From fedora-cvs-commits at redhat.com Mon Jan 1 01:53:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 31 Dec 2006 20:53:31 -0500 Subject: rpms/gnome-python2/devel gnome-python.spec,1.53,1.54 Message-ID: <200701010153.l011rVWa020641@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20613 Modified Files: gnome-python.spec Log Message: * Sun Dec 31 2006 Matthew Barnes - 2.16.2-5 - Bonobo subpackage requires pyorbit >= 2.0.1, not 2.0.l (RH bug #150885). Index: gnome-python.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gnome-python.spec 7 Dec 2006 19:05:02 -0000 1.53 +++ gnome-python.spec 1 Jan 2007 01:53:27 -0000 1.54 @@ -7,7 +7,7 @@ Name: gnome-python2 Version: 2.16.2 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: Development/Languages Summary: The sources for the PyGNOME Python extension module @@ -84,7 +84,7 @@ Requires: bonobo-activation >= 1.0.0 Requires: libbonobo >= 2.0.0 Requires: libbonoboui >= 2.0.0 -Requires: pyorbit >= 2.0.l +Requires: pyorbit >= 2.0.1 %description bonobo This module contains a wrapper that allows the creation of bonobo @@ -198,6 +198,9 @@ rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo} %changelog +* Sun Dec 31 2006 Matthew Barnes - 2.16.2-5 +- Bonobo subpackage requires pyorbit >= 2.0.1, not 2.0.l (RH bug #150885). + * Thu Dec 7 2006 Jeremy Katz - 2.16.2-4 - rebuild for python 2.5 From fedora-cvs-commits at redhat.com Mon Jan 1 01:53:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 31 Dec 2006 20:53:50 -0500 Subject: rpms/gnome-python2/FC-6 gnome-python.spec,1.49,1.50 Message-ID: <200701010153.l011rouf020669@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20654 Modified Files: gnome-python.spec Log Message: * Fri Nov 17 2006 Matthew Barnes - 2.16.2-2.fc6 - Fix some minor packaging bugs (RH bug #203532). - Bonobo subpackage requires pyorbit >= 2.0.1, not 2.0.l (RH bug #150885). Index: gnome-python.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/FC-6/gnome-python.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnome-python.spec 6 Nov 2006 01:53:51 -0000 1.49 +++ gnome-python.spec 1 Jan 2007 01:53:48 -0000 1.50 @@ -7,7 +7,7 @@ Name: gnome-python2 Version: 2.16.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: Development/Languages Summary: The sources for the PyGNOME Python extension module @@ -86,7 +86,7 @@ Requires: bonobo-activation >= 1.0.0 Requires: libbonobo >= 2.0.0 Requires: libbonoboui >= 2.0.0 -Requires: pyorbit >= 2.0.l +Requires: pyorbit >= 2.0.1 %description bonobo This module contains a wrapper that allows the creation of bonobo @@ -117,6 +117,7 @@ Requires: %{name} = %{version}-%{release} Requires: gnome-vfs2-devel Requires: pkgconfig +Requires: python-devel %description devel This package contains files required to build wrappers for GNOME add-on @@ -188,8 +189,7 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/gnome-python-2.0/pygnomevfs.h -%{_includedir}/gnome-python-2.0/pygnomevfsbonobo.h +%{_includedir}/gnome-python-2.0 %{_libdir}/pkgconfig/gnome-python-2.0.pc # old versions did not have .pyc and .pyo files in their file list @@ -200,6 +200,10 @@ rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo} %changelog +* Fri Nov 17 2006 Matthew Barnes - 2.16.2-2.fc6 +- Fix some minor packaging bugs (RH bug #203532). +- Bonobo subpackage requires pyorbit >= 2.0.1, not 2.0.l (RH bug #150885). + * Sun Nov 5 2006 Matthew Barnes - 2.16.2-1.fc6 - Update to 2.16.2 - Clean up spec file. From fedora-cvs-commits at redhat.com Mon Jan 1 03:09:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 31 Dec 2006 22:09:43 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2882,1.2883 Message-ID: <200701010309.l0139hUs006423@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6373 Modified Files: kernel-2.6.spec Log Message: devel & debuginfo for -debug Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2882 retrieving revision 1.2883 diff -u -r1.2882 -r1.2883 --- kernel-2.6.spec 31 Dec 2006 19:31:41 -0000 1.2882 +++ kernel-2.6.spec 1 Jan 2007 03:09:40 -0000 1.2883 @@ -1728,6 +1728,25 @@ %endif %if %{builddebug} +%if "%{_enable_debug_packages}" == "1" +%ifnarch noarch +%package debug-debuginfo +Summary: Debug information for package %{name}-debug +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL} +Provides: %{name}-debug-debuginfo-%{_target_cpu} = %{KVERREL} +%description debug-debuginfo +This package provides debug information for package %{name}-debug +%files debug-debuginfo +%defattr(-,root,root) +%if "%{elf_image_install_path}" != "" +/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}debug.debug +%endif +/usr/lib/debug/lib/modules/%{KVERREL}debug +/usr/lib/debug/usr/src/kernels/%{KVERREL}-debug-%{_target_cpu} +%endif +%endif + %files debug %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}debug @@ -1742,8 +1761,15 @@ /lib/modules/%{KVERREL}debug/updates /lib/modules/%{KVERREL}debug/weak-updates %ghost /boot/initrd-%{KVERREL}debug.img + +%files debug-devel +%defattr(-,root,root) +%verify(not mtime) /usr/src/kernels/%{KVERREL}-debug-%{_target_cpu} +/usr/src/kernels/%{KVERREL}debug-%{_target_cpu} %endif + + %if %{buildpae} %if "%{_enable_debug_packages}" == "1" %ifnarch noarch @@ -1786,6 +1812,25 @@ /usr/src/kernels/%{KVERREL}PAE-%{_target_cpu} %if %{builddebug} +%if "%{_enable_debug_packages}" == "1" +%ifnarch noarch +%package PAE-debug-debuginfo +Summary: Debug information for package %{name}-PAE-debug +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL} +Provides: %{name}-debug-debuginfo-%{_target_cpu} = %{KVERREL} +%description PAE-debug-debuginfo +This package provides debug information for package %{name}-PAE-debug +%files PAE-debug-debuginfo +%defattr(-,root,root) +%if "%{elf_image_install_path}" != "" +/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}PAE-debug.debug +%endif +/usr/lib/debug/lib/modules/%{KVERREL}PAE-debug +/usr/lib/debug/usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu} +%endif +%endif + %files PAE-debug %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}PAE-debug @@ -1800,9 +1845,15 @@ /lib/modules/%{KVERREL}PAE-debug/updates /lib/modules/%{KVERREL}PAE-debug/weak-updates %ghost /boot/initrd-%{KVERREL}PAE-debug.img -%endif + +%files PAE-debug-devel +%defattr(-,root,root) +%verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu} +/usr/src/kernels/%{KVERREL}PAE-debug-%{_target_cpu} %endif + + %if %{buildsmp} %if "%{_enable_debug_packages}" == "1" %ifnarch noarch @@ -1891,7 +1942,6 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu} /usr/src/kernels/%{KVERREL}xen-%{_target_cpu} %endif - %endif %if %{buildkdump} From fedora-cvs-commits at redhat.com Mon Jan 1 03:11:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 31 Dec 2006 22:11:58 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2883,1.2884 Message-ID: <200701010311.l013BwT6008266@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8220 Modified Files: kernel-2.6.spec Log Message: devel & debuginfo for -debug Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2883 retrieving revision 1.2884 diff -u -r1.2883 -r1.2884 --- kernel-2.6.spec 1 Jan 2007 03:09:40 -0000 1.2883 +++ kernel-2.6.spec 1 Jan 2007 03:11:56 -0000 1.2884 @@ -1762,6 +1762,14 @@ /lib/modules/%{KVERREL}debug/weak-updates %ghost /boot/initrd-%{KVERREL}debug.img +%package debug-devel +Summary: Development package for building kernel modules to match the kernel. +Group: System Environment/Kernel +AutoReqProv: no +Prereq: /usr/bin/find +%description debug-devel +This package provides kernel headers and makefiles sufficient to build modules +against the kernel package. %files debug-devel %defattr(-,root,root) %verify(not mtime) /usr/src/kernels/%{KVERREL}-debug-%{_target_cpu} @@ -1846,6 +1854,14 @@ /lib/modules/%{KVERREL}PAE-debug/weak-updates %ghost /boot/initrd-%{KVERREL}PAE-debug.img +%package PAE-debug-devel +Summary: Development package for building kernel modules to match the kernel. +Group: System Environment/Kernel +AutoReqProv: no +Prereq: /usr/bin/find +%description PAE-debug-devel +This package provides kernel headers and makefiles sufficient to build modules +against the kernel package. %files PAE-debug-devel %defattr(-,root,root) %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu} From fedora-cvs-commits at redhat.com Mon Jan 1 03:15:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 31 Dec 2006 22:15:29 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2884,1.2885 Message-ID: <200701010315.l013FTex011082@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11037 Modified Files: kernel-2.6.spec Log Message: missing endif Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2884 retrieving revision 1.2885 diff -u -r1.2884 -r1.2885 --- kernel-2.6.spec 1 Jan 2007 03:11:56 -0000 1.2884 +++ kernel-2.6.spec 1 Jan 2007 03:15:27 -0000 1.2885 @@ -1721,12 +1721,14 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu} %endif + %if %{buildheaders} %files headers %defattr(-,root,root) /usr/include/* %endif + %if %{builddebug} %if "%{_enable_debug_packages}" == "1" %ifnarch noarch @@ -1818,6 +1820,8 @@ %defattr(-,root,root) %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu} /usr/src/kernels/%{KVERREL}PAE-%{_target_cpu} +%endif + %if %{builddebug} %if "%{_enable_debug_packages}" == "1" @@ -1912,6 +1916,7 @@ /usr/src/kernels/%{KVERREL}smp-%{_target_cpu} %endif + %if %{includexen} %if %{buildxen} %if "%{_enable_debug_packages}" == "1" From fedora-cvs-commits at redhat.com Mon Jan 1 06:35:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 01:35:47 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2885,1.2886 Message-ID: <200701010635.l016Zli3005915@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5863 Modified Files: kernel-2.6.spec Log Message: misplaced endif Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2885 retrieving revision 1.2886 diff -u -r1.2885 -r1.2886 --- kernel-2.6.spec 1 Jan 2007 03:15:27 -0000 1.2885 +++ kernel-2.6.spec 1 Jan 2007 06:35:44 -0000 1.2886 @@ -1820,8 +1820,6 @@ %defattr(-,root,root) %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-%{_target_cpu} /usr/src/kernels/%{KVERREL}PAE-%{_target_cpu} -%endif - %if %{builddebug} %if "%{_enable_debug_packages}" == "1" @@ -1871,7 +1869,8 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu} /usr/src/kernels/%{KVERREL}PAE-debug-%{_target_cpu} %endif - +# PAE +%endif %if %{buildsmp} From fedora-cvs-commits at redhat.com Mon Jan 1 19:37:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 14:37:40 -0500 Subject: rpms/kernel/devel linux-2.6-maple-ide.patch, NONE, 1.1 linux-2.6-powerpc-fix-BUG.patch, NONE, 1.1 kernel-2.6.spec, 1.2899, 1.2900 Message-ID: <200701011937.l01Jbe2v027379@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27363 Modified Files: kernel-2.6.spec Added Files: linux-2.6-maple-ide.patch linux-2.6-powerpc-fix-BUG.patch Log Message: fix PPC generic BUG() in asm, fix maple ide linux-2.6-maple-ide.patch: arch/powerpc/Kconfig | 1 + drivers/ata/Kconfig | 4 ++++ drivers/ata/libata-sff.c | 6 +++--- include/asm-generic/libata-portmap.h | 4 ++-- include/asm-powerpc/libata-portmap.h | 12 ++++++++++++ 5 files changed, 22 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-maple-ide.patch --- diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 0673dbe..1857707 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -484,6 +484,7 @@ config PPC_MAPLE select PPC_970_NAP select PPC_NATIVE select PPC_RTAS + select ATA_NONSTANDARD if ATA default n help This option enables support for the Maple 970FX Evaluation Board. diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 7645f2b..bf44f6d 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -879,7 +879,7 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, probe_ent->n_ports = 2; if (port_mask & ATA_PORT_PRIMARY) { - probe_ent->irq = ATA_PRIMARY_IRQ; + probe_ent->irq = ATA_PRIMARY_IRQ(pdev); probe_ent->port[0].cmd_addr = ATA_PRIMARY_CMD; probe_ent->port[0].altstatus_addr = probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL; @@ -894,9 +894,9 @@ static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, if (port_mask & ATA_PORT_SECONDARY) { if (probe_ent->irq) - probe_ent->irq2 = ATA_SECONDARY_IRQ; + probe_ent->irq2 = ATA_SECONDARY_IRQ(pdev); else - probe_ent->irq = ATA_SECONDARY_IRQ; + probe_ent->irq = ATA_SECONDARY_IRQ(pdev); probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD; probe_ent->port[1].altstatus_addr = probe_ent->port[1].ctl_addr = ATA_SECONDARY_CTL; diff --git a/include/asm-generic/libata-portmap.h b/include/asm-generic/libata-portmap.h index 9202fd0..ec742ca 100644 --- a/include/asm-generic/libata-portmap.h +++ b/include/asm-generic/libata-portmap.h @@ -1,12 +1,12 @@ #ifndef __ASM_GENERIC_LIBATA_PORTMAP_H #define __ASM_GENERIC_LIBATA_PORTMAP_H #define ATA_PRIMARY_CMD 0x1F0 #define ATA_PRIMARY_CTL 0x3F6 -#define ATA_PRIMARY_IRQ 14 +#define ATA_PRIMARY_IRQ(dev) 14 #define ATA_SECONDARY_CMD 0x170 #define ATA_SECONDARY_CTL 0x376 -#define ATA_SECONDARY_IRQ 15 +#define ATA_SECONDARY_IRQ(dev) 15 #endif --- /dev/null 2006-12-19 10:44:19.206057770 +0000 +++ b/include/asm-powerpc/libata-portmap.h 2006-12-31 00:32:04.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef __ASM_POWERPC_LIBATA_PORTMAP_H +#define __ASM_POWERPC_LIBATA_PORTMAP_H + +#define ATA_PRIMARY_CMD 0x1F0 +#define ATA_PRIMARY_CTL 0x3F6 +#define ATA_PRIMARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 0) + +#define ATA_SECONDARY_CMD 0x170 +#define ATA_SECONDARY_CTL 0x376 +#define ATA_SECONDARY_IRQ(dev) pci_get_legacy_ide_irq(dev, 1) + +#endif diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 03f6338..6a38c9b 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -19,6 +19,10 @@ config ATA if ATA +config ATA_NONSTANDARD + bool + default n + config SATA_AHCI tristate "AHCI SATA support" depends on PCI linux-2.6-powerpc-fix-BUG.patch: arch/powerpc/kernel/asm-offsets.c | 3 +++ arch/powerpc/kernel/entry_64.S | 13 +++++-------- include/asm-powerpc/bug.h | 27 ++++++++++++++++++++++++--- 3 files changed, 32 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6-powerpc-fix-BUG.patch --- diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index e965215..030d300 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -303,5 +303,8 @@ int main(void) DEFINE(NSEC_PER_SEC, NSEC_PER_SEC); DEFINE(CLOCK_REALTIME_RES, TICK_NSEC); +#ifdef CONFIG_BUG + DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); +#endif return 0; } diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 1a3d4de..2551c08 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -28,6 +28,7 @@ #include #include #include +#include /* * System calls. @@ -634,19 +635,15 @@ _GLOBAL(enter_rtas) li r0,0 mtcr r0 +#ifdef CONFIG_BUG /* There is no way it is acceptable to get here with interrupts enabled, * check it with the asm equivalent of WARN_ON */ lbz r0,PACASOFTIRQEN(r13) 1: tdnei r0,0 -.section __bug_table,"a" - .llong 1b,__LINE__ + 0x1000000, 1f, 2f -.previous -.section .rodata,"a" -1: .asciz __FILE__ -2: .asciz "enter_rtas" -.previous - + EMIT_BUG_ENTRY 1b,__FILE__,__LINE__,BUGFLAG_WARNING +#endif + /* Hard-disable interrupts */ mfmsr r6 rldicl r7,r6,48,1 diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h index 7095688..f6fa394 100644 --- a/include/asm-powerpc/bug.h +++ b/include/asm-powerpc/bug.h @@ -11,10 +11,31 @@ #define BUG_OPCODE .long 0x00b00b00 /* For asm */ #define BUG_ILLEGAL_INSTR "0x00b00b00" /* For BUG macro */ -#ifndef __ASSEMBLY__ - #ifdef CONFIG_BUG +#ifdef __ASSEMBLY__ +#ifdef CONFIG_DEBUG_BUGVERBOSE +.macro EMIT_BUG_ENTRY addr,file,line,flags + .section __bug_table,"a" +5001: PPC_LONG \addr, 5002f + .short \line, \flags + .org 5001b+BUG_ENTRY_SIZE + .previous + .section .rodata,"a" +5002: .asciz "\file" + .previous +.endm +#else + .macro EMIT_BUG_ENTRY addr,file,line,flags + .section __bug_table,"a" +5001: PPC_LONG \addr + .short \flags + .org 5001b+BUG_ENTRY_SIZE + .previous +.endm +#endif /* verbose */ + +#else /* !__ASSEMBLY__ */ /* _EMIT_BUG_ENTRY expects args %0,%1,%2,%3 to be FILE, LINE, flags and sizeof(struct bug_entry), respectively */ #ifdef CONFIG_DEBUG_BUGVERBOSE @@ -91,8 +112,8 @@ #define HAVE_ARCH_BUG #define HAVE_ARCH_BUG_ON #define HAVE_ARCH_WARN_ON -#endif /* CONFIG_BUG */ #endif /* __ASSEMBLY __ */ +#endif /* CONFIG_BUG */ #include Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2899 retrieving revision 1.2900 diff -u -r1.2899 -r1.2900 --- kernel-2.6.spec 31 Dec 2006 19:42:34 -0000 1.2899 +++ kernel-2.6.spec 1 Jan 2007 19:37:37 -0000 1.2900 @@ -325,6 +325,8 @@ Patch302: linux-2.6-systemsim-work.patch Patch303: linux-2.6-ppc32-ucmpdi2.patch Patch304: linux-2.6-ibmvscsi-schizo.patch +Patch305: linux-2.6-maple-ide.patch +Patch306: linux-2.6-powerpc-fix-BUG.patch Patch310: linux-2.6-common-uevent.patch Patch311: linux-2.6-uevent-macio.patch @@ -811,6 +813,10 @@ %patch303 -p1 # Fix up ibmvscsi for combined pSeries/iSeries build %patch304 -p1 +# Fix legacy mode IDE IRQ on Maple +%patch305 -p1 +# Fix BUG() in assembly +%patch306 -p1 # uevent support for of_platform device %patch310 -p1 @@ -1914,6 +1920,10 @@ # - tux. %changelog +* Mon Jan 1 2007 David Woodhouse +- Fix BUG() in assembler in PowerPC +- Fix Maple IDE IRQ + * Sun Dec 31 2006 Dave Jones - 2.6.20rc2-git2 From fedora-cvs-commits at redhat.com Mon Jan 1 19:54:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 14:54:10 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2900,1.2901 Message-ID: <200701011954.l01JsA4g015543@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15530 Modified Files: kernel-2.6.spec Log Message: more -debug tweaks Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2900 retrieving revision 1.2901 diff -u -r1.2900 -r1.2901 --- kernel-2.6.spec 1 Jan 2007 19:37:37 -0000 1.2900 +++ kernel-2.6.spec 1 Jan 2007 19:54:07 -0000 1.2901 @@ -1688,13 +1688,34 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu} %endif + %if %{buildheaders} %files headers %defattr(-,root,root) /usr/include/* %endif + %if %{builddebug} +%if "%{_enable_debug_packages}" == "1" +%ifnarch noarch +%package debug-debuginfo +Summary: Debug information for package %{name}-debug +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL} +Provides: %{name}-debug-debuginfo-%{_target_cpu} = %{KVERREL} +%description debug-debuginfo +This package provides debug information for package %{name}-debug +%files debug-debuginfo +%defattr(-,root,root) +%if "%{elf_image_install_path}" != "" +/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}debug.debug +%endif +/usr/lib/debug/lib/modules/%{KVERREL}debug +/usr/lib/debug/usr/src/kernels/%{KVERREL}-debug-%{_target_cpu} +%endif +%endif + %files debug %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}debug @@ -1709,8 +1730,23 @@ /lib/modules/%{KVERREL}debug/updates /lib/modules/%{KVERREL}debug/weak-updates %ghost /boot/initrd-%{KVERREL}debug.img + +%package debug-devel +Summary: Development package for building kernel modules to match the kernel. +Group: System Environment/Kernel +AutoReqProv: no +Prereq: /usr/bin/find +%description debug-devel +This package provides kernel headers and makefiles sufficient to build modules +against the kernel package. +%files debug-devel +%defattr(-,root,root) +%verify(not mtime) /usr/src/kernels/%{KVERREL}-debug-%{_target_cpu} +/usr/src/kernels/%{KVERREL}debug-%{_target_cpu} %endif + + %if %{buildpae} %if "%{_enable_debug_packages}" == "1" %ifnarch noarch @@ -1753,6 +1789,25 @@ /usr/src/kernels/%{KVERREL}PAE-%{_target_cpu} %if %{builddebug} +%if "%{_enable_debug_packages}" == "1" +%ifnarch noarch +%package PAE-debug-debuginfo +Summary: Debug information for package %{name}-PAE-debug +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL} +Provides: %{name}-debug-debuginfo-%{_target_cpu} = %{KVERREL} +%description PAE-debug-debuginfo +This package provides debug information for package %{name}-PAE-debug +%files PAE-debug-debuginfo +%defattr(-,root,root) +%if "%{elf_image_install_path}" != "" +/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}PAE-debug.debug +%endif +/usr/lib/debug/lib/modules/%{KVERREL}PAE-debug +/usr/lib/debug/usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu} +%endif +%endif + %files PAE-debug %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}PAE-debug @@ -1767,9 +1822,24 @@ /lib/modules/%{KVERREL}PAE-debug/updates /lib/modules/%{KVERREL}PAE-debug/weak-updates %ghost /boot/initrd-%{KVERREL}PAE-debug.img + +%package PAE-debug-devel +Summary: Development package for building kernel modules to match the kernel. +Group: System Environment/Kernel +AutoReqProv: no +Prereq: /usr/bin/find +%description PAE-debug-devel +This package provides kernel headers and makefiles sufficient to build modules +against the kernel package. +%files PAE-debug-devel +%defattr(-,root,root) +%verify(not mtime) /usr/src/kernels/%{KVERREL}-PAE-debug-%{_target_cpu} +/usr/src/kernels/%{KVERREL}PAE-debug-%{_target_cpu} %endif +# PAE %endif + %if %{buildsmp} %if "%{_enable_debug_packages}" == "1" %ifnarch noarch @@ -1812,6 +1882,7 @@ /usr/src/kernels/%{KVERREL}smp-%{_target_cpu} %endif + %if %{includexen} %if %{buildxen} %if "%{_enable_debug_packages}" == "1" @@ -1858,7 +1929,6 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu} /usr/src/kernels/%{KVERREL}xen-%{_target_cpu} %endif - %endif %if %{buildkdump} From fedora-cvs-commits at redhat.com Mon Jan 1 20:07:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 15:07:17 -0500 Subject: rpms/kernel/devel linux-2.6-ibmvscsi-schizo.patch,1.1,1.2 Message-ID: <200701012007.l01K7Hdx015732@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15715 Modified Files: linux-2.6-ibmvscsi-schizo.patch Log Message: Fix ibmvscsi harder linux-2.6-ibmvscsi-schizo.patch: Makefile | 2 ibmvscsi.c | 39 +++++++++++-------- ibmvscsi.h | 32 ++++++++------- iseries_vscsi.c | 37 +++++++++++------- rpa_vscsi.c | 114 +++++++++++++++++++++++++++++--------------------------- 5 files changed, 125 insertions(+), 99 deletions(-) Index: linux-2.6-ibmvscsi-schizo.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ibmvscsi-schizo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-ibmvscsi-schizo.patch 19 Dec 2006 16:01:23 -0000 1.1 +++ linux-2.6-ibmvscsi-schizo.patch 1 Jan 2007 20:07:14 -0000 1.2 @@ -447,3 +447,15 @@ + .reenable_crq_queue = iseriesvscsi_reenable_crq_queue, + .send_crq = iseriesvscsi_send_crq, +}; +--- linux-2.6.19.ppc64/drivers/scsi/ibmvscsi/Makefile.orig 2007-01-01 20:06:26.000000000 +0000 ++++ linux-2.6.19.ppc64/drivers/scsi/ibmvscsi/Makefile 2007-01-01 20:06:35.000000000 +0000 +@@ -1,9 +1,7 @@ + obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsic.o + + ibmvscsic-y += ibmvscsi.o +-ifndef CONFIG_PPC_PSERIES + ibmvscsic-$(CONFIG_PPC_ISERIES) += iseries_vscsi.o +-endif + ibmvscsic-$(CONFIG_PPC_PSERIES) += rpa_vscsi.o + + obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvstgt.o From fedora-cvs-commits at redhat.com Mon Jan 1 20:08:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 15:08:55 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2901,1.2902 Message-ID: <200701012008.l01K8th5015785@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15770 Modified Files: kernel-2.6.spec Log Message: Fix ibmvscsi harder Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2901 retrieving revision 1.2902 diff -u -r1.2901 -r1.2902 --- kernel-2.6.spec 1 Jan 2007 19:54:07 -0000 1.2901 +++ kernel-2.6.spec 1 Jan 2007 20:08:53 -0000 1.2902 @@ -1991,6 +1991,9 @@ %changelog * Mon Jan 1 2007 David Woodhouse +- Fix fallout from half-baked upstream IBM vSCSI patch + +* Mon Jan 1 2007 David Woodhouse - Fix BUG() in assembler in PowerPC - Fix Maple IDE IRQ From fedora-cvs-commits at redhat.com Tue Jan 2 00:16:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 19:16:13 -0500 Subject: rpms/scim-bridge/devel .cvsignore, 1.25, 1.26 scim-bridge.spec, 1.38, 1.39 sources, 1.25, 1.26 scim-bridge-0.4.8-qt-moc-path.patch, 1.1, NONE scim-bridge-0.4.8-tests-dir-missing.patch, 1.1, NONE Message-ID: <200701020016.l020GDjd028707@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim-bridge/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28679 Modified Files: .cvsignore scim-bridge.spec sources Removed Files: scim-bridge-0.4.8-qt-moc-path.patch scim-bridge-0.4.8-tests-dir-missing.patch Log Message: - update to 0.4.9 - fixes hanging agent processes Resolves: #210772 - fixes movement of preedit with clicking Resolves: #217329 - no longer need scim-bridge-0.4.8-qt-moc-path.patch and scim-bridge-0.4.8-tests-dir-missing.patch - protect update-gtk-immodules in %%post and %%postun Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/scim-bridge/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 23 Nov 2006 05:22:37 -0000 1.25 +++ .cvsignore 2 Jan 2007 00:16:06 -0000 1.26 @@ -1 +1 @@ -scim-bridge-0.4.8.tar.gz +scim-bridge-0.4.9.tar.gz Index: scim-bridge.spec =================================================================== RCS file: /cvs/dist/rpms/scim-bridge/devel/scim-bridge.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- scim-bridge.spec 23 Nov 2006 05:30:44 -0000 1.38 +++ scim-bridge.spec 2 Jan 2007 00:16:06 -0000 1.39 @@ -1,10 +1,10 @@ -#%%define snapdate 20061018 +#%%define snapdate 20061204 %define snapshot 0%{?snapdate:1} %define build_qt 1 Name: scim-bridge -Version: 0.4.8 +Version: 0.4.9 Release: 1%{?dist} Summary: SCIM Bridge Gtk IM module @@ -24,10 +24,6 @@ %endif # for new xinput files (fc6) Requires: scim >= 1.4.4-33 -Patch1: scim-bridge-0.4.8-qt-moc-path.patch -Buildrequires: automake -Patch2: scim-bridge-0.4.8-tests-dir-missing.patch -Buildrequires: autoconf libtool %description SCIM Bridge is a C implementation of a Gtk IM module for SCIM. @@ -64,11 +60,8 @@ %prep %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -%patch1 -p1 -b .1-moc -%patch2 -p1 -b .2-tests-missing -mkdir m4 -autoreconf %if %{snapshot} +mkdir m4 ./bootstrap %endif @@ -104,11 +97,11 @@ %post gtk -%{_bindir}/update-gtk-immodules %{_host} +%{_bindir}/update-gtk-immodules %{_host} || : %postun gtk -%{_bindir}/update-gtk-immodules %{_host} +%{_bindir}/update-gtk-immodules %{_host} || : %files @@ -133,6 +126,14 @@ %changelog +* Tue Jan 2 2007 Jens Petersen - 0.4.9-1 +- update to 0.4.9 + - fixes hanging agent processes (#210772) + - fixes movement of preedit with clicking (#217329) + - no longer need scim-bridge-0.4.8-qt-moc-path.patch and + scim-bridge-0.4.8-tests-dir-missing.patch +- protect update-gtk-immodules in %%post and %%postun + * Thu Nov 23 2006 Jens Petersen - 0.4.8-1 - update to 0.4.8 - add scim-bridge-0.4.8-qt-moc-path.patch to set full path to moc Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-bridge/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 23 Nov 2006 05:22:38 -0000 1.25 +++ sources 2 Jan 2007 00:16:06 -0000 1.26 @@ -1 +1 @@ -dd31005d109a12d35e93b79fc8c67690 scim-bridge-0.4.8.tar.gz +5997d4172e6602775e906f21eaf28552 scim-bridge-0.4.9.tar.gz --- scim-bridge-0.4.8-qt-moc-path.patch DELETED --- --- scim-bridge-0.4.8-tests-dir-missing.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 2 03:29:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 22:29:07 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2902,1.2903 Message-ID: <200701020329.l023T7ca023602@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23556 Modified Files: kernel-2.6.spec Log Message: disable symvers Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2902 retrieving revision 1.2903 diff -u -r1.2902 -r1.2903 --- kernel-2.6.spec 1 Jan 2007 20:08:53 -0000 1.2902 +++ kernel-2.6.spec 2 Jan 2007 03:29:05 -0000 1.2903 @@ -1720,7 +1720,7 @@ %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}debug /boot/System.map-%{KVERREL}debug -/boot/symvers-%{KVERREL}debug.gz +#/boot/symvers-%{KVERREL}debug.gz /boot/config-%{KVERREL}debug %dir /lib/modules/%{KVERREL}debug /lib/modules/%{KVERREL}debug/kernel @@ -1812,7 +1812,7 @@ %defattr(-,root,root) /%{image_install_path}/vmlinuz-%{KVERREL}PAE-debug /boot/System.map-%{KVERREL}PAE-debug -/boot/symvers-%{KVERREL}PAE-debug.gz +#/boot/symvers-%{KVERREL}PAE-debug.gz /boot/config-%{KVERREL}PAE-debug %dir /lib/modules/%{KVERREL}PAE-debug /lib/modules/%{KVERREL}PAE-debug/kernel From fedora-cvs-commits at redhat.com Tue Jan 2 04:31:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 1 Jan 2007 23:31:28 -0500 Subject: rpms/kernel/devel patch-2.6.20-rc3.bz2.sign, NONE, 1.1 .cvsignore, 1.558, 1.559 kernel-2.6.spec, 1.2903, 1.2904 linux-2.6-utrace.patch, 1.47, 1.48 sources, 1.521, 1.522 upstream, 1.449, 1.450 patch-2.6.20-rc2-git2.bz2.sign, 1.1, NONE patch-2.6.20-rc2.bz2.sign, 1.1, NONE Message-ID: <200701020431.l024VSbQ011051@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10997 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-utrace.patch sources upstream Added Files: patch-2.6.20-rc3.bz2.sign Removed Files: patch-2.6.20-rc2-git2.bz2.sign patch-2.6.20-rc2.bz2.sign Log Message: rc3 --- NEW FILE patch-2.6.20-rc3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFmIzyyGugalF9Dw4RAo+aAJ0U3hYCCOZ6YDjhSKDMKev1C/phuwCeNVhk ZkPnIq9SKO/CceOB5gJ2Ows= =evFK -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.558 retrieving revision 1.559 diff -u -r1.558 -r1.559 --- .cvsignore 31 Dec 2006 19:42:34 -0000 1.558 +++ .cvsignore 2 Jan 2007 04:31:26 -0000 1.559 @@ -4,5 +4,4 @@ kernel-2.6.19 xen-11633.tar.bz2 linux-2.6.19.tar.bz2 -patch-2.6.20-rc2.bz2 -patch-2.6.20-rc2-git2.bz2 +patch-2.6.20-rc3.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2903 retrieving revision 1.2904 diff -u -r1.2903 -r1.2904 --- kernel-2.6.spec 2 Jan 2007 03:29:05 -0000 1.2903 +++ kernel-2.6.spec 2 Jan 2007 04:31:26 -0000 1.2904 @@ -300,8 +300,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.20-rc2.bz2 -Patch2: patch-2.6.20-rc2-git2.bz2 +Patch1: patch-2.6.20-rc3.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -773,7 +772,6 @@ # Update to latest upstream. %patch1 -p1 -%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -1990,6 +1988,9 @@ # - tux. %changelog +* Mon Jan 1 2007 Dave Jones +- 2.6.20rc3 + * Mon Jan 1 2007 David Woodhouse - Fix fallout from half-baked upstream IBM vSCSI patch linux-2.6-utrace.patch: Documentation/utrace.txt | 579 +++++++++++ arch/alpha/kernel/asm-offsets.c | 2 arch/alpha/kernel/entry.S | 4 arch/arm/kernel/ptrace.c | 36 arch/arm26/kernel/ptrace.c | 32 arch/frv/kernel/ptrace.c | 15 arch/i386/kernel/entry.S | 7 arch/i386/kernel/i387.c | 143 +- arch/i386/kernel/process.c | 3 arch/i386/kernel/ptrace.c | 863 +++++++++------- arch/i386/kernel/signal.c | 37 arch/i386/kernel/vm86.c | 7 arch/ia64/ia32/ia32_entry.S | 2 arch/ia64/ia32/sys_ia32.c | 537 ++++++++++ arch/ia64/kernel/asm-offsets.c | 2 arch/ia64/kernel/fsys.S | 16 arch/ia64/kernel/mca.c | 2 arch/ia64/kernel/ptrace.c | 1680 ++++++++++++++++---------------- arch/ia64/kernel/signal.c | 4 arch/mips/kernel/ptrace.c | 21 arch/mips/kernel/sysirix.c | 2 arch/powerpc/kernel/Makefile | 4 arch/powerpc/kernel/asm-offsets.c | 2 arch/powerpc/kernel/process.c | 5 arch/powerpc/kernel/ptrace-common.h | 161 --- arch/powerpc/kernel/ptrace.c | 959 +++++++++++------- arch/powerpc/kernel/ptrace32.c | 436 -------- arch/powerpc/kernel/signal_32.c | 55 + arch/powerpc/kernel/signal_64.c | 3 arch/powerpc/kernel/sys_ppc32.c | 5 arch/powerpc/lib/sstep.c | 3 arch/ppc/kernel/asm-offsets.c | 2 arch/s390/kernel/Makefile | 2 arch/s390/kernel/compat_linux.c | 3 arch/s390/kernel/compat_signal.c | 5 arch/s390/kernel/process.c | 3 arch/s390/kernel/ptrace.c | 1073 +++++++++----------- arch/s390/kernel/signal.c | 3 arch/s390/kernel/traps.c | 6 arch/sparc64/kernel/Makefile | 2 arch/sparc64/kernel/binfmt_aout32.c | 2 arch/sparc64/kernel/entry.S | 6 arch/sparc64/kernel/process.c | 3 arch/sparc64/kernel/ptrace.c | 1224 ++++++++++++----------- arch/sparc64/kernel/signal.c | 2 arch/sparc64/kernel/signal32.c | 2 arch/sparc64/kernel/sys_sparc32.c | 3 arch/sparc64/kernel/systbls.S | 4 arch/x86_64/ia32/fpu32.c | 92 + arch/x86_64/ia32/ia32_aout.c | 6 arch/x86_64/ia32/ia32_signal.c | 7 arch/x86_64/ia32/ia32entry.S | 2 arch/x86_64/ia32/ptrace32.c | 723 +++++++++---- arch/x86_64/ia32/sys_ia32.c | 5 arch/x86_64/kernel/process.c | 5 arch/x86_64/kernel/ptrace.c | 657 +++++++----- arch/x86_64/kernel/signal.c | 28 arch/x86_64/kernel/traps.c | 8 arch/x86_64/mm/fault.c | 4 drivers/connector/cn_proc.c | 4 fs/binfmt_aout.c | 6 fs/binfmt_elf.c | 6 fs/binfmt_elf_fdpic.c | 7 fs/binfmt_flat.c | 3 fs/binfmt_som.c | 2 fs/exec.c | 11 fs/proc/array.c | 12 fs/proc/base.c | 17 include/asm-i386/i387.h | 13 include/asm-i386/signal.h | 4 include/asm-i386/thread_info.h | 7 include/asm-i386/tracehook.h | 49 include/asm-ia64/elf.h | 24 include/asm-ia64/tracehook.h | 83 + include/asm-powerpc/tracehook.h | 80 + include/asm-s390/tracehook.h | 53 + include/asm-sparc64/tracehook.h | 44 include/asm-x86_64/fpu32.h | 3 include/asm-x86_64/thread_info.h | 3 include/asm-x86_64/tracehook.h | 54 + include/linux/init_task.h | 3 include/linux/ptrace.h | 224 +++- include/linux/sched.h | 25 include/linux/tracehook.h | 707 +++++++++++++ include/linux/utrace.h | 504 +++++++++ init/Kconfig | 29 kernel/Makefile | 1 kernel/exit.c | 241 +--- kernel/fork.c | 62 - kernel/ptrace.c | 1767 ++++++++++++++++++++++++++++------ kernel/signal.c | 211 ---- kernel/sys.c | 2 kernel/timer.c | 6 kernel/tsacct.c | 2 kernel/utrace.c | 1861 ++++++++++++++++++++++++++++++++++++ security/selinux/hooks.c | 54 - security/selinux/include/objsec.h | 1 97 files changed, 10639 insertions(+), 5055 deletions(-) Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- linux-2.6-utrace.patch 29 Dec 2006 06:03:21 -0000 1.47 +++ linux-2.6-utrace.patch 2 Jan 2007 04:31:26 -0000 1.48 @@ -5313,9 +5313,9 @@ { /* We don't want people slaying init. */ if (p->exit_signal != -1) -@@ -597,49 +597,21 @@ static void - reparent_thread(struct task_struct *p, struct task_struct *father) - { +@@ -601,35 +601,7 @@ reparent_thread(struct task_struct *p, s + group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + /* Move the child from its dying parent to the new one. */ - if (unlikely(traced)) { - /* Preserve ptrace links if someone else is tracing this child. */ @@ -5350,25 +5350,15 @@ /* We don't want people slaying init. */ if (p->exit_signal != -1) - p->exit_signal = SIGCHLD; -- -+ - if (p->pdeath_signal) - /* We already hold the tasklist_lock here. */ - group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); - +@@ -638,7 +610,7 @@ reparent_thread(struct task_struct *p, s /* If we'd notified the old parent about this child's death, -- * also notify the new parent. -- */ + * also notify the new parent. + */ - if (!traced && p->exit_state == EXIT_ZOMBIE && -- p->exit_signal != -1 && thread_group_empty(p)) -+ * also notify the new parent. -+ */ -+ if (p->exit_state == EXIT_ZOMBIE && p->exit_signal != -1 && -+ thread_group_empty(p)) ++ if (p->exit_state == EXIT_ZOMBIE && + p->exit_signal != -1 && thread_group_empty(p)) do_notify_parent(p, p->exit_signal); - /* @@ -662,7 +640,7 @@ reparent_thread(struct task_struct *p, s * space. */ Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.521 retrieving revision 1.522 diff -u -r1.521 -r1.522 --- sources 31 Dec 2006 19:42:34 -0000 1.521 +++ sources 2 Jan 2007 04:31:26 -0000 1.522 @@ -1,4 +1,3 @@ 93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 -4faf72e4e70867a85dae6db27f98a78f patch-2.6.20-rc2.bz2 -ede86a62f467f2ece6f792429f4858a4 patch-2.6.20-rc2-git2.bz2 +69e8bfe3fbba5931833e7f6da51f6186 patch-2.6.20-rc3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.449 retrieving revision 1.450 diff -u -r1.449 -r1.450 --- upstream 31 Dec 2006 19:42:34 -0000 1.449 +++ upstream 2 Jan 2007 04:31:26 -0000 1.450 @@ -1,3 +1,2 @@ linux-2.6.19.tar.bz2 -patch-2.6.20-rc2.bz2 -patch-2.6.20-rc2-git2.bz2 +patch-2.6.20-rc3.bz2 --- patch-2.6.20-rc2-git2.bz2.sign DELETED --- --- patch-2.6.20-rc2.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 2 07:39:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 02:39:26 -0500 Subject: rpms/kernel/devel linux-2.6-utrace.patch,1.48,1.49 Message-ID: <200701020739.l027dQHB003499@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3483 Modified Files: linux-2.6-utrace.patch Log Message: utrace rebase linux-2.6-utrace.patch: Documentation/utrace.txt | 579 +++++++++++ arch/alpha/kernel/asm-offsets.c | 2 arch/alpha/kernel/entry.S | 4 arch/arm/kernel/ptrace.c | 36 arch/arm26/kernel/ptrace.c | 32 arch/frv/kernel/ptrace.c | 15 arch/i386/kernel/entry.S | 7 arch/i386/kernel/i387.c | 143 +- arch/i386/kernel/process.c | 3 arch/i386/kernel/ptrace.c | 863 +++++++++------- arch/i386/kernel/signal.c | 37 arch/i386/kernel/vm86.c | 7 arch/ia64/ia32/ia32_entry.S | 2 arch/ia64/ia32/sys_ia32.c | 537 ++++++++++ arch/ia64/kernel/asm-offsets.c | 2 arch/ia64/kernel/fsys.S | 16 arch/ia64/kernel/mca.c | 2 arch/ia64/kernel/ptrace.c | 1680 ++++++++++++++++---------------- arch/ia64/kernel/signal.c | 4 arch/mips/kernel/ptrace.c | 21 arch/mips/kernel/sysirix.c | 2 arch/powerpc/kernel/Makefile | 4 arch/powerpc/kernel/asm-offsets.c | 2 arch/powerpc/kernel/process.c | 5 arch/powerpc/kernel/ptrace-common.h | 161 --- arch/powerpc/kernel/ptrace.c | 959 +++++++++++------- arch/powerpc/kernel/ptrace32.c | 436 -------- arch/powerpc/kernel/signal_32.c | 55 + arch/powerpc/kernel/signal_64.c | 3 arch/powerpc/kernel/sys_ppc32.c | 5 arch/powerpc/lib/sstep.c | 3 arch/ppc/kernel/asm-offsets.c | 2 arch/s390/kernel/Makefile | 2 arch/s390/kernel/compat_linux.c | 3 arch/s390/kernel/compat_signal.c | 5 arch/s390/kernel/process.c | 3 arch/s390/kernel/ptrace.c | 1073 +++++++++----------- arch/s390/kernel/signal.c | 3 arch/s390/kernel/traps.c | 6 arch/sparc64/kernel/Makefile | 2 arch/sparc64/kernel/binfmt_aout32.c | 2 arch/sparc64/kernel/entry.S | 6 arch/sparc64/kernel/process.c | 3 arch/sparc64/kernel/ptrace.c | 1224 ++++++++++++----------- arch/sparc64/kernel/signal.c | 2 arch/sparc64/kernel/signal32.c | 2 arch/sparc64/kernel/sys_sparc32.c | 3 arch/sparc64/kernel/systbls.S | 4 arch/x86_64/ia32/fpu32.c | 92 + arch/x86_64/ia32/ia32_aout.c | 6 arch/x86_64/ia32/ia32_signal.c | 7 arch/x86_64/ia32/ia32entry.S | 2 arch/x86_64/ia32/ptrace32.c | 723 +++++++++---- arch/x86_64/ia32/sys_ia32.c | 5 arch/x86_64/kernel/process.c | 5 arch/x86_64/kernel/ptrace.c | 657 +++++++----- arch/x86_64/kernel/signal.c | 28 arch/x86_64/kernel/traps.c | 8 arch/x86_64/mm/fault.c | 4 drivers/connector/cn_proc.c | 4 fs/binfmt_aout.c | 6 fs/binfmt_elf.c | 6 fs/binfmt_elf_fdpic.c | 7 fs/binfmt_flat.c | 3 fs/binfmt_som.c | 2 fs/exec.c | 11 fs/proc/array.c | 12 fs/proc/base.c | 17 include/asm-i386/i387.h | 13 include/asm-i386/signal.h | 4 include/asm-i386/thread_info.h | 7 include/asm-i386/tracehook.h | 49 include/asm-ia64/elf.h | 24 include/asm-ia64/tracehook.h | 83 + include/asm-powerpc/tracehook.h | 80 + include/asm-s390/tracehook.h | 53 + include/asm-sparc64/tracehook.h | 44 include/asm-x86_64/fpu32.h | 3 include/asm-x86_64/thread_info.h | 3 include/asm-x86_64/tracehook.h | 54 + include/linux/init_task.h | 3 include/linux/ptrace.h | 224 +++- include/linux/sched.h | 25 include/linux/tracehook.h | 707 +++++++++++++ include/linux/utrace.h | 504 +++++++++ init/Kconfig | 29 kernel/Makefile | 1 kernel/exit.c | 238 +--- kernel/fork.c | 62 - kernel/ptrace.c | 1767 ++++++++++++++++++++++++++++------ kernel/signal.c | 211 ---- kernel/sys.c | 2 kernel/timer.c | 6 kernel/tsacct.c | 2 kernel/utrace.c | 1861 ++++++++++++++++++++++++++++++++++++ security/selinux/hooks.c | 54 - security/selinux/include/objsec.h | 1 97 files changed, 10641 insertions(+), 5050 deletions(-) Index: linux-2.6-utrace.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- linux-2.6-utrace.patch 2 Jan 2007 04:31:26 -0000 1.48 +++ linux-2.6-utrace.patch 2 Jan 2007 07:39:24 -0000 1.49 @@ -86,7 +86,7 @@ include/linux/utrace.h | 504 +++++++++ init/Kconfig | 29 + kernel/Makefile | 1 - kernel/exit.c | 244 +---- + kernel/exit.c | 238 +--- kernel/fork.c | 62 - kernel/ptrace.c | 1767 +++++++++++++++++++++++++++------ kernel/signal.c | 211 +--- @@ -96,7 +96,7 @@ kernel/utrace.c | 1861 +++++++++++++++++++++++++++++++++++ security/selinux/hooks.c | 54 + security/selinux/include/objsec.h | 1 - 98 files changed, 10644 insertions(+), 5053 deletions(-) + 98 files changed, 10641 insertions(+), 5050 deletions(-) create mode 100644 Documentation/utrace.txt delete arch/powerpc/kernel/ptrace-common.h delete arch/powerpc/kernel/ptrace32.c @@ -5299,7 +5299,7 @@ add_parent(current); /* Set the exit signal to SIGCHLD so we signal init on exit */ -@@ -591,11 +590,11 @@ choose_new_parent(struct task_struct *p, +@@ -591,45 +590,23 @@ choose_new_parent(struct task_struct *p, * the parent is not a zombie. */ BUG_ON(p == reaper || reaper->exit_state); @@ -5311,9 +5311,8 @@ -reparent_thread(struct task_struct *p, struct task_struct *father, int traced) +reparent_thread(struct task_struct *p, struct task_struct *father) { - /* We don't want people slaying init. */ - if (p->exit_signal != -1) -@@ -601,35 +601,7 @@ reparent_thread(struct task_struct *p, s + if (p->pdeath_signal) + /* We already hold the tasklist_lock here. */ group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); /* Move the child from its dying parent to the new one. */ @@ -5340,26 +5339,27 @@ - ptrace_untrace(p); - } - } -- -- /* If this is a threaded reparent there is no need to -- * notify anyone anything has happened. -- */ -- if (p->real_parent->group_leader == father->group_leader) -- return; + list_move_tail(&p->sibling, &p->parent->children); + /* If this is a threaded reparent there is no need to + * notify anyone anything has happened. + */ +- if (p->real_parent->group_leader == father->group_leader) ++ if (p->parent->group_leader == father->group_leader) + return; + /* We don't want people slaying init. */ - if (p->exit_signal != -1) -@@ -638,7 +610,7 @@ reparent_thread(struct task_struct *p, s +@@ -639,7 +616,8 @@ reparent_thread(struct task_struct *p, s /* If we'd notified the old parent about this child's death, * also notify the new parent. */ - if (!traced && p->exit_state == EXIT_ZOMBIE && -+ if (p->exit_state == EXIT_ZOMBIE && ++ if (!tracehook_inhibit_wait_zombie(p) && ++ p->exit_state == EXIT_ZOMBIE && p->exit_signal != -1 && thread_group_empty(p)) do_notify_parent(p, p->exit_signal); -@@ -662,7 +640,7 @@ reparent_thread(struct task_struct *p, s +@@ -669,7 +647,7 @@ reparent_thread(struct task_struct *p, s * space. */ static void @@ -5368,7 +5368,7 @@ { struct task_struct *p, *reaper = father; struct list_head *_p, *_n; -@@ -675,48 +653,10 @@ forget_original_parent(struct task_struc +@@ -682,48 +660,10 @@ forget_original_parent(struct task_struc } } while (reaper->exit_state); @@ -5418,7 +5418,7 @@ } } -@@ -728,7 +668,8 @@ static void exit_notify(struct task_stru +@@ -735,7 +675,8 @@ static void exit_notify(struct task_stru { int state; struct task_struct *t; @@ -5428,7 +5428,7 @@ if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT) && !thread_group_empty(tsk)) { -@@ -764,10 +705,8 @@ static void exit_notify(struct task_stru +@@ -771,10 +712,8 @@ static void exit_notify(struct task_stru * jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ @@ -5440,7 +5440,7 @@ /* * Check to see if any process groups have become orphaned -@@ -779,7 +718,7 @@ static void exit_notify(struct task_stru +@@ -786,7 +725,7 @@ static void exit_notify(struct task_stru * is about to become orphaned. */ @@ -5449,7 +5449,7 @@ if ((process_group(t) != process_group(tsk)) && (process_session(t) == process_session(tsk)) && -@@ -811,32 +750,18 @@ static void exit_notify(struct task_stru +@@ -818,32 +757,18 @@ static void exit_notify(struct task_stru && !capable(CAP_KILL)) tsk->exit_signal = SIGCHLD; @@ -5487,7 +5487,7 @@ /* If the process is dead, release it - nobody will wait for it */ if (state == EXIT_DEAD) -@@ -864,10 +789,7 @@ fastcall NORET_TYPE void do_exit(long co +@@ -871,10 +796,7 @@ fastcall NORET_TYPE void do_exit(long co } @@ -5499,7 +5499,7 @@ /* * We're taking recursive faults here in do_exit. Safest is to just -@@ -884,6 +806,8 @@ fastcall NORET_TYPE void do_exit(long co +@@ -891,6 +813,8 @@ fastcall NORET_TYPE void do_exit(long co tsk->flags |= PF_EXITING; @@ -5508,7 +5508,7 @@ if (unlikely(in_atomic())) printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", current->comm, current->pid, -@@ -1037,10 +961,9 @@ static int eligible_child(pid_t pid, int +@@ -1044,10 +968,9 @@ static int eligible_child(pid_t pid, int } /* @@ -5521,7 +5521,7 @@ return 0; /* Wait for all children (clone and not) if __WALL is set; -@@ -1111,7 +1034,7 @@ static int wait_task_zombie(struct task_ +@@ -1118,7 +1041,7 @@ static int wait_task_zombie(struct task_ if (unlikely(p->exit_state != EXIT_ZOMBIE)) return 0; @@ -5530,7 +5530,7 @@ return 0; get_task_struct(p); read_unlock(&tasklist_lock); -@@ -1135,15 +1058,9 @@ static int wait_task_zombie(struct task_ +@@ -1142,15 +1065,9 @@ static int wait_task_zombie(struct task_ BUG_ON(state != EXIT_DEAD); return 0; } @@ -5548,7 +5548,7 @@ struct signal_struct *psig; struct signal_struct *sig; -@@ -1225,28 +1142,8 @@ static int wait_task_zombie(struct task_ +@@ -1232,28 +1149,8 @@ static int wait_task_zombie(struct task_ return retval; } retval = p->pid; @@ -5579,7 +5579,7 @@ BUG_ON(!retval); return retval; } -@@ -1265,7 +1162,7 @@ static int wait_task_stopped(struct task +@@ -1272,7 +1169,7 @@ static int wait_task_stopped(struct task if (!p->exit_code) return 0; @@ -5588,7 +5588,7 @@ p->signal && p->signal->group_stop_count > 0) /* * A group stop is in progress and this is the group leader. -@@ -1286,14 +1183,13 @@ static int wait_task_stopped(struct task +@@ -1293,14 +1190,13 @@ static int wait_task_stopped(struct task if (unlikely(noreap)) { pid_t pid = p->pid; uid_t uid = p->uid; @@ -5605,7 +5605,7 @@ infop, ru); } -@@ -1349,9 +1245,7 @@ bail_ref: +@@ -1356,9 +1252,7 @@ bail_ref: if (!retval && infop) retval = put_user(0, &infop->si_errno); if (!retval && infop) @@ -5616,7 +5616,7 @@ if (!retval && infop) retval = put_user(exit_code, &infop->si_status); if (!retval && infop) -@@ -1419,22 +1313,6 @@ static int wait_task_continued(struct ta +@@ -1426,22 +1320,6 @@ static int wait_task_continued(struct ta } @@ -5639,7 +5639,7 @@ static long do_wait(pid_t pid, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { -@@ -1466,26 +1344,17 @@ repeat: +@@ -1473,26 +1351,17 @@ repeat: switch (p->state) { case TASK_TRACED: @@ -5670,7 +5670,7 @@ continue; retval = wait_task_stopped(p, ret == 2, (options & WNOWAIT), -@@ -1510,6 +1379,10 @@ repeat: +@@ -1517,6 +1386,10 @@ repeat: goto check_continued; if (!likely(options & WEXITED)) continue; @@ -5681,7 +5681,7 @@ retval = wait_task_zombie( p, (options & WNOWAIT), infop, stat_addr, ru); -@@ -1526,6 +1399,8 @@ check_continued: +@@ -1533,6 +1406,8 @@ check_continued: flag = 1; if (!unlikely(options & WCONTINUED)) continue; @@ -5690,7 +5690,7 @@ retval = wait_task_continued( p, (options & WNOWAIT), infop, stat_addr, ru); -@@ -1534,16 +1409,15 @@ check_continued: +@@ -1541,16 +1416,15 @@ check_continued: break; } } @@ -5715,7 +5715,7 @@ if (options & __WNOTHREAD) break; tsk = next_thread(tsk); -@@ -1567,7 +1441,7 @@ end: +@@ -1574,7 +1448,7 @@ end: remove_wait_queue(¤t->signal->wait_chldexit,&wait); if (infop) { if (retval > 0) @@ -8256,7 +8256,7 @@ current->thread.error_code = error_code; --- linux-2.6/arch/i386/kernel/process.c.utrace-ptrace-compat +++ linux-2.6/arch/i386/kernel/process.c -@@ -745,9 +745,6 @@ asmlinkage int sys_execve(struct pt_regs +@@ -750,9 +750,6 @@ asmlinkage int sys_execve(struct pt_regs (char __user * __user *) regs.edx, ®s); if (error == 0) { @@ -8324,7 +8324,7 @@ case DS: case ES: case GS: -@@ -136,9 +136,11 @@ static unsigned long getreg(struct task_ +@@ -135,9 +136,11 @@ static unsigned long getreg(struct task_ retval = 0xffff; /* fall through */ default: @@ -8336,7 +8336,7 @@ } return retval; } -@@ -216,7 +219,7 @@ static inline int is_setting_trap_flag(s +@@ -215,7 +218,7 @@ static inline int is_setting_trap_flag(s return 0; } @@ -8345,7 +8345,7 @@ { struct pt_regs *regs = get_child_regs(child); -@@ -230,11 +233,11 @@ static void set_singlestep(struct task_s +@@ -229,11 +232,11 @@ static void set_singlestep(struct task_s /* * If TF was already set, don't do anything else */ @@ -8359,7 +8359,7 @@ /* * ..but if TF is changed by the instruction we will trace, -@@ -244,43 +247,323 @@ static void set_singlestep(struct task_s +@@ -243,43 +246,323 @@ static void set_singlestep(struct task_s if (is_setting_trap_flag(child, regs)) return; @@ -8701,7 +8701,7 @@ /* * Get the current Thread-Local Storage area: -@@ -302,23 +585,29 @@ ptrace_get_thread_area(struct task_struc +@@ -301,23 +584,29 @@ ptrace_get_thread_area(struct task_struc #define GET_PRESENT(desc) (((desc)->b >> 15) & 1) #define GET_USEABLE(desc) (((desc)->b >> 20) & 1) @@ -8748,7 +8748,7 @@ return 0; } -@@ -327,308 +616,154 @@ ptrace_get_thread_area(struct task_struc +@@ -326,308 +615,154 @@ ptrace_get_thread_area(struct task_struc * Perform set_thread_area on behalf of the traced child. */ static int @@ -9186,7 +9186,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code) { -@@ -652,78 +787,24 @@ void send_sigtrap(struct task_struct *ts +@@ -651,78 +786,24 @@ void send_sigtrap(struct task_struct *ts * - triggered by current->work.syscall_trace */ __attribute__((regparm(3))) @@ -16630,7 +16630,7 @@ return ret; --- linux-2.6/arch/x86_64/kernel/process.c.utrace-ptrace-compat +++ linux-2.6/arch/x86_64/kernel/process.c -@@ -679,11 +679,6 @@ long sys_execve(char __user *name, char +@@ -683,11 +683,6 @@ long sys_execve(char __user *name, char if (IS_ERR(filename)) return error; error = do_execve(filename, argv, envp, ®s); From fedora-cvs-commits at redhat.com Tue Jan 2 09:35:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 04:35:42 -0500 Subject: rpms/m17n-db/devel .cvsignore, 1.53, 1.54 m17n-db.spec, 1.63, 1.64 sources, 1.55, 1.56 Message-ID: <200701020935.l029ZgOf012773@cvs.devel.redhat.com> Author: majain Update of /cvs/dist/rpms/m17n-db/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12752 Modified Files: .cvsignore m17n-db.spec sources Log Message: Resolves: Bug 221122: [hi_IN-remington] vowels in hi-remington are not typed correctly Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 7 Dec 2006 07:34:22 -0000 1.53 +++ .cvsignore 2 Jan 2007 09:35:40 -0000 1.54 @@ -12,3 +12,4 @@ m17n-db-indic-0.4.38.tar.gz m17n-db-indic-0.4.39.tar.gz m17n-db-indic-0.4.40.tar.gz +m17n-db-indic-0.4.41.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- m17n-db.spec 7 Dec 2006 07:34:22 -0000 1.63 +++ m17n-db.spec 2 Jan 2007 09:35:40 -0000 1.64 @@ -1,9 +1,9 @@ -%define indic_ver 0.4.40 +%define indic_ver 0.4.41 Name: m17n-db Summary: Multilingualization datafiles for m17n-lib Version: 1.3.3 -Release: 43%{?dist} +Release: 44%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html @@ -699,6 +699,9 @@ %changelog +* Tue Jan 2 2007 Mayank Jain +- Resolves: Bug 221122: [hi_IN-remington] vowels in hi-remington are not typed correctly + * Thu Dec 7 2006 Mayank Jain - Resolves: bug 218255 - Fixed ta-typewriter keymap. Index: sources =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 7 Dec 2006 07:34:22 -0000 1.55 +++ sources 2 Jan 2007 09:35:40 -0000 1.56 @@ -1,2 +1,2 @@ a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz -e7f6686362a0c6d5e630bfab7cc18e9d m17n-db-indic-0.4.40.tar.gz +0ca75078a8b01375d03b85a2749545ae m17n-db-indic-0.4.41.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 2 09:54:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 04:54:47 -0500 Subject: rpms/m17n-db/FC-6 .cvsignore, 1.49, 1.50 m17n-db.spec, 1.59, 1.60 sources, 1.51, 1.52 Message-ID: <200701020954.l029sld7000994@cvs.devel.redhat.com> Author: majain Update of /cvs/dist/rpms/m17n-db/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv978 Modified Files: .cvsignore m17n-db.spec sources Log Message: Resolves: Bug 221122 Processed: [hi_IN-remington] vowels in hi-remington are not typed correctly Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/m17n-db/FC-6/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 7 Dec 2006 07:36:33 -0000 1.49 +++ .cvsignore 2 Jan 2007 09:54:45 -0000 1.50 @@ -23,3 +23,4 @@ m17n-db-1.3.3.tar.gz m17n-db-indic-0.4.39.tar.gz m17n-db-indic-0.4.40.tar.gz +m17n-db-indic-0.4.41.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/dist/rpms/m17n-db/FC-6/m17n-db.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- m17n-db.spec 7 Dec 2006 07:36:33 -0000 1.59 +++ m17n-db.spec 2 Jan 2007 09:54:45 -0000 1.60 @@ -1,9 +1,9 @@ -%define indic_ver 0.4.40 +%define indic_ver 0.4.41 Name: m17n-db Summary: Multilingualization datafiles for m17n-lib Version: 1.3.3 -Release: 41%{?dist} +Release: 42%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html @@ -699,6 +699,9 @@ %changelog +* Tue Jan 2 2007 Mayank Jain +- Resolves: Bug 221122 Processed: [hi_IN-remington] vowels in hi-remington are not typed correctly + * Thu Dec 7 2006 Mayank Jain - Resolves: bug 218255 - Fixed ta-typewriter keymap. Index: sources =================================================================== RCS file: /cvs/dist/rpms/m17n-db/FC-6/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 7 Dec 2006 07:36:33 -0000 1.51 +++ sources 2 Jan 2007 09:54:45 -0000 1.52 @@ -1,2 +1,2 @@ a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz -e7f6686362a0c6d5e630bfab7cc18e9d m17n-db-indic-0.4.40.tar.gz +0ca75078a8b01375d03b85a2749545ae m17n-db-indic-0.4.41.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 2 10:25:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 05:25:37 -0500 Subject: rpms/fbset/devel fbset-2.1-manfix.patch, NONE, 1.1 fbset.spec, 1.19, 1.20 Message-ID: <200701021025.l02APbwD022095@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/fbset/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22074 Modified Files: fbset.spec Added Files: fbset-2.1-manfix.patch Log Message: fix man page and URLs fbset-2.1-manfix.patch: fbset.8 | 1 - 1 files changed, 1 deletion(-) --- NEW FILE fbset-2.1-manfix.patch --- --- fbset-2.1/fbset.8~ 2007-01-02 10:20:56.000000000 +0000 +++ fbset-2.1/fbset.8 2007-01-02 10:21:36.000000000 +0000 @@ -73,7 +73,6 @@ gives the frame buffer device node. If n is given, .I /dev/fb0 is used -.TP .RE .PP Video mode database: Index: fbset.spec =================================================================== RCS file: /cvs/dist/rpms/fbset/devel/fbset.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fbset.spec 12 Jul 2006 21:32:20 -0000 1.19 +++ fbset.spec 2 Jan 2007 10:25:35 -0000 1.20 @@ -1,14 +1,15 @@ Summary: Tools for managing a frame buffer's video mode properties. Name: fbset Version: 2.1 -Release: 22 +Release: 23 License: GPL Group: Applications/System -URL: http://home.tvd.be/cr26864/Linux/fbdev/ -Source: http://home.tvd.be/cr26864/Linux/fbdev/fbset-2.1.tar.gz +URL: http://users.telenet.be/geertu/Linux/fbdev/ +Source: http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz BuildRequires: bison flex Patch0: fbset-2.1-makefile.patch Patch1: fbset-2.1-fixmode.patch +Patch2: fbset-2.1-manfix.patch BuildRoot: %{_tmppath}/%{name}-root ExcludeArch: s390 s390x @@ -23,6 +24,7 @@ %setup -q %patch0 -p1 -b .makefile %patch1 -p1 -b .fixmode +%patch2 -p1 -b .man %build make CFLAGS="$RPM_OPT_FLAGS" @@ -42,6 +44,9 @@ %config %{_sysconfdir}/fb.modes %changelog +* Thu Jan 2 2007 David Woodhouse - 2.1-23 +- Fix man page syntax error + * Wed Jul 12 2006 Jesse Keating - 2.1-22 - rebuild - Add missing br flex From fedora-cvs-commits at redhat.com Tue Jan 2 10:59:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 05:59:11 -0500 Subject: rpms/psacct/devel psacct-6.3.2-lastcomm_man.patch, NONE, 1.1 psacct.spec, 1.24, 1.25 Message-ID: <200701021059.l02AxB0w012076@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/psacct/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11871 Modified Files: psacct.spec Added Files: psacct-6.3.2-lastcomm_man.patch Log Message: - Resolves: 221069 (fix lastcomm man page) - spec file cleanup psacct-6.3.2-lastcomm_man.patch: lastcomm.1 | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE psacct-6.3.2-lastcomm_man.patch --- --- acct-6.3.2/lastcomm.1.pom 1997-09-30 01:41:53.000000000 +0200 +++ acct-6.3.2/lastcomm.1 2007-01-02 09:45:19.000000000 +0100 @@ -99,7 +99,7 @@ D -- command terminated with the generation of a core file X -- command was terminated with the signal SIGTERM + the name of the user who ran the process - + time the process exited + + time the process started .SH OPTIONS \. .PD 0 .TP Index: psacct.spec =================================================================== RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- psacct.spec 12 Jul 2006 07:53:30 -0000 1.24 +++ psacct.spec 2 Jan 2007 10:59:08 -0000 1.25 @@ -1,18 +1,18 @@ # Our /usr/bin/last is in the SysVInit packae -%define with_last 0 +%define with_last 0 %define FHS_compliant 1 %if %{FHS_compliant} -%define accounting_logdir /var/account +%define accounting_logdir /var/account %else -%define accounting_logdir /var/log +%define accounting_logdir /var/log %endif -Summary: Utilities for monitoring process activities. +Summary: Utilities for monitoring process activities Name: psacct Version: 6.3.2 -Release: 41.1 +Release: 42%{?dist} License: GPL Group: Applications/System Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz @@ -28,9 +28,10 @@ Patch5: psacct-6.3.2-strictmatch.patch Patch6: psacct-6.3.2-sa-manfix.patch Patch7: psacct-6.3.2-LargeFile.patch +Patch8: psacct-6.3.2-lastcomm_man.patch Buildroot: %{_tmppath}/%{name}-%{version}-root -Prereq: /sbin/install-info, /sbin/chkconfig, /bin/touch +Prereq: /sbin/chkconfig /sbin/install-info BuildRequires: autoconf # This conflict is to avoid psacct being forced on by old initscripts now that @@ -59,6 +60,7 @@ %patch5 -p1 -b .strictmatch %patch6 -p1 -b .tio-avio %patch7 -p1 -b .lfs +%patch8 -p1 -b .man %build %if ! %{FHS_compliant} @@ -101,7 +103,7 @@ rotate 31 create 0600 root root postrotate - %{_sbindir}/accton %{accounting_logdir}/pacct + %{_sbindir}/accton %{accounting_logdir}/pacct endscript } EOF @@ -142,8 +144,8 @@ %dir /var/account %endif /etc/rc.d/init.d/psacct -%attr(0600,root,root) %ghost %config %{accounting_logdir}/pacct -%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/* +%attr(0600,root,root) %ghost %config %{accounting_logdir}/pacct +%attr(0644,root,root) %config(noreplace) /etc/logrotate.d/* /sbin/accton %{_sbindir}/accton %{_sbindir}/sa @@ -164,6 +166,11 @@ %{_infodir}/accounting.info.gz %changelog +* Tue Jan 2 2007 Ivana Varekova - 6.3.2-42 +- Resolves: 221069 + (fix lastcomm man page) +- spec file cleanup + * Wed Jul 12 2006 Jesse Keating - 6.3.2-41.1 - rebuild From fedora-cvs-commits at redhat.com Tue Jan 2 12:31:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 07:31:18 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch, 1.6, 1.7 Message-ID: <200701021231.l02CVIkU009861@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9805 Modified Files: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch Log Message: Resolves: rhbz#221091 finnish .desktop translations openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch: desktop/menus/base.desktop | 0 desktop/menus/calc.desktop | 0 desktop/menus/impress.desktop | 0 desktop/menus/writer.desktop | 0 sysui/desktop/menus/base.desktop | 4 +++- sysui/desktop/menus/calc.desktop | 25 ++++++++++++++++++++++++- sysui/desktop/menus/impress.desktop | 6 +++++- sysui/desktop/menus/writer.desktop | 6 +++++- 8 files changed, 37 insertions(+), 4 deletions(-) Index: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch 10 Nov 2006 17:49:29 -0000 1.6 +++ openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch 2 Jan 2007 12:31:15 -0000 1.7 @@ -5,13 +5,14 @@ diff -u -p -u -r1.6 base.desktop --- openoffice.org.orig/sysui/desktop/menus/base.desktop 13 May 2005 09:27:14 -0000 1.6 +++ openoffice.org/sysui/desktop/menus/base.desktop 26 Jul 2005 12:53:41 -0000 -@@ -8,5 +8,6 @@ InitialPreference=2 +@@ -8,5 +8,7 @@ InitialPreference=2 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office; Exec=openoffice -base %U MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base -Name=%PRODUCTNAME Base +Name=Database Development +Name[de]=Datenbank-Entwicklung ++Name[fi]=Tietokantakehitys Comment=Manage databases, create queries and reports to track and manage your information by using Base. Index: desktop/menus/calc.desktop =================================================================== @@ -57,7 +58,7 @@ diff -u -p -u -r1.8 impress.desktop --- openoffice.org.orig/sysui/desktop/menus/impress.desktop 20 Apr 2005 11:35:17 -0000 1.8 +++ openoffice.org/sysui/desktop/menus/impress.desktop 26 Jul 2005 12:53:41 -0000 -@@ -8,5 +8,8 @@ InitialPreference=2 +@@ -8,5 +8,9 @@ InitialPreference=2 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office; Exec=openoffice -impress %U MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint @@ -66,6 +67,7 @@ +Name[de]=Pr??sentationen +Name[pt]=Apresenta????o +Name[pt_BR]=Apresenta????o ++Name[fi]=Esitys Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress. Index: desktop/menus/writer.desktop =================================================================== @@ -74,7 +76,7 @@ diff -u -p -u -r1.9 writer.desktop --- openoffice.org.orig/sysui/desktop/menus/writer.desktop 20 Apr 2005 11:35:35 -0000 1.9 +++ openoffice.org/sysui/desktop/menus/writer.desktop 26 Jul 2005 12:53:41 -0000 -@@ -8,5 +8,8 @@ InitialPreference=2 +@@ -8,5 +8,9 @@ InitialPreference=2 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office; Exec=openoffice -writer %U MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect @@ -83,4 +85,5 @@ +Name[de]=Textverarbeitung +Name[pt]=Processador de Textos +Name[pt_BR]=Processador de Textos ++Name[fi]=Tekstink??sittely Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. From fedora-cvs-commits at redhat.com Tue Jan 2 12:58:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 07:58:49 -0500 Subject: rpms/hwdata/devel .cvsignore, 1.77, 1.78 hwdata.spec, 1.79, 1.80 sources, 1.80, 1.81 Message-ID: <200701021258.l02CwnhN018802@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/hwdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18740/devel Modified Files: .cvsignore hwdata.spec sources Log Message: auto-import hwdata-0.193-1 on branch devel from hwdata-0.193-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- .cvsignore 6 Dec 2006 09:45:58 -0000 1.77 +++ .cvsignore 2 Jan 2007 12:58:47 -0000 1.78 @@ -1 +1 @@ -hwdata-0.192.tar.gz +hwdata-0.193.tar.gz Index: hwdata.spec =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- hwdata.spec 6 Dec 2006 09:45:58 -0000 1.79 +++ hwdata.spec 2 Jan 2007 12:58:47 -0000 1.80 @@ -1,6 +1,6 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.192 +Version: 0.193 Release: 1 License: GPL/MIT Group: System Environment/Base @@ -33,10 +33,10 @@ %config /usr/share/hwdata/* %changelog -* Wed Dec 06 2006 Karsten Hopp 0.192-1 -- update pci.ids -- update usb.ids -- add some Samsung monitors (Till Maas, #204459) +* Tue Jan 02 2007 Karsten Hopp 0.193-1 +- Update to latest pci.ids/usb.ids for RHEL5 +- Resolves: #220182 + Add some Dell monitors to MonitorDB * Mon Oct 09 2006 Phil Knirsch - 0.191-1 - Update to latest pci.ids for RHEL5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 6 Dec 2006 09:45:58 -0000 1.80 +++ sources 2 Jan 2007 12:58:47 -0000 1.81 @@ -1 +1 @@ -e7fc51c350e19f1d0c19596950de70a9 hwdata-0.192.tar.gz +dc2be7f514f88a85dcbdaf82d1d1e21d hwdata-0.193.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 2 13:15:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 08:15:41 -0500 Subject: rpms/coreutils/devel coreutils-5.2.1-runuser.patch, 1.13, 1.14 coreutils.spec, 1.152, 1.153 Message-ID: <200701021315.l02DFfC2031789@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31702 Modified Files: coreutils-5.2.1-runuser.patch coreutils.spec Log Message: * Tue Jan 2 2007 Tim Waugh - Prevent 'su --help' showing runuser-only options such as --group. coreutils-5.2.1-runuser.patch: AUTHORS | 1 README | 2 man/Makefile.am | 3 - man/runuser.1 | 68 +++++++++++++++++++++++++++++++ man/runuser.x | 4 + src/Makefile.am | 8 ++- src/su.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++----- tests/help-version | 1 8 files changed, 190 insertions(+), 13 deletions(-) Index: coreutils-5.2.1-runuser.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- coreutils-5.2.1-runuser.patch 11 Sep 2006 16:16:03 -0000 1.13 +++ coreutils-5.2.1-runuser.patch 2 Jan 2007 13:15:38 -0000 1.14 @@ -135,16 +135,7 @@ pam_end(pamh, 0); if (!same_session) setsid (); -@@ -647,6 +692,8 @@ - Change the effective user id and group id to that of USER.\n\ - \n\ - -, -l, --login make the shell a login shell\n\ -+ -g --group=group specify the primary group\n\ -+ -G --supp-group=group specify a supplemental group\n\ - -c, --commmand=COMMAND pass a single COMMAND to the shell with -c\n\ - --session-command=COMMAND pass a single COMMAND to the shell with -c\n\ - and do not create a new session\n\ -@@ -676,6 +723,12 @@ +@@ -676,6 +721,12 @@ char *shell = NULL; struct passwd *pw; struct passwd pw_copy; @@ -157,7 +148,7 @@ initialize_main (&argc, &argv); program_name = argv[0]; -@@ -690,7 +743,11 @@ +@@ -690,7 +741,11 @@ simulate_login = false; change_environment = true; @@ -170,7 +161,7 @@ { switch (optc) { -@@ -720,6 +777,28 @@ +@@ -720,6 +775,28 @@ shell = optarg; break; @@ -199,7 +190,7 @@ case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); -@@ -758,7 +837,20 @@ +@@ -758,7 +835,20 @@ : DEFAULT_SHELL); endpwent (); @@ -221,7 +212,7 @@ { #ifdef SYSLOG_FAILURE log_su (pw, false); -@@ -790,8 +882,16 @@ +@@ -790,8 +880,16 @@ modify_environment (pw, shell); #ifndef USE_PAM Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- coreutils.spec 24 Nov 2006 18:35:26 -0000 1.152 +++ coreutils.spec 2 Jan 2007 13:15:38 -0000 1.153 @@ -285,6 +285,9 @@ /sbin/runuser %changelog +* Tue Jan 2 2007 Tim Waugh +- Prevent 'su --help' showing runuser-only options such as --group. + * Fri Nov 24 2006 Tim Waugh 5.97-16 - Unbreak id (bug #217177). From fedora-cvs-commits at redhat.com Tue Jan 2 14:29:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 09:29:04 -0500 Subject: rpms/aspell/devel aspell-0.60.5-fileconflict.patch, NONE, 1.1 aspell-0.60.5-pspell_conf.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 aspell.spec, 1.34, 1.35 sources, 1.10, 1.11 aspell-0.60.3-gcc41.patch, 1.1, NONE aspell-0.60.3-pspell_conf.patch, 1.1, NONE aspell-0.60.4-fileconflict.patch, 1.1, NONE Message-ID: <200701021429.l02ET4cr003695@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3660 Modified Files: .cvsignore aspell.spec sources Added Files: aspell-0.60.5-fileconflict.patch aspell-0.60.5-pspell_conf.patch Removed Files: aspell-0.60.3-gcc41.patch aspell-0.60.3-pspell_conf.patch aspell-0.60.4-fileconflict.patch Log Message: - update to 0.60.4 - cleanup spec file aspell-0.60.5-fileconflict.patch: Makefile.in | 3 ++- configure | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) --- NEW FILE aspell-0.60.5-fileconflict.patch --- --- aspell-0.60.5/Makefile.in.fc 2006-12-19 12:03:37.000000000 +0100 +++ aspell-0.60.5/Makefile.in 2007-01-02 13:32:03.000000000 +0100 @@ -341,6 +341,7 @@ # These are needed due to a bug in Automake pkgdatadir = @pkgdatadir@ +pkgdatadir2 = @pkgdatadir2@ pkglibdir = @pkglibdir@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -1907,7 +1908,7 @@ cd gen; perl mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > dirs.h scripts/run-with-aspell: scripts/run-with-aspell.create - sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell + sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell chmod 755 scripts/run-with-aspell @PSPELL_COMPATIBILITY_TRUE at scripts/pspell-config: scripts/mkconfig @PSPELL_COMPATIBILITY_TRUE@ sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir} --- aspell-0.60.5/configure.fc 2006-12-19 12:03:38.000000000 +0100 +++ aspell-0.60.5/configure 2007-01-02 13:33:16.000000000 +0100 @@ -844,6 +844,7 @@ MAINT pkgdocdir pkgdatadir +pkgdatadir2 pkglibdir CXX CXXFLAGS @@ -2638,23 +2639,25 @@ # Check whether --enable-pkgdatadir was given. if test "${enable_pkgdatadir+set}" = set; then enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir + pkgdatadir2=$enable_pkgdatadir fi # Check whether --enable-pkgdata-dir was given. if test "${enable_pkgdata_dir+set}" = set; then enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir + pkgdatadir2=$enable_dict_dir fi if test "$pkgdatadir" = "undef" then pkgdatadir=\${libdir}/aspell-0.60 + pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60 fi - pkglibdir=undef # Check whether --enable-pkglibdir was given. if test "${enable_pkglibdir+set}" = set; then @@ -24186,6 +24189,7 @@ ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF SHELL!$SHELL$ac_delim @@ -24264,6 +24268,7 @@ MAINT!$MAINT$ac_delim pkgdocdir!$pkgdocdir$ac_delim pkgdatadir!$pkgdatadir$ac_delim +pkgdatadir2!$pkgdatadir2$ac_delim pkglibdir!$pkglibdir$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim @@ -24287,7 +24292,7 @@ CCDEPMODE!$CCDEPMODE$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 aspell-0.60.5-pspell_conf.patch: Makefile.in | 2 ++ aspell.pc.in | 12 ++++++++++++ configure | 4 ++-- scripts/mkconfig | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) --- NEW FILE aspell-0.60.5-pspell_conf.patch --- --- aspell-0.60.5/configure.mlib 2007-01-02 14:59:04.000000000 +0100 +++ aspell-0.60.5/configure 2007-01-02 15:03:38.000000000 +0100 @@ -23484,7 +23484,7 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" +ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -24129,7 +24129,7 @@ "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;; "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;; "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;; - + "aspell.pc" ) CONFIG_FILES="$CONFIG_FILES aspell.pc" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; --- aspell-0.60.5/scripts/mkconfig.mlib 2004-01-03 13:06:24.000000000 +0100 +++ aspell-0.60.5/scripts/mkconfig 2007-01-02 14:59:04.000000000 +0100 @@ -15,7 +15,7 @@ echo "$2" ;; --pkgdatadir | pkgdatadir) - echo "$3" + pkg-config aspell --variable=pkgdatadir ;; *) echo "usage: pspell-config version|datadir|pkgdatadir" --- aspell-0.60.5/Makefile.in.mlib 2007-01-02 14:59:04.000000000 +0100 +++ aspell-0.60.5/Makefile.in 2007-01-02 14:59:04.000000000 +0100 @@ -809,6 +809,8 @@ done install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) + mkdir -p $(libdir)/pkgconfig; \ + cp aspell.pc $(libdir)/pkgconfig/aspell.pc; \ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ --- /dev/null 2007-01-02 09:09:01.616000852 +0100 +++ aspell-0.60.5/aspell.pc.in 2007-01-02 14:59:04.000000000 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +pkgdatadir=@pkgdatadir@ + +Name: Aspell +Description: A spelling checker. +Version: @VERSION@ +Requires: +Libs: -L${libdir} -laspell +Cflags: -I${includedir} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/aspell/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 8 Nov 2006 15:05:37 -0000 1.10 +++ .cvsignore 2 Jan 2007 14:29:02 -0000 1.11 @@ -1 +1 @@ -aspell-0.60.4.tar.gz +aspell-0.60.5.tar.gz Index: aspell.spec =================================================================== RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- aspell.spec 8 Nov 2006 15:05:37 -0000 1.34 +++ aspell.spec 2 Jan 2007 14:29:02 -0000 1.35 @@ -1,6 +1,6 @@ -Summary: A spelling checker. +Summary: A spelling checker Name: aspell -Version: 0.60.4 +Version: 0.60.5 Release: 1%{?dist} Epoch: 12 License: LGPL @@ -9,9 +9,8 @@ Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz Patch1: aspell-0.50.3-gcc33.patch Patch3: aspell-0.60.3-install_info.patch -Patch4: aspell-0.60.3-gcc41.patch -Patch5: aspell-0.60.4-fileconflict.patch -Patch7: aspell-0.60.3-pspell_conf.patch +Patch5: aspell-0.60.5-fileconflict.patch +Patch7: aspell-0.60.5-pspell_conf.patch Requires: aspell-en BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gettext, ncurses-devel, pkgconfig @@ -41,11 +40,9 @@ static libraries and header files needed for Aspell development. %prep -rm -rf $RPM_BUILD_ROOT %setup -q -n aspell-%{version} %patch1 -p1 -b .gcc33 %patch3 -p1 -b .iinfo -%patch4 -p1 -b .gcc41 %patch5 -p1 -b .fc %patch7 -p1 -b .mlib @@ -64,10 +61,6 @@ 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} - %post /sbin/ldconfig @@ -124,6 +117,10 @@ %{_mandir}/man1/pspell-config.1* %changelog +* Tue Jan 2 2007 Ivana Varekova - 12:0.60.5-1 +- update to 0.60.4 +- cleanup spec file + * Wed Nov 8 2006 Ivana Varekova - 12:0.60.4-1 - update to 0.60.4 @@ -267,106 +264,106 @@ * Fri Jun 21 2002 Tim Powers 0.33.7.1-13 - automated rebuild -* Thu Jun 13 2002 Trond Eivind Glomsr?d 0.33.7.1-12 +* Thu Jun 13 2002 Trond Eivind Glomsr??d 0.33.7.1-12 - Rebuild to make it work again... #66708 * Thu May 23 2002 Tim Powers - automated rebuild -* Mon May 13 2002 Trond Eivind Glomsr?d 0.33.7.1-10 +* Mon May 13 2002 Trond Eivind Glomsr??d 0.33.7.1-10 - Rebuild -* Thu Feb 21 2002 Trond Eivind Glomsr?d 0.33.7.1-9 +* Thu Feb 21 2002 Trond Eivind Glomsr??d 0.33.7.1-9 - Disable evil patch -* Mon Jan 28 2002 Trond Eivind Glomsr?d 0.33.7.1-8 +* Mon Jan 28 2002 Trond Eivind Glomsr??d 0.33.7.1-8 - Build on more archs (doh) -* Tue Jan 22 2002 Trond Eivind Glomsr?d 0.33.7.1-7 +* Tue Jan 22 2002 Trond Eivind Glomsr??d 0.33.7.1-7 - Make it compile with new compiler (evil workaround) -* Wed Jan 16 2002 Trond Eivind Glomsr?d 0.33.7.1-5 +* Wed Jan 16 2002 Trond Eivind Glomsr??d 0.33.7.1-5 - Rebuild - Unexclude alpha -* Fri Dec 14 2001 Trond Eivind Glomsr?d 0.33.7.1-3 +* Fri Dec 14 2001 Trond Eivind Glomsr??d 0.33.7.1-3 - Rebuild - Don't build on alpha * Mon Oct 29 2001 Bernhard Rosenkraenzer 0.33.7.1-2 - "make it work with gcc 3.1" ;) -* Tue Sep 18 2001 Trond Eivind Glomsr?d 0.33.7.1-1 +* Tue Sep 18 2001 Trond Eivind Glomsr??d 0.33.7.1-1 - 0.33.7.1, which is a "make it work with gcc 3" release * Wed Sep 12 2001 Tim Powers - rebuild with new gcc and binutils -* Thu Aug 9 2001 Trond Eivind Glomsr?d 0.33.7-1 +* Thu Aug 9 2001 Trond Eivind Glomsr??d 0.33.7-1 - 0.33.7 bugfix release. Requested by the author, it fixes coredumps in sug-mode and when not using typo-analyses. It also contains code cleanups so it compiles with -ansi - should fix coredump on IA64 (#49746) -* Wed Jul 11 2001 Trond Eivind Glomsr?d +* Wed Jul 11 2001 Trond Eivind Glomsr??d - Add the .la files in the main package - used for dynamic loading -* Sun Jun 3 2001 Trond Eivind Glomsr?d +* Sun Jun 3 2001 Trond Eivind Glomsr??d - 0.33.6.3, which includes the fix made yesterday -* Sat Jun 2 2001 Trond Eivind Glomsr?d +* Sat Jun 2 2001 Trond Eivind Glomsr??d - Make it search for directories in the correct location -* Wed May 30 2001 Trond Eivind Glomsr?d +* Wed May 30 2001 Trond Eivind Glomsr??d - No more workarounds at the specfile level -* Tue May 29 2001 Trond Eivind Glomsr?d +* Tue May 29 2001 Trond Eivind Glomsr??d - Use custom ltmain.sh to work around buggy bundled libtool -* Sun May 20 2001 Trond Eivind Glomsr?d +* Sun May 20 2001 Trond Eivind Glomsr??d - 0.33.6 - use standard %%configure macro - it works now. * Fri May 11 2001 Bernhard Rosenkraenzer 0.33.5-2 - Rebuild with new libltdl -* Mon Apr 23 2001 Trond Eivind Glomsr?d +* Mon Apr 23 2001 Trond Eivind Glomsr??d - 0.33.5 -* Thu Nov 30 2000 Trond Eivind Glomsr?d +* Thu Nov 30 2000 Trond Eivind Glomsr??d - use new emacs init scheme for Emacs and XEmacs -* Wed Nov 22 2000 Trond Eivind Glomsr?d +* Wed Nov 22 2000 Trond Eivind Glomsr??d - .32.6 -* Sat Aug 19 2000 Trond Eivind Glomsr?d +* Sat Aug 19 2000 Trond Eivind Glomsr??d - .32.5 bugfix release (also contains improved documentation), obsolete old patch - the compatibility scripts are now part of the package itself - clean up build procedure - remove manual.aux file from docs (#16424) -* Sun Aug 06 2000 Trond Eivind Glomsr?d +* Sun Aug 06 2000 Trond Eivind Glomsr??d - .32.1 bugfix release, obsolete old patch - rename to 0.32.1 - add patch from author to change his email address - add spell and ispell compatibility scripts -* Fri Aug 04 2000 Trond Eivind Glomsr?d +* Fri Aug 04 2000 Trond Eivind Glomsr??d - rebuild -* Tue Aug 01 2000 Trond Eivind Glomsr?d +* Tue Aug 01 2000 Trond Eivind Glomsr??d - remember to obsolete ispell - build the Canadian and British dictionaries here now, as part of the main package. Same package names and descriptions. -* Mon Jul 24 2000 Trond Eivind Glomsr?d +* Mon Jul 24 2000 Trond Eivind Glomsr??d - .32 - remove old patches, add a patch since namespace isn't polluted as much anymore (as opposed to older toolchain) -* Wed Jul 19 2000 Trond Eivind Glomsr?d +* Wed Jul 19 2000 Trond Eivind Glomsr??d - rebuild * Wed Jul 12 2000 Prospector @@ -375,24 +372,24 @@ * Tue Jul 4 2000 Jakub Jelinek - Rebuild with new C++ -* Fri Jun 30 2000 Trond Eivind Glomsr?d +* Fri Jun 30 2000 Trond Eivind Glomsr??d - use RPM_OPT_FLAGS, not just -O0 - dont include .la-files -* Fri Jun 23 2000 Trond Eivind Glomsr?d +* Fri Jun 23 2000 Trond Eivind Glomsr??d - excludearch ia64 -* Fri Jun 23 2000 Trond Eivind Glomsr?d +* Fri Jun 23 2000 Trond Eivind Glomsr??d - patch to work around compiler bug(?) wrt. inline functions - use CFLAGS and CXXFLAGS - set them to -O0 to work around YACB - copy libtool files for IA64 support -* Sun Jun 18 2000 Trond Eivind Glomsr?d +* Sun Jun 18 2000 Trond Eivind Glomsr??d - update to .31.1. My patch was upstreamed and is no longer needed. - new patch added so DESTDIR works properly -* Fri Jun 16 2000 Trond Eivind Glomsr?d +* Fri Jun 16 2000 Trond Eivind Glomsr??d - (this entry includes some old ones...) - update to .31 - added patch to make it compile with a pickier compiler Index: sources =================================================================== RCS file: /cvs/dist/rpms/aspell/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 8 Nov 2006 15:05:37 -0000 1.10 +++ sources 2 Jan 2007 14:29:02 -0000 1.11 @@ -1 +1 @@ -4f1737e726d66476b9c7388831305510 aspell-0.60.4.tar.gz +17fd8acac6293336bcef44391b71e337 aspell-0.60.5.tar.gz --- aspell-0.60.3-gcc41.patch DELETED --- --- aspell-0.60.3-pspell_conf.patch DELETED --- --- aspell-0.60.4-fileconflict.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 2 15:24:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 10:24:06 -0500 Subject: rpms/system-config-printer/FC-6 .cvsignore, 1.107, 1.108 sources, 1.110, 1.111 system-config-printer.spec, 1.79, 1.80 Message-ID: <200701021524.l02FO63T032321@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv32272 Modified Files: .cvsignore sources system-config-printer.spec Log Message: * Tue Jan 2 2007 Tim Waugh 0.7.44-1 - 0.7.44: - Fixed traceback in error display (bug #220136). - Preserve case in model string when dumping debug output. - Resolves: rhbz#220136 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-6/.cvsignore,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- .cvsignore 21 Dec 2006 18:42:37 -0000 1.107 +++ .cvsignore 2 Jan 2007 15:23:59 -0000 1.108 @@ -87,3 +87,4 @@ system-config-printer-0.7.41.tar.bz2 system-config-printer-0.7.42.tar.bz2 system-config-printer-0.7.43.tar.bz2 +system-config-printer-0.7.44.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-6/sources,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- sources 21 Dec 2006 18:42:37 -0000 1.110 +++ sources 2 Jan 2007 15:23:59 -0000 1.111 @@ -1,2 +1,2 @@ 19e872c23c404cf97f1fd2042b54655b pycups-1.9.16.tar.bz2 -7be85c85344139937f95387757815773 system-config-printer-0.7.43.tar.bz2 +47bd61cc00917c787eb659054007eb99 system-config-printer-0.7.44.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-6/system-config-printer.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- system-config-printer.spec 21 Dec 2006 18:42:37 -0000 1.79 +++ system-config-printer.spec 2 Jan 2007 15:23:59 -0000 1.80 @@ -2,7 +2,7 @@ Summary: A printer administration tool Name: system-config-printer -Version: 0.7.43 +Version: 0.7.44 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -114,7 +114,13 @@ fi %changelog +* Tue Jan 2 2007 Tim Waugh 0.7.44-1 +- 0.7.44: + - Fixed traceback in error display (bug #220136). + - Preserve case in model string when dumping debug output. + * Thu Dec 21 2006 Tim Waugh 0.7.43-1 +- 0.7.43: - Don't check against IEEE 1284 DES field at all. - Merged device matching code (bug #219518). - Catch non-fatal errors when auto-matching device. From fedora-cvs-commits at redhat.com Tue Jan 2 15:25:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 10:25:16 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.105, 1.106 sources, 1.108, 1.109 system-config-printer.spec, 1.76, 1.77 Message-ID: <200701021525.l02FPGtq000783@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv650 Modified Files: .cvsignore sources system-config-printer.spec Log Message: * Tue Jan 2 2007 Tim Waugh 0.7.44-1 - 0.7.44: - Fixed traceback in error display (bug #220136). - Preserve case in model string when dumping debug output. - Resolves: rhbz#220136 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- .cvsignore 21 Dec 2006 18:41:52 -0000 1.105 +++ .cvsignore 2 Jan 2007 15:25:14 -0000 1.106 @@ -85,3 +85,4 @@ system-config-printer-0.7.41.tar.bz2 system-config-printer-0.7.42.tar.bz2 system-config-printer-0.7.43.tar.bz2 +system-config-printer-0.7.44.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- sources 21 Dec 2006 18:41:52 -0000 1.108 +++ sources 2 Jan 2007 15:25:14 -0000 1.109 @@ -1,2 +1,2 @@ 19e872c23c404cf97f1fd2042b54655b pycups-1.9.16.tar.bz2 -7be85c85344139937f95387757815773 system-config-printer-0.7.43.tar.bz2 +47bd61cc00917c787eb659054007eb99 system-config-printer-0.7.44.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- system-config-printer.spec 21 Dec 2006 18:41:52 -0000 1.76 +++ system-config-printer.spec 2 Jan 2007 15:25:14 -0000 1.77 @@ -2,7 +2,7 @@ Summary: A printer administration tool Name: system-config-printer -Version: 0.7.43 +Version: 0.7.44 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -112,7 +112,13 @@ fi %changelog +* Tue Jan 2 2007 Tim Waugh 0.7.44-1 +- 0.7.44: + - Fixed traceback in error display (bug #220136). + - Preserve case in model string when dumping debug output. + * Thu Dec 21 2006 Tim Waugh 0.7.43-1 +- 0.7.43: - Don't check against IEEE 1284 DES field at all. - Merged device matching code (bug #219518). - Catch non-fatal errors when auto-matching device. From fedora-cvs-commits at redhat.com Tue Jan 2 15:42:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 10:42:06 -0500 Subject: rpms/device-mapper/FC-6 device-mapper.1.02.13.tgz.asc, NONE, 1.1 .cvsignore, 1.18, 1.19 device-mapper.spec, 1.43, 1.44 sources, 1.23, 1.24 upstream, 1.14, 1.15 device-mapper.1.02.07.tgz.asc, 1.1, NONE Message-ID: <200701021542.l02Fg6rQ002260@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2239 Modified Files: .cvsignore device-mapper.spec sources upstream Added Files: device-mapper.1.02.13.tgz.asc Removed Files: device-mapper.1.02.07.tgz.asc Log Message: Bring up to date. --- NEW FILE device-mapper.1.02.13.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFbL2zIoGRwVZ+LBcRAlXVAKCEIo2c2/AfHSXis3UnBhv+d21tYQCgkYb3 zYu8EqUtl7zw+BYjhwsgKPw= =XXgY -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-6/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 10 Oct 2006 22:10:15 -0000 1.18 +++ .cvsignore 2 Jan 2007 15:42:04 -0000 1.19 @@ -1 +1 @@ -device-mapper.1.02.07.tgz +device-mapper.1.02.13.tgz Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-6/device-mapper.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- device-mapper.spec 10 Oct 2006 22:10:48 -0000 1.43 +++ device-mapper.spec 2 Jan 2007 15:42:04 -0000 1.44 @@ -1,7 +1,7 @@ Summary: Device mapper library Name: device-mapper -Version: 1.02.07 -Release: 3 +Version: 1.02.13 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/dm @@ -48,6 +48,21 @@ %changelog +* Tue Jan 02 2007 Alasdair Kergon - 1.02.13-1 +- Update dmsetup man page (setgeometry & message). +- Suppress encryption key in 'dmsetup table' output unless --showkeys supplied. +- Smaller upstream source tarball with files for 2.4 kernel removed. +- Avoid deptree attempting to suspend a device that's already suspended. +- Add suspend noflush support. +- Add dm_snprintf(), dm_split_words() and dm_split_lvm_name() to libdevmapper. +- Add --table argument to dmsetup for a one-line table. +- Abort if errors are found during cmdline option processing. +- Add lockfs indicator to debug output. +- Add --force to dmsetup remove* to load error target. +- dmsetup remove_all also performs mknodes. +- Don't suppress identical table reloads if permission changes. +- Append distribution to release. + * Tue Oct 10 2006 Jeremy Katz - 1.02.07-3 - bump version to fix upgrade path Index: sources =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-6/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 10 Oct 2006 22:10:15 -0000 1.23 +++ sources 2 Jan 2007 15:42:04 -0000 1.24 @@ -1 +1 @@ -460cc211b03af4048ec90c0de2ecd8f7 device-mapper.1.02.07.tgz +9ab13083a939ceb26ce5da6b625aeb3c device-mapper.1.02.13.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-6/upstream,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- upstream 10 Oct 2006 22:10:15 -0000 1.14 +++ upstream 2 Jan 2007 15:42:04 -0000 1.15 @@ -1 +1 @@ -device-mapper.1.02.07.tgz +device-mapper.1.02.13.tgz --- device-mapper.1.02.07.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 2 15:46:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 10:46:19 -0500 Subject: rpms/device-mapper/FC-6 branch,1.2,1.3 Message-ID: <200701021546.l02FkJAm008076@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2365 Added Files: branch Log Message: missing branch file causing it to think it's .fc7 ? Index: branch =================================================================== RCS file: branch diff -N branch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ branch 2 Jan 2007 15:46:17 -0000 1.3 @@ -0,0 +1 @@ +FC-6 From fedora-cvs-commits at redhat.com Tue Jan 2 15:54:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 10:54:15 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.266, 1.267 policycoreutils.spec, 1.353, 1.354 Message-ID: <200701021554.l02FsFVV022979@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22959 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Jan 2 2007 Dan Walsh 1.33.6-9 - Fix fixfiles script to use tty command correctly. If this command fails, it should set the LOGFILE to /dev/null Resolves: #220879 policycoreutils-rhat.patch: Makefile | 2 audit2allow/Makefile | 2 audit2allow/avc.py | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ load_policy/load_policy.c | 10 newrole/newrole.c | 4 po/Makefile | 2 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/fixfiles | 3 semanage/Makefile | 2 semanage/seobject.py | 39 25 files changed, 4834 insertions(+), 32 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- policycoreutils-rhat.patch 20 Dec 2006 18:21:01 -0000 1.266 +++ policycoreutils-rhat.patch 2 Jan 2007 15:54:13 -0000 1.267 @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.33.6/audit2allow/avc.py --- nsapolicycoreutils/audit2allow/avc.py 2006-11-16 17:14:29.000000000 -0500 -+++ policycoreutils-1.33.6/audit2allow/avc.py 2006-12-08 16:09:54.000000000 -0500 ++++ policycoreutils-1.33.6/audit2allow/avc.py 2006-12-20 14:59:04.000000000 -0500 @@ -231,7 +231,7 @@ else: file = m[0][1] @@ -12,7 +12,7 @@ if file != i[1]: diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.33.6/audit2allow/Makefile --- nsapolicycoreutils/audit2allow/Makefile 2006-11-16 17:14:29.000000000 -0500 -+++ policycoreutils-1.33.6/audit2allow/Makefile 2006-12-20 13:18:16.000000000 -0500 ++++ policycoreutils-1.33.6/audit2allow/Makefile 2006-12-20 14:59:04.000000000 -0500 @@ -4,7 +4,7 @@ LIBDIR ?= $(PREFIX)/lib MANDIR ?= $(PREFIX)/share/man @@ -24,7 +24,7 @@ TARGETS=audit2allow diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.6/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/booleansPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/booleansPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -227,7 +227,7 @@ + commands.getstatusoutput(setsebool) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.6/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/fcontextPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/fcontextPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -389,7 +389,7 @@ + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.6/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/loginsPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/loginsPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -554,7 +554,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.6/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/Makefile 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/Makefile 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -588,7 +588,7 @@ +relabel: diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.6/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/mappingsPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/mappingsPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -646,7 +646,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.6/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/modulesPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/modulesPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -811,7 +811,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.6/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/portsPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/portsPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1029,7 +1029,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.6/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/selinux.tbl 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/selinux.tbl 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1298,7 +1298,7 @@ +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.6/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/semanagePage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/semanagePage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1411,7 +1411,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.6/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/statusPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/statusPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1628,7 +1628,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.6/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/system-config-selinux.glade 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/system-config-selinux.glade 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4435,7 +4435,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.6/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/system-config-selinux.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/system-config-selinux.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4595,7 +4595,7 @@ + app.stand_alone() diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.6/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/translationsPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/translationsPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4708,7 +4708,7 @@ + self.store.set_value(iter, 1, translation) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.6/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/usersPage.py 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/gui/usersPage.py 2006-12-20 14:59:04.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4867,7 +4867,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.33.6/load_policy/load_policy.c --- nsapolicycoreutils/load_policy/load_policy.c 2006-11-16 17:14:31.000000000 -0500 -+++ policycoreutils-1.33.6/load_policy/load_policy.c 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/load_policy/load_policy.c 2006-12-20 14:59:04.000000000 -0500 @@ -50,12 +50,12 @@ nargs = argc - optind; if (nargs > 2) @@ -4888,7 +4888,7 @@ argv[0], argv[optind++]); diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.6/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.6/Makefile 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/Makefile 2006-12-20 14:59:04.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui @@ -4897,7 +4897,7 @@ @for subdir in $(SUBDIRS); do \ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.6/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2006-11-29 17:11:18.000000000 -0500 -+++ policycoreutils-1.33.6/newrole/newrole.c 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/newrole/newrole.c 2006-12-20 14:59:04.000000000 -0500 @@ -1120,10 +1120,10 @@ fd = open(ttyn, O_RDONLY); if (fd != 0) @@ -4913,7 +4913,7 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-1.33.6/po/Makefile --- nsapolicycoreutils/po/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.6/po/Makefile 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/po/Makefile 2006-12-20 14:59:04.000000000 -0500 @@ -64,8 +64,6 @@ @rm -fv *mo *~ .depend @rm -rf tmp @@ -4925,7 +4925,7 @@ l=`basename $$n .mo`; \ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.6/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.6/restorecond/restorecond.c 2006-12-08 10:34:48.000000000 -0500 ++++ policycoreutils-1.33.6/restorecond/restorecond.c 2006-12-20 14:59:04.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4954,16 +4954,29 @@ close(fd); diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.6/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.6/restorecond/restorecond.conf 2006-12-12 08:27:15.000000000 -0500 ++++ policycoreutils-1.33.6/restorecond/restorecond.conf 2006-12-20 14:59:04.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.6/scripts/fixfiles +--- nsapolicycoreutils/scripts/fixfiles 2006-11-16 17:14:27.000000000 -0500 ++++ policycoreutils-1.33.6/scripts/fixfiles 2007-01-02 10:51:58.000000000 -0500 +@@ -29,6 +29,9 @@ + RPMILES="" + OUTFILES="" + LOGFILE=`tty` ++if [ $1 != 0 ]; then ++ LOGFILE="/dev/null" ++fi + SYSLOGFLAG="-l" + LOGGER=/usr/sbin/logger + SETFILES=/sbin/setfiles diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.33.6/semanage/Makefile --- nsapolicycoreutils/semanage/Makefile 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.6/semanage/Makefile 2006-12-20 13:17:58.000000000 -0500 ++++ policycoreutils-1.33.6/semanage/Makefile 2006-12-20 14:59:04.000000000 -0500 @@ -3,7 +3,7 @@ LIBDIR ?= $(PREFIX)/lib SBINDIR ?= $(PREFIX)/sbin @@ -4973,111 +4986,9 @@ PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) TARGETS=semanage -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.33.6/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.6/semanage/semanage 2006-12-19 08:56:35.000000000 -0500 -@@ -65,6 +65,7 @@ - -l (symbolic link) \n\ - -p (named pipe) \n\n\ - \ -+ -e, --exists Check if Linux user exists before adding (login only)\n\ - -p, --proto Port protocol (tcp or udp)\n\ - -P, --prefix Prefix for home directory labeling\n\ - -L, --level Default SELinux Level (MLS/MCS Systems only)\n\ -@@ -88,7 +89,7 @@ - valid_option={} - valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading' ] - valid_option["login"] = [] -- valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range'] -+ valid_option["login"] += valid_everyone + [ '-e', '--exists', '-s', '--seuser', '-r', '--range'] - valid_option["user"] = [] - valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ] - valid_option["port"] = [] -@@ -118,7 +119,8 @@ - seuser = "" - prefix = "" - heading=1 -- -+ exists = 1 -+ - add = 0 - modify = 0 - delete = 0 -@@ -134,9 +136,10 @@ - args = sys.argv[2:] - - gopts, cmds = getopt.getopt(args, -- 'adf:lhmnp:s:R:L:r:t:T:P:', -+ 'ade:f:lhmnp:s:R:L:r:t:T:P:', - ['add', - 'delete', -+ 'exists=', - 'ftype=', - 'help', - 'list', -@@ -165,13 +168,26 @@ - if modify or add: - usage() - delete = 1 -+ -+ if o == "-e" or o == "--exists": -+ if not add: -+ usage() -+ a = a.upper() -+ if a == "0" or a == "FALSE": -+ exists = False -+ else: -+ if a == "1" or a == "TRUE": -+ exists = True -+ else: -+ usage() - if o == "-f" or o == "--ftype": -- ftype=a -+ ftype = a -+ - if o == "-h" or o == "--help": - usage() - - if o == "-n" or o == "--noheading": -- heading=0 -+ heading = 0 - - if o == "-m"or o == "--modify": - if delete or add: -@@ -238,7 +254,7 @@ - - if add: - if object == "login": -- OBJECT.add(target, seuser, serange) -+ OBJECT.add(target, seuser, serange, exists) - - if object == "translation": - OBJECT.add(target, setrans) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.33.6/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2006-11-29 17:11:17.000000000 -0500 -+++ policycoreutils-1.33.6/semanage/semanage.8 2006-12-19 08:43:02.000000000 -0500 -@@ -5,7 +5,7 @@ - .SH "SYNOPSIS" - .B semanage {login|user|port|interface|fcontext|translation} \-l [\-n] - .br --.B semanage login \-{a|d|m} [\-sr] login_name -+.B semanage login \-{a|d|m} [\-esr] login_name - .br - .B semanage user \-{a|d|m} [\-LrRP] selinux_name - .br -@@ -43,6 +43,9 @@ - .I \-d, \-\-delete - Delete a OBJECT record NAME - .TP -+.I \-e, \-\-exists -+Check whether or not the Linux user exists before adding the login mapping. -+.TP - .I \-f, \-\-ftype - File Type. This is used with fcontext. - Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files. diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.6/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.6/semanage/seobject.py 2006-12-19 08:31:21.000000000 -0500 ++++ policycoreutils-1.33.6/semanage/seobject.py 2006-12-20 14:59:04.000000000 -0500 @@ -94,23 +94,25 @@ return re.search("^" + reg +"$",raw) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.353 retrieving revision 1.354 diff -u -r1.353 -r1.354 --- policycoreutils.spec 20 Dec 2006 18:21:02 -0000 1.353 +++ policycoreutils.spec 2 Jan 2007 15:54:13 -0000 1.354 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.33.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,11 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Tue Jan 2 2007 Dan Walsh 1.33.6-9 +- Fix fixfiles script to use tty command correctly. If this command fails, it +should set the LOGFILE to /dev/null +Resolves: #220879 + * Wed Dec 20 2006 Dan Walsh 1.33.6-8 - Remove hard coding of python2.4 from Makefiles From fedora-cvs-commits at redhat.com Tue Jan 2 16:09:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 11:09:19 -0500 Subject: rpms/device-mapper/FC-5 device-mapper.1.02.13.tgz.asc, NONE, 1.1 .cvsignore, 1.13, 1.14 device-mapper.spec, 1.28, 1.29 sources, 1.15, 1.16 upstream, 1.9, 1.10 device-mapper-1.02.02-libpaths.patch, 1.1, NONE device-mapper-1.02.02-pkg-config.patch, 1.3, NONE device-mapper-1.02.02-selinux.patch, 1.1, NONE device-mapper-mknod.patch, 1.3, NONE device-mapper.1.00.20.tgz.asc, 1.1, NONE device-mapper.1.00.21.tgz.asc, 1.2, NONE device-mapper.1.01.00.tgz.asc, 1.1, NONE device-mapper.1.01.01.tgz.asc, 1.1, NONE device-mapper.1.01.02.tgz.asc, 1.1, NONE device-mapper.1.01.03.tgz.asc, 1.1, NONE device-mapper.1.01.04.tgz.asc, 1.1, NONE device-mapper.1.01.05.tgz.asc, 1.1, NONE Message-ID: <200701021609.l02G9JNn023452@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23411 Modified Files: .cvsignore device-mapper.spec sources upstream Added Files: device-mapper.1.02.13.tgz.asc Removed Files: device-mapper-1.02.02-libpaths.patch device-mapper-1.02.02-pkg-config.patch device-mapper-1.02.02-selinux.patch device-mapper-mknod.patch device-mapper.1.00.20.tgz.asc device-mapper.1.00.21.tgz.asc device-mapper.1.01.00.tgz.asc device-mapper.1.01.01.tgz.asc device-mapper.1.01.02.tgz.asc device-mapper.1.01.03.tgz.asc device-mapper.1.01.04.tgz.asc device-mapper.1.01.05.tgz.asc Log Message: update to latest stable release --- NEW FILE device-mapper.1.02.13.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFbL2zIoGRwVZ+LBcRAlXVAKCEIo2c2/AfHSXis3UnBhv+d21tYQCgkYb3 zYu8EqUtl7zw+BYjhwsgKPw= =XXgY -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Sep 2005 20:59:39 -0000 1.13 +++ .cvsignore 2 Jan 2007 16:09:17 -0000 1.14 @@ -1 +1 @@ -device-mapper.1.01.05.tgz +device-mapper.1.02.13.tgz Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-5/device-mapper.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- device-mapper.spec 11 Feb 2006 02:25:03 -0000 1.28 +++ device-mapper.spec 2 Jan 2007 16:09:17 -0000 1.29 @@ -1,14 +1,11 @@ -Summary: device mapper library +Summary: Device mapper library Name: device-mapper -Version: 1.02.02 -Release: 3.2 +Version: 1.02.13 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/dm Source0: %{name}.%{version}.tgz -Patch0: device-mapper-1.02.02-selinux.patch -Patch1: device-mapper-1.02.02-libpaths.patch -Patch2: device-mapper-1.02.02-pkg-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libselinux-devel, libsepol-devel @@ -20,18 +17,16 @@ %prep %setup -q -n %{name}.%{version} -%patch0 -p1 -b .selinux -%patch1 -p1 -b .libpaths -%patch2 -p1 -b .pkg-config %build -autoconf -%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-dmeventd +%define _exec_prefix "" +%configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig +%define _exec_prefix / make %install rm -rf $RPM_BUILD_ROOT -%makeinstall +%makeinstall usrlibdir=$RPM_BUILD_ROOT/usr/%{_lib} %clean rm -rf $RPM_BUILD_ROOT @@ -43,19 +38,19 @@ %files %defattr(-,root,root,-) %doc COPYING COPYING.LIB INSTALL INTRO README VERSION WHATS_NEW -%{_libdir}/libdevmapper.so* -%{_libdir}/libdevmapper.a* -%{_libdir}/libdevmapper-event.so* -%{_libdir}/libdevmapper-event.a* -%{_sbindir}/dmsetup -%{_sbindir}/dmsetup.static +%attr(755,root,root) %{_libdir}/libdevmapper.so* +%attr(755,root,root) %{_libdir}/libdevmapper.a* +%attr(755,root,root) %{_sbindir}/dmsetup +%attr(755,root,root) %{_sbindir}/dmsetup.static %{_mandir}/*/* %{_includedir}/libdevmapper.h -%{_includedir}/libdevmapper-event.h /usr/%{_lib}/pkgconfig/*.pc %changelog +* Tue Jan 02 2007 Alasdair Kergon - 1.02.13-1 +- Update to latest stable release. + * Fri Feb 10 2006 Jesse Keating - 1.02.02-3.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 2 Dec 2005 21:44:49 -0000 1.15 +++ sources 2 Jan 2007 16:09:17 -0000 1.16 @@ -1,3 +1 @@ -a2562b57e7cca026faa425fa5da92bbc device-mapper.1.00.21.tgz -42dd0610e24d4b4f2409a32a04e6e37f device-mapper.1.01.04.tgz -6ddd9de8366f38322367bbe8414a05c3 device-mapper.1.02.02.tgz +9ab13083a939ceb26ce5da6b625aeb3c device-mapper.1.02.13.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/device-mapper/FC-5/upstream,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- upstream 26 Sep 2005 20:59:39 -0000 1.9 +++ upstream 2 Jan 2007 16:09:17 -0000 1.10 @@ -1 +1 @@ -device-mapper.1.01.05.tgz +device-mapper.1.02.13.tgz --- device-mapper-1.02.02-libpaths.patch DELETED --- --- device-mapper-1.02.02-pkg-config.patch DELETED --- --- device-mapper-1.02.02-selinux.patch DELETED --- --- device-mapper-mknod.patch DELETED --- --- device-mapper.1.00.20.tgz.asc DELETED --- --- device-mapper.1.00.21.tgz.asc DELETED --- --- device-mapper.1.01.00.tgz.asc DELETED --- --- device-mapper.1.01.01.tgz.asc DELETED --- --- device-mapper.1.01.02.tgz.asc DELETED --- --- device-mapper.1.01.03.tgz.asc DELETED --- --- device-mapper.1.01.04.tgz.asc DELETED --- --- device-mapper.1.01.05.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 2 16:30:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 11:30:54 -0500 Subject: rpms/lvm2/FC-6 LVM2.2.02.17.tgz.asc, NONE, 1.1 .cvsignore, 1.36, 1.37 lvm2.spec, 1.73, 1.74 sources, 1.37, 1.38 upstream, 1.29, 1.30 LVM2.2.01.14.tgz.asc, 1.1, NONE LVM2.2.02.04.tgz.asc, 1.1, NONE LVM2.2.02.05.tgz.asc, 1.1, NONE LVM2.2.02.06.tgz.asc, 1.1, NONE lvm2-2.02.06-pe_align.patch, 1.1, NONE Message-ID: <200701021630.l02GUscM024810@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24698 Modified Files: .cvsignore lvm2.spec sources upstream Added Files: LVM2.2.02.17.tgz.asc Removed Files: LVM2.2.01.14.tgz.asc LVM2.2.02.04.tgz.asc LVM2.2.02.05.tgz.asc LVM2.2.02.06.tgz.asc lvm2-2.02.06-pe_align.patch Log Message: Latest stable upstream version. --- NEW FILE LVM2.2.02.17.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFga+TIoGRwVZ+LBcRAnM7AKDxJPRsMOh4D1BrN6Me1jV1si4tqQCfYpGZ ZgsQSeYhxDNDBJ8Z8HymFcg= =w2bz -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lvm2/FC-6/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 28 Sep 2006 19:22:27 -0000 1.36 +++ .cvsignore 2 Jan 2007 16:30:52 -0000 1.37 @@ -1 +1 @@ -LVM2.2.02.06.tgz +LVM2.2.02.17.tgz Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/FC-6/lvm2.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- lvm2.spec 28 Sep 2006 19:22:27 -0000 1.73 +++ lvm2.spec 2 Jan 2007 16:30:52 -0000 1.74 @@ -1,21 +1,22 @@ +%define device_mapper_version 1.02.13 + Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.06 -Release: 4 +Version: 2.02.17 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/lvm2 Source0: LVM2.%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: device-mapper >= 1.02.07 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: device-mapper >= %{device_mapper_version} BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: libtermcap-devel BuildRequires: ncurses-devel BuildRequires: readline-devel -Requires: device-mapper >= 1.02.07 +Requires: device-mapper >= %{device_mapper_version} Conflicts: lvm Obsoletes: lvm -Patch0: lvm2-2.02.06-pe_align.patch %define _exec_prefix /usr @@ -29,7 +30,6 @@ %prep %setup -q -n LVM2.%{version} -%patch0 -p1 -b .pe_align %build %configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-pool=internal --with-staticdir=/sbin --with-user= --with-group= @@ -58,8 +58,12 @@ /sbin/pvscan /sbin/vgscan /sbin/vgchange -/usr/sbin/* -%{_mandir}/*/* +/usr/sbin/lv* +/usr/sbin/pv* +/usr/sbin/vg* +%{_mandir}/*/lv* +%{_mandir}/*/pv* +%{_mandir}/*/vg* %dir /etc/lvm %ghost /etc/lvm/.cache %config(noreplace) /etc/lvm/lvm.conf @@ -68,6 +72,9 @@ /var/lock/lvm %changelog +* Tue Jan 02 2006 Alasdair Kergon - 2.02.17-1 +- Latest stable upstream version. + * Thu Sep 28 2006 Peter Jones - 2.02.06-4 - Fix metadata and map alignment problems on ppc64 (#206202) Index: sources =================================================================== RCS file: /cvs/dist/rpms/lvm2/FC-6/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 28 Sep 2006 19:22:27 -0000 1.37 +++ sources 2 Jan 2007 16:30:52 -0000 1.38 @@ -1 +1 @@ -35c232e771812700e0ca7225da1431b8 LVM2.2.02.06.tgz +a1bebdabb0dace2b9dd98579625ce53c LVM2.2.02.17.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/lvm2/FC-6/upstream,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- upstream 28 Sep 2006 19:22:27 -0000 1.29 +++ upstream 2 Jan 2007 16:30:52 -0000 1.30 @@ -1 +1 @@ -LVM2.2.02.06.tgz +LVM2.2.02.17.tgz --- LVM2.2.01.14.tgz.asc DELETED --- --- LVM2.2.02.04.tgz.asc DELETED --- --- LVM2.2.02.05.tgz.asc DELETED --- --- LVM2.2.02.06.tgz.asc DELETED --- --- lvm2-2.02.06-pe_align.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 2 16:31:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 11:31:31 -0500 Subject: rpms/lvm2/FC-6 lvm2.spec,1.74,1.75 Message-ID: <200701021631.l02GVVQl025224@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25140 Modified Files: lvm2.spec Log Message: fix date Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/FC-6/lvm2.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- lvm2.spec 2 Jan 2007 16:30:52 -0000 1.74 +++ lvm2.spec 2 Jan 2007 16:31:23 -0000 1.75 @@ -72,7 +72,7 @@ /var/lock/lvm %changelog -* Tue Jan 02 2006 Alasdair Kergon - 2.02.17-1 +* Tue Jan 02 2007 Alasdair Kergon - 2.02.17-1 - Latest stable upstream version. * Thu Sep 28 2006 Peter Jones - 2.02.06-4 From fedora-cvs-commits at redhat.com Tue Jan 2 16:40:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 11:40:15 -0500 Subject: rpms/selinux-policy/devel policy-20061106.patch, 1.54, 1.55 selinux-policy.spec, 1.376, 1.377 Message-ID: <200701021640.l02GeFbR031707@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31661 Modified Files: policy-20061106.patch selinux-policy.spec Log Message: * Tue Jan 29 2007 Dan Walsh 2.4.6-21 - Allow spamassassin to read var_lib_t dir Resolves: #219234 policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 policy/flask/access_vectors | 2 policy/global_tunables | 48 ++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 9 policy/modules/admin/consoletype.te | 15 policy/modules/admin/dmesg.te | 1 policy/modules/admin/firstboot.if | 6 policy/modules/admin/logwatch.te | 2 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 9 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 46 -- policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 21 - policy/modules/apps/evolution.if | 127 ++++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 +++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 209 +++++++++-- policy/modules/apps/mplayer.if | 84 ++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 2 policy/modules/apps/thunderbird.if | 80 +++- policy/modules/apps/userhelper.if | 19 - policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 58 +++ policy/modules/kernel/corenetwork.if.in | 97 +++++ policy/modules/kernel/corenetwork.te.in | 15 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 5 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 7 policy/modules/kernel/files.if | 183 +++++++++ policy/modules/kernel/filesystem.te | 7 policy/modules/kernel/kernel.if | 61 +++ policy/modules/kernel/kernel.te | 4 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 10 policy/modules/services/apache.te | 17 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 21 + policy/modules/services/bind.fc | 1 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 5 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 39 +- policy/modules/services/cups.fc | 2 policy/modules/services/cups.te | 7 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 41 ++ policy/modules/services/ftp.te | 14 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 +++ policy/modules/services/hal.te | 8 policy/modules/services/inetd.te | 9 policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/kerberos.te | 11 policy/modules/services/lpd.if | 56 +-- policy/modules/services/mta.if | 1 policy/modules/services/mta.te | 1 policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 15 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 policy/modules/services/oddjob.te | 3 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 +++ policy/modules/services/pcscd.te | 74 +++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.te | 13 policy/modules/services/procmail.te | 16 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 ++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.if | 2 policy/modules/services/samba.te | 8 policy/modules/services/sasl.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 4 policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 40 ++ policy/modules/services/ssh.te | 7 policy/modules/services/telnet.te | 1 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 ++ policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 74 +++ policy/modules/system/authlogin.te | 6 policy/modules/system/clock.te | 8 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 2 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 10 policy/modules/system/init.if | 3 policy/modules/system/init.te | 31 + policy/modules/system/iptables.te | 11 policy/modules/system/libraries.fc | 29 - policy/modules/system/libraries.te | 6 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 9 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 48 ++ policy/modules/system/miscfiles.fc | 1 policy/modules/system/miscfiles.if | 79 ++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 20 - policy/modules/system/raid.te | 7 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 113 +++++- policy/modules/system/selinuxutil.te | 107 +---- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 34 + policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 + policy/modules/system/unconfined.te | 19 + policy/modules/system/userdomain.if | 560 ++++++++++++++++++++++++++---- policy/modules/system/userdomain.te | 61 +-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 35 + 163 files changed, 3619 insertions(+), 536 deletions(-) Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20061106.patch,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- policy-20061106.patch 29 Dec 2006 20:01:11 -0000 1.54 +++ policy-20061106.patch 2 Jan 2007 16:40:08 -0000 1.55 @@ -822,8 +822,19 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolution.if serefpolicy-2.4.6/policy/modules/apps/evolution.if --- nsaserefpolicy/policy/modules/apps/evolution.if 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/apps/evolution.if 2006-12-24 02:11:43.000000000 -0500 -@@ -171,6 +171,8 @@ ++++ serefpolicy-2.4.6/policy/modules/apps/evolution.if 2007-01-02 11:32:21.000000000 -0500 +@@ -129,6 +129,10 @@ + allow $1_evolution_t $1_evolution_orbit_tmp_t:file manage_file_perms; + files_tmp_filetrans($1_evolution_t,$1_evolution_orbit_tmp_t,{ dir file }) + ++ allow $1_evolution_server_t $1_evolution_orbit_tmp_t:dir manage_dir_perms; ++ allow $1_evolution_server_t $1_evolution_orbit_tmp_t:file manage_file_perms; ++ files_tmp_filetrans($1_evolution_server_t,$1_evolution_orbit_tmp_t,{ dir file }) ++ + allow $1_evolution_t $1_evolution_server_t:dir search_dir_perms; + allow $1_evolution_t $1_evolution_server_t:file read; + +@@ -171,6 +175,8 @@ allow $2 $1_evolution_t:{ file lnk_file } { read getattr }; allow $2 $1_evolution_t:process getattr; @@ -832,7 +843,15 @@ #FIXME check to see if really needed kernel_read_kernel_sysctls($1_evolution_t) kernel_read_system_state($1_evolution_t) -@@ -246,6 +248,7 @@ +@@ -238,6 +244,7 @@ + userdom_manage_user_tmp_dirs($1,$1_evolution_t) + userdom_manage_user_tmp_sockets($1,$1_evolution_t) + userdom_manage_user_tmp_files($1,$1_evolution_t) ++ userdom_use_user_terminals($1, $1_evolution_t) + # FIXME: suppress access to .local/.icons/.themes until properly implemented + # FIXME: suppress access to .gaim/blist.xml (buddy list synchronization) + # until properly implemented +@@ -246,6 +253,7 @@ mta_read_config($1_evolution_t) xserver_user_client_template($1,$1_evolution_t,$1_evolution_tmpfs_t) @@ -840,7 +859,7 @@ tunable_policy(`use_nfs_home_dirs',` fs_manage_nfs_dirs($1_evolution_t) -@@ -410,7 +413,11 @@ +@@ -410,7 +418,11 @@ ') optional_policy(` @@ -853,7 +872,7 @@ ') ### Junk mail filtering (start spamd) -@@ -463,7 +470,8 @@ +@@ -463,7 +475,8 @@ # Evolution alarm local policy # @@ -863,7 +882,7 @@ allow $1_evolution_alarm_t $1_evolution_t:unix_stream_socket connectto; allow $1_evolution_alarm_t $1_evolution_orbit_tmp_t:sock_file write; -@@ -489,6 +497,14 @@ +@@ -489,6 +502,14 @@ domain_auto_trans($2, evolution_alarm_exec_t, $1_evolution_alarm_t) allow $1_evolution_alarm_t $2:fd use; @@ -878,7 +897,7 @@ fs_search_auto_mountpoints($1_evolution_alarm_t) miscfiles_read_localization($1_evolution_alarm_t) -@@ -512,9 +528,17 @@ +@@ -512,9 +533,18 @@ ') optional_policy(` @@ -890,13 +909,14 @@ ') + optional_policy(` ++ dbus_user_bus_client_template($1,$1_evolution_alarm,$1_evolution_alarm_t) + dbus_send_user_bus($1,$1_evolution_alarm_t) + ') + ifdef(`TODO',` # Gnome common stuff gnome_application($1_evolution_alarm,$1) -@@ -525,6 +549,9 @@ +@@ -525,6 +555,9 @@ # Evolution exchange connector local policy # @@ -906,7 +926,7 @@ allow $1_evolution_exchange_t self:tcp_socket create_socket_perms; allow $1_evolution_exchange_t self:udp_socket create_socket_perms; -@@ -542,6 +569,16 @@ +@@ -542,6 +575,16 @@ allow $1_evolution_exchange_t $1_evolution_server_t:unix_stream_socket connectto; allow $1_evolution_exchange_t $1_evolution_server_orbit_tmp_t:sock_file write; @@ -923,7 +943,7 @@ # /tmp/.exchange-$USER allow $1_evolution_exchange_t $1_evolution_exchange_tmp_t:dir create_dir_perms; allow $1_evolution_exchange_t $1_evolution_exchange_tmp_t:file create_file_perms; -@@ -588,6 +625,10 @@ +@@ -588,6 +631,10 @@ fs_manage_nfs_files($1_evolution_exchange_t) ') @@ -934,7 +954,7 @@ tunable_policy(`use_samba_home_dirs',` fs_manage_cifs_files($1_evolution_exchange_t) ') -@@ -606,6 +647,8 @@ +@@ -606,6 +653,8 @@ # Evolution data server local policy # @@ -943,7 +963,7 @@ allow $1_evolution_server_t self:fifo_file { read write }; allow $1_evolution_server_t self:unix_stream_socket { accept connectto }; # Talk to ldap (address book), -@@ -628,6 +671,12 @@ +@@ -628,6 +677,12 @@ allow $1_evolution_server_t $2:fd use; @@ -956,7 +976,7 @@ kernel_read_system_state($1_evolution_server_t) corecmd_exec_shell($1_evolution_server_t) -@@ -682,6 +731,10 @@ +@@ -682,6 +737,10 @@ ') optional_policy(` @@ -967,7 +987,7 @@ nscd_socket_use($1_evolution_server_t) ') -@@ -813,3 +866,46 @@ +@@ -813,3 +872,67 @@ allow $2 $1_evolution_t:unix_stream_socket connectto; allow $2 $1_evolution_home_t:dir search; ') @@ -1014,6 +1034,35 @@ + allow $1_evolution_alarm_t $2:dbus send_msg; +') + ++allow staff_evolution_alarm_t staff_t:fifo_file { getattr write }; ++allow staff_evolution_alarm_t staff_t:unix_stream_socket connectto; ++allow staff_evolution_alarm_t staff_tmp_t:dir { add_name getattr search setattr write }; ++allow staff_evolution_alarm_t staff_tmp_t:file { getattr lock read write }; ++allow staff_evolution_alarm_t staff_tmp_t:sock_file { create write }; ++allow staff_evolution_alarm_t tmp_t:dir read; ++ ++allow staff_evolution_exchange_t staff_t:fd use; ++allow staff_evolution_exchange_t staff_t:fifo_file { getattr write }; ++allow staff_evolution_exchange_t staff_tmp_t:dir { add_name getattr search setattr write }; ++allow staff_evolution_exchange_t staff_tmp_t:file { getattr lock read write }; ++allow staff_evolution_exchange_t staff_tmp_t:sock_file { create write }; ++ ++allow staff_evolution_server_t staff_t:fifo_file { getattr write }; ++allow staff_evolution_server_t staff_t:unix_stream_socket connectto; ++allow staff_evolution_server_t staff_tmp_t:dir { add_name getattr search setattr write }; ++allow staff_evolution_server_t staff_tmp_t:file { getattr lock read write }; ++allow staff_evolution_server_t staff_tmp_t:sock_file { create write }; ++allow staff_evolution_server_t tmp_t:dir { getattr read search }; ++ ++allow staff_evolution_t default_t:lnk_file read; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolution.te serefpolicy-2.4.6/policy/modules/apps/evolution.te +--- nsaserefpolicy/policy/modules/apps/evolution.te 2006-11-16 17:15:07.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/apps/evolution.te 2006-12-29 15:44:21.000000000 -0500 +@@ -20,3 +20,4 @@ + + type evolution_webcal_exec_t; + corecmd_executable_file(evolution_webcal_exec_t) ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-2.4.6/policy/modules/apps/gnome.fc --- nsaserefpolicy/policy/modules/apps/gnome.fc 2006-11-16 17:15:07.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/apps/gnome.fc 2006-12-29 11:30:43.000000000 -0500 @@ -2386,7 +2435,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.4.6/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/kernel/files.if 2006-12-23 22:41:19.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/kernel/files.if 2007-01-02 10:17:36.000000000 -0500 @@ -353,8 +353,7 @@ ######################################## @@ -2478,7 +2527,17 @@ ## Do not audit attempts to search ## the contents of /var. ## -@@ -4471,14 +4523,16 @@ +@@ -3823,7 +3875,8 @@ + type var_t, var_lib_t; + ') + +- allow $1 { var_t var_lib_t }:dir search_dir_perms; ++ allow $1 var_t:dir search_dir_perms; ++ allow $1 var_lib_t:dir r_dir_perms; + allow $1 var_lib_t:file r_file_perms; + ') + +@@ -4471,14 +4524,16 @@ type poly_t; ') @@ -2497,7 +2556,7 @@ # Need to give access to the polyinstantiated subdirectories allow $1 polymember:dir search_dir_perms; -@@ -4491,11 +4545,13 @@ +@@ -4491,11 +4546,13 @@ allow $1 self:process setfscreate; allow $1 polymember: dir { create setattr relabelto }; allow $1 polydir: dir { write add_name }; @@ -2512,7 +2571,7 @@ ') ######################################## -@@ -4559,3 +4615,115 @@ +@@ -4559,3 +4616,115 @@ typealias etc_runtime_t alias $1; ') @@ -2630,7 +2689,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.4.6/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te 2006-12-23 22:41:19.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/kernel/filesystem.te 2007-01-02 11:04:15.000000000 -0500 @@ -21,9 +21,11 @@ # Use xattrs for the following filesystem types. @@ -2643,7 +2702,15 @@ fs_use_xattr jffs2 gen_context(system_u:object_r:fs_t,s0); fs_use_xattr jfs gen_context(system_u:object_r:fs_t,s0); fs_use_xattr xfs gen_context(system_u:object_r:fs_t,s0); -@@ -182,7 +184,6 @@ +@@ -149,6 +151,7 @@ + allow dosfs_t fs_t:filesystem associate; + genfscon fat / gen_context(system_u:object_r:dosfs_t,s0) + genfscon msdos / gen_context(system_u:object_r:dosfs_t,s0) ++genfscon ntfs-3g / gen_context(system_u:object_r:dosfs_t,s0) + genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0) + genfscon vfat / gen_context(system_u:object_r:dosfs_t,s0) + +@@ -182,7 +185,6 @@ genfscon hfs / gen_context(system_u:object_r:nfs_t,s0) genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0) @@ -2651,7 +2718,7 @@ ######################################## # -@@ -202,3 +203,6 @@ +@@ -202,3 +204,6 @@ # pseudo filesystem types that are applied to both the filesystem # and its files. allow filesystem_unconfined_type filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *; @@ -2895,7 +2962,7 @@ +/opt/fortitude/run(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.4.6/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2006-11-29 09:27:47.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/apache.te 2006-12-23 22:41:19.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/apache.te 2007-01-02 10:09:49.000000000 -0500 @@ -143,6 +143,8 @@ allow httpd_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow httpd_t self:tcp_socket create_stream_socket_perms; @@ -2944,7 +3011,15 @@ ') tunable_policy(`httpd_ssi_exec',` -@@ -704,6 +714,8 @@ +@@ -695,6 +705,7 @@ + + optional_policy(` + snmp_dontaudit_read_snmp_var_lib_files(httpd_t) ++ snmp_dontaudit_write_snmp_var_lib_files(httpd_t) + ') + + ######################################## +@@ -704,6 +715,8 @@ allow httpd_rotatelogs_t httpd_log_t:dir rw_dir_perms; allow httpd_rotatelogs_t httpd_log_t:file manage_file_perms; @@ -2953,7 +3028,7 @@ kernel_read_kernel_sysctls(httpd_rotatelogs_t) kernel_dontaudit_list_proc(httpd_rotatelogs_t) -@@ -714,6 +726,8 @@ +@@ -714,6 +727,8 @@ libs_use_ld_so(httpd_rotatelogs_t) libs_use_shared_libs(httpd_rotatelogs_t) @@ -3093,7 +3168,7 @@ corenet_tcp_sendrecv_all_nodes(clamd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.4.6/policy/modules/services/cron.fc --- nsaserefpolicy/policy/modules/services/cron.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/cron.fc 2006-12-28 14:25:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/cron.fc 2007-01-02 10:25:01.000000000 -0500 @@ -5,11 +5,11 @@ /usr/bin/at -- gen_context(system_u:object_r:crontab_exec_t,s0) /usr/bin/(f)?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) @@ -3112,7 +3187,7 @@ /var/run/fcron\.fifo -s gen_context(system_u:object_r:crond_var_run_t,s0) /var/run/fcron\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0) -+/var/spool/anacron -d gen_context(system_u:object_r:cron_spool_t,s0) ++/var/spool/anacron(/.*)? gen_context(system_u:object_r:cron_spool_t,s0) /var/spool/at -d gen_context(system_u:object_r:cron_spool_t,s0) /var/spool/at/spool -d gen_context(system_u:object_r:cron_spool_t,s0) /var/spool/at/[^/]* -- <> @@ -4671,6 +4746,30 @@ storage_raw_read_fixed_disk(fsdaemon_t) storage_raw_write_fixed_disk(fsdaemon_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-2.4.6/policy/modules/services/snmp.if +--- nsaserefpolicy/policy/modules/services/snmp.if 2006-11-16 17:15:20.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/snmp.if 2007-01-02 10:09:42.000000000 -0500 +@@ -65,3 +65,20 @@ + dontaudit $1 snmpd_var_lib_t:file r_file_perms; + dontaudit $1 snmpd_var_lib_t:lnk_file { getattr read }; + ') ++ ++######################################## ++## ++## dontaudit write snmpd libraries files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`snmp_dontaudit_write_snmp_var_lib_files',` ++ gen_require(` ++ type snmpd_var_lib_t; ++ ') ++ dontaudit $1 snmpd_var_lib_t:file write; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.4.6/policy/modules/services/snmp.te --- nsaserefpolicy/policy/modules/services/snmp.te 2006-11-16 17:15:20.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/snmp.te 2006-12-23 22:41:19.000000000 -0500 @@ -5009,7 +5108,7 @@ /tmp/\.X11-unix/.* -s <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.4.6/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2006-11-29 09:27:47.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/services/xserver.if 2006-12-28 10:14:55.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/services/xserver.if 2006-12-29 15:54:21.000000000 -0500 @@ -45,7 +45,7 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -5058,7 +5157,24 @@ fs_search_auto_mountpoints($1_iceauth_t) libs_use_ld_so($1_iceauth_t) -@@ -578,6 +589,8 @@ +@@ -548,7 +559,7 @@ + + gen_require(` + type xdm_t, xdm_tmp_t; +- type $1_xauth_home_t, $1_xserver_t, $1_xserver_tmpfs_t; ++ type $1_xauth_home_t, $1_iceauth_home_t, $1_xserver_t, $1_xserver_tmpfs_t; + ') + + allow $2 self:shm create_shm_perms; +@@ -557,6 +568,7 @@ + + # Read .Xauthority file + allow $2 $1_xauth_home_t:file { getattr read }; ++ allow $2 $1_iceauth_home_t:file { getattr read }; + + # for when /tmp/.X11-unix is created by the system + allow $2 xdm_t:fd use; +@@ -578,6 +590,8 @@ xserver_rw_session_template($1,$2,$3) xserver_use_user_fonts($1,$2) @@ -5067,7 +5183,7 @@ # Client write xserver shm tunable_policy(`allow_write_xshm',` allow $2 $1_xserver_t:shm rw_shm_perms; -@@ -906,10 +919,12 @@ +@@ -906,10 +920,12 @@ domain_auto_trans($1,xserver_exec_t,xdm_xserver_t) @@ -5080,7 +5196,7 @@ ') ######################################## -@@ -1024,6 +1039,7 @@ +@@ -1024,6 +1040,7 @@ logging_search_logs($1) allow $1 xserver_log_t:dir rw_dir_perms; allow $1 xserver_log_t:file unlink; @@ -5088,7 +5204,7 @@ ') ######################################## -@@ -1080,6 +1096,7 @@ +@@ -1080,6 +1097,7 @@ type xdm_tmp_t; ') @@ -5096,7 +5212,7 @@ allow $1 xdm_tmp_t:dir search_dir_perms; allow $1 xdm_tmp_t:file { getattr read }; ') -@@ -1160,3 +1177,170 @@ +@@ -1160,3 +1178,171 @@ allow $1 xdm_xserver_tmp_t:sock_file write; allow $1 xdm_xserver_t:unix_stream_socket connectto; ') @@ -5267,6 +5383,7 @@ + userdom_user_home_dir_filetrans($1, $2, $1_xauth_home_t, file) +') + ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.4.6/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2006-11-16 17:15:21.000000000 -0500 +++ serefpolicy-2.4.6/policy/modules/services/xserver.te 2006-12-24 11:03:54.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- selinux-policy.spec 29 Dec 2006 20:01:11 -0000 1.376 +++ selinux-policy.spec 2 Jan 2007 16:40:08 -0000 1.377 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -351,6 +351,10 @@ %endif %changelog +* Tue Jan 29 2007 Dan Walsh 2.4.6-21 +- Allow spamassassin to read var_lib_t dir +Resolves: #219234 + * Fri Dec 29 2006 Dan Walsh 2.4.6-20 - fix mplayer to work under strict policy - Allow iptables to use nscd From fedora-cvs-commits at redhat.com Tue Jan 2 16:41:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 2 Jan 2007 11:41:25 -0500 Subject: rpms/gphoto2/FC-6 gphoto2.spec,1.70,1.71 sources,1.13,1.14 Message-ID: <200701021641.l02GfPHV000314@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv32575 Modified Files: gphoto2.spec sources Log Message: - update to 2.3.1 - don't ship docs in separate tarball, use the internal one - nuke useless PreReq and BuildRequires - fix BuildRoot, use dist tag - specify version of libgphoto2 in Provides - enable lockdev - spec cleanup Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-6/gphoto2.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- gphoto2.spec 12 Jul 2006 06:13:51 -0000 1.70 +++ gphoto2.spec 2 Jan 2007 16:41:23 -0000 1.71 @@ -4,32 +4,24 @@ Summary: Software for accessing digital cameras Name: gphoto2 %define pkg gphoto2 -%define pkgver 2.2.0 +%define pkgver 2.3.1 %define libpkg libgphoto2 -%define libver 2.2.1 +%define libver 2.3.1 Version: %{pkgver} -Release: 2.1 +Release: 1%{?dist} License: LGPL Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2 -Source2: gphoto2-2.1.99-installed-doc.tar.bz2 Source3: 90-gphoto-camera-policy.fdi Source4: gphoto-set-procperm Source5: gphoto2-config -Patch2: gphoto2-2.2.0-gcc4.patch -Patch5: gphoto2-2.1.99-config.patch -Patch6: gphoto2-2.2.0-print-camera-list.patch Url: http://www.gphoto.org/ ExcludeArch: s390 s390x -PreReq: /sbin/ldconfig, grep, fileutils -Provides: libgphoto2 +Provides: libgphoto2 = %{libver} Requires: lockdev BuildRequires: libusb-devel >= 0.1.5 -BuildRequires: gtk-doc -BuildRequires: findutils perl -BuildRequires: transfig BuildRequires: lockdev-devel BuildRequires: libexif-devel BuildRequires: libjpeg-devel, readline-devel @@ -75,10 +67,7 @@ #################################### %prep -%setup -q -a 1 -a 2 -%patch2 -p1 -b .gcc4 -%patch5 -p1 -b .config -%patch6 -p1 -b .include +%setup -q -a 1 #################################### %build @@ -86,33 +75,21 @@ pushd %{libpkg}-%{libver} export CFLAGS=$RPM_OPT_FLAGS %configure \ - --mandir=%{_mandir} \ - --libdir=%{_libdir} \ --with-drivers=all \ --with-doc-dir=%{_docdir}/%{name} \ - --disable-static + --disable-static \ + --without-aalib -export tagname=CC make -ln -s . libgphoto2/gphoto2 -ln -s . libgphoto2_port/libgphoto2_port/gphoto2 popd -gp_path=../libgphoto2_port/libgphoto2_port -cat $(pwd)/libgphoto2-%{libver}/libgphoto2/libgphoto2.pc | sed \ - -e "s,^libdir=.*$,libdir=$(pwd)/libgphoto2-%{libver}/libgphoto2," \ - -e "s,^includedir=.*$,includedir=$(pwd)/libgphoto2-%{libver}/libgphoto2," \ - -e "s,^Libs:.*},Libs: -L\${libdir}/.libs -L\${libdir}/$gp_path/.libs/," \ - -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \ - > libgphoto2.pc -export PKG_CONFIG_PATH=. +export LIBGPHOTO2_LIBS="-L../%{libpkg}-%{libver}/%{libpkg}/.libs -L../%{libpkg}-%{libver}/%{libpkg}_port/%{libpkg}_port/.libs -lgphoto2 -lgphoto2_port" +export LIBGPHOTO2_CFLAGS="-I../%{libpkg}-%{libver} -I../%{libpkg}-%{libver}/%{libpkg}_port" %configure \ - --mandir=%{_mandir} \ - --libdir=%{_libdir} \ --enable-docs \ - --with-doc-dir=%{_docdir}/%{name} + --enable-lockdev \ + --with-doc-dir=%{_docdir}/%{name} -export tagname=CC make @@ -121,9 +98,8 @@ rm -rf "${RPM_BUILD_ROOT}" pushd %{libpkg}-%{libver} -export tagname=CC -export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} -make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install + export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} + make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install pushd packaging/linux-hotplug/ install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ @@ -132,60 +108,38 @@ # get the correct lib export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/%{libpkg}/print-camera-list hal-fdi | grep -v " + +@@ -54,16 +52,10 @@ + en-US + + +- +- +- +- ++ + + +- +- +- +- ++ + + + +Index: util/officecfg/util/data_val.xsl +diff -u util/officecfg/util/data_val.xsl:1.8 util/officecfg/util/data_val.xsl:1.8.284.1 +--- util/officecfg/util/data_val.xsl:1.8 Thu Sep 8 08:49:07 2005 ++++ util/officecfg/util/data_val.xsl Sun Dec 24 00:10:57 2006 +@@ -41,9 +41,7 @@ + xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:oor="http://openoffice.org/2001/registry" +- xmlns:install="http://openoffice.org/2004/installation" +- xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper" +- extension-element-prefixes="filehelper"> ++ xmlns:install="http://openoffice.org/2004/installation"> + + + +@@ -52,16 +50,10 @@ + . + + +- +- +- +- ++ + + +- +- +- +- ++ + + + +Index: util/officecfg/util/makefile.pmk +diff -u util/officecfg/util/makefile.pmk:1.34 util/officecfg/util/makefile.pmk:1.34.284.1 +--- util/officecfg/util/makefile.pmk:1.34 Thu Sep 8 08:49:46 2005 ++++ util/officecfg/util/makefile.pmk Sun Dec 24 00:10:57 2006 +@@ -34,7 +34,8 @@ + #************************************************************************* + + XSLDIR=$(PRJ)$/util +-XCSROOT=$(PWD)$/$(PRJ) ++ABSXCSROOT=$(PWD)$/$(PRJ) ++XCSROOT=.. + DTDDIR=$(PRJ) + PROCESSOUT=$(MISC) + PROCESSORDIR=$(CLASSDIR) +Index: installation/scp2/source/ooo/file_library_ooo.scp +diff -u installation/scp2/source/ooo/file_library_ooo.scp:1.219 installation/scp2/source/ooo/file_library_ooo.scp:1.219.8.1 +--- installation/scp2/source/ooo/file_library_ooo.scp:1.219 Wed Dec 13 07:15:32 2006 ++++ installation/scp2/source/ooo/file_library_ooo.scp Tue Dec 26 12:33:27 2006 +@@ -2339,6 +2339,24 @@ + End + #endif + ++#ifndef SYSTEM_LIBXSLT ++File gid_File_Lib_Xslt ++ TXT_FILE_BODY; ++ Styles = (PACKED); ++ Dir = gid_Dir_Program; ++ #ifdef UNX ++ #ifdef MACOSX ++ Name = STRING(CONCAT3(libxslt,.1.1.16,UNXSUFFIX)); ++ #else ++ Name = STRING(CONCAT3(libxslt,UNXSUFFIX,.1.1.16)); ++ #endif ++ #else ++ Name = "libxslt.dll"; ++ #endif ++End ++#endif + -+ PKG_CHECK_MODULES( LIBXSLT, libxslt ) -+else -+ AC_MSG_RESULT([none]) -+ SYSTEM_LIBXSLT=NO -+fi -+AC_SUBST(SYSTEM_LIBXSLT) + -+if test "$SYSTEM_LIBXSLT" == "NO"; then -+dnl =================================================================== - dnl Check for system sablot - dnl =================================================================== - AC_MSG_CHECKING([which sablot to use]) -@@ -2666,6 +2685,7 @@ - fi - AC_SUBST(SYSTEM_SABLOT) - AC_SUBST(SABLOT_LIBS) -+fi + STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Unoxml, unoxml ) - dnl =================================================================== - dnl Check for system curl -diff -u config_office.orig/set_soenv.in config_office/set_soenv.in ---- openoffice.org.orig/config_office/set_soenv.in 2005-08-30 15:45:40.000000000 +0100 -+++ openoffice.org/config_office/set_soenv.in 2005-08-30 15:50:51.000000000 +0100 -@@ -1769,6 +1769,7 @@ ToFile( "DB_JAR", "@DB_JAR@", - ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" ); - ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" ); - ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); -+ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); - ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" ); - ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" ); - ToFile( "SYSTEM_CURL", "@SYSTEM_CURL@", "e" ); -Index: source/cxxhelp/provider/makefile.mk -=================================================================== -RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v -retrieving revision 1.16 -diff -u -p -u -r1.16 makefile.mk ---- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/makefile.mk 11 Apr 2005 09:32:12 -0000 1.16 -+++ openoffice.org/xmlhelp/source/cxxhelp/provider/makefile.mk 30 Aug 2005 15:09:58 -0000 -@@ -79,6 +79,12 @@ CFLAGS += -DHAVE_EXPAT_H - CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) + File gid_File_Lib_Jvmfwk +Index: installation/scp2/source/ooo/makefile.mk +diff -u installation/scp2/source/ooo/makefile.mk:1.47 installation/scp2/source/ooo/makefile.mk:1.47.8.1 +--- installation/scp2/source/ooo/makefile.mk:1.47 Tue Dec 12 08:17:58 2006 ++++ installation/scp2/source/ooo/makefile.mk Tue Dec 26 12:33:27 2006 +@@ -107,6 +107,10 @@ + SCPDEFS+=-DSYSTEM_LIBXML .ENDIF +.IF "$(SYSTEM_LIBXSLT)" == "YES" -+PKGCONFIG_MODULES=libxslt -+.INCLUDE: pkg_config.mk -+CFLAGS+=-DSYSTEM_LIBXSLT ++SCPDEFS+=-DSYSTEM_LIBXSLT ++.ENDIF ++ + .IF "$(SYSTEM_DB)" == "YES" + SCPDEFS+=-DSYSTEM_DB + .ENDIF +Index: installation/scp2/source/ooo/module_hidden_ooo.scp +diff -u installation/scp2/source/ooo/module_hidden_ooo.scp:1.48 installation/scp2/source/ooo/module_hidden_ooo.scp:1.48.6.1 +--- installation/scp2/source/ooo/module_hidden_ooo.scp:1.48 Wed Dec 13 08:13:01 2006 ++++ installation/scp2/source/ooo/module_hidden_ooo.scp Tue Dec 26 12:33:27 2006 +@@ -417,6 +417,7 @@ + gid_File_Lib_Ucphier1, + gid_File_Lib_Ucppkg1, + gid_File_Lib_Xml2, ++ gid_File_Lib_Xslt, + gid_File_Lib_LibXMLSec_xmlsecnss, + gid_File_Lib_LibXMLSec_xmlseccore, + gid_File_Lib_LibXMLSec_xmlsecmscrypto, +Index: installation/scp2/source/ooo/shortcut_ooo.scp +diff -u installation/scp2/source/ooo/shortcut_ooo.scp:1.21 installation/scp2/source/ooo/shortcut_ooo.scp:1.21.8.1 +--- installation/scp2/source/ooo/shortcut_ooo.scp:1.21 Tue Dec 12 08:18:23 2006 ++++ installation/scp2/source/ooo/shortcut_ooo.scp Tue Dec 26 12:33:27 2006 +@@ -63,6 +63,34 @@ + #endif + #endif + ++#ifndef SYSTEM_LIBXSLT ++#ifdef UNX ++ ++Shortcut gid_Shortcut_Lib_Xslt ++ FileID = gid_File_Lib_Xslt; ++ Dir = gid_Dir_Program; ++#ifdef MACOSX ++ Name = STRING(CONCAT2(libxslt.1,UNXSUFFIX)); ++#else ++ Name = STRING(CONCAT3(libxslt,UNXSUFFIX,.1)); ++#endif ++ Styles = (NETWORK,RELATIVE); ++End ++ ++#endif ++ ++#ifdef UNX ++ ++Shortcut gid_Shortcut_Lib_Xslt_2 ++ ShortcutID = gid_Shortcut_Lib_Xslt; ++ Dir = gid_Dir_Program; ++ Name = STRING(CONCAT2(libxslt,UNXSUFFIX)); ++ Styles = (NETWORK,RELATIVE); ++End ++ ++#endif ++#endif ++ + #ifdef UNX + + Shortcut gid_Shortcut_Lib_Cppu_Linker +Index: util/xmlhelp/prj/build.lst +diff -u util/xmlhelp/prj/build.lst:1.11 util/xmlhelp/prj/build.lst:1.11.8.1 +--- util/xmlhelp/prj/build.lst:1.11 Mon Oct 30 00:35:29 2006 ++++ util/xmlhelp/prj/build.lst Sun Dec 24 01:06:46 2006 +@@ -1,4 +1,4 @@ +-xh xmlhelp : ucbhelper XmlSearch SABLOT:sablot jut unoil BERKELEYDB:berkeleydb svtools NULL ++xh xmlhelp : ucbhelper XmlSearch LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools NULL + xh xmlhelp usr1 - all xh_mkout NULL + xh xmlhelp\inc nmake - all xh_inc NULL + xh xmlhelp\source\helpprovider nmake - all xh_helpprovider xh_inc NULL +Index: util/xmlhelp/source/cxxhelp/provider/makefile.mk +diff -u util/xmlhelp/source/cxxhelp/provider/makefile.mk:1.17 util/xmlhelp/source/cxxhelp/provider/makefile.mk:1.17.60.1 +--- util/xmlhelp/source/cxxhelp/provider/makefile.mk:1.17 Fri Sep 9 05:19:42 2005 ++++ util/xmlhelp/source/cxxhelp/provider/makefile.mk Sun Dec 24 01:06:46 2006 +@@ -52,8 +52,18 @@ + CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) + .ENDIF + +-.IF "$(SYSTEM_SABLOT)" == "YES" +-CFLAGS+=-DSYSTEM_SABLOT ++.IF "$(SYSTEM_LIBXML)" == "YES" ++CFLAGS+= $(LIBXML_CFLAGS) ++.ELSE ++LIBXMLINCDIR=external$/libxml ++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) +.ENDIF + - .IF "$(SYSTEM_SABLOT)" == "YES" - CFLAGS+=-DSYSTEM_SABLOT ++.IF "$(SYSTEM_LIBXSLT)" == "YES" ++CFLAGS+= $(LIBXSLT_CFLAGS) ++.ELSE ++LIBXSLTINCDIR=external$/libxslt ++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) .ENDIF -Index: source/cxxhelp/provider/urlparameter.cxx -=================================================================== -RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx,v -retrieving revision 1.36 -diff -u -p -u -r1.36 urlparameter.cxx ---- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 30 Mar 2005 08:38:37 -0000 1.36 -+++ openoffice.org/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 30 Aug 2005 15:09:59 -0000 -@@ -61,6 +61,11 @@ + + .IF "$(GUI)"=="WNT" +Index: util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +diff -u util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx:1.39 util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx:1.39.16.1 +--- util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx:1.39 Sat Sep 16 18:18:38 2006 ++++ util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Sun Dec 24 01:06:46 2006 +@@ -64,17 +64,9 @@ #ifndef _RTL_URI_HXX_ #include #endif -+#ifdef SYSTEM_LIBXSLT +-#ifdef SYSTEM_SABLOT +-#include +-#include +-#else +-#ifndef SablotHIncl +-#include +-#endif +-#ifndef ShandlerHIncl +-#include +-#endif +-#endif +#include +#include +#include -+#else - #ifdef SYSTEM_SABLOT - #include - #include -@@ -72,6 +77,7 @@ - #include - #endif - #endif -+#endif #ifndef BERKELEYDBPROXY_DB_HXX_ #include "db.hxx" #endif -@@ -736,8 +742,7 @@ +@@ -739,42 +731,6 @@ return ret; } - - -+#ifndef SYSTEM_LIBXSLT - - //////////////////////////////////////////////////////////////////////////////// - // InutStreamTransformerImpl // -@@ -771,6 +776,7 @@ - SablotHandle processor_, - int handle ); - -+#endif - +- +-//////////////////////////////////////////////////////////////////////////////// +-// InutStreamTransformerImpl // +-//////////////////////////////////////////////////////////////////////////////// +- +-int schemehandlergetall( void *userData, +- SablotHandle processor_, +- const char *scheme, +- const char *rest, +- char **buffer, +- int *byteCount); +-int schemehandlerfreememory( void *userData, +- SablotHandle processor_, +- char *buffer ); +-int schemehandleropen( void *userData, +- SablotHandle processor_, +- const char *scheme, +- const char *rest, +- int *handle ); +-int schemehandlerget( void *userData, +- SablotHandle processor_, +- int handle, +- char *buffer, +- int *byteCount ); +-int schemehandlerput( void *userData, +- SablotHandle processor_, +- int handle, +- const char *buffer, +- int *byteCount ); +-int schemehandlerclose( void *userData, +- SablotHandle processor_, +- int handle ); +- +- struct UserData { -@@ -788,7 +794,124 @@ + UserData( InputStreamTransformer* pTransformer, +@@ -791,7 +747,122 @@ URLParameter* m_pInitial; }; -+#ifdef SYSTEM_LIBXSLT +UserData *ugblData = 0; + +static int @@ -137,7 +433,7 @@ + return 1; + return 0; +} -+ + +static void * +pkgOpen(const char * URI) { + rtl::OUString language,jar,path; @@ -179,7 +475,7 @@ +static void * +helpOpen(const char * URI) { + rtl::OUString language,jar,path; - ++ + URLParameter urlpar( rtl::OUString::createFromAscii( URI ), + ugblData->m_pDatabases ); + @@ -238,24 +534,21 @@ + delete pRef; + return 0; +} -+#endif InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, Databases* pDatabases, -@@ -815,6 +938,7 @@ +@@ -818,94 +889,82 @@ } else { -+#ifndef SYSTEM_LIBXSLT - SchemeHandler schemeHandler; - schemeHandler.getAll = schemehandlergetall; - schemeHandler.freeMemory = schemehandlerfreememory; -@@ -822,87 +946,89 @@ - schemeHandler.get = schemehandlerget; - schemeHandler.put = schemehandlerput; - schemeHandler.close = schemehandlerclose; -+#endif - +- SchemeHandler schemeHandler; +- schemeHandler.getAll = schemehandlergetall; +- schemeHandler.freeMemory = schemehandlerfreememory; +- schemeHandler.open = schemehandleropen; +- schemeHandler.get = schemehandlerget; +- schemeHandler.put = schemehandlerput; +- schemeHandler.close = schemehandlerclose; +- UserData userData( this,urlParam,pDatabases ); // Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array @@ -263,7 +556,8 @@ - const char* parameter[42]; + const char* parameter[44]; rtl::OString parString[43]; - int last = 0; +- int last = 0; ++ int last = 0; parString[last++] = "Program"; - parString[last++] = urlParam->getByName( "Program" ); @@ -361,109 +655,862 @@ parameter[last] = 0; - -+#ifndef SYSTEM_LIBXSLT - SablotHandle p; - SablotCreateProcessor(&p); - SablotRegHandler( p,HLR_SCHEME,&schemeHandler,(void*)(&userData) ); -+#endif +- SablotHandle p; +- SablotCreateProcessor(&p); +- SablotRegHandler( p,HLR_SCHEME,&schemeHandler,(void*)(&userData) ); rtl::OUString xslURL = pDatabases->getInstallPathAsURL/*WithOutEncoding*/(); rtl::OString xslURLascii( -@@ -910,7 +1036,31 @@ - xslURL.getLength(), +@@ -914,32 +973,33 @@ RTL_TEXTENCODING_ASCII_US/*osl_getThreadTextEncoding()*/); xslURLascii += "main_transform.xsl"; -+#ifdef SYSTEM_LIBXSLT -+ ugblData = &userData; + +- const char aVndPkgConstStr[] = "vnd.sun.star.pkg:/"; +- const char aVndResConstStr[] = "vnd.sun.star.resultat:/"; +- char aVndPkgStr[ sizeof( aVndPkgConstStr ) ]; +- strcpy( aVndPkgStr, aVndPkgConstStr ); +- char aVndResStr[ sizeof( aVndResConstStr ) ]; +- strcpy( aVndResStr, aVndResConstStr ); +-#ifdef SYSTEM_SABLOT +- SablotRunProcessor( p, +- xslURLascii.getStr(), +- aVndPkgStr, +- aVndResStr, +- parameter, +- 0); +-#else +- SablotRunProcessor( p, +- const_cast(xslURLascii.getStr()), +- aVndPkgStr, +- aVndResStr, +- const_cast(parameter), +- 0); +-#endif +- +- SablotDestroyProcessor( p ); ++ ugblData = &userData; ++ ++ xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose); ++ xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose); + -+ xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose); -+ xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose); ++ xsltStylesheetPtr cur = ++ xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr()); + -+ xsltStylesheetPtr cur = -+ xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr()); - -+ xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/"); -+ -+ xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter); -+ if (res) { -+ xmlChar *doc_txt_ptr=0; -+ int doc_txt_len; -+ int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur); -+ addToBuffer((const char*)doc_txt_ptr, doc_txt_len); -+ xmlFree(doc_txt_ptr); -+ } -+ xmlPopInputCallbacks(); -+ xmlPopInputCallbacks(); -+ xmlFreeDoc(res); -+ xmlFreeDoc(doc); -+ xsltFreeStylesheet(cur); -+#else - const char aVndPkgConstStr[] = "vnd.sun.star.pkg:/"; - const char aVndResConstStr[] = "vnd.sun.star.resultat:/"; - char aVndPkgStr[ sizeof( aVndPkgConstStr ) ]; -@@ -934,6 +1084,7 @@ - #endif - - SablotDestroyProcessor( p ); -+#endif ++ xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/"); ++ ++ xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter); ++ if (res) ++ { ++ xmlChar *doc_txt_ptr=0; ++ int doc_txt_len; ++ int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur); ++ addToBuffer((const char*)doc_txt_ptr, doc_txt_len); ++ xmlFree(doc_txt_ptr); ++ } ++ xmlPopInputCallbacks(); ++ xmlPopInputCallbacks(); ++ xmlFreeDoc(res); ++ xmlFreeDoc(doc); ++ xsltFreeStylesheet(cur); } } - -@@ -1079,8 +1230,7 @@ - } - +- ++ + InputStreamTransformer::~InputStreamTransformer() + { +@@ -1080,205 +1140,3 @@ + delete[] tmp; + len += len_; + } - - -+#ifndef SYSTEM_LIBXSLT - - /** - * getAll: open the URI and return the whole string -@@ -1275,7 +1425,4 @@ - return 0; - } - - - - +-/** +- * getAll: open the URI and return the whole string +- * scheme = URI scheme (e.g. "http") +- * rest = the rest of the URI (without colon) +- * the document is returned in a handler-allocated buffer +- * byteCount holds the byte count on return +- * return *buffer = NULL if not processed +-*/ - -+#endif -Index: util/makefile.mk -=================================================================== -RCS file: /cvs/util/xmlhelp/util/makefile.mk,v -retrieving revision 1.7 -diff -u -p -u -r1.7 makefile.mk ---- openoffice.org.orig/xmlhelp/util/makefile.mk 30 Mar 2005 08:38:50 -0000 1.7 -+++ openoffice.org/xmlhelp/util/makefile.mk 30 Aug 2005 15:10:03 -0000 -@@ -62,6 +62,11 @@ - .ENDIF # wnt - .ENDIF # sablot3rdlib +-int schemehandlergetall( void *userData, +- SablotHandle processor_, +- const char *scheme, +- const char *rest, +- char **buffer, +- int *byteCount ) +-{ +- (void)processor_; +- +- rtl::OUString language,jar,path; +- UserData *uData = reinterpret_cast< UserData* >( userData ); +- +- if( strcmp( scheme,"vnd.sun.star.help" ) == 0 ) +- { +- URLParameter urlpar( rtl::OUString::createFromAscii( scheme ) + +- rtl::OUString::createFromAscii( ":" ) + +- rtl::OUString::createFromAscii( rest ), +- uData->m_pDatabases ); +- +- jar = urlpar.get_jar(); +- language = urlpar.get_language(); +- path = urlpar.get_path(); +- } +- else if( strcmp( scheme,"vnd.sun.star.pkg" ) == 0 ) +- { +- if( uData->m_pInitial->get_eid().getLength() ) +- { +- uData->m_pDatabases->popupDocument( uData->m_pInitial,buffer,byteCount ); +- return 0; +- } +- else +- { +- jar = uData->m_pInitial->get_jar(); +- language = uData->m_pInitial->get_language(); +- path = uData->m_pInitial->get_path(); +- } +- } +- else +- { +- *buffer = 0; +- *byteCount = 0; +- return 0; +- } +- +-// fprintf(stdout,"jarFile %s\n",(rtl::OUStringToOString(jar,RTL_TEXTENCODING_UTF8).getStr())); +-// fprintf(stdout,"lang %s\n",(rtl::OUStringToOString(language,RTL_TEXTENCODING_UTF8).getStr())); +-// fprintf(stdout,"path %s\n",(rtl::OUStringToOString(path,RTL_TEXTENCODING_UTF8).getStr())); +- +- Reference< XInputStream > xInputStream; +- Reference< XHierarchicalNameAccess > xNA = uData->m_pDatabases->jarFile( jar,language ); +- +- if( xNA.is() ) +- { +- try +- { +- Any aEntry = xNA->getByHierarchicalName( path ); +- Reference< XActiveDataSink > xSink; +- if( ( aEntry >>= xSink ) && xSink.is() ) +- xInputStream = xSink->getInputStream(); +- } +- catch ( NoSuchElementException & ) +- { +- } +- } +- +- if( xInputStream.is() ) +- { +- sal_Int32 size = 0; +- +- Reference< XSeekable > xSeekable( xInputStream,UNO_QUERY ); +- +- if( xSeekable.is() ) +- size = sal_Int32( xSeekable->getLength() ); +- else +- size = sal_Int32( xInputStream->available() ); +- +- *buffer = new char[ 1+size ]; +- (*buffer)[ size ] = 0; +- +- Sequence< sal_Int8 > aSeq; +- xInputStream->readBytes( aSeq,size ); +- +- rtl_copyMemory( (void*)(*buffer),(void*)(aSeq.getConstArray()),sal_uInt32(size) ); +- *byteCount = size; +- } +- else +- uData->m_pDatabases->errorDocument( language,buffer,byteCount ); +- +- return 0; +-} +- +-/* freeMemory: free the buffer allocated by getAll +- */ +- +-int schemehandlerfreememory( void *userData, +- SablotHandle processor_, +- char *buffer ) +-{ +- (void)userData; +- (void)processor_; +- +- delete[] buffer; +- return 0; +-} +- +- +-/* open: open the URI and return a handle +- scheme = URI scheme (e.g. "http") +- rest = the rest of the URI (without colon) +- the resulting handle is returned in '*handle' +-*/ +- +-int schemehandleropen( void *userData, +- SablotHandle processor_, +- const char *scheme, +- const char *rest, +- int *handle ) +-{ +- (void)userData; +- (void)processor_; +- (void)scheme; +- (void)rest; +- +- *handle = 0; +- return 0; +-} +- +-/* get: retrieve data from the URI +- handle = the handle assigned on open +- buffer = pointer to the data +- *byteCount = number of bytes to read +- (the number actually read is returned here) +-*/ +- +-int schemehandlerget( void *userData, +- SablotHandle processor_, +- int handle, +- char *buffer, +- int *byteCount ) +-{ +- (void)userData; +- (void)processor_; +- (void)handle; +- (void)buffer; +- +- *byteCount = 0; +- return 0; +-} +- +-/* put: save data to the URI (if possible) +- handle = the handle assigned on open +- buffer = pointer to the data +- *byteCount = number of bytes to write +- (the number actually written is returned here) +-*/ +-int schemehandlerput( void *userData, +- SablotHandle processor_, +- int handle, +- const char *buffer, +- int *byteCount ) +-{ +- (void)processor_; +- (void)handle; +- +- UserData *uData = reinterpret_cast< UserData* >( userData ); +- uData->m_pTransformer->addToBuffer( buffer,*byteCount ); +- return 0; +-} +- +-/* close: close the URI with the given handle +- handle = the handle assigned on open +-*/ +- +-int schemehandlerclose( void *userData, +- SablotHandle processor_, +- int handle ) +-{ +- (void)userData; +- (void)processor_; +- (void)handle; +- +- return 0; +-} +- +- +- +- +- +Index: util/xmlhelp/util/makefile.mk +diff -u util/xmlhelp/util/makefile.mk:1.9 util/xmlhelp/util/makefile.mk:1.9.44.1 +--- util/xmlhelp/util/makefile.mk:1.9 Thu Jan 5 10:18:15 2006 ++++ util/xmlhelp/util/makefile.mk Sun Dec 24 01:06:47 2006 +@@ -53,15 +53,6 @@ + CFLAGS+=-GR + .ENDIF -+.IF "$(SYSTEM_LIBXSLT)" == "YES" -+PKGCONFIG_MODULES=libxslt -+.INCLUDE: pkg_config.mk -+.ENDIF -+ +-.IF "$(SABLOT3RDLIB)"=="" +-.IF "$(GUI)"=="UNX" +-SABLOT3RDLIB=-lsablot +-.ENDIF # unx +-.IF "$(GUI)"=="WNT" +-SABLOT3RDLIB=sablot.lib +-.ENDIF # wnt +-.ENDIF # sablot3rdlib +- # --- Shared-Library --------------------------------------------------- SHL1TARGET=$(TARGET)$(UCP_VERSION) -@@ -75,13 +80,18 @@ +@@ -75,12 +66,11 @@ $(CPPULIB) \ $(SALLIB) \ $(VOSLIB) \ - $(SABLOT3RDLIB) \ $(EXPATASCII3RDLIB) \ $(UCBHELPERLIB) \ - $(SVLLIB) \ - $(BERKELEYLIB) - # $(BERKELEYCPPLIB) +- $(SVLLIB) \ +- $(BERKELEYLIB) +-# $(BERKELEYCPPLIB) ++ $(SVLLIB) \ ++ $(BERKELEYLIB) \ ++ $(XSLTLIB) -+.IF "$(SYSTEM_LIBXSLT)" == "YES" -+ SHL1STDLIBS+=$(PKGCONFIG_LIBS) + SHL1LIBS = \ + $(SLB)$/jaqe.lib \ +Index: tools/config_office/configure.in +diff -u tools/config_office/configure.in:1.190 tools/config_office/configure.in:1.190.4.1 +--- tools/config_office/configure.in:1.190 Tue Dec 12 08:05:16 2006 ++++ tools/config_office/configure.in Sat Dec 23 09:22:53 2006 +@@ -162,9 +162,6 @@ + assertions, object counting, etc. Larger build. + Independent from --enable-debug + ],,) +-AC_ARG_ENABLE(xsltproc, +-[ --enable-xsltproc: Use xsltproc at buildtime, even when java is available +-],,) + AC_ARG_ENABLE(crashdump, + [[ --enable-crashdump[=yes|TRUE|STATIC|no] + Enable (disable) the crashdump feature code. [default=no] +@@ -327,8 +324,8 @@ + [ --with-serializer-jar=JARFILE Specify path to jarfile manually ], + [ SERIALIZER_JAR="$withval" + ]) +-AC_ARG_WITH(system-sablot, +-[ --with-system-sablot Use sablot already on system ++AC_ARG_WITH(system-libxslt, ++[ --with-system-libxslt Use libxslt already on system + ],,) + AC_ARG_WITH(system-odbc, + [ --with-system-odbc-headers Use the odbc headers already on system +@@ -2045,11 +2042,9 @@ + if test "$WITH_JAVA" != "no"; then + AC_MSG_RESULT([yes]) + SOLAR_JAVA="TRUE" +- NEEDXSLTPROC="no" + else + AC_MSG_RESULT([no]) + SOLAR_JAVA="" +- NEEDXSLTPROC="yes" + + AC_MSG_WARN([building without java will mean some features will not be available]) + echo "building without java will mean some features will not be available" >>warn +@@ -2391,21 +2386,6 @@ + AC_SUBST(JAVAAOTCOMPILER) + AC_SUBST(JAVADOC) + +-if test "$NEEDXSLTPROC" = "no" && test -z "$enable_xsltproc"; then +- XSLTPROC=NO_XSLTPROC +-else +- dnl Check for xsltproc +- AC_PATH_PROG(XSLTPROC, xsltproc, no) +- if test "$XSLTPROC" = "no"; then +- AC_MSG_ERROR([xsltproc is required]) +- fi +- # somehow AC_MSG_WARN won't work... +- echo "to prevent incompatibilities between internal libxml2 and xsltproc, the office will be build with system-libxml" +- echo "to prevent incompatibilities between internal libxml2 and xsltproc, the office will be build with system-libxml" >> warn +- with_system_libxml=yes +-fi +-AC_SUBST(XSLTPROC) +- + dnl =================================================================== + dnl Checks for specific files. + dnl =================================================================== +@@ -2907,6 +2887,40 @@ + fi + AC_SUBST(USE_FT_EMBOLDEN) + ++ ++dnl =================================================================== ++dnl Check for system libxslt ++dnl =================================================================== ++AC_MSG_CHECKING([which libxslt to use]) ++if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \ ++ test "$with_system_libxslt" != "no"; then ++ AC_MSG_RESULT([external]) ++ SYSTEM_LIBXSLT=YES ++ ++ PKG_CHECK_MODULES( LIBXSLT, libxslt ) ++ ++ dnl Check for xsltproc ++ AC_PATH_PROG(XSLTPROC, xsltproc, no) ++ if test "$XSLTPROC" = "no"; then ++ AC_MSG_ERROR([xsltproc is required]) ++ fi ++ if test -z "$with_system_libxml" -o -z "$with_system_libs" || \ ++ test "$with_system_libxml" == "no"; then ++ # somehow AC_MSG_WARN won't work... ++ echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" ++ echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn ++ with_system_libxml=yes ++ fi ++else ++ AC_MSG_RESULT([none]) ++ SYSTEM_LIBXSLT=NO ++ BUILD_TYPE="$BUILD_TYPE LIBXSLT" ++fi ++AC_SUBST(SYSTEM_LIBXSLT) ++AC_SUBST(LIBXSLT_CFLAGS) ++AC_SUBST(LIBXSLT_LIBS) ++ ++ + dnl =================================================================== + dnl Check for system libxml + dnl =================================================================== +@@ -3202,31 +3216,6 @@ + if test -n "$NEED_XALAN"; then + BUILD_TYPE="$BUILD_TYPE XALAN" + fi +- +- +-dnl =================================================================== +-dnl Check for system sablot +-dnl =================================================================== +-AC_MSG_CHECKING([which sablot to use]) +-if test -n "$with_system_sablot" -o -n "$with_system_libs" && \ +- test "$with_system_sablot" != "no"; then +- AC_MSG_RESULT([external]) +- SYSTEM_SABLOT=YES +- +- AC_PATH_PROG( SABLOTCONFIG, sablot-config) +- if test -z "$SABLOTCONFIG"; then +- AC_MSG_ERROR([install sablot to run this script]) +- fi +- +- SABLOT_LIBS=`$SABLOTCONFIG --libs` +- SABLOT_LIBS="-lsablot $SABLOT_LIBS" +-else +- AC_MSG_RESULT([internal]) +- SYSTEM_SABLOT=NO +- BUILD_TYPE="$BUILD_TYPE SABLOT" +-fi +-AC_SUBST(SYSTEM_SABLOT) +-AC_SUBST(SABLOT_LIBS) + + dnl =================================================================== + dnl Check for system curl +Index: tools/config_office/set_soenv.in +diff -u tools/config_office/set_soenv.in:1.128 tools/config_office/set_soenv.in:1.128.4.1 +--- tools/config_office/set_soenv.in:1.128 Tue Dec 12 08:05:54 2006 ++++ tools/config_office/set_soenv.in Sat Dec 23 09:22:53 2006 +@@ -1451,7 +1451,6 @@ + ToFile( "SRC_ROOT", $SRC_ROOT, "e" ); + ToFile( "SHELL", $SHELL, "e" ); + ToFile( "JAVA_HOME", $JAVA_HOME, "e" ); +-ToFile( "XSLTPROC", "@XSLTPROC@", "e" ); + ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); + ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); + ToFile( "ANT", "@ANT@", "e" ); +@@ -1821,9 +1820,10 @@ + ToFile( "SYSTEM_XALAN", "@SYSTEM_XALAN@", "e" ); + ToFile( "XALAN_JAR", "@XALAN_JAR@", "e" ); + ToFile( "SERIALIZER_JAR", "@SERIALIZER_JAR@", "e" ); +-ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" ); +-ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" ); + ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); ++ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); ++ToFile( "LIBXSLT_CFLAGS", "@LIBXSLT_CFLAGS@", "e" ); ++ToFile( "LIBXSLT_LIBS", "@LIBXSLT_LIBS@", "e" ); + ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" ); + ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" ); + ToFile( "SYSTEM_CURL", "@SYSTEM_CURL@", "e" ); +Index: util/extensions/source/update/check/makefile.mk +diff -u util/extensions/source/update/check/makefile.mk:1.6 util/extensions/source/update/check/makefile.mk:1.6.16.1 +--- util/extensions/source/update/check/makefile.mk:1.6 Wed Dec 13 07:17:13 2006 ++++ util/extensions/source/update/check/makefile.mk Sun Dec 24 00:26:26 2006 +@@ -41,9 +41,10 @@ + LIBTARGET=NO + ENABLE_EXCEPTIONS=TRUE + +-XSLDIR=$(SOLARXMLDIR)$/processing +-XCSROOT=$(SOLARXMLDIR) +-DTDDIR=$(SOLARXMLDIR) ++ABSXCSROOT=$(SOLARXMLDIR) ++XCSROOT=.. ++DTDDIR=$(ABSXCSROOT) ++XSLDIR=$(ABSXCSROOT)$/processing + PROCESSOUT=$(MISC)$/$(TARGET) + PROCESSORDIR=$(SOLARBINDIR) + +Index: tools/solenv/config/ssrc680.ini +diff -u tools/solenv/config/ssrc680.ini:1.113 tools/solenv/config/ssrc680.ini:1.113.12.1 +--- tools/solenv/config/ssrc680.ini:1.113 Tue Dec 12 08:04:39 2006 ++++ tools/solenv/config/ssrc680.ini Sun Dec 24 01:04:55 2006 +@@ -93,7 +93,7 @@ + { + BIG_SVX TRUE + BMP_WRITES_FLAG TRUE +- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG GTK ICU ++ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU + RES_ENUS TRUE + RES_GER TRUE + NO_REC_RES TRUE +@@ -118,7 +118,6 @@ + wrapper_override_cc_wrapper TRUE + WITH_FONTOOO YES + BUILD_SPECIAL TRUE +- XSLTPROC NO_XSLTPROC + } + common:1 IF X%CWS_WORK_STAMP%X != XX + { +Index: tools/solenv/config/stand.lst +diff -u tools/solenv/config/stand.lst:1.103 tools/solenv/config/stand.lst:1.103.108.1 +--- tools/solenv/config/stand.lst:1.103 Mon Oct 9 01:54:57 2006 ++++ tools/solenv/config/stand.lst Sun Dec 24 01:04:55 2006 +@@ -502,6 +502,10 @@ + { + SCS :pserver:hr at so-cvs-tunnel.germany.sun.com:/cvs + } ++ libxslt ++ { ++ SCS :pserver:hr at so-cvs-tunnel.germany.sun.com:/cvs ++ } + libxml2 + { + SCS :pserver:hr at so-cvs-tunnel.germany.sun.com:/cvs +Index: tools/solenv/inc/libs.mk +diff -u tools/solenv/inc/libs.mk:1.106 tools/solenv/inc/libs.mk:1.106.52.1 +--- tools/solenv/inc/libs.mk:1.106 Tue Nov 14 06:04:00 2006 ++++ tools/solenv/inc/libs.mk Sun Dec 24 01:04:55 2006 +@@ -242,6 +242,11 @@ + .ELSE + XML2LIB=-lxml2 + .ENDIF ++.IF "$(SYSTEM_LIBXSLT)"=="YES" ++XSLTLIB=$(LIBXSLT_LIBS) +.ELSE -+ SHL1STDLIBS+=$(SABLOT3RDLIB) ++XSLTLIB=-lxslt $(ZLIB3RD) $(XML2LIB) +.ENDIF + JVMFWKLIB = -ljvmfwk + + # #110743# +@@ -432,6 +437,8 @@ + JVMACCESSLIB = ijvmaccess.lib + CPPUNITLIB = cppunit.lib + XML2LIB = libxml2.lib ++XSLTLIB = libxslt.lib $(ZLIB3RD) $(XML2LIB) + - SHL1LIBS = \ - $(SLB)$/jaqe.lib \ - $(SLB)$/jautil.lib \ + JVMFWKLIB = ijvmfwk.lib + + # #110743# +Index: tools/solenv/inc/tg_config.mk +diff -u tools/solenv/inc/tg_config.mk:1.14 tools/solenv/inc/tg_config.mk:1.14.64.1 +--- tools/solenv/inc/tg_config.mk:1.14 Wed Nov 8 04:03:43 2006 ++++ tools/solenv/inc/tg_config.mk Sun Dec 24 01:04:56 2006 +@@ -34,6 +34,13 @@ + #************************************************************************* + + PACKAGEDIR*:=$(subst,.,$/ $(PACKAGE)) ++XSLTPACKAGEDIR*:=$(subst,.,/ $(PACKAGE)) ++XCSROOTURL!:=$(ABSXCSROOT) ++.IF $(GUI)==WNT ++XCSROOTURL!:=$(shell +$(WRAPCMD) echo $(XCSROOTURL)) ++XCSROOTURL!:=file:///$(subst,\,/ $(XCSROOTURL)) ++.ENDIF ++SYSXSLDIR*:=$(shell +$(WRAPCMD) echo $(XSLDIR)$/) + + # + # --- XCS --- +@@ -60,32 +67,15 @@ + $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs + @echo -------------+ validating and stripping schema files + -$(MKDIRHIER) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +-.IF "$(NO_INSPECTION)"=="" +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< +-.ENDIF # "$(NO_INSPECTION)"=="" +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$* +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ +-.ELSE +-# xsltproc already validates against the dtd. For additional validation, +-# org.openoffice.configuration.Inspector should be replaced and the +-# replacement should be invoked here. +- $(XSLTPROC) -o $(@:d)$*.val \ ++ $(XSLTPROC) --nonet -o $(@:d)$*.val \ + --stringparam componentName $(PACKAGE).$* \ +- $(XSLDIR)$/schema_val.xsl $< +- $(XSLTPROC) -o $(@:d)$*.san \ +- $(XSLDIR)$/sanity.xsl $< +- $(XSLTPROC) -o $(@:d)$*.tmp \ +- $(XSLDIR)$/schema_trim.xsl $< +-# xsltproc already seems to pretty-print the xml, so +-# org.openoffice.helper.PrettyPrinter seems to be unnecessary. +- cp $(@:d)$*.tmp $@ +-.ENDIF +- +$(RM) $(@:d)$*.tmp > $(NULLDEV) +- +$(RM) $(@:d)$*.val > $(NULLDEV) +- +$(RM) $(@:d)$*.san > $(NULLDEV) ++ $(SYSXSLDIR)schema_val.xsl $< ++ $(XSLTPROC) --nonet -o $(@:d)$*.san \ ++ $(SYSXSLDIR)sanity.xsl $< ++ $(XSLTPROC) --nonet -o $@ \ ++ $(SYSXSLDIR)schema_trim.xsl $< ++ +-$(RM) $(@:d)$*.val > $(NULLDEV) ++ +-$(RM) $(@:d)$*.san > $(NULLDEV) + + $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs : %.xcs + # just a copy for now - insert "cfgex" commandline when required +@@ -100,13 +90,9 @@ + $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs + @echo -------------+ creating locale dependent resource bundles + -$(MKDIRHIER) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} +-.ELSE +- $(XSLTPROC) -o $@ \ ++ $(XSLTPROC) --nonet -o $@ \ + --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ +- $(XSLDIR)$/resource.xsl $< +-.ENDIF ++ $(SYSXSLDIR)resource.xsl $< + + # + # --- XCU --- +@@ -127,31 +113,15 @@ + $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu + @echo -------------+ validating and creating a locale independent file + -$(MKDIRHIER) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +-.IF "$(NO_INSPECTION)"=="" +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< +-.ENDIF # "$(NO_INSPECTION)"=="" +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ +-.ELSE +-# xsltproc already validates against the dtd. For additional validation, +-# org.openoffice.configuration.Inspector should be replaced and the +-# replacement should be invoked here. +- $(XSLTPROC) -o $(@:d)$*.val \ +- --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \ +- --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ +- $(XSLDIR)$/data_val.xsl $< +- $(XSLTPROC) -o $(@:d)$*.tmp \ +- --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \ +- --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ +- $(XSLDIR)$/alllang.xsl $< +-# xsltproc already seems to pretty-print the xml, so +-# org.openoffice.helper.PrettyPrinter seems to be unnecessary. +- cp $(@:d)$*.tmp $@ +-.ENDIF +- +$(RM) $(@:d)$*.tmp > $(NULLDEV) +- +$(RM) $(@:d)$*.val > $(NULLDEV) ++ $(XSLTPROC) --nonet -o $(@:d)$*.val \ ++ --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ ++ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ ++ $(SYSXSLDIR)data_val.xsl $< ++ $(XSLTPROC) --nonet -o $@ \ ++ --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ ++ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ ++ $(SYSXSLDIR)alllang.xsl $< ++ +-$(RM) $(@:d)$*.val > $(NULLDEV) + + # --- localizations --- + .IF "$(WITH_LANG)"!="" +@@ -161,7 +131,7 @@ + + $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu + -$(MKDIRHIER) $(@:d) +- $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all ++ $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) --nonet -o $@ -m localize.sdf -l all + + .IF "$(XCU_LANG)" != "" + $(XCU_LANG) : $(XSLDIR)$/alllang.xsl +@@ -173,20 +143,11 @@ + .ENDIF # "$(WITH_LANG)"!="" + @echo ------------- creating locale dependent entries + -$(MKDIRHIER) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ +-.ELSE +- $(XSLTPROC) -o $(@:d)$*.tmp \ +- --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \ +- --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ ++ $(XSLTPROC) --nonet -o $@ \ ++ --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ ++ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ + --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ +- $(XSLDIR)$/alllang.xsl $< +-# xsltproc already seems to pretty-print the xml, so +-# org.openoffice.helper.PrettyPrinter seems to be unnecessary. +- cp $(@:d)$*.tmp $@ +-.ENDIF +- +$(RM) $(@:d)$*.tmp > $(NULLDEV) ++ $(SYSXSLDIR)alllang.xsl $< + + # --- languagepack tag modules --- + .IF "$(LANGUAGEPACKS)" != "" +@@ -209,20 +170,11 @@ + $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu + @echo -------------+ creating a module file + -$(MKDIRHIER) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))} +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@ +-.ELSE +- $(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \ +- --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \ +- --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ ++ $(XSLTPROC) --nonet -o $@ \ ++ --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \ ++ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ + --stringparam module $(subst,$(<:b)-, $(*)) \ +- $(XSLDIR)$/alllang.xsl $< +-# xsltproc already seems to pretty-print the xml, so +-# org.openoffice.helper.PrettyPrinter seems to be unnecessary. +- cp $(@:d)$(@:f:s/.xcu/.tmp/) $@ +-.ENDIF +- +$(RM) $(@:d)$(@:f:s/.xcu/.tmp/) > $(NULLDEV) ++ $(SYSXSLDIR)alllang.xsl $< + + .IF "$(XCUFILES)"!="" + ALLTAR: \ +@@ -230,7 +182,7 @@ + $(XCU_MODULES) \ + $(XCU_LANG) + +-$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)$/registry$/data$/!$(XCSROOT)$/registry$/schema$/!)$$(@:f:s/.xcu/.xcs/) ++$(XCU_DEFAULT) : $$(@:d:s!$(PROCESSOUT)$/registry$/data$/!$(ABSXCSROOT)$/registry$/schema$/!)$$(@:f:s/.xcu/.xcs/) + + .ENDIF # "$(XCUFILES)"!="" + +Index: tools/solenv/inc/unitools.mk +diff -u tools/solenv/inc/unitools.mk:1.49 tools/solenv/inc/unitools.mk:1.49.112.1 +--- tools/solenv/inc/unitools.mk:1.49 Thu Oct 5 09:22:24 2006 ++++ tools/solenv/inc/unitools.mk Sun Dec 24 01:04:56 2006 +@@ -39,6 +39,7 @@ + XMLEX*=xmlex + XRMEX*=xrmex + CFGEX*=cfgex ++XSLTPROC*=xsltproc + + ULFCONV*=ulfconv + +Index: installation/readlicense/docs/readme.xsl +diff -u installation/readlicense/docs/readme.xsl:1.4 installation/readlicense/docs/readme.xsl:1.4.98.2 +--- installation/readlicense/docs/readme.xsl:1.4 Wed Sep 28 08:24:06 2005 ++++ installation/readlicense/docs/readme.xsl Wed Dec 27 06:17:28 2006 +@@ -1,10 +1,7 @@ + + +- +- +- ++ ++ + + + +@@ -20,7 +17,6 @@ + + + +- + + + +@@ -31,14 +27,11 @@ + + + +- + + + + +- + +- + + + +Index: installation/readlicense/prj/build.lst +diff -u installation/readlicense/prj/build.lst:1.7 installation/readlicense/prj/build.lst:1.7.198.1 +--- installation/readlicense/prj/build.lst:1.7 Tue Jun 29 04:37:51 2004 ++++ installation/readlicense/prj/build.lst Sun Dec 24 01:35:53 2006 +@@ -1,4 +1,4 @@ +-ro readlicense_oo : solenv external transex3 NULL ++ro readlicense_oo : solenv external transex3 LIBXSLT:libxslt NULL + ro readlicense_oo usr1 - all ro_root NULL + ro readlicense_oo\docs\readme nmake - all ro_readme NULL + ro readlicense_oo\html nmake - all ro_html NULL +Index: installation/readlicense/util/makefile.pmk +diff -u installation/readlicense/util/makefile.pmk:1.14 installation/readlicense/util/makefile.pmk:1.14.6.3 +--- installation/readlicense/util/makefile.pmk:1.14 Wed Nov 8 03:57:22 2006 ++++ installation/readlicense/util/makefile.pmk Wed Dec 27 13:00:16 2006 +@@ -35,11 +35,6 @@ + + # --- Targets ------------------------------------------------------ + +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +-# FIXME: Java-disabled case not parallel-build safe yet +-MAXPROCESS=1 +-.ENDIF +- + .IF "$(GUI)"=="UNX" + SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b:u)$(j:e:s/.txt//)) + .ELSE # "$(GUI)"=="UNX" +@@ -67,39 +62,33 @@ + +$(COPY) $< $@ + + $(MISC)$/$(GUI)$/README%.html : $(MISC)$/readme%.html +- @+-$(MKDIR) $(@:d) ++ @+-$(MKDIRHIER) $(@:d) + +$(COPY) $< $@ + + $(MISC)$/$(GUI)$/README% : $(MISC)$/readme%.txt +- @+-$(MKDIR) $(@:d) ++ @+-$(MKDIRHIER) $(@:d) + +$(COPY) $< $@ + + $(MISC)$/$(GUI)$/readme% : $(MISC)$/readme% +- @+-$(MKDIR) $(@:d) ++ @+-$(MKDIRHIER) $(@:d) + +$(COPY) $< $@ + + $(MISC)$/readme%.html : +- @+-$(MKDIR) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ +-.ELSE +- sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|||' < ..$/readme.xsl | xsltproc -o $@ \ ++ @+-$(MKDIRHIER) $(@:d) ++ $(XSLTPROC) --nonet -o $@ \ + --stringparam os1 $(OS) \ + --stringparam gui1 $(GUI) \ + --stringparam cp1 $(CPUNAME) \ + --stringparam com1 $(COM) \ + --stringparam lang1 $(@:b:s/_/./:e:s/.//) \ + --stringparam type html \ +- - \ ++ ..$/readme.xsl \ + $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) +-.ENDIF + + $(MISC)$/readme%.txt : +- @+-$(MKDIR) $(@:d) +-.IF "$(XSLTPROC)"=="NO_XSLTPROC" +- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ +-.ELSE +- sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|||' < ..$/readme.xsl | xsltproc -o $@ \ ++ @+-$(MKDIRHIER) $(@:d) ++ $(SED) "s#method=\(.\)html..*#method=\1text\1/>#" < ..$/readme.xsl | \ ++ $(XSLTPROC) --nonet -o $@ \ + --stringparam os1 $(OS) \ + --stringparam gui1 $(GUI) \ + --stringparam cp1 $(CPUNAME) \ +@@ -108,5 +97,3 @@ + --stringparam type text \ + - \ + $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) +-.ENDIF +- --- openoffice.org-2.1.0.ooo72350.svx.showsizes.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 3 16:12:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 11:12:11 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.988,1.989 Message-ID: <200701031612.l03GCBVZ019872@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19858 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#216094 add workspace.impress115.patch Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.988 retrieving revision 1.989 diff -u -r1.988 -r1.989 --- openoffice.org.spec 3 Jan 2007 16:11:40 -0000 1.988 +++ openoffice.org.spec 3 Jan 2007 16:12:09 -0000 1.989 @@ -2575,7 +2575,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Wed Jan 03 2006 Caolan McNamara - 1:2.1.0-6.10 +* Wed Jan 03 2007 Caolan McNamara - 1:2.1.0-6.10 - Resolves: rhbz#216094 add workspace.impress115.patch * Wed Dec 20 2006 Caolan McNamara - 1:2.1.0-6.9 From fedora-cvs-commits at redhat.com Wed Jan 3 16:28:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 11:28:10 -0500 Subject: rpms/openoffice.org/devel workspace.libxslt02.patch,1.2,1.3 Message-ID: <200701031628.l03GSAmS008122@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8106 Modified Files: workspace.libxslt02.patch Log Message: Resolves: rhbz#216094 add workspace.impress115.patch workspace.libxslt02.patch: framework/filter/prj/build.lst | 2 framework/filter/source/config/fragments/langfilter.xsl | 22 framework/filter/source/config/fragments/makefile.mk | 9 installation/readlicense_oo/docs/readme.xsl | 11 installation/readlicense_oo/prj/build.lst | 2 installation/readlicense_oo/util/makefile.pmk | 31 - installation/scp2/source/ooo/file_library_ooo.scp | 18 installation/scp2/source/ooo/makefile.mk | 4 installation/scp2/source/ooo/module_hidden_ooo.scp | 1 installation/scp2/source/ooo/shortcut_ooo.scp | 28 tools/config_office/configure.in | 83 +- tools/config_office/set_soenv.in | 6 tools/solenv/config/stand.lst | 4 tools/solenv/inc/libs.mk | 7 tools/solenv/inc/tg_config.mk | 120 +-- tools/solenv/inc/unitools.mk | 1 util/extensions/source/update/check/makefile.mk | 7 util/officecfg/org/openoffice/configuration/makefile.mk | 3 util/officecfg/prj/build.lst | 24 util/officecfg/util/alllang.xsl | 14 util/officecfg/util/data_val.xsl | 14 util/officecfg/util/makefile.pmk | 3 util/xmlhelp/prj/build.lst | 2 util/xmlhelp/source/cxxhelp/provider/makefile.mk | 14 util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 486 +++++----------- util/xmlhelp/util/makefile.mk | 16 26 files changed, 388 insertions(+), 544 deletions(-) Index: workspace.libxslt02.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.libxslt02.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workspace.libxslt02.patch 3 Jan 2007 16:11:40 -0000 1.2 +++ workspace.libxslt02.patch 3 Jan 2007 16:28:08 -0000 1.3 @@ -1136,27 +1136,6 @@ PROCESSOUT=$(MISC)$/$(TARGET) PROCESSORDIR=$(SOLARBINDIR) -Index: tools/solenv/config/ssrc680.ini -diff -u tools/solenv/config/ssrc680.ini:1.113 tools/solenv/config/ssrc680.ini:1.113.12.1 ---- tools/solenv/config/ssrc680.ini:1.113 Tue Dec 12 08:04:39 2006 -+++ tools/solenv/config/ssrc680.ini Sun Dec 24 01:04:55 2006 -@@ -93,7 +93,7 @@ - { - BIG_SVX TRUE - BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG GTK ICU -+ BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU - RES_ENUS TRUE - RES_GER TRUE - NO_REC_RES TRUE -@@ -118,7 +118,6 @@ - wrapper_override_cc_wrapper TRUE - WITH_FONTOOO YES - BUILD_SPECIAL TRUE -- XSLTPROC NO_XSLTPROC - } - common:1 IF X%CWS_WORK_STAMP%X != XX - { Index: tools/solenv/config/stand.lst diff -u tools/solenv/config/stand.lst:1.103 tools/solenv/config/stand.lst:1.103.108.1 --- tools/solenv/config/stand.lst:1.103 Mon Oct 9 01:54:57 2006 @@ -1393,10 +1372,10 @@ ULFCONV*=ulfconv -Index: installation/readlicense/docs/readme.xsl -diff -u installation/readlicense/docs/readme.xsl:1.4 installation/readlicense/docs/readme.xsl:1.4.98.2 ---- installation/readlicense/docs/readme.xsl:1.4 Wed Sep 28 08:24:06 2005 -+++ installation/readlicense/docs/readme.xsl Wed Dec 27 06:17:28 2006 +Index: installation/readlicense_oo/docs/readme.xsl +diff -u installation/readlicense_oo/docs/readme.xsl:1.4 installation/readlicense_oo/docs/readme.xsl:1.4.98.2 +--- installation/readlicense_oo/docs/readme.xsl:1.4 Wed Sep 28 08:24:06 2005 ++++ installation/readlicense_oo/docs/readme.xsl Wed Dec 27 06:17:28 2006 @@ -1,10 +1,7 @@ @@ -1433,20 +1412,20 @@ -Index: installation/readlicense/prj/build.lst -diff -u installation/readlicense/prj/build.lst:1.7 installation/readlicense/prj/build.lst:1.7.198.1 ---- installation/readlicense/prj/build.lst:1.7 Tue Jun 29 04:37:51 2004 -+++ installation/readlicense/prj/build.lst Sun Dec 24 01:35:53 2006 +Index: installation/readlicense_oo/prj/build.lst +diff -u installation/readlicense_oo/prj/build.lst:1.7 installation/readlicense_oo/prj/build.lst:1.7.198.1 +--- installation/readlicense_oo/prj/build.lst:1.7 Tue Jun 29 04:37:51 2004 ++++ installation/readlicense_oo/prj/build.lst Sun Dec 24 01:35:53 2006 @@ -1,4 +1,4 @@ -ro readlicense_oo : solenv external transex3 NULL +ro readlicense_oo : solenv external transex3 LIBXSLT:libxslt NULL ro readlicense_oo usr1 - all ro_root NULL ro readlicense_oo\docs\readme nmake - all ro_readme NULL ro readlicense_oo\html nmake - all ro_html NULL -Index: installation/readlicense/util/makefile.pmk -diff -u installation/readlicense/util/makefile.pmk:1.14 installation/readlicense/util/makefile.pmk:1.14.6.3 ---- installation/readlicense/util/makefile.pmk:1.14 Wed Nov 8 03:57:22 2006 -+++ installation/readlicense/util/makefile.pmk Wed Dec 27 13:00:16 2006 +Index: installation/readlicense_oo/util/makefile.pmk +diff -u installation/readlicense_oo/util/makefile.pmk:1.14 installation/readlicense_oo/util/makefile.pmk:1.14.6.3 +--- installation/readlicense_oo/util/makefile.pmk:1.14 Wed Nov 8 03:57:22 2006 ++++ installation/readlicense_oo/util/makefile.pmk Wed Dec 27 13:00:16 2006 @@ -35,11 +35,6 @@ # --- Targets ------------------------------------------------------ From fedora-cvs-commits at redhat.com Wed Jan 3 16:49:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 11:49:08 -0500 Subject: rpms/openoffice.org/devel workspace.libxslt02.patch,1.3,1.4 Message-ID: <200701031649.l03Gn8Jl021254@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21180 Modified Files: workspace.libxslt02.patch Log Message: add workspace.libxslt02.patch for openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch workspace.libxslt02.patch: framework/filter/prj/build.lst | 2 framework/filter/source/config/fragments/langfilter.xsl | 22 framework/filter/source/config/fragments/makefile.mk | 9 installation/readlicense_oo/docs/readme.xsl | 11 installation/readlicense_oo/prj/build.lst | 2 installation/readlicense_oo/util/makefile.pmk | 21 installation/scp2/source/ooo/file_library_ooo.scp | 18 installation/scp2/source/ooo/makefile.mk | 4 installation/scp2/source/ooo/module_hidden_ooo.scp | 1 installation/scp2/source/ooo/shortcut_ooo.scp | 28 tools/config_office/configure.in | 83 +- tools/config_office/set_soenv.in | 6 tools/solenv/config/stand.lst | 4 tools/solenv/inc/libs.mk | 7 tools/solenv/inc/tg_config.mk | 120 +-- tools/solenv/inc/unitools.mk | 1 util/extensions/source/update/check/makefile.mk | 7 util/officecfg/org/openoffice/configuration/makefile.mk | 3 util/officecfg/prj/build.lst | 24 util/officecfg/util/alllang.xsl | 14 util/officecfg/util/data_val.xsl | 14 util/officecfg/util/makefile.pmk | 3 util/xmlhelp/prj/build.lst | 2 util/xmlhelp/source/cxxhelp/provider/makefile.mk | 14 util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 486 +++++----------- util/xmlhelp/util/makefile.mk | 16 26 files changed, 383 insertions(+), 539 deletions(-) Index: workspace.libxslt02.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.libxslt02.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- workspace.libxslt02.patch 3 Jan 2007 16:28:08 -0000 1.3 +++ workspace.libxslt02.patch 3 Jan 2007 16:49:06 -0000 1.4 @@ -1438,32 +1438,15 @@ .IF "$(GUI)"=="UNX" SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b:u)$(j:e:s/.txt//)) .ELSE # "$(GUI)"=="UNX" -@@ -67,39 +62,33 @@ - +$(COPY) $< $@ - - $(MISC)$/$(GUI)$/README%.html : $(MISC)$/readme%.html -- @+-$(MKDIR) $(@:d) -+ @+-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ - - $(MISC)$/$(GUI)$/README% : $(MISC)$/readme%.txt -- @+-$(MKDIR) $(@:d) -+ @+-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ - - $(MISC)$/$(GUI)$/readme% : $(MISC)$/readme% -- @+-$(MKDIR) $(@:d) -+ @+-$(MKDIRHIER) $(@:d) - +$(COPY) $< $@ +@@ -69,26 +64,20 @@ $(MISC)$/readme%.html : -- @+-$(MKDIR) $(@:d) + @+-$(MKDIR) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ +- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ -.ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|||' < ..$/readme.xsl | xsltproc -o $@ \ -+ @+-$(MKDIRHIER) $(@:d) -+ $(XSLTPROC) --nonet -o $@ \ ++ $(XSLTPROC) --nonet -o $@ \ --stringparam os1 $(OS) \ --stringparam gui1 $(GUI) \ --stringparam cp1 $(CPUNAME) \ @@ -1472,24 +1455,23 @@ --stringparam type html \ - - \ + ..$/readme.xsl \ - $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) + $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) -.ENDIF $(MISC)$/readme%.txt : -- @+-$(MKDIR) $(@:d) + @+-$(MKDIR) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ +- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ -.ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|||' < ..$/readme.xsl | xsltproc -o $@ \ -+ @+-$(MKDIRHIER) $(@:d) -+ $(SED) "s#method=\(.\)html..*#method=\1text\1/>#" < ..$/readme.xsl | \ -+ $(XSLTPROC) --nonet -o $@ \ ++ $(SED) "s#method=\(.\)html..*#method=\1text\1/>#" < ..$/readme.xsl | \ ++ $(XSLTPROC) --nonet -o $@ \ --stringparam os1 $(OS) \ --stringparam gui1 $(GUI) \ --stringparam cp1 $(CPUNAME) \ -@@ -108,5 +97,3 @@ +@@ -97,5 +86,3 @@ --stringparam type text \ - \ - $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) + $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) -.ENDIF - From fedora-cvs-commits at redhat.com Wed Jan 3 18:10:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 13:10:59 -0500 Subject: rpms/cups/FC-6 cups-str2179.patch,NONE,1.1 cups.spec,1.312,1.313 Message-ID: <200701031810.l03IAxGw028316@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28300 Modified Files: cups.spec Added Files: cups-str2179.patch Log Message: * Wed Jan 3 2007 Tim Waugh - Applied upstream patch to avoid busy loop in client (STR #2179, bug #219330). - Resolves: rhbz#219330 cups-str2179.patch: ipp.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cups-str2179.patch --- --- cups-1.2.7/cups/ipp.c.str2179 2006-06-02 16:15:23.000000000 +0100 +++ cups-1.2.7/cups/ipp.c 2007-01-03 18:08:32.000000000 +0000 @@ -1054,7 +1054,7 @@ if ((n = (*cb)(src, buffer, 8)) < 8) { DEBUG_printf(("ippReadIO: Unable to read header (%d bytes read)!\n", n)); - return (n == 0 ? IPP_IDLE : IPP_ERROR); + return (IPP_ERROR); } /* Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- cups.spec 8 Dec 2006 15:55:37 -0000 1.312 +++ cups.spec 3 Jan 2007 18:10:57 -0000 1.313 @@ -48,6 +48,7 @@ Patch22: cups-str2121.patch Patch23: cups-str2111.patch Patch24: cups-str2133.patch +Patch25: cups-str2179.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -157,6 +158,7 @@ %patch22 -p1 -b .str2121 %patch23 -p1 -b .str2111 %patch24 -p1 -b .str2133 +%patch25 -p1 -b .str2179 %if %lspp %patch100 -p1 -b .lspp @@ -439,6 +441,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Wed Jan 3 2007 Tim Waugh +- Applied upstream patch to avoid busy loop in client (STR #2179, bug #219330). + * Fri Dec 8 2006 Tim Waugh - Requires tmpwatch for the cron.daily script (bug #218901). From fedora-cvs-commits at redhat.com Wed Jan 3 18:11:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 13:11:20 -0500 Subject: rpms/cups/FC-6 cups.spec,1.313,1.314 Message-ID: <200701031811.l03IBK4t028347@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28333 Modified Files: cups.spec Log Message: 1:1.2.7-1.6 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- cups.spec 3 Jan 2007 18:10:57 -0000 1.313 +++ cups.spec 3 Jan 2007 18:11:18 -0000 1.314 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.7 -Release: 1.5%{?dist} +Release: 1.6%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -441,7 +441,7 @@ %{cups_serverbin}/daemon/cups-lpd %changelog -* Wed Jan 3 2007 Tim Waugh +* Wed Jan 3 2007 Tim Waugh 1:1.2.7-1.6 - Applied upstream patch to avoid busy loop in client (STR #2179, bug #219330). * Fri Dec 8 2006 Tim Waugh From fedora-cvs-commits at redhat.com Wed Jan 3 18:53:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 13:53:51 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch, 1.1, 1.2 Message-ID: <200701031853.l03Irp8t002238@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2180 Modified Files: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch Log Message: Resolves: rhbz#216094 add workspace.impress115.patch openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch: source/editeng/impedit2.cxx | 0 svx/source/editeng/impedit2.cxx | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) Index: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch 7 Dec 2006 10:14:41 -0000 1.1 +++ openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch 3 Jan 2007 18:53:48 -0000 1.2 @@ -3,8 +3,8 @@ RCS file: /cvs/graphics/svx/source/editeng/impedit2.cxx,v retrieving revision 1.114 diff -u -r1.114 impedit2.cxx ---- source/editeng/impedit2.cxx 12 Oct 2006 12:39:14 -0000 1.114 -+++ source/editeng/impedit2.cxx 6 Dec 2006 13:46:00 -0000 +--- openoffice.org.orig/svx/source/editeng/impedit2.cxx 12 Oct 2006 12:39:14 -0000 1.114 ++++ openoffice.org/svx/source/editeng/impedit2.cxx 6 Dec 2006 13:46:00 -0000 @@ -1764,9 +1767,10 @@ USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0; From fedora-cvs-commits at redhat.com Wed Jan 3 19:11:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 14:11:30 -0500 Subject: rpms/evolution-sharp/devel .cvsignore, 1.4, 1.5 evolution-sharp.spec, 1.30, 1.31 sources, 1.4, 1.5 evolution-sharp-0.11.1-evo210.patch, 1.2, NONE Message-ID: <200701031911.l03JBUU5015578@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15466 Modified Files: .cvsignore evolution-sharp.spec sources Removed Files: evolution-sharp-0.11.1-evo210.patch Log Message: * Wed Jan 03 2007 Matthew Barnes - 0.12.1-1.fc7 - Update to 0.12.1 - Remove evolution-sharp-0.11.1-evo210.patch (fixed upstream). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Nov 2006 17:43:53 -0000 1.4 +++ .cvsignore 3 Jan 2007 19:11:28 -0000 1.5 @@ -1 +1 @@ -evolution-sharp-0.12.0.tar.bz2 +evolution-sharp-0.12.1.tar.bz2 Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- evolution-sharp.spec 17 Nov 2006 17:43:53 -0000 1.30 +++ evolution-sharp.spec 3 Jan 2007 19:11:28 -0000 1.31 @@ -1,7 +1,7 @@ ### Abstract ### Name: evolution-sharp -Version: 0.12.0 +Version: 0.12.1 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -16,7 +16,6 @@ ### Patches ### Patch1: evolution-sharp-0.11.1-libdir.patch -Patch2: evolution-sharp-0.11.1-evo210.patch ### Dependencies ### @@ -47,7 +46,6 @@ %prep %setup -q %patch1 -p1 -b .libdir -%patch2 -p1 -b .evo210 %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -84,6 +82,10 @@ # sonames may need to be updated in evolution-sharp's configure.in. %changelog +* Wed Jan 03 2007 Matthew Barnes - 0.12.1-1.fc7 +- Update to 0.12.1 +- Remove evolution-sharp-0.11.1-evo210.patch (fixed upstream). + * Fri Nov 17 2006 Matthew Barnes - 0.12.0-1.fc7 - Update to 0.12.0 - Don't ship unused patches. Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Nov 2006 17:43:53 -0000 1.4 +++ sources 3 Jan 2007 19:11:28 -0000 1.5 @@ -1 +1 @@ -0430359ac6fc7c526e4d4a71de5d22fa evolution-sharp-0.12.0.tar.bz2 +5dbcf479d81e2a4bde541470ea49b746 evolution-sharp-0.12.1.tar.bz2 --- evolution-sharp-0.11.1-evo210.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 3 19:15:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 14:15:19 -0500 Subject: rpms/gcc/devel gcc41-pr25993.patch, NONE, 1.1 gcc41-pr28217.patch, NONE, 1.1 gcc41-pr30189.patch, NONE, 1.1 gcc41-rh220627.patch, NONE, 1.1 gcc41-pr29054.patch, 1.1, 1.2 gcc41.spec, 1.133, 1.134 Message-ID: <200701031915.l03JFJ3c018473@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18429 Modified Files: gcc41-pr29054.patch gcc41.spec Added Files: gcc41-pr25993.patch gcc41-pr28217.patch gcc41-pr30189.patch gcc41-rh220627.patch Log Message: 4.1.1-50 gcc41-pr25993.patch: 0 files changed --- NEW FILE gcc41-pr25993.patch --- 2006-09-17 Steven Bosscher PR c/25993 * c-opts.c (c_common_handle_option): Ignore the -std options if the input language is assembly. 2006-09-16 Steven Bosscher PR c/25993 * gcc.dg/pr25993.c: New test. --- gcc/c-opts.c (revision 117004) +++ gcc/c-opts.c (revision 117005) @@ -268,6 +268,10 @@ c_common_handle_option (size_t scode, co enum opt_code code = (enum opt_code) scode; int result = 1; + /* Prevent resetting the language standard to a C dialect when the driver + has already determined that we're looking at assembler input. */ + bool preprocessing_asm_p = (cpp_get_options (parse_in)->lang == CLK_ASM); + switch (code) { default: @@ -905,29 +909,34 @@ c_common_handle_option (size_t scode, co case OPT_std_c__98: case OPT_std_gnu__98: - set_std_cxx98 (code == OPT_std_c__98 /* ISO */); + if (!preprocessing_asm_p) + set_std_cxx98 (code == OPT_std_c__98 /* ISO */); break; case OPT_std_c89: case OPT_std_iso9899_1990: case OPT_std_iso9899_199409: - set_std_c89 (code == OPT_std_iso9899_199409 /* c94 */, true /* ISO */); + if (!preprocessing_asm_p) + set_std_c89 (code == OPT_std_iso9899_199409 /* c94 */, true /* ISO */); break; case OPT_std_gnu89: - set_std_c89 (false /* c94 */, false /* ISO */); + if (!preprocessing_asm_p) + set_std_c89 (false /* c94 */, false /* ISO */); break; case OPT_std_c99: case OPT_std_c9x: case OPT_std_iso9899_1999: case OPT_std_iso9899_199x: - set_std_c99 (true /* ISO */); + if (!preprocessing_asm_p) + set_std_c99 (true /* ISO */); break; case OPT_std_gnu99: case OPT_std_gnu9x: - set_std_c99 (false /* ISO */); + if (!preprocessing_asm_p) + set_std_c99 (false /* ISO */); break; case OPT_trigraphs: --- gcc/testsuite/gcc.dg/pr25993.c (revision 0) +++ gcc/testsuite/gcc.dg/pr25993.c (revision 117005) @@ -0,0 +1,14 @@ +/* { dg-do assemble { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-std=c99 -x assembler-with-cpp" } */ + +#ifndef __ASSEMBLER__ +extern int func(void); +#else +.global func +.type func,%function +.align 4 +func: + ret +.size func,.-func +#endif + gcc41-pr28217.patch: template-1.C | 8 ++++++++ template-1.Hs | 5 +++++ 2 files changed, 13 insertions(+) --- NEW FILE gcc41-pr28217.patch --- 2007-01-03 Jakub Jelinek PR c++/28217 * g++.dg/pch/template-1.C: New test. * g++.dg/pch/template-1.Hs: New file. 2006-07-12 Jason Merrill PR c++/28217 * semantics.c (note_decl_for_pch): Don't premangle templates. --- gcc/cp/semantics.c (revision 115398) +++ gcc/cp/semantics.c (revision 115399) @@ -2339,8 +2339,9 @@ note_decl_for_pch (tree decl) /* There's a good chance that we'll have to mangle names at some point, even if only for emission in debugging information. */ - if (TREE_CODE (decl) == VAR_DECL - || TREE_CODE (decl) == FUNCTION_DECL) + if ((TREE_CODE (decl) == VAR_DECL + || TREE_CODE (decl) == FUNCTION_DECL) + && !processing_template_decl) mangle_decl (decl); } --- gcc/testsuite/g++.dg/pch/template-1.C.jj 2007-01-03 17:49:40.000000000 +0100 +++ gcc/testsuite/g++.dg/pch/template-1.C 2007-01-03 17:51:35.000000000 +0100 @@ -0,0 +1,8 @@ +// PR c++/28217 + +#include "template-1.H" + +int +main (void) +{ +} --- gcc/testsuite/g++.dg/pch/template-1.Hs.jj 2007-01-03 17:49:06.000000000 +0100 +++ gcc/testsuite/g++.dg/pch/template-1.Hs 2007-01-03 17:44:39.000000000 +0100 @@ -0,0 +1,5 @@ +template struct A +{ + enum { a, b = a }; + void foo(A); +}; gcc41-pr30189.patch: dwarf2out.c | 5 ++++- testsuite/gcc.dg/pr30189.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) --- NEW FILE gcc41-pr30189.patch --- 2007-01-03 Alexandre Oliva PR debug/30189 * dwarf2out.c (modified_type_die): Follow DECL_ORIGINAL_TYPE even if cv-qualification is the same. * gcc.dg/pr30189.c: New test. --- gcc/dwarf2out.c.orig 2007-01-02 17:48:15.000000000 -0200 +++ gcc/dwarf2out.c 2007-01-02 17:51:53.000000000 -0200 @@ -8407,7 +8407,10 @@ modified_type_die (tree type, int is_con mod_type_die = lookup_type_die (qualified_type); } else if (is_const_type < TYPE_READONLY (dtype) - || is_volatile_type < TYPE_VOLATILE (dtype)) + || is_volatile_type < TYPE_VOLATILE (dtype) + || (is_const_type <= TYPE_READONLY (dtype) + && is_volatile_type <= TYPE_VOLATILE (dtype) + && DECL_ORIGINAL_TYPE (type_name) != type)) /* cv-unqualified version of named type. Just use the unnamed type to which it refers. */ mod_type_die --- gcc/testsuite/gcc.dg/pr30189.c 1970-01-01 00:00:00.000000000 +0000 +++ gcc/testsuite/gcc.dg/pr30189.c 2007-01-03 14:14:16.000000000 -0200 @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-g -O" } */ + +extern void foo (void); + +static +void baz (int i) +{ + foo (); + typedef char A[i]; + struct { A b; } *x = 0; +} + +void +bar (i) +{ + baz (i); +} gcc41-rh220627.patch: config/rs6000/linux-unwind.h | 4 +-- unwind-dw2.c | 50 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 11 deletions(-) --- NEW FILE gcc41-rh220627.patch --- 2007-01-03 Jakub Jelinek * unwind-dw2.c (SIGNAL_FRAME_BIT, EXTENDED_CONTEXT_BIT): Define. (struct _Unwind_Context): Rename args_size to flags, remove signal_frame field, add a new args_size field and version field. (_Unwind_IsSignalFrame, _Unwind_SetSignalFrame, _Unwind_IsExtendedContext): New inline functions. (_Unwind_GetGR, _Unwind_SetGR, _Unwind_GetGRPtr, _Unwind_SetGRPtr): Assume by_value array is only present if _Unwind_IsExtendedContext. (_Unwind_GetIPInfo, execute_cfa_program, uw_frame_state_for): Use _Unwind_IsSignalFrame. (__frame_state_for): Initialize context.flags to EXTENDED_CONTEXT_BIT. (uw_update_context_1): Use _Unwind_SetSignalFrame. (uw_init_context_1): Initialize context->flags to EXTENDED_CONTEXT_BIT. * config/rs6000/linux-unwind.h (frob_update_context): Use _Unwind_SetSignalFrame. --- gcc/unwind-dw2.c.jj 2006-12-08 15:57:44.000000000 +0100 +++ gcc/unwind-dw2.c 2006-12-27 17:16:12.000000000 +0100 @@ -70,8 +70,15 @@ struct _Unwind_Context void *ra; void *lsda; struct dwarf_eh_bases bases; + /* Signal frame context. */ +#define SIGNAL_FRAME_BIT ((~(_Unwind_Word) 0 >> 1) + 1) + /* Context which has version/args_size/by_value fields. */ +#define EXTENDED_CONTEXT_BIT ((~(_Unwind_Word) 0 >> 2) + 1) + _Unwind_Word flags; + /* 0 for now, can be increased when further fields are added to + struct _Unwind_Context. */ + _Unwind_Word version; _Unwind_Word args_size; - char signal_frame; char by_value[DWARF_FRAME_REGISTERS+1]; }; @@ -123,6 +130,27 @@ 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; } +static inline _Unwind_Word +_Unwind_IsSignalFrame (struct _Unwind_Context *context) +{ + return (context->flags & SIGNAL_FRAME_BIT) ? 1 : 0; +} + +static inline void +_Unwind_SetSignalFrame (struct _Unwind_Context *context, int val) +{ + if (val) + context->flags |= SIGNAL_FRAME_BIT; + else + context->flags &= ~SIGNAL_FRAME_BIT; +} + +static inline _Unwind_Word +_Unwind_IsExtendedContext (struct _Unwind_Context *context) +{ + return context->flags & EXTENDED_CONTEXT_BIT; +} + /* Get the value of register INDEX as saved in CONTEXT. */ inline _Unwind_Word @@ -141,7 +169,7 @@ _Unwind_GetGR (struct _Unwind_Context *c size = dwarf_reg_size_table[index]; ptr = context->reg[index]; - if (context->by_value[index]) + if (_Unwind_IsExtendedContext (context) && context->by_value[index]) return (_Unwind_Word) (_Unwind_Internal_Ptr) ptr; /* This will segfault if the register hasn't been saved. */ @@ -180,7 +208,7 @@ _Unwind_SetGR (struct _Unwind_Context *c gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); size = dwarf_reg_size_table[index]; - if (context->by_value[index]) + if (_Unwind_IsExtendedContext (context) && context->by_value[index]) { context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; return; @@ -203,7 +231,7 @@ static inline void * _Unwind_GetGRPtr (struct _Unwind_Context *context, int index) { index = DWARF_REG_TO_UNWIND_COLUMN (index); - if (context->by_value[index]) + if (_Unwind_IsExtendedContext (context) && context->by_value[index]) return &context->reg[index]; return context->reg[index]; } @@ -214,7 +242,8 @@ 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; + if (_Unwind_IsExtendedContext (context)) + context->by_value[index] = 0; context->reg[index] = p; } @@ -256,7 +285,7 @@ _Unwind_GetIP (struct _Unwind_Context *c inline _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn) { - *ip_before_insn = context->signal_frame != 0; + *ip_before_insn = _Unwind_IsSignalFrame (context); return (_Unwind_Ptr) context->ra; } @@ -824,7 +853,8 @@ execute_cfa_program (const unsigned char reflected at the point immediately before the call insn. In signal frames, return address is after last completed instruction, so we add 1 to return address to make the comparison <=. */ - while (insn_ptr < insn_end && fs->pc < context->ra + context->signal_frame) + while (insn_ptr < insn_end + && fs->pc < context->ra + _Unwind_IsSignalFrame (context)) { unsigned char insn = *insn_ptr++; _Unwind_Word reg, utmp; @@ -1063,7 +1093,7 @@ uw_frame_state_for (struct _Unwind_Conte if (context->ra == 0) return _URC_END_OF_STACK; - fde = _Unwind_Find_FDE (context->ra + context->signal_frame - 1, + fde = _Unwind_Find_FDE (context->ra + _Unwind_IsSignalFrame (context) - 1, &context->bases); if (fde == NULL) { @@ -1142,6 +1172,7 @@ __frame_state_for (void *pc_target, stru int reg; memset (&context, 0, sizeof (struct _Unwind_Context)); + context.flags = EXTENDED_CONTEXT_BIT; context.ra = pc_target + 1; if (uw_frame_state_for (&context, &fs) != _URC_NO_REASON) @@ -1306,7 +1337,7 @@ uw_update_context_1 (struct _Unwind_Cont break; } - context->signal_frame = fs->signal_frame; + _Unwind_SetSignalFrame (context, fs->signal_frame); #ifdef MD_FROB_UPDATE_CONTEXT MD_FROB_UPDATE_CONTEXT (context, fs); @@ -1366,6 +1397,7 @@ uw_init_context_1 (struct _Unwind_Contex memset (context, 0, sizeof (struct _Unwind_Context)); context->ra = ra; + context->flags = EXTENDED_CONTEXT_BIT; code = uw_frame_state_for (context, &fs); gcc_assert (code == _URC_NO_REASON); --- gcc/config/rs6000/linux-unwind.h.jj 2006-10-29 21:49:21.000000000 +0100 +++ gcc/config/rs6000/linux-unwind.h 2006-12-28 10:40:19.000000000 +0100 @@ -319,7 +319,7 @@ frob_update_context (struct _Unwind_Cont if (pc[0] == 0x38210000 + SIGNAL_FRAMESIZE && (pc[1] == 0x38000077 || pc[1] == 0x380000AC) && pc[2] == 0x44000002) - context->signal_frame = 1; + _Unwind_SetSignalFrame (context, 1); #else /* li r0, 0x7777; sc (sigreturn old) */ /* li r0, 0x0077; sc (sigreturn new) */ @@ -328,7 +328,7 @@ frob_update_context (struct _Unwind_Cont if ((pc[0] == 0x38007777 || pc[0] == 0x38000077 || pc[0] == 0x38006666 || pc[0] == 0x380000AC) && pc[1] == 0x44000002) - context->signal_frame = 1; + _Unwind_SetSignalFrame (context, 1); #endif #ifdef __powerpc64__ gcc41-pr29054.patch: cp/decl.c | 6 +++++- testsuite/g++.dg/template/friend49.C | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) Index: gcc41-pr29054.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr29054.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr29054.patch 2 Jan 2007 18:56:06 -0000 1.1 +++ gcc41-pr29054.patch 3 Jan 2007 19:15:15 -0000 1.2 @@ -4,6 +4,8 @@ * decl.c (revert_static_member_fn): Don't remove first argument without checking it is "this". + * g++.dg/template/friend49.C: New test. + --- gcc/cp/decl.c.jj 2006-12-15 14:32:06.000000000 +0100 +++ gcc/cp/decl.c 2007-01-02 17:43:56.000000000 +0100 @@ -11554,7 +11554,11 @@ revert_static_member_fn (tree decl) Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- gcc41.spec 2 Jan 2007 18:56:41 -0000 1.133 +++ gcc41.spec 3 Jan 2007 19:15:15 -0000 1.134 @@ -1,6 +1,6 @@ %define DATE 20070102 %define gcc_version 4.1.1 -%define gcc_release 49 +%define gcc_release 50 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -149,6 +149,10 @@ Patch40: gcc41-pr29535-test.patch Patch41: gcc41-pr30045.patch Patch42: gcc41-pr30286.patch +Patch43: gcc41-pr25993.patch +Patch44: gcc41-pr28217.patch +Patch45: gcc41-pr30189.patch +Patch46: gcc41-rh220627.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -466,6 +470,10 @@ %patch40 -p0 -b .pr29535-test~ %patch41 -p0 -b .pr30045~ %patch42 -p0 -b .pr30286~ +%patch43 -p0 -b .pr25993~ +%patch44 -p0 -b .pr28217~ +%patch45 -p0 -b .pr30189~ +%patch46 -p0 -b .rh220627~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1537,6 +1545,14 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 +- backwards compatibility with old layout of struct _Unwind_Context + (#220627) +- fix preprocessor defines in assembly preprocessed with -std=... + (Steven Bosscher, PR c/25993) +- fix PCH creation with templates (Jason Merrill, PR c++/28217) +- fix dwarf2out ICE (Alexandre Oliva, #217529, PR debug/30189) + * Tue Jan 2 2007 Jakub Jelinek 4.1.1-49 - update from gcc-4_1-branch (-r120062:120325) - PRs debug/26964, fortran/30200, libfortran/30145 From fedora-cvs-commits at redhat.com Wed Jan 3 19:18:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 14:18:15 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.128, 1.129 policycoreutils-rhat.patch, 1.267, 1.268 policycoreutils.spec, 1.354, 1.355 sources, 1.132, 1.133 Message-ID: <200701031918.l03JIFWY008628@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8574 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jan 3 2007 Dan Walsh 1.33.7-1 - Update to upstream * Patch from Dan Walsh to correctly suppress warnings in load_policy. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- .cvsignore 1 Dec 2006 16:31:26 -0000 1.128 +++ .cvsignore 3 Jan 2007 19:18:12 -0000 1.129 @@ -120,3 +120,4 @@ policycoreutils-1.33.4.tgz policycoreutils-1.33.5.tgz policycoreutils-1.33.6.tgz +policycoreutils-1.33.7.tgz policycoreutils-rhat.patch: Makefile | 2 audit2allow/Makefile | 2 audit2allow/avc.py | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ newrole/newrole.c | 4 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/fixfiles | 3 semanage/Makefile | 2 semanage/seobject.py | 34 23 files changed, 4826 insertions(+), 23 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- policycoreutils-rhat.patch 2 Jan 2007 15:54:13 -0000 1.267 +++ policycoreutils-rhat.patch 3 Jan 2007 19:18:12 -0000 1.268 @@ -4865,27 +4865,6 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.33.6/load_policy/load_policy.c ---- nsapolicycoreutils/load_policy/load_policy.c 2006-11-16 17:14:31.000000000 -0500 -+++ policycoreutils-1.33.6/load_policy/load_policy.c 2006-12-20 14:59:04.000000000 -0500 -@@ -50,12 +50,12 @@ - nargs = argc - optind; - if (nargs > 2) - usage(argv[0]); -- if (nargs >= 1) { -- fprintf(stderr, -- "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", -- argv[0], argv[optind++]); -+ if (nargs >= 1 && !quiet) { -+ fprintf(stderr, -+ "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", -+ argv[0], argv[optind++]); - } -- if (nargs == 2) { -+ if (nargs == 2 && ! quiet) { - fprintf(stderr, - "%s: Warning! Boolean file argument (%s) is no longer supported, installed booleans file is always used. Continuing...\n", - argv[0], argv[optind++]); diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.6/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 +++ policycoreutils-1.33.6/Makefile 2006-12-20 14:59:04.000000000 -0500 @@ -4911,18 +4890,6 @@ if (fd != 2) goto err_close_pam; -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-1.33.6/po/Makefile ---- nsapolicycoreutils/po/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.6/po/Makefile 2006-12-20 14:59:04.000000000 -0500 -@@ -64,8 +64,6 @@ - @rm -fv *mo *~ .depend - @rm -rf tmp - --indent: -- - install: $(MOFILES) - @for n in $(MOFILES); do \ - l=`basename $$n .mo`; \ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.6/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 +++ policycoreutils-1.33.6/restorecond/restorecond.c 2006-12-20 14:59:04.000000000 -0500 @@ -5048,25 +5015,6 @@ class semanageRecords: def __init__(self): self.sh = semanage_handle_create() -@@ -228,7 +231,7 @@ - def __init__(self): - semanageRecords.__init__(self) - -- def add(self, name, sename, serange): -+ def add(self, name, sename, serange, check_exists = True): - if is_mls_enabled == 1: - if serange == "": - serange = "s0" -@@ -249,7 +252,8 @@ - if exists: - raise ValueError(_("Login mapping for %s is already defined") % name) - try: -- pwd.getpwnam(name) -+ if check_exists: -+ pwd.getpwnam(name) - except: - raise ValueError(_("Linux User %s does not exist") % name) - @@ -456,7 +460,8 @@ rc = semanage_user_set_mlslevel(self.sh, u, selevel) if rc < 0: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- policycoreutils.spec 2 Jan 2007 15:54:13 -0000 1.354 +++ policycoreutils.spec 3 Jan 2007 19:18:12 -0000 1.355 @@ -4,8 +4,8 @@ %define libselinuxver 1.30.29-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.6 -Release: 9%{?dist} +Version: 1.33.7 +Release: 1{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,10 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Wed Jan 3 2007 Dan Walsh 1.33.7-1 +- Update to upstream + * Patch from Dan Walsh to correctly suppress warnings in load_policy. + * Tue Jan 2 2007 Dan Walsh 1.33.6-9 - Fix fixfiles script to use tty command correctly. If this command fails, it should set the LOGFILE to /dev/null Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- sources 1 Dec 2006 16:31:27 -0000 1.132 +++ sources 3 Jan 2007 19:18:12 -0000 1.133 @@ -1 +1 @@ -1608bac92b9b014500defff770ea1691 policycoreutils-1.33.6.tgz +aacdcf4aa375bdea88cc1530517f95bb policycoreutils-1.33.7.tgz From fedora-cvs-commits at redhat.com Wed Jan 3 19:18:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 14:18:29 -0500 Subject: rpms/pam/devel pam-0.99.6.2-selinux-namespace.patch, NONE, 1.1 pam-0.99.6.2-selinux-select-context.patch, 1.1, 1.2 pam.spec, 1.137, 1.138 Message-ID: <200701031918.l03JITuD008875@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8821 Modified Files: pam-0.99.6.2-selinux-select-context.patch pam.spec Added Files: pam-0.99.6.2-selinux-namespace.patch Log Message: * Thu Dec 1 2006 Dan Walsh 0.99.6.2-7 - Fix selection of role pam-0.99.6.2-selinux-namespace.patch: namespace.conf | 16 ++++----- namespace.conf.5.xml | 18 +++++----- pam_namespace.c | 88 ++++++++++++++++++++++++++++++++++++++------------- pam_namespace.h | 4 +- 4 files changed, 86 insertions(+), 40 deletions(-) --- NEW FILE pam-0.99.6.2-selinux-namespace.patch --- --- Linux-PAM-0.99.6.2/modules/pam_namespace/namespace.conf.selinux-namespace 2006-12-07 16:44:06.000000000 -0500 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/namespace.conf 2006-12-07 16:45:58.000000000 -0500 @@ -4,12 +4,10 @@ # # Uncommenting the following three lines will polyinstantiate # /tmp, /var/tmp and user's home directories. /tmp and /var/tmp will -# be polyinstantiated based on both security context as well as user -# name, whereas home directory will be polyinstantiated based on -# security context only. Polyinstantion will not be performed for -# user root and adm for directories /tmp and /var/tmp, whereas home -# directories will be polyinstantiated for all users. The user name -# and/or context is appended to the instance prefix. +# be polyinstantiated based on the MLS level part of the security context as well as user +# name, Polyinstantion will not be performed for user root and adm for directories +# /tmp and /var/tmp, whereas home directories will be polyinstantiated for all users. +# The user name and context is appended to the instance prefix. # # Note that instance directories do not have to reside inside the # polyinstantiated directory. In the examples below, instances of /tmp @@ -25,6 +23,6 @@ # caution, as it will reduce security and isolation achieved by # polyinstantiation. # -#/tmp /tmp-inst/ both root,adm -#/var/tmp /var/tmp/tmp-inst/ both root,adm -#$HOME $HOME/$USER.inst/inst- context +#/tmp /tmp-inst/ level root,adm +#/var/tmp /var/tmp/tmp-inst/ level root,adm +#$HOME $HOME/$USER.inst/ level --- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c.selinux-namespace 2006-12-07 11:14:50.000000000 -0500 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.c 2006-12-08 09:34:04.000000000 -0500 @@ -244,23 +244,29 @@ } strcpy(poly.dir, dir); strcpy(poly.instance_prefix, instance_prefix); - if (strcmp(method, "user") == 0) - poly.method = USER; + + poly.method = NONE; + if (strcmp(method, "user") == 0) + poly.method = USER; + #ifdef WITH_SELINUX - else if (strcmp(method, "context") == 0) { + if (strcmp(method, "level") == 0) { if (idata->flags & PAMNS_CTXT_BASED_INST) - poly.method = CONTEXT; + poly.method = LEVEL; else poly.method = USER; - } else if (strcmp(method, "both") == 0) { + } + + if (strcmp(method, "context") == 0) { if (idata->flags & PAMNS_CTXT_BASED_INST) - poly.method = BOTH; + poly.method = CONTEXT; else poly.method = USER; } #endif - else { + + if ( poly.method == NONE) { pam_syslog(idata->pamh, LOG_NOTICE, "Illegal method"); goto skipping; } @@ -438,6 +444,8 @@ security_context_t scon = NULL; security_class_t tclass; + if (polyptr->method == USER) return PAM_SUCCESS; + /* * Get the security context of the directory to polyinstantiate. */ @@ -448,19 +456,21 @@ return PAM_SESSION_ERR; } + rc = getexeccon(&scon); + if (rc < 0 || scon == NULL) { + pam_syslog(idata->pamh, LOG_ERR, + "Error getting exec context, %m"); + return PAM_SESSION_ERR; + } + /* * If polyinstantiating based on security context, get current * process security context, get security class for directories, * and ask the policy to provide security context of the * polyinstantiated instance directory. */ - if ((polyptr->method == CONTEXT) || (polyptr->method == BOTH)) { - rc = getexeccon(&scon); - if (rc < 0 || scon == NULL) { - pam_syslog(idata->pamh, LOG_ERR, - "Error getting exec context, %m"); - return PAM_SESSION_ERR; - } + + if (polyptr->method == CONTEXT) { tclass = string_to_security_class("dir"); if (security_compute_member(scon, *origcon, tclass, @@ -473,7 +483,48 @@ pam_syslog(idata->pamh, LOG_DEBUG, "member context returned by policy %s", *i_context); freecon(scon); + return PAM_SUCCESS; } + + /* + * If polyinstantiating based on security level, get current + * process security context, get security class for directories, + * and change the directories MLS Level to match process. + */ + + if (polyptr->method == LEVEL) { + context_t scontext = NULL; + context_t fcontext = NULL; + rc = PAM_SESSION_ERR; + + scontext = context_new(scon); + if (! scontext) { + pam_syslog(idata->pamh, LOG_NOTICE, "out of memory"); + goto fail; + } + fcontext = context_new(*origcon); + if (! fcontext) { + pam_syslog(idata->pamh, LOG_NOTICE, "out of memory"); + goto fail; + } + if (context_range_set(fcontext, context_range_get(scontext)) != 0) { + pam_syslog(idata->pamh, LOG_NOTICE, "Unable to set MLS Componant of context"); + goto fail; + } + *i_context=strdup(context_str(fcontext)); + if (! *i_context) { + pam_syslog(idata->pamh, LOG_NOTICE, "out of memory"); + goto fail; + } + + rc = PAM_SUCCESS; + fail: + context_free(scontext); + context_free(fcontext); + freecon(scon); + return rc; + } + /* Should never get here */ return PAM_SUCCESS; } #endif @@ -514,19 +565,14 @@ break; #ifdef WITH_SELINUX + case LEVEL: case CONTEXT: - if (asprintf(i_name, "%s", *i_context) < 0) { - *i_name = NULL; - rc = PAM_SESSION_ERR; - } - break; - - case BOTH: if (asprintf(i_name, "%s_%s", *i_context, idata->user) < 0) { *i_name = NULL; rc = PAM_SESSION_ERR; } break; + #endif /* WITH_SELINUX */ default: --- Linux-PAM-0.99.6.2/modules/pam_namespace/namespace.conf.5.xml.selinux-namespace 2006-06-27 09:07:43.000000000 -0400 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/namespace.conf.5.xml 2006-12-07 16:51:27.000000000 -0500 @@ -22,7 +22,7 @@ This module allows setup of private namespaces with polyinstantiated directories. Directories can be polyinstantiated based on user name - or, in the case of SELinux, user name, security context or both. If an + or, in the case of SELinux, user name, sensitivity level or complete security context. If an executable script /etc/security/namespace.init exists, it is used to initialize the namespace every time a new instance directory is setup. The script receives the polyinstantiated @@ -72,10 +72,10 @@ The third field, method, is the method used for polyinstantiation. It can take 3 different values; "user" - for polyinstantiation based on user name, "context" for - polyinstantiation based on process security context, and "both" - for polyinstantiation based on both user name and security context. - Methods "context" and "both" are only available with SELinux. This + for polyinstantiation based on user name, "level" for + polyinstantiation based on process MLS level and user name, and "context" for + polyinstantiation based on process security context and user name + Methods "context" and "level" are only available with SELinux. This field cannot be blank. @@ -98,9 +98,9 @@ # The following three lines will polyinstantiate /tmp, # /var/tmp and user's home directories. /tmp and /var/tmp - # will be polyinstantiated based on both security context + # will be polyinstantiated based on the security level # as well as user name, whereas home directory will be - # polyinstantiated based on security context only. + # polyinstantiated based on the full security context and user name. # Polyinstantiation will not be performed for user root # and adm for directories /tmp and /var/tmp, whereas home # directories will be polyinstantiated for all users. @@ -112,8 +112,8 @@ # will reside within the directories that are being # polyinstantiated. # - /tmp /tmp-inst/ both root,adm - /var/tmp /var/tmp/tmp-inst/ both root,adm + /tmp /tmp-inst/ level root,adm + /var/tmp /var/tmp/tmp-inst/ level root,adm $HOME $HOME/$USER.inst/inst- context --- Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.h.selinux-namespace 2006-12-07 11:14:50.000000000 -0500 +++ Linux-PAM-0.99.6.2/modules/pam_namespace/pam_namespace.h 2006-12-07 17:00:14.000000000 -0500 @@ -63,6 +63,7 @@ #ifdef WITH_SELINUX #include +#include #endif #ifndef CLONE_NEWNS @@ -93,9 +94,10 @@ * or both */ enum polymethod { + NONE, USER, CONTEXT, - BOTH, + LEVEL, }; /* pam-0.99.6.2-selinux-select-context.patch: pam_selinux.8.xml | 14 +++ pam_selinux.c | 231 ++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 195 insertions(+), 50 deletions(-) Index: pam-0.99.6.2-selinux-select-context.patch =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam-0.99.6.2-selinux-select-context.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pam-0.99.6.2-selinux-select-context.patch 30 Nov 2006 09:40:03 -0000 1.1 +++ pam-0.99.6.2-selinux-select-context.patch 3 Jan 2007 19:18:27 -0000 1.2 @@ -1,5 +1,5 @@ ---- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.8.xml.select-context 2006-11-10 17:48:59.000000000 +0100 -+++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.8.xml 2006-11-10 17:52:36.000000000 +0100 +--- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.8.xml.select-context 2006-12-27 10:59:06.000000000 -0500 ++++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.8.xml 2006-12-27 10:59:06.000000000 -0500 @@ -33,6 +33,9 @@ verbose @@ -28,36 +28,154 @@ ---- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c.select-context 2006-11-10 17:48:59.000000000 +0100 -+++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c 2006-11-10 18:00:11.000000000 +0100 -@@ -63,6 +63,7 @@ +--- Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c.select-context 2006-12-27 10:59:06.000000000 -0500 ++++ Linux-PAM-0.99.6.2/modules/pam_selinux/pam_selinux.c 2007-01-03 13:40:24.000000000 -0500 +@@ -63,8 +63,10 @@ #include #include #include +#include #include #include ++#include -@@ -151,6 +152,8 @@ + static int + send_text (pam_handle_t *pamh, const char *text, int debug) +@@ -79,69 +81,64 @@ + * is responsible for freeing the responses. + */ + static int +-query_response (pam_handle_t *pamh, const char *text, ++query_response (pam_handle_t *pamh, const char *text, const char *def, + char **responses, int debug) + { ++ int rc; ++ if (def) ++ rc = pam_prompt (pamh, PAM_PROMPT_ECHO_ON, responses, "%s [%s] ", text, def); ++ else ++ rc = pam_prompt (pamh, PAM_PROMPT_ECHO_ON, responses, "%s ", text); + if (debug) +- pam_syslog(pamh, LOG_NOTICE, "%s", text); +- +- return pam_prompt (pamh, PAM_PROMPT_ECHO_ON, responses, "%s", text); ++ pam_syslog(pamh, LOG_NOTICE, "%s %s", text, responses[0]); ++ return rc; + } + + static security_context_t + manual_context (pam_handle_t *pamh, const char *user, int debug) + { +- security_context_t newcon; ++ security_context_t newcon=NULL; + context_t new_context; + int mls_enabled = is_selinux_mls_enabled(); +- +- char *responses; ++ char *type=NULL; ++ char *responses=NULL; + + while (1) { + query_response(pamh, +- _("Would you like to enter a security context? [y] "), ++ _("Would you like to enter a security context? [n] "), NULL, + &responses,debug); +- if ((responses[0] == 'y') || (responses[0] == 'Y') || +- (responses[0] == '\0') ) ++ if ((responses[0] == 'y') || (responses[0] == 'Y')) + { + if (mls_enabled) + new_context = context_new ("user:role:type:level"); + else + new_context = context_new ("user:role:type"); +- _pam_drop(responses); + +- /* Allow the user to enter each field of the context individually */ ++ if (!new_context) ++ goto fail_set; ++ + if (context_user_set (new_context, user)) +- { +- context_free (new_context); +- return NULL; +- } +- query_response(pamh,_("role: "),&responses,debug); +- if (context_role_set (new_context, responses)) +- { +- _pam_drop(responses); +- context_free (new_context); +- return NULL; +- } ++ goto fail_set; ++ + _pam_drop(responses); +- query_response(pamh,_("type: "),&responses,debug); +- if (context_type_set (new_context, responses)) +- { +- _pam_drop(responses); +- context_free (new_context); +- return NULL; +- } ++ /* Allow the user to enter each field of the context individually */ ++ query_response(pamh,_("role:"), NULL, &responses,debug); ++ if (responses[0] != '\0') { ++ if (context_role_set (new_context, responses)) ++ goto fail_set; ++ if (get_default_type(responses, &type)) ++ goto fail_set; ++ if (context_type_set (new_context, type)) ++ goto fail_set; ++ } + _pam_drop(responses); + if (mls_enabled) + { +- query_response(pamh,_("level: "),&responses,debug); +- if (context_range_set (new_context, responses)) +- { +- _pam_drop(responses); +- context_free (new_context); +- return NULL; +- } +- _pam_drop(responses); ++ query_response(pamh,_("level:"), NULL, &responses,debug); ++ if (responses[0] != '\0') { ++ if (context_range_set (new_context, responses)) ++ goto fail_set; ++ } + } + /* Get the string value of the context and see if it is valid. */ + if (!security_check_context(context_str(new_context))) { +@@ -151,14 +148,125 @@ } else send_text(pamh,_("Not a valid security context"),debug); -+ -+ context_free(new_context); /* next time around allocates another */ ++ context_free (new_context); } else { _pam_drop(responses); -@@ -161,6 +164,86 @@ - return NULL; - } - -+static int mls_range_allowed(security_context_t src, security_context_t dst) + return NULL; + } + } /* end while */ ++ fail_set: ++ free(type); ++ _pam_drop(responses); ++ context_free (new_context); ++ return NULL; ++} ++ ++static int mls_range_allowed(pam_handle_t *pamh, security_context_t src, security_context_t dst, int debug) +{ + struct av_decision avd; + int retval; + unsigned int bit = CONTEXT__CONTAINS; -+ -+ retval = security_compute_av(src, dst, SECCLASS_CONTEXT, bit, &avd); ++ context_t src_context = context_new (src); ++ context_t dst_context = context_new (dst); ++ context_range_set(dst_context, context_range_get(src_context)); ++ if (debug) ++ pam_syslog(pamh, LOG_NOTICE, "Checking if %s mls range valid for %s", dst, context_str(dst_context)); ++ ++ retval = security_compute_av(context_str(dst_context), dst, SECCLASS_CONTEXT, bit, &avd); ++ context_free(src_context); ++ context_free(dst_context); + if (retval || ((bit & avd.allowed) != bit)) + return 0; + @@ -67,35 +185,54 @@ +static security_context_t +config_context (pam_handle_t *pamh, security_context_t puser_context, int debug) +{ -+ security_context_t newcon; ++ security_context_t newcon=NULL; + context_t new_context; + int mls_enabled = is_selinux_mls_enabled(); -+ char *responses; ++ char *responses=NULL; ++ char *type=NULL; + char resp_val = 0; -+ ++ ++ pam_prompt (pamh, PAM_TEXT_INFO, NULL, _("Default Security Context %s\n"), puser_context); ++ + while (1) { + query_response(pamh, -+ _("Would you like to enter a role/level? [y] "), ++ _("Would you like to enter a different role or level?"), "n", + &responses,debug); + + resp_val = responses[0]; + _pam_drop(responses); -+ if ((resp_val == 'y') || (resp_val == 'Y') || (resp_val == '\0')) ++ if ((resp_val == 'y') || (resp_val == 'Y')) + { + new_context = context_new(puser_context); + + /* Allow the user to enter role and level individually */ -+ query_response(pamh,_("role: "),&responses,debug); -+ if (responses[0] && context_role_set(new_context, responses)) -+ goto fail_set; ++ query_response(pamh,_("role:"), context_role_get(new_context), ++ &responses, debug); ++ if (responses[0]) { ++ if (get_default_type(responses, &type)) { ++ pam_prompt (pamh, PAM_ERROR_MSG, NULL, _("No default type for role %s\n"), responses); ++ _pam_drop(responses); ++ continue; ++ } else { ++ if (context_role_set(new_context, responses)) ++ goto fail_set; ++ if (context_type_set (new_context, type)) ++ goto fail_set; ++ } ++ } + _pam_drop(responses); + if (mls_enabled) + { -+ query_response(pamh,_("level: "),&responses,debug); -+ if (responses[0] && context_range_set(new_context, responses)) -+ goto fail_set; ++ query_response(pamh,_("level:"), context_range_get(new_context), ++ &responses, debug); ++ if (responses[0]) { ++ if (context_range_set(new_context, responses)) ++ goto fail_set; ++ } + _pam_drop(responses); + } ++ if (debug) ++ pam_syslog(pamh, LOG_NOTICE, "Selected Security Context %s", context_str(new_context)); + + /* Get the string value of the context and see if it is valid. */ + if (!security_check_context(context_str(new_context))) { @@ -105,10 +242,12 @@ + /* we have to check that this user is allowed to go into the + range they have specified ... role is tied to an seuser, so that'll + be checked at setexeccon time */ -+ if (mls_enabled && !mls_range_allowed(puser_context, newcon)) -+ goto fail_range; ++ if (mls_enabled && !mls_range_allowed(pamh, puser_context, newcon, debug)) { ++ pam_syslog(pamh, LOG_NOTICE, "Security context %s is not allowed for %s", puser_context, newcon); + -+ freecon(puser_context); ++ ++ goto fail_range; ++ } + return newcon; + } + else @@ -117,24 +256,21 @@ + context_free(new_context); /* next time around allocates another */ + } + else -+ break; ++ return strdup(puser_context); + } /* end while */ -+ -+ freecon(puser_context); -+ return NULL; + + return NULL; + + fail_set: ++ free(type); + _pam_drop(responses); + context_free (new_context); + fail_range: -+ freecon(puser_context); + return NULL; -+} -+ + } + static void - security_restorelabel_tty(const pam_handle_t *pamh, - const char *tty, security_context_t context) -@@ -273,10 +356,12 @@ +@@ -273,10 +381,11 @@ { int i, debug = 0, ttys=1, has_tty=isatty(0); int verbose=0, close_session=0; @@ -143,12 +279,11 @@ security_context_t* contextlist = NULL; int num_contexts = 0; - const void *username = NULL; -+ const void *pusername = NULL; + const char *username = NULL; const void *tty = NULL; char *seuser=NULL; char *level=NULL; -@@ -295,6 +380,9 @@ +@@ -295,6 +404,9 @@ if (strcmp(argv[i], "close") == 0) { close_session = 1; } @@ -158,21 +293,16 @@ } if (debug) -@@ -307,10 +395,11 @@ +@@ -307,7 +419,7 @@ if (!(selinux_enabled = is_selinux_enabled()>0) ) return PAM_SUCCESS; - if (pam_get_item(pamh, PAM_USER, &username) != PAM_SUCCESS || -- username == NULL) { -+ if (pam_get_item(pamh, PAM_USER, &pusername) != PAM_SUCCESS || -+ pusername == NULL) { ++ if (pam_get_item(pamh, PAM_USER, (void *) &username) != PAM_SUCCESS || + username == NULL) { return PAM_USER_UNKNOWN; } -+ username = pusername; - - if (getseuserbyname(username, &seuser, &level)==0) { - num_contexts = get_ordered_context_list_with_level(seuser, -@@ -319,19 +408,32 @@ +@@ -319,19 +431,38 @@ &contextlist); if (debug) pam_syslog(pamh, LOG_DEBUG, "Username= %s SELinux User = %s Level= %s", @@ -182,24 +312,33 @@ free(level); } if (num_contexts > 0) { - user_context = (security_context_t) strdup(contextlist[0]); -+ +- user_context = (security_context_t) strdup(contextlist[0]); ++ security_context_t puser_context=strdup(contextlist[0]); + freeconary(contextlist); +- } else { ++ if (puser_context == NULL) { ++ pam_syslog(pamh, LOG_ERR, _("Out of memory")); ++ return PAM_AUTH_ERR; ++ } ++ user_context = puser_context; + if (select_context && has_tty) { -+ user_context = config_context(pamh, user_context, debug); ++ user_context = config_context(pamh, puser_context, debug); ++ freecon(puser_context); + if (user_context == NULL) { -+ pam_syslog(pamh, LOG_ERR, "Unable to get valid context for %s", ++ pam_syslog(pamh, LOG_ERR, _("Unable to get valid context for %s"), + username); ++ pam_prompt (pamh, PAM_ERROR_MSG, NULL, _("Unable to get valid context for %s"), username); + if (security_getenforce() == 1) + return PAM_AUTH_ERR; + else + return PAM_SUCCESS; + } -+ } -+ - freeconary(contextlist); - } else { ++ } ++ } ++ else { if (has_tty) { - user_context = manual_context(pamh,username,debug); +- user_context = manual_context(pamh,username,debug); ++ user_context = manual_context(pamh,seuser,debug); if (user_context == NULL) { pam_syslog (pamh, LOG_ERR, "Unable to get valid context for %s", - (const char *)username); @@ -207,7 +346,7 @@ if (security_getenforce() == 1) return PAM_AUTH_ERR; else -@@ -340,7 +442,7 @@ +@@ -340,7 +471,7 @@ } else { pam_syslog (pamh, LOG_ERR, "Unable to get valid context for %s, No valid tty", @@ -216,7 +355,7 @@ if (security_getenforce() == 1) return PAM_AUTH_ERR; else -@@ -381,7 +483,7 @@ +@@ -381,7 +512,7 @@ if (ret) { pam_syslog(pamh, LOG_ERR, "Error! Unable to set %s executable context %s.", @@ -225,7 +364,7 @@ if (security_getenforce() == 1) { freecon(user_context); return PAM_AUTH_ERR; -@@ -389,7 +491,7 @@ +@@ -389,7 +520,7 @@ } else { if (debug) pam_syslog(pamh, LOG_NOTICE, "set %s security context to %s", @@ -234,7 +373,7 @@ } #ifdef HAVE_SETKEYCREATECON ret = setkeycreatecon(user_context); -@@ -402,7 +504,7 @@ +@@ -402,7 +533,7 @@ if (ret) { pam_syslog(pamh, LOG_ERR, "Error! Unable to set %s key creation context %s.", @@ -243,7 +382,7 @@ if (security_getenforce() == 1) { freecon(user_context); return PAM_AUTH_ERR; -@@ -410,7 +512,7 @@ +@@ -410,7 +541,7 @@ } else { if (debug) pam_syslog(pamh, LOG_NOTICE, "set %s key creation context to %s", Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- pam.spec 30 Nov 2006 13:00:48 -0000 1.137 +++ pam.spec 3 Jan 2007 19:18:27 -0000 1.138 @@ -11,7 +11,7 @@ Summary: A security tool which provides authentication for applications Name: pam Version: 0.99.6.2 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL or BSD Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -41,6 +41,7 @@ Patch91: pam-0.99.6.2-unix-username.patch Patch92: pam-0.99.6.2-selinux-select-context.patch Patch100: pam-0.99.6.2-reconf.patch +Patch101: pam-0.99.6.2-selinux-namespace.patch BuildRoot: %{_tmppath}/%{name}-root Requires: cracklib, cracklib-dicts >= 2.8 @@ -110,6 +111,7 @@ %patch92 -p1 -b .select-context %patch100 -p1 -b .reconf +%patch101 -p1 -b .selinux-namespace #autoreconf %build @@ -386,6 +388,13 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Thu Dec 1 2006 Dan Walsh 0.99.6.2-7 +- Fix selection of role + +* Thu Dec 1 2006 Dan Walsh 0.99.6.2-6 +- Fix pam_namespace to only change MLS componant +Resolves: Bug #216184 + * Thu Nov 30 2006 Tomas Mraz 0.99.6.2-5 - add select-context option to pam_selinux (#213812) - autoreconf won't work with autoconf-2.61 as configure.in is not yet adjusted From fedora-cvs-commits at redhat.com Wed Jan 3 19:19:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 14:19:33 -0500 Subject: rpms/yum/FC-6 .cvsignore, 1.46, 1.47 sources, 1.48, 1.49 yum.spec, 1.137, 1.138 yum-2.9.5-rpmmi.patch, 1.2, NONE yum-3.0-misc-fixes.patch, 1.5, NONE yum-misc-fixes.patch, 1.1, NONE Message-ID: <200701031919.l03JJXOw009760@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/yum/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9713 Modified Files: .cvsignore sources yum.spec Removed Files: yum-2.9.5-rpmmi.patch yum-3.0-misc-fixes.patch yum-misc-fixes.patch Log Message: * Wed Jan 3 2007 Jeremy Katz - 3.0.2-1 - update to 3.0.2 with lots of fixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/yum/FC-6/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 10 Nov 2006 16:51:21 -0000 1.46 +++ .cvsignore 3 Jan 2007 19:19:31 -0000 1.47 @@ -1 +1 @@ -yum-3.0.1.tar.gz +yum-3.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/yum/FC-6/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 10 Nov 2006 16:51:21 -0000 1.48 +++ sources 3 Jan 2007 19:19:31 -0000 1.49 @@ -1 +1 @@ -e4ec5720315abeed044f71e384488f93 yum-3.0.1.tar.gz +0c8c9491f3eee587efbd6151c3f8ac1e yum-3.0.2.tar.gz Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/FC-6/yum.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- yum.spec 10 Nov 2006 16:52:52 -0000 1.137 +++ yum.spec 3 Jan 2007 19:19:31 -0000 1.138 @@ -2,8 +2,8 @@ Summary: RPM installer/updater Name: yum -Version: 3.0.1 -Release: 2%{?dist} +Version: 3.0.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/3.0/yum-%{version}.tar.gz @@ -14,8 +14,6 @@ # default plugins here Source100: installonlyn.py -Patch0: yum-misc-fixes.patch - URL: http://linux.duke.edu/yum/ BuildArchitectures: noarch BuildRequires: python @@ -48,7 +46,6 @@ %prep %setup -q -%patch0 -p0 %build make @@ -117,6 +114,9 @@ %changelog +* Wed Jan 3 2007 Jeremy Katz - 3.0.2-1 +- update to 3.0.2 with lots of fixes + * Fri Nov 10 2006 Jeremy Katz - 3.0.1-2 - yum-updatesd fixes (#213622, #212494, #212507) --- yum-2.9.5-rpmmi.patch DELETED --- --- yum-3.0-misc-fixes.patch DELETED --- --- yum-misc-fixes.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 3 20:34:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 15:34:55 -0500 Subject: rpms/eclipse-cdt/devel eclipse-cdt-libhover.patch,1.1,NONE Message-ID: <200701032034.l03KYtFu009549@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9461 Removed Files: eclipse-cdt-libhover.patch Log Message: Patch no longer used. --- eclipse-cdt-libhover.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 3 21:06:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 16:06:59 -0500 Subject: rpms/Pyrex/devel pyrex-python-2.5.patch, NONE, 1.1 Pyrex.spec, 1.17, 1.18 Message-ID: <200701032106.l03L6x0L022092@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/Pyrex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21995 Modified Files: Pyrex.spec Added Files: pyrex-python-2.5.patch Log Message: * Wed Jan 3 2007 David Zeuthen - 0:0.9.4-4%{?dist} - include a patch so Pyrex works with python 2.5 pyrex-python-2.5.patch: ExprNodes.py | 10 +++++----- Nodes.py | 32 +++++++++++++++++++------------- Parsing.py | 2 +- PyrexTypes.py | 34 ++++++++++++++++++++++------------ TypeSlots.py | 27 ++++++++++++++++++++++----- 5 files changed, 69 insertions(+), 36 deletions(-) --- NEW FILE pyrex-python-2.5.patch --- Index: Pyrex/Compiler/PyrexTypes.py =================================================================== --- Pyrex/Compiler/PyrexTypes.py (Revision 133) +++ Pyrex/Compiler/PyrexTypes.py (Arbeitskopie) @@ -293,8 +293,8 @@ default_value = "0" parsetuple_formats = ( # rank -> format - "?HIkK???", # unsigned - "chilLfd?", # signed + "?HIkK????", # unsigned + "chilL?fd?", # signed ) def __init__(self, rank, signed = 1, pymemberdef_typecode = None): @@ -340,6 +340,12 @@ self.is_returncode = is_returncode +class CPySSizeTType(CIntType): + + to_py_function = "PyInt_FromSsize_t" + from_py_function = "PyInt_AsSsize_t" + + class CUIntType(CIntType): to_py_function = "PyLong_FromUnsignedLong" @@ -699,6 +705,7 @@ c_int_type = CIntType(2, 1, "T_INT") c_long_type = CIntType(3, 1, "T_LONG") c_longlong_type = CLongLongType(4, 1, "T_LONGLONG") +c_py_ssize_t_type = CPySSizeTType(5, 1) c_uchar_type = CIntType(0, 0, "T_UBYTE") c_ushort_type = CIntType(1, 0, "T_USHORT") @@ -706,9 +713,9 @@ c_ulong_type = CULongType(3, 0, "T_ULONG") c_ulonglong_type = CULongLongType(4, 0, "T_ULONGLONG") -c_float_type = CFloatType(5, "T_FLOAT") -c_double_type = CFloatType(6, "T_DOUBLE") -c_longdouble_type = CFloatType(7) +c_float_type = CFloatType(6, "T_FLOAT") +c_double_type = CFloatType(7, "T_DOUBLE") +c_longdouble_type = CFloatType(8) c_null_ptr_type = CNullPtrType(c_void_type) c_char_array_type = CCharArrayType(None) @@ -720,7 +727,7 @@ error_type = ErrorType() -lowest_float_rank = 5 +lowest_float_rank = 6 rank_to_type_name = ( "char", # 0 @@ -728,9 +735,10 @@ "int", # 2 "long", # 3 "PY_LONG_LONG", # 4 - "float", # 5 - "double", # 6 - "long double", # 7 + "Py_ssize_t", # 5 + "float", # 6 + "double", # 7 + "long double", # 8 ) sign_and_rank_to_type = { @@ -745,9 +753,10 @@ (1, 2): c_int_type, (1, 3): c_long_type, (1, 4): c_longlong_type, - (1, 5): c_float_type, - (1, 6): c_double_type, - (1, 7): c_longdouble_type, + (1, 5): c_py_ssize_t_type, + (1, 6): c_float_type, + (1, 7): c_double_type, + (1, 8): c_longdouble_type, } modifiers_and_name_to_type = { @@ -763,6 +772,7 @@ (1, 0, "int"): c_int_type, (1, 1, "int"): c_long_type, (1, 2, "int"): c_longlong_type, + (1, 0, "Py_ssize_t"): c_py_ssize_t_type, (1, 0, "float"): c_float_type, (1, 0, "double"): c_double_type, (1, 1, "double"): c_longdouble_type, Index: Pyrex/Compiler/Parsing.py =================================================================== --- Pyrex/Compiler/Parsing.py (Revision 133) +++ Pyrex/Compiler/Parsing.py (Arbeitskopie) @@ -1257,7 +1257,7 @@ # "void", "signed", "unsigned" #) -basic_c_type_names = ("void", "char", "int", "float", "double") +basic_c_type_names = ("void", "char", "int", "float", "double", "Py_ssize_t") sign_and_longness_words = ("short", "long", "signed", "unsigned") Index: Pyrex/Compiler/TypeSlots.py =================================================================== --- Pyrex/Compiler/TypeSlots.py (Revision 133) +++ Pyrex/Compiler/TypeSlots.py (Arbeitskopie) @@ -26,6 +26,7 @@ # 'i' int # 'I' int * # 'l' long + # 'Z' Py_ssize_t # 's' char * # 'S' char ** # 'r' int used only to signal exception @@ -42,6 +43,7 @@ 'i': PyrexTypes.c_int_type, 'I': PyrexTypes.c_int_ptr_type, 'l': PyrexTypes.c_long_type, + 'Z': PyrexTypes.c_py_ssize_t_type, 's': PyrexTypes.c_char_ptr_type, 'S': PyrexTypes.c_char_ptr_ptr_type, 'r': PyrexTypes.c_returncode_type, @@ -354,18 +356,30 @@ iternaryfunc = Signature("TOO", "O") # typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *); callfunc = Signature("T*", "O") # typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *); inquiry = Signature("T", "i") # typedef int (*inquiry)(PyObject *); +lenfunc = Signature("T", "Z") # typedef Py_ssize_t (*lenfunc)(PyObject *); + # typedef int (*coercion)(PyObject **, PyObject **); intargfunc = Signature("Ti", "O") # typedef PyObject *(*intargfunc)(PyObject *, int); +ssizeargfunc = Signature("TZ", "O") # typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t); intintargfunc = Signature("Tii", "O") # typedef PyObject *(*intintargfunc)(PyObject *, int, int); +ssizessizeargfunc = Signature("TZZ", "O") # typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t); intobjargproc = Signature("TiO", 'r') # typedef int(*intobjargproc)(PyObject *, int, PyObject *); +ssizeobjargproc = Signature("TZO", 'r') # typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *); intintobjargproc = Signature("TiiO", 'r') # typedef int(*intintobjargproc)(PyObject *, int, int, PyObject *); +ssizessizeobjargproc = Signature("TZZO", 'r') # typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); + intintargproc = Signature("Tii", 'r') +ssizessizeargproc = Signature("TZZ", 'r') objargfunc = Signature("TO", "O") objobjargproc = Signature("TOO", 'r') # typedef int (*objobjargproc)(PyObject *, PyObject *, PyObject *); getreadbufferproc = Signature("TiP", 'i') # typedef int (*getreadbufferproc)(PyObject *, int, void **); getwritebufferproc = Signature("TiP", 'i') # typedef int (*getwritebufferproc)(PyObject *, int, void **); getsegcountproc = Signature("TI", 'i') # typedef int (*getsegcountproc)(PyObject *, int *); getcharbufferproc = Signature("TiS", 'i') # typedef int (*getcharbufferproc)(PyObject *, int, const char **); +readbufferproc = Signature("TZP", "Z") # typedef Py_ssize_t (*readbufferproc)(PyObject *, Py_ssize_t, void **); +writebufferproc = Signature("TZP", "Z") # typedef Py_ssize_t (*writebufferproc)(PyObject *, Py_ssize_t, void **); +segcountproc = Signature("TZ", "Z") # typedef Py_ssize_t (*segcountproc)(PyObject *, Py_ssize_t *); +writebufferproc = Signature("TZS", "Z") # typedef Py_ssize_t (*charbufferproc)(PyObject *, Py_ssize_t, char **); objargproc = Signature("TO", 'r') # typedef int (*objobjproc)(PyObject *, PyObject *); # typedef int (*visitproc)(PyObject *, void *); # typedef int (*traverseproc)(PyObject *, visitproc, void *); @@ -454,14 +468,17 @@ MethodSlot(binaryfunc, "nb_true_divide", "__truediv__"), MethodSlot(ibinaryfunc, "nb_inplace_floor_divide", "__ifloordiv__"), MethodSlot(ibinaryfunc, "nb_inplace_true_divide", "__itruediv__"), + + # Added in release 2.5 +# MethodSlot(lenfunc, "nb_index", "??"), ) PySequenceMethods = ( - MethodSlot(inquiry, "sq_length", "__len__"), # EmptySlot("sq_length"), # mp_length used instead + MethodSlot(lenfunc, "sq_length", "__len__"), # EmptySlot("sq_length"), # mp_length used instead EmptySlot("sq_concat"), # nb_add used instead EmptySlot("sq_repeat"), # nb_multiply used instead SyntheticSlot("sq_item", ["__getitem__"], "0"), #EmptySlot("sq_item"), # mp_subscript used instead - MethodSlot(intintargfunc, "sq_slice", "__getslice__"), + MethodSlot(ssizessizeargfunc, "sq_slice", "__getslice__"), EmptySlot("sq_ass_item"), # mp_ass_subscript used instead SyntheticSlot("sq_ass_slice", ["__setslice__", "__delslice__"], "0"), MethodSlot(cmpfunc, "sq_contains", "__contains__"), @@ -470,7 +487,7 @@ ) PyMappingMethods = ( - MethodSlot(inquiry, "mp_length", "__len__"), + MethodSlot(lenfunc, "mp_length", "__len__"), MethodSlot(objargfunc, "mp_subscript", "__getitem__"), SyntheticSlot("mp_ass_subscript", ["__setitem__", "__delitem__"], "0"), ) @@ -565,8 +582,8 @@ MethodSlot(destructor, "", "__dealloc__") MethodSlot(objobjargproc, "", "__setitem__") MethodSlot(objargproc, "", "__delitem__") -MethodSlot(intintobjargproc, "", "__setslice__") -MethodSlot(intintargproc, "", "__delslice__") +MethodSlot(ssizessizeobjargproc, "", "__setslice__") +MethodSlot(ssizessizeargproc, "", "__delslice__") MethodSlot(getattrofunc, "", "__getattr__") MethodSlot(setattrofunc, "", "__setattr__") MethodSlot(delattrofunc, "", "__delattr__") Index: Pyrex/Compiler/ExprNodes.py =================================================================== --- Pyrex/Compiler/ExprNodes.py (Revision 133) +++ Pyrex/Compiler/ExprNodes.py (Arbeitskopie) @@ -1035,7 +1035,7 @@ self.type = PyrexTypes.error_type if self.index.type.is_pyobject: self.index = self.index.coerce_to( - PyrexTypes.c_int_type, env) + PyrexTypes.c_py_ssize_t_type, env) if not self.index.type.is_int: error(self.pos, "Invalid index type '%s'" % @@ -1107,7 +1107,7 @@ if self.stop: self.stop.analyse_types(env) self.base = self.base.coerce_to_pyobject(env) - c_int = PyrexTypes.c_int_type + c_int = PyrexTypes.c_py_ssize_t_type if self.start: self.start = self.start.coerce_to(c_int, env) if self.stop: @@ -1157,7 +1157,7 @@ if self.stop: return self.stop.result_code else: - return "0x7fffffff" + return "PY_SSIZE_T_MAX" def calculate_result_code(self): # self.result_code is not used, but this method must exist @@ -3101,7 +3101,7 @@ PyErr_SetString(PyExc_ValueError, "unpack sequence of wrong size"); } -static PyObject *__Pyx_UnpackItem(PyObject *seq, int i) { +static PyObject *__Pyx_UnpackItem(PyObject *seq, Py_ssize_t i) { PyObject *item; if (!(item = PySequence_GetItem(seq, i))) { if (PyErr_ExceptionMatches(PyExc_IndexError)) @@ -3110,7 +3110,7 @@ return item; } -static int __Pyx_EndUnpack(PyObject *seq, int i) { +static int __Pyx_EndUnpack(PyObject *seq, Py_ssize_t i) { PyObject *item; if (item = PySequence_GetItem(seq, i)) { Py_DECREF(item); Index: Pyrex/Compiler/Nodes.py =================================================================== --- Pyrex/Compiler/Nodes.py (Revision 133) +++ Pyrex/Compiler/Nodes.py (Arbeitskopie) @@ -199,11 +199,19 @@ code.putln('/* Generated by Pyrex %s on %s */' % ( Version.version, time.asctime())) code.putln('') + code.putln('#define PY_SSIZE_T_CLEAN') for filename in env.python_include_files: code.putln('#include "%s"' % filename) code.putln("#ifndef PY_LONG_LONG") code.putln(" #define PY_LONG_LONG LONG_LONG") code.putln("#endif") + code.putln("#if PY_VERSION_HEX < 0x02050000") + code.putln(" typedef int Py_ssize_t;") + code.putln(" #define PY_SSIZE_T_MAX INT_MAX") + code.putln(" #define PY_SSIZE_T_MIN INT_MIN") + code.putln(" #define PyInt_FromSsize_t(z) PyInt_FromLong(z)") + code.putln(" #define PyInt_AsSsize_t(o) PyInt_AsLong(o)") + code.putln("#endif") self.generate_extern_c_macro_definition(code) code.putln("%s double pow(double, double);" % Naming.extern_c_macro) self.generate_includes(env, cimported_modules, code) @@ -624,12 +632,12 @@ # a __getitem__ method is present. It converts its # argument to a Python integer and calls mp_subscript. code.putln( - "static PyObject *%s(PyObject *o, int i) {" % + "static PyObject *%s(PyObject *o, Py_ssize_t i) {" % scope.mangle_internal("sq_item")) code.putln( "PyObject *r;") code.putln( - "PyObject *x = PyInt_FromLong(i); if(!x) return 0;") + "PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;") code.putln( "r = o->ob_type->tp_as_mapping->mp_subscript(o, x);") code.putln( @@ -715,7 +723,7 @@ del_entry = scope.lookup_here("__delslice__") code.putln("") code.putln( - "static int %s(PyObject *o, int i, int j, PyObject *v) {" % + "static int %s(PyObject *o, Py_ssize_t i, Py_ssize_t j, PyObject *v) {" % scope.mangle_internal("sq_ass_slice")) code.putln( "if (v) {") @@ -3542,8 +3550,8 @@ """ typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/ typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/ -static PyObject *__Pyx_UnpackItem(PyObject *, int); /*proto*/ -static int __Pyx_EndUnpack(PyObject *, int); /*proto*/ +static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t); /*proto*/ +static int __Pyx_EndUnpack(PyObject *, Py_ssize_t); /*proto*/ static int __Pyx_PrintItem(PyObject *); /*proto*/ static int __Pyx_PrintNewline(void); /*proto*/ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ @@ -3553,7 +3561,7 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/ static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds,\ - char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/ + char *kwd_list[], Py_ssize_t nargs, PyObject **args2, PyObject **kwds2); /*proto*/ static void __Pyx_WriteUnraisable(char *name); /*proto*/ static void __Pyx_AddTraceback(char *funcname); /*proto*/ static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size); /*proto*/ @@ -3595,7 +3603,7 @@ return -1; if (PyString_Check(v)) { char *s = PyString_AsString(v); - int len = PyString_Size(v); + Py_ssize_t len = PyString_Size(v); if (len > 0 && isspace(Py_CHARMASK(s[len-1])) && s[len-1] != ' ') @@ -3650,7 +3658,7 @@ } if (PyString_Check(type)) ; - else if (PyClass_Check(type)) + else if (PyType_Check(type) || PyClass_Check(type)) ; /*PyErr_NormalizeException(&type, &value, &tb);*/ else if (PyInstance_Check(type)) { /* Raising an instance. The value should be a dummy. */ @@ -3739,7 +3747,7 @@ PyObject **args, PyObject **kwds, char *kwd_list[], - int nargs, + Py_ssize_t nargs, PyObject **args2, PyObject **kwds2) { @@ -3799,10 +3807,8 @@ bad: Py_XDECREF(args1); Py_XDECREF(kwds1); - if (*args2) - Py_XDECREF(*args2); - if (*kwds2) - Py_XDECREF(*kwds2); + Py_XDECREF(*args2); + Py_XDECREF(*kwds2); return -1; } """ Index: Pyrex.spec =================================================================== RCS file: /cvs/dist/rpms/Pyrex/devel/Pyrex.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Pyrex.spec 7 Dec 2006 16:13:07 -0000 1.17 +++ Pyrex.spec 3 Jan 2007 21:06:56 -0000 1.18 @@ -2,7 +2,7 @@ Name: Pyrex Version: 0.9.4 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 BuildArch: noarch Summary: A compiler/language for writing Python extension modules. @@ -12,6 +12,7 @@ Source0: http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-%{version}.tar.gz Patch0: Pyrex-0.9.4-fix-indent.patch +Patch1: pyrex-python-2.5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -33,6 +34,7 @@ %prep %setup -q %patch0 -p1 -b .fix-indent +%patch1 -p0 -b .python25 %build python setup.py build @@ -64,6 +66,9 @@ %exclude %{python_sitelib}/Pyrex/Mac %changelog +* Wed Jan 3 2007 David Zeuthen - 0:0.9.4-4%{?dist} +- include a patch so Pyrex works with python 2.5 + * Thu Dec 7 2006 Jeremy Katz - 0:0.9.4-2 - rebuild against python 2.5 From fedora-cvs-commits at redhat.com Wed Jan 3 21:10:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 16:10:45 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.388,1.389 Message-ID: <200701032110.l03LAjAb025242@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25023 Modified Files: eclipse.spec Log Message: * Wed Jan 03 2007 Ben Konrath 3.2.1-27 - Use /g in tomcat version replacement. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.388 retrieving revision 1.389 diff -u -r1.388 -r1.389 --- eclipse.spec 20 Dec 2006 04:19:37 -0000 1.388 +++ eclipse.spec 3 Jan 2007 21:10:43 -0000 1.389 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 26%{?dist} +Release: 27%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -367,7 +367,7 @@ %patch6 -p0 %patch7 -p0 popd -sed --in-place "s/4.1.130/5.5.17/" \ +sed --in-place "s/4.1.130/5.5.17/g" \ features/org.eclipse.platform/build.xml \ plugins/org.eclipse.tomcat/build.xml \ assemble.*.xml @@ -1701,6 +1701,9 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Wed Jan 03 2007 Ben Konrath 3.2.1-27 +- Use /g in tomcat version replacement. + * Tue Dec 19 2006 Ben Konrath 3.2.1-26 - Use sed instead of patch for tomcat version. - Add BuildRequires desktop-file-utils. From fedora-cvs-commits at redhat.com Wed Jan 3 21:13:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 16:13:11 -0500 Subject: rpms/dbus-python/devel dbus-python.spec,1.11,1.12 Message-ID: <200701032113.l03LDBoW027158@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/dbus-python/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27079 Modified Files: dbus-python.spec Log Message: * Wed Jan 3 2007 David Zeuthen - 0.70-9%{?dist} - rebuild against new Pyrex Index: dbus-python.spec =================================================================== RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dbus-python.spec 6 Dec 2006 23:09:31 -0000 1.11 +++ dbus-python.spec 3 Jan 2007 21:13:09 -0000 1.12 @@ -1,13 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define pyrex_version 0.9.3 +%define pyrex_version 0.9.4-4 %define dbus_glib_version 0.70 %define dbus_version 0.90 Summary: D-Bus Python Bindings Name: dbus-python Version: 0.70 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz Patch0: dbus-python-0.70-fix-binary-modules-dir.patch @@ -48,6 +48,9 @@ %{python_sitearch}/dbus/*.py* %changelog +* Wed Jan 3 2007 David Zeuthen - 0.70-9%{?dist} +- rebuild against new Pyrex + * Wed Dec 6 2006 Jeremy Katz - 0.70-8 - rebuild against python 2.5 From fedora-cvs-commits at redhat.com Wed Jan 3 21:18:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 16:18:33 -0500 Subject: rpms/dogtail/devel .cvsignore, 1.3, 1.4 dogtail.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200701032118.l03LIXcp019155@cvs.devel.redhat.com> Author: zcerza Update of /cvs/dist/rpms/dogtail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18866 Modified Files: .cvsignore dogtail.spec sources Log Message: Update to 0.6.1. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dogtail/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Sep 2006 03:48:35 -0000 1.3 +++ .cvsignore 3 Jan 2007 21:18:30 -0000 1.4 @@ -1 +1 @@ -dogtail-0.6.0.tar.gz +dogtail-0.6.1.tar.gz Index: dogtail.spec =================================================================== RCS file: /cvs/dist/rpms/dogtail/devel/dogtail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dogtail.spec 7 Dec 2006 19:46:27 -0000 1.5 +++ dogtail.spec 3 Jan 2007 21:18:30 -0000 1.6 @@ -1,7 +1,7 @@ Summary: GUI test tool and automation framework Name: dogtail -Version: 0.6.0 -Release: 2%{?dist} +Version: 0.6.1 +Release: 1%{?dist} License: GPL Group: User Interface/X URL: http://people.redhat.com/zcerza/dogtail/ @@ -63,6 +63,9 @@ %doc examples/ %changelog +* Wed Jan 3 2007 Zack Cerza - 0.6.1-1 +- New upstream release. + * Thu Dec 7 2006 Jeremy Katz - 0.6.0-2 - build for python 2.5 - BR python-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/dogtail/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Sep 2006 03:48:35 -0000 1.3 +++ sources 3 Jan 2007 21:18:30 -0000 1.4 @@ -1 +1 @@ -6c5d54a2efaa74d19376e2482b98c7be dogtail-0.6.0.tar.gz +d0dbe2e44ab205600dae1b8a8611105e dogtail-0.6.1.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 3 23:22:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 18:22:16 -0500 Subject: rpms/cpuspeed/devel cpuspeed.init,1.18,1.19 Message-ID: <200701032322.l03NMGOX024169@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24124 Modified Files: cpuspeed.init Log Message: Fix up status/condrestart for cpufreq-ondemand case Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cpuspeed.init 14 Dec 2006 22:40:33 -0000 1.18 +++ cpuspeed.init 3 Jan 2007 23:22:13 -0000 1.19 @@ -1,4 +1,4 @@ -#!/bin/sh +#/bin/sh # Startup script for cpuspeed # # chkconfig: 12345 06 99 @@ -19,6 +19,9 @@ cpu0freqd=/sys/devices/system/cpu/cpu0/cpufreq cpus='/sys/devices/system/cpu/cpu*' testpat="${cpus}/cpufreq/scaling_driver" +lockfile="/var/lock/subsys/$prog" +governor=${GOVERNOR:-ondemand} +xendir="/proc/xen" some_file_exist() { while [ "$1" ] ; do @@ -29,7 +32,7 @@ } start() { - if [ ! -f /var/lock/subsys/cpuspeed ] ; then + if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then if ! some_file_exist $testpat ; then # Attempt to load scaling_driver if not loaded # but it is configured @@ -61,22 +64,22 @@ case "$drv" in centrino|powernow-k8) - /sbin/modprobe cpufreq-ondemand + /sbin/modprobe cpufreq-${governor} for cpu in ${cpus} do - echo ondemand > $cpu/cpufreq/scaling_governor + echo ${governor} > $cpu/cpufreq/scaling_governor done RETVAL=0 # technically, not quite right, but close enough to # illustrate that we're doing frequency scaling - touch /var/lock/subsys/cpuspeed + touch $lockfile ;; *) echo -n $"Starting $prog: " daemon cpuspeed -d $OPTS RETVAL=$? echo - [ $RETVAL = 0 ] && touch /var/lock/subsys/cpuspeed + [ $RETVAL = 0 ] && touch $lockfile esac else return 0 @@ -95,7 +98,7 @@ echo userspace > $cpu/cpufreq/scaling_governor cat $cpu/cpufreq/cpuinfo_max_freq > $cpu/cpufreq/scaling_setspeed done - /sbin/modprobe -r cpufreq-ondemand + /sbin/modprobe -r cpufreq-${governor} RETVAL=0 ;; *) @@ -112,7 +115,7 @@ esac [ -n "$DRIVER" ] && /sbin/modprobe -r $DRIVER [ $RETVAL = 0 ] && RETVAL=$? - [ $RETVAL = 0 ] && rm -f /var/lock/subsys/cpuspeed + [ $RETVAL = 0 ] && rm -f $lockfile return $RETVAL } @@ -126,7 +129,11 @@ ;; status) - status cpuspeed + if [ `/sbin/lsmod | grep -c "cpufreq.${governor}"` -ge 1 ] ; then + echo "Frequency scaling enabled via ${governor} governor" + else + status cpuspeed + fi ;; restart) stop From fedora-cvs-commits at redhat.com Thu Jan 4 00:15:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 19:15:09 -0500 Subject: rpms/gcc/devel .cvsignore, 1.189, 1.189.2.1 gcc41.spec, 1.134, 1.134.2.1 sources, 1.191, 1.191.2.1 Message-ID: <200701040015.l040F94C022219@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22185 Modified Files: Tag: private-powerpc-ada-branch .cvsignore gcc41.spec sources Log Message: test build ada on ppc Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.189 retrieving revision 1.189.2.1 diff -u -r1.189 -r1.189.2.1 --- .cvsignore 2 Jan 2007 19:30:18 -0000 1.189 +++ .cvsignore 4 Jan 2007 00:15:06 -0000 1.189.2.1 @@ -1 +1,2 @@ gcc-4.1.1-20070102.tar.bz2 +gcc-gnat-4.1.1-47.ppc.tar.gz Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.134 retrieving revision 1.134.2.1 diff -u -r1.134 -r1.134.2.1 --- gcc41.spec 3 Jan 2007 19:15:15 -0000 1.134 +++ gcc41.spec 4 Jan 2007 00:15:06 -0000 1.134.2.1 @@ -1,10 +1,11 @@ +ExclusiveArch: ppc %define DATE 20070102 %define gcc_version 4.1.1 -%define gcc_release 50 +%define gcc_release 50.ada %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 -%ifarch %{ix86} x86_64 ia64 +%ifarch %{ix86} x86_64 ia64 ppc %define build_ada 1 %else %define build_ada 0 @@ -58,8 +59,12 @@ %endif %if %{build_ada} # Ada requires Ada to build +%ifarch ppc +Source4: gcc-gnat-4.1.1-47.ppc.tar.gz +%else BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 %endif +%endif %ifarch ia64 BuildRequires: libunwind >= 0.98 %endif @@ -506,6 +511,9 @@ rm -rf libstdc++-v3/config/abi/sparc64-linux-gnu/32 fi %endif +%ifarch ppc +tar xfz %SOURCE4 +%endif %build @@ -543,6 +551,10 @@ CC=`pwd`/gcc64 fi %endif +%ifarch ppc + CC=`pwd`/../usr/bin/gcc + export PATH=`pwd`/../usr/bin:$PATH +%endif OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'` case "$OPT_FLAGS" in *-fasynchronous-unwind-tables*) @@ -1545,6 +1557,9 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Wed Jan 3 2007 Jakub Jelinek 4.1.1-50.ada +- Build with ADA on PowerPC + * Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 - backwards compatibility with old layout of struct _Unwind_Context (#220627) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.191 retrieving revision 1.191.2.1 diff -u -r1.191 -r1.191.2.1 --- sources 2 Jan 2007 19:30:19 -0000 1.191 +++ sources 4 Jan 2007 00:15:06 -0000 1.191.2.1 @@ -1 +1,2 @@ 8a44fdf031974e9640b6ca7c77f0b499 gcc-4.1.1-20070102.tar.bz2 +2cd152cc704b26bac00556007fcf58cc gcc-gnat-4.1.1-47.ppc.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 00:22:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 19:22:50 -0500 Subject: rpms/kernel/devel netlabel-lock.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2904, 1.2904.2.1 Message-ID: <200701040022.l040Mohh010494@cvs.devel.redhat.com> Author: eparis Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10478 Modified Files: Tag: private-BZ220966-branch kernel-2.6.spec Added Files: Tag: private-BZ220966-branch netlabel-lock.patch Log Message: * Wed Jan 3 2007 Eric Paris - FOR TESTING ONLY! - added netlabel locking fix. netlabel-lock.patch: services.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE netlabel-lock.patch --- [PATCH] selinux: fix selinux_netlbl_inode_permission() locking do not call a sleeping lock API in an RCU read section. lock_sock_nested can sleep, its BH counterpart doesn't. selinux_netlbl_inode_permission() needs to use the BH counterpart unconditionally. Compile tested. From: Ingo Molnar added BH disabling, because this function can be called from non-atomic contexts too, so a naked bh_lock_sock() would be deadlock-prone. Boot-tested the resulting kernel. Signed-off-by: Parag Warudkar Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds --- diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index bdb7070..ee05815 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2660,9 +2660,11 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask) rcu_read_unlock(); return 0; } - lock_sock(sock->sk); + local_bh_disable(); + bh_lock_sock_nested(sock->sk); rc = selinux_netlbl_socket_setsid(sock, sksec->sid); - release_sock(sock->sk); + bh_unlock_sock(sock->sk); + local_bh_enable(); rcu_read_unlock(); return rc; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2904 retrieving revision 1.2904.2.1 diff -u -r1.2904 -r1.2904.2.1 --- kernel-2.6.spec 2 Jan 2007 04:31:26 -0000 1.2904 +++ kernel-2.6.spec 4 Jan 2007 00:22:48 -0000 1.2904.2.1 @@ -32,7 +32,7 @@ %define sublevel 19 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist} +%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.BZ220966.TESTING.ONLY %define make_target bzImage %define kernel_image x86 @@ -477,6 +477,8 @@ Patch20001: xen-11668-hvm_disable_fix.patch Patch20002: xen-dom0-reboot.patch +Patch25001: netlabel-lock.patch + # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu} @@ -1047,6 +1049,9 @@ # # + +%patch25001 -p1 + # misc small stuff to make things compile or otherwise improve performance # %patch10000 -p1 @@ -1988,6 +1993,10 @@ # - tux. %changelog +* Wed Jan 3 2007 Eric Paris +- FOR TESTING ONLY! +- added netlabel locking fix. + * Mon Jan 1 2007 Dave Jones - 2.6.20rc3 From fedora-cvs-commits at redhat.com Thu Jan 4 00:27:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 19:27:10 -0500 Subject: rpms/gcc/devel gcc41.spec,1.134.2.1,1.134.2.2 Message-ID: <200701040027.l040RA5k010646@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10631 Modified Files: Tag: private-powerpc-ada-branch gcc41.spec Log Message: gnat tarball unconditional Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.134.2.1 retrieving revision 1.134.2.2 diff -u -r1.134.2.1 -r1.134.2.2 --- gcc41.spec 4 Jan 2007 00:15:06 -0000 1.134.2.1 +++ gcc41.spec 4 Jan 2007 00:27:08 -0000 1.134.2.2 @@ -33,6 +33,7 @@ Source1: libgcc_post_upgrade.c Source2: README.libgcjwebplugin.so Source3: protoize.1 +Source4: gcc-gnat-4.1.1-47.ppc.tar.gz URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Need binutils with -pie support >= 2.14.90.0.4-4 @@ -59,9 +60,7 @@ %endif %if %{build_ada} # Ada requires Ada to build -%ifarch ppc -Source4: gcc-gnat-4.1.1-47.ppc.tar.gz -%else +%ifnarch ppc BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 %endif %endif From fedora-cvs-commits at redhat.com Thu Jan 4 00:43:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 19:43:39 -0500 Subject: rpms/gcc/devel gcc41.spec,1.134.2.2,1.134.2.3 Message-ID: <200701040043.l040hdOQ000609@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv552 Modified Files: Tag: private-powerpc-ada-branch gcc41.spec Log Message: Need LD_LIBRARY_PATH for libgnat Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.134.2.2 retrieving revision 1.134.2.3 diff -u -r1.134.2.2 -r1.134.2.3 --- gcc41.spec 4 Jan 2007 00:27:08 -0000 1.134.2.2 +++ gcc41.spec 4 Jan 2007 00:43:36 -0000 1.134.2.3 @@ -553,6 +553,7 @@ %ifarch ppc CC=`pwd`/../usr/bin/gcc export PATH=`pwd`/../usr/bin:$PATH + export LD_LIBRARY_PATH=`pwd`/../usr/lib %endif OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'` case "$OPT_FLAGS" in From fedora-cvs-commits at redhat.com Thu Jan 4 03:32:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 3 Jan 2007 22:32:38 -0500 Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.31,1.32 Message-ID: <200701040332.l043Wciu019918@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19883 Modified Files: evolution-sharp.spec Log Message: - Fix location of mono files. Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- evolution-sharp.spec 3 Jan 2007 19:11:28 -0000 1.31 +++ evolution-sharp.spec 4 Jan 2007 03:32:35 -0000 1.32 @@ -68,8 +68,8 @@ %defattr(-,root,root,-) %doc COPYING README %{_libdir}/*.so -%{_libdir}/mono/gac/evolution-sharp/ -%{_libdir}/mono/evolution-sharp/evolution-sharp.dll +%{_prefix}/lib/mono/gac/evolution-sharp/ +%{_prefix}/lib/mono/evolution-sharp/evolution-sharp.dll %{_datadir}/gapi-2.0/ %files devel @@ -85,6 +85,7 @@ * Wed Jan 03 2007 Matthew Barnes - 0.12.1-1.fc7 - Update to 0.12.1 - Remove evolution-sharp-0.11.1-evo210.patch (fixed upstream). +- Mono files now live in %{_prefix}/lib rather than %{_libdir}. * Fri Nov 17 2006 Matthew Barnes - 0.12.0-1.fc7 - Update to 0.12.0 From fedora-cvs-commits at redhat.com Thu Jan 4 06:05:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 01:05:11 -0500 Subject: rpms/fonts-indic/devel .cvsignore, 1.13, 1.14 fonts-indic.spec, 1.18, 1.19 sources, 1.16, 1.17 Message-ID: <200701040605.l0465BGA010803@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-indic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10749 Modified Files: .cvsignore fonts-indic.spec sources Log Message: - Resolves: RH#216639 and RH#217482 for [kn_IN] (Parag Nemade) - Resolves: RH#219583 for [pa_IN] (Parag Nemade) - Resolves: RH#218588 for [gu_IN] (Parag Nemade) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 6 Dec 2006 07:32:11 -0000 1.13 +++ .cvsignore 4 Jan 2007 06:05:09 -0000 1.14 @@ -10,3 +10,4 @@ fonts-indic-2.0.8.tar.gz fonts-indic-2.0.9.tar.gz fonts-indic-2.0.10.tar.gz +fonts-indic-2.0.11.tar.gz Index: fonts-indic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fonts-indic.spec 6 Dec 2006 07:32:11 -0000 1.18 +++ fonts-indic.spec 4 Jan 2007 06:05:09 -0000 1.19 @@ -3,7 +3,7 @@ %define langlist "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu" Name: fonts-indic -Version: 2.0.10 +Version: 2.0.11 Release: 1%{?dist} License: GPL Group: User Interface/X @@ -256,11 +256,16 @@ %{xfontdir}/telugu/*ttf %changelog -* Wed Dec 06 2006 Parag Nemade - 2.0.10-1.fc7 +* Thu Jan 04 2007 Parag Nemade - 2.0.11-1 +- Resolves: RH#216639 and RH#217482 for [kn_IN] (Parag Nemade) +- Resolves: RH#219583 for [pa_IN] (Parag Nemade) +- Resolves: RH#218588 for [gu_IN] (Parag Nemade) + +* Tue Dec 06 2006 Parag Nemade - 2.0.10-1 - Resolved Bugs from Parag Nemade -- Resolves: bug 207269,bug 217482,bug 216628,bug 218588,bug 206599 +- Resolves: bug 207269 for [ta_IN],bug 217482 for [kn_IN],bug 216628 for [ml_IN],bug 218588 for [gu_IN],bug 206599 for [te_IN] - Resolved Bugs from LingNing Zhang -- Resolves: Bug 218586,bug 218587 +- Resolves: Bug 218586,bug 218587 for [ml_IN] * Tue Nov 21 2006 Parag Nemade - 2.0.9-1 - Fixed Bugs from Parag Nemade Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 6 Dec 2006 07:32:11 -0000 1.16 +++ sources 4 Jan 2007 06:05:09 -0000 1.17 @@ -1 +1 @@ -f74d3aeafaa8b64e9676628a6c71a2ad fonts-indic-2.0.10.tar.gz +f4062354ec34af5d9b8ca65031419993 fonts-indic-2.0.11.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 06:19:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 01:19:28 -0500 Subject: rpms/fonts-indic/devel .cvsignore, 1.14, 1.15 fonts-indic.spec, 1.19, 1.20 sources, 1.17, 1.18 Message-ID: <200701040619.l046JS46031441@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-indic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31425 Modified Files: .cvsignore fonts-indic.spec sources Log Message: - Resolves: RH#220881 for [ta_IN], RH#220882 for [hi_IN] (Parag Nemade) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 4 Jan 2007 06:05:09 -0000 1.14 +++ .cvsignore 4 Jan 2007 06:19:26 -0000 1.15 @@ -11,3 +11,4 @@ fonts-indic-2.0.9.tar.gz fonts-indic-2.0.10.tar.gz fonts-indic-2.0.11.tar.gz +fonts-indic-2.0.12.tar.gz Index: fonts-indic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fonts-indic.spec 4 Jan 2007 06:05:09 -0000 1.19 +++ fonts-indic.spec 4 Jan 2007 06:19:26 -0000 1.20 @@ -3,7 +3,7 @@ %define langlist "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu" Name: fonts-indic -Version: 2.0.11 +Version: 2.0.12 Release: 1%{?dist} License: GPL Group: User Interface/X @@ -256,6 +256,9 @@ %{xfontdir}/telugu/*ttf %changelog +* Thu Jan 04 2007 Parag Nemade - 2.0.12-1 +- Resolves: RH#220881 for [ta_IN], RH#220882 for [hi_IN] (Parag Nemade) + * Thu Jan 04 2007 Parag Nemade - 2.0.11-1 - Resolves: RH#216639 and RH#217482 for [kn_IN] (Parag Nemade) - Resolves: RH#219583 for [pa_IN] (Parag Nemade) Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 4 Jan 2007 06:05:09 -0000 1.17 +++ sources 4 Jan 2007 06:19:26 -0000 1.18 @@ -1 +1,2 @@ f4062354ec34af5d9b8ca65031419993 fonts-indic-2.0.11.tar.gz +a22857065b10895e4358fa748f3f2f45 fonts-indic-2.0.12.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 06:23:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 01:23:15 -0500 Subject: rpms/fonts-indic/FC-6 .cvsignore, 1.11, 1.12 fonts-indic.spec, 1.16, 1.17 sources, 1.14, 1.15 Message-ID: <200701040623.l046NFYM031532@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-indic/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31513 Modified Files: .cvsignore fonts-indic.spec sources Log Message: - Resolves: RH#220881 for [ta_IN], RH#220882 for [hi_IN] (Parag Nemade) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/FC-6/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Dec 2006 07:32:38 -0000 1.11 +++ .cvsignore 4 Jan 2007 06:23:13 -0000 1.12 @@ -8,3 +8,4 @@ fonts-indic-2.0.5.tar.gz fonts-indic-2.0.6.tar.gz fonts-indic-2.0.10.tar.gz +fonts-indic-2.0.12.tar.gz Index: fonts-indic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/FC-6/fonts-indic.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fonts-indic.spec 6 Dec 2006 07:32:38 -0000 1.16 +++ fonts-indic.spec 4 Jan 2007 06:23:13 -0000 1.17 @@ -3,7 +3,7 @@ %define langlist "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu" Name: fonts-indic -Version: 2.0.10 +Version: 2.0.12 Release: 1%{?dist} License: GPL Group: User Interface/X @@ -256,7 +256,15 @@ %{xfontdir}/telugu/*ttf %changelog -* Wed Dec 06 2006 Parag Nemade - 2.0.10-1.fc6 +* Thu Jan 04 2007 Parag Nemade - 2.0.12-1 +- Resolves: RH#220881 for [ta_IN], RH#220882 for [hi_IN] (Parag Nemade) + +* Thu Jan 04 2007 Parag Nemade - 2.0.11-1 +- Resolves: RH#216639 and RH#217482 for [kn_IN] (Parag Nemade) +- Resolves: RH#219583 for [pa_IN] (Parag Nemade) +- Resolves: RH#218588 for [gu_IN] (Parag Nemade) + +* Wed Dec 06 2006 Parag Nemade - 2.0.10-1 - Resolved Bugs from Parag Nemade - Resolves: bug 207269,bug 217482,bug 216628,bug 218588,bug 206599 - Resolved Bugs from LingNing Zhang Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 6 Dec 2006 07:32:38 -0000 1.14 +++ sources 4 Jan 2007 06:23:13 -0000 1.15 @@ -1 +1 @@ -f74d3aeafaa8b64e9676628a6c71a2ad fonts-indic-2.0.10.tar.gz +a22857065b10895e4358fa748f3f2f45 fonts-indic-2.0.12.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 09:52:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 04:52:44 -0500 Subject: rpms/uucp/devel uucp.spec,1.32,1.33 Message-ID: <200701040952.l049qigw026814@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/uucp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26800 Modified Files: uucp.spec Log Message: spec file improvements (#220534) Index: uucp.spec =================================================================== RCS file: /cvs/dist/rpms/uucp/devel/uucp.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- uucp.spec 3 Jan 2007 13:30:35 -0000 1.32 +++ uucp.spec 4 Jan 2007 09:52:41 -0000 1.33 @@ -7,7 +7,7 @@ Summary: The uucp utility for copying files between systems Name: uucp Version: 1.07 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL Group: Applications/Communications Url: http://www.airs.com/ian/uucp.html @@ -101,7 +101,7 @@ chmod 644 %{_varlogdir}/Log %{_varlogdir}/Stats chmod 600 %{_varlogdir}/Debug -/sbin/install-info %{_infodir}/uucp.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/uucp.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then @@ -155,6 +155,9 @@ %config(noreplace) %{_newconfigdir}/sys %changelog +* Thu Jan 04 2007 Peter Vrabec 1.07-14 +- spec file improvements (#220534) + * Wed Jan 03 2007 Peter Vrabec 1.07-13 - spec file improvements (#220534) From fedora-cvs-commits at redhat.com Thu Jan 4 09:53:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 04:53:37 -0500 Subject: rpms/gcc/devel .cvsignore, 1.189, 1.190 gcc41.spec, 1.134, 1.135 sources, 1.191, 1.192 Message-ID: <200701040953.l049rb6r026883@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26866 Modified Files: .cvsignore gcc41.spec sources Log Message: bootstrap ppc ada Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- .cvsignore 2 Jan 2007 19:30:18 -0000 1.189 +++ .cvsignore 4 Jan 2007 09:53:35 -0000 1.190 @@ -1 +1,2 @@ gcc-4.1.1-20070102.tar.bz2 +gcc-gnat-4.1.1-47.ppc.tar.gz Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- gcc41.spec 3 Jan 2007 19:15:15 -0000 1.134 +++ gcc41.spec 4 Jan 2007 09:53:35 -0000 1.135 @@ -1,10 +1,10 @@ %define DATE 20070102 %define gcc_version 4.1.1 -%define gcc_release 50 +%define gcc_release 50.1 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 -%ifarch %{ix86} x86_64 ia64 +%ifarch %{ix86} x86_64 ia64 ppc %define build_ada 1 %else %define build_ada 0 @@ -32,6 +32,7 @@ Source1: libgcc_post_upgrade.c Source2: README.libgcjwebplugin.so Source3: protoize.1 +Source4: gcc-gnat-4.1.1-47.ppc.tar.gz URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Need binutils with -pie support >= 2.14.90.0.4-4 @@ -58,8 +59,10 @@ %endif %if %{build_ada} # Ada requires Ada to build +%ifnarch ppc BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 %endif +%endif %ifarch ia64 BuildRequires: libunwind >= 0.98 %endif @@ -506,6 +509,9 @@ rm -rf libstdc++-v3/config/abi/sparc64-linux-gnu/32 fi %endif +%ifarch ppc +tar xfz %SOURCE4 +%endif %build @@ -543,6 +549,11 @@ CC=`pwd`/gcc64 fi %endif +%ifarch ppc + CC=`pwd`/../usr/bin/gcc + export PATH=`pwd`/../usr/bin:$PATH + export LD_LIBRARY_PATH=`pwd`/../usr/lib +%endif OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'` case "$OPT_FLAGS" in *-fasynchronous-unwind-tables*) @@ -1545,6 +1556,9 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Wed Jan 3 2007 David Woodhouse 4.1.1-50.1 +- Bootstrap Ada on PowerPC + * Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 - backwards compatibility with old layout of struct _Unwind_Context (#220627) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- sources 2 Jan 2007 19:30:19 -0000 1.191 +++ sources 4 Jan 2007 09:53:35 -0000 1.192 @@ -1 +1,2 @@ 8a44fdf031974e9640b6ca7c77f0b499 gcc-4.1.1-20070102.tar.bz2 +2cd152cc704b26bac00556007fcf58cc gcc-gnat-4.1.1-47.ppc.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 09:57:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 04:57:04 -0500 Subject: rpms/gcc/devel .cvsignore, 1.190, 1.191 gcc41.spec, 1.135, 1.136 sources, 1.192, 1.193 Message-ID: <200701040957.l049v4Bl026962@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26945 Modified Files: .cvsignore gcc41.spec sources Log Message: Normal build for Ada on PPC Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- .cvsignore 4 Jan 2007 09:53:35 -0000 1.190 +++ .cvsignore 4 Jan 2007 09:57:02 -0000 1.191 @@ -1,2 +1 @@ gcc-4.1.1-20070102.tar.bz2 -gcc-gnat-4.1.1-47.ppc.tar.gz Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- gcc41.spec 4 Jan 2007 09:53:35 -0000 1.135 +++ gcc41.spec 4 Jan 2007 09:57:02 -0000 1.136 @@ -1,6 +1,6 @@ %define DATE 20070102 %define gcc_version 4.1.1 -%define gcc_release 50.1 +%define gcc_release 51 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -32,7 +32,6 @@ Source1: libgcc_post_upgrade.c Source2: README.libgcjwebplugin.so Source3: protoize.1 -Source4: gcc-gnat-4.1.1-47.ppc.tar.gz URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Need binutils with -pie support >= 2.14.90.0.4-4 @@ -59,10 +58,8 @@ %endif %if %{build_ada} # Ada requires Ada to build -%ifnarch ppc BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 %endif -%endif %ifarch ia64 BuildRequires: libunwind >= 0.98 %endif @@ -509,9 +506,6 @@ rm -rf libstdc++-v3/config/abi/sparc64-linux-gnu/32 fi %endif -%ifarch ppc -tar xfz %SOURCE4 -%endif %build @@ -549,11 +543,6 @@ CC=`pwd`/gcc64 fi %endif -%ifarch ppc - CC=`pwd`/../usr/bin/gcc - export PATH=`pwd`/../usr/bin:$PATH - export LD_LIBRARY_PATH=`pwd`/../usr/lib -%endif OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e 's/[[:blank:]]\+/ /g'` case "$OPT_FLAGS" in *-fasynchronous-unwind-tables*) @@ -1556,7 +1545,7 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog -* Wed Jan 3 2007 David Woodhouse 4.1.1-50.1 +* Thu Jan 4 2007 David Woodhouse 4.1.1-51 - Bootstrap Ada on PowerPC * Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- sources 4 Jan 2007 09:53:35 -0000 1.192 +++ sources 4 Jan 2007 09:57:02 -0000 1.193 @@ -1,2 +1 @@ 8a44fdf031974e9640b6ca7c77f0b499 gcc-4.1.1-20070102.tar.bz2 -2cd152cc704b26bac00556007fcf58cc gcc-gnat-4.1.1-47.ppc.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 10:00:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 05:00:16 -0500 Subject: rpms/seamonkey/FC-5 seamonkey.spec,1.15,1.16 Message-ID: <200701041000.l04A0GQu027052@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/seamonkey/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27028 Modified Files: seamonkey.spec Log Message: release bump Index: seamonkey.spec =================================================================== RCS file: /cvs/dist/rpms/seamonkey/FC-5/seamonkey.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- seamonkey.spec 21 Dec 2006 15:30:43 -0000 1.15 +++ seamonkey.spec 4 Jan 2007 10:00:09 -0000 1.16 @@ -15,7 +15,7 @@ Name: seamonkey Summary: Web browser and mail reader Version: 1.0.7 -Release: 0.1%{?dist} +Release: 0.6%{?dist} License: MPL/NPL/GPL/LGPL Source0: seamonkey-%{version}.source.tar.bz2 Source1: mozilla.sh.in @@ -792,6 +792,9 @@ %{mozdir}/xpt_link %changelog +* Thu Jan 4 2007 Martin Stransky 1.0.7-0.6 +- Release bump + * Thu Dec 21 2006 Martin Stransky 1.0.7-0.1 - Update to 1.0.7 From fedora-cvs-commits at redhat.com Thu Jan 4 11:23:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 06:23:54 -0500 Subject: rpms/fonts-sinhala/devel .cvsignore, 1.3, 1.4 fonts-sinhala.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200701041123.l04BNsM4011529@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-sinhala/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11246 Modified Files: .cvsignore fonts-sinhala.spec sources Log Message: - Resolves: RH#206001 (Parag Nemade) ------------------------------------------ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2006 10:53:27 -0000 1.3 +++ .cvsignore 4 Jan 2007 11:23:52 -0000 1.4 @@ -1,2 +1,3 @@ lklug-0.2.tar.gz lklug-0.2.1.tar.gz +lklug-0.2.2.tar.gz Index: fonts-sinhala.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/devel/fonts-sinhala.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fonts-sinhala.spec 28 Sep 2006 10:53:27 -0000 1.3 +++ fonts-sinhala.spec 4 Jan 2007 11:23:52 -0000 1.4 @@ -1,5 +1,5 @@ Name: fonts-sinhala -Version: 0.2.1 +Version: 0.2.2 Release: 1 License: GPL Source: lklug-%{version}.tar.gz @@ -49,6 +49,9 @@ %{_datadir}/fonts/sinhala/*.ttf %changelog +* Thu Jan 04 2007 Parag Nemade - 0.2.2-1 +- Resolves: RH#206001 (Parag Nemade) + * Thu Sep 28 2006 Leon Ho - 0.2.1-1 - Fixed RH#207275 (Rahul Bhalerao) Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Sep 2006 10:53:27 -0000 1.4 +++ sources 4 Jan 2007 11:23:52 -0000 1.5 @@ -1,2 +1,3 @@ d6c9527ad8cb60535b282ef1267a066e lklug-0.2.tar.gz 457dcc1ad0c4864f5aaa99903ca1ad55 lklug-0.2.1.tar.gz +f125cd043f474d6bf7da61a384844f4f lklug-0.2.2.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 11:28:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 06:28:15 -0500 Subject: rpms/fonts-sinhala/devel fonts-sinhala.spec,1.4,1.5 Message-ID: <200701041128.l04BSFxV014784@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-sinhala/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14478 Modified Files: fonts-sinhala.spec Log Message: Added dist tag to prevent make tag error Index: fonts-sinhala.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/devel/fonts-sinhala.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fonts-sinhala.spec 4 Jan 2007 11:23:52 -0000 1.4 +++ fonts-sinhala.spec 4 Jan 2007 11:28:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: fonts-sinhala Version: 0.2.2 -Release: 1 +Release: 1%{?dist} License: GPL Source: lklug-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-cvs-commits at redhat.com Thu Jan 4 11:33:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 06:33:01 -0500 Subject: rpms/fonts-arabic/FC-6 .cvsignore, 1.5, 1.6 fonts-arabic.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200701041133.l04BX11H018076@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-arabic/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17853 Modified Files: .cvsignore fonts-arabic.spec sources Log Message: -Resolves: Fixed bug rh#218411 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jul 2006 05:42:59 -0000 1.5 +++ .cvsignore 4 Jan 2007 11:32:59 -0000 1.6 @@ -1,2 +1,3 @@ KacstArabicFonts-1.5.tar.gz paktype-20060712.tar.bz2 +paktype-20061205.tar.gz Index: fonts-arabic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/fonts-arabic.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- fonts-arabic.spec 12 Jul 2006 05:49:20 -0000 1.12 +++ fonts-arabic.spec 4 Jan 2007 11:32:59 -0000 1.13 @@ -1,9 +1,9 @@ %define kacst KacstArabicFonts-1.5 -%define paktype paktype-20060712 +%define paktype paktype-20061205 Name: fonts-arabic Version: 2.0 -Release: 1.1 +Release: 3%{?dist} License: GPL Source0: %{kacst}.tar.gz Source1: %{paktype}.tar.bz2 @@ -52,6 +52,9 @@ %{_datadir}/fonts/arabic/*.ttf %changelog +* Tue Dec 05 2006 Parag Nemade - 2.0-3 +- Fixed bug 218411 PakTypeNaqsh.ttf contains a space in PS name + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jul 2006 05:42:59 -0000 1.5 +++ sources 4 Jan 2007 11:32:59 -0000 1.6 @@ -1,2 +1,2 @@ d27ec36204feb4e8e6c50eebffd76f55 KacstArabicFonts-1.5.tar.gz -27407c76313f42d33ffabebd77f0dd0d paktype-20060712.tar.bz2 +6f98186ce64c30539bc426d3e0f3becd paktype-20061205.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 11:49:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 06:49:56 -0500 Subject: rpms/php-pear/devel .cvsignore, 1.6, 1.7 php-pear.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200701041149.l04BnucZ001521@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php-pear/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1505 Modified Files: .cvsignore php-pear.spec sources Log Message: * Thu Jan 4 2007 Joe Orton 1:1.4.11-2 - update to 1.4.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 14 Jul 2006 13:21:27 -0000 1.6 +++ .cvsignore 4 Jan 2007 11:49:53 -0000 1.7 @@ -1 +1,7 @@ XML_RPC-1.5.0.tgz +install-pear-nozlib-1.4.11.phar +XML_RPC-1.5.1.tgz +pear-1.4.11 +*.src.rpm +noarch +clog Index: php-pear.spec =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- php-pear.spec 14 Jul 2006 13:21:27 -0000 1.14 +++ php-pear.spec 4 Jan 2007 11:49:53 -0000 1.15 @@ -1,14 +1,14 @@ %define peardir %{_datadir}/pear -%define xmlrpcver 1.5.0 +%define xmlrpcver 1.5.1 Summary: PHP Extension and Application Repository framework Name: php-pear -Version: 1.4.9 -Release: 4 +Version: 1.4.11 +Release: 2 Epoch: 1 -License: The PHP License 3.0 +License: The PHP License v3.0 Group: System URL: http://pear.php.net/package/PEAR Source0: install-pear-nozlib-%{version}.phar @@ -43,7 +43,12 @@ export PHP_PEAR_SYSCONF_DIR=`pwd` export PHP_PEAR_SIG_KEYDIR=/etc/pearkeys -export PHP_PEAR_CACHE_DIR=%{_localstatedir}/cache/php-pear + +# 1.4.11 tries to write to the cache directory during installation +# so it's not possible to set a sane default via the environment. +# The ${PWD} bit will be stripped via relocate.php later. +export PHP_PEAR_CACHE_DIR=${PWD}%{_localstatedir}/cache/php-pear +export PHP_PEAR_TEMP_DIR=/var/tmp %{_bindir}/php -n -dshort_open_tag=0 -dsafe_mode=0 \ -derror_reporting=E_ALL -ddetect_unicode=0 \ @@ -73,7 +78,8 @@ $RPM_BUILD_ROOT%{peardir}/*/*/*.php # Sanitize the pear.conf -%{_bindir}/php -n %{SOURCE2} pear.conf $RPM_BUILD_ROOT > new-pear.conf +%{_bindir}/php -n %{SOURCE2} pear.conf $RPM_BUILD_ROOT | + %{_bindir}/php -n %{SOURCE2} php://stdin $PWD > new-pear.conf %{_bindir}/php -n %{SOURCE3} new-pear.conf ext_dir > $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf for f in $RPM_BUILD_ROOT%{peardir}/.registry/*.reg; do @@ -90,7 +96,7 @@ # Check that no buildroot-relative or arch-specific paths are left in the pear.conf grep $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 grep %{_libdir} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 -grep /tmp $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 +grep '"/tmp"' $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 %clean rm -rf $RPM_BUILD_ROOT @@ -106,6 +112,9 @@ %doc LICENSE %changelog +* Thu Jan 4 2007 Joe Orton 1:1.4.11-2 +- update to 1.4.11 + * Fri Jul 14 2006 Joe Orton 1:1.4.9-4 - update to XML_RPC-1.5.0 - really package macros.pear Index: sources =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 14 Jul 2006 13:21:27 -0000 1.6 +++ sources 4 Jan 2007 11:49:53 -0000 1.7 @@ -1,2 +1,2 @@ -1030f325e0ce140db7cb3063bda52d3b install-pear-nozlib-1.4.9.phar -9f9205d8c8b3ca07a50c5d332c6fb722 XML_RPC-1.5.0.tgz +b023a99f9a9cf1164ef96208206a00d1 install-pear-nozlib-1.4.11.phar +1b516162ad65971b5fd04a7c279627ec XML_RPC-1.5.1.tgz From fedora-cvs-commits at redhat.com Thu Jan 4 12:21:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 07:21:03 -0500 Subject: rpms/hal-cups-utils/FC-6 .cvsignore, 1.12, 1.13 hal-cups-utils.spec, 1.46, 1.47 sources, 1.12, 1.13 Message-ID: <200701041221.l04CL3XA022459@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hal-cups-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22442 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Thu Jan 4 2007 Tim Waugh 0.6.4-1 - 0.6.4: - Don't enable/disable existing printers. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 2 Jan 2007 18:09:58 -0000 1.12 +++ .cvsignore 4 Jan 2007 12:21:00 -0000 1.13 @@ -1,2 +1,3 @@ hal-cups-utils-0.6.2.tar.gz hal-cups-utils-0.6.3.tar.gz +hal-cups-utils-0.6.4.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/hal-cups-utils.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- hal-cups-utils.spec 2 Jan 2007 18:09:58 -0000 1.46 +++ hal-cups-utils.spec 4 Jan 2007 12:21:00 -0000 1.47 @@ -1,6 +1,6 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.3 +Version: 0.6.4 Release: 1%{?dist} License: GPL Group: Applications/System @@ -59,7 +59,11 @@ %{_initrddir}/cups-config-daemon %changelog -* Tue Jan 2 2007 Tim Waugh - 0.6.3-1 +* Thu Jan 4 2007 Tim Waugh 0.6.4-1 +- 0.6.4: + - Don't enable/disable existing printers. + +* Tue Jan 2 2007 Tim Waugh 0.6.3-1 - 0.6.3: - Applied all patches. - Added syslogging. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 Jan 2007 18:09:58 -0000 1.12 +++ sources 4 Jan 2007 12:21:00 -0000 1.13 @@ -1 +1 @@ -7a03712599825f275acec31141c4884e hal-cups-utils-0.6.3.tar.gz +23dc6ab715ea02b961a995a50a2f2655 hal-cups-utils-0.6.4.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 12:22:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 07:22:14 -0500 Subject: rpms/hal-cups-utils/devel .cvsignore, 1.12, 1.13 hal-cups-utils.spec, 1.49, 1.50 sources, 1.12, 1.13 Message-ID: <200701041222.l04CMEZ9022557@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hal-cups-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22541 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Thu Jan 4 2007 Tim Waugh 0.6.4-1 - 0.6.4: - Don't enable/disable existing printers. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 2 Jan 2007 18:12:35 -0000 1.12 +++ .cvsignore 4 Jan 2007 12:22:12 -0000 1.13 @@ -1,2 +1,3 @@ hal-cups-utils-0.6.2.tar.gz hal-cups-utils-0.6.3.tar.gz +hal-cups-utils-0.6.4.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- hal-cups-utils.spec 2 Jan 2007 18:12:35 -0000 1.49 +++ hal-cups-utils.spec 4 Jan 2007 12:22:12 -0000 1.50 @@ -1,6 +1,6 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.3 +Version: 0.6.4 Release: 1%{?dist} License: GPL Group: Applications/System @@ -59,6 +59,10 @@ %{_initrddir}/cups-config-daemon %changelog +* Thu Jan 4 2007 Tim Waugh 0.6.4-1 +- 0.6.4: + - Don't enable/disable existing printers. + * Tue Jan 2 2007 Tim Waugh 0.6.3-1 - 0.6.3: - Put PPD NickName in info line instead of just 'Added by HAL'. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 Jan 2007 18:12:35 -0000 1.12 +++ sources 4 Jan 2007 12:22:12 -0000 1.13 @@ -1 +1 @@ -7a03712599825f275acec31141c4884e hal-cups-utils-0.6.3.tar.gz +23dc6ab715ea02b961a995a50a2f2655 hal-cups-utils-0.6.4.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 14:37:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 09:37:51 -0500 Subject: rpms/bind/devel bind.spec,1.149,1.150 namedGetForwarders,1.2,1.3 Message-ID: <200701041437.l04EbpXO015206@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15155 Modified Files: bind.spec namedGetForwarders Log Message: added namedGetForwarders written in shell (#176100) Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- bind.spec 10 Dec 2006 23:52:53 -0000 1.149 +++ bind.spec 4 Jan 2007 14:37:49 -0000 1.150 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.3 -Release: 1%{?prever}%{?dist} +Release: 2%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -777,6 +777,10 @@ :; %changelog +* Thu Jan 4 2007 Martin Stransky - 31:9.3.3-2 +- added namedGetForwarders written in shell (#176100), + created by Baris Cicek . + * Sun Dec 10 2006 Martin Stransky - 31:9.3.3-1 - update to 9.3.3 final - fix for #219069: file included twice in src.rpm Index: namedGetForwarders =================================================================== RCS file: /cvs/dist/rpms/bind/devel/namedGetForwarders,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- namedGetForwarders 19 Jul 2006 18:46:43 -0000 1.2 +++ namedGetForwarders 4 Jan 2007 14:37:49 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/bin/sh # # 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 @@ -9,12 +9,14 @@ # # If no zone argument is specified, all forwarding zones will be listed. # -# Usage: GetForwarders [-n -r] [ ] +# Usage: namedGetForwarders [-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 script is based on perl script of Jason Vas Dias . +# +# Copyright(C) Baris Cicek Nerd Software. 2007 # # 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 @@ -26,98 +28,131 @@ # 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)."'"; -}; - - at dn=(); - -open(DNS, - '/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"; - }; -}; +declare -a zones; +declare -a servers; +declare -a ports; +declare -a only; + +output_format='plain'; +zonecnt=0; + +function push () { + local array + array=( `echo $1` ); + array[${#array[*]}]=$2; + echo ${array[@]}; +} + +function concat () { + local string + while [ $# -gt 0 ]; do + string=${string}$1; + shift; + done + echo $string; +} + +if [ $# -ge 0 ]; then + if [ "$1" == "-r" ]; then + output_format='resolv'; + shift; + elif [ "$1" == "-n" ]; then + output_format='named'; + shift; + fi + zone=""; + for arg in $*; do + zone=$(push "$zone" " string:'$arg'"); + done +fi + +DNS=`/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`; + +if [ $? -ne 0 ]; then + echo -e "dbus-send failed: $? $!"; + exit 1; +fi + +IFS=$'\n' + + +for line in $DNS; do + match_ip=$( echo "$line" | awk --re-interval '{ match ($0, /([[:digit:]]{1,3})\.([[:digit:]]{1,3})\.([[:digit:]]{1,3})\.([[:digit:]]{1,3})/, a); printf "%s.%s.%s.%s", substr($0, a[1, "start"], a[1, "length"]), substr($0, a[2, "start"], a[2, "length"]), substr($0, a[3, "start"], a[3, "length"]), substr($0, a[4, "start"], a[4, "length"]);}' ); + match_port=$( echo "$line" | awk '{ match ($0, /\"([[:digit:]]+)\"$/, a); printf "%s", substr($0, a[1, "start"], a[1,"length"]);}' ); + match_string=$( echo "$line" | awk '{ match ($0, /string.+\"([^\"]+)\"$/, a); printf "%s", substr($0, a[1, "start"], a[1,"length"]);}' ); + + if [ "$match_ip" != "" ] && [ "$match_ip" != "..." ]; then + servers[$zonecnt]=$(push "${servers[$zonecnt]}" "$match_ip"); + elif [ "$match_port" != "" ]; then + ports[$zonecnt]=$(push "${ports[$zonecnt]}" "$match_port"); + elif [ "$match_string" == "only" ]; then + only[$zonecnt]="1"; + elif [ "$match_string" != "" ] && [ "$match_string" != "first" ]; then + zonecnt=$((zonecnt + 1)); + zones[$zonecnt]="$match_string"; + fi + +done + +if [ "$output_format" == "resolv" ]; then +# resolv.conf style: + search_line='search'; + nameserver_lines=''; + for index in $(seq 1 $zonecnt); do + if [ "` echo ${zones[$index]} | awk ' /\.in-addr\.arpa$/ { print $0 }'`" == '' ]; then + search_line=$(push "$search_line" "${zones[$index]}"); + fi + IFS=$' '; + for ns in ${servers[$index]}; do + nameserver_lines=$(concat "$nameserver_lines" "\nnameserver " "$ns"); + done + done + echo -n $search_line; + echo -e $nameserver_lines; +elif [ "$output_format" == "named" ]; then +# named.conf style: + zone_lines=''; + for index in $(seq 1 $zonecnt); do + zone_line=$(concat 'zone "' "${zones[$index]}" '." IN { type forward; forwarders { '); + srvcnt=1; + IFS=$' '; + for ns in ${servers[$index]}; do + srvport=$(eval "echo ${ports[$index]} | awk '{ print \$${srvcnt} }'"); + if [ "$srvport" != "53" ]; then + zone_line=$(concat "$zone_line" " $ns port $srvport;"); + else + zone_line=$(concat "$zone_line" " $ns;"); + fi + srvcnt=$((srvcnt+1)); + done + zone_line=$(concat "$zone_line" " };"); + if [ "${only[$index]}" == '1' ]; then + zone_line=$(concat "$zone_line" " forward only;"); + fi + zone_line=$(concat "$zone_line" " };"); + zone_lines=$(concat "$zone_lines" "$zone_line\n"); + done + echo -e ${zone_lines%\\n}; +elif [ "$output_format" == "plain" ]; then +# just list: + output=''; + for index in $(seq 1 $zonecnt); do + output=$(concat "$output" "${zones[$index]}" "\n"); + if [ "${only[$index]}" == "1" ]; then + output=$(concat "$output" "\t" "forward only" "\n"); + fi + srvcnt=1; + IFS=$' '; + for ns in ${servers[$index]}; do + srvport=$(eval "echo ${ports[$index]} | awk '{ print \$${srvcnt} }'"); + if [ "$srvport" != "53" ]; then + output=$(concat "$output" "\t" "$ns:$srvport" "\n"); + else + output=$(concat "$output" "\t" "$ns" "\n"); + fi + srvcnt=$((srvcnt+1)); + done + done + echo -e ${output%\\n}; +fi From fedora-cvs-commits at redhat.com Thu Jan 4 14:38:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 09:38:52 -0500 Subject: rpms/bind/FC-6 bind.spec,1.144,1.145 namedGetForwarders,1.2,1.3 Message-ID: <200701041438.l04EcqkJ016047@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/bind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15997 Modified Files: bind.spec namedGetForwarders Log Message: added namedGetForwarders written in shell (#176100) Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- bind.spec 10 Dec 2006 23:57:37 -0000 1.144 +++ bind.spec 4 Jan 2007 14:38:50 -0000 1.145 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.3 -Release: 1%{?prever}%{?dist} +Release: 2%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -777,6 +777,10 @@ :; %changelog +* Thu Jan 4 2007 Martin Stransky - 31:9.3.3-2 +- added namedGetForwarders written in shell (#176100), + created by Baris Cicek . + * Sun Dec 10 2006 Martin Stransky - 31:9.3.3-1 - update to 9.3.3 final - fix for #219069: file included twice in src.rpm Index: namedGetForwarders =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/namedGetForwarders,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- namedGetForwarders 19 Jul 2006 18:46:43 -0000 1.2 +++ namedGetForwarders 4 Jan 2007 14:38:50 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/bin/sh # # 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 @@ -9,12 +9,14 @@ # # If no zone argument is specified, all forwarding zones will be listed. # -# Usage: GetForwarders [-n -r] [ ] +# Usage: namedGetForwarders [-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 script is based on perl script of Jason Vas Dias . +# +# Copyright(C) Baris Cicek Nerd Software. 2007 # # 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 @@ -26,98 +28,131 @@ # 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)."'"; -}; - - at dn=(); - -open(DNS, - '/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"; - }; -}; +declare -a zones; +declare -a servers; +declare -a ports; +declare -a only; + +output_format='plain'; +zonecnt=0; + +function push () { + local array + array=( `echo $1` ); + array[${#array[*]}]=$2; + echo ${array[@]}; +} + +function concat () { + local string + while [ $# -gt 0 ]; do + string=${string}$1; + shift; + done + echo $string; +} + +if [ $# -ge 0 ]; then + if [ "$1" == "-r" ]; then + output_format='resolv'; + shift; + elif [ "$1" == "-n" ]; then + output_format='named'; + shift; + fi + zone=""; + for arg in $*; do + zone=$(push "$zone" " string:'$arg'"); + done +fi + +DNS=`/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`; + +if [ $? -ne 0 ]; then + echo -e "dbus-send failed: $? $!"; + exit 1; +fi + +IFS=$'\n' + + +for line in $DNS; do + match_ip=$( echo "$line" | awk --re-interval '{ match ($0, /([[:digit:]]{1,3})\.([[:digit:]]{1,3})\.([[:digit:]]{1,3})\.([[:digit:]]{1,3})/, a); printf "%s.%s.%s.%s", substr($0, a[1, "start"], a[1, "length"]), substr($0, a[2, "start"], a[2, "length"]), substr($0, a[3, "start"], a[3, "length"]), substr($0, a[4, "start"], a[4, "length"]);}' ); + match_port=$( echo "$line" | awk '{ match ($0, /\"([[:digit:]]+)\"$/, a); printf "%s", substr($0, a[1, "start"], a[1,"length"]);}' ); + match_string=$( echo "$line" | awk '{ match ($0, /string.+\"([^\"]+)\"$/, a); printf "%s", substr($0, a[1, "start"], a[1,"length"]);}' ); + + if [ "$match_ip" != "" ] && [ "$match_ip" != "..." ]; then + servers[$zonecnt]=$(push "${servers[$zonecnt]}" "$match_ip"); + elif [ "$match_port" != "" ]; then + ports[$zonecnt]=$(push "${ports[$zonecnt]}" "$match_port"); + elif [ "$match_string" == "only" ]; then + only[$zonecnt]="1"; + elif [ "$match_string" != "" ] && [ "$match_string" != "first" ]; then + zonecnt=$((zonecnt + 1)); + zones[$zonecnt]="$match_string"; + fi + +done + +if [ "$output_format" == "resolv" ]; then +# resolv.conf style: + search_line='search'; + nameserver_lines=''; + for index in $(seq 1 $zonecnt); do + if [ "` echo ${zones[$index]} | awk ' /\.in-addr\.arpa$/ { print $0 }'`" == '' ]; then + search_line=$(push "$search_line" "${zones[$index]}"); + fi + IFS=$' '; + for ns in ${servers[$index]}; do + nameserver_lines=$(concat "$nameserver_lines" "\nnameserver " "$ns"); + done + done + echo -n $search_line; + echo -e $nameserver_lines; +elif [ "$output_format" == "named" ]; then +# named.conf style: + zone_lines=''; + for index in $(seq 1 $zonecnt); do + zone_line=$(concat 'zone "' "${zones[$index]}" '." IN { type forward; forwarders { '); + srvcnt=1; + IFS=$' '; + for ns in ${servers[$index]}; do + srvport=$(eval "echo ${ports[$index]} | awk '{ print \$${srvcnt} }'"); + if [ "$srvport" != "53" ]; then + zone_line=$(concat "$zone_line" " $ns port $srvport;"); + else + zone_line=$(concat "$zone_line" " $ns;"); + fi + srvcnt=$((srvcnt+1)); + done + zone_line=$(concat "$zone_line" " };"); + if [ "${only[$index]}" == '1' ]; then + zone_line=$(concat "$zone_line" " forward only;"); + fi + zone_line=$(concat "$zone_line" " };"); + zone_lines=$(concat "$zone_lines" "$zone_line\n"); + done + echo -e ${zone_lines%\\n}; +elif [ "$output_format" == "plain" ]; then +# just list: + output=''; + for index in $(seq 1 $zonecnt); do + output=$(concat "$output" "${zones[$index]}" "\n"); + if [ "${only[$index]}" == "1" ]; then + output=$(concat "$output" "\t" "forward only" "\n"); + fi + srvcnt=1; + IFS=$' '; + for ns in ${servers[$index]}; do + srvport=$(eval "echo ${ports[$index]} | awk '{ print \$${srvcnt} }'"); + if [ "$srvport" != "53" ]; then + output=$(concat "$output" "\t" "$ns:$srvport" "\n"); + else + output=$(concat "$output" "\t" "$ns" "\n"); + fi + srvcnt=$((srvcnt+1)); + done + done + echo -e ${output%\\n}; +fi From fedora-cvs-commits at redhat.com Thu Jan 4 16:14:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 11:14:40 -0500 Subject: rpms/mc/devel .cvsignore, 1.30, 1.31 mc-extensions.patch, 1.9, 1.10 mc-utf8.patch, 1.23, 1.24 mc.spec, 1.114, 1.115 sources, 1.37, 1.38 Message-ID: <200701041614.l04GEe3Z018572@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18495 Modified Files: .cvsignore mc-extensions.patch mc-utf8.patch mc.spec sources Log Message: - update to new CVS snapshot (fixes #220828) - update bindings again Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mc/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 20 Nov 2006 14:08:49 -0000 1.30 +++ .cvsignore 4 Jan 2007 16:14:37 -0000 1.31 @@ -5,3 +5,4 @@ mc-2006-09-25-14.tar.gz mc-2006-10-15-16.tar.gz mc-2006-11-14-16.tar.gz +mc-2006-12-28-05.tar.gz mc-extensions.patch: configure | 2 - configure.ac | 2 - lib/mc.ext.in | 82 +++++++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 64 insertions(+), 22 deletions(-) Index: mc-extensions.patch =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc-extensions.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mc-extensions.patch 4 Dec 2006 12:37:46 -0000 1.9 +++ mc-extensions.patch 4 Jan 2007 16:14:38 -0000 1.10 @@ -1,5 +1,5 @@ ---- mc-2006-11-14-16/configure.ac.extensions 2006-11-14 17:05:09.000000000 +0100 -+++ mc-2006-11-14-16/configure.ac 2006-12-04 12:53:03.000000000 +0100 +--- mc/configure.ac.extensions 2006-12-28 06:34:31.000000000 +0100 ++++ mc/configure.ac 2007-01-04 15:42:15.000000000 +0100 @@ -83,7 +83,7 @@ AC_CHECK_TOOL(AR, ar, ar) @@ -9,9 +9,9 @@ dnl dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. ---- mc-2006-11-14-16/configure.extensions 2006-11-14 17:05:25.000000000 +0100 -+++ mc-2006-11-14-16/configure 2006-12-04 12:53:03.000000000 +0100 -@@ -5767,7 +5767,7 @@ +--- mc/configure.extensions 2006-12-28 06:34:48.000000000 +0100 ++++ mc/configure 2007-01-04 15:42:15.000000000 +0100 +@@ -7166,7 +7166,7 @@ fi @@ -20,8 +20,8 @@ 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-2006-11-14-16/lib/mc.ext.in.extensions 2006-06-22 15:40:51.000000000 +0200 -+++ mc-2006-11-14-16/lib/mc.ext.in 2006-12-04 13:07:36.000000000 +0100 +--- mc/lib/mc.ext.in.extensions 2006-12-28 04:45:29.000000000 +0100 ++++ mc/lib/mc.ext.in 2007-01-04 15:53:33.000000000 +0100 @@ -220,14 +220,25 @@ # C @@ -65,7 +65,7 @@ # Manual page # Exception - .so libraries are not manual pages -@@ -328,18 +342,24 @@ +@@ -328,18 +341,24 @@ type/^Netpbm Include=image @@ -92,22 +92,37 @@ View=%view{ascii} identify %f #View=%view{ascii} asciiview %f -@@ -357,8 +377,12 @@ +@@ -347,7 +366,8 @@ + ### Sound files ### + + regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$ +- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi ++ Open=play %f ++# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi + + regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$ + Open=mikmod %f +@@ -357,11 +377,16 @@ Open=vplay -s 22 %f regex/\.([mM][pP]3)$ -- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi +- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi - View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' + Include=audio -+ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f &); fi -+ #View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' ++# Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi ++# View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' + +regex/\.([mM][kK][aA])$ + Include=audio regex/\.([oO][gG][gG])$ - Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f &); fi -@@ -371,6 +395,9 @@ +- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi ++ Open=ogg123 %f ++# Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi + View=%view{ascii} ogginfo %s + + regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$ +@@ -371,11 +396,15 @@ 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 @@ -117,7 +132,14 @@ ### Play lists ### -@@ -395,20 +422,27 @@ + regex/\.([mM]3[uU]|[pP][lL][sS])$ +- Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi ++ Open=mplayer -vo null -playlist %f ++# Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi + + + ### Video ### +@@ -395,20 +424,27 @@ regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$ Include=video @@ -146,7 +168,7 @@ #Open=(gtv %f >/dev/null 2>&1 &) #Open=(xanim %f >/dev/null 2>&1 &) -@@ -417,12 +451,13 @@ +@@ -417,12 +453,13 @@ # Postscript type/^PostScript @@ -162,7 +184,7 @@ #Open=(acroread %f &) #Open=(ghostview %f &) View=%view{ascii} pdftotext %f - -@@ -433,7 +468,7 @@ +@@ -433,7 +470,7 @@ # html regex/\.([hH][tT][mM][lL]?)$ Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null @@ -171,7 +193,7 @@ # StarOffice 5.2 shell/.sdw -@@ -450,22 +485,27 @@ +@@ -450,22 +487,27 @@ # Microsoft Word Document regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$ mc-utf8.patch: acinclude.m4 | 16 - edit/edit-widget.h | 16 + edit/edit.c | 266 +++++++++++++++++++------- edit/edit.h | 39 +++ edit/editcmd.c | 523 +++++++++++++++++++++++++++++++++++++++++++++-------- edit/editdraw.c | 111 +++++++---- 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 | 13 + 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 | 300 +++++++++++++++++++++++------- src/slint.c | 4 src/tty.c | 10 - src/tty.h | 2 src/util.c | 349 ++++++++++++++++++++++++++++++++--- src/util.h | 7 src/view.c | 50 ++++- src/widget.c | 371 ++++++++++++++++++++++++++++++------- src/widget.h | 16 + src/wtools.c | 14 - 35 files changed, 2068 insertions(+), 501 deletions(-) Index: mc-utf8.patch =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc-utf8.patch,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mc-utf8.patch 10 Oct 2006 11:43:56 -0000 1.23 +++ mc-utf8.patch 4 Jan 2007 16:14:38 -0000 1.24 @@ -1,5 +1,5 @@ ---- mc-2006-09-25-14/acinclude.m4.utf8 2006-09-09 00:35:29.000000000 +0200 -+++ mc-2006-09-25-14/acinclude.m4 2006-10-10 09:35:14.000000000 +0200 +--- mc/acinclude.m4.utf8 2006-09-09 00:35:29.000000000 +0200 ++++ mc/acinclude.m4 2007-01-04 16:20:56.000000000 +0100 @@ -399,14 +399,14 @@ AC_DEFUN([MC_WITH_SLANG], [ fi @@ -23,8 +23,8 @@ if test x$with_screen = xslang; then AC_DEFINE(HAVE_SYSTEM_SLANG, 1, ---- mc-2006-09-25-14/src/layout.c.utf8 2006-09-25 16:47:33.000000000 +0200 -+++ mc-2006-09-25-14/src/layout.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/layout.c.utf8 2006-11-10 01:22:30.000000000 +0100 ++++ mc/src/layout.c 2007-01-04 16:20:56.000000000 +0100 @@ -366,36 +366,36 @@ init_layout (void) while (i--) { @@ -98,8 +98,8 @@ widget_set_size (&the_menubar->widget, 0, 0, 1, COLS); ---- mc-2006-09-25-14/src/tty.c.utf8 2006-05-23 16:20:39.000000000 +0200 -+++ mc-2006-09-25-14/src/tty.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/tty.c.utf8 2006-05-23 16:20:39.000000000 +0200 ++++ mc/src/tty.c 2007-01-04 16:20:56.000000000 +0100 @@ -134,10 +134,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. @@ -117,8 +117,8 @@ #else addch(c); #endif ---- mc-2006-09-25-14/src/option.c.utf8 2006-02-28 18:44:28.000000000 +0100 -+++ mc-2006-09-25-14/src/option.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/option.c.utf8 2006-02-28 18:44:28.000000000 +0100 ++++ mc/src/option.c 2007-01-04 16:20:56.000000000 +0100 @@ -123,12 +123,12 @@ init_configure (void) title2 = _(" Pause after run... "); title3 = _(" Other options "); @@ -166,8 +166,8 @@ i18n_config_flag = 1; } ---- mc-2006-09-25-14/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100 -+++ mc-2006-09-25-14/src/menu.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100 ++++ mc/src/menu.h 2007-01-04 16:20:56.000000000 +0100 @@ -21,6 +21,8 @@ typedef struct Menu { menu_entry *entries; int start_x; /* position relative to menubar start */ @@ -177,8 +177,8 @@ } Menu; extern int menubar_visible; ---- mc-2006-09-25-14/src/menu.c.utf8 2005-09-06 22:36:23.000000000 +0200 -+++ mc-2006-09-25-14/src/menu.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/menu.c.utf8 2005-09-06 22:36:23.000000000 +0200 ++++ mc/src/menu.c 2007-01-04 16:20:56.000000000 +0100 @@ -22,6 +22,7 @@ #include @@ -380,8 +380,8 @@ g_free (menu->name); g_free (menu->help_node); g_free (menu); ---- mc-2006-09-25-14/src/filegui.c.utf8 2006-01-30 18:01:58.000000000 +0100 -+++ mc-2006-09-25-14/src/filegui.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/filegui.c.utf8 2006-01-30 18:01:58.000000000 +0100 ++++ mc/src/filegui.c 2007-01-04 16:20:56.000000000 +0100 @@ -65,6 +65,7 @@ #include "filegui.h" #include "key.h" /* get_event */ @@ -527,8 +527,8 @@ + g_free(def_text); return dest_dir; } ---- mc-2006-09-25-14/src/panelize.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-2006-09-25-14/src/panelize.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/panelize.c.utf8 2005-05-27 05:35:15.000000000 +0200 ++++ mc/src/panelize.c 2007-01-04 16:20:56.000000000 +0100 @@ -127,7 +127,7 @@ init_panelize (void) i = sizeof (panelize_but) / sizeof (panelize_but[0]); while (i--) { @@ -553,8 +553,8 @@ #endif /* ENABLE_NLS */ ---- mc-2006-09-25-14/src/slint.c.utf8 2005-09-06 22:36:23.000000000 +0200 -+++ mc-2006-09-25-14/src/slint.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/slint.c.utf8 2005-09-06 22:36:23.000000000 +0200 ++++ mc/src/slint.c 2007-01-04 16:20:56.000000000 +0100 @@ -141,7 +141,9 @@ void slang_init (void) { @@ -566,8 +566,8 @@ /* * 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-2006-09-25-14/src/main.c.utf8 2006-09-25 16:47:34.000000000 +0200 -+++ mc-2006-09-25-14/src/main.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/main.c.utf8 2006-09-25 16:47:34.000000000 +0200 ++++ mc/src/main.c 2007-01-04 16:20:56.000000000 +0100 @@ -704,7 +704,7 @@ load_prompt (int fd, void *unused) int prompt_len; @@ -589,8 +589,8 @@ *s = '?'; } while (*++s); fprintf (stdout, "\33]0;mc - %s\7", p); ---- mc-2006-09-25-14/src/view.c.utf8 2006-08-03 17:50:57.000000000 +0200 -+++ mc-2006-09-25-14/src/view.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/view.c.utf8 2006-12-12 18:39:33.000000000 +0100 ++++ mc/src/view.c 2007-01-04 16:20:56.000000000 +0100 @@ -43,6 +43,10 @@ #include #include @@ -681,8 +681,8 @@ } col++; tty_setcolor (NORMAL_COLOR); ---- mc-2006-09-25-14/src/screen.c.utf8 2006-02-09 02:59:16.000000000 +0100 -+++ mc-2006-09-25-14/src/screen.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/screen.c.utf8 2006-02-09 02:59:16.000000000 +0100 ++++ mc/src/screen.c 2007-01-04 16:20:56.000000000 +0100 @@ -171,21 +171,56 @@ add_permission_string (char *dest, int w static const char * string_file_name (file_entry *fe, int len) @@ -1110,8 +1110,8 @@ paint_panel (panel); } ---- mc-2006-09-25-14/src/widget.h.utf8 2006-02-28 18:44:28.000000000 +0100 -+++ mc-2006-09-25-14/src/widget.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/widget.h.utf8 2006-02-28 18:44:28.000000000 +0100 ++++ mc/src/widget.h 2007-01-04 16:20:56.000000000 +0100 @@ -22,6 +22,7 @@ typedef struct WButton { char *text; /* text of button */ int hotkey; /* hot KEY */ @@ -1154,8 +1154,8 @@ GList *history; /* The history */ int need_push; /* need to push the current Input on hist? */ char **completions; /* Possible completions array */ ---- mc-2006-09-25-14/src/tty.h.utf8 2006-05-15 17:46:20.000000000 +0200 -+++ mc-2006-09-25-14/src/tty.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/tty.h.utf8 2006-05-15 17:46:20.000000000 +0200 ++++ mc/src/tty.h 2007-01-04 16:20:56.000000000 +0100 @@ -8,6 +8,8 @@ of ifdefs in the other files small. */ @@ -1165,8 +1165,8 @@ #ifdef HAVE_SLANG # include "myslang.h" #endif ---- mc-2006-09-25-14/src/hotlist.c.utf8 2006-08-08 19:55:46.000000000 +0200 -+++ mc-2006-09-25-14/src/hotlist.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/hotlist.c.utf8 2006-08-08 19:55:46.000000000 +0200 ++++ mc/src/hotlist.c 2007-01-04 16:20:56.000000000 +0100 @@ -563,7 +563,7 @@ init_i18n_stuff(int list_type, int cols) row = hotlist_but [i].y; @@ -1227,8 +1227,8 @@ char *label_string = g_strdup (current_panel->cwd); strip_password (label_string, 1); ---- mc-2006-09-25-14/src/help.c.utf8 2005-07-22 11:29:50.000000000 +0200 -+++ mc-2006-09-25-14/src/help.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/help.c.utf8 2005-07-22 11:29:50.000000000 +0200 ++++ mc/src/help.c 2007-01-04 16:20:56.000000000 +0100 @@ -449,10 +449,28 @@ static void help_show (Dlg_head *h, cons #ifndef HAVE_SLANG addch (acs_map [c]); @@ -1271,8 +1271,8 @@ if (!filename) g_free (hlpfile); ---- mc-2006-09-25-14/src/wtools.c.utf8 2006-09-14 16:16:10.000000000 +0200 -+++ mc-2006-09-25-14/src/wtools.c 2006-10-10 09:36:13.000000000 +0200 +--- mc/src/wtools.c.utf8 2006-09-14 16:16:10.000000000 +0200 ++++ mc/src/wtools.c 2007-01-04 16:20:56.000000000 +0100 @@ -49,11 +49,11 @@ create_listbox_window (int cols, int lin /* Adjust sizes */ lines = (lines > LINES - 6) ? LINES - 6 : lines; @@ -1332,8 +1332,8 @@ quick_widgets[0].x_divisions = quick_widgets[1].x_divisions = len; #endif /* ENABLE_NLS */ ---- mc-2006-09-25-14/src/util.h.utf8 2006-02-06 17:55:43.000000000 +0100 -+++ mc-2006-09-25-14/src/util.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/util.h.utf8 2006-02-06 17:55:43.000000000 +0100 ++++ mc/src/util.h 2007-01-04 16:20:56.000000000 +0100 @@ -103,6 +103,13 @@ void init_uid_gid_cache (void); char *get_group (int); char *get_owner (int); @@ -1348,8 +1348,8 @@ #define MAX_I18NTIMELENGTH 14 #define MIN_I18NTIMELENGTH 10 #define STD_I18NTIMELENGTH 12 ---- mc-2006-09-25-14/src/widget.c.utf8 2006-05-30 15:46:15.000000000 +0200 -+++ mc-2006-09-25-14/src/widget.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/widget.c.utf8 2006-05-30 15:46:15.000000000 +0200 ++++ mc/src/widget.c 2007-01-04 16:20:56.000000000 +0100 @@ -36,6 +36,9 @@ #include "global.h" @@ -2065,8 +2065,8 @@ return in; } ---- mc-2006-09-25-14/src/util.c.utf8 2005-11-03 03:01:12.000000000 +0100 -+++ mc-2006-09-25-14/src/util.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/util.c.utf8 2005-11-03 03:01:12.000000000 +0100 ++++ mc/src/util.c 2007-01-04 16:20:56.000000000 +0100 @@ -33,7 +33,11 @@ #include #include @@ -2536,8 +2536,8 @@ } *w = 0; return s; ---- mc-2006-09-25-14/src/file.c.utf8 2006-05-23 16:20:39.000000000 +0200 -+++ mc-2006-09-25-14/src/file.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/file.c.utf8 2006-05-23 16:20:39.000000000 +0200 ++++ mc/src/file.c 2007-01-04 16:20:56.000000000 +0100 @@ -161,15 +161,20 @@ static const char * do_transform_source (FileOpContext *ctx, const char *source) { @@ -2592,8 +2592,8 @@ if (i > 0) { fmd_xlen += i; fmd_init_i18n (TRUE); /* to recalculate positions of child widgets */ ---- mc-2006-09-25-14/src/find.c.utf8 2006-02-06 17:55:43.000000000 +0100 -+++ mc-2006-09-25-14/src/find.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/find.c.utf8 2006-02-06 17:55:43.000000000 +0100 ++++ mc/src/find.c 2007-01-04 16:20:56.000000000 +0100 @@ -217,7 +217,7 @@ find_parameters (char **start_dir, char int l1, maxlen = 0; @@ -2641,8 +2641,8 @@ list->list[next_free].fname = name; list->list[next_free].f.marked = 0; list->list[next_free].f.link_to_dir = link_to_dir; ---- mc-2006-09-25-14/src/myslang.h.utf8 2005-09-06 22:36:23.000000000 +0200 -+++ mc-2006-09-25-14/src/myslang.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/myslang.h.utf8 2005-09-06 22:36:23.000000000 +0200 ++++ mc/src/myslang.h 2007-01-04 16:20:56.000000000 +0100 @@ -11,6 +11,16 @@ #endif /* HAVE_SLANG_SLANG_H */ #endif @@ -2660,8 +2660,8 @@ enum { KEY_BACKSPACE = 400, KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, ---- mc-2006-09-25-14/src/achown.c.utf8 2005-09-06 22:36:23.000000000 +0200 -+++ mc-2006-09-25-14/src/achown.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/achown.c.utf8 2005-09-06 22:36:23.000000000 +0200 ++++ mc/src/achown.c 2007-01-04 16:20:56.000000000 +0100 @@ -584,6 +584,12 @@ init_chown_advanced (void) b_att[2] = button_new (XTRACT (6)); b_user = button_new (XTRACT (5)); @@ -2675,8 +2675,8 @@ add_widget (ch_dlg, b_group); add_widget (ch_dlg, b_user); ---- mc-2006-09-25-14/src/dialog.c.utf8 2005-09-06 22:36:23.000000000 +0200 -+++ mc-2006-09-25-14/src/dialog.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/dialog.c.utf8 2005-09-06 22:36:23.000000000 +0200 ++++ mc/src/dialog.c 2007-01-04 16:20:56.000000000 +0100 @@ -166,7 +166,7 @@ common_dialog_repaint (struct Dlg_head * if (h->title) { @@ -2686,8 +2686,8 @@ addstr (h->title); } } ---- mc-2006-09-25-14/src/boxes.c.utf8 2006-02-28 18:44:28.000000000 +0100 -+++ mc-2006-09-25-14/src/boxes.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/boxes.c.utf8 2006-02-28 18:44:28.000000000 +0100 ++++ mc/src/boxes.c 2007-01-04 16:20:56.000000000 +0100 @@ -153,23 +153,23 @@ display_init (int radio_sel, char *init_ display_title = _(display_title); for (i = 0; i < LIST_TYPES; i++) { @@ -2860,8 +2860,8 @@ i18n_flag = 1; } ---- mc-2006-09-25-14/src/learn.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-2006-09-25-14/src/learn.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/src/learn.c.utf8 2005-05-27 05:35:15.000000000 +0200 ++++ mc/src/learn.c 2007-01-04 16:20:56.000000000 +0100 @@ -237,7 +237,7 @@ init_learn (void) learn_but[0].x = 78 / 2 + 4; @@ -2871,8 +2871,8 @@ learn_title = _(learn_title); i18n_flag = 1; ---- mc-2006-09-25-14/edit/edit-widget.h.utf8 2006-03-20 17:44:32.000000000 +0100 -+++ mc-2006-09-25-14/edit/edit-widget.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/edit/edit-widget.h.utf8 2006-03-20 17:44:32.000000000 +0100 ++++ mc/edit/edit-widget.h 2007-01-04 16:20:56.000000000 +0100 @@ -30,6 +30,11 @@ typedef struct edit_key_map_type { long command; } edit_key_map_type; @@ -2912,8 +2912,8 @@ unsigned long stack_size; unsigned long stack_size_mask; unsigned long stack_bottom; ---- mc-2006-09-25-14/edit/editkeys.c.utf8 2006-02-02 00:05:15.000000000 +0100 -+++ mc-2006-09-25-14/edit/editkeys.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/edit/editkeys.c.utf8 2006-02-02 00:05:15.000000000 +0100 ++++ mc/edit/editkeys.c 2007-01-04 16:20:56.000000000 +0100 @@ -182,10 +182,10 @@ static const edit_key_map_type common_ke * 'command' is one of the editor commands from editcmddef.h. */ @@ -2968,9 +2968,9 @@ /* unchanged, key has no function here */ return 0; } ---- mc-2006-09-25-14/edit/editwidget.c.utf8 2005-09-07 17:53:03.000000000 +0200 -+++ mc-2006-09-25-14/edit/editwidget.c 2006-10-10 09:35:14.000000000 +0200 -@@ -344,7 +344,8 @@ edit_callback (Widget *w, widget_msg_t m +--- mc/edit/editwidget.c.utf8 2006-12-12 18:39:33.000000000 +0100 ++++ mc/edit/editwidget.c 2007-01-04 16:20:56.000000000 +0100 +@@ -331,7 +331,8 @@ edit_callback (Widget *w, widget_msg_t m case WIDGET_KEY: { @@ -2980,8 +2980,8 @@ /* The user may override the access-keys for the menu bar. */ if (edit_translate_key (e, parm, &cmd, &ch)) { ---- mc-2006-09-25-14/edit/editcmd.c.utf8 2006-03-20 17:44:32.000000000 +0100 -+++ mc-2006-09-25-14/edit/editcmd.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/edit/editcmd.c.utf8 2006-11-27 15:19:29.000000000 +0100 ++++ mc/edit/editcmd.c 2007-01-04 16:20:56.000000000 +0100 @@ -61,7 +61,7 @@ #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f) @@ -3074,7 +3074,7 @@ /* If 0 (quick save) then a) create/truncate file, b) save to ; if 1 (safe save) then a) save to , -@@ -345,32 +391,48 @@ edit_save_file (WEdit *edit, const char +@@ -360,32 +406,48 @@ edit_save_file (WEdit *edit, const char buf = 0; filelen = edit->last_byte; while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) { @@ -3126,7 +3126,7 @@ EDIT_BUF_SIZE) != EDIT_BUF_SIZE) { filelen = -1; break; -@@ -686,13 +748,21 @@ edit_delete_macro (WEdit * edit, int k) +@@ -705,13 +767,21 @@ edit_delete_macro (WEdit * edit, int k) if (!n || n == EOF) break; n = 0; @@ -3148,7 +3148,7 @@ fprintf (g, ";\n"); } } -@@ -725,7 +795,11 @@ int edit_save_macro_cmd (WEdit * edit, s +@@ -744,7 +814,11 @@ int edit_save_macro_cmd (WEdit * edit, s if (f) { fprintf (f, ("key '%d 0': "), s); for (i = 0; i < n; i++) @@ -3160,7 +3160,7 @@ fprintf (f, ";\n"); fclose (f); if (saved_macros_loaded) { -@@ -775,10 +849,18 @@ int edit_load_macro_cmd (WEdit * edit, s +@@ -794,10 +868,18 @@ int edit_load_macro_cmd (WEdit * edit, s saved_macro[i++] = s; if (!found) { *n = 0; @@ -3179,7 +3179,7 @@ } fscanf (f, ";\n"); if (s == k) -@@ -925,7 +1007,7 @@ int eval_marks (WEdit * edit, long *star +@@ -944,7 +1026,7 @@ int eval_marks (WEdit * edit, long *star #define space_width 1 static void @@ -3188,7 +3188,7 @@ { long cursor; int i, col; -@@ -973,7 +1055,7 @@ edit_block_copy_cmd (WEdit *edit) +@@ -992,7 +1074,7 @@ edit_block_copy_cmd (WEdit *edit) { long start_mark, end_mark, current = edit->curs1; int size; @@ -3197,7 +3197,7 @@ edit_update_curs_col (edit); if (eval_marks (edit, &start_mark, &end_mark)) -@@ -1013,7 +1095,7 @@ edit_block_move_cmd (WEdit *edit) +@@ -1032,7 +1114,7 @@ edit_block_move_cmd (WEdit *edit) { long count; long current; @@ -3206,7 +3206,7 @@ long start_mark, end_mark; int deleted = 0; int x = 0; -@@ -1074,7 +1156,7 @@ edit_block_move_cmd (WEdit *edit) +@@ -1093,7 +1175,7 @@ edit_block_move_cmd (WEdit *edit) edit_push_action (edit, COLUMN_ON); column_highlighting = 0; } else { @@ -3215,7 +3215,7 @@ edit_cursor_move (edit, start_mark - edit->curs1); edit_scroll_screen_over_cursor (edit); count = start_mark; -@@ -1413,7 +1495,11 @@ static long sargs[NUM_REPL_ARGS][256 / s +@@ -1432,7 +1514,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 @@ -3227,7 +3227,7 @@ int match_bol, int icase, int *found_len, void *d) { static regex_t r; -@@ -1422,6 +1508,11 @@ string_regexp_search (char *pattern, cha +@@ -1441,6 +1527,11 @@ string_regexp_search (char *pattern, cha regmatch_t *pmatch; static regmatch_t s[1]; @@ -3239,7 +3239,7 @@ pmatch = (regmatch_t *) d; if (!pmatch) pmatch = s; -@@ -1441,13 +1532,51 @@ string_regexp_search (char *pattern, cha +@@ -1460,13 +1551,51 @@ string_regexp_search (char *pattern, cha old_type = match_type; old_icase = icase; } @@ -3291,7 +3291,7 @@ *found_len = pmatch[0].rm_eo - pmatch[0].rm_so; return (pmatch[0].rm_so); } -@@ -1455,13 +1584,29 @@ string_regexp_search (char *pattern, cha +@@ -1474,13 +1603,29 @@ string_regexp_search (char *pattern, cha /* thanks to Liviu Daia for getting this (and the above) routines to work properly - paul */ @@ -3322,7 +3322,7 @@ int n = 0; for (p = 0; p < l; p++) /* count conversions... */ -@@ -1470,19 +1615,22 @@ edit_find_string (long start, unsigned c +@@ -1489,19 +1634,22 @@ edit_find_string (long start, unsigned c n++; if (replace_scanf || replace_regexp) { @@ -3352,7 +3352,7 @@ if (replace_case) { for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++) buf[p - start] = (*get_byte) (data, p); -@@ -1496,20 +1644,36 @@ edit_find_string (long start, unsigned c +@@ -1515,20 +1663,36 @@ edit_find_string (long start, unsigned c } buf[(q = p - start)] = 0; @@ -3390,7 +3390,7 @@ if (q + start < last_byte) { if (replace_case) { buf[q] = (*get_byte) (data, q + start); -@@ -1523,7 +1687,11 @@ edit_find_string (long start, unsigned c +@@ -1542,7 +1706,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... */ @@ -3402,7 +3402,7 @@ buf = mbuf; } q--; -@@ -1549,10 +1717,16 @@ edit_find_string (long start, unsigned c +@@ -1568,10 +1736,16 @@ edit_find_string (long start, unsigned c buf = mbuf; while (q) { @@ -3420,7 +3420,7 @@ return -3; } else if (found_start == -1) /* not found: try next line */ -@@ -1563,15 +1737,27 @@ edit_find_string (long start, unsigned c +@@ -1582,15 +1756,27 @@ edit_find_string (long start, unsigned c match_bol = 0; continue; } @@ -3450,7 +3450,7 @@ memmove (mbuf, buf, q); p = start + q; move_win = 1; -@@ -1581,36 +1767,59 @@ edit_find_string (long start, unsigned c +@@ -1600,36 +1786,59 @@ edit_find_string (long start, unsigned c } } } else { @@ -3518,7 +3518,7 @@ return -2; } -@@ -1624,9 +1833,14 @@ edit_find_forwards (long search_start, u +@@ -1643,9 +1852,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) { @@ -3533,7 +3533,7 @@ return p; if (once_only) return -2; -@@ -1658,6 +1872,7 @@ edit_find (long search_start, unsigned c +@@ -1677,6 +1891,7 @@ edit_find (long search_start, unsigned c #define is_digit(x) ((x) >= '0' && (x) <= '9') @@ -3541,7 +3541,7 @@ #define snprint(v) { \ *p1++ = *p++; \ *p1 = '\0'; \ -@@ -1665,33 +1880,48 @@ edit_find (long search_start, unsigned c +@@ -1684,33 +1899,48 @@ edit_find (long search_start, unsigned c if (n >= (size_t) (e - s)) goto nospc; \ s += n; \ } @@ -3598,7 +3598,7 @@ s += n; q = p; p1 = q1; -@@ -1719,45 +1949,78 @@ static int snprintf_p (char *str, size_t +@@ -1738,45 +1968,78 @@ static int snprintf_p (char *str, size_t *p1++ = *p++; if (*p == '*') { p++; @@ -3687,7 +3687,7 @@ snprint (*va_arg (ap, long *)); } else if (*p == 'p') { snprint (*va_arg (ap, void **)); -@@ -1766,10 +2029,17 @@ static int snprintf_p (char *str, size_t +@@ -1785,10 +2048,17 @@ static int snprintf_p (char *str, size_t q = p; } va_end (ap); @@ -3705,7 +3705,7 @@ return s + n - str; nospc: va_end (ap); -@@ -1948,8 +2218,11 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1967,8 +2237,11 @@ edit_replace_cmd (WEdit *edit, int again } } if (replace_yes) { /* delete then insert new */ @@ -3718,7 +3718,7 @@ int ret = 0; /* we need to fill in sargs just like with scanf */ -@@ -1958,17 +2231,25 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1977,17 +2250,25 @@ edit_replace_cmd (WEdit *edit, int again for (k = 1; k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0; k++) { @@ -3745,7 +3745,7 @@ edit-> search_start - -@@ -1986,14 +2267,23 @@ edit_replace_cmd (WEdit *edit, int again +@@ -2005,14 +2286,23 @@ edit_replace_cmd (WEdit *edit, int again } if (!ret) ret = @@ -3769,7 +3769,7 @@ } else { edit_error_dialog (_(" Replace "), ret == -@@ -2007,10 +2297,18 @@ edit_replace_cmd (WEdit *edit, int again +@@ -2026,10 +2316,18 @@ edit_replace_cmd (WEdit *edit, int again times_replaced++; while (i--) edit_delete (edit); @@ -3788,7 +3788,7 @@ } /* so that we don't find the same string again */ if (replace_backwards) { -@@ -2183,16 +2481,17 @@ edit_ok_to_exit (WEdit *edit) +@@ -2202,16 +2500,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 */ @@ -3810,7 +3810,7 @@ x = edit_move_forward3 (edit, edit_bol (edit, start), 0, start); c = edit_get_byte (edit, start); -@@ -2225,11 +2524,15 @@ edit_save_block (WEdit * edit, const cha +@@ -2244,11 +2543,15 @@ edit_save_block (WEdit * edit, const cha return 0; if (column_highlighting) { @@ -3827,7 +3827,7 @@ if (r < 0) break; p += r; -@@ -2237,15 +2540,19 @@ edit_save_block (WEdit * edit, const cha +@@ -2256,15 +2559,19 @@ edit_save_block (WEdit * edit, const cha } g_free (block); } else { @@ -3849,7 +3849,7 @@ start = end; } g_free (buf); -@@ -2583,17 +2890,20 @@ edit_block_process_cmd (WEdit *edit, con +@@ -2602,17 +2909,20 @@ edit_block_process_cmd (WEdit *edit, con /* prints at the cursor */ /* returns the number of chars printed */ @@ -3872,7 +3872,7 @@ static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc) { FILE *p = 0; -@@ -2687,15 +2997,20 @@ void edit_mail_dialog (WEdit * edit) +@@ -2706,15 +3016,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) { @@ -3895,7 +3895,7 @@ return 0; /* search start of word to be completed */ -@@ -2705,11 +3020,19 @@ static int edit_find_word_start (WEdit * +@@ -2724,11 +3039,19 @@ static int edit_find_word_start (WEdit * return 0; last = c; @@ -3916,7 +3916,7 @@ return 0; *word_start = edit->curs1 - (i - 1); /* start found */ -@@ -2742,7 +3065,7 @@ edit_collect_completions (WEdit *edit, l +@@ -2761,7 +3084,7 @@ edit_collect_completions (WEdit *edit, l int *num) { int len, max_len = 0, i, skip; @@ -3925,7 +3925,7 @@ /* collect max MAX_WORD_COMPLETIONS completions */ while (*num < MAX_WORD_COMPLETIONS) { -@@ -2761,11 +3084,16 @@ edit_collect_completions (WEdit *edit, l +@@ -2780,11 +3103,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++) { @@ -3945,7 +3945,7 @@ skip = 1; break; /* skip it, already added */ } -@@ -2773,7 +3101,7 @@ edit_collect_completions (WEdit *edit, l +@@ -2792,7 +3120,7 @@ edit_collect_completions (WEdit *edit, l if (skip) continue; @@ -3954,7 +3954,7 @@ compl[*num].len = len; for (i = 0; i < len; i++) compl[*num].text[i] = *(bufpos + i); -@@ -2787,6 +3115,18 @@ edit_collect_completions (WEdit *edit, l +@@ -2806,6 +3134,18 @@ edit_collect_completions (WEdit *edit, l return max_len; } @@ -3973,7 +3973,7 @@ /* let the user select its preferred completion */ static void -@@ -2799,6 +3139,9 @@ edit_completion_dialog (WEdit * edit, in +@@ -2818,6 +3158,9 @@ edit_completion_dialog (WEdit * edit, in WListbox *compl_list; int compl_dlg_h; /* completion dialog height */ int compl_dlg_w; /* completion dialog width */ @@ -3983,7 +3983,7 @@ /* calculate the dialog metrics */ compl_dlg_h = num_compl + 2; -@@ -2834,9 +3177,18 @@ edit_completion_dialog (WEdit * edit, in +@@ -2853,9 +3196,18 @@ edit_completion_dialog (WEdit * edit, in add_widget (compl_dlg, compl_list); /* fill the listbox with the completions */ @@ -4002,7 +4002,7 @@ /* pop up the dialog */ run_dlg (compl_dlg); -@@ -2844,9 +3196,17 @@ edit_completion_dialog (WEdit * edit, in +@@ -2863,9 +3215,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); @@ -4021,7 +4021,7 @@ } /* destroy dialog before return */ -@@ -2863,8 +3223,9 @@ edit_complete_word_cmd (WEdit *edit) +@@ -2882,8 +3242,9 @@ edit_complete_word_cmd (WEdit *edit) { int word_len = 0, i, num_compl = 0, max_len; long word_start = 0; @@ -4033,7 +4033,7 @@ struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */ /* don't want to disturb another search */ -@@ -2881,16 +3242,32 @@ edit_complete_word_cmd (WEdit *edit) +@@ -2900,16 +3261,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]; @@ -4066,8 +4066,8 @@ if (num_compl > 0) { /* insert completed word if there is only one match */ ---- mc-2006-09-25-14/edit/wordproc.c.utf8 2006-06-17 04:55:41.000000000 +0200 -+++ mc-2006-09-25-14/edit/wordproc.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/edit/wordproc.c.utf8 2006-06-17 04:55:41.000000000 +0200 ++++ mc/edit/wordproc.c 2007-01-04 16:20:56.000000000 +0100 @@ -40,7 +40,12 @@ #define tab_width option_tab_spacing @@ -4287,8 +4287,8 @@ g_free (t); return; } ---- mc-2006-09-25-14/edit/edit.h.utf8 2006-02-06 17:55:42.000000000 +0100 -+++ mc-2006-09-25-14/edit/edit.h 2006-10-10 09:35:14.000000000 +0200 +--- mc/edit/edit.h.utf8 2006-12-12 18:39:33.000000000 +0100 ++++ mc/edit/edit.h 2007-01-04 16:20:56.000000000 +0100 @@ -25,6 +25,27 @@ #include @@ -4349,7 +4349,7 @@ int edit_count_lines (WEdit * edit, long current, int upto); long edit_move_forward (WEdit * edit, long current, int lines, long upto); long edit_move_forward3 (WEdit * edit, long current, int cols, long upto); -@@ -146,11 +173,11 @@ int edit_block_delete_cmd (WEdit * edit) +@@ -148,11 +175,11 @@ int edit_block_delete_cmd (WEdit * edit) void edit_delete_line (WEdit * edit); int edit_delete (WEdit * edit); @@ -4363,7 +4363,7 @@ long edit_write_stream (WEdit * edit, FILE * f); char *edit_get_write_filter (const char *writename, const char *filename); int edit_save_confirm_cmd (WEdit * edit); -@@ -181,7 +208,7 @@ void edit_goto_cmd (WEdit * edit); +@@ -183,7 +210,7 @@ void edit_goto_cmd (WEdit * edit); int eval_marks (WEdit * edit, long *start_mark, long *end_mark); void edit_status (WEdit * edit); void edit_execute_key_command (WEdit *edit, int command, @@ -4372,7 +4372,7 @@ void edit_update_screen (WEdit * edit); int edit_print_string (WEdit * e, const char *s); void edit_move_to_line (WEdit * e, long line); -@@ -231,7 +258,7 @@ void edit_mail_dialog (WEdit *edit); +@@ -233,7 +260,7 @@ void edit_mail_dialog (WEdit *edit); void format_paragraph (WEdit *edit, int force); /* either command or char_for_insertion must be passed as -1 */ @@ -4381,8 +4381,8 @@ #define get_sys_error(s) (s) ---- mc-2006-09-25-14/edit/editdraw.c.utf8 2005-09-06 22:36:20.000000000 +0200 -+++ mc-2006-09-25-14/edit/editdraw.c 2006-10-10 09:35:14.000000000 +0200 +--- mc/edit/editdraw.c.utf8 2006-12-09 16:19:48.000000000 +0100 ++++ mc/edit/editdraw.c 2007-01-04 16:20:56.000000000 +0100 @@ -69,11 +69,16 @@ static void status_string (WEdit * edit, * as decimal and as hex. */ @@ -4473,9 +4473,9 @@ - unsigned int c; + mc_wint_t c; int color; - int i, book_mark = -1; + int i; -@@ -287,66 +300,96 @@ edit_draw_this_line (WEdit *edit, long b +@@ -282,62 +295,92 @@ edit_draw_this_line (WEdit *edit, long b if (row <= edit->total_lines - edit->start_line) { while (col <= end_col - edit->start_col) { @@ -4505,14 +4505,9 @@ + p->style |= MOD_BOLD; c = edit_get_byte (edit, q); /* we don't use bg for mc - fg contains both */ - if (book_mark == -1) { - edit_get_syntax_color (edit, q, &color); -- *p |= color << 16; -+ p->style |= color << 16; - } else { -- *p |= book_mark << 16; -+ p->style |= book_mark << 16; - } + edit_get_syntax_color (edit, q, &color); +- *p |= color << 16; ++ p->style |= color << 16; q++; switch (c) { case '\n': @@ -4543,10 +4538,10 @@ if (c < 32) { - *(p++) = '^' | MOD_ABNORMAL; - *(p++) = (c + 0x40) | MOD_ABNORMAL; -+ p->ch = '^'; ++ p->ch = '^'; + p->style = MOD_ABNORMAL; + p++; -+ p->ch = c + 0x40; ++ p->ch = c + 0x40; + p->style = MOD_ABNORMAL; col += 2; break; @@ -4592,7 +4587,7 @@ } col++; break; -@@ -356,7 +399,7 @@ edit_draw_this_line (WEdit *edit, long b +@@ -347,7 +390,7 @@ edit_draw_this_line (WEdit *edit, long b } else { start_col_real = start_col = 0; } @@ -4601,10 +4596,10 @@ print_to_widget (edit, row, start_col, start_col_real, end_col, line); } ---- mc-2006-09-25-14/edit/edit.c.utf8 2006-02-13 22:35:05.000000000 +0100 -+++ mc-2006-09-25-14/edit/edit.c 2006-10-10 09:35:14.000000000 +0200 -@@ -103,7 +103,11 @@ char *option_backup_ext = NULL; - static void edit_move_to_prev_col (WEdit *edit, long p); +--- mc/edit/edit.c.utf8 2006-12-12 18:39:33.000000000 +0100 ++++ mc/edit/edit.c 2007-01-04 16:20:56.000000000 +0100 +@@ -102,7 +102,11 @@ char *option_backup_ext = NULL; + static void user_menu (WEdit *edit); +#ifndef UTF8 @@ -4615,7 +4610,7 @@ { unsigned long p; if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0) -@@ -132,7 +136,7 @@ edit_init_buffers (WEdit *edit) +@@ -131,7 +135,7 @@ edit_init_buffers (WEdit *edit) edit->curs1 = 0; edit->curs2 = 0; @@ -4624,7 +4619,7 @@ } /* -@@ -157,7 +161,7 @@ edit_load_file_fast (WEdit *edit, const +@@ -156,7 +160,7 @@ edit_load_file_fast (WEdit *edit, const } if (!edit->buffers2[buf2]) @@ -4633,7 +4628,7 @@ mc_read (file, (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE - -@@ -167,7 +171,7 @@ edit_load_file_fast (WEdit *edit, const +@@ -166,7 +170,7 @@ edit_load_file_fast (WEdit *edit, const for (buf = buf2 - 1; buf >= 0; buf--) { /* edit->buffers2[0] is already allocated */ if (!edit->buffers2[buf]) @@ -4642,7 +4637,7 @@ mc_read (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE); } -@@ -240,9 +244,44 @@ edit_insert_stream (WEdit * edit, FILE * +@@ -239,9 +243,44 @@ edit_insert_stream (WEdit * edit, FILE * { int c; long i = 0; @@ -4688,7 +4683,7 @@ } return i; } -@@ -250,9 +289,32 @@ edit_insert_stream (WEdit * edit, FILE * +@@ -249,9 +288,32 @@ edit_insert_stream (WEdit * edit, FILE * long edit_write_stream (WEdit * edit, FILE * f) { long i; @@ -4721,7 +4716,7 @@ return i; } -@@ -291,12 +353,46 @@ edit_insert_file (WEdit *edit, const cha +@@ -290,12 +352,46 @@ edit_insert_file (WEdit *edit, const cha int i, file, blocklen; long current = edit->curs1; unsigned char *buf; @@ -4768,7 +4763,7 @@ } edit_cursor_move (edit, current - edit->curs1); g_free (buf); -@@ -386,7 +482,11 @@ cleanup: +@@ -385,7 +481,11 @@ cleanup: static int edit_load_file (WEdit *edit) { @@ -4780,7 +4775,7 @@ /* Cannot do fast load if a filter is used */ if (edit_find_filter (edit->filename) >= 0) -@@ -452,6 +552,7 @@ edit_load_position (WEdit *edit) +@@ -451,6 +551,7 @@ edit_load_position (WEdit *edit) edit->prev_col = column; edit_move_to_prev_col (edit, edit_bol (edit, edit->curs1)); edit_move_display (edit, line - (edit->num_widget_lines / 2)); @@ -4797,22 +4792,22 @@ if (edit_load_file (edit)) { /* edit_load_file already gives an error message */ if (to_free) -@@ -689,13 +790,23 @@ void edit_push_action (WEdit * edit, lon +@@ -689,14 +790,23 @@ void edit_push_action (WEdit * edit, lon { unsigned long sp = edit->stack_pointer; unsigned long spm1; - long *t; -+ -+ struct action *t; -+ mc_wchar_t ch = 0; -+ -+ if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) { -+ va_list ap; -+ va_start (ap, c); -+ ch = va_arg (ap, mc_wint_t); -+ va_end (ap); -+ } + ++ struct action *t; ++ mc_wchar_t ch = 0; ++ ++ if (c == CHAR_INSERT || c == CHAR_INSERT_AHEAD) { ++ va_list ap; ++ va_start (ap, c); ++ ch = va_arg (ap, mc_wint_t); ++ va_end (ap); ++ } + /* first enlarge the stack if necessary */ if (sp > edit->stack_size - 10) { /* say */ if (option_max_undo < 256) @@ -4823,7 +4818,7 @@ if (t) { edit->undo_stack = t; edit->stack_size <<= 1; -@@ -710,7 +821,7 @@ void edit_push_action (WEdit * edit, lon +@@ -711,7 +821,7 @@ void edit_push_action (WEdit * edit, lon #ifdef FAST_MOVE_CURSOR if (c == CURS_LEFT_LOTS || c == CURS_RIGHT_LOTS) { va_list ap; @@ -4832,7 +4827,7 @@ edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask; va_start (ap, c); c = -(va_arg (ap, int)); -@@ -721,12 +832,14 @@ void edit_push_action (WEdit * edit, lon +@@ -722,12 +832,14 @@ void edit_push_action (WEdit * edit, lon && spm1 != edit->stack_bottom && ((sp - 2) & edit->stack_size_mask) != edit->stack_bottom) { int d; @@ -4852,7 +4847,7 @@ return; } } -@@ -734,19 +847,20 @@ void edit_push_action (WEdit * edit, lon +@@ -735,19 +847,20 @@ void edit_push_action (WEdit * edit, lon #ifndef NO_STACK_CURSMOVE_ANIHILATION else if ((c == CURS_LEFT && d == CURS_RIGHT) || (c == CURS_RIGHT && d == CURS_LEFT)) { /* a left then a right anihilate each other */ @@ -4878,7 +4873,7 @@ goto check_bottom; } #ifndef NO_STACK_CURSMOVE_ANIHILATION -@@ -758,7 +872,9 @@ void edit_push_action (WEdit * edit, lon +@@ -759,7 +872,9 @@ void edit_push_action (WEdit * edit, lon #endif } } @@ -4889,7 +4884,7 @@ check_bottom: edit->stack_pointer = (edit->stack_pointer + 1) & edit->stack_size_mask; -@@ -771,10 +887,10 @@ void edit_push_action (WEdit * edit, lon +@@ -772,10 +887,10 @@ void edit_push_action (WEdit * edit, lon (((unsigned long) c + 1) & edit->stack_size_mask) == edit->stack_bottom) do { edit->stack_bottom = (edit->stack_bottom + 1) & edit->stack_size_mask; @@ -4902,7 +4897,7 @@ edit->stack_bottom = edit->stack_pointer = 0; } -@@ -783,30 +899,30 @@ void edit_push_action (WEdit * edit, lon +@@ -784,30 +899,30 @@ void edit_push_action (WEdit * edit, lon then the file should be as it was when he loaded up. Then set edit->modified to 0. */ static long @@ -4944,7 +4939,7 @@ } /* is called whenever a modification is made by one of the four routines below */ -@@ -827,7 +943,7 @@ static inline void edit_modification (WE +@@ -828,7 +943,7 @@ static inline void edit_modification (WE */ void @@ -4953,7 +4948,7 @@ { /* check if file has grown to large */ if (edit->last_byte >= SIZE_LIMIT) -@@ -865,12 +981,11 @@ edit_insert (WEdit *edit, int c) +@@ -866,12 +981,11 @@ edit_insert (WEdit *edit, int c) /* add a new buffer if we've reached the end of the last one */ if (!(edit->curs1 & M_EDIT_BUF_SIZE)) edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE] = @@ -4969,7 +4964,7 @@ /* update file length */ edit->last_byte++; -@@ -881,7 +996,7 @@ edit_insert (WEdit *edit, int c) +@@ -882,7 +996,7 @@ edit_insert (WEdit *edit, int c) /* same as edit_insert and move left */ @@ -4978,7 +4973,7 @@ { if (edit->last_byte >= SIZE_LIMIT) return; -@@ -904,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in +@@ -905,7 +1019,7 @@ void edit_insert_ahead (WEdit * edit, in edit->last_get_rule += (edit->last_get_rule >= edit->curs1); if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE)) @@ -4987,7 +4982,7 @@ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c; edit->last_byte++; -@@ -914,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in +@@ -915,7 +1029,7 @@ void edit_insert_ahead (WEdit * edit, in int edit_delete (WEdit * edit) { @@ -4996,7 +4991,7 @@ if (!edit->curs2) return 0; -@@ -938,7 +1053,7 @@ int edit_delete (WEdit * edit) +@@ -939,7 +1053,7 @@ int edit_delete (WEdit * edit) edit->total_lines--; edit->force |= REDRAW_AFTER_CURSOR; } @@ -5005,7 +5000,7 @@ if (edit->curs1 < edit->start_display) { edit->start_display--; if (p == '\n') -@@ -952,7 +1067,7 @@ int edit_delete (WEdit * edit) +@@ -953,7 +1067,7 @@ int edit_delete (WEdit * edit) static int edit_backspace (WEdit * edit) { @@ -5014,7 +5009,7 @@ if (!edit->curs1) return 0; -@@ -976,7 +1091,7 @@ edit_backspace (WEdit * edit) +@@ -977,7 +1091,7 @@ edit_backspace (WEdit * edit) edit->total_lines--; edit->force |= REDRAW_AFTER_CURSOR; } @@ -5023,7 +5018,7 @@ if (edit->curs1 < edit->start_display) { edit->start_display--; -@@ -989,10 +1104,18 @@ edit_backspace (WEdit * edit) +@@ -990,10 +1104,18 @@ edit_backspace (WEdit * edit) #ifdef FAST_MOVE_CURSOR @@ -5043,7 +5038,7 @@ edit->curs_line--; next -= (unsigned long) dest; n -= next; -@@ -1005,7 +1128,7 @@ int +@@ -1006,7 +1128,7 @@ int edit_move_backward_lots (WEdit *edit, long increment) { int r, s, t; @@ -5052,7 +5047,7 @@ if (increment > edit->curs1) increment = edit->curs1; -@@ -1045,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo +@@ -1046,7 +1168,7 @@ edit_move_backward_lots (WEdit *edit, lo edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p; else edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = @@ -5061,7 +5056,7 @@ } else { g_free (p); } -@@ -1083,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo +@@ -1084,7 +1206,7 @@ edit_move_backward_lots (WEdit *edit, lo edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = p; else edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE] = @@ -5070,7 +5065,7 @@ } else { g_free (p); } -@@ -1115,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long +@@ -1116,7 +1238,7 @@ int edit_cursor_move (WEdit * edit, long c = edit_get_byte (edit, edit->curs1 - 1); if (!((edit->curs2 + 1) & M_EDIT_BUF_SIZE)) @@ -5079,7 +5074,7 @@ edit->buffers2[edit->curs2 >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1] = c; edit->curs2++; c = edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE][(edit->curs1 - 1) & M_EDIT_BUF_SIZE]; -@@ -1140,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long +@@ -1141,7 +1263,7 @@ int edit_cursor_move (WEdit * edit, long c = edit_get_byte (edit, edit->curs1); if (!(edit->curs1 & M_EDIT_BUF_SIZE)) @@ -5088,7 +5083,7 @@ edit->buffers1[edit->curs1 >> S_EDIT_BUF_SIZE][edit->curs1 & M_EDIT_BUF_SIZE] = c; edit->curs1++; c = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - ((edit->curs2 - 1) & M_EDIT_BUF_SIZE) - 1]; -@@ -1247,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l +@@ -1248,7 +1370,7 @@ long edit_move_forward3 (WEdit * edit, l q = edit->last_byte + 2; for (col = 0, p = current; p < q; p++) { @@ -5097,7 +5092,7 @@ if (cols != -10) { if (col == cols) return p; -@@ -1265,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l +@@ -1266,7 +1388,7 @@ long edit_move_forward3 (WEdit * edit, l } else if (c < 32 || c == 127) col += 2; /* Caret notation for control characters */ else @@ -5106,7 +5101,7 @@ } return col; } -@@ -1398,7 +1521,7 @@ static int +@@ -1399,7 +1521,7 @@ static int is_blank (WEdit *edit, long offset) { long s, f; @@ -5115,7 +5110,7 @@ s = edit_bol (edit, offset); f = edit_eol (edit, offset) - 1; while (s <= f) { -@@ -1770,13 +1893,13 @@ static void edit_left_delete_word (WEdit +@@ -1771,13 +1893,13 @@ static void edit_left_delete_word (WEdit static void edit_do_undo (WEdit * edit) { @@ -5132,7 +5127,7 @@ case STACK_BOTTOM: goto done_undo; case CURS_RIGHT: -@@ -1797,31 +1920,33 @@ edit_do_undo (WEdit * edit) +@@ -1798,31 +1920,33 @@ edit_do_undo (WEdit * edit) case COLUMN_OFF: column_highlighting = 0; break; @@ -5179,7 +5174,7 @@ edit_update_curs_row (edit); done_undo:; -@@ -2101,7 +2226,7 @@ static void edit_goto_matching_bracket ( +@@ -2102,7 +2226,7 @@ static void edit_goto_matching_bracket ( * passed as -1. Commands are executed, and char_for_insertion is * inserted at the cursor. */ @@ -5188,7 +5183,7 @@ { if (command == CK_Begin_Record_Macro) { edit->macro_i = 0; -@@ -2136,7 +2261,7 @@ static const char * const shell_cmd[] = +@@ -2137,7 +2261,7 @@ static const char * const shell_cmd[] = all of them. It also does not check for the Undo command. */ void @@ -5197,7 +5192,7 @@ { edit->force |= REDRAW_LINE; -@@ -2169,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma +@@ -2170,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma } /* An ordinary key press */ Index: mc.spec =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- mc.spec 21 Dec 2006 12:34:51 -0000 1.114 +++ mc.spec 4 Jan 2007 16:14:38 -0000 1.115 @@ -1,9 +1,9 @@ -%define date 2006-11-14-16 +%define date 2006-12-28-05 Summary: User-friendly text console file manager and visual shell Name: mc Version: 4.6.1a -Release: 38%{?dist} +Release: 39%{?dist} Epoch: 1 License: GPL Group: System Environment/Shells @@ -200,6 +200,10 @@ %dir %{_sysconfdir}/mc %changelog +* Thu Jan 4 2007 Jindrich Novy 4.6.1a-39 +- update to new CVS snapshot (fixes #220828) +- update bindings again + * Thu Dec 21 2006 Jindrich Novy 4.6.1a-38 - rebuild because of the %%{_host} macro change (Related: #220273) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mc/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 20 Nov 2006 14:08:49 -0000 1.37 +++ sources 4 Jan 2007 16:14:38 -0000 1.38 @@ -1 +1 @@ -bd4f2e1c98a283ce7634365c9d4567f0 mc-2006-11-14-16.tar.gz +36677cf9331e463c98109ea7fa7f5c47 mc-2006-12-28-05.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 17:43:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 12:43:27 -0500 Subject: rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, 1.9, 1.10 workspace.libxslt02.patch, 1.4, 1.5 Message-ID: <200701041743.l04HhR4h007542@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7526 Modified Files: pseudoworkspace.valgrind1.patch workspace.libxslt02.patch Log Message: I'm mad, that's not an xsltproc line pseudoworkspace.valgrind1.patch: osl/unx/process.c | 0 psprint/source/helper/ppdparser.cxx | 2 +- sal/osl/unx/process.c | 6 +++--- sfx2/source/explorer/nochaos.cxx | 4 ++-- source/explorer/nochaos.cxx | 0 source/gdi/impgraph.cxx | 0 source/helper/ppdparser.cxx | 0 unx/gtk/gdi/salnativewidgets-gtk.cxx | 0 vcl/source/gdi/impgraph.cxx | 4 ++-- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 3 +-- 10 files changed, 9 insertions(+), 10 deletions(-) Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pseudoworkspace.valgrind1.patch 15 Dec 2006 16:34:17 -0000 1.9 +++ pseudoworkspace.valgrind1.patch 4 Jan 2007 17:43:25 -0000 1.10 @@ -83,3 +83,28 @@ { ByteString aLine( pRun ); int nPos = aLine.Search( ':' ); +Index: source/gdi/impgraph.cxx +=================================================================== +RCS file: /cvs/gsl/vcl/source/gdi/impgraph.cxx,v +retrieving revision 1.27 +diff -u -r1.27 impgraph.cxx +--- openoffice.org.orig/vcl/source/gdi/impgraph.cxx 17 Sep 2006 12:03:05 -0000 1.27 ++++ openoffice.org/vcl/source/gdi/impgraph.cxx 4 Jan 2007 11:12:30 -0000 +@@ -1592,7 +1592,7 @@ + + if( !rIStm.GetError() ) + { +- UINT32 nMagic1, nMagic2; ++ UINT32 nMagic1(0), nMagic2(0); + ULONG nActPos = rIStm.Tell(); + + rIStm >> nMagic1 >> nMagic2; +@@ -1600,7 +1600,7 @@ + + rImpGraphic = ImpGraphic( aBmpEx ); + +- if( ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) && !rIStm.GetError() ) ++ if( !rIStm.GetError() && ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) ) + { + delete rImpGraphic.mpAnimation; + rImpGraphic.mpAnimation = new Animation; workspace.libxslt02.patch: framework/filter/prj/build.lst | 2 framework/filter/source/config/fragments/langfilter.xsl | 22 framework/filter/source/config/fragments/makefile.mk | 9 installation/readlicense_oo/docs/readme.xsl | 11 installation/readlicense_oo/prj/build.lst | 2 installation/readlicense_oo/util/makefile.pmk | 21 installation/scp2/source/ooo/file_library_ooo.scp | 18 installation/scp2/source/ooo/makefile.mk | 4 installation/scp2/source/ooo/module_hidden_ooo.scp | 1 installation/scp2/source/ooo/shortcut_ooo.scp | 28 tools/config_office/configure.in | 83 +- tools/config_office/set_soenv.in | 6 tools/solenv/config/stand.lst | 4 tools/solenv/inc/libs.mk | 7 tools/solenv/inc/tg_config.mk | 120 +-- tools/solenv/inc/unitools.mk | 1 util/extensions/source/update/check/makefile.mk | 7 util/officecfg/org/openoffice/configuration/makefile.mk | 3 util/officecfg/prj/build.lst | 24 util/officecfg/util/alllang.xsl | 14 util/officecfg/util/data_val.xsl | 14 util/officecfg/util/makefile.pmk | 3 util/xmlhelp/prj/build.lst | 2 util/xmlhelp/source/cxxhelp/provider/makefile.mk | 14 util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 486 +++++----------- util/xmlhelp/util/makefile.mk | 16 26 files changed, 383 insertions(+), 539 deletions(-) Index: workspace.libxslt02.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.libxslt02.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- workspace.libxslt02.patch 3 Jan 2007 16:49:06 -0000 1.4 +++ workspace.libxslt02.patch 4 Jan 2007 17:43:25 -0000 1.5 @@ -1297,7 +1297,7 @@ $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu -$(MKDIRHIER) $(@:d) - $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all -+ $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) --nonet -o $@ -m localize.sdf -l all ++ $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all .IF "$(XCU_LANG)" != "" $(XCU_LANG) : $(XSLDIR)$/alllang.xsl From fedora-cvs-commits at redhat.com Thu Jan 4 17:47:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 12:47:09 -0500 Subject: rpms/lvm2-cluster/FC-6 LVM2.2.02.17.tgz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 lvm2-cluster.spec, 1.31, 1.32 sources, 1.7, 1.8 upstream, 1.7, 1.8 Message-ID: <200701041747.l04Hl9oE028049@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2-cluster/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28030 Modified Files: .cvsignore lvm2-cluster.spec sources upstream Added Files: LVM2.2.02.17.tgz.asc Log Message: latest stable upstream --- NEW FILE LVM2.2.02.17.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFga+TIoGRwVZ+LBcRAnM7AKDxJPRsMOh4D1BrN6Me1jV1si4tqQCfYpGZ ZgsQSeYhxDNDBJ8Z8HymFcg= =w2bz -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lvm2-cluster/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Sep 2006 20:31:56 -0000 1.7 +++ .cvsignore 4 Jan 2007 17:47:07 -0000 1.8 @@ -1 +1 @@ -LVM2.2.02.10.tgz +LVM2.2.02.17.tgz Index: lvm2-cluster.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2-cluster/FC-6/lvm2-cluster.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- lvm2-cluster.spec 19 Sep 2006 20:31:56 -0000 1.31 +++ lvm2-cluster.spec 4 Jan 2007 17:47:07 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Cluster extenstions for userland logical volume management tools Name: lvm2-cluster -Version: 2.02.10 -Release: 1.0 +Version: 2.02.17 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -11,13 +11,13 @@ Requires(post): chkconfig Requires(post): ldconfig Requires(preun): chkconfig -Requires(preun): device-mapper >= 1.02.10 +Requires(preun): device-mapper >= 1.02.13 Requires(preun): lvm2 >= 2.02 Requires(postun): ldconfig -BuildRequires: device-mapper >= 1.02.10 +BuildRequires: device-mapper >= 1.02.13 BuildRequires: libselinux-devel, libsepol-devel BuildRequires: cman-devel -Requires: lvm2 >= 2.02 +Requires: lvm2 >= 2.02.17 %description Extensions to LVM2 to support clusters. @@ -44,6 +44,8 @@ /sbin/chkconfig --add clvmd /sbin/ldconfig +/usr/sbin/lvmconf --lockinglibdir %{_libdir} + %postun -p /sbin/ldconfig %preun @@ -62,6 +64,9 @@ /etc/rc.d/init.d/clvmd %changelog +* Wed Jan 03 2007 Alasdair Kergon - 2.02.17-1 +- Update to latest stable upstream. + * Tue Sep 19 2006 Alasdair Kergon - 2.02.10-1.0 - New upstream with fixes. Index: sources =================================================================== RCS file: /cvs/dist/rpms/lvm2-cluster/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Sep 2006 20:31:56 -0000 1.7 +++ sources 4 Jan 2007 17:47:07 -0000 1.8 @@ -1 +1 @@ -a03249bd9f16510dbef241b0f15f9b83 LVM2.2.02.10.tgz +a1bebdabb0dace2b9dd98579625ce53c LVM2.2.02.17.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/lvm2-cluster/FC-6/upstream,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- upstream 19 Sep 2006 20:31:56 -0000 1.7 +++ upstream 4 Jan 2007 17:47:07 -0000 1.8 @@ -1 +1 @@ -LVM2.2.02.10.tgz +LVM2.2.02.17.tgz From fedora-cvs-commits at redhat.com Thu Jan 4 17:47:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 12:47:48 -0500 Subject: rpms/lvm2-cluster/FC-6 LVM2.2.01.07.tgz.asc, 1.1, NONE LVM2.2.01.09.tgz.asc, 1.1, NONE LVM2.2.02.01.tgz.asc, 1.1, NONE LVM2.2.02.06.tgz.asc, 1.1, NONE LVM2.2.02.10.tgz.asc, 1.1, NONE Message-ID: <200701041747.l04HlmI6028080@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2-cluster/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28067 Removed Files: LVM2.2.01.07.tgz.asc LVM2.2.01.09.tgz.asc LVM2.2.02.01.tgz.asc LVM2.2.02.06.tgz.asc LVM2.2.02.10.tgz.asc Log Message: old .asc --- LVM2.2.01.07.tgz.asc DELETED --- --- LVM2.2.01.09.tgz.asc DELETED --- --- LVM2.2.02.01.tgz.asc DELETED --- --- LVM2.2.02.06.tgz.asc DELETED --- --- LVM2.2.02.10.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 4 18:32:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 13:32:54 -0500 Subject: rpms/booty/devel .cvsignore, 1.52, 1.53 booty.spec, 1.57, 1.58 sources, 1.55, 1.56 Message-ID: <200701041832.l04IWsHh031730@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31599 Modified Files: .cvsignore booty.spec sources Log Message: - update to 0.82-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 17 Nov 2006 17:03:26 -0000 1.52 +++ .cvsignore 4 Jan 2007 18:32:52 -0000 1.53 @@ -1 +1 @@ -booty-0.81.tar.bz2 +booty-0.82.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- booty.spec 17 Nov 2006 17:03:26 -0000 1.57 +++ booty.spec 4 Jan 2007 18:32:52 -0000 1.58 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.81 +Version: 0.82 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -35,6 +35,10 @@ %changelog +* Thu Jan 4 2007 Peter Jones - 0.82-1 +- Include drives for /boot and stage1 in device.map (#218453) +- Use the right drive list from isys (#217434) + * Fri Nov 17 2006 Peter Jones - 0.81-1 - Use "--stage2=" in the script we pass to grub to install the bootloader, so it won't write to the disk's device node. Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 17 Nov 2006 17:03:26 -0000 1.55 +++ sources 4 Jan 2007 18:32:52 -0000 1.56 @@ -1 +1 @@ -27e1fb0e316eb32f2e352585e14202a5 booty-0.81.tar.bz2 +065434a63ef35da166afd93fecfab652 booty-0.82.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 4 18:42:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 13:42:47 -0500 Subject: rpms/booty/devel sources,1.56,1.57 Message-ID: <200701041842.l04Iglrp006817@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6647 Modified Files: sources Log Message: - replace tarball (wtf? no Makefile in it?) Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 4 Jan 2007 18:32:52 -0000 1.56 +++ sources 4 Jan 2007 18:42:42 -0000 1.57 @@ -1 +1 @@ -065434a63ef35da166afd93fecfab652 booty-0.82.tar.bz2 +3b8951e2ee281e719241b45deb4219ab booty-0.82.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 4 19:18:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 14:18:45 -0500 Subject: rpms/kexec-tools/devel kexec-tools-1.101-bzimage-options.patch, NONE, 1.1 kexec-tools.spec, 1.65, 1.66 Message-ID: <200701041918.l04JIj1f010143@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10091 Modified Files: kexec-tools.spec Added Files: kexec-tools-1.101-bzimage-options.patch Log Message: Related: bz 221272 kexec-tools-1.101-bzimage-options.patch: kexec-bzImage.c | 11 +++++++++++ 1 files changed, 11 insertions(+) --- NEW FILE kexec-tools-1.101-bzimage-options.patch --- --- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-04 13:58:06.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-04 14:14:07.000000000 -0500 @@ -234,6 +234,9 @@ int bzImage_load(int argc, char **argv, #define OPT_APPEND (OPT_ARCH_MAX+0) #define OPT_RAMDISK (OPT_ARCH_MAX+1) #define OPT_REAL_MODE (OPT_ARCH_MAX+2) +#define OPT_ARGS_ELF (OPT_ARCH_MAX+3) +#define OPT_ARGS_LINUX (OPT_ARCH_MAX+4) +#define OPT_ARGS_NONE (OPT_ARCH_MAX+5) static const struct option options[] = { KEXEC_ARCH_OPTIONS { "debug", 0, 0, OPT_DEBUG }, @@ -242,6 +245,9 @@ int bzImage_load(int argc, char **argv, { "initrd", 1, 0, OPT_RAMDISK }, { "ramdisk", 1, 0, OPT_RAMDISK }, { "real-mode", 0, 0, OPT_REAL_MODE }, + { "args-elf", 0, NULL, OPT_ARGS_ELF }, + { "args-linux", 0, NULL, OPT_ARGS_LINUX }, + { "args-none", 0, NULL, OPT_ARGS_NONE }, { 0, 0, 0, 0 }, }; static const char short_options[] = KEXEC_ARCH_OPT_STR "d"; @@ -276,6 +282,11 @@ int bzImage_load(int argc, char **argv, case OPT_REAL_MODE: real_mode_entry = 1; break; + case OPT_ARGS_ELF: + case OPT_ARGS_LINUX: + case OPT_ARGS_NONE: + /* we can ignore these options */ + break; } } command_line_len = 0; Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- kexec-tools.spec 15 Dec 2006 21:05:01 -0000 1.65 +++ kexec-tools.spec 4 Jan 2007 19:18:42 -0000 1.66 @@ -30,6 +30,7 @@ # Patch1: kexec-tools-1.101-kdump.patch Patch2: kexec-tools-1.101-elf-core-type.patch +Patch3: kexec-tools-1.101-bzimage-options.patch # # Patches 101 through 200 are meant for x86_64 kexec-tools enablement @@ -92,6 +93,7 @@ rm -f ../kexec-tools-1.101.spec %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch101 -p1 %patch102 -p1 %patch201 -p1 @@ -220,6 +222,9 @@ %doc kexec-kdump-howto.txt %changelog +* Thu Jan 04 2007 Neil Horman - 1.101-6%{dist} +- Fix option parsing problem for bzImage files (bz 221272) + * Fri Dec 15 2006 Neil Horman - 1.101-5%{dist} - Wholesale update of RHEL5 revisions 55-147 From fedora-cvs-commits at redhat.com Thu Jan 4 19:19:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 14:19:33 -0500 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.66,1.67 Message-ID: <200701041919.l04JJXOk010804@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10770 Modified Files: kexec-tools.spec Log Message: Related: bz 221272 Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- kexec-tools.spec 4 Jan 2007 19:18:42 -0000 1.66 +++ kexec-tools.spec 4 Jan 2007 19:19:31 -0000 1.67 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 55%{?dist} +Release: 56%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -222,10 +222,10 @@ %doc kexec-kdump-howto.txt %changelog -* Thu Jan 04 2007 Neil Horman - 1.101-6%{dist} +* Thu Jan 04 2007 Neil Horman - 1.101-56%{dist} - Fix option parsing problem for bzImage files (bz 221272) -* Fri Dec 15 2006 Neil Horman - 1.101-5%{dist} +* Fri Dec 15 2006 Neil Horman - 1.101-55%{dist} - Wholesale update of RHEL5 revisions 55-147 * Tue Aug 29 2006 Neil Horman - 1.101-54%{dist} From fedora-cvs-commits at redhat.com Thu Jan 4 19:23:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 14:23:36 -0500 Subject: rpms/gimp-help/devel .cvsignore, 1.7, 1.8 gimp-help.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200701041923.l04JNaVt014031@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp-help/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13866 Modified Files: .cvsignore gimp-help.spec sources Log Message: version 2-0.11 add disttag Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gimp-help/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Apr 2006 10:14:51 -0000 1.7 +++ .cvsignore 4 Jan 2007 19:23:34 -0000 1.8 @@ -1 +1 @@ -gimp-help-2-0.10.tar.gz +gimp-help-2-0.11.tar.gz Index: gimp-help.spec =================================================================== RCS file: /cvs/dist/rpms/gimp-help/devel/gimp-help.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gimp-help.spec 12 Jul 2006 05:55:45 -0000 1.10 +++ gimp-help.spec 4 Jan 2007 19:23:34 -0000 1.11 @@ -1,10 +1,10 @@ -%define gimphelpver 2-0.10 +%define gimphelpver 2-0.11 %define gimpsubver 2.0 Summary: Help files for the GIMP. Name: gimp-help Version: %(echo %gimphelpver|cut -d- -f1) -Release: 0.1.%(echo %gimphelpver|cut -d- -f2).1.1 +Release: 0.1.%(echo %gimphelpver|cut -d- -f2)%{?dist} License: GNU FDL Group: Applications/Multimedia URL: http://wiki.gimp.org/gimp/GimpDocs @@ -40,6 +40,10 @@ %{_datadir}/gimp/%{gimpsubver}/help %changelog +* Thu Jan 04 2007 Nils Philippsen - 2-0.1.0.11 +- version 2-0.11 +- add disttag + * Wed Jul 12 2006 Jesse Keating - 2-0.1.0.10.1.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/gimp-help/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Apr 2006 10:14:51 -0000 1.7 +++ sources 4 Jan 2007 19:23:34 -0000 1.8 @@ -1 +1 @@ -22a1e10c314c5547fe8721c4f6f0b30a gimp-help-2-0.10.tar.gz +1becf4914fe51d8f0ce4142202c8cb92 gimp-help-2-0.11.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 4 21:25:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 16:25:41 -0500 Subject: rpms/lvm2-cluster/FC-6 lvm2-cluster.spec, 1.32, 1.33 clvmd-init-chkconfig.patch, 1.1, NONE Message-ID: <200701042125.l04LPfAs023767@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2-cluster/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23577 Modified Files: lvm2-cluster.spec Removed Files: clvmd-init-chkconfig.patch Log Message: chkconfig change now built-in Index: lvm2-cluster.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2-cluster/FC-6/lvm2-cluster.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- lvm2-cluster.spec 4 Jan 2007 17:47:07 -0000 1.32 +++ lvm2-cluster.spec 4 Jan 2007 21:25:39 -0000 1.33 @@ -6,7 +6,6 @@ Group: System Environment/Base URL: http://sources.redhat.com/lvm2 Source0: LVM2.%{version}.tgz -Patch0: clvmd-init-chkconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig Requires(post): ldconfig @@ -24,7 +23,6 @@ %prep %setup -q -n LVM2.%{version} -%patch -p1 -b .chkconfig %build %configure --with-clvmd=cman --with-cluster=shared --with-user= --with-group= --- clvmd-init-chkconfig.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 4 21:45:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 16:45:24 -0500 Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.65, 1.66 sources, 1.80, 1.81 system-config-securitylevel.spec, 1.91, 1.92 Message-ID: <200701042145.l04LjOex024781@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-securitylevel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24765 Modified Files: .cvsignore sources system-config-securitylevel.spec Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- .cvsignore 22 Dec 2006 16:01:47 -0000 1.65 +++ .cvsignore 4 Jan 2007 21:45:22 -0000 1.66 @@ -53,3 +53,4 @@ system-config-securitylevel-1.6.28.tar.bz2 system-config-securitylevel-1.6.29.tar.bz2 system-config-securitylevel-1.6.30.tar.bz2 +system-config-securitylevel-1.6.31.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 22 Dec 2006 16:01:47 -0000 1.80 +++ sources 4 Jan 2007 21:45:22 -0000 1.81 @@ -1 +1 @@ -fcc8aac48b9d96408254e4fdc4af0984 system-config-securitylevel-1.6.30.tar.bz2 +e7a18955a2e6e131de4c30df7b289055 system-config-securitylevel-1.6.31.tar.bz2 Index: system-config-securitylevel.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- system-config-securitylevel.spec 22 Dec 2006 16:01:47 -0000 1.91 +++ system-config-securitylevel.spec 4 Jan 2007 21:45:22 -0000 1.92 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying the system security level Name: system-config-securitylevel -Version: 1.6.30 +Version: 1.6.31 Release: 1%{?dist} URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,6 +93,9 @@ /usr/bin/system-config-securitylevel-tui %changelog +* Thu Jan 04 2007 Chris Lumens 1.6.31-1 +- Fix import that was causing a traceback (#221402). + * Fri Dec 22 2006 Chris Lumens 1.6.30-1 - Reorganize code to be more useful as a library. - Allow changing the SELinux setting from text mode (#217767). From fedora-cvs-commits at redhat.com Thu Jan 4 22:09:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 17:09:57 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.123, 1.124 libselinux.spec, 1.236, 1.237 sources, 1.125, 1.126 Message-ID: <200701042209.l04M9vab013783@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13767 Modified Files: .cvsignore libselinux.spec sources Log Message: * Thu Jan 4 2007 Dan Walsh - 1.33.3-1 - Upgrade to upstream * Merged patch for matchpathcon utility to use file mode information when available from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- .cvsignore 28 Nov 2006 14:25:28 -0000 1.123 +++ .cvsignore 4 Jan 2007 22:09:55 -0000 1.124 @@ -99,3 +99,4 @@ libselinux-1.32.tgz libselinux-1.33.1.tgz libselinux-1.33.2.tgz +libselinux-1.33.3.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- libselinux.spec 7 Dec 2006 15:46:04 -0000 1.236 +++ libselinux.spec 4 Jan 2007 22:09:55 -0000 1.237 @@ -1,12 +1,11 @@ %define libsepolver 1.15.2-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.33.2 -Release: 4%{?dist} +Version: 1.33.3 +Release: 1%{?dist} 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} swig Requires: libsepol >= %{libsepolver} setransd @@ -49,7 +48,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -119,6 +117,11 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Thu Jan 4 2007 Dan Walsh - 1.33.3-1 +- Upgrade to upstream + * Merged patch for matchpathcon utility to use file mode information + when available from Dan Walsh. + * Thu Dec 7 2006 Jeremy Katz - 1.33.2-4 - rebuild against python 2.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- sources 28 Nov 2006 14:25:28 -0000 1.125 +++ sources 4 Jan 2007 22:09:55 -0000 1.126 @@ -1 +1 @@ -443ffbc50604d5481010ce698ed1b742 libselinux-1.33.2.tgz +11ea5b86dcea249dfa5c48940c98b1b6 libselinux-1.33.3.tgz From fedora-cvs-commits at redhat.com Thu Jan 4 22:11:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 17:11:40 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.129, 1.130 policycoreutils-rhat.patch, 1.268, 1.269 policycoreutils.spec, 1.355, 1.356 sources, 1.133, 1.134 Message-ID: <200701042211.l04MBeiI014118@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14090 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Thu Jan 4 2007 Dan Walsh 1.33.8-1 - Update to upstream * Merged patches from Dan Walsh to: - omit the optional name from audit2allow - use the installed python version in the Makefiles - re-open the tty with O_RDWR in newrole Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- .cvsignore 3 Jan 2007 19:18:12 -0000 1.129 +++ .cvsignore 4 Jan 2007 22:11:35 -0000 1.130 @@ -121,3 +121,4 @@ policycoreutils-1.33.5.tgz policycoreutils-1.33.6.tgz policycoreutils-1.33.7.tgz +policycoreutils-1.33.8.tgz policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ newrole/newrole.c | 22 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/fixfiles | 3 semanage/seobject.py | 34 20 files changed, 4843 insertions(+), 18 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- policycoreutils-rhat.patch 3 Jan 2007 19:18:12 -0000 1.268 +++ policycoreutils-rhat.patch 4 Jan 2007 22:11:37 -0000 1.269 @@ -1,30 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.33.6/audit2allow/avc.py ---- nsapolicycoreutils/audit2allow/avc.py 2006-11-16 17:14:29.000000000 -0500 -+++ policycoreutils-1.33.6/audit2allow/avc.py 2006-12-20 14:59:04.000000000 -0500 -@@ -231,7 +231,7 @@ - else: - file = m[0][1] - ret = "\n#%s\n"% self.out() -- ret += "optional_policy(`%s', `\n" % m[0][1] -+ ret += "optional_policy(`\n" - first = True - for i in m: - if file != i[1]: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/Makefile policycoreutils-1.33.6/audit2allow/Makefile ---- nsapolicycoreutils/audit2allow/Makefile 2006-11-16 17:14:29.000000000 -0500 -+++ policycoreutils-1.33.6/audit2allow/Makefile 2006-12-20 14:59:04.000000000 -0500 -@@ -4,7 +4,7 @@ - LIBDIR ?= $(PREFIX)/lib - MANDIR ?= $(PREFIX)/share/man - LOCALEDIR ?= /usr/share/locale --PYLIBVER ?= python2.4 -+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') - PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) - - TARGETS=audit2allow -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.6/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.7/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/booleansPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/booleansPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -225,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.6/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.7/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/fcontextPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/fcontextPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -387,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.6/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.7/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/loginsPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/loginsPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -552,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.6/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.7/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/Makefile 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/Makefile 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -586,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.6/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.7/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/mappingsPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/mappingsPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -644,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.6/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.7/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/modulesPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/modulesPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -809,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.6/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.7/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/portsPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/portsPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1027,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.6/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.7/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/selinux.tbl 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/selinux.tbl 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1296,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.6/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.7/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/semanagePage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/semanagePage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1409,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.6/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.7/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/statusPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/statusPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1626,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.6/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.7/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/system-config-selinux.glade 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/system-config-selinux.glade 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4433,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.6/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.7/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/system-config-selinux.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/system-config-selinux.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4593,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.6/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.7/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/translationsPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/translationsPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4706,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.6/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.7/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.6/gui/usersPage.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/gui/usersPage.py 2007-01-04 16:24:30.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4865,34 +4841,71 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.6/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.7/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.6/Makefile 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/Makefile 2007-01-04 16:24:30.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.6/newrole/newrole.c ---- nsapolicycoreutils/newrole/newrole.c 2006-11-29 17:11:18.000000000 -0500 -+++ policycoreutils-1.33.6/newrole/newrole.c 2006-12-20 14:59:04.000000000 -0500 -@@ -1120,10 +1120,10 @@ - fd = open(ttyn, O_RDONLY); - if (fd != 0) - goto err_close_pam; -- fd = open(ttyn, O_WRONLY); -+ fd = open(ttyn, O_RDWR); - if (fd != 1) - goto err_close_pam; -- fd = open(ttyn, O_WRONLY); -+ fd = open(ttyn, O_RDWR); - if (fd != 2) - goto err_close_pam; +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.7/newrole/newrole.c +--- nsapolicycoreutils/newrole/newrole.c 2007-01-04 17:01:41.000000000 -0500 ++++ policycoreutils-1.33.7/newrole/newrole.c 2007-01-04 16:24:47.000000000 -0500 +@@ -67,6 +67,7 @@ + #include /* for SELINUX_DEFAULTUSER */ + #include + #include /* for getuid(), exit(), getopt() */ ++#include + #ifdef USE_AUDIT + #include + #endif +@@ -93,6 +94,19 @@ + + extern char **environ; -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.6/restorecond/restorecond.c ++static int check_isapty(int fd) { ++ struct stat buf; ++ if ((isatty(fd)) && (fstat(fd, &buf) == 0)) { ++ int dev=major(buf.st_rdev); ++ if (dev > 135 && dev < 144) { ++ return 1; ++ } else { ++ return 0; ++ } ++ } ++ return 0; ++} ++ + /** + * Construct from the current range and specified desired level a resulting + * range. If the specified level is a range, return that. If it is not, then +@@ -733,6 +747,7 @@ + security_context_t *new_context, + int *preserve_environment) + { ++ int i; /* index for open file descriptors */ + int flag_index; /* flag index in argv[] */ + int clflag; /* holds codes for command line flags */ + char *role_s = NULL; /* role spec'd by user in argv[] */ +@@ -793,6 +808,13 @@ + "specified\n")); + return -1; + } ++ for (i=0; i < 3; i++) { ++ if (check_isapty(i)) { ++ fprintf(stderr, "Error: you are not allowed to change levels on pseudo terminals\n"); ++ return -1; ++ } ++ } ++ + level_s = optarg; + break; + default: +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.7/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.6/restorecond/restorecond.c 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/restorecond/restorecond.c 2007-01-04 16:24:30.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4919,43 +4932,31 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.6/restorecond/restorecond.conf +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.7/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.6/restorecond/restorecond.conf 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/restorecond/restorecond.conf 2007-01-04 16:24:30.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.6/scripts/fixfiles +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.7/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.33.6/scripts/fixfiles 2007-01-02 10:51:58.000000000 -0500 ++++ policycoreutils-1.33.7/scripts/fixfiles 2007-01-04 16:24:30.000000000 -0500 @@ -29,6 +29,9 @@ RPMILES="" OUTFILES="" LOGFILE=`tty` -+if [ $1 != 0 ]; then ++if [ $? != 0 ]; then + LOGFILE="/dev/null" +fi SYSLOGFLAG="-l" LOGGER=/usr/sbin/logger SETFILES=/sbin/setfiles -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.33.6/semanage/Makefile ---- nsapolicycoreutils/semanage/Makefile 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.6/semanage/Makefile 2006-12-20 14:59:04.000000000 -0500 -@@ -3,7 +3,7 @@ - LIBDIR ?= $(PREFIX)/lib - SBINDIR ?= $(PREFIX)/sbin - MANDIR = $(PREFIX)/share/man --PYLIBVER ?= python2.4 -+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') - PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) - - TARGETS=semanage -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.6/semanage/seobject.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.7/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.6/semanage/seobject.py 2006-12-20 14:59:04.000000000 -0500 ++++ policycoreutils-1.33.7/semanage/seobject.py 2007-01-04 16:24:30.000000000 -0500 @@ -94,23 +94,25 @@ return re.search("^" + reg +"$",raw) @@ -5015,7 +5016,7 @@ class semanageRecords: def __init__(self): self.sh = semanage_handle_create() -@@ -456,7 +460,8 @@ +@@ -456,7 +459,8 @@ rc = semanage_user_set_mlslevel(self.sh, u, selevel) if rc < 0: raise ValueError(_("Could not set MLS level for %s") % name) @@ -5025,7 +5026,7 @@ rc = semanage_user_set_prefix(self.sh, u, prefix) if rc < 0: raise ValueError(_("Could not add prefix %s for %s") % (r, prefix)) -@@ -522,11 +527,17 @@ +@@ -522,11 +526,17 @@ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) if prefix != "": Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.355 retrieving revision 1.356 diff -u -r1.355 -r1.356 --- policycoreutils.spec 3 Jan 2007 19:18:12 -0000 1.355 +++ policycoreutils.spec 4 Jan 2007 22:11:38 -0000 1.356 @@ -4,7 +4,7 @@ %define libselinuxver 1.30.29-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.7 +Version: 1.33.8 Release: 1{?dist} License: GPL Group: System Environment/Base @@ -165,9 +165,16 @@ %post /sbin/chkconfig --add restorecond -[ -x /sbin/service ] && /sbin/service restorecond condrestart +[ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Thu Jan 4 2007 Dan Walsh 1.33.8-1 +- Update to upstream + * Merged patches from Dan Walsh to: + - omit the optional name from audit2allow + - use the installed python version in the Makefiles + - re-open the tty with O_RDWR in newrole + * Wed Jan 3 2007 Dan Walsh 1.33.7-1 - Update to upstream * Patch from Dan Walsh to correctly suppress warnings in load_policy. Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- sources 3 Jan 2007 19:18:12 -0000 1.133 +++ sources 4 Jan 2007 22:11:38 -0000 1.134 @@ -1 +1 @@ -aacdcf4aa375bdea88cc1530517f95bb policycoreutils-1.33.7.tgz +c4c3ebbaf1c11e122441da38fd11478c policycoreutils-1.33.8.tgz From fedora-cvs-commits at redhat.com Thu Jan 4 22:47:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 17:47:19 -0500 Subject: rpms/cpuspeed/devel cpuspeed.init,1.19,1.20 Message-ID: <200701042247.l04MlJdx030051@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29669 Modified Files: cpuspeed.init Log Message: More overhauling of cpuspeed initscript to make it behave betterwith cpufreq modules... Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cpuspeed.init 3 Jan 2007 23:22:13 -0000 1.19 +++ cpuspeed.init 4 Jan 2007 22:47:16 -0000 1.20 @@ -1,8 +1,9 @@ -#/bin/sh +#!/bin/sh # Startup script for cpuspeed # # chkconfig: 12345 06 99 -# description: Run dynamic CPU speed daemon +# description: Run dynamic CPU speed daemon and/or load appropriate +# cpu frequency scaling kernel modules and governors # Source function library. . /etc/rc.d/init.d/functions @@ -20,8 +21,9 @@ cpus='/sys/devices/system/cpu/cpu*' testpat="${cpus}/cpufreq/scaling_driver" lockfile="/var/lock/subsys/$prog" -governor=${GOVERNOR:-ondemand} xendir="/proc/xen" +logger="/usr/bin/logger -p info -t cpuspeed" +module_loaded=false some_file_exist() { while [ "$1" ] ; do @@ -31,7 +33,55 @@ return 1 } +governor_is_module() { + # Check to see if the requested cpufreq governor + # is provided as a kernel module or not + module_info=`/sbin/modinfo cpufreq-${governor} 2>&1 > /dev/null` + return $? +} + +governor_module_loaded() { + # Check to see if we have a module loaded for + # the current cpufreq governor + if [ -e ${cpu0freqd}/scaling_governor ]; then + governor=`cat ${cpu0freqd}/scaling_governor` + fi + if [ -n "${governor}" -a `/sbin/lsmod | grep -c -w "cpufreq.${governor}"` -ge 1 ] ; then + return 0 + fi + return 1 +} + +adjust_cpufreq() { + # First arg is a param under $cpu/cpufreq/ + # Second arg is the value you want to set that param to + for cpu in ${cpus}; do + echo $2 > $cpu/cpufreq/$1 + done +} + +start_cpuspeed() { + echo -n $"Starting $prog: " + daemon cpuspeed -d $OPTS + RETVAL=$? + return $RETVAL +} + +stop_cpuspeed() { + if [ -n "`pidof cpuspeed`" ]; then + killproc cpuspeed -USR1 + killproc cpuspeed -INT + RETVAL=$? + fi + if [ -n "`pidof cpuspeed`" ]; then + killproc cpuspeed + RETVAL=$? + fi + return $RETVAL +} + start() { + governor=${GOVERNOR} if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then if ! some_file_exist $testpat ; then # Attempt to load scaling_driver if not loaded @@ -44,11 +94,11 @@ grep flags /proc/cpuinfo | \ grep -q est ; then # use ACPI as a fallback - /sbin/modprobe acpi-cpufreq + /sbin/modprobe acpi-cpufreq 2>&1 > /dev/null # if even ACPI didn't work, remove it # and then next test will bail out. [ -d ${cpu0freqd} ] || \ - /sbin/modprobe -r acpi-cpufreq + /sbin/modprobe -r acpi-cpufreq 2>&1 > /dev/null else # No scaling. Just exit. return 0 @@ -64,23 +114,42 @@ case "$drv" in centrino|powernow-k8) - /sbin/modprobe cpufreq-${governor} - for cpu in ${cpus} - do - echo ${governor} > $cpu/cpufreq/scaling_governor - done - RETVAL=0 - # technically, not quite right, but close enough to - # illustrate that we're doing frequency scaling - touch $lockfile + if [ `grep -c -w ${governor} ${cpu0freqd}/scaling_available_governors` -ge 1 ] ; then + $logger "Enabling ${governor} cpu frequency scaling governor" + else + $logger "Invalid governor \"${governor}\" specified, falling back to ondemand" + governor="ondemand" + fi + governor_is_module && is_module=true + if [ $is_module == true ]; then + /sbin/modprobe cpufreq-${governor} + fi + adjust_cpufreq scaling_governor ${governor} + if [ -n "$MAX_SPEED" ]; then + adjust_cpufreq scaling_max_freq $MAX_SPEED + fi + if [ -n "$MIN_SPEED" ]; then + adjust_cpufreq scaling_min_freq $MIN_SPEED + fi + if [ "${governor}" != "userspace" ]; then + echo -n "Enabling ${governor} cpu frequency scaling: " + daemon : + RETVAL=0 + else + start_cpuspeed + RETVAL=$? + fi ;; *) - echo -n $"Starting $prog: " - daemon cpuspeed -d $OPTS + start_cpuspeed RETVAL=$? - echo - [ $RETVAL = 0 ] && touch $lockfile + ;; esac + echo + # Technically, not quite right in centrino/powernow-k8 + # case, but close enough to indicaate that we're + # doing some sort of cpu frequency scaling. + [ $RETVAL = 0 ] && touch $lockfile else return 0 fi @@ -93,27 +162,33 @@ case "$drv" in centrino|powernow-k8) + $logger "Disabling ${governor} cpu frequency scaling governor" + governor_module_loaded && module_loaded=true for cpu in ${cpus} do echo userspace > $cpu/cpufreq/scaling_governor cat $cpu/cpufreq/cpuinfo_max_freq > $cpu/cpufreq/scaling_setspeed done - /sbin/modprobe -r cpufreq-${governor} - RETVAL=0 - ;; - *) - if test "x`pidof cpuspeed`" != x; then - echo -n $"Stopping $prog: " - killproc cpuspeed -USR1 - killproc cpuspeed -INT - echo + if [ $module_loaded == true ]; then + /sbin/modprobe -r cpufreq-${governor} fi - if test "x`pidof cpuspeed`" != x; then - killproc cpuspeed + if [ "${governor}" != "userspace" ]; then + echo -n "Disabling ${governor} cpu frequency scaling: " + daemon : + RETVAL=0 + else + stop_cpuspeed + RETVAL=$? fi + ;; + *) + stop_cpuspeed RETVAL=$? + ;; esac - [ -n "$DRIVER" ] && /sbin/modprobe -r $DRIVER + echo + + [ -n "$DRIVER" ] && governor_module_loaded && /sbin/modprobe -r $DRIVER [ $RETVAL = 0 ] && RETVAL=$? [ $RETVAL = 0 ] && rm -f $lockfile return $RETVAL @@ -129,7 +204,8 @@ ;; status) - if [ `/sbin/lsmod | grep -c "cpufreq.${governor}"` -ge 1 ] ; then + governor_module_loaded && module_loaded=true + if [ $module_loaded == true ] ; then echo "Frequency scaling enabled via ${governor} governor" else status cpuspeed @@ -140,7 +216,8 @@ start ;; condrestart) - if test "x`pidof cpuspeed`" != x; then + governor_module_loaded && module_loaded=true + if [ $module_loaded == true -o -n "`pidof cpuspeed`" ] ; then stop start fi From fedora-cvs-commits at redhat.com Fri Jan 5 00:34:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 19:34:58 -0500 Subject: rpms/gcc/devel gcc41-pr30360.patch,NONE,1.1 gcc41.spec,1.136,1.137 Message-ID: <200701050034.l050YwgH026189@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26145 Modified Files: gcc41.spec Added Files: gcc41-pr30360.patch Log Message: 4.1.1-51 gcc41-pr30360.patch: libgcc2.c | 2 +- testsuite/gcc.dg/pr30360.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) --- NEW FILE gcc41-pr30360.patch --- 2007-01-04 Jakub Jelinek PR c/30360 * libgcc2.c (__divdc3): Compare c and d against 0.0 instead of denom against 0.0. * gcc.dg/pr30360.c: New test. --- gcc/libgcc2.c.jj 2006-11-11 18:21:08.000000000 +0100 +++ gcc/libgcc2.c 2007-01-04 15:49:14.000000000 +0100 @@ -1909,7 +1909,7 @@ CONCAT3(__div,MODE,3) (MTYPE a, MTYPE b, are nonzero/zero, infinite/finite, and finite/infinite. */ if (isnan (x) && isnan (y)) { - if (denom == 0.0 && (!isnan (a) || !isnan (b))) + if (c == 0.0 && d == 0.0 && (!isnan (a) || !isnan (b))) { x = COPYSIGN (INFINITY, c) * a; y = COPYSIGN (INFINITY, c) * b; --- gcc/testsuite/gcc.dg/pr30360.c.jj 2007-01-04 15:20:40.000000000 +0100 +++ gcc/testsuite/gcc.dg/pr30360.c 2007-01-04 15:26:57.000000000 +0100 @@ -0,0 +1,25 @@ +/* PR c/30360 */ +/* { dg-do run { target i?86-*-linux* x86_64-*-linux* ia64-*-linux* s390*-*-linux* } } */ +/* { dg-options "-O2 -std=gnu99" } */ + +#define I (__extension__ 1.0iF) +#define H(x) asm ("" : "=m" (x) : "m" (x)) +extern void abort (void); + +int +main (void) +{ + _Complex double a = 1.0 + 1.0 * I, b = 0.0, c; + H (a); + H (b); + c = a / b; + if (!__builtin_isinf (__real__ c) && !__builtin_isinf (__imag__ c)) + abort (); + a = 0.0; + H (a); + H (b); + c = a / b; + if (!__builtin_isnan (__real__ c) || !__builtin_isnan (__imag__ c)) + abort (); + return 0; +} Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- gcc41.spec 4 Jan 2007 09:57:02 -0000 1.136 +++ gcc41.spec 5 Jan 2007 00:34:56 -0000 1.137 @@ -153,6 +153,7 @@ Patch44: gcc41-pr28217.patch Patch45: gcc41-pr30189.patch Patch46: gcc41-rh220627.patch +Patch47: gcc41-pr30360.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -474,6 +475,7 @@ %patch44 -p0 -b .pr28217~ %patch45 -p0 -b .pr30189~ %patch46 -p0 -b .rh220627~ +%patch47 -p0 -b .pr30360~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1545,8 +1547,9 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog -* Thu Jan 4 2007 David Woodhouse 4.1.1-51 -- Bootstrap Ada on PowerPC +* Thu Jan 4 2007 Jakub Jelinek 4.1.1-51 +- bootstrap Ada on ppc32 (David Woodhouse) +- fix complex division with -std=c99 or -std=gnu99 (PR c/30360) * Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 - backwards compatibility with old layout of struct _Unwind_Context From fedora-cvs-commits at redhat.com Fri Jan 5 00:59:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 19:59:39 -0500 Subject: rpms/mlocate/devel mlocate.spec,1.10,1.11 updatedb.conf,1.1,1.2 Message-ID: <200701050059.l050xd8k000536@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mlocate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv402 Modified Files: mlocate.spec updatedb.conf Log Message: * Fri Jan 5 2007 Miloslav Trmac - 0.15-2 - Add gfs and gfs2 to PRUNEFS Resolves: #220491 Index: mlocate.spec =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mlocate.spec 16 Nov 2006 03:01:57 -0000 1.10 +++ mlocate.spec 5 Jan 2007 00:59:37 -0000 1.11 @@ -1,7 +1,7 @@ Summary: An utility for finding files by name Name: mlocate Version: 0.15 -Release: 1 +Release: 2 License: GPLv2 Group: Applications/System Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,10 @@ %ghost /var/lib/mlocate/mlocate.db %changelog +* Fri Jan 5 2007 Miloslav Trmac - 0.15-2 +- Add gfs and gfs2 to PRUNEFS + Resolves: #220491 + * Thu Nov 16 2006 Miloslav Trmac - 0.15-1 - Update to mlocate-0.15 Resolves: #215763 Index: updatedb.conf =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/updatedb.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- updatedb.conf 10 Nov 2005 01:52:16 -0000 1.1 +++ updatedb.conf 5 Jan 2007 00:59:37 -0000 1.2 @@ -1,2 +1,2 @@ -PRUNEFS = "auto afs iso9660 sfs udf" +PRUNEFS = "auto afs gfs gfs2 iso9660 sfs udf" PRUNEPATHS = "/afs /media /net /sfs /tmp /udev /var/spool/cups /var/spool/squid /var/tmp" From fedora-cvs-commits at redhat.com Fri Jan 5 02:17:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 21:17:15 -0500 Subject: rpms/fonts-sinhala/FC-6 .cvsignore, 1.3, 1.4 fonts-sinhala.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200701050217.l052HFUD014969@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-sinhala/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7053 Modified Files: .cvsignore fonts-sinhala.spec sources Log Message: - Resolves: RH#206001 (Parag Nemade) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Sep 2006 10:53:27 -0000 1.3 +++ .cvsignore 5 Jan 2007 02:17:12 -0000 1.4 @@ -1,2 +1,3 @@ lklug-0.2.tar.gz lklug-0.2.1.tar.gz +lklug-0.2.2.tar.gz Index: fonts-sinhala.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/FC-6/fonts-sinhala.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fonts-sinhala.spec 28 Sep 2006 10:53:27 -0000 1.3 +++ fonts-sinhala.spec 5 Jan 2007 02:17:12 -0000 1.4 @@ -1,6 +1,6 @@ Name: fonts-sinhala -Version: 0.2.1 -Release: 1 +Version: 0.2.2 +Release: 1%{?dist} License: GPL Source: lklug-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,6 +49,9 @@ %{_datadir}/fonts/sinhala/*.ttf %changelog +* Thu Jan 04 2007 Parag Nemade - 0.2.2-1 +- Resolves: RH#206001 (Parag Nemade) + * Thu Sep 28 2006 Leon Ho - 0.2.1-1 - Fixed RH#207275 (Rahul Bhalerao) Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-sinhala/FC-6/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Sep 2006 10:53:27 -0000 1.4 +++ sources 5 Jan 2007 02:17:12 -0000 1.5 @@ -1,2 +1 @@ -d6c9527ad8cb60535b282ef1267a066e lklug-0.2.tar.gz -457dcc1ad0c4864f5aaa99903ca1ad55 lklug-0.2.1.tar.gz +f125cd043f474d6bf7da61a384844f4f lklug-0.2.2.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 5 02:35:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 21:35:44 -0500 Subject: rpms/glib2/devel .cvsignore, 1.61, 1.62 glib2.spec, 1.115, 1.116 sources, 1.61, 1.62 Message-ID: <200701050235.l052Zi2M001976@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1867 Modified Files: .cvsignore glib2.spec sources Log Message: 2.12.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 20 Dec 2006 18:07:04 -0000 1.61 +++ .cvsignore 5 Jan 2007 02:35:42 -0000 1.62 @@ -1 +1,2 @@ glib-2.12.6.tar.bz2 +glib-2.12.7.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- glib2.spec 20 Dec 2006 18:27:55 -0000 1.115 +++ glib2.spec 5 Jan 2007 02:35:42 -0000 1.116 @@ -2,7 +2,7 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.12.6 +Version: 2.12.7 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -107,6 +107,9 @@ %{_mandir}/man1/* %changelog +* Thu Jan 4 2006 Matthias Clasen - 2.12.7-1 +- Update to 2.12.7 + * Wed Dec 20 2006 Matthias Clasen - 2.12.6-1 - Update to 2.12.6 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 20 Dec 2006 18:07:04 -0000 1.61 +++ sources 5 Jan 2007 02:35:42 -0000 1.62 @@ -1 +1,2 @@ b13d971e7de0b844fc4ced7367702003 glib-2.12.6.tar.bz2 +7a9e949627cf55c844c3570ab83a2caf glib-2.12.7.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 5 02:36:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 21:36:20 -0500 Subject: rpms/glib2/devel glib2.spec,1.116,1.117 Message-ID: <200701050236.l052aKJ4002466@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2386 Modified Files: glib2.spec Log Message: fix spec Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- glib2.spec 5 Jan 2007 02:35:42 -0000 1.116 +++ glib2.spec 5 Jan 2007 02:36:17 -0000 1.117 @@ -107,7 +107,7 @@ %{_mandir}/man1/* %changelog -* Thu Jan 4 2006 Matthias Clasen - 2.12.7-1 +* Thu Jan 4 2007 Matthias Clasen - 2.12.7-1 - Update to 2.12.7 * Wed Dec 20 2006 Matthias Clasen - 2.12.6-1 From fedora-cvs-commits at redhat.com Fri Jan 5 03:24:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 22:24:15 -0500 Subject: rpms/gnome-python2-extras/FC-6 gnome-python-extras.spec,1.62,1.63 Message-ID: <200701050324.l053OF9p014607@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-extras/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14533 Modified Files: gnome-python-extras.spec Log Message: * Thu Jan 04 2007 Matthew Barnes - 2.14.2-7 - Require firefox-1.5.0.9 exactly. This will introduce a dependency conflict the next time libgtkembedmoz.so changes location, to ensure this package gets rebuilt (RH bug #215163). Index: gnome-python-extras.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-6/gnome-python-extras.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gnome-python-extras.spec 21 Dec 2006 12:14:49 -0000 1.62 +++ gnome-python-extras.spec 5 Jan 2007 03:24:09 -0000 1.63 @@ -8,11 +8,16 @@ %define firefox_version 1.5.0.9 %define gtkspell_version 2.0.7 +# Require firefox = %{firefox_version} (not >=) to purposefully cause a +# dependency conflict when firefox is upgraded, since libgtkembedmoz.so +# lives in a versioned directory (/usr/lib/firefox-w.x.y.z/). This +# package needs to be rebuilt every time "w.x.y.z" changes. + ### Abstract ### Name: gnome-python2-extras Version: 2.14.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL/LGPL Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -31,7 +36,7 @@ ### Build Dependencies ### -BuildRequires: firefox-devel >= %{firefox_version} +BuildRequires: firefox-devel = %{firefox_version} BuildRequires: glib2 >= %{glib_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} BuildRequires: gnome-python2 >= %{gnome_python_version} @@ -80,7 +85,7 @@ %package -n gnome-python2-gtkmozembed Summary: Python bindings for interacting with gtkmozembed Group: Development/Languages -Requires: firefox >= %{firefox_version} +Requires: firefox = %{firefox_version} %description -n gnome-python2-gtkmozembed This module contains a wrapper that allows the use of gtkmozembed @@ -137,6 +142,11 @@ %{_datadir}/gtk-doc/html/pygtkmozembed %changelog +* Thu Jan 04 2007 Matthew Barnes - 2.14.2-7 +- Require firefox-1.5.0.9 exactly. This will introduce a dependency + conflict the next time libgtkembedmoz.so changes location, to ensure + this package gets rebuilt (RH bug #215163). + * Thu Nov 21 2006 Matthew Barnes - 2.14.2-6 - Rebuild against firefox (again). From fedora-cvs-commits at redhat.com Fri Jan 5 03:38:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 22:38:34 -0500 Subject: rpms/glib2/devel glib-2.12.7-bit-test-x86-64.patch, NONE, 1.1 glib2.spec, 1.117, 1.118 Message-ID: <200701050338.l053cYdb016464@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16444 Modified Files: glib2.spec Added Files: glib-2.12.7-bit-test-x86-64.patch Log Message: fix bit-test glib-2.12.7-bit-test-x86-64.patch: bit-test.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE glib-2.12.7-bit-test-x86-64.patch --- --- glib-2.12.7/tests/bit-test.c.bit-test-x86-64 2007-01-04 22:37:38.000000000 -0500 +++ glib-2.12.7/tests/bit-test.c 2007-01-04 22:37:50.000000000 -0500 @@ -13,7 +13,7 @@ if (nth_bit >= 0) { if (G_LIKELY (nth_bit < GLIB_SIZEOF_LONG * 8 - 1)) - mask &= -(1<<(nth_bit+1)); + mask &= -(1UL<<(nth_bit+1)); else mask = 0; } @@ -26,7 +26,7 @@ if (nth_bit >= 0) { if (G_LIKELY (nth_bit < GLIB_SIZEOF_LONG * 8 - 1)) - mask &= -(1<<(nth_bit+1)); + mask &= -(1UL<<(nth_bit+1)); else mask = 0; } @@ -37,7 +37,7 @@ builtin_bit_nth_msf (gulong mask, gint nth_bit) { if (nth_bit >= 0 && nth_bit < GLIB_SIZEOF_LONG * 8) - mask &= (1< - 2.12.7-1 - Update to 2.12.7 +- Fix bit-test on x86-64 * Wed Dec 20 2006 Matthias Clasen - 2.12.6-1 - Update to 2.12.6 From fedora-cvs-commits at redhat.com Fri Jan 5 04:24:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 23:24:30 -0500 Subject: rpms/fonts-arabic/FC-6 fonts-arabic.spec,1.13,1.14 Message-ID: <200701050424.l054OUks025473@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-arabic/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25458 Modified Files: fonts-arabic.spec Log Message: Chnaged Source1 file name from .bz2 to .gz Index: fonts-arabic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/fonts-arabic.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fonts-arabic.spec 4 Jan 2007 11:32:59 -0000 1.13 +++ fonts-arabic.spec 5 Jan 2007 04:24:27 -0000 1.14 @@ -6,7 +6,7 @@ Release: 3%{?dist} License: GPL Source0: %{kacst}.tar.gz -Source1: %{paktype}.tar.bz2 +Source1: %{paktype}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Group: User Interface/X From fedora-cvs-commits at redhat.com Fri Jan 5 04:38:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 23:38:46 -0500 Subject: rpms/m4/FC-6 m4-1.4.5-substitute.patch,NONE,1.1 m4.spec,1.24,1.25 Message-ID: <200701050438.l054cklN012102@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/m4/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11984 Modified Files: m4.spec Added Files: m4-1.4.5-substitute.patch Log Message: * Fri Jan 5 2007 Miloslav Trmac - 1.4.5-4 - Backport regexp substitution fixes from m4-1.4.6 Resolves: #221024 m4-1.4.5-substitute.patch: builtin.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE m4-1.4.5-substitute.patch --- 2006-08-17 Eric Blake * src/builtin.c (substitute): Avoid core dump when accessing beyond bound of regular expression. Reported by Karl Nelson. 2006-07-17 Eric Blake * src/builtin.c (substitute): Bah. Fix buffer overrun. --- m4-1.4.5/src/builtin.c.substitute 2007-01-05 05:26:56.000000000 +0100 +++ m4-1.4.5/src/builtin.c 2007-01-05 05:27:32.000000000 +0100 @@ -1646,18 +1646,18 @@ case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': ch -= '0'; - if (regs->end[ch] > 0) - obstack_grow (obs, victim + regs->start[ch], - regs->end[ch] - regs->start[ch]); - else + if (regs->num_regs - 1 <= ch) M4ERROR ((warning_status, 0, "\ Warning: sub-expression %d not present", ch)); + else if (regs->end[ch] > 0) + obstack_grow (obs, victim + regs->start[ch], + regs->end[ch] - regs->start[ch]); break; case '\0': M4ERROR ((warning_status, 0, "\ Warning: trailing \\ ignored in replacement")); - break; + return; default: obstack_1grow (obs, ch); Index: m4.spec =================================================================== RCS file: /cvs/dist/rpms/m4/FC-6/m4.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- m4.spec 17 Jul 2006 14:01:49 -0000 1.24 +++ m4.spec 5 Jan 2007 04:38:44 -0000 1.25 @@ -1,11 +1,12 @@ Summary: The GNU macro processor. Name: m4 Version: 1.4.5 -Release: 3 +Release: 4 License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2 Source1: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2.sig +Patch0: m4-1.4.5-substitute.patch URL: http://www.gnu.org/software/m4/ Buildroot: %{_tmppath}/%{name}-root Requires(post): /sbin/install-info @@ -23,6 +24,7 @@ %prep %setup -q +%patch0 -p1 -b .substitute %build %configure @@ -53,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 5 2007 Miloslav Trmac - 1.4.5-4 +- Backport regexp substitution fixes from m4-1.4.6 + Resolves: #221024 + * Mon Jul 17 2006 Miloslav Trmac - 1.4.5-3 - Use the install-info scriptlets recommended in the Fedora Extras wiki - Move $RPM_BUILD_ROOT cleaning from %%prep to %%install From fedora-cvs-commits at redhat.com Fri Jan 5 04:56:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 4 Jan 2007 23:56:19 -0500 Subject: rpms/findutils/devel findutils.spec,1.48,1.49 Message-ID: <200701050456.l054uJQE013305@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/findutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13204 Modified Files: findutils.spec Log Message: * Fri Jan 5 2007 Miloslav Trmac - 1:4.2.29-2 - Ignore install-info errors in scriptlets Index: findutils.spec =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- findutils.spec 26 Nov 2006 06:06:03 -0000 1.48 +++ findutils.spec 5 Jan 2007 04:56:17 -0000 1.49 @@ -1,7 +1,7 @@ Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.2.29 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: Applications/File @@ -55,11 +55,11 @@ %find_lang %{name} %post -/sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/find.info.gz %{_infodir}/dir || : fi %clean @@ -75,6 +75,9 @@ %{_infodir}/find.info* %changelog +* Fri Jan 5 2007 Miloslav Trmac - 1:4.2.29-2 +- Ignore install-info errors in scriptlets + * Sun Nov 26 2006 Miloslav Trmac - 1:4.2.29-1 - Update to findutils-4.2.29 - Fix some rpmlint warnings From fedora-cvs-commits at redhat.com Fri Jan 5 05:14:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 00:14:20 -0500 Subject: rpms/jwhois/devel jwhois.spec,1.31,1.32 Message-ID: <200701050514.l055EKpW022773@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/jwhois/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22197 Modified Files: jwhois.spec Log Message: * Fri Jan 5 2007 Miloslav Trmac - 3.2.3-9 - Ignore install-info errors in scriptlets - Remove the trailing dot from Summary: Index: jwhois.spec =================================================================== RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- jwhois.spec 31 Oct 2006 17:12:45 -0000 1.31 +++ jwhois.spec 5 Jan 2007 05:14:16 -0000 1.32 @@ -1,6 +1,6 @@ Name: jwhois Version: 3.2.3 -Release: 8%{?dist} +Release: 9 URL: http://www.gnu.org/software/jwhois/ Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig @@ -12,11 +12,12 @@ Patch5: jwhois-3.2.3-idn.patch License: GPL Group: Applications/Internet -Summary: Internet whois/nicname client. +Summary: Internet whois/nicname client Buildroot: %{_tmppath}/%{name}-%{version}-root Obsoletes: fwhois, whois BuildRequires: autoconf automake libidn-devel -Prereq: /sbin/install-info +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description A whois client that accepts both traditional and finger-style queries. @@ -59,17 +60,21 @@ %config(noreplace) %{_sysconfdir}/jwhois.conf %post -/sbin/install-info %{_infodir}/jwhois.info %{_infodir}/dir +/sbin/install-info %{_infodir}/jwhois.info %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/jwhois.info %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/jwhois.info %{_infodir}/dir || : fi %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT %changelog +* Fri Jan 5 2007 Miloslav Trmac - 3.2.3-9 +- Ignore install-info errors in scriptlets +- Remove the trailing dot from Summary: + * Tue Oct 31 2006 Miloslav Trmac - 3.2.3-8 - Actually use the new upstream config in non-rawhide branches From fedora-cvs-commits at redhat.com Fri Jan 5 06:05:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 01:05:08 -0500 Subject: rpms/cpuspeed/devel cpuspeed.init,1.20,1.21 Message-ID: <200701050605.l05658JI012187@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12173 Modified Files: cpuspeed.init Log Message: Fix more issues with performance governor and do more prep for new config file... Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- cpuspeed.init 4 Jan 2007 22:47:16 -0000 1.20 +++ cpuspeed.init 5 Jan 2007 06:05:06 -0000 1.21 @@ -24,6 +24,7 @@ xendir="/proc/xen" logger="/usr/bin/logger -p info -t cpuspeed" module_loaded=false +is_module=false some_file_exist() { while [ "$1" ] ; do @@ -81,7 +82,7 @@ } start() { - governor=${GOVERNOR} + governor=${GOVERNOR:-ondemand} if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then if ! some_file_exist $testpat ; then # Attempt to load scaling_driver if not loaded @@ -131,6 +132,15 @@ if [ -n "$MIN_SPEED" ]; then adjust_cpufreq scaling_min_freq $MIN_SPEED fi + if [ -n "$UP_THRESHOLD" -a ${governor} == "ondemand" ]; then + adjust_cpufreq ondemand/up_threshold $UP_THRESHOLD + fi + if [ -n "$DOWN_THRESHOLD" -a ${governor} == "conservative" ]; then + adjust_cpufreq conservative/down_threshold $DOWN_THRESHOLD + fi + if [ "$IGNORE_NICE" -eq 1 -a ${governor} == "ondemand" -o ${governor} == "conservative" ]; then + adjust_cpufreq ${governor}/ignore_nice_load $IGNORE_NICE + fi if [ "${governor}" != "userspace" ]; then echo -n "Enabling ${governor} cpu frequency scaling: " daemon : @@ -205,8 +215,8 @@ status) governor_module_loaded && module_loaded=true - if [ $module_loaded == true ] ; then - echo "Frequency scaling enabled via ${governor} governor" + if [ $module_loaded == true -o ${governor} == "performance" ] ; then + echo "Frequency scaling enabled using ${governor} governor" else status cpuspeed fi @@ -217,7 +227,9 @@ ;; condrestart) governor_module_loaded && module_loaded=true - if [ $module_loaded == true -o -n "`pidof cpuspeed`" ] ; then + if [ $module_loaded == true -o \ + -n "`pidof cpuspeed`" -o \ + ${governor} == "performance" ] ; then stop start fi From fedora-cvs-commits at redhat.com Fri Jan 5 08:25:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 03:25:40 -0500 Subject: rpms/screen/devel screen.spec,1.34,1.35 Message-ID: <200701050825.l058Pe6O010002@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/screen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9988 Modified Files: screen.spec Log Message: Change in spec file. Index: screen.spec =================================================================== RCS file: /cvs/dist/rpms/screen/devel/screen.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- screen.spec 15 Nov 2006 13:15:08 -0000 1.34 +++ screen.spec 5 Jan 2007 08:25:38 -0000 1.35 @@ -1,7 +1,7 @@ Summary: A screen manager that supports multiple logins on one terminal Name: screen Version: 4.0.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL2 Group: Applications/System URL: http://www.gnu.org/software/screen @@ -162,12 +162,12 @@ /usr/sbin/groupadd -g 84 -r -f screen %post -/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." +/sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." ||: %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." + /sbin/install-info --delete %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen). Terminal multiplexer." ||: fi @@ -184,6 +184,9 @@ %config(noreplace) /etc/pam.d/screen %changelog +* Fri Jan 5 2007 Marcela Maslanova - 4.0.3-2 +- rebuilt (change in spec file) + * Wed Oct 15 2006 Marcela Maslanova - 4.0.3-1 - new version from upstream - ipv6 patch #198410 From fedora-cvs-commits at redhat.com Fri Jan 5 08:43:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 03:43:30 -0500 Subject: rpms/openoffice.org/devel workspace.impress115.patch,1.1,1.2 Message-ID: <200701050843.l058hUwg032407@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32303 Modified Files: workspace.impress115.patch Log Message: Resolves: rhbz#216094 add workspace.impress115.patch workspace.impress115.patch: bf_svx/source/tbxctrls/svx_tbcontrl.cxx | 0 binfilter/bf_svx/source/tbxctrls/svx_tbcontrl.cxx | 2 +- graphics/svx/source/dialog/chardlg.cxx | 3 ++- graphics/svx/source/tbxctrls/tbcontrl.cxx | 18 ++++++++++-------- script/basic/source/app/dialogs.cxx | 3 ++- sw/sw/source/ui/config/optpage.cxx | 18 ++++++++++++------ util/svtools/inc/ctrlbox.hxx | 2 +- util/svtools/source/control/ctrlbox.cxx | 17 +++++++++++++---- 8 files changed, 41 insertions(+), 22 deletions(-) Index: workspace.impress115.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.impress115.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- workspace.impress115.patch 3 Jan 2007 16:11:40 -0000 1.1 +++ workspace.impress115.patch 5 Jan 2007 08:43:28 -0000 1.2 @@ -171,3 +171,19 @@ } SetText( aStr ); +Index: bf_svx/source/tbxctrls/svx_tbcontrl.cxx +=================================================================== +RCS file: /cvs/framework/binfilter/bf_svx/source/tbxctrls/svx_tbcontrl.cxx,v +retrieving revision 1.7 +diff -u -r1.7 svx_tbcontrl.cxx +--- openoffice.org.orig/binfilter/bf_svx/source/tbxctrls/svx_tbcontrl.cxx 8 Sep 2005 07:17:12 -0000 1.7 ++++ openoffice.org/binfilter/bf_svx/source/tbxctrls/svx_tbcontrl.cxx 5 Jan 2007 08:38:27 -0000 +@@ -915,7 +915,7 @@ + /*N*/ if ( pFontList ) + /*N*/ { + /*N*/ aFontInfo = FontInfo( pFontList->Get( rFontItem.GetFamilyName(), rFontItem.GetStyleName() ) ); +-/*N*/ Fill( aFontInfo, pFontList ); ++/*N*/ Fill( &aFontInfo, pFontList ); + /*N*/ } + /*N*/ SetValue( nOldVal ); // alten Wert wiederherstellen + /*N*/ aCurText = GetText(); // zum R"ucksetzen bei ESC merken From fedora-cvs-commits at redhat.com Fri Jan 5 11:47:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 06:47:38 -0500 Subject: rpms/logrotate/devel logrotate-sizeOption.patch, NONE, 1.1 logrotate.spec, 1.52, 1.53 Message-ID: <200701051147.l05Blco7003727@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3707 Modified Files: logrotate.spec Added Files: logrotate-sizeOption.patch Log Message: "size" option was ignored in config files (#221341) logrotate-sizeOption.patch: config.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logrotate-sizeOption.patch --- --- logrotate-3.7.4/config.c.sizeOption 2007-01-04 16:22:59.000000000 +0100 +++ logrotate-3.7.4/config.c 2007-01-04 16:23:22.000000000 +0100 @@ -617,7 +617,7 @@ return 1; } - if (!strcmp(opt, "size")) { + if (!strncmp(opt, "size", 4)) { newlog->criterium = ROT_SIZE; newlog->threshhold = size; } else Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- logrotate.spec 1 Oct 2006 20:20:23 -0000 1.52 +++ logrotate.spec 5 Jan 2007 11:47:36 -0000 1.53 @@ -1,12 +1,14 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.4 -Release: 7 +Release: 8%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz Patch1: logrotate-selinux.patch Patch2: logrotate-fdLeak.patch +Patch3: logrotate-sizeOption.patch + BuildRoot: %{_tmppath}/%{name}-%{version}.root BuildRequires: libselinux-devel @@ -25,6 +27,7 @@ %setup %patch1 -p1 -b .rhat %patch2 -p1 -b .fdLeak +%patch3 -p1 -b .sizeOption %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -55,6 +58,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Fri Jan 05 2007 Peter Vrabec 3.7.4-8 +- "size" option was ignored in config files (#221341) + * Sun Oct 01 2006 Jesse Keating - 3.7.4-7 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-cvs-commits at redhat.com Fri Jan 5 12:00:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 07:00:52 -0500 Subject: rpms/logrotate/FC-6 logrotate-sizeOption.patch, NONE, 1.1 logrotate.spec, 1.52, 1.53 Message-ID: <200701051200.l05C0qBV004048@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4027 Modified Files: logrotate.spec Added Files: logrotate-sizeOption.patch Log Message: - "size" option was ignored in config files (#221341) logrotate-sizeOption.patch: config.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logrotate-sizeOption.patch --- --- logrotate-3.7.4/config.c.sizeOption 2007-01-04 16:22:59.000000000 +0100 +++ logrotate-3.7.4/config.c 2007-01-04 16:23:22.000000000 +0100 @@ -617,7 +617,7 @@ return 1; } - if (!strcmp(opt, "size")) { + if (!strncmp(opt, "size", 4)) { newlog->criterium = ROT_SIZE; newlog->threshhold = size; } else Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-6/logrotate.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- logrotate.spec 1 Oct 2006 20:20:23 -0000 1.52 +++ logrotate.spec 5 Jan 2007 12:00:50 -0000 1.53 @@ -1,12 +1,13 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.4 -Release: 7 +Release: 8%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz Patch1: logrotate-selinux.patch Patch2: logrotate-fdLeak.patch +Patch3: logrotate-sizeOption.patch BuildRoot: %{_tmppath}/%{name}-%{version}.root BuildRequires: libselinux-devel @@ -25,6 +26,7 @@ %setup %patch1 -p1 -b .rhat %patch2 -p1 -b .fdLeak +%patch3 -p1 -b .sizeOption %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -55,6 +57,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Fri Jan 05 2007 Peter Vrabec 3.7.4-8 +- "size" option was ignored in config files (#221341) + * Sun Oct 01 2006 Jesse Keating - 3.7.4-7 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-cvs-commits at redhat.com Fri Jan 5 13:26:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 08:26:11 -0500 Subject: rpms/cvs/devel cvs.spec,1.51,1.52 Message-ID: <200701051326.l05DQBLl022453@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/cvs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22330 Modified Files: cvs.spec Log Message: - fix post/preun scriptlets so that they won't fail with docs disabled Index: cvs.spec =================================================================== RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- cvs.spec 1 Dec 2006 09:46:43 -0000 1.51 +++ cvs.spec 5 Jan 2007 13:26:09 -0000 1.52 @@ -6,7 +6,7 @@ Summary: A version control system Name: cvs Version: 1.11.22 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2 @@ -131,13 +131,15 @@ %post /sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir -/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir +/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir +exit 0 %preun if [ $1 = 0 ]; then /sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir /sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir fi +exit 0 %files %defattr(-,root,root) @@ -153,6 +155,9 @@ %{_sysconfdir}/profile.d/* %changelog +* Fri Jan 5 2006 Jindrich Novy -1.11.22-8 +- fix post/preun scriptlets so that they won't fail with docs disabled + * Fri Dec 1 2006 Jindrich Novy - 1.11.22-7 - remove/replace obsolete rpm tags, fix rpmlint errors From fedora-cvs-commits at redhat.com Fri Jan 5 13:28:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 08:28:42 -0500 Subject: rpms/cvs/devel cvs.spec,1.52,1.53 Message-ID: <200701051328.l05DSgxQ024482@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/cvs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22977 Modified Files: cvs.spec Log Message: - 2006 is already gone, unfortunatelly Index: cvs.spec =================================================================== RCS file: /cvs/dist/rpms/cvs/devel/cvs.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- cvs.spec 5 Jan 2007 13:26:09 -0000 1.52 +++ cvs.spec 5 Jan 2007 13:28:39 -0000 1.53 @@ -155,7 +155,7 @@ %{_sysconfdir}/profile.d/* %changelog -* Fri Jan 5 2006 Jindrich Novy -1.11.22-8 +* Fri Jan 5 2007 Jindrich Novy -1.11.22-8 - fix post/preun scriptlets so that they won't fail with docs disabled * Fri Dec 1 2006 Jindrich Novy - 1.11.22-7 From fedora-cvs-commits at redhat.com Fri Jan 5 13:34:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 08:34:35 -0500 Subject: rpms/texi2html/devel texi2html.spec,1.10,1.11 Message-ID: <200701051334.l05DYZWI022864@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/texi2html/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22847 Modified Files: texi2html.spec Log Message: - fix post/preun scriptlets so that they won't fail with docs disabled Index: texi2html.spec =================================================================== RCS file: /cvs/dist/rpms/texi2html/devel/texi2html.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- texi2html.spec 29 Nov 2006 12:39:13 -0000 1.10 +++ texi2html.spec 5 Jan 2007 13:34:33 -0000 1.11 @@ -1,6 +1,6 @@ Name: texi2html Version: 1.76 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Text Summary: A highly customizable texinfo to HTML and other formats translator @@ -56,12 +56,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz \ - %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : fi %files @@ -79,6 +78,10 @@ %{_datadir}/%{name}/images/* %changelog +* Fri Jan 5 2007 Jindrich Novy 1.76-6 +- fix post/preun scriptlets so that they won't fail with docs disabled + (thanks to Ville Skytt??) + * Wed Nov 29 2006 Jindrich Novy 1.76-5 - replace PreReq, fix BuildRoot From fedora-cvs-commits at redhat.com Fri Jan 5 13:44:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 08:44:55 -0500 Subject: rpms/logwatch/devel logwatch.spec,1.53,1.54 Message-ID: <200701051344.l05DitUn023374@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23360 Modified Files: logwatch.spec Log Message: - Resolves: 221576 add html conf files Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- logwatch.spec 21 Dec 2006 09:04:31 -0000 1.53 +++ logwatch.spec 5 Jan 2007 13:44:53 -0000 1.54 @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -30,11 +30,13 @@ install -m 0755 -d %{buildroot}%{_var}/cache/logwatch install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/scripts +install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/scripts/services install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/conf/services install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/logfiles install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/services +install -m 0755 -d %{buildroot}%{_datadir}/logwatch/default.conf/html install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/logfiles install -m 0755 -d %{buildroot}%{_datadir}/logwatch/dist.conf/services install -m 0755 -d %{buildroot}%{_datadir}/logwatch/scripts/services @@ -55,6 +57,7 @@ install -m 0644 conf/logwatch.conf %{buildroot}%{_datadir}/logwatch/default.conf/logwatch.conf install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles install -m 0644 conf/services/* %{buildroot}%{_datadir}/logwatch/default.conf/services +install -m 0644 conf/html/* %{buildroot}%{_datadir}/logwatch/default.conf/html install -m 0644 lib/Logwatch.pm %{buildroot}%{_datadir}/logwatch/lib/Logwatch.pm @@ -74,7 +77,6 @@ install -m 0755 -d %{buildroot}%{_sbindir} ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sbindir}/logwatch -install -m 0755 -d %{buildroot}%{_sysconfdir}/logwatch/scripts/services echo "###### REGULAR EXPRESSIONS IN THIS FILE WILL BE TRIMMED FROM REPORT OUTPUT #####" > %{buildroot}%{_sysconfdir}/logwatch/conf/ignore.conf echo "# Local configuration options go here (defaults are in %{_datadir}/logwatch/default.conf/logwatch.conf)" > %{buildroot}%{_sysconfdir}/logwatch/conf/logwatch.conf @@ -100,6 +102,7 @@ %dir %{_datadir}/logwatch/default.conf %dir %{_datadir}/logwatch/default.conf/services %dir %{_datadir}/logwatch/default.conf/logfiles +%dir %{_datadir}/logwatch/default.conf/html %dir %{_datadir}/logwatch/dist.conf %dir %{_datadir}/logwatch/dist.conf/services %dir %{_datadir}/logwatch/dist.conf/logfiles @@ -121,12 +124,21 @@ %{_datadir}/logwatch/default.conf/*.conf %{_datadir}/logwatch/default.conf/services/*.conf %{_datadir}/logwatch/default.conf/logfiles/*.conf +%{_datadir}/logwatch/default.conf/html/*.html %{_sysconfdir}/cron.daily/0logwatch %doc %{_mandir}/man8/logwatch.8* %doc License project/CHANGES project/TODO %changelog +* Fri Jan 5 2007 Ivana Varekova 7.3.2-2 +- Resolves: 221576 + add html conf files + +* Thu Dec 21 2006 Ivana Varekova 7.3.2-1 +- update to 7.3.2 +- remove obsolete patches + * Wed Dec 20 2006 Ivana Varekova 7.3.1-9 - add cron, pam_unix, audit, init service patches From fedora-cvs-commits at redhat.com Fri Jan 5 14:47:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 09:47:09 -0500 Subject: rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, 1.10, 1.11 Message-ID: <200701051447.l05El9cv000823@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30584 Modified Files: pseudoworkspace.valgrind1.patch Log Message: additional valgrind work (ooo#73180) pseudoworkspace.valgrind1.patch: inc/xhatch.hxx | 0 osl/unx/process.c | 0 psprint/source/helper/ppdparser.cxx | 2 +- sal/osl/unx/process.c | 6 +++--- sfx2/source/explorer/nochaos.cxx | 4 ++-- source/dialog/dlgctrl.cxx | 0 source/dialog/numpages.cxx | 0 source/explorer/nochaos.cxx | 0 source/gdi/impgraph.cxx | 0 source/helper/ppdparser.cxx | 0 svx/inc/xhatch.hxx | 2 +- svx/source/dialog/dlgctrl.cxx | 4 ++-- svx/source/dialog/numpages.cxx | 1 + unx/gtk/gdi/salnativewidgets-gtk.cxx | 0 vcl/source/gdi/impgraph.cxx | 4 ++-- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 3 +-- 16 files changed, 13 insertions(+), 13 deletions(-) Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pseudoworkspace.valgrind1.patch 4 Jan 2007 17:43:25 -0000 1.10 +++ pseudoworkspace.valgrind1.patch 5 Jan 2007 14:47:07 -0000 1.11 @@ -108,3 +108,59 @@ { delete rImpGraphic.mpAnimation; rImpGraphic.mpAnimation = new Animation; +Index: source/dialog/dlgctrl.cxx +=================================================================== +RCS file: /cvs/graphics/svx/source/dialog/dlgctrl.cxx,v +retrieving revision 1.27 +diff -u -r1.27 dlgctrl.cxx +--- openoffice.org.orig/svx/source/dialog/dlgctrl.cxx 17 Sep 2006 04:17:40 -0000 1.27 ++++ openoffice.org/svx/source/dialog/dlgctrl.cxx 5 Jan 2007 13:10:40 -0000 +@@ -907,6 +907,7 @@ + + nSquares = nLines * nLines; + pPixel = new USHORT[ nSquares ]; ++ rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); + + // Reset(); <-- wird vom Dialog aufgerufen + } +@@ -1062,8 +1063,7 @@ + void SvxPixelCtl::Reset() + { + // Initialisierung des Arrays +- for( USHORT i = 0; i < nSquares; i++) +- *(pPixel + i) = 0; ++ rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); + Invalidate(); + } + +Index: inc/xhatch.hxx +=================================================================== +RCS file: /cvs/graphics/svx/inc/xhatch.hxx,v +retrieving revision 1.5 +diff -u -r1.5 xhatch.hxx +--- openoffice.org.orig/svx/inc/xhatch.hxx 12 Oct 2006 11:59:49 -0000 1.5 ++++ openoffice.org/svx/inc/xhatch.hxx 5 Jan 2007 13:11:35 -0000 +@@ -59,7 +59,7 @@ + long nAngle; + + public: +- XHatch() {} ++ XHatch() : eStyle(XHATCH_SINGLE), nDistance(0), nAngle(0) {} + XHatch(const Color& rCol, XHatchStyle eStyle = XHATCH_SINGLE, + long nDistance = 20, long nAngle = 0); + +Index: source/dialog/numpages.cxx +=================================================================== +RCS file: /cvs/graphics/svx/source/dialog/numpages.cxx,v +retrieving revision 1.52 +diff -u -r1.52 numpages.cxx +--- openoffice.org.orig/svx/source/dialog/numpages.cxx 12 Oct 2006 12:19:44 -0000 1.52 ++++ openoffice.org/svx/source/dialog/numpages.cxx 5 Jan 2007 14:34:15 -0000 +@@ -2954,6 +2954,7 @@ + pActNum(0), + pSaveNum(0), + nActNumLvl( USHRT_MAX ), ++ bModified(false), bPreset(false), + nNumItemId(SID_ATTR_NUMBERING_RULE), + bInInintControl(FALSE) + { From fedora-cvs-commits at redhat.com Fri Jan 5 15:17:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 10:17:49 -0500 Subject: rpms/evolution-sharp/devel evolution-sharp-0.12.1-fix-assembly-dir.patch, NONE, 1.1 evolution-sharp.spec, 1.32, 1.33 Message-ID: <200701051517.l05FHncp023934@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23758 Modified Files: evolution-sharp.spec Added Files: evolution-sharp-0.12.1-fix-assembly-dir.patch Log Message: * Fri Jan 05 2007 Matthew Barnes - 0.12.1-2.fc7 - Add patch for RH bug #221555 (wrong install directory). - Fix location of mono files to conform to packaging guidelines. evolution-sharp-0.12.1-fix-assembly-dir.patch: Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE evolution-sharp-0.12.1-fix-assembly-dir.patch --- --- evolution-sharp-0.12.1/evolution/Makefile.am.fix-assembly-dir 2007-01-03 12:12:08.000000000 -0500 +++ evolution-sharp-0.12.1/evolution/Makefile.am 2007-01-05 10:01:22.000000000 -0500 @@ -74,14 +74,14 @@ install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ fi evolution-sharp.pub: $(top_srcdir)/evolution-sharp.pub Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- evolution-sharp.spec 4 Jan 2007 03:32:35 -0000 1.32 +++ evolution-sharp.spec 5 Jan 2007 15:17:46 -0000 1.33 @@ -2,7 +2,7 @@ Name: evolution-sharp Version: 0.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Evolution Data Server Mono Bindings @@ -17,6 +17,9 @@ Patch1: evolution-sharp-0.11.1-libdir.patch +# RH bug #221555 +Patch2: evolution-sharp-0.12.1-fix-assembly-dir.patch + ### Dependencies ### Requires: evolution-data-server @@ -46,6 +49,7 @@ %prep %setup -q %patch1 -p1 -b .libdir +%patch2 -p1 -b .fix-assembly-dir %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -68,8 +72,8 @@ %defattr(-,root,root,-) %doc COPYING README %{_libdir}/*.so -%{_prefix}/lib/mono/gac/evolution-sharp/ -%{_prefix}/lib/mono/evolution-sharp/evolution-sharp.dll +%{_libdir}/mono/gac/evolution-sharp/ +%{_libdir}/mono/evolution-sharp/evolution-sharp.dll %{_datadir}/gapi-2.0/ %files devel @@ -82,6 +86,10 @@ # sonames may need to be updated in evolution-sharp's configure.in. %changelog +* Fri Jan 05 2007 Matthew Barnes - 0.12.1-2.fc7 +- Add patch for RH bug #221555 (wrong install directory). +- Fix location of mono files to conform to packaging guidelines. + * Wed Jan 03 2007 Matthew Barnes - 0.12.1-1.fc7 - Update to 0.12.1 - Remove evolution-sharp-0.11.1-evo210.patch (fixed upstream). From fedora-cvs-commits at redhat.com Fri Jan 5 16:26:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 11:26:52 -0500 Subject: rpms/gnome-python2-extras/FC-6 gnome-python-extras.spec,1.63,1.64 Message-ID: <200701051626.l05GQq9o008136@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-extras/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8122 Modified Files: gnome-python-extras.spec Log Message: Try again. Index: gnome-python-extras.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-6/gnome-python-extras.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- gnome-python-extras.spec 5 Jan 2007 03:24:09 -0000 1.63 +++ gnome-python-extras.spec 5 Jan 2007 16:26:50 -0000 1.64 @@ -8,11 +8,6 @@ %define firefox_version 1.5.0.9 %define gtkspell_version 2.0.7 -# Require firefox = %{firefox_version} (not >=) to purposefully cause a -# dependency conflict when firefox is upgraded, since libgtkembedmoz.so -# lives in a versioned directory (/usr/lib/firefox-w.x.y.z/). This -# package needs to be rebuilt every time "w.x.y.z" changes. - ### Abstract ### Name: gnome-python2-extras @@ -36,7 +31,7 @@ ### Build Dependencies ### -BuildRequires: firefox-devel = %{firefox_version} +BuildRequires: firefox-devel >= %{firefox_version} BuildRequires: glib2 >= %{glib_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} BuildRequires: gnome-python2 >= %{gnome_python_version} @@ -87,6 +82,11 @@ Group: Development/Languages Requires: firefox = %{firefox_version} +# Require firefox = %{firefox_version} (not >=) to purposefully cause a +# dependency conflict when firefox is upgraded, since libgtkembedmoz.so +# lives in a versioned directory (/usr/lib/firefox-w.x.y.z/). This +# package needs to be rebuilt every time "w.x.y.z" changes. + %description -n gnome-python2-gtkmozembed This module contains a wrapper that allows the use of gtkmozembed via Python. @@ -142,7 +142,7 @@ %{_datadir}/gtk-doc/html/pygtkmozembed %changelog -* Thu Jan 04 2007 Matthew Barnes - 2.14.2-7 +* Thu Jan 05 2007 Matthew Barnes - 2.14.2-7 - Require firefox-1.5.0.9 exactly. This will introduce a dependency conflict the next time libgtkembedmoz.so changes location, to ensure this package gets rebuilt (RH bug #215163). From fedora-cvs-commits at redhat.com Fri Jan 5 16:41:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 11:41:14 -0500 Subject: rpms/glibc/FC-6 glibc-rh220420.patch, NONE, 1.1 glibc-rh220658.patch, NONE, 1.1 glibc-strtod.patch, 1.1, 1.2 glibc-strxfrm.patch, 1.5, 1.6 glibc.spec, 1.278, 1.279 Message-ID: <200701051641.l05GfEsI029046@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29002 Modified Files: glibc-strtod.patch glibc-strxfrm.patch glibc.spec Added Files: glibc-rh220420.patch glibc-rh220658.patch Log Message: 2.5-10.fc6 glibc-rh220420.patch: include/atomic.h | 6 ++++++ nptl/sysdeps/unix/sysv/linux/pthread_kill.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE glibc-rh220420.patch --- 2006-12-21 Ulrich Drepper * include/atomic.h (atomic_forced_read): New macro. nptl/ 2006-12-21 Jakub Jelinek * sysdeps/unix/sysv/linux/pthread_kill.c (pthread_kill): Make sure tid isn't reread from pd->tid in between ESRCH test and the syscall. --- libc/include/atomic.h 18 Oct 2006 19:02:53 -0000 1.20 +++ libc/include/atomic.h 21 Dec 2006 21:44:00 -0000 1.21 @@ -497,6 +497,12 @@ #endif +#ifndef atomic_forced_read +# define atomic_forced_read(x) \ + ({ __typeof (x) __x; __asm ("" : "=r" (__x) : "0" (x)); __x; }) +#endif + + #ifndef atomic_delay # define atomic_delay() do { /* nothing */ } while (0) #endif --- libc/nptl/sysdeps/unix/sysv/linux/pthread_kill.c 28 Sep 2004 22:22:37 -0000 1.12 +++ libc/nptl/sysdeps/unix/sysv/linux/pthread_kill.c 22 Dec 2006 00:35:21 -0000 1.14 @@ -33,7 +33,15 @@ __pthread_kill (threadid, signo) struct pthread *pd = (struct pthread *) threadid; /* Make sure the descriptor is valid. */ - if (INVALID_TD_P (pd)) + if (DEBUGGING_P && INVALID_TD_P (pd)) + /* Not a valid thread handle. */ + return ESRCH; + + /* Force load of pd->tid into local variable or register. Otherwise + if a thread exits between ESRCH test and tgkill, we might return + EINVAL, because pd->tid would be cleared by the kernel. */ + pid_t tid = atomic_forced_read (pd->tid); + if (__builtin_expect (tid <= 0, 0)) /* Not a valid thread handle. */ return ESRCH; @@ -53,15 +61,15 @@ __pthread_kill (threadid, signo) int val; #if __ASSUME_TGKILL val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid), - pd->tid, signo); + tid, signo); #else # ifdef __NR_tgkill val = INTERNAL_SYSCALL (tgkill, err, 3, THREAD_GETMEM (THREAD_SELF, pid), - pd->tid, signo); + tid, signo); if (INTERNAL_SYSCALL_ERROR_P (val, err) && INTERNAL_SYSCALL_ERRNO (val, err) == ENOSYS) # endif - val = INTERNAL_SYSCALL (tkill, err, 2, pd->tid, signo); + val = INTERNAL_SYSCALL (tkill, err, 2, tid, signo); #endif return (INTERNAL_SYSCALL_ERROR_P (val, err) glibc-rh220658.patch: compat-grp.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE glibc-rh220658.patch --- 2006-12-22 Gavin Romig-Koch * nis/nss_compat/compat-grp.c (internal_getgrgid_r): Don't blacklist the group till after we look it up. --- libc/nis/nss_compat/compat-grp.c 31 Jul 2006 23:33:04 -0000 1.32 +++ libc/nis/nss_compat/compat-grp.c 22 Dec 2006 20:26:11 -0000 1.33 @@ -580,13 +580,17 @@ internal_getgrgid_r (gid_t gid, struct g /* +group */ if (result->gr_name[0] == '+' && result->gr_name[1] != '\0') { + /* Yes, no +1, see the memcpy call below. */ + size_t len = strlen (result->gr_name); + char buf[len]; enum nss_status status; /* Store the group in the blacklist for the "+" at the end of /etc/group */ - blacklist_store_name (&result->gr_name[1], ent); + memcpy (buf, &result->gr_name[1], len); status = getgrnam_plusgroup (&result->gr_name[1], result, ent, buffer, buflen, errnop); + blacklist_store_name (buf, ent); if (status == NSS_STATUS_SUCCESS && result->gr_gid == gid) break; else glibc-strtod.patch: Makefile | 4 +++- strtod_l.c | 38 ++++++++++++++++++++------------------ tst-atof1.c | 19 +++++++++++++++++++ tst-atof2.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tst-strtod2.c | 25 +++++++++++++++++++++++++ tst-strtod3.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 177 insertions(+), 19 deletions(-) Index: glibc-strtod.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-6/glibc-strtod.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glibc-strtod.patch 19 Dec 2006 23:23:44 -0000 1.1 +++ glibc-strtod.patch 5 Jan 2007 16:41:11 -0000 1.2 @@ -1,3 +1,7 @@ +2007-01-03 Ulrich Drepper + + * stdlib/Makefile (tst-strtod3-ENV): Define. + 2006-12-11 Ulrich Drepper * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand @@ -133,6 +137,14 @@ include ../Makeconfig +@@ -113,6 +113,7 @@ include ../Rules + test-canon-ARGS = --test-dir=${common-objpfx}stdlib + + tst-strtod-ENV = LOCPATH=$(common-objpfx)localedata ++tst-strtod3-ENV = LOCPATH=$(common-objpfx)localedata + testmb2-ENV = LOCPATH=$(common-objpfx)localedata + + # Run a test on the header files we use. --- libc/stdlib/tst-atof1.c 1 Jan 1970 00:00:00 -0000 +++ libc/stdlib/tst-atof1.c 10 Dec 2006 09:54:35 -0000 1.1 @@ -0,0 +1,19 @@ glibc-strxfrm.patch: Makefile | 3 +- strxfrm_l.c | 8 +++-- tst-strxfrm2.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 4 deletions(-) Index: glibc-strxfrm.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-6/glibc-strxfrm.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- glibc-strxfrm.patch 19 Dec 2006 23:23:44 -0000 1.5 +++ glibc-strxfrm.patch 5 Jan 2007 16:41:11 -0000 1.6 @@ -1,3 +1,7 @@ +2007-01-03 Ulrich Drepper + + * string/Makefile (tst-strxfrm2-ENV): Define. + 2006-11-10 Jakub Jelinek * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization @@ -18,7 +22,7 @@ optimization even if needed > n. --- libc/string/Makefile 4 Jun 2006 16:35:25 -0000 1.69 -+++ libc/string/Makefile 9 Nov 2006 20:19:24 -0000 1.70 ++++ libc/string/Makefile 9 Nov 2006 20:19:24 -0000 1.71 @@ -54,7 +54,7 @@ tests := tester inl-tester noinl-tester bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \ tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \ @@ -28,6 +32,14 @@ distribute := memcopy.h pagecopy.h tst-svc.expect test-string.h +@@ -64,6 +64,7 @@ tester-ENV = LANGUAGE=C + inl-tester-ENV = LANGUAGE=C + noinl-tester-ENV = LANGUAGE=C + tst-strxfrm-ENV = LOCPATH=$(common-objpfx)localedata ++tst-strxfrm2-ENV = LOCPATH=$(common-objpfx)localedata + bug-strcoll1-ENV = LOCPATH=$(common-objpfx)localedata + CFLAGS-inl-tester.c = -fno-builtin + CFLAGS-noinl-tester.c = -fno-builtin --- libc/string/strxfrm_l.c 15 Oct 2005 20:49:18 -0000 1.5 +++ libc/string/strxfrm_l.c 10 Nov 2006 15:18:46 -0000 1.7 @@ -96,6 +97,7 @@ STRXFRM (STRING_TYPE *dest, const STRING Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-6/glibc.spec,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- glibc.spec 19 Dec 2006 23:23:44 -0000 1.278 +++ glibc.spec 5 Jan 2007 16:41:11 -0000 1.279 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-2.5-20061008T1257 %define glibc_release_tarballs 0 %define glibcversion 2.5 -%define glibcrelease 8%{?dist} +%define glibcrelease 10%{?dist} %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -70,6 +70,8 @@ Patch33: glibc-rh219107.patch Patch34: glibc-rh219145.patch Patch35: glibc-tst-pselect.patch +Patch36: glibc-rh220420.patch +Patch37: glibc-rh220658.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -315,6 +317,8 @@ %patch33 -p1 %patch34 -p1 %patch35 -p1 +%patch36 -p1 +%patch37 -p1 # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux @@ -1617,7 +1621,15 @@ %endif %changelog -* Tue Dec 19 2006 Jakub Jelinek 2.5-8.fc6 +* Fri Jan 5 2007 Jakub Jelinek 2.5-10.fc6 +- fix nss_compat +group handling (#220658) + +* Fri Dec 22 2006 Jakub Jelinek 2.5-9 +- make sure pthread_kill doesn't return EINVAL even if + the target thread exits in between pthread_kill ESRCH check + and the actual tgkill syscall (#220420) + +* Tue Dec 19 2006 Jakub Jelinek 2.5-8 - fix setcontext on ppc32 (#219107) - fix wide stdio after setvbuf (#217064, BZ#2337) - fix {j,m}rand48{,_r} on 64-bit arches (BZ#3747) From fedora-cvs-commits at redhat.com Fri Jan 5 17:25:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 12:25:26 -0500 Subject: rpms/cpuspeed/devel cpuspeed.conf, NONE, 1.1 cpuspeed.init, 1.21, 1.22 cpuspeed.spec, 1.46, 1.47 Message-ID: <200701051725.l05HPQke005755@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5333 Modified Files: cpuspeed.init cpuspeed.spec Added Files: cpuspeed.conf Log Message: - Fix status and condrestart for centrino/powernow-k8 (#219926) - Give feedback when loading/unloading a cpufreq governor - Rework config file and initscript to make it much easier for end-users to adjust frequency scaling setup - Log start/stop events with useful info - Don't start on xen kernels (freq scaling not supported) --- NEW FILE cpuspeed.conf --- # /etc/cpuspeed.conf # # This configuration file controls the behavior of both the # cpuspeed daemon and various cpufreq modules. ### DRIVER ### # Your CPUFreq driver module # Note that many drivers are now built-in, rather than built as modules, # so its usually best not to specify one. # default value: empty (auto-detect/use built-in) DRIVER= ### GOVERNOR ### # Which scaling governor to use # Valid scaling governors for your cpu(s) can be found in # /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors # on systems that support frequency scaling. # NOTES: # - The GOVERNOR parameter is only valid on centrino and powernow-k8 (amd64) # platforms, other platforms that support frequency scaling always use # the 'userspace' governor. # - Using the 'userspace' governor will trigger the cpuspeed daemon to run, # which provides said user-space frequency scaling. # default value: empty (defaults to ondemand) GOVERNOR= ### FREQUENCIES ### # NOTE: valid max/min frequencies for your cpu(s) can be found in # /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_frequencies # on systems that support frequency scaling. # maximum speed to scale up to # default value: empty (use cpu reported maximum) MAX_SPEED= # minimum speed to scale down to # default value: empty (use cpu reported minimum) MIN_SPEED= ### SCALING THRESHOLDS ### # Busy percentage threshold over which to scale up to max frequency # default value: empty (use governor default) UP_THRESHOLD= # Busy percentage threshold under which to scale frequency down # default value: empty (use governor default) DOWN_THRESHOLD= ### NICE PROCESS HANDLING ### # Let background (nice) processes speed up the cpu # default value: 0 (background process usage can speed up cpu) # alternate value: 1 (background processes will be ignored) IGNORE_NICE=0 ##################################################### ########## HISTORICAL CPUSPEED CONFIG BITS ########## ##################################################### VMAJOR=1 VMINOR=1 # Add your favorite options here #OPTS="$OPTS -s 0 -i 10 -r" # uncomment and modify this to check the state of the AC adapter #OPTS="$OPTS -a /proc/acpi/ac_adapter/*/state" # uncomment and modify this to check the system temperature #OPTS="$OPTS -t /proc/acpi/thermal_zone/*/temperature 75" Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- cpuspeed.init 5 Jan 2007 06:05:06 -0000 1.21 +++ cpuspeed.init 5 Jan 2007 17:25:24 -0000 1.22 @@ -63,6 +63,32 @@ start_cpuspeed() { echo -n $"Starting $prog: " + # cpuspeed daemon thresholds are specified as idle percentages, + # cpufreq modules as busy percentages, so we need to do some + # math here for use of unified config... + # DOWN_THRESHOLD doesn't mean exactly the same thing for + # cpuspeed as it does for the cpufreq governors, but close + # enough, and if not specified, we use the daemon defaults. + if [ -n "$UP_THRESHOLD" ]; then + UP_THRESHOLD=10 + else + let UP_THRESHOLD=100-$UP_THRESHOLD + fi + if [ -n "$DOWN_THRESHOLD" ]; then + DOWN_THRESHOLD=25 + else + let DOWN_THRESHOLD=100-$DOWN_THRESHOLD + fi + OPTS="$OPTS -p $UP_THRESHOLD $DOWN_THRESHOLD" + if [ -n "$MIN_SPEED" ]; then + OPTS="$OPTS -m $MIN_SPEED" + fi + if [ -n "$MAX_SPEED" ]; then + OPTS="$OPTS -M $MAX_SPEED" + fi + if [ $IGNORE_NICE -eq 0 ]; then + OPTS="$OPTS -n" + fi daemon cpuspeed -d $OPTS RETVAL=$? return $RETVAL @@ -126,12 +152,12 @@ /sbin/modprobe cpufreq-${governor} fi adjust_cpufreq scaling_governor ${governor} - if [ -n "$MAX_SPEED" ]; then - adjust_cpufreq scaling_max_freq $MAX_SPEED - fi if [ -n "$MIN_SPEED" ]; then adjust_cpufreq scaling_min_freq $MIN_SPEED fi + if [ -n "$MAX_SPEED" ]; then + adjust_cpufreq scaling_max_freq $MAX_SPEED + fi if [ -n "$UP_THRESHOLD" -a ${governor} == "ondemand" ]; then adjust_cpufreq ondemand/up_threshold $UP_THRESHOLD fi @@ -198,7 +224,7 @@ esac echo - [ -n "$DRIVER" ] && governor_module_loaded && /sbin/modprobe -r $DRIVER + [ -n "$DRIVER" ] && /sbin/modprobe -r $DRIVER [ $RETVAL = 0 ] && RETVAL=$? [ $RETVAL = 0 ] && rm -f $lockfile return $RETVAL Index: cpuspeed.spec =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- cpuspeed.spec 14 Dec 2006 22:40:33 -0000 1.46 +++ cpuspeed.spec 5 Jan 2007 17:25:24 -0000 1.47 @@ -9,6 +9,7 @@ Source0: http://carlthompson.net/dl/cpuspeed/cpuspeed-%{version}.tar.gz Source1: cpuspeed.init Source2: http://carlthompson.net/dl/cpuspeed/license.txt +Source3: cpuspeed.conf Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -49,7 +50,7 @@ %install install cpuspeed %{buildroot}%{_sbindir} install %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/cpuspeed -install cpuspeed.conf %{buildroot}%{_sysconfdir} +install %{SOURCE3} %{buildroot}%{_sysconfdir} chmod -R a-s %{buildroot} @@ -77,6 +78,14 @@ exit 0 %changelog +* Fri Jan 05 2007 Jarod Wilson +- Fix status and condrestart for centrino/powernow-k8 (#219926) +- Give feedback when loading/unloading a cpufreq governor +- Rework config file and initscript to make it much easier + for end-users to adjust frequency scaling setup +- Log start/stop events with useful info +- Don't start on xen kernels (freq scaling not supported) + * Thu Dec 14 2006 Jarod Wilson - Set lock file for centrino/powernow-k8 so status indicates we do have scaling working From fedora-cvs-commits at redhat.com Fri Jan 5 17:30:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 12:30:43 -0500 Subject: rpms/foomatic/FC-6 .cvsignore, 1.43, 1.44 foomatic.spec, 1.147, 1.148 sources, 1.43, 1.44 Message-ID: <200701051730.l05HUh9k009850@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9785 Modified Files: .cvsignore foomatic.spec sources Log Message: * Fri Jan 5 2007 Tim Waugh 3.0.2-39.3 - Updated db to 3.0-20070105 (bug #214037, bug #191661, bug #198999, bug #191504, bug #187387, bug #188762, bug #170373, bug #221121, bug #214801). - Resolves: rhbz#214037 rhbz#191661 rhbz#198999 rhbz#191504 rhbz#187387 rhbz#188762 rhbz#170373 rhbz#221121 rhbz#214801 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-6/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 1 Dec 2006 13:45:56 -0000 1.43 +++ .cvsignore 5 Jan 2007 17:30:40 -0000 1.44 @@ -34,3 +34,4 @@ foomatic-db-hpijs-20061031.tar.gz foomatic-db-engine-3.0-20061109.tar.gz foomatic-db-3.0-20061130.tar.gz +foomatic-db-3.0-20070105.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- foomatic.spec 1 Dec 2006 13:45:56 -0000 1.147 +++ foomatic.spec 5 Jan 2007 17:30:40 -0000 1.148 @@ -1,4 +1,4 @@ -%define dbver 20061130 +%define dbver 20070105 %define enginever 3.0-20061109 %define filtersver 20051209 %define hpijsver 20061031 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 39.2%{?dist} +Release: 39.3%{?dist} License: GPL Group: System Environment/Libraries @@ -279,6 +279,11 @@ %{_var}/cache/foomatic %changelog +* Fri Jan 5 2007 Tim Waugh 3.0.2-39.3 +- Updated db to 3.0-20070105 (bug #214037, bug #191661, bug #198999, + bug #191504, bug #187387, bug #188762, bug #170373, bug #221121, + bug #214801). + * Fri Dec 1 2006 Tim Waugh 3.0.2-39.2 - Updated db to 3.0-20061130. Index: sources =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-6/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 1 Dec 2006 13:45:56 -0000 1.43 +++ sources 5 Jan 2007 17:30:40 -0000 1.44 @@ -3,4 +3,4 @@ 5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz 480ab4a4148667dad1ffc188b6480bce foomatic-db-hpijs-20061031.tar.gz 562703c7da605a4c89ac476a3bf7955b foomatic-db-engine-3.0-20061109.tar.gz -331cc5406cda3796b1bb5f130ff8114a foomatic-db-3.0-20061130.tar.gz +ba04156e056a1df600decaa0501af371 foomatic-db-3.0-20070105.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 5 17:40:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 12:40:09 -0500 Subject: rpms/foomatic/devel .cvsignore, 1.44, 1.45 foomatic.spec, 1.148, 1.149 sources, 1.44, 1.45 Message-ID: <200701051740.l05He9rl006848@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6832 Modified Files: .cvsignore foomatic.spec sources Log Message: * Fri Jan 5 2007 Tim Waugh 3.0.2-43 - Updated db to 3.0-20070105 (bug #214037, bug #191661, bug #198999, bug #191504, bug #187387, bug #188762, bug #170373, bug #221121, bug #214801). - Resolves: rhbz#214037 rhbz#191661 rhbz#198999 rhbz#191504 rhbz#187387 rhbz#188762 rhbz#170373 rhbz#221121 rhbz#214801 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 30 Nov 2006 18:20:48 -0000 1.44 +++ .cvsignore 5 Jan 2007 17:40:07 -0000 1.45 @@ -38,3 +38,4 @@ foomatic-db-hpijs-20061031.tar.gz foomatic-db-engine-3.0-20061109.tar.gz foomatic-db-3.0-20061130.tar.gz +foomatic-db-3.0-20070105.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- foomatic.spec 30 Nov 2006 18:20:49 -0000 1.148 +++ foomatic.spec 5 Jan 2007 17:40:07 -0000 1.149 @@ -1,4 +1,4 @@ -%define dbver 20061130 +%define dbver 20070105 %define enginever 3.0-20061109 %define filtersver 20051209 %define hpijsver 20061031 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 42%{?dist} +Release: 43%{?dist} License: GPL Group: System Environment/Libraries @@ -279,6 +279,11 @@ %{_var}/cache/foomatic %changelog +* Fri Jan 5 2007 Tim Waugh 3.0.2-43 +- Updated db to 3.0-20070105 (bug #214037, bug #191661, bug #198999, + bug #191504, bug #187387, bug #188762, bug #170373, bug #221121, + bug #214801). + * Thu Nov 30 2006 Tim Waugh 3.0.2-42 - Updated db to 3.0-20061130. Index: sources =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 30 Nov 2006 18:20:49 -0000 1.44 +++ sources 5 Jan 2007 17:40:07 -0000 1.45 @@ -3,4 +3,4 @@ 5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz 480ab4a4148667dad1ffc188b6480bce foomatic-db-hpijs-20061031.tar.gz 562703c7da605a4c89ac476a3bf7955b foomatic-db-engine-3.0-20061109.tar.gz -331cc5406cda3796b1bb5f130ff8114a foomatic-db-3.0-20061130.tar.gz +ba04156e056a1df600decaa0501af371 foomatic-db-3.0-20070105.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 5 17:47:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 12:47:39 -0500 Subject: rpms/kexec-tools/devel kexec-tools-1.101-relocatable-bzimage.patch, NONE, 1.1 kexec-tools-1.101-reloc-update.patch, 1.1, 1.2 kexec-tools.spec, 1.67, 1.68 Message-ID: <200701051747.l05HldD5027417@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27399 Modified Files: kexec-tools-1.101-reloc-update.patch kexec-tools.spec Added Files: kexec-tools-1.101-relocatable-bzimage.patch Log Message: Related: bz221272 kexec-tools-1.101-relocatable-bzimage.patch: include/x86/x86-linux.h | 10 +++++-- kexec/arch/i386/crashdump-x86.c | 7 +++-- kexec/arch/i386/kexec-bzImage.c | 53 +++++++++++++++++++++++++++++++++++++- kexec/arch/i386/x86-linux-setup.c | 3 ++ kexec/kexec.h | 7 +++++ 5 files changed, 75 insertions(+), 5 deletions(-) --- NEW FILE kexec-tools-1.101-relocatable-bzimage.patch --- --- kexec-tools-1.101/include/x86/x86-linux.h.orig 2004-12-20 05:10:21.000000000 -0500 +++ kexec-tools-1.101/include/x86/x86-linux.h 2007-01-05 11:05:30.000000000 -0500 @@ -141,7 +141,10 @@ struct x86_linux_param_header { uint32_t high_filesz; /* 0x254 */ uint8_t reserved15[0x2d0 - 0x258]; /* 0x258 */ #else - uint8_t reserved15[0x2d0 - 0x230]; /* 0x230 */ + /* 2.04+ */ + uint32_t kernel_alignment; /* 0x230 */ + uint8_t relocatable_kernel; /* 0x234 */ + uint8_t reserved15[0x2d0 - 0x235]; /* 0x230 */ #endif struct e820entry e820_map[E820MAX]; /* 0x2d0 */ /* 0x550 */ @@ -201,12 +204,15 @@ struct x86_linux_header { uint32_t high_filesz; /* 0x254 */ uint32_t tail[32*1024 - 0x258]; /* 0x258 */ #else - uint8_t tail[32*1024 - 0x230]; /* 0x230 */ + uint32_t kernel_alignment; /* 0x230 */ + uint8_t relocatable_kernel; /* 0x234 */ + uint8_t tail[32*1024 - 0x235]; /* 0x230 */ #endif } PACKED; #endif /* ASSEMBLY */ #define DEFAULT_INITRD_ADDR_MAX 0x37FFFFFF +#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF #endif /* X86_LINUX_H */ --- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig 2007-01-05 11:05:11.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-01-05 11:05:30.000000000 -0500 @@ -680,7 +680,9 @@ int load_crashdump_segments(struct kexec tmp = xmalloc(sz); memset(tmp, 0, sz); info->backup_start = add_buffer(info, tmp, sz, sz, align, - 0, max_addr, 1); + 0, max_addr, -1); + dfprintf(stdout, "Created backup segment at 0x%lx\n", + info->backup_start); if (delete_memmap(memmap_p, info->backup_start, sz) < 0) return -1; @@ -719,7 +721,8 @@ int load_crashdump_segments(struct kexec * This is a makeshift solution until it is fixed in kernel. */ elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base, - max_addr, 1); + max_addr, -1); + dfprintf(stdout, "Created elf header segment at 0x%lx\n", elfcorehdr); if (delete_memmap(memmap_p, elfcorehdr, sz) < 0) return -1; cmdline_add_memmap(mod_cmdline, memmap_p); --- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c.orig 2007-01-05 11:05:11.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2007-01-05 11:05:30.000000000 -0500 @@ -59,6 +59,7 @@ void setup_linux_bootloader_parameters( initrd_addr_max = DEFAULT_INITRD_ADDR_MAX; if (real_mode->protocol_version >= 0x0203) { initrd_addr_max = real_mode->initrd_addr_max; + dfprintf(stdout, "initrd_addr_max is 0x%lx\n", initrd_addr_max); } /* Load the initrd if we have one */ @@ -66,6 +67,8 @@ void setup_linux_bootloader_parameters( initrd_base = add_buffer(info, initrd_buf, initrd_size, initrd_size, 4096, INITRD_BASE, initrd_addr_max, -1); + dfprintf(stdout, "Loaded initrd at 0x%lx size 0x%lx\n", + initrd_base, initrd_size); } else { initrd_base = 0; initrd_size = 0; --- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 11:05:11.000000000 -0500 +++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 11:07:04.000000000 -0500 @@ -34,8 +34,10 @@ #include #include "../../kexec.h" #include "../../kexec-elf.h" +#include "../../kexec-syscall.h" #include "kexec-x86.h" #include "x86-linux-setup.h" +#include "crashdump-x86.h" #include static const int probe_debug = 0; @@ -109,6 +111,7 @@ int do_bzImage_load(struct kexec_info *i unsigned long setup_base, setup_size; struct entry32_regs regs32; struct entry16_regs regs16; + char *modified_cmdline; /* * Find out about the file I am about to load. @@ -128,6 +131,45 @@ int do_bzImage_load(struct kexec_info *i return -1; } + /* Can't use bzImage for crash dump purposes with real mode entry */ + if((info->kexec_flags & KEXEC_ON_CRASH) && real_mode_entry) { + fprintf(stderr, "Can't use bzImage for crash dump purposes" + " with real mode entry\n"); + return -1; + } + + if((info->kexec_flags & KEXEC_ON_CRASH) && !relocatable_kernel) { + fprintf(stderr, "BzImage is not relocatable. Can't be used" + " as capture kernel.\n"); + return -1; + } + + /* Need to append some command line parameters internally in case of + * taking crash dumps. + */ + if (info->kexec_flags & KEXEC_ON_CRASH) { + modified_cmdline = xmalloc(COMMAND_LINE_SIZE); + memset((void *)modified_cmdline, 0, COMMAND_LINE_SIZE); + if (command_line) { + strncpy(modified_cmdline, command_line, + COMMAND_LINE_SIZE); + modified_cmdline[COMMAND_LINE_SIZE - 1] = '\0'; + } + + /* If panic kernel is being loaded, additional segments need + * to be created. load_crashdump_segments will take care of + * loading the segments as high in memory as possible, hence + * in turn as away as possible from kernel to avoid being + * stomped by the kernel. + */ + if (load_crashdump_segments(info, modified_cmdline, -1, 0) < 0) + return -1; + + /* Use new command line buffer */ + command_line = modified_cmdline; + command_line_len = strlen(command_line) +1; + } + /* Load the trampoline. This must load at a higher address * the the argument/parameter segment or the kernel will stomp * it's gdt. @@ -139,7 +181,16 @@ int do_bzImage_load(struct kexec_info *i setup_size = kern16_size + command_line_len; real_mode = xmalloc(setup_size); memcpy(real_mode, kernel, kern16_size); - if (real_mode->protocol_version >= 0x0200) { + + if (info->kexec_flags & KEXEC_ON_CRASH) { + /* If using bzImage for capture kernel, then we will not be + * executing real mode code. setup segment can be loaded + * anywhere as we will be just reading command line. + */ + setup_base = add_buffer(info, real_mode, setup_size, setup_size, + 16, 0x3000, -1, 1); + } + else if (real_mode->protocol_version >= 0x0200) { /* Careful setup_base must be greater than 8K */ setup_base = add_buffer(info, real_mode, setup_size, setup_size, 16, 0x3000, 640*1024, -1); --- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 11:05:11.000000000 -0500 +++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 11:05:30.000000000 -0500 @@ -197,4 +197,11 @@ int arch_compat_trampoline(struct kexec_ void arch_update_purgatory(struct kexec_info *info); #define MAX_LINE 160 + +#ifdef DEBUG +#define dfprintf(args...) do {fprintf(args);} while(0) +#else +#define dfprintf(args...) do { } while(0) +#endif + #endif /* KEXEC_H */ kexec-tools-1.101-reloc-update.patch: kexec/Makefile | 1 kexec/arch/i386/kexec-bzImage.c | 2 kexec/arch/i386/kexec-elf-x86.c | 6 kexec/arch/i386/kexec-multiboot-x86.c | 5 kexec/arch/ia64/kexec-elf-ia64.c | 6 kexec/arch/ppc/kexec-elf-ppc.c | 4 kexec/arch/ppc64/kexec-elf-ppc64.c | 6 kexec/arch/x86_64/crashdump-x86_64.c | 190 ++++++++++++++++++++++++++--- kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 2 kexec/arch/x86_64/kexec-elf-x86_64.c | 6 kexec/arch/x86_64/kexec-x86_64.c | 4 kexec/crashdump.h | 2 kexec/kexec-elf-core.c | 29 ++++ kexec/kexec-elf-exec.c | 9 - kexec/kexec-elf-rel.c | 9 - kexec/kexec-elf.c | 27 ++-- kexec/kexec-elf.h | 17 +- kexec/kexec.c | 44 ++++++ kexec/kexec.h | 4 purgatory/arch/i386/entry32-16-debug.S | 20 +-- purgatory/arch/i386/include/arch/debug.h | 2 purgatory/arch/i386/linux-entry16.S | 44 +++--- purgatory/arch/x86_64/include/arch/debug.h | 2 23 files changed, 345 insertions(+), 96 deletions(-) Index: kexec-tools-1.101-reloc-update.patch =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-reloc-update.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kexec-tools-1.101-reloc-update.patch 15 Dec 2006 21:05:01 -0000 1.1 +++ kexec-tools-1.101-reloc-update.patch 5 Jan 2007 17:47:37 -0000 1.2 @@ -1,5 +1,16 @@ +--- kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h.orig 2004-12-20 18:05:40.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2007-01-05 12:45:07.000000000 -0500 +@@ -311,7 +311,7 @@ + TTYS0_TX_AL + + +-#define DEBUG(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') ++#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') + #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') + #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') + --- kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S.orig 2004-12-20 05:48:45.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2006-12-01 15:05:42.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2007-01-05 12:45:07.000000000 -0500 @@ -127,10 +127,10 @@ TTYS0_TX_AL @@ -32,7 +43,7 @@ /* Note we don't disable the a20 line, (this shouldn't be required) * The code to do it is in kexec_test and it is a real pain. * I will worry about that when I need it. -@@ -164,26 +164,26 @@ +@@ -164,26 +164,26 @@ DEBUG('c') movl %eax, %fs movl %eax, %gs @@ -63,7 +74,7 @@ /* we are in real mode now * set up the real mode segment registers : %ds, $ss, %es */ -@@ -191,7 +191,7 @@ +@@ -191,7 +191,7 @@ DEBUG('g') movw %cs, %ax movw %ax, %ds @@ -72,7 +83,7 @@ /* Load the registers */ movl eax - entry16, %eax movl ebx - entry16, %ebx -@@ -386,10 +386,10 @@ +@@ -386,10 +386,10 @@ gdt_end: TTYS0_TX_AL @@ -85,7 +96,7 @@ #define DEBUG_TX_HEX32(x) #endif -@@ -403,7 +403,7 @@ +@@ -403,7 +403,7 @@ setup16_debug_start: _reloc = . .balign 16 .code32 @@ -94,7 +105,7 @@ /* Compute where I am running at */ call 1f 1: popl %ebx -@@ -412,13 +412,13 @@ +@@ -412,13 +412,13 @@ DEBUG('a') /* Remember where I am running at */ movl %ebx, location - _reloc(%ebx) @@ -110,7 +121,7 @@ /* Fixup the gdt */ movl %ebx, %eax shll $16, %eax -@@ -440,7 +440,7 @@ +@@ -440,7 +440,7 @@ DEBUG('c') @@ -119,7 +130,7 @@ /* Setup the classic BIOS interrupt table at 0x0 */ lidt idtptr - _reloc(%ebx) -@@ -465,20 +465,20 @@ +@@ -465,20 +465,20 @@ DEBUG('d') ljmp $0x08, $2f - _reloc 2: .code16 @@ -143,7 +154,7 @@ /* we are in real mode now * set up the real mode segment registers : %ds, $ss, %es */ -@@ -486,7 +486,7 @@ +@@ -486,7 +486,7 @@ DEBUG('g') movw %cs, %ax movw %ax, %ds @@ -152,7 +163,7 @@ /* Load the registers */ movl eax - _reloc, %eax movl ebx - _reloc, %ebx -@@ -600,7 +600,7 @@ +@@ -600,7 +600,7 @@ debug_gdt_end: setup16_debug_kernel_pre_protected: .code16 @@ -161,7 +172,7 @@ cli # no interrupts allowed ! movb $0x80, %al # disable NMI for bootup # sequence -@@ -611,7 +611,7 @@ +@@ -611,7 +611,7 @@ setup16_debug_first_code32: .byte 0xbf /* movl $0x12345678, %edi */ location: .long 0x12345678 @@ -170,19 +181,9 @@ .byte 0xb8 /* movl $0x10000, %eax */ setup16_debug_old_code32: .long 0x10000 ---- kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h.orig 2004-12-20 18:03:17.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2006-12-01 15:05:42.000000000 -0500 -@@ -311,6 +311,6 @@ - TTYS0_TX_AL - - --#define DEBUG(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') -+#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') - #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') - #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') --- kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S.orig 2004-12-20 18:11:43.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2006-12-01 15:05:42.000000000 -0500 -@@ -55,15 +55,15 @@ ++++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2007-01-05 12:45:07.000000000 -0500 +@@ -55,15 +55,15 @@ entry16_debug: orl %ecx, 0x14 + gdt @@ -201,7 +202,7 @@ /* Note we don't disable the a20 line, (this shouldn't be required) * The code to do it is in kexec_test and it is a real pain. * I will worry about that when I need it. -@@ -77,26 +77,26 @@ +@@ -77,26 +77,26 @@ DEBUG('c') movl %eax, %fs movl %eax, %gs @@ -232,7 +233,7 @@ /* we are in real mode now * set up the real mode segment registers : %ds, $ss, %es */ -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ DEBUG('g') movw %cs, %ax movw %ax, %ds @@ -241,7 +242,7 @@ /* Load the registers */ movl eax - entry16_debug, %eax movl ebx - entry16_debug, %ebx -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ gdt_end: .text entry16_debug_pre32: .code16 @@ -250,7 +251,7 @@ cli # no interrupts allowed ! movb $0x80, %al # disable NMI for bootup # sequence -@@ -186,7 +186,7 @@ +@@ -186,7 +186,7 @@ DEBUG('i') entry16_debug_first32: .code32 @@ -259,9 +260,9 @@ .byte 0xb8 /* movl $0x10000, %eax */ entry16_debug_old_first32: .long 0x100000 ---- kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h.orig 2004-12-20 18:05:40.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2006-12-01 15:05:42.000000000 -0500 -@@ -311,7 +311,7 @@ +--- kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h.orig 2004-12-20 18:03:17.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2007-01-05 12:45:07.000000000 -0500 +@@ -311,6 +311,6 @@ TTYS0_TX_AL @@ -269,30 +270,9 @@ +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') - ---- kexec-tools-1.101/kexec/kexec.h.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec.h 2006-12-01 15:05:42.000000000 -0500 -@@ -116,6 +116,9 @@ - struct mem_ehdr rhdr; - unsigned long backup_start; - unsigned long kexec_flags; -+ unsigned long kern_vaddr_start; -+ unsigned long kern_paddr_start; -+ unsigned long kern_size; - }; - - void usage(void); -@@ -177,6 +180,7 @@ - extern void *xmalloc(size_t size); - extern void *xrealloc(void *ptr, size_t size); - extern char *slurp_file(const char *filename, off_t *r_size); -+extern char *slurp_file_len(const char *filename, off_t size); - extern char *slurp_decompress_file(const char *filename, off_t *r_size); - extern void add_segment(struct kexec_info *info, - const void *buf, size_t bufsz, unsigned long base, size_t memsz); ---- kexec-tools-1.101/kexec/Makefile.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/Makefile 2006-12-01 15:05:42.000000000 -0500 -@@ -13,6 +13,7 @@ +--- kexec-tools-1.101/kexec/Makefile.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/Makefile 2007-01-05 12:45:07.000000000 -0500 +@@ -13,6 +13,7 @@ KEXEC_C_SRCS:= kexec/kexec.c KEXEC_C_SRCS+= kexec/ifdown.c KEXEC_C_SRCS+= kexec/kexec-elf.c KEXEC_C_SRCS+= kexec/kexec-elf-exec.c @@ -300,228 +280,156 @@ KEXEC_C_SRCS+= kexec/kexec-elf-rel.c KEXEC_C_SRCS+= kexec/kexec-elf-boot.c KEXEC_C_SRCS+= kexec/crashdump.c ---- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2006-12-01 15:05:42.000000000 -0500 -@@ -11,11 +11,12 @@ - - static const int probe_debug = 0; +--- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2007-01-05 12:45:07.000000000 -0500 +@@ -135,10 +135,11 @@ static struct mem_rela elf_rela(struct m + return rela; + } --int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr) -+int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr, +-int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr) ++int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr, + uint32_t flags) { - struct mem_phdr *phdr, *end_phdr; int result; - result = build_elf_info(buf, len, ehdr); + result = build_elf_info(buf, len, ehdr, flags); if (result < 0) { return result; } -@@ -136,11 +137,11 @@ - } +@@ -412,12 +413,12 @@ int elf_rel_load(struct mem_ehdr *ehdr, - void elf_exec_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, -- const char *buf, off_t len) -+ const char *buf, off_t len, uint32_t flags) + void elf_rel_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, + const char *buf, off_t len, unsigned long min, unsigned long max, +- int end) ++ int end, uint32_t flags) { int result; + /* Parse the Elf file */ -- result = build_elf_exec_info(buf, len, ehdr); -+ result = build_elf_exec_info(buf, len, ehdr, flags); +- result = build_elf_rel_info((char *)purgatory, purgatory_size, ehdr); ++ result = build_elf_rel_info(buf, len, ehdr, flags); if (result < 0) { - die("ELF exec parse failed\n"); + die("ELF rel parse failed\n"); } ---- kexec-tools-1.101/kexec/kexec.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec.c 2006-12-01 15:05:42.000000000 -0500 -@@ -391,6 +391,50 @@ - return buf; +--- kexec-tools-1.101/kexec/kexec-elf.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf.c 2007-01-05 12:45:07.000000000 -0500 +@@ -368,7 +368,8 @@ static int build_mem_elf64_phdr(const ch + return 0; } -+/* This functions reads either specified number of bytes from the file or -+ lesser if EOF is met. */ -+ -+char *slurp_file_len(const char *filename, off_t size) -+{ -+ int fd; -+ char *buf; -+ off_t progress; -+ ssize_t result; -+ -+ if (!filename) -+ return 0; -+ fd = open(filename, O_RDONLY); -+ if (fd < 0) { -+ fprintf(stderr, "Cannot open %s: %s\n", filename, -+ strerror(errno)); -+ return 0; -+ } -+ buf = xmalloc(size); -+ progress = 0; -+ while(progress < size) { -+ result = read(fd, buf + progress, size - progress); -+ if (result < 0) { -+ if ((errno == EINTR) || (errno == EAGAIN)) -+ continue; -+ fprintf(stderr, "read on %s of %ld bytes failed: %s\n", -+ filename, (size - progress)+ 0UL, -+ strerror(errno)); -+ free(buf); -+ return 0; -+ } -+ if (result == 0) -+ /* EOF */ -+ break; -+ progress += result; -+ } -+ result = close(fd); -+ if (result < 0) { -+ die("Close of %s failed: %s\n", -+ filename, strerror(errno)); -+ } -+ return buf; -+} -+ - #if HAVE_ZLIB_H - char *slurp_decompress_file(const char *filename, off_t *r_size) +-static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr) ++static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr, ++ uint32_t flags) { ---- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2006-12-01 15:05:42.000000000 -0500 -@@ -133,7 +133,7 @@ - * it's gdt. - */ - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, -- 0x3000, 640*1024, -1); -+ 0x3000, 640*1024, -1, 0); + size_t phdr_size, mem_phdr_size; + int i; +@@ -418,9 +419,11 @@ static int build_mem_phdrs(const char *b - /* The argument/parameter segment */ - setup_size = kern16_size + command_line_len; ---- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2006-12-01 15:05:42.000000000 -0500 -@@ -209,10 +209,11 @@ + /* Check the program headers to be certain + * they are safe to use. ++ * Skip the check if ELF_SKIP_FILESZ_CHECK is set. + */ + phdr = &ehdr->e_phdr[i]; +- if ((phdr->p_offset + phdr->p_filesz) > len) { ++ if (!(flags & ELF_SKIP_FILESZ_CHECK) ++ && (phdr->p_offset + phdr->p_filesz) > len) { + /* The segment does not fit in the buffer */ + if (probe_debug) { + fprintf(stderr, "ELF segment not in file\n"); +@@ -580,7 +583,8 @@ static int build_mem_elf64_shdr(const ch + return 0; + } - - /* Load the ELF executable */ -- elf_exec_build_load(info, &ehdr, buf, len); -+ elf_exec_build_load(info, &ehdr, buf, len, 0); +-static int build_mem_shdrs(const char *buf, off_t len, struct mem_ehdr *ehdr) ++static int build_mem_shdrs(const char *buf, off_t len, struct mem_ehdr *ehdr, ++ uint32_t flags) + { + size_t shdr_size, mem_shdr_size; + int i; +@@ -628,11 +632,12 @@ static int build_mem_shdrs(const char *b + } + /* Check the section headers to be certain + * they are safe to use. ++ * Skip the check if ELF_SKIP_FILESZ_CHECK is set. + */ + shdr = &ehdr->e_shdr[i]; +- if ((shdr->sh_type != SHT_NOBITS) && +- ((shdr->sh_offset + shdr->sh_size) > len)) +- { ++ if (!(flags & ELF_SKIP_FILESZ_CHECK) ++ && (shdr->sh_type != SHT_NOBITS) ++ && (shdr->sh_offset + shdr->sh_size) > len) { + /* The section does not fit in the buffer */ + if (probe_debug) { + fprintf(stderr, "ELF section %d not in file\n", +@@ -710,7 +715,8 @@ static int build_mem_notes(const char *b + note_size += (hdr.n_descsz + 3) & ~3; - /* Load the setup code */ -- elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0, ULONG_MAX, 1); -+ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0, -+ ULONG_MAX, 1, 0); - - /* The first segment will contain the multiboot headers: - * ============= ---- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2006-12-01 15:05:42.000000000 -0500 -@@ -47,7 +47,7 @@ - - struct mem_ehdr ehdr; + if ((hdr.n_namesz != 0) && (name[hdr.n_namesz -1] != '\0')) { +- die("Note name is not null termiated"); ++ fprintf(stderr, "Note name is not null termiated\n"); ++ return -1; + } + ehdr->e_note[i].n_type = hdr.n_type; + ehdr->e_note[i].n_name = (char *)name; +@@ -729,7 +735,8 @@ void free_elf_info(struct mem_ehdr *ehdr + memset(ehdr, 0, sizeof(*ehdr)); + } + +-int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr) ++int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr, ++ uint32_t flags) + { int result; -- result = build_elf_exec_info(buf, len, &ehdr); -+ result = build_elf_exec_info(buf, len, &ehdr, 0); - if (result < 0) { - if (probe_debug) { - fprintf(stderr, "Not an ELF executable\n"); -@@ -177,7 +177,7 @@ + result = build_mem_ehdr(buf, len, ehdr); +@@ -737,14 +744,14 @@ int build_elf_info(const char *buf, off_ + return result; } - - /* Load the ELF executable */ -- elf_exec_build_load(info, &ehdr, buf, len); -+ elf_exec_build_load(info, &ehdr, buf, len, 0); - - entry = ehdr.e_entry; - max_addr = elf_max_addr(&ehdr); -@@ -186,7 +186,7 @@ - if (arg_style != ARG_STYLE_NONE) { - /* Load the setup code */ - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, -- 0, ULONG_MAX, 1); -+ 0, ULONG_MAX, 1, 0); + if ((ehdr->e_phoff > 0) && (ehdr->e_phnum > 0)) { +- result = build_mem_phdrs(buf, len, ehdr); ++ result = build_mem_phdrs(buf, len, ehdr, flags); + if (result < 0) { + free_elf_info(ehdr); + return result; + } } - if (arg_style == ARG_STYLE_NONE) { - info->entry = (void *)entry; ---- kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c.orig 2005-01-20 14:10:56.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2006-12-01 15:05:42.000000000 -0500 -@@ -72,7 +72,7 @@ - + if ((ehdr->e_shoff > 0) && (ehdr->e_shnum > 0)) { +- result = build_mem_shdrs(buf, len, ehdr); ++ result = build_mem_shdrs(buf, len, ehdr, flags); + if (result < 0) { + free_elf_info(ehdr); + return result; +--- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2007-01-05 12:45:07.000000000 -0500 +@@ -56,7 +56,7 @@ int elf_ia64_probe(const char *buf, off_ + { struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { - goto out; - } -@@ -180,7 +180,7 @@ + if (probe_debug) { + fprintf(stderr, "Not an ELF executable\n"); +@@ -163,7 +163,7 @@ int elf_ia64_load(int argc, char **argv, } /* Parse the Elf file */ - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { + fprintf(stderr, "ELF parse failed\n"); free_elf_info(&ehdr); - return result; ---- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2006-12-01 15:05:42.000000000 -0500 -@@ -64,7 +64,7 @@ - continue; - str = line + consumed; - end = end + 1; --#if 0 -+#ifdef DEBUG - printf("%016Lx-%016Lx : %s", - start, end, str); - #endif -@@ -104,7 +104,7 @@ - memory_range[memory_ranges].start = start; - memory_range[memory_ranges].end = end; - memory_range[memory_ranges].type = type; --#if 0 -+#ifdef DEBUG - printf("%016Lx-%016Lx : %x\n", - start, end, type); - #endif ---- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2006-12-01 15:05:42.000000000 -0500 -@@ -47,7 +47,7 @@ - - struct mem_ehdr ehdr; - int result; -- result = build_elf_exec_info(buf, len, &ehdr); -+ result = build_elf_exec_info(buf, len, &ehdr, 0); - if (result < 0) { - if (probe_debug) { - fprintf(stderr, "Not an ELF executable\n"); -@@ -177,7 +177,7 @@ - } +@@ -198,7 +198,7 @@ int elf_ia64_load(int argc, char **argv, - /* Load the ELF executable */ -- elf_exec_build_load(info, &ehdr, buf, len); -+ elf_exec_build_load(info, &ehdr, buf, len, 0); + /* Load the setup code */ + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, +- 0x0, ULONG_MAX, -1); ++ 0x0, ULONG_MAX, -1, 0); - entry = ehdr.e_entry; - max_addr = elf_max_addr(&ehdr); -@@ -186,7 +186,7 @@ - if (arg_style != ARG_STYLE_NONE) { - /* Load the setup code */ - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, -- 0, ULONG_MAX, 1); -+ 0, ULONG_MAX, 1, 0); - } - if (arg_style == ARG_STYLE_NONE) { - info->entry = (void *)entry; ---- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c.orig 2004-12-21 12:51:24.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2006-12-01 15:05:42.000000000 -0500 -@@ -60,7 +60,7 @@ - void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, - void *location, unsigned long address, unsigned long value) - { --#if 0 -+#ifdef DEBUG - fprintf(stderr, "%s\n", reloc_name(r_type)); - #endif - switch(r_type) { ---- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2006-12-01 15:05:42.000000000 -0500 + + if (load_crashdump_segments(info, &ehdr, max_addr, 0, +--- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2007-01-05 12:45:07.000000000 -0500 @@ -24,8 +24,10 @@ #include #include @@ -533,7 +441,7 @@ #include #include "../../kexec.h" #include "../../kexec-elf.h" -@@ -40,6 +42,137 @@ +@@ -40,6 +42,137 @@ extern struct arch_options_t arch_option /* Forward Declaration. */ static int exclude_crash_reserve_region(int *nr_ranges); @@ -671,7 +579,7 @@ /* Stores a sorted list of RAM memory ranges for which to create elf headers. * A separate program header is created for backup region */ static struct memory_range crash_memory_range[CRASH_MAX_MEMORY_RANGES]; -@@ -245,7 +378,7 @@ +@@ -245,7 +378,7 @@ static int add_memmap(struct memory_rang memmap_p[j+1] = memmap_p[j]; memmap_p[tidx].start = addr; memmap_p[tidx].end = addr + size - 1; @@ -680,7 +588,7 @@ printf("Memmap after adding segment\n"); for (i = 0; i < CRASH_MAX_MEMMAP_NR; i++) { mstart = memmap_p[i].start; -@@ -330,7 +463,7 @@ +@@ -330,7 +463,7 @@ static int delete_memmap(struct memory_r memmap_p[j-1] = memmap_p[j]; memmap_p[j-1].start = memmap_p[j-1].end = 0; } @@ -689,7 +597,7 @@ printf("Memmap after deleting segment\n"); for (i = 0; i < CRASH_MAX_MEMMAP_NR; i++) { mstart = memmap_p[i].start; -@@ -404,7 +537,7 @@ +@@ -404,7 +537,7 @@ static int cmdline_add_memmap(char *cmdl die("Command line overflow\n"); strcat(cmdline, str_mmap); } @@ -698,7 +606,7 @@ printf("Command line after adding memmap\n"); printf("%s\n", cmdline); #endif -@@ -432,7 +565,7 @@ +@@ -432,7 +565,7 @@ static int cmdline_add_elfcorehdr(char * if (cmdlen > (COMMAND_LINE_SIZE - 1)) die("Command line overflow\n"); strcat(cmdline, str); @@ -707,7 +615,7 @@ printf("Command line after adding elfcorehdr\n"); printf("%s\n", cmdline); #endif -@@ -465,7 +598,7 @@ +@@ -465,7 +598,7 @@ static int cmdline_add_memmap_acpi(char die("Command line overflow\n"); strcat(cmdline, str_mmap); @@ -716,7 +624,7 @@ printf("Command line after adding acpi memmap\n"); printf("%s\n", cmdline); #endif -@@ -536,6 +669,27 @@ +@@ -536,6 +669,27 @@ static int prepare_crash_memory_elf64_he (elf->e_phnum)++; } @@ -744,7 +652,7 @@ /* Setup PT_LOAD type program header for every system RAM chunk. * A seprate program header for Backup Region*/ for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) { -@@ -555,21 +709,13 @@ +@@ -555,21 +709,13 @@ static int prepare_crash_memory_elf64_he else phdr->p_offset = mstart; @@ -771,7 +679,7 @@ phdr->p_filesz = phdr->p_memsz = mend - mstart + 1; /* Do we need any alignment of segments? */ phdr->p_align = 0; -@@ -593,6 +739,12 @@ +@@ -593,6 +739,12 @@ int load_crashdump_segments(struct kexec long int nr_cpus = 0; struct memory_range *mem_range, *memmap_p; @@ -784,7 +692,7 @@ if (get_crash_memory_ranges(&mem_range, &nr_ranges) < 0) return -1; -@@ -638,7 +790,7 @@ +@@ -638,7 +790,7 @@ int load_crashdump_segments(struct kexec * This is a makeshift solution until it is fixed in kernel. */ elfcorehdr = add_buffer(info, tmp, sz, 16*1024, align, min_base, @@ -793,10 +701,21 @@ if (delete_memmap(memmap_p, elfcorehdr, sz) < 0) return -1; cmdline_add_memmap(mod_cmdline, memmap_p); ---- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2006-12-01 15:05:42.000000000 -0500 -@@ -56,7 +56,7 @@ +--- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c.orig 2004-12-21 12:51:24.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +@@ -60,7 +60,7 @@ static const char *reloc_name(unsigned l + void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, + void *location, unsigned long address, unsigned long value) { +-#if 0 ++#ifdef DEBUG + fprintf(stderr, "%s\n", reloc_name(r_type)); + #endif + switch(r_type) { +--- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +@@ -47,7 +47,7 @@ int elf_x86_64_probe(const char *buf, of + struct mem_ehdr ehdr; int result; - result = build_elf_exec_info(buf, len, &ehdr); @@ -804,27 +723,123 @@ if (result < 0) { if (probe_debug) { fprintf(stderr, "Not an ELF executable\n"); -@@ -163,7 +163,7 @@ +@@ -177,7 +177,7 @@ int elf_x86_64_load(int argc, char **arg } - /* Parse the Elf file */ + /* Load the ELF executable */ +- elf_exec_build_load(info, &ehdr, buf, len); ++ elf_exec_build_load(info, &ehdr, buf, len, 0); + + entry = ehdr.e_entry; + max_addr = elf_max_addr(&ehdr); +@@ -186,7 +186,7 @@ int elf_x86_64_load(int argc, char **arg + if (arg_style != ARG_STYLE_NONE) { + /* Load the setup code */ + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, +- 0, ULONG_MAX, 1); ++ 0, ULONG_MAX, 1, 0); + } + if (arg_style == ARG_STYLE_NONE) { + info->entry = (void *)entry; +--- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +@@ -64,7 +64,7 @@ int get_memory_ranges(struct memory_rang + continue; + str = line + consumed; + end = end + 1; +-#if 0 ++#ifdef DEBUG + printf("%016Lx-%016Lx : %s", + start, end, str); + #endif +@@ -104,7 +104,7 @@ int get_memory_ranges(struct memory_rang + memory_range[memory_ranges].start = start; + memory_range[memory_ranges].end = end; + memory_range[memory_ranges].type = type; +-#if 0 ++#ifdef DEBUG + printf("%016Lx-%016Lx : %x\n", + start, end, type); + #endif +--- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2007-01-05 12:45:07.000000000 -0500 +@@ -47,7 +47,7 @@ int elf_x86_probe(const char *buf, off_t + + struct mem_ehdr ehdr; + int result; - result = build_elf_exec_info(buf, len, &ehdr); + result = build_elf_exec_info(buf, len, &ehdr, 0); if (result < 0) { - fprintf(stderr, "ELF parse failed\n"); - free_elf_info(&ehdr); -@@ -198,7 +198,7 @@ + if (probe_debug) { + fprintf(stderr, "Not an ELF executable\n"); +@@ -177,7 +177,7 @@ int elf_x86_load(int argc, char **argv, + } + + /* Load the ELF executable */ +- elf_exec_build_load(info, &ehdr, buf, len); ++ elf_exec_build_load(info, &ehdr, buf, len, 0); + + entry = ehdr.e_entry; + max_addr = elf_max_addr(&ehdr); +@@ -186,7 +186,7 @@ int elf_x86_load(int argc, char **argv, + if (arg_style != ARG_STYLE_NONE) { + /* Load the setup code */ + elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, +- 0, ULONG_MAX, 1); ++ 0, ULONG_MAX, 1, 0); + } + if (arg_style == ARG_STYLE_NONE) { + info->entry = (void *)entry; +--- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-01-05 12:45:07.000000000 -0500 +@@ -209,10 +209,11 @@ int multiboot_x86_load(int argc, char ** + + + /* Load the ELF executable */ +- elf_exec_build_load(info, &ehdr, buf, len); ++ elf_exec_build_load(info, &ehdr, buf, len, 0); /* Load the setup code */ +- elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0, ULONG_MAX, 1); ++ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, 0, ++ ULONG_MAX, 1, 0); + + /* The first segment will contain the multiboot headers: + * ============= +--- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 12:45:07.000000000 -0500 +@@ -175,7 +175,7 @@ int do_bzImage_load(struct kexec_info *i + * it's gdt. + */ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, -- 0x0, ULONG_MAX, -1); -+ 0x0, ULONG_MAX, -1, 0); +- 0x3000, 640*1024, -1); ++ 0x3000, 640*1024, -1, 0); + /* The argument/parameter segment */ + setup_size = kern16_size + command_line_len; +--- kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c.orig 2005-01-20 14:10:56.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2007-01-05 12:45:07.000000000 -0500 +@@ -72,7 +72,7 @@ int elf_ppc_probe(const char *buf, off_t - if (load_crashdump_segments(info, &ehdr, max_addr, 0, ---- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2006-12-01 15:05:42.000000000 -0500 -@@ -52,7 +52,7 @@ + struct mem_ehdr ehdr; + int result; +- result = build_elf_exec_info(buf, len, &ehdr); ++ result = build_elf_exec_info(buf, len, &ehdr, 0); + if (result < 0) { + goto out; + } +@@ -180,7 +180,7 @@ int elf_ppc_load(int argc, char **argv, + } + + /* Parse the Elf file */ +- result = build_elf_exec_info(buf, len, &ehdr); ++ result = build_elf_exec_info(buf, len, &ehdr, 0); + if (result < 0) { + free_elf_info(&ehdr); + return result; +--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-01-05 12:45:07.000000000 -0500 +@@ -52,7 +52,7 @@ int elf_ppc64_probe(const char *buf, off { struct mem_ehdr ehdr; int result; @@ -833,7 +848,7 @@ if (result < 0) { goto out; } -@@ -163,7 +163,7 @@ +@@ -163,7 +163,7 @@ int elf_ppc64_load(int argc, char **argv } /* Parse the Elf file */ @@ -842,7 +857,7 @@ if (result < 0) { free_elf_info(&ehdr); return result; -@@ -213,7 +213,7 @@ +@@ -213,7 +213,7 @@ int elf_ppc64_load(int argc, char **argv memcpy(seg_buf, purgatory, purgatory_size); seg_size = purgatory_size; elf_rel_build_load(info, &info->rhdr, (const char *)purgatory, @@ -851,39 +866,8 @@ /* Add a ram-disk to the current image * Note: Add the ramdisk after elf_rel_build_load ---- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2006-12-01 15:05:42.000000000 -0500 -@@ -135,10 +135,11 @@ - return rela; - } - --int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr) -+int build_elf_rel_info(const char *buf, off_t len, struct mem_ehdr *ehdr, -+ uint32_t flags) - { - int result; -- result = build_elf_info(buf, len, ehdr); -+ result = build_elf_info(buf, len, ehdr, flags); - if (result < 0) { - return result; - } -@@ -412,12 +413,12 @@ - - void elf_rel_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, - const char *buf, off_t len, unsigned long min, unsigned long max, -- int end) -+ int end, uint32_t flags) - { - int result; - - /* Parse the Elf file */ -- result = build_elf_rel_info((char *)purgatory, purgatory_size, ehdr); -+ result = build_elf_rel_info(buf, len, ehdr, flags); - if (result < 0) { - die("ELF rel parse failed\n"); - } ---- /dev/null 2006-11-22 10:18:18.589138000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf-core.c 2006-12-01 15:05:42.000000000 -0500 +--- /dev/null 2006-12-27 08:05:56.458406418 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf-core.c 2007-01-05 12:45:07.000000000 -0500 @@ -0,0 +1,29 @@ +#include +#include @@ -914,107 +898,9 @@ + + return 0; +} ---- kexec-tools-1.101/kexec/crashdump.h.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/crashdump.h 2006-12-01 15:05:42.000000000 -0500 -@@ -5,5 +5,7 @@ - - /* Need to find a better way to determine per cpu notes section size. */ - #define MAX_NOTE_BYTES 1024 -+/* Expecting ELF headers to fit in 4K. Increase it if you need more. */ -+#define KCORE_ELF_HEADERS_SIZE 4096 - - #endif /* CRASHDUMP_H */ ---- kexec-tools-1.101/kexec/kexec-elf.c.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf.c 2006-12-01 15:05:42.000000000 -0500 -@@ -368,7 +368,8 @@ - return 0; - } - --static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr) -+static int build_mem_phdrs(const char *buf, off_t len, struct mem_ehdr *ehdr, -+ uint32_t flags) - { - size_t phdr_size, mem_phdr_size; - int i; -@@ -418,9 +419,11 @@ - - /* Check the program headers to be certain - * they are safe to use. -+ * Skip the check if ELF_SKIP_FILESZ_CHECK is set. - */ - phdr = &ehdr->e_phdr[i]; -- if ((phdr->p_offset + phdr->p_filesz) > len) { -+ if (!(flags & ELF_SKIP_FILESZ_CHECK) -+ && (phdr->p_offset + phdr->p_filesz) > len) { - /* The segment does not fit in the buffer */ - if (probe_debug) { - fprintf(stderr, "ELF segment not in file\n"); -@@ -580,7 +583,8 @@ - return 0; - } - --static int build_mem_shdrs(const char *buf, off_t len, struct mem_ehdr *ehdr) -+static int build_mem_shdrs(const char *buf, off_t len, struct mem_ehdr *ehdr, -+ uint32_t flags) - { - size_t shdr_size, mem_shdr_size; - int i; -@@ -628,11 +632,12 @@ - } - /* Check the section headers to be certain - * they are safe to use. -+ * Skip the check if ELF_SKIP_FILESZ_CHECK is set. - */ - shdr = &ehdr->e_shdr[i]; -- if ((shdr->sh_type != SHT_NOBITS) && -- ((shdr->sh_offset + shdr->sh_size) > len)) -- { -+ if (!(flags & ELF_SKIP_FILESZ_CHECK) -+ && (shdr->sh_type != SHT_NOBITS) -+ && (shdr->sh_offset + shdr->sh_size) > len) { - /* The section does not fit in the buffer */ - if (probe_debug) { - fprintf(stderr, "ELF section %d not in file\n", -@@ -710,7 +715,8 @@ - note_size += (hdr.n_descsz + 3) & ~3; - - if ((hdr.n_namesz != 0) && (name[hdr.n_namesz -1] != '\0')) { -- die("Note name is not null termiated"); -+ fprintf(stderr, "Note name is not null termiated\n"); -+ return -1; - } - ehdr->e_note[i].n_type = hdr.n_type; - ehdr->e_note[i].n_name = (char *)name; -@@ -729,7 +735,8 @@ - memset(ehdr, 0, sizeof(*ehdr)); - } - --int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr) -+int build_elf_info(const char *buf, off_t len, struct mem_ehdr *ehdr, -+ uint32_t flags) - { - int result; - result = build_mem_ehdr(buf, len, ehdr); -@@ -737,14 +744,14 @@ - return result; - } - if ((ehdr->e_phoff > 0) && (ehdr->e_phnum > 0)) { -- result = build_mem_phdrs(buf, len, ehdr); -+ result = build_mem_phdrs(buf, len, ehdr, flags); - if (result < 0) { - free_elf_info(ehdr); - return result; - } - } - if ((ehdr->e_shoff > 0) && (ehdr->e_shnum > 0)) { -- result = build_mem_shdrs(buf, len, ehdr); -+ result = build_mem_shdrs(buf, len, ehdr, flags); - if (result < 0) { - free_elf_info(ehdr); - return result; ---- kexec-tools-1.101/kexec/kexec-elf.h.orig 2006-12-01 15:05:05.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf.h 2006-12-01 15:05:42.000000000 -0500 -@@ -82,22 +82,29 @@ +--- kexec-tools-1.101/kexec/kexec-elf.h.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf.h 2007-01-05 12:45:07.000000000 -0500 +@@ -82,22 +82,29 @@ typedef struct uint32_t n_type; /* Type of the note. */ } ElfNN_Nhdr; @@ -1049,3 +935,117 @@ extern int elf_rel_find_symbol(struct mem_ehdr *ehdr, const char *name, struct mem_sym *ret_sym); +--- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2007-01-05 12:45:07.000000000 -0500 +@@ -11,11 +11,12 @@ + + static const int probe_debug = 0; + +-int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr) ++int build_elf_exec_info(const char *buf, off_t len, struct mem_ehdr *ehdr, ++ uint32_t flags) + { + struct mem_phdr *phdr, *end_phdr; + int result; +- result = build_elf_info(buf, len, ehdr); ++ result = build_elf_info(buf, len, ehdr, flags); + if (result < 0) { + return result; + } +@@ -136,11 +137,11 @@ int elf_exec_load(struct mem_ehdr *ehdr, + } + + void elf_exec_build_load(struct kexec_info *info, struct mem_ehdr *ehdr, +- const char *buf, off_t len) ++ const char *buf, off_t len, uint32_t flags) + { + int result; + /* Parse the Elf file */ +- result = build_elf_exec_info(buf, len, ehdr); ++ result = build_elf_exec_info(buf, len, ehdr, flags); + if (result < 0) { + die("ELF exec parse failed\n"); + } +--- kexec-tools-1.101/kexec/crashdump.h.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/crashdump.h 2007-01-05 12:45:07.000000000 -0500 +@@ -5,5 +5,7 @@ extern int get_crash_notes_per_cpu(int c + + /* Need to find a better way to determine per cpu notes section size. */ + #define MAX_NOTE_BYTES 1024 ++/* Expecting ELF headers to fit in 4K. Increase it if you need more. */ ++#define KCORE_ELF_HEADERS_SIZE 4096 + + #endif /* CRASHDUMP_H */ +--- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 12:45:07.000000000 -0500 +@@ -116,6 +116,9 @@ struct kexec_info { + struct mem_ehdr rhdr; + unsigned long backup_start; + unsigned long kexec_flags; ++ unsigned long kern_vaddr_start; ++ unsigned long kern_paddr_start; ++ unsigned long kern_size; + }; + + void usage(void); +@@ -177,6 +180,7 @@ extern void die(char *fmt, ...); + extern void *xmalloc(size_t size); + extern void *xrealloc(void *ptr, size_t size); + extern char *slurp_file(const char *filename, off_t *r_size); ++extern char *slurp_file_len(const char *filename, off_t size); + extern char *slurp_decompress_file(const char *filename, off_t *r_size); + extern void add_segment(struct kexec_info *info, + const void *buf, size_t bufsz, unsigned long base, size_t memsz); +--- kexec-tools-1.101/kexec/kexec.c.orig 2007-01-05 11:15:00.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec.c 2007-01-05 12:45:07.000000000 -0500 +@@ -391,6 +391,50 @@ char *slurp_file(const char *filename, o + return buf; + } + ++/* This functions reads either specified number of bytes from the file or ++ lesser if EOF is met. */ ++ ++char *slurp_file_len(const char *filename, off_t size) ++{ ++ int fd; ++ char *buf; ++ off_t progress; ++ ssize_t result; ++ ++ if (!filename) ++ return 0; ++ fd = open(filename, O_RDONLY); ++ if (fd < 0) { ++ fprintf(stderr, "Cannot open %s: %s\n", filename, ++ strerror(errno)); ++ return 0; ++ } ++ buf = xmalloc(size); ++ progress = 0; ++ while(progress < size) { ++ result = read(fd, buf + progress, size - progress); ++ if (result < 0) { ++ if ((errno == EINTR) || (errno == EAGAIN)) ++ continue; ++ fprintf(stderr, "read on %s of %ld bytes failed: %s\n", ++ filename, (size - progress)+ 0UL, ++ strerror(errno)); ++ free(buf); ++ return 0; ++ } ++ if (result == 0) ++ /* EOF */ ++ break; ++ progress += result; ++ } ++ result = close(fd); ++ if (result < 0) { ++ die("Close of %s failed: %s\n", ++ filename, strerror(errno)); ++ } ++ return buf; ++} ++ + #if HAVE_ZLIB_H + char *slurp_decompress_file(const char *filename, off_t *r_size) + { Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- kexec-tools.spec 4 Jan 2007 19:19:31 -0000 1.67 +++ kexec-tools.spec 5 Jan 2007 17:47:37 -0000 1.68 @@ -31,6 +31,7 @@ Patch1: kexec-tools-1.101-kdump.patch Patch2: kexec-tools-1.101-elf-core-type.patch Patch3: kexec-tools-1.101-bzimage-options.patch +Patch4: kexec-tools-1.101-relocatable-bzimage.patch # # Patches 101 through 200 are meant for x86_64 kexec-tools enablement @@ -94,6 +95,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch101 -p1 %patch102 -p1 %patch201 -p1 From fedora-cvs-commits at redhat.com Fri Jan 5 17:54:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 12:54:24 -0500 Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.97, 1.98 libselinux.spec, 1.237, 1.238 Message-ID: <200701051754.l05HsNJn027601@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27585 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Fri Jan 5 2007 Dan Walsh - 1.33.3-2 - Add securetty handling Resolves: #200110 libselinux-rhat.patch: include/selinux/selinux.h | 5 ++ man/man3/selinux_binary_policy_path.3 | 4 ++ man/man3/selinux_check_securetty_context.3 | 13 +++++++ man/man3/selinux_securetty_context_path.3 | 1 src/file_path_suffixes.h | 1 src/selinux_check_securetty_context.c | 49 +++++++++++++++++++++++++++++ src/selinux_config.c | 9 ++++- src/selinux_internal.h | 2 + utils/selinux_check_securetty_context.c | 40 +++++++++++++++++++++++ 9 files changed, 122 insertions(+), 2 deletions(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- libselinux-rhat.patch 6 Dec 2006 19:13:54 -0000 1.97 +++ libselinux-rhat.patch 5 Jan 2007 17:54:21 -0000 1.98 @@ -1,64 +1,223 @@ -Binary files nsalibselinux/utils/matchpathcon and libselinux-1.33.2/utils/matchpathcon differ -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.33.2/utils/matchpathcon.c ---- nsalibselinux/utils/matchpathcon.c 2006-11-16 17:15:17.000000000 -0500 -+++ libselinux-1.33.2/utils/matchpathcon.c 2006-12-06 14:11:29.000000000 -0500 -@@ -4,20 +4,23 @@ - #include - #include - #include -+#include -+#include -+#include - #include +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.33.3/include/selinux/selinux.h +--- nsalibselinux/include/selinux/selinux.h 2006-11-16 17:15:18.000000000 -0500 ++++ libselinux-1.33.3/include/selinux/selinux.h 2007-01-05 11:57:44.000000000 -0500 +@@ -406,6 +406,7 @@ + extern const char *selinux_homedir_context_path(void); + extern const char *selinux_media_context_path(void); + extern const char *selinux_contexts_path(void); ++ extern const char *selinux_securetty_context_path(void); + extern const char *selinux_booleans_path(void); + extern const char *selinux_customizable_types_path(void); + extern const char *selinux_users_path(void); +@@ -413,12 +414,14 @@ + extern const char *selinux_translations_path(void); + extern const char *selinux_netfilter_context_path(void); + extern const char *selinux_path(void); +- + /* Check a permission in the passwd class. + Return 0 if granted or -1 otherwise. */ + extern int selinux_check_passwd_access(access_vector_t requested); + extern int checkPasswdAccess(access_vector_t requested); - void usage(const char *progname) - { - fprintf(stderr, -- "usage: %s [-n] [-f file_contexts] [-p prefix] path...\n", -+ "usage: %s [-N] [-n] [-f file_contexts] [-p prefix] [-V] path...\n", - progname); - exit(1); - } ++/* Check if the tty_context is defined as a securetty ++ Return 1 if secure, 0 if not, or -1 if otherwise. */ ++ extern int selinux_check_securetty_context(security_context_t tty_context); + /* Set the path to the selinuxfs mount point explicitly. + Normally, this is determined automatically during libselinux + initialization, but this is not always possible, e.g. for /sbin/init +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 +--- nsalibselinux/man/man3/selinux_binary_policy_path.3 2006-11-16 17:15:30.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 2007-01-05 11:57:44.000000000 -0500 +@@ -27,6 +27,8 @@ + .br + extern const char *selinux_media_context_path(void); + .br ++extern const char *selinux_securetty_context_path(void); ++.br + extern const char *selinux_contexts_path(void); + .br + extern const char *selinux_booleans_path(void); +@@ -56,6 +58,8 @@ + .sp + selinux_contexts_path() - directory containing all of the context configuration files + .sp ++selinux_securetty_context_path() - defines terminal contexts for securetty ++.sp + selinux_booleans_path() - initial policy boolean settings --int printmatchpathcon(char *path, int header) -+int printmatchpathcon(char *path, int header, int mode) + .SH AUTHOR +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_check_securetty_context.3 libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 +--- nsalibselinux/man/man3/selinux_check_securetty_context.3 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1,13 @@ ++.TH "selinux_check_securetty_context" "3" "1 January 2007" "dwalsh at redhat.com" "SE Linux API documentation" ++.SH "NAME" ++selinux_check_securetty_context \- check whether a tty security context is defined as a securetty context ++.SH "SYNOPSIS" ++.B #include ++.sp ++.BI "int selinux_check_securetty_context(security_context_t "tty_context ); ++ ++.SH "DESCRIPTION" ++.B selinux_check_securetty_context ++returns 1 if tty_context is a securetty context ++returns 0 if tty_context is a not a securetty context ++returns -1 on error. +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_securetty_context_path.3 libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 +--- nsalibselinux/man/man3/selinux_securetty_context_path.3 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1 @@ ++.so man3/selinux_binary_policy_path.3 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-1.33.3/src/file_path_suffixes.h +--- nsalibselinux/src/file_path_suffixes.h 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.33.3/src/file_path_suffixes.h 2007-01-05 11:57:44.000000000 -0500 +@@ -7,6 +7,7 @@ + S_(USER_CONTEXTS, "/contexts/users/") + S_(FAILSAFE_CONTEXT, "/contexts/failsafe_context") + S_(DEFAULT_TYPE, "/contexts/default_type") ++ S_(SECURETTY_CONTEXTS, "/contexts/securetty_contexts") + S_(BOOLEANS, "/booleans") + S_(MEDIA_CONTEXTS, "/contexts/files/media") + S_(REMOVABLE_CONTEXT, "/contexts/removable_context") +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_check_securetty_context.c libselinux-1.33.3/src/selinux_check_securetty_context.c +--- nsalibselinux/src/selinux_check_securetty_context.c 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_check_securetty_context.c 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1,49 @@ ++#include ++#include ++#include ++#include ++#include ++#include "selinux_internal.h" ++#include "context_internal.h" ++ ++int selinux_check_securetty_context(security_context_t tty_context) ++{ ++ char buf[250]; ++ char *ptr = "", *end; ++ size_t len; ++ int found = -1; ++ FILE *fp; ++ fp = fopen(selinux_securetty_context_path(), "r"); ++ if (fp) { ++ context_t con =context_new(tty_context); ++ if (con) { ++ char *type=context_type_get(con); ++ found = 0; ++ len = strlen(type); ++ while (!feof_unlocked(fp)) { ++ if (!fgets_unlocked(buf, sizeof buf, fp)) ++ break; ++ ++ if (buf[strlen(buf) - 1]) ++ buf[strlen(buf) - 1] = 0; ++ ++ ptr = buf; ++ while (*ptr && isspace(*ptr)) ++ ptr++; ++ if (!(*ptr)) ++ continue; ++ ++ if (!strncmp(type, ptr, len)) { ++ found = 1; ++ break; ++ } ++ } ++ context_free(con); ++ } ++ fclose(fp); ++ } ++ ++ return found; ++} ++ ++hidden_def(selinux_check_securetty_context) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.33.3/src/selinux_config.c +--- nsalibselinux/src/selinux_config.c 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_config.c 2007-01-05 11:57:44.000000000 -0500 +@@ -38,7 +38,8 @@ + #define NETFILTER_CONTEXTS 15 + #define FILE_CONTEXTS_HOMEDIR 16 + #define FILE_CONTEXTS_LOCAL 17 +-#define NEL 18 ++#define SECURETTY_CONTEXTS 18 ++#define NEL 19 + + /* New layout is relative to SELINUXDIR/policytype. */ + static char *file_paths[NEL]; +@@ -299,6 +300,12 @@ + + hidden_def(selinux_default_context_path) + ++const char *selinux_securetty_context_path() ++{ ++ return get_path(SECURETTY_CONTEXTS); ++} ++hidden_def(selinux_securetty_context_path) ++ + const char *selinux_failsafe_context_path() { - char *buf; -- int rc = matchpathcon(path, 0, &buf); -+ int rc = matchpathcon(path, mode, &buf); - if (rc < 0) { - fprintf(stderr, "matchpathcon(%s) failed: %s\n", path, - strerror(errno)); -@@ -92,6 +95,11 @@ - } - } - for (i = optind; i < argc; i++) { -+ int mode=0; -+ struct stat buf; -+ if (lstat(argv[i], &buf) == 0) -+ mode = buf.st_mode; -+ - if (verify) { - if (selinux_file_context_verify(argv[i], 0)) { - printf("%s verified.\n", argv[i]); -@@ -106,17 +114,17 @@ - if (rc >= 0) { - printf("%s has context %s, should be ", - argv[i], con); -- error += printmatchpathcon(argv[i], 0); -+ error += printmatchpathcon(argv[i], 0, mode); - freecon(con); - } else { - printf - ("actual context unknown: %s, should be ", - strerror(errno)); -- error += printmatchpathcon(argv[i], 0); -+ error += printmatchpathcon(argv[i], 0,mode); - } - } - } else { -- error += printmatchpathcon(argv[i], header); -+ error += printmatchpathcon(argv[i], header, mode); - } - } - matchpathcon_fini(); + return get_path(FAILSAFE_CONTEXT); +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.33.3/src/selinux_internal.h +--- nsalibselinux/src/selinux_internal.h 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_internal.h 2007-01-05 11:57:44.000000000 -0500 +@@ -53,6 +53,7 @@ + hidden_proto(security_setenforce) + hidden_proto(selinux_binary_policy_path) + hidden_proto(selinux_default_context_path) ++ hidden_proto(selinux_securetty_context_path) + hidden_proto(selinux_failsafe_context_path) + hidden_proto(selinux_removable_context_path) + hidden_proto(selinux_file_context_path) +@@ -66,6 +67,7 @@ + hidden_proto(selinux_media_context_path) + hidden_proto(selinux_path) + hidden_proto(selinux_check_passwd_access) ++ hidden_proto(selinux_check_securetty_context) + hidden_proto(matchpathcon_init_prefix) + hidden_proto(selinux_users_path) + hidden_proto(selinux_usersconf_path); +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/selinux_check_securetty_context.c libselinux-1.33.3/utils/selinux_check_securetty_context.c +--- nsalibselinux/utils/selinux_check_securetty_context.c 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/utils/selinux_check_securetty_context.c 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1,40 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++void usage(const char *progname) ++{ ++ fprintf(stderr, ++ "usage: %s tty_context...\n", ++ progname); ++ exit(1); ++} ++ ++int main(int argc, char **argv) ++{ ++ int i; ++ if (argc < 2) ++ usage(argv[0]); ++ ++ for (i = 1; i < argc; i++) { ++ switch (selinux_check_securetty_context(argv[i])) { ++ case 1: ++ printf("%s securetty.\n", argv[i]); ++ break; ++ case 0: ++ printf("%s not securetty.\n", argv[i]); ++ break; ++ case -1: ++ perror("Failed on check if securetty"); ++ return -1; ++ } ++ } ++ return 0; ++} Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- libselinux.spec 4 Jan 2007 22:09:55 -0000 1.237 +++ libselinux.spec 5 Jan 2007 17:54:21 -0000 1.238 @@ -2,10 +2,11 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 1.33.3 -Release: 1%{?dist} +Release: 2%{?dist} 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} swig Requires: libsepol >= %{libsepolver} setransd @@ -48,6 +49,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -78,6 +80,7 @@ rm -f %{buildroot}%{_sbindir}/selinuxconfig rm -f %{buildroot}%{_sbindir}/selinuxdisable rm -f %{buildroot}%{_sbindir}/getseuser +rm -f %{buildroot}%{_sbindir}/selinux_check_securetty_context %clean rm -rf %{buildroot} @@ -117,6 +120,10 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Fri Jan 5 2007 Dan Walsh - 1.33.3-2 +- Add securetty handling +Resolves: #200110 + * Thu Jan 4 2007 Dan Walsh - 1.33.3-1 - Upgrade to upstream * Merged patch for matchpathcon utility to use file mode information From fedora-cvs-commits at redhat.com Fri Jan 5 18:07:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 13:07:21 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2904.2.1, 1.2904.2.2 netlabel-lock.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200701051807.l05I7LqE028007@cvs.devel.redhat.com> Author: eparis Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27990 Modified Files: Tag: private-BZ220966-branch kernel-2.6.spec netlabel-lock.patch Log Message: update netlabel locking Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2904.2.1 retrieving revision 1.2904.2.2 diff -u -r1.2904.2.1 -r1.2904.2.2 --- kernel-2.6.spec 4 Jan 2007 00:22:48 -0000 1.2904.2.1 +++ kernel-2.6.spec 5 Jan 2007 18:07:18 -0000 1.2904.2.2 @@ -32,7 +32,7 @@ %define sublevel 19 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.BZ220966.TESTING.ONLY +%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist}.2.BZ220966.TESTING.ONLY %define make_target bzImage %define kernel_image x86 netlabel-lock.patch: services.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) Index: netlabel-lock.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/netlabel-lock.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- netlabel-lock.patch 4 Jan 2007 00:22:48 -0000 1.1.2.1 +++ netlabel-lock.patch 5 Jan 2007 18:07:19 -0000 1.1.2.2 @@ -1,28 +1,30 @@ -[PATCH] selinux: fix selinux_netlbl_inode_permission() locking - do not call a sleeping lock API in an RCU read section. lock_sock_nested can sleep, its BH counterpart doesn't. selinux_netlbl_inode_permission() needs to use the BH counterpart unconditionally. -Compile tested. - -From: Ingo Molnar - added BH disabling, because this function can be called from non-atomic contexts too, so a naked bh_lock_sock() would be deadlock-prone. -Boot-tested the resulting kernel. - -Signed-off-by: Parag Warudkar -Signed-off-by: Ingo Molnar -Signed-off-by: Linus Torvalds ---- +The spinlock protecting the update of the "sksec->nlbl_state" variable is not +currently softirq safe which can lead to problems. This patch fixes this by +changing the spin_{un}lock() functions into spin_{un}lock_bh() functions. diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c -index bdb7070..ee05815 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c +@@ -2492,9 +2492,9 @@ static int selinux_netlbl_socket_setsid( + + rc = netlbl_socket_setattr(sock, &secattr); + if (rc == 0) { +- spin_lock(&sksec->nlbl_lock); ++ spin_lock_bh(&sksec->nlbl_lock); + sksec->nlbl_state = NLBL_LABELED; +- spin_unlock(&sksec->nlbl_lock); ++ spin_unlock_bh(&sksec->nlbl_lock); + } + + netlbl_socket_setsid_return: @@ -2660,9 +2660,11 @@ int selinux_netlbl_inode_permission(struct inode *inode, int mask) rcu_read_unlock(); return 0; From fedora-cvs-commits at redhat.com Fri Jan 5 18:15:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 13:15:41 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.269, 1.270 policycoreutils.spec, 1.356, 1.357 Message-ID: <200701051815.l05IFfwO028193@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28174 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Jan 5 2007 Dan Walsh 1.33.8-2 - Stop newrole -l from working on non secure ttys Resolves: #200110 policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ newrole/newrole |binary newrole/newrole.c | 16 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/fixfiles | 3 semanage/seobject.py | 34 21 files changed, 4837 insertions(+), 18 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- policycoreutils-rhat.patch 4 Jan 2007 22:11:37 -0000 1.269 +++ policycoreutils-rhat.patch 5 Jan 2007 18:15:38 -0000 1.270 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.7/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.8/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/booleansPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/booleansPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -201,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.7/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.8/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/fcontextPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/fcontextPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -363,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.7/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.8/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/loginsPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/loginsPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -528,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.7/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.8/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/Makefile 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/Makefile 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -562,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.7/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.8/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/mappingsPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/mappingsPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -620,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.7/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.8/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/modulesPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/modulesPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -785,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.7/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.8/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/portsPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/portsPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1003,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.7/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.8/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/selinux.tbl 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/selinux.tbl 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1272,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.7/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.8/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/semanagePage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/semanagePage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1385,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.7/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.8/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/statusPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/statusPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1602,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.7/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.8/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/system-config-selinux.glade 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/system-config-selinux.glade 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4409,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.7/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.8/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/system-config-selinux.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/system-config-selinux.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4569,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.7/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.8/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/translationsPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/translationsPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4682,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.7/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.8/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.7/gui/usersPage.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/gui/usersPage.py 2007-01-04 17:10:20.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4841,18 +4841,19 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.7/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.8/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.7/Makefile 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/Makefile 2007-01-04 17:10:20.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.7/newrole/newrole.c +Binary files nsapolicycoreutils/newrole/newrole and policycoreutils-1.33.8/newrole/newrole differ +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.8/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2007-01-04 17:01:41.000000000 -0500 -+++ policycoreutils-1.33.7/newrole/newrole.c 2007-01-04 16:24:47.000000000 -0500 ++++ policycoreutils-1.33.8/newrole/newrole.c 2007-01-05 11:17:36.000000000 -0500 @@ -67,6 +67,7 @@ #include /* for SELINUX_DEFAULTUSER */ #include @@ -4861,27 +4862,7 @@ #ifdef USE_AUDIT #include #endif -@@ -93,6 +94,19 @@ - - extern char **environ; - -+static int check_isapty(int fd) { -+ struct stat buf; -+ if ((isatty(fd)) && (fstat(fd, &buf) == 0)) { -+ int dev=major(buf.st_rdev); -+ if (dev > 135 && dev < 144) { -+ return 1; -+ } else { -+ return 0; -+ } -+ } -+ return 0; -+} -+ - /** - * Construct from the current range and specified desired level a resulting - * range. If the specified level is a range, return that. If it is not, then -@@ -733,6 +747,7 @@ +@@ -733,6 +734,7 @@ security_context_t *new_context, int *preserve_environment) { @@ -4889,13 +4870,27 @@ int flag_index; /* flag index in argv[] */ int clflag; /* holds codes for command line flags */ char *role_s = NULL; /* role spec'd by user in argv[] */ -@@ -793,6 +808,13 @@ +@@ -741,6 +743,8 @@ + char *level_s = NULL; /* level spec'd by user in argv[] */ + char *range_ptr = NULL; + security_context_t new_con = NULL; ++ security_context_t tty_con = NULL; ++ int securetty=0; + context_t context = NULL; /* manipulatable form of new_context */ + const struct option long_options[] = { + {"role", 1, 0, 'r'}, +@@ -793,6 +797,18 @@ "specified\n")); return -1; } + for (i=0; i < 3; i++) { -+ if (check_isapty(i)) { -+ fprintf(stderr, "Error: you are not allowed to change levels on pseudo terminals\n"); ++ securetty=0; ++ if (fgetfilecon(i,&tty_con) >= 0) { ++ securetty = (selinux_check_securetty_context(tty_con) == 1); ++ freecon(tty_con); ++ } ++ if (!securetty) { ++ fprintf(stderr, "Error: you are not allowed to change levels on a non secure terminal\n"); + return -1; + } + } @@ -4903,9 +4898,9 @@ level_s = optarg; break; default: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.7/restorecond/restorecond.c +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.8/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.7/restorecond/restorecond.c 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/restorecond/restorecond.c 2007-01-04 17:10:20.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4932,18 +4927,18 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.7/restorecond/restorecond.conf +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.8/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.7/restorecond/restorecond.conf 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/restorecond/restorecond.conf 2007-01-04 17:10:20.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.7/scripts/fixfiles +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.8/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.33.7/scripts/fixfiles 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/scripts/fixfiles 2007-01-04 17:10:20.000000000 -0500 @@ -29,6 +29,9 @@ RPMILES="" OUTFILES="" @@ -4954,9 +4949,9 @@ SYSLOGFLAG="-l" LOGGER=/usr/sbin/logger SETFILES=/sbin/setfiles -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.7/semanage/seobject.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.8/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.7/semanage/seobject.py 2007-01-04 16:24:30.000000000 -0500 ++++ policycoreutils-1.33.8/semanage/seobject.py 2007-01-04 17:10:20.000000000 -0500 @@ -94,23 +94,25 @@ return re.search("^" + reg +"$",raw) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.356 retrieving revision 1.357 diff -u -r1.356 -r1.357 --- policycoreutils.spec 4 Jan 2007 22:11:38 -0000 1.356 +++ policycoreutils.spec 5 Jan 2007 18:15:39 -0000 1.357 @@ -1,11 +1,11 @@ %define libauditver 1.1.4-3 %define libsepolver 1.12.27-1 %define libsemanagever 1.6.17-1 -%define libselinuxver 1.30.29-2 +%define libselinuxver 1.33.3-2 Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.33.8 -Release: 1{?dist} +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,10 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Fri Jan 5 2007 Dan Walsh 1.33.8-2 +- Stop newrole -l from working on non secure ttys +Resolves: #200110 + * Thu Jan 4 2007 Dan Walsh 1.33.8-1 - Update to upstream * Merged patches from Dan Walsh to: From fedora-cvs-commits at redhat.com Fri Jan 5 18:35:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 13:35:40 -0500 Subject: rpms/kexec-tools/devel kexec-tools-1.101-reloc-update.patch, 1.2, 1.3 kexec-tools-1.101-relocatable-bzimage.patch, 1.1, 1.2 Message-ID: <200701051835.l05IZeLU032658@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32615 Modified Files: kexec-tools-1.101-reloc-update.patch kexec-tools-1.101-relocatable-bzimage.patch Log Message: Related: bz221272 kexec-tools-1.101-reloc-update.patch: kexec/Makefile | 1 kexec/arch/i386/kexec-elf-x86.c | 6 kexec/arch/i386/kexec-multiboot-x86.c | 5 kexec/arch/ia64/kexec-elf-ia64.c | 6 kexec/arch/ppc/kexec-elf-ppc.c | 4 kexec/arch/ppc64/kexec-elf-ppc64.c | 6 kexec/arch/x86_64/crashdump-x86_64.c | 190 ++++++++++++++++++++++++++--- kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 2 kexec/arch/x86_64/kexec-elf-x86_64.c | 6 kexec/arch/x86_64/kexec-x86_64.c | 4 kexec/crashdump.h | 2 kexec/kexec-elf-core.c | 29 ++++ kexec/kexec-elf-exec.c | 9 - kexec/kexec-elf-rel.c | 9 - kexec/kexec-elf.c | 27 ++-- kexec/kexec-elf.h | 17 +- kexec/kexec.c | 44 ++++++ kexec/kexec.h | 4 purgatory/arch/i386/entry32-16-debug.S | 20 +-- purgatory/arch/i386/include/arch/debug.h | 2 purgatory/arch/i386/linux-entry16.S | 44 +++--- purgatory/arch/x86_64/include/arch/debug.h | 2 22 files changed, 344 insertions(+), 95 deletions(-) Index: kexec-tools-1.101-reloc-update.patch =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-reloc-update.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kexec-tools-1.101-reloc-update.patch 5 Jan 2007 17:47:37 -0000 1.2 +++ kexec-tools-1.101-reloc-update.patch 5 Jan 2007 18:35:38 -0000 1.3 @@ -1,5 +1,5 @@ --- kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h.orig 2004-12-20 18:05:40.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/x86_64/include/arch/debug.h 2007-01-05 13:32:24.000000000 -0500 @@ -311,7 +311,7 @@ TTYS0_TX_AL @@ -10,7 +10,7 @@ #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') --- kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S.orig 2004-12-20 05:48:45.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/i386/linux-entry16.S 2007-01-05 13:32:24.000000000 -0500 @@ -127,10 +127,10 @@ TTYS0_TX_AL @@ -182,7 +182,7 @@ setup16_debug_old_code32: .long 0x10000 --- kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S.orig 2004-12-20 18:11:43.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/i386/entry32-16-debug.S 2007-01-05 13:32:24.000000000 -0500 @@ -55,15 +55,15 @@ entry16_debug: orl %ecx, 0x14 + gdt @@ -261,7 +261,7 @@ entry16_debug_old_first32: .long 0x100000 --- kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h.orig 2004-12-20 18:03:17.000000000 -0500 -+++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/purgatory/arch/i386/include/arch/debug.h 2007-01-05 13:32:24.000000000 -0500 @@ -311,6 +311,6 @@ TTYS0_TX_AL @@ -270,8 +270,8 @@ +#define DEBUG_CHAR(x) TTYS0_TX_CHAR($x) ; TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX32(x) TTYS0_TX_HEX32(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') #define DEBUG_TX_HEX64(x) TTYS0_TX_HEX64(x); TTYS0_TX_CHAR($'\r') ; TTYS0_TX_CHAR($'\n') ---- kexec-tools-1.101/kexec/Makefile.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/Makefile 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/Makefile.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/Makefile 2007-01-05 13:32:24.000000000 -0500 @@ -13,6 +13,7 @@ KEXEC_C_SRCS:= kexec/kexec.c KEXEC_C_SRCS+= kexec/ifdown.c KEXEC_C_SRCS+= kexec/kexec-elf.c @@ -280,8 +280,8 @@ KEXEC_C_SRCS+= kexec/kexec-elf-rel.c KEXEC_C_SRCS+= kexec/kexec-elf-boot.c KEXEC_C_SRCS+= kexec/crashdump.c ---- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/kexec-elf-rel.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2007-01-05 13:32:24.000000000 -0500 @@ -135,10 +135,11 @@ static struct mem_rela elf_rela(struct m return rela; } @@ -311,8 +311,8 @@ if (result < 0) { die("ELF rel parse failed\n"); } ---- kexec-tools-1.101/kexec/kexec-elf.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/kexec-elf.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf.c 2007-01-05 13:32:24.000000000 -0500 @@ -368,7 +368,8 @@ static int build_mem_elf64_phdr(const ch return 0; } @@ -399,8 +399,8 @@ if (result < 0) { free_elf_info(ehdr); return result; ---- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/ia64/kexec-elf-ia64.c 2007-01-05 13:32:24.000000000 -0500 @@ -56,7 +56,7 @@ int elf_ia64_probe(const char *buf, off_ { struct mem_ehdr ehdr; @@ -428,8 +428,8 @@ if (load_crashdump_segments(info, &ehdr, max_addr, 0, ---- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/crashdump-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -24,8 +24,10 @@ #include #include @@ -702,7 +702,7 @@ return -1; cmdline_add_memmap(mod_cmdline, memmap_p); --- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c.orig 2004-12-21 12:51:24.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-rel-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -60,7 +60,7 @@ static const char *reloc_name(unsigned l void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, void *location, unsigned long address, unsigned long value) @@ -712,8 +712,8 @@ fprintf(stderr, "%s\n", reloc_name(r_type)); #endif switch(r_type) { ---- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/kexec-elf-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -47,7 +47,7 @@ int elf_x86_64_probe(const char *buf, of struct mem_ehdr ehdr; @@ -741,8 +741,8 @@ } if (arg_style == ARG_STYLE_NONE) { info->entry = (void *)entry; ---- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/x86_64/kexec-x86_64.c 2007-01-05 13:32:24.000000000 -0500 @@ -64,7 +64,7 @@ int get_memory_ranges(struct memory_rang continue; str = line + consumed; @@ -761,8 +761,8 @@ printf("%016Lx-%016Lx : %x\n", start, end, type); #endif ---- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-elf-x86.c 2007-01-05 13:32:24.000000000 -0500 @@ -47,7 +47,7 @@ int elf_x86_probe(const char *buf, off_t struct mem_ehdr ehdr; @@ -790,8 +790,8 @@ } if (arg_style == ARG_STYLE_NONE) { info->entry = (void *)entry; ---- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-01-05 13:32:24.000000000 -0500 @@ -209,10 +209,11 @@ int multiboot_x86_load(int argc, char ** @@ -806,19 +806,8 @@ /* The first segment will contain the multiboot headers: * ============= ---- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 12:45:07.000000000 -0500 -@@ -175,7 +175,7 @@ int do_bzImage_load(struct kexec_info *i - * it's gdt. - */ - elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, -- 0x3000, 640*1024, -1); -+ 0x3000, 640*1024, -1, 0); - - /* The argument/parameter segment */ - setup_size = kern16_size + command_line_len; --- kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c.orig 2005-01-20 14:10:56.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/ppc/kexec-elf-ppc.c 2007-01-05 13:32:24.000000000 -0500 @@ -72,7 +72,7 @@ int elf_ppc_probe(const char *buf, off_t struct mem_ehdr ehdr; @@ -837,8 +826,8 @@ if (result < 0) { free_elf_info(&ehdr); return result; ---- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/ppc64/kexec-elf-ppc64.c 2007-01-05 13:32:24.000000000 -0500 @@ -52,7 +52,7 @@ int elf_ppc64_probe(const char *buf, off { struct mem_ehdr ehdr; @@ -867,7 +856,7 @@ /* Add a ram-disk to the current image * Note: Add the ramdisk after elf_rel_build_load --- /dev/null 2006-12-27 08:05:56.458406418 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf-core.c 2007-01-05 12:45:07.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf-core.c 2007-01-05 13:32:24.000000000 -0500 @@ -0,0 +1,29 @@ +#include +#include @@ -898,8 +887,8 @@ + + return 0; +} ---- kexec-tools-1.101/kexec/kexec-elf.h.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf.h 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/kexec-elf.h.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf.h 2007-01-05 13:32:24.000000000 -0500 @@ -82,22 +82,29 @@ typedef struct uint32_t n_type; /* Type of the note. */ } ElfNN_Nhdr; @@ -935,8 +924,8 @@ extern int elf_rel_find_symbol(struct mem_ehdr *ehdr, const char *name, struct mem_sym *ret_sym); ---- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/kexec-elf-exec.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec-elf-exec.c 2007-01-05 13:32:24.000000000 -0500 @@ -11,11 +11,12 @@ static const int probe_debug = 0; @@ -966,8 +955,8 @@ if (result < 0) { die("ELF exec parse failed\n"); } ---- kexec-tools-1.101/kexec/crashdump.h.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/crashdump.h 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/crashdump.h.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/crashdump.h 2007-01-05 13:32:24.000000000 -0500 @@ -5,5 +5,7 @@ extern int get_crash_notes_per_cpu(int c /* Need to find a better way to determine per cpu notes section size. */ @@ -976,8 +965,8 @@ +#define KCORE_ELF_HEADERS_SIZE 4096 #endif /* CRASHDUMP_H */ ---- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 13:32:24.000000000 -0500 @@ -116,6 +116,9 @@ struct kexec_info { struct mem_ehdr rhdr; unsigned long backup_start; @@ -996,8 +985,8 @@ extern char *slurp_decompress_file(const char *filename, off_t *r_size); extern void add_segment(struct kexec_info *info, const void *buf, size_t bufsz, unsigned long base, size_t memsz); ---- kexec-tools-1.101/kexec/kexec.c.orig 2007-01-05 11:15:00.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec.c 2007-01-05 12:45:07.000000000 -0500 +--- kexec-tools-1.101/kexec/kexec.c.orig 2007-01-05 13:32:05.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec.c 2007-01-05 13:32:24.000000000 -0500 @@ -391,6 +391,50 @@ char *slurp_file(const char *filename, o return buf; } kexec-tools-1.101-relocatable-bzimage.patch: include/x86/x86-linux.h | 10 ++- kexec/arch/i386/crashdump-x86.c | 7 +- kexec/arch/i386/kexec-bzImage.c | 102 +++++++++++++++++++++++++++++++++++--- kexec/arch/i386/x86-linux-setup.c | 3 + kexec/kexec.h | 7 ++ 5 files changed, 119 insertions(+), 10 deletions(-) Index: kexec-tools-1.101-relocatable-bzimage.patch =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-relocatable-bzimage.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kexec-tools-1.101-relocatable-bzimage.patch 5 Jan 2007 17:47:37 -0000 1.1 +++ kexec-tools-1.101-relocatable-bzimage.patch 5 Jan 2007 18:35:38 -0000 1.2 @@ -1,5 +1,5 @@ ---- kexec-tools-1.101/include/x86/x86-linux.h.orig 2004-12-20 05:10:21.000000000 -0500 -+++ kexec-tools-1.101/include/x86/x86-linux.h 2007-01-05 11:05:30.000000000 -0500 +--- kexec-tools-1.101/include/x86/x86-linux.h.orig 2007-01-05 13:28:08.000000000 -0500 ++++ kexec-tools-1.101/include/x86/x86-linux.h 2007-01-05 13:24:49.000000000 -0500 @@ -141,7 +141,10 @@ struct x86_linux_param_header { uint32_t high_filesz; /* 0x254 */ uint8_t reserved15[0x2d0 - 0x258]; /* 0x258 */ @@ -29,8 +29,8 @@ +#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF #endif /* X86_LINUX_H */ ---- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig 2007-01-05 11:05:11.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-01-05 11:05:30.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c.orig 2007-01-05 13:28:08.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 2007-01-05 13:27:53.000000000 -0500 @@ -680,7 +680,9 @@ int load_crashdump_segments(struct kexec tmp = xmalloc(sz); memset(tmp, 0, sz); @@ -52,8 +52,8 @@ if (delete_memmap(memmap_p, elfcorehdr, sz) < 0) return -1; cmdline_add_memmap(mod_cmdline, memmap_p); ---- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c.orig 2007-01-05 11:05:11.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2007-01-05 11:05:30.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c.orig 2007-01-05 13:28:08.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/x86-linux-setup.c 2007-01-05 13:24:49.000000000 -0500 @@ -59,6 +59,7 @@ void setup_linux_bootloader_parameters( initrd_addr_max = DEFAULT_INITRD_ADDR_MAX; if (real_mode->protocol_version >= 0x0203) { @@ -71,8 +71,8 @@ } else { initrd_base = 0; initrd_size = 0; ---- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 11:05:11.000000000 -0500 -+++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 11:07:04.000000000 -0500 +--- kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c.orig 2007-01-05 13:28:08.000000000 -0500 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-bzImage.c 2007-01-05 13:27:53.000000000 -0500 @@ -34,8 +34,10 @@ #include #include "../../kexec.h" @@ -84,18 +84,33 @@ #include static const int probe_debug = 0; -@@ -109,6 +111,7 @@ int do_bzImage_load(struct kexec_info *i +@@ -109,6 +111,9 @@ int do_bzImage_load(struct kexec_info *i unsigned long setup_base, setup_size; struct entry32_regs regs32; struct entry16_regs regs16; ++ unsigned int relocatable_kernel = 0; ++ unsigned long kernel32_load_addr; + char *modified_cmdline; /* * Find out about the file I am about to load. -@@ -128,6 +131,45 @@ int do_bzImage_load(struct kexec_info *i +@@ -121,6 +126,7 @@ int do_bzImage_load(struct kexec_info *i + if (setup_sects == 0) { + setup_sects = 4; + } ++ + kern16_size = (setup_sects +1) *512; + kernel_version = ((unsigned char *)&setup_header) + 512 + setup_header.kver_addr; + if (kernel_len < kern16_size) { +@@ -128,25 +134,88 @@ int do_bzImage_load(struct kexec_info *i return -1; } ++ if (setup_header.protocol_version >= 0x0205) { ++ relocatable_kernel = setup_header.relocatable_kernel; ++ dfprintf(stdout, "bzImage is relocatable\n"); ++ } ++ + /* Can't use bzImage for crash dump purposes with real mode entry */ + if((info->kexec_flags & KEXEC_ON_CRASH) && real_mode_entry) { + fprintf(stderr, "Can't use bzImage for crash dump purposes" @@ -138,7 +153,20 @@ /* Load the trampoline. This must load at a higher address * the the argument/parameter segment or the kernel will stomp * it's gdt. -@@ -139,7 +181,16 @@ int do_bzImage_load(struct kexec_info *i + */ +- elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, +- 0x3000, 640*1024, -1); ++ ++ if (!real_mode_entry && relocatable_kernel) ++ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, ++ 0x3000, -1, -1, 0); ++ else ++ elf_rel_build_load(info, &info->rhdr, purgatory, purgatory_size, ++ 0x3000, 640*1024, -1, 0); ++ dfprintf(stdout, "Loaded purgatory at addr 0x%lx\n", ++ info->rhdr.rel_addr); + + /* The argument/parameter segment */ setup_size = kern16_size + command_line_len; real_mode = xmalloc(setup_size); memcpy(real_mode, kernel, kern16_size); @@ -155,9 +183,61 @@ + else if (real_mode->protocol_version >= 0x0200) { /* Careful setup_base must be greater than 8K */ setup_base = add_buffer(info, real_mode, setup_size, setup_size, - 16, 0x3000, 640*1024, -1); ---- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 11:05:11.000000000 -0500 -+++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 11:05:30.000000000 -0500 +- 16, 0x3000, 640*1024, -1); ++ 16, 0x3000, 640*1024, 1); + } else { + add_segment(info, real_mode, setup_size, SETUP_BASE, setup_size); + setup_base = SETUP_BASE; + } ++ dfprintf(stdout, "Loaded real-mode code and command line at 0x%lx\n", ++ setup_base); ++ + /* Verify purgatory loads higher than the parameters */ + if (info->rhdr.rel_addr < setup_base) { + die("Could not put setup code above the kernel parameters\n"); +@@ -154,9 +223,30 @@ int do_bzImage_load(struct kexec_info *i + + /* The main kernel segment */ + size = kernel_len - kern16_size; +- add_segment(info, kernel + kern16_size, size, KERN32_BASE, size); + ++ if (real_mode->protocol_version >=0x0205 && relocatable_kernel) { ++ /* Relocatable bzImage */ ++ unsigned long kern_align = real_mode->kernel_alignment; ++ unsigned long kernel32_max_addr = DEFAULT_BZIMAGE_ADDR_MAX; ++ ++ if (real_mode->protocol_version >= 0x0203) { ++ if (kernel32_max_addr > real_mode->initrd_addr_max) ++ kernel32_max_addr = real_mode->initrd_addr_max; ++ } ++ ++ kernel32_load_addr = add_buffer(info, kernel + kern16_size, ++ size, size, kern_align, ++ 0x100000, kernel32_max_addr, ++ 1); ++ } ++ else { ++ kernel32_load_addr = KERN32_BASE; ++ add_segment(info, kernel + kern16_size, size, ++ kernel32_load_addr, size); ++ } + ++ dfprintf(stdout, "Loaded 32bit kernel at 0x%lx\n", kernel32_load_addr); ++ + /* Tell the kernel what is going on */ + setup_linux_bootloader_parameters(info, real_mode, setup_base, + kern16_size, command_line, command_line_len, +@@ -177,7 +267,7 @@ int do_bzImage_load(struct kexec_info *i + regs32.edi = 0; /* unused */ + regs32.esp = elf_rel_get_addr(&info->rhdr, "stack_end"); /* stack, unused */ + regs32.ebp = 0; /* unused */ +- regs32.eip = KERN32_BASE; /* kernel entry point */ ++ regs32.eip = kernel32_load_addr; /* kernel entry point */ + + /* + * Initialize the 16bit start information. +--- kexec-tools-1.101/kexec/kexec.h.orig 2007-01-05 13:28:08.000000000 -0500 ++++ kexec-tools-1.101/kexec/kexec.h 2007-01-05 13:24:43.000000000 -0500 @@ -197,4 +197,11 @@ int arch_compat_trampoline(struct kexec_ void arch_update_purgatory(struct kexec_info *info); From fedora-cvs-commits at redhat.com Fri Jan 5 19:04:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 14:04:37 -0500 Subject: rpms/vixie-cron/FC-6 vixie-cron-4.1-_60-SELinux-contains-range.patch, NONE, 1.1 vixie-cron.spec, 1.80, 1.81 Message-ID: <200701051904.l05J4bG5010254@cvs.devel.redhat.com> Author: jantill Update of /cvs/dist/rpms/vixie-cron/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10198 Modified Files: vixie-cron.spec Added Files: vixie-cron-4.1-_60-SELinux-contains-range.patch Log Message: * Fri Jan 05 2007 James Antill - 4:4.1-66 - include system-auth for session in crond.pam, it now avoids vixie-cron-4.1-_60-SELinux-contains-range.patch: crontab.c | 22 ++++- do_command.c | 1 funcs.h | 4 security.c | 255 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 250 insertions(+), 32 deletions(-) --- NEW FILE vixie-cron-4.1-_60-SELinux-contains-range.patch --- --- vixie-cron-4.1/do_command.c.selinux-contains-range 2006-12-30 09:20:53.000000000 -0500 +++ vixie-cron-4.1/do_command.c 2006-12-30 09:20:53.000000000 -0500 @@ -238,6 +238,7 @@ } break; default: + cron_restore_default_security_context(); /* parent process */ break; } --- vixie-cron-4.1/security.c.selinux-contains-range 2006-12-30 09:20:53.000000000 -0500 +++ vixie-cron-4.1/security.c 2006-12-30 09:22:54.000000000 -0500 @@ -23,6 +23,7 @@ #ifdef WITH_SELINUX #include +#include #include #include #include @@ -30,6 +31,15 @@ static char ** build_env(char **cronenv); +#ifdef WITH_SELINUX +static int cron_change_selinux_range( user *u, + security_context_t ucontext ); +static int cron_get_job_range( user *u, security_context_t *ucontextp, char **jobenv ); +#endif + +int cron_restore_default_security_context() { + setexeccon(NULL); +} int cron_set_job_security_context( entry *e, user *u, char ***jobenv ) { time_t minutely_time = 0; @@ -58,9 +68,9 @@ * we'll not be permitted to read the cron spool directory :-) */ - security_context_t scontext=0, file_context=0; + security_context_t ucontext=0; - if ( cron_get_job_context(u, &scontext, &file_context, *jobenv) < OK ) + if ( cron_get_job_range(u, &ucontext, *jobenv) < OK ) { syslog(LOG_ERR, "CRON (%s) ERROR: failed to get selinux context: %s", e->pwd->pw_name, strerror(errno) @@ -68,38 +78,37 @@ return -1; } + if (cron_change_selinux_range(u, ucontext) != 0) + { + syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", + e->pwd->pw_name); + if ( ucontext ) + freecon(ucontext); + return -1; + } + if ( ucontext ) + freecon(ucontext); #endif - if ( cron_change_user( e->pwd ) != 0 ) + if ( cron_start_security_session( e->pwd ) != 0 ) { syslog(LOG_INFO, "CRON (%s) ERROR: failed to open PAM security session: %s", e->pwd->pw_name, strerror(errno) ); return -1; - } + } -#if WITH_SELINUX - if ( cron_change_selinux_context( u, scontext, file_context ) != 0 ) + if ( cron_change_user( e->pwd, env_get("HOME", *jobenv)) != 0 ) { - syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", - e->pwd->pw_name); - if ( file_context ) - freecon(file_context); + syslog(LOG_INFO, "CRON (%s) ERROR: failed to open PAM security session: %s", + e->pwd->pw_name, strerror(errno) + ); return -1; - } - if ( file_context ) - freecon(file_context); -#endif + } log_close(); openlog(ProgramName, LOG_PID, LOG_CRON); - if ( chdir(env_get("HOME", *jobenv)) == -1 ) - { - log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno)); - return -1; - } - time_t job_run_time = time(0L); if( (minutely_time > 0) @@ -145,10 +154,20 @@ PAM_FAIL_CHECK; retcode = pam_acct_mgmt(pamh, PAM_SILENT); PAM_FAIL_CHECK; - retcode = pam_open_session(pamh, PAM_SILENT); - PAM_FAIL_CHECK; +#endif + + return retcode; +} + +int cron_start_security_session( struct passwd *pw ) +{ + int retcode = 0; + +#if defined(WITH_PAM) retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); PAM_FAIL_CHECK; + retcode = pam_open_session(pamh, PAM_SILENT); + PAM_FAIL_CHECK; log_close(); /* PAM has now re-opened our log to auth.info ! */ openlog(ProgramName, LOG_PID, LOG_CRON); #endif @@ -165,7 +184,7 @@ #endif } -int cron_change_user( struct passwd *pw ) +int cron_change_user( struct passwd *pw, char *homedir ) { /* set our directory, uid and gid. Set gid first, since once * we set uid, we've lost root privledges. @@ -176,6 +195,13 @@ return -1; } + if ( chdir(homedir) == -1 ) + { + log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno)); + log_it("CRON", getpid(), homedir, strerror(errno)); + return -1; + } + if ( initgroups( pw->pw_name, pw->pw_gid ) != 0 ) { log_it("CRON", getpid(), "initgroups failed:", strerror(errno)); @@ -201,6 +227,7 @@ #ifdef WITH_SELINUX struct av_decision avd; int retval; + unsigned int bit = FILE__ENTRYPOINT; /* * Since crontab files are not directly executed, * crond must ensure that the crontab file has @@ -208,13 +235,35 @@ * the user cron job. It performs an entrypoint * permission check for this purpose. */ - retval = security_compute_av(scontext, - file_context, - SECCLASS_FILE, - FILE__ENTRYPOINT, - &avd); + retval = security_compute_av(scontext, file_context, + SECCLASS_FILE, bit, &avd); + + if (retval || ((bit & avd.allowed) != bit)) + return 0; +#endif + return 1; +} + +static int +cron_authorize_range +( + security_context_t scontext, + security_context_t ucontext +) +{ +#ifdef WITH_SELINUX + struct av_decision avd; + int retval; + unsigned int bit = CONTEXT__CONTAINS; + /* + * Since crontab files are not directly executed, + * so crond must ensure that any user specified range + * falls within the seusers-specified range for that Linux user. + */ + retval = security_compute_av(scontext, ucontext, + SECCLASS_CONTEXT, bit, &avd); - if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) + if (retval || ((bit & avd.allowed) != bit)) return 0; #endif return 1; @@ -265,6 +314,75 @@ return 0; } +#if WITH_SELINUX +/* always uses u->scontext as the default process context, then changes the + level, and retuns it in ucontextp (or NULL otherwise) */ +static int cron_get_job_range( user *u, security_context_t *ucontextp, + char **jobenv ) +{ + char *range; + + if ( is_selinux_enabled() <= 0 ) + return 0; + if ( ucontextp == 0L ) + return -1; + + *ucontextp = 0L; + + if ( (range = env_get("MLS_LEVEL",jobenv)) != 0L ) + { + context_t ccon; + + if (!(ccon = context_new(u->scontext))) + { + log_it(u->name, + getpid(), "context_new FAILED for MLS_LEVEL", + range); + return -1; + } + + if (context_range_set(ccon, range)) + { + log_it(u->name, + getpid(), "context_range_set FAILED for MLS_LEVEL", + range); + return -1; + } + + if (!(*ucontextp = context_str(ccon))) + { + log_it(u->name, + getpid(), "context_str FAILED for MLS_LEVEL", + range); + return -1; + } + + if (!(*ucontextp = strdup(*ucontextp))) + { + log_it(u->name, + getpid(), "strdup FAILED for MLS_LEVEL", + range); + return -1; + } + + context_free(ccon); + } + else if (!u->scontext) + { /* cron_change_selinux_range() deals with this */ + return 0; + } + else if (!(*ucontextp = strdup(u->scontext))) + { + log_it(u->name, + getpid(), "strdup FAILED for MLS_LEVEL", + range); + return -1; + } + + return 0; +} +#endif + int cron_change_selinux_context( user *u, void *scontext, void *file_context ) { #ifdef WITH_SELINUX @@ -332,6 +450,84 @@ return 0; } +#ifdef WITH_SELINUX +static int cron_change_selinux_range( user *u, + security_context_t ucontext ) +{ + if ( is_selinux_enabled() <= 0 ) + return 0; + + if ( u->scontext == 0L ) + { + if (security_getenforce() > 0) + { + log_it( u->name, getpid(), + "NULL security context for user", + "" + ); + return -1; + }else + { + log_it( u->name, getpid(), + "NULL security context for user, " + "but SELinux in permissive mode, continuing", + "" + ); + return 0; + } + } + + if ( strcmp(u->scontext, ucontext) ) + { + if ( ! cron_authorize_range( u->scontext, ucontext )) + { + if ( security_getenforce() > 0 ) + { + syslog(LOG_ERR, + "CRON (%s) ERROR:" + "Unauthorized range %s in MLS_LEVEL for user %s ", + u->name, (char*)ucontext, u->scontext + ); + return -1; + } else + { + syslog(LOG_INFO, + "CRON (%s) WARNING:" + "Unauthorized range %s in MLS_LEVEL for user %s," + " but SELinux in permissive mode, continuing", + u->name, (char*)ucontext, u->scontext + ); + } + } + } + + if ( setexeccon(ucontext) < 0 ) + { + if (security_getenforce() > 0) + { + syslog(LOG_ERR, + "CRON (%s) ERROR:" + "Could not set exec context to %s for user", + u->name, (char*)ucontext + ); + + return -1; + } else + { + syslog(LOG_ERR, + "CRON (%s) ERROR:" + "Could not set exec context to %s for user, " + " but SELinux in permissive mode, continuing", + u->name, (char*)ucontext + ); + + return 0; + } + } + return 0; +} +#endif + int get_security_context( const char *name, int crontab_fd, security_context_t *rcontext, @@ -449,3 +645,4 @@ return env_copy(cronenv); #endif } + --- vixie-cron-4.1/crontab.c.selinux-contains-range 2006-12-30 09:20:53.000000000 -0500 +++ vixie-cron-4.1/crontab.c 2006-12-30 09:20:53.000000000 -0500 @@ -33,6 +33,7 @@ #include "cron.h" #ifdef WITH_SELINUX #include +#include #include #endif @@ -415,8 +416,25 @@ #ifdef WITH_SELINUX if ( selinux_context ) { - fprintf(NewCrontab,"SELINUX_ROLE_TYPE=%s\n", selinux_context); - selinux_context = 0; + context_t ccon = NULL; + char *level = NULL; + + if (!(ccon = context_new(selinux_context))) + { + fprintf(stderr, "context_new failed\n"); + goto fatal; + } + + if (!(level = context_range_get(ccon))) + { + fprintf(stderr, "context_range failed\n"); + goto fatal; + } + + fprintf(NewCrontab,"MLS_LEVEL=%s\n", level); + context_free(ccon); + freecon(selinux_context); + selinux_context = NULL; } #endif --- vixie-cron-4.1/funcs.h.selinux-contains-range 2006-12-30 09:20:53.000000000 -0500 +++ vixie-cron-4.1/funcs.h 2006-12-30 09:20:53.000000000 -0500 @@ -80,13 +80,15 @@ /* Red Hat security stuff (security.c): */ +int cron_restore_default_security_context( void ); + int cron_set_job_security_context( entry *e, user *u, char ***jobenvp ); int cron_open_security_session( struct passwd *pw ); void cron_close_security_session( void ); -int cron_change_user( struct passwd *pw ); +int cron_change_user( struct passwd *pw, char *homedir ); int cron_get_job_context( user *u, void *scontextp, void *file_contextp, char **envp ); Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/FC-6/vixie-cron.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- vixie-cron.spec 28 Nov 2006 13:39:18 -0000 1.80 +++ vixie-cron.spec 5 Jan 2007 19:04:35 -0000 1.81 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 65%{?dist} +Release: 66%{?dist} Epoch: 4 License: distributable Group: System Environment/Base @@ -77,6 +77,7 @@ Patch57: vixie-cron-4.1-_44-delayed_database.patch Patch58: vixie-cron-4.1-_52-bz181439_2.patch Patch59: vixie-cron-4.1-_56-pam-session-system-auth.patch +Patch60: vixie-cron-4.1-_60-SELinux-contains-range.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: syslog, bash >= 2.0 @@ -173,6 +174,7 @@ %patch57 -p1 -b .delayed_database %patch58 -p1 -b .bz181439_2 %patch59 -p1 -b .pam-session-system-auth +%patch60 -p1 -b .selinux-contains-range %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \ @@ -245,6 +247,8 @@ %config(noreplace) /etc/sysconfig/crond %changelog +* Fri Jan 05 2007 James Antill - 4:4.1-66 +- include system-auth for session in crond.pam, it now avoids * Tue Sep 05 2006 Marcela Maslanova - 4:4.1-64 - include system-auth for session in crond.pam, it now avoids From fedora-cvs-commits at redhat.com Fri Jan 5 19:07:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 14:07:22 -0500 Subject: rpms/vixie-cron/FC-6 vixie-cron.spec,1.81,1.82 Message-ID: <200701051907.l05J7MQg012446@cvs.devel.redhat.com> Author: jantill Update of /cvs/dist/rpms/vixie-cron/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12390 Modified Files: vixie-cron.spec Log Message: * Fri Jan 05 2007 James Antill - 4:4.1-67 - Merge MLS option for LSPP from RHEL-5. Resolves: #207433 Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/FC-6/vixie-cron.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- vixie-cron.spec 5 Jan 2007 19:04:35 -0000 1.81 +++ vixie-cron.spec 5 Jan 2007 19:07:20 -0000 1.82 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 66%{?dist} +Release: 67%{?dist} Epoch: 4 License: distributable Group: System Environment/Base @@ -247,8 +247,9 @@ %config(noreplace) /etc/sysconfig/crond %changelog -* Fri Jan 05 2007 James Antill - 4:4.1-66 -- include system-auth for session in crond.pam, it now avoids +* Fri Jan 05 2007 James Antill - 4:4.1-67 +- Merge MLS option for LSPP from RHEL-5. +Resolves: #207433 * Tue Sep 05 2006 Marcela Maslanova - 4:4.1-64 - include system-auth for session in crond.pam, it now avoids From fedora-cvs-commits at redhat.com Fri Jan 5 20:25:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 15:25:30 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.389,1.390 Message-ID: <200701052025.l05KPUhC024655@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24641 Modified Files: eclipse.spec Log Message: - Disable com.jcraft.jsch_0.1.28.jar on ia64. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- eclipse.spec 3 Jan 2007 21:10:43 -0000 1.389 +++ eclipse.spec 5 Jan 2007 20:25:27 -0000 1.390 @@ -1303,7 +1303,12 @@ # exclude org.eclipse.ui.ide to work around # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547 UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//') -aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION +%ifnarch ia64 +aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION +%else +aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \ + --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar +%endif %endif %clean @@ -1701,8 +1706,9 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog -* Wed Jan 03 2007 Ben Konrath 3.2.1-27 +* Fri Jan 05 2007 Ben Konrath 3.2.1-27 - Use /g in tomcat version replacement. +- Disable com.jcraft.jsch_0.1.28.jar on ia64. * Tue Dec 19 2006 Ben Konrath 3.2.1-26 - Use sed instead of patch for tomcat version. From fedora-cvs-commits at redhat.com Fri Jan 5 21:00:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 16:00:56 -0500 Subject: rpms/selinux-policy/FC-6 booleans-mls.conf, 1.5, 1.6 booleans-strict.conf, 1.3, 1.4 booleans-targeted.conf, 1.21, 1.22 modules-strict.conf, 1.16, 1.17 policy-20061106.patch, 1.8, 1.9 selinux-policy.spec, 1.334, 1.335 Message-ID: <200701052100.l05L0umk015884@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15820 Modified Files: booleans-mls.conf booleans-strict.conf booleans-targeted.conf modules-strict.conf policy-20061106.patch selinux-policy.spec Log Message: * Fri Jan 5 2007 Dan Walsh 2.4.6-23 - Allow ssh access to the krb tickets - Allow sshd to change passwd - Stop newrole -l from working on non securetty Resolves: #200110 Index: booleans-mls.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/booleans-mls.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- booleans-mls.conf 22 Dec 2006 16:52:38 -0000 1.5 +++ booleans-mls.conf 5 Jan 2007 21:00:54 -0000 1.6 @@ -140,7 +140,7 @@ # Control users use of ping and traceroute # -user_ping = false +user_ping = true # Allow gpg executable stack # Index: booleans-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/booleans-strict.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- booleans-strict.conf 27 Sep 2006 19:49:43 -0000 1.3 +++ booleans-strict.conf 5 Jan 2007 21:00:54 -0000 1.4 @@ -164,7 +164,7 @@ # Allow applications to read untrusted contentIf this is disallowed, Internet content hasto be manually relabeled for read access to be granted # -read_untrusted_content = false +read_untrusted_content = true # Allow user spamassassin clients to use the network. # @@ -204,10 +204,21 @@ # Allow applications to write untrusted contentIf this is disallowed, no Internet contentwill be stored. # -write_untrusted_content = false +write_untrusted_content = true spamd_enable_home_dirs = false # Allow login domains to polyinstatiate directories # allow_polyinstantiation = false + +# Allow sysadm to ptrace all processes +# +allow_ptrace = false + +## Control users use of ping and traceroute +user_ping = true + +# Allow unlabeled packets to flow +# +allow_unlabeled_packets = true Index: booleans-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/booleans-targeted.conf,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- booleans-targeted.conf 14 Dec 2006 20:59:24 -0000 1.21 +++ booleans-targeted.conf 5 Jan 2007 21:00:54 -0000 1.22 @@ -1,6 +1,6 @@ # Allow making anonymous memory executable, e.g.for runtime-code generation or executable stack. # -allow_execmem = false +allow_execmem = true # Allow making a modified private filemapping executable (text relocation). # @@ -229,3 +229,7 @@ # Allow mount command to mounton any directory # allow_mounton_anydir = true + +# Allow unlabeled packets to flow +# +allow_unlabeled_packets = true Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/modules-strict.conf,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- modules-strict.conf 14 Dec 2006 20:59:24 -0000 1.16 +++ modules-strict.conf 5 Jan 2007 21:00:54 -0000 1.17 @@ -1304,3 +1304,11 @@ # Policy for tzdata-update # tzdata = base + +# Layer: apps +# Module: gnome +# +# gnome session and gconf +# +gnome = module + policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 policy/flask/access_vectors | 2 policy/global_tunables | 48 ++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 9 policy/modules/admin/consoletype.te | 15 policy/modules/admin/dmesg.te | 1 policy/modules/admin/firstboot.if | 6 policy/modules/admin/logwatch.te | 2 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 9 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 46 -- policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 27 + policy/modules/admin/vpn.te | 1 policy/modules/apps/evolution.if | 127 ++++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 +++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 209 +++++++++-- policy/modules/apps/mplayer.if | 84 ++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 80 +++- policy/modules/apps/userhelper.if | 19 - policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 58 +++ policy/modules/kernel/corenetwork.if.in | 99 +++++ policy/modules/kernel/corenetwork.te.in | 17 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 5 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 11 policy/modules/kernel/files.if | 183 +++++++++ policy/modules/kernel/filesystem.te | 7 policy/modules/kernel/kernel.if | 64 +++ policy/modules/kernel/kernel.te | 10 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 10 policy/modules/services/apache.te | 17 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 21 + policy/modules/services/bind.fc | 1 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 45 ++ policy/modules/services/cups.te | 7 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 43 ++ policy/modules/services/ftp.te | 14 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 +++ policy/modules/services/hal.te | 9 policy/modules/services/inetd.te | 9 policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/kerberos.te | 11 policy/modules/services/lpd.if | 56 +- policy/modules/services/mta.if | 1 policy/modules/services/mta.te | 1 policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 15 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 policy/modules/services/oddjob.te | 3 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 +++ policy/modules/services/pcscd.te | 75 ++++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.te | 13 policy/modules/services/procmail.te | 16 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 ++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.te | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.if | 2 policy/modules/services/samba.te | 8 policy/modules/services/sasl.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 4 policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 44 ++ policy/modules/services/ssh.te | 7 policy/modules/services/telnet.te | 1 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 ++ policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 ++++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 74 +++ policy/modules/system/authlogin.te | 6 policy/modules/system/clock.te | 8 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 4 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 3 policy/modules/system/init.te | 31 + policy/modules/system/iptables.te | 11 policy/modules/system/libraries.fc | 29 - policy/modules/system/libraries.te | 6 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 9 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 48 ++ policy/modules/system/miscfiles.fc | 1 policy/modules/system/miscfiles.if | 79 ++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 20 - policy/modules/system/raid.te | 7 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 113 +++++- policy/modules/system/selinuxutil.te | 107 +---- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 34 + policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 + policy/modules/system/unconfined.te | 19 + policy/modules/system/userdomain.if | 561 ++++++++++++++++++++++++++---- policy/modules/system/userdomain.te | 61 +-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 35 + 164 files changed, 3661 insertions(+), 543 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 policy-20061106.patch Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- policy-20061106.patch 22 Dec 2006 17:26:03 -0000 1.8 +++ policy-20061106.patch 5 Jan 2007 21:00:54 -0000 1.9 @@ -1,27 +1,27 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers ---- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2006-12-14 14:55:59.000000000 -0500 +--- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-29 12:04:52.000000000 -0500 ++++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-01-05 15:23:37.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers ---- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2006-12-14 14:57:01.000000000 -0500 +--- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-29 12:04:52.000000000 -0500 ++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-01-05 15:23:37.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers ---- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2006-12-14 14:55:40.000000000 -0500 +--- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-29 12:04:52.000000000 -0500 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-01-05 15:23:37.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors ---- nsaserefpolicy/policy/flask/access_vectors 2006-11-16 17:15:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/flask/access_vectors 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/flask/access_vectors 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-01-05 15:23:37.000000000 -0500 @@ -619,6 +619,8 @@ send recv @@ -32,8 +32,8 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables ---- nsaserefpolicy/policy/global_tunables 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/global_tunables 2006-12-13 17:53:00.000000000 -0500 +--- nsaserefpolicy/policy/global_tunables 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/global_tunables 2007-01-05 15:23:37.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -114,8 +114,8 @@ +gen_tunable(allow_unlabeled_packets,true) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls ---- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/mls 2006-12-12 16:40:35.000000000 -0500 +--- nsaserefpolicy/policy/mls 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/mls 2007-01-05 15:23:37.000000000 -0500 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -188,8 +188,8 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te ---- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-01-05 15:23:37.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -199,8 +199,8 @@ type acct_data_t; logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if ---- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-01-05 15:23:37.000000000 -0500 @@ -127,4 +127,21 @@ allow $1 amanda_log_t:file ra_file_perms; ') @@ -224,8 +224,8 @@ + files_search_usr($1) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te ---- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2006-12-19 16:04:18.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-01-05 15:23:37.000000000 -0500 @@ -75,6 +75,7 @@ allow amanda_t self:unix_dgram_socket create_socket_perms; allow amanda_t self:tcp_socket create_stream_socket_perms; @@ -235,8 +235,8 @@ # access to amanda_amandates_t allow amanda_t amanda_amandates_t:file { getattr lock read write }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc ---- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-01-05 15:23:37.000000000 -0500 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -250,8 +250,8 @@ -/sbin/mkinitrd -- gen_context(system_u:object_r:bootloader_exec_t,s0) /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te ---- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2006-12-22 10:37:04.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-01-05 15:23:37.000000000 -0500 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -280,8 +280,8 @@ + hal_dontaudit_append_var_lib_files(bootloader_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.4.6/policy/modules/admin/consoletype.te ---- nsaserefpolicy/policy/modules/admin/consoletype.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/consoletype.te 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-01-05 15:23:37.000000000 -0500 @@ -8,7 +8,12 @@ type consoletype_t; @@ -304,7 +304,19 @@ ######################################## # -@@ -84,7 +90,7 @@ +@@ -71,7 +77,10 @@ + apm_use_fds(consoletype_t) + apm_write_pipes(consoletype_t) + ') +- ++optional_policy(` ++ hal_dontaudit_use_fds(consoletype_t) ++ hal_dontaudit_rw_pipes(consoletype_t) ++') + optional_policy(` + auth_read_pam_pid(consoletype_t) + ') +@@ -84,7 +93,7 @@ optional_policy(` files_read_etc_files(consoletype_t) firstboot_use_fds(consoletype_t) @@ -314,8 +326,8 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.4.6/policy/modules/admin/dmesg.te ---- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-29 12:04:49.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-01-05 15:23:37.000000000 -0500 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -325,8 +337,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-2.4.6/policy/modules/admin/firstboot.if ---- nsaserefpolicy/policy/modules/admin/firstboot.if 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/firstboot.if 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-01-05 15:23:37.000000000 -0500 @@ -96,7 +96,7 @@ ######################################## @@ -350,8 +362,8 @@ + allow $1 firstboot_t:fifo_file { read write }; ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.4.6/policy/modules/admin/logwatch.te ---- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/logwatch.te 2006-12-20 09:54:52.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-11-29 12:04:49.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/logwatch.te 2007-01-05 15:23:37.000000000 -0500 @@ -53,10 +53,12 @@ corecmd_exec_ls(logwatch_t) @@ -366,14 +378,9 @@ files_read_etc_runtime_files(logwatch_t) files_read_usr_files(logwatch_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.4.6/policy/modules/admin/netutils.te ---- nsaserefpolicy/policy/modules/admin/netutils.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/netutils.te 2006-12-19 16:04:18.000000000 -0500 -@@ -18,10 +18,12 @@ - type ping_exec_t; - init_system_domain(ping_t,ping_exec_t) - role system_r types ping_t; -+userdom_executable_file(ping_exec_t) - +--- nsaserefpolicy/policy/modules/admin/netutils.te 2006-11-29 12:04:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/netutils.te 2007-01-05 15:23:37.000000000 -0500 [...4376 lines suppressed...] @@ -5074,7 +7413,7 @@ allow $2 $1_home_t:dir rw_dir_perms; allow $2 $1_home_t:sock_file create_file_perms; ') -@@ -3977,7 +3993,7 @@ +@@ -3977,7 +4027,7 @@ ') files_search_home($1) @@ -5083,7 +7422,7 @@ ') ######################################## -@@ -3996,7 +4012,7 @@ +@@ -3996,7 +4046,7 @@ type staff_home_dir_t; ') @@ -5092,7 +7431,7 @@ ') ######################################## -@@ -4343,7 +4359,7 @@ +@@ -4343,7 +4393,7 @@ type sysadm_home_dir_t; ') @@ -5101,7 +7440,7 @@ ') ######################################## -@@ -4501,41 +4517,13 @@ +@@ -4501,41 +4551,13 @@ ## # interface(`userdom_read_sysadm_home_content_files',` @@ -5148,7 +7487,7 @@ ') ######################################## -@@ -4858,7 +4846,7 @@ +@@ -4858,7 +4880,7 @@ type user_home_t; ') @@ -5157,7 +7496,7 @@ ') ######################################## -@@ -4905,6 +4893,28 @@ +@@ -4905,6 +4927,28 @@ ######################################## ## @@ -5186,7 +7525,7 @@ ## Read files in generic user home directories. ## ## -@@ -5497,3 +5507,383 @@ +@@ -5497,3 +5541,406 @@ allow $1 user_home_dir_t:dir create_dir_perms; files_home_filetrans($1,user_home_dir_t,dir) ') @@ -5505,6 +7844,7 @@ + + mls_process_read_up($1) + mls_file_read_up($1) ++ mls_file_write_down($1) + mls_file_upgrade($1) + mls_file_downgrade($1) + @@ -5570,9 +7910,31 @@ + allow $1 user_exec_type:file getattr; +') + ++######################################## ++## ++## dontaudit getattr all user file type ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++# ++interface(`userdom_dontaudit_list_user_files',` ++ gen_require(` ++ attribute $1_file_type; ++ ') ++ ++ dontaudit $2 $1_file_type:dir search_dir_perms; ++ dontaudit $2 $1_file_type:file getattr; ++') ++ ++ ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2006-12-14 13:55:38.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-01-05 15:23:37.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -5583,7 +7945,15 @@ # The privhome attribute identifies every domain that can create files under # regular user home directories in the regular context (IE act on behalf of # a user in writing regular files) -@@ -141,25 +144,6 @@ +@@ -68,6 +71,7 @@ + + # only staff_r can change to sysadm_r + userdom_role_change_template(staff, sysadm) ++ dontaudit staff_t admin_terminal:chr_file { read write }; + + ifdef(`enable_mls',` + userdom_unpriv_user_template(secadm) +@@ -141,25 +145,6 @@ logging_run_auditd(auditadm_t, auditadm_r, { auditadm_tty_device_t auditadm_devpts_t }) userdom_dontaudit_read_sysadm_home_content_files(auditadm_t) @@ -5609,7 +7979,7 @@ ',` logging_manage_audit_log(sysadm_t) logging_manage_audit_config(sysadm_t) -@@ -181,6 +165,14 @@ +@@ -181,6 +166,14 @@ ') optional_policy(` @@ -5624,7 +7994,7 @@ # cjp: why is this not apm_run_client apm_domtrans_client(sysadm_t) ') -@@ -229,7 +221,6 @@ +@@ -229,7 +222,6 @@ consoletype_exec(sysadm_t) ifdef(`enable_mls',` @@ -5632,7 +8002,7 @@ consoletype_exec(auditadm_t) ') ') -@@ -248,7 +239,6 @@ +@@ -248,7 +240,6 @@ dmesg_exec(sysadm_t) ifdef(`enable_mls',` @@ -5640,7 +8010,7 @@ dmesg_exec(auditadm_t) ') ') -@@ -383,27 +373,12 @@ +@@ -383,27 +374,12 @@ seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal) ifdef(`enable_mls',` @@ -5673,7 +8043,7 @@ ') ') -@@ -428,6 +403,9 @@ +@@ -428,6 +404,9 @@ ') optional_policy(` @@ -5684,8 +8054,8 @@ usermanage_run_groupadd(sysadm_t,sysadm_r,admin_terminal) usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc ---- nsaserefpolicy/policy/modules/system/xen.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/xen.fc 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-01-05 15:23:37.000000000 -0500 @@ -8,6 +8,7 @@ /usr/sbin/xm -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -5695,8 +8065,8 @@ /var/lib/xenstored(/.*)? gen_context(system_u:object_r:xenstored_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te ---- nsaserefpolicy/policy/modules/system/xen.te 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.te 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/xen.te 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-01-05 15:23:37.000000000 -0500 @@ -86,8 +86,8 @@ allow xend_t self:tcp_socket create_stream_socket_perms; allow xend_t self:packet_socket create_socket_perms; @@ -5787,8 +8157,8 @@ +fs_read_nfs_files(xend_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular ---- nsaserefpolicy/Rules.modular 2006-11-16 17:15:29.000000000 -0500 -+++ serefpolicy-2.4.6/Rules.modular 2006-12-12 15:19:22.000000000 -0500 +--- nsaserefpolicy/Rules.modular 2006-11-29 12:04:51.000000000 -0500 ++++ serefpolicy-2.4.6/Rules.modular 2007-01-05 15:23:37.000000000 -0500 @@ -219,6 +219,16 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- selinux-policy.spec 22 Dec 2006 17:38:33 -0000 1.334 +++ selinux-policy.spec 5 Jan 2007 21:00:54 -0000 1.335 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 17%{?dist} +Release: 23%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -33,6 +33,9 @@ Source10: booleans-strict.conf Source12: setrans-strict.conf Source13: policygentool +Source14: securetty_contexts-targeted +Source15: securetty_contexts-mls +Source16: securetty_contexts-strict Url: http://serefpolicy.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -99,6 +102,7 @@ touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \ touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \ touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \ +install -m0644 ${RPM_SOURCE_DIR}/securetty_contexts-%1 %{buildroot}%{_sysconfdir}/selinux/%1/contexts/securetty_contexts \ install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \ ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1 \ %nil @@ -120,6 +124,7 @@ %ghost %{_sysconfdir}/selinux/%1/policy/policy.* \ %dir %{_sysconfdir}/selinux/%1/contexts \ %config %{_sysconfdir}/selinux/%1/contexts/customizable_types \ +%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/securetty_contexts \ %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/dbus_contexts \ %config %{_sysconfdir}/selinux/%1/contexts/default_contexts \ %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/default_type \ @@ -351,6 +356,32 @@ %endif %changelog +* Fri Jan 5 2007 Dan Walsh 2.4.6-23 +- Allow ssh access to the krb tickets +- Allow sshd to change passwd +- Stop newrole -l from working on non securetty +Resolves: #200110 + + +* Wed Jan 3 2007 Dan Walsh 2.4.6-22 +- Fixes to run prelink in MLS machine +Resolves: #221233 + +* Tue Jan 2 2007 Dan Walsh 2.4.6-21 +- Allow spamassassin to read var_lib_t dir +Resolves: #219234 + +* Fri Dec 29 2006 Dan Walsh 2.4.6-20 +- fix mplayer to work under strict policy +- Allow iptables to use nscd +Resolves: #220794 + +* Thu Dec 28 2006 Dan Walsh 2.4.6-19 +- Add gconf policy and make it work with strict + +* Sat Dec 23 2006 Dan Walsh 2.4.6-18 +- Many fixes for strict policy and by extension mls. + * Fri Dec 22 2006 Dan Walsh 2.4.6-17 - Fix to allow ftp to bind to ports > 1024 Resolves: #219349 From fedora-cvs-commits at redhat.com Fri Jan 5 21:02:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 16:02:42 -0500 Subject: rpms/selinux-policy/FC-6 securetty_contexts-mls, NONE, 1.1 securetty_contexts-strict, NONE, 1.1 securetty_contexts-targeted, NONE, 1.1 Message-ID: <200701052102.l05L2gNx017214@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17164 Added Files: securetty_contexts-mls securetty_contexts-strict securetty_contexts-targeted Log Message: * Fri Jan 5 2007 Dan Walsh 2.4.6-23 - Allow ssh access to the krb tickets - Allow sshd to change passwd - Stop newrole -l from working on non securetty Resolves: #200110 --- NEW FILE securetty_contexts-mls --- sysadm_tty_device_t user_tty_device_t staff_tty_device_t auditadm_tty_device_t secureadm_tty_device_t --- NEW FILE securetty_contexts-strict --- sysadm_tty_device_t user_tty_device_t staff_tty_device_t --- NEW FILE securetty_contexts-targeted --- From fedora-cvs-commits at redhat.com Fri Jan 5 23:23:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:23:10 -0500 Subject: rpms/xorg-x11-drv-vmware/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-vmware.spec, 1.11, 1.12 Message-ID: <200701052323.l05NNAOh023483@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-vmware/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23430/devel Modified Files: .cvsignore sources xorg-x11-drv-vmware.spec Log Message: auto-import xorg-x11-drv-vmware-10.14.1-1.fc7 on branch devel from xorg-x11-drv-vmware-10.14.1-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 03:27:57 -0000 1.7 +++ .cvsignore 5 Jan 2007 23:23:08 -0000 1.8 @@ -1 +1 @@ -xf86-video-vmware-10.13.0.tar.bz2 +xf86-video-vmware-10.14.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 03:27:57 -0000 1.7 +++ sources 5 Jan 2007 23:23:08 -0000 1.8 @@ -1 +1 @@ -0b8951d07af049b22c90a5a185c897c2 xf86-video-vmware-10.13.0.tar.bz2 +eaf1ce9fa23363799140602afaa10f37 xf86-video-vmware-10.14.1.tar.bz2 Index: xorg-x11-drv-vmware.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-vmware/devel/xorg-x11-drv-vmware.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-drv-vmware.spec 12 Jul 2006 09:17:13 -0000 1.11 +++ xorg-x11-drv-vmware.spec 5 Jan 2007 23:23:08 -0000 1.12 @@ -6,8 +6,8 @@ Summary: Xorg X11 vmware video driver Name: xorg-x11-drv-vmware -Version: 10.13.0 -Release: 2.1 +Version: 10.14.1 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -58,6 +58,9 @@ %{_mandir}/man4/vmware.4* %changelog +* Fri Jan 05 2007 Adam Jackson 10.14.1-1.fc7 +- Update to 10.14.1 + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Fri Jan 5 23:27:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:27:50 -0500 Subject: rpms/gcc/devel .cvsignore, 1.191, 1.192 gcc41.spec, 1.137, 1.138 sources, 1.193, 1.194 gcc41-pr25993.patch, 1.1, NONE gcc41-pr27266.patch, 1.1, NONE gcc41-pr28217.patch, 1.1, NONE gcc41-pr28261.patch, 1.1, NONE gcc41-pr29054.patch, 1.2, NONE gcc41-pr29166.patch, 1.1, NONE gcc41-pr29241.patch, 1.1, NONE gcc41-pr29535-test.patch, 1.1, NONE gcc41-pr30286.patch, 1.1, NONE gcc41-pr30360.patch, 1.1, NONE gcc41-rh220627.patch, 1.1, NONE Message-ID: <200701052327.l05NRoW1026970@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26929 Modified Files: .cvsignore gcc41.spec sources Removed Files: gcc41-pr25993.patch gcc41-pr27266.patch gcc41-pr28217.patch gcc41-pr28261.patch gcc41-pr29054.patch gcc41-pr29166.patch gcc41-pr29241.patch gcc41-pr29535-test.patch gcc41-pr30286.patch gcc41-pr30360.patch gcc41-rh220627.patch Log Message: 4.1.1-52 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- .cvsignore 4 Jan 2007 09:57:02 -0000 1.191 +++ .cvsignore 5 Jan 2007 23:27:48 -0000 1.192 @@ -1 +1 @@ -gcc-4.1.1-20070102.tar.bz2 +gcc-4.1.1-20070105.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- gcc41.spec 5 Jan 2007 00:34:56 -0000 1.137 +++ gcc41.spec 5 Jan 2007 23:27:48 -0000 1.138 @@ -1,6 +1,6 @@ -%define DATE 20070102 +%define DATE 20070105 %define gcc_version 4.1.1 -%define gcc_release 51 +%define gcc_release 52 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -123,7 +123,7 @@ Patch14: gcc41-objc-rh185398.patch Patch15: gcc41-tests.patch Patch16: gcc41-pr25874.patch -Patch17: gcc41-pr29241.patch +Patch17: gcc41-pr30189.patch Patch18: gcc41-i386-tune-geode.patch Patch19: gcc41-hash-style-gnu.patch Patch20: gcc41-pr30001.patch @@ -141,19 +141,8 @@ Patch32: gcc41-ppc64-libffi-unwind.patch Patch33: gcc41-pr30113.patch Patch34: gcc41-pr30110.patch -Patch35: gcc41-pr29166.patch -Patch36: gcc41-pr27266.patch -Patch37: gcc41-pr30143.patch -Patch38: gcc41-pr28261.patch -Patch39: gcc41-pr29054.patch -Patch40: gcc41-pr29535-test.patch -Patch41: gcc41-pr30045.patch -Patch42: gcc41-pr30286.patch -Patch43: gcc41-pr25993.patch -Patch44: gcc41-pr28217.patch -Patch45: gcc41-pr30189.patch -Patch46: gcc41-rh220627.patch -Patch47: gcc41-pr30360.patch +Patch35: gcc41-pr30143.patch +Patch36: gcc41-pr30045.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -445,7 +434,7 @@ %patch14 -p0 -b .objc-rh185398~ %patch15 -p0 -b .tests~ %patch16 -p0 -b .pr25874~ -%patch17 -p0 -b .pr29241~ +%patch17 -p0 -b .pr30189~ %patch18 -p0 -b .i386-tune-geode~ %patch19 -p0 -b .hash-style-gnu~ %patch20 -p0 -b .pr30001~ @@ -463,19 +452,8 @@ %patch32 -p0 -b .ppc64-libffi-unwind~ %patch33 -p0 -b .pr30113~ %patch34 -p0 -b .pr30110~ -%patch35 -p0 -b .pr29166~ -%patch36 -p0 -b .pr27266~ -%patch37 -p0 -b .pr30143~ -%patch38 -p0 -b .pr28261~ -%patch39 -p0 -b .pr29054~ -%patch40 -p0 -b .pr29535-test~ -%patch41 -p0 -b .pr30045~ -%patch42 -p0 -b .pr30286~ -%patch43 -p0 -b .pr25993~ -%patch44 -p0 -b .pr28217~ -%patch45 -p0 -b .pr30189~ -%patch46 -p0 -b .rh220627~ -%patch47 -p0 -b .pr30360~ +%patch35 -p0 -b .pr30143~ +%patch36 -p0 -b .pr30045~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1547,6 +1525,11 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Fri Jan 5 2007 Jakub Jelinek 4.1.1-52 +- update from gcc-4_1-branch (-r120325:120507) + - PRs c++/30382, middle-end/27826, middle-end/28116, + tree-optimization/30212 + * Thu Jan 4 2007 Jakub Jelinek 4.1.1-51 - bootstrap Ada on ppc32 (David Woodhouse) - fix complex division with -std=c99 or -std=gnu99 (PR c/30360) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- sources 4 Jan 2007 09:57:02 -0000 1.193 +++ sources 5 Jan 2007 23:27:48 -0000 1.194 @@ -1 +1 @@ -8a44fdf031974e9640b6ca7c77f0b499 gcc-4.1.1-20070102.tar.bz2 +4b9c1eb1d83c309010044b827b8c3e45 gcc-4.1.1-20070105.tar.bz2 --- gcc41-pr25993.patch DELETED --- --- gcc41-pr27266.patch DELETED --- --- gcc41-pr28217.patch DELETED --- --- gcc41-pr28261.patch DELETED --- --- gcc41-pr29054.patch DELETED --- --- gcc41-pr29166.patch DELETED --- --- gcc41-pr29241.patch DELETED --- --- gcc41-pr29535-test.patch DELETED --- --- gcc41-pr30286.patch DELETED --- --- gcc41-pr30360.patch DELETED --- --- gcc41-rh220627.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 5 23:31:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:31:44 -0500 Subject: rpms/libXft/devel .cvsignore, 1.6, 1.7 libXft.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200701052331.l05NViB0030040@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXft/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29992/devel Modified Files: .cvsignore libXft.spec sources Log Message: auto-import libXft-2.1.12-1.fc7 on branch devel from libXft-2.1.12-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXft/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Jun 2006 03:22:03 -0000 1.6 +++ .cvsignore 5 Jan 2007 23:31:42 -0000 1.7 @@ -1,3 +1 @@ -*.tar.bz2 -*.tar.gz -clog +libXft-2.1.12.tar.bz2 Index: libXft.spec =================================================================== RCS file: /cvs/dist/rpms/libXft/devel/libXft.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libXft.spec 12 Jul 2006 07:07:34 -0000 1.17 +++ libXft.spec 5 Jan 2007 23:31:42 -0000 1.18 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXft runtime library Name: libXft -Version: 2.1.10 -Release: 1.1 +Version: 2.1.12 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -95,6 +95,9 @@ %{_mandir}/man3/Xft.3* %changelog +* Fri Jan 05 2007 Adam Jackson 2.1.12-1.fc7 +- Update to 2.1.12 + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXft/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Jun 2006 03:22:03 -0000 1.7 +++ sources 5 Jan 2007 23:31:42 -0000 1.8 @@ -1,2 +1 @@ -03f27b29ec11c8f9436c63fde62367b9 libXft-2.1.8.2.tar.bz2 -5905c7687fba70d1cd69b2c0ab9a098c libXft-2.1.10.tar.bz2 +1309301e2d979bd475dc58325cb8c056 libXft-2.1.12.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 5 23:35:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:35:20 -0500 Subject: rpms/xorg-x11-xauth/devel .cvsignore, 1.6, 1.7 sources, 1.7, 1.8 xorg-x11-xauth.spec, 1.13, 1.14 Message-ID: <200701052335.l05NZKZY032744@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xauth/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32697/devel Modified Files: .cvsignore sources xorg-x11-xauth.spec Log Message: auto-import xorg-x11-xauth-1.0.2-1.fc7 on branch devel from xorg-x11-xauth-1.0.2-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 31 Jan 2006 15:21:56 -0000 1.6 +++ .cvsignore 5 Jan 2007 23:35:18 -0000 1.7 @@ -1 +1 @@ -xauth-1.0.1.tar.bz2 +xauth-1.0.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 31 Jan 2006 15:21:56 -0000 1.7 +++ sources 5 Jan 2007 23:35:18 -0000 1.8 @@ -1 +1 @@ -ed848ebba8d3a1ca727b80d6b89dc3c3 xauth-1.0.1.tar.bz2 +31b956edaeb453ddaa640420e97b25b2 xauth-1.0.2.tar.bz2 Index: xorg-x11-xauth.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-xauth.spec 12 Jul 2006 09:20:49 -0000 1.13 +++ xorg-x11-xauth.spec 5 Jan 2007 23:35:18 -0000 1.14 @@ -2,8 +2,8 @@ Summary: X.Org X11 X authority utilities Name: xorg-x11-%{pkgname} -Version: 1.0.1 -Release: 2.1 +Version: 1.0.2 +Release: 1%{?dist} # NOTE: Remove Epoch line if package gets renamed Epoch: 1 License: MIT/X11 @@ -62,10 +62,13 @@ %{_bindir}/xauth %{_bindir}/mkxauth #%dir %{_mandir}/man1x -%{_mandir}/man1/xauth.1x* -%{_mandir}/man1/mkxauth.1x* +%{_mandir}/man1/xauth.1* +%{_mandir}/man1/mkxauth.1* %changelog +* Fri Jan 05 2007 Adam Jackson 1:1.0.2-1.fc7 +- Update to 1.0.2 + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Fri Jan 5 23:42:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:42:10 -0500 Subject: rpms/xorg-x11-font-utils/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xorg-x11-font-utils.spec, 1.22, 1.23 fonttosfnt-1.0.1-freetype22-build-fix.patch, 1.1, NONE Message-ID: <200701052342.l05NgAGJ026948@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-font-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21927/devel Modified Files: .cvsignore sources xorg-x11-font-utils.spec Removed Files: fonttosfnt-1.0.1-freetype22-build-fix.patch Log Message: auto-import xorg-x11-font-utils-7.1-4.fc7 on branch devel from xorg-x11-font-utils-7.1-4.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 22 Jun 2006 03:16:26 -0000 1.10 +++ .cvsignore 5 Jan 2007 23:42:08 -0000 1.11 @@ -1,3 +1,5 @@ -*.tar.bz2 -*.tar.gz -clog +bdftopcf-1.0.0.tar.bz2 +font-util-1.0.1.tar.bz2 +mkfontdir-1.0.2.tar.bz2 +mkfontscale-1.0.1.tar.bz2 +fonttosfnt-1.0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 22 Jun 2006 03:16:41 -0000 1.10 +++ sources 5 Jan 2007 23:42:08 -0000 1.11 @@ -1,5 +1,5 @@ f489db67914ca4d9d2fa0331132f342b bdftopcf-1.0.0.tar.bz2 b81535f78fe05732931f02841e5ca37b font-util-1.0.1.tar.bz2 -efe452ec264ee0fddbe9300873164dec fonttosfnt-1.0.1.tar.bz2 94da9dcd2447300e8fdada896d7ed433 mkfontdir-1.0.2.tar.bz2 1e74e68eb9e8e91c6b7b615d80dc5ee1 mkfontscale-1.0.1.tar.bz2 +b0ebd86029571239b9d7b0c61191b591 fonttosfnt-1.0.3.tar.bz2 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-font-utils.spec 14 Jul 2006 15:47:14 -0000 1.22 +++ xorg-x11-font-utils.spec 5 Jan 2007 23:42:08 -0000 1.23 @@ -1,36 +1,25 @@ %define pkgname font-utils -# NOTE: When enabled, this provides symbolic links in /usr/X11R6/bin which -# provide backward compatibility for utilities/scripts that hard code paths -# to /usr/X11R6/bin/mkfontdir et al. This compatibility support will be -# disabled and removed in a future OS release, so 3rd party application -# developers and package maintainers should update their software as soon -# as possible. -%define with_X11R6_compat 1 -%define _x11r6bindir /usr/X11R6/bin - Summary: X.Org X11 font utilities Name: xorg-x11-%{pkgname} # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 # NOTE: Keep version set to the X11Rx.y release the package is based upon. Version: 7.1 -# Bump release for updates. -Release: 2 +Release: 4%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.0.tar.bz2 -Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.1.tar.bz2 +Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.2.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2 Source4: ftp://ftp.x.org/pub/individual/app/font-util-1.0.1.tar.bz2 Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch -Patch2: fonttosfnt-1.0.1-freetype22-build-fix.patch BuildRequires: pkgconfig # xorg-x11-libXfont-devel needed for bdftopcf @@ -80,7 +69,6 @@ %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 %patch0 -p0 -b .font-util-mapdir-use-datadir-fix %patch1 -p0 -b .autoconf-add-with-fontdir-option -%patch2 -p1 -b .freetype22 %build # Build all apps @@ -110,16 +98,6 @@ done } -%if %{with_X11R6_compat} -{ - mkdir -p $RPM_BUILD_ROOT%{_x11r6bindir} - - for util in mkfontdir mkfontscale ; do - ln -sf ../../..%{_bindir}/$util $RPM_BUILD_ROOT%{_x11r6bindir}/$util - done -} -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -133,14 +111,6 @@ %{_bindir}/mkfontdir %{_bindir}/mkfontscale %{_bindir}/ucs2any -# NOTE: These compat symlinks will be removed in a future OS release. -# Developers and package maintainers should update their software to handle -# the X11R7 changes in a clean manner. -%if %{with_X11R6_compat} -%dir %{_x11r6bindir} -%{_x11r6bindir}/mkfontdir -%{_x11r6bindir}/mkfontscale -%endif %dir %{_datadir}/X11 %dir %{_datadir}/X11/fonts %dir %{_datadir}/X11/fonts/util @@ -148,14 +118,20 @@ %{_datadir}/aclocal/fontutil.m4 %{_libdir}/pkgconfig/fontutil.pc #%dir %{_mandir}/man1x -%{_mandir}/man1/bdftopcf.1x* -%{_mandir}/man1/bdftruncate.1x* -%{_mandir}/man1/fonttosfnt.1x* -%{_mandir}/man1/mkfontdir.1x* -%{_mandir}/man1/mkfontscale.1x* -%{_mandir}/man1/ucs2any.1x* +%{_mandir}/man1/bdftopcf.1* +%{_mandir}/man1/bdftruncate.1* +%{_mandir}/man1/fonttosfnt.1* +%{_mandir}/man1/mkfontdir.1* +%{_mandir}/man1/mkfontscale.1* +%{_mandir}/man1/ucs2any.1* %changelog +* Fri Jan 05 2007 Adam Jackson 1:7.1-4.fc7 +- fonttosfnt 1.0.3 + +* Thu Aug 17 2006 Adam Jackson 1:7.1-3 +- Remove X11R6 symlinks. + * Fri Jul 14 2006 Adam Jackson 1:7.1-2 - Added fonttosfnt-1.0.1-freetype22-build-fix.patch to fix a build failure with new freetype 2.2. --- fonttosfnt-1.0.1-freetype22-build-fix.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 5 23:47:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:47:00 -0500 Subject: rpms/libICE/devel .cvsignore, 1.7, 1.8 libICE.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200701052347.l05Nl0Q2021768@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libICE/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21731/devel Modified Files: .cvsignore libICE.spec sources Log Message: auto-import libICE-1.0.3-1.fc7 on branch devel from libICE-1.0.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libICE/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2006 14:55:10 -0000 1.7 +++ .cvsignore 5 Jan 2007 23:46:57 -0000 1.8 @@ -1 +1 @@ -libICE-1.0.2.tar.bz2 +libICE-1.0.3.tar.bz2 Index: libICE.spec =================================================================== RCS file: /cvs/dist/rpms/libICE/devel/libICE.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libICE.spec 20 Nov 2006 14:55:10 -0000 1.16 +++ libICE.spec 5 Jan 2007 23:46:57 -0000 1.17 @@ -1,7 +1,7 @@ Summary: X.Org X11 libICE runtime library Name: libICE -Version: 1.0.2 -Release: 1 +Version: 1.0.3 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/ice.pc %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.3-1 +- Update to 1.0.3 + * Mon Nov 20 2006 Adam Jackson 1.0.2-1 - Update to 1.0.2. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libICE/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 14:55:10 -0000 1.9 +++ sources 5 Jan 2007 23:46:57 -0000 1.10 @@ -1 +1 @@ -b0ace9d84a145e070ba7a7ddde6cc77c libICE-1.0.2.tar.bz2 +071f96648ac25c8e87a3de11a7de2d8a libICE-1.0.3.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 5 23:50:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 18:50:05 -0500 Subject: rpms/libXScrnSaver/devel .cvsignore, 1.9, 1.10 libXScrnSaver.spec, 1.21, 1.22 sources, 1.9, 1.10 Message-ID: <200701052350.l05No5s7023043@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXScrnSaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23017/devel Modified Files: .cvsignore libXScrnSaver.spec sources Log Message: auto-import libXScrnSaver-1.1.2-1.fc7 on branch devel from libXScrnSaver-1.1.2-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXScrnSaver/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Nov 2006 15:19:08 -0000 1.9 +++ .cvsignore 5 Jan 2007 23:50:03 -0000 1.10 @@ -1 +1 @@ -libXScrnSaver-1.1.1.tar.bz2 +libXScrnSaver-1.1.2.tar.bz2 Index: libXScrnSaver.spec =================================================================== RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libXScrnSaver.spec 20 Nov 2006 15:19:08 -0000 1.21 +++ libXScrnSaver.spec 5 Jan 2007 23:50:03 -0000 1.22 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXss runtime library Name: libXScrnSaver -Version: 1.1.1 -Release: 1 +Version: 1.1.2 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -83,6 +83,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jan 05 2007 Adam Jackson 1.1.2-1 +- Update to 1.1.2 + * Mon Nov 20 2006 Adam Jackson 1.1.1-1 - Update to 1.1.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXScrnSaver/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 15:19:08 -0000 1.9 +++ sources 5 Jan 2007 23:50:03 -0000 1.10 @@ -1 +1 @@ -264f63058ab690142ded20585f8ac642 libXScrnSaver-1.1.1.tar.bz2 +ac2d697dd02f51e5c15f7104f4be5328 libXScrnSaver-1.1.2.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 00:00:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:00:44 -0500 Subject: rpms/libXau/devel .cvsignore, 1.8, 1.9 libXau.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200701060000.l0600i3I023994@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXau/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23968/devel Modified Files: .cvsignore libXau.spec sources Log Message: auto-import libXau-1.0.3-1.fc7 on branch devel from libXau-1.0.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXau/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Nov 2006 15:22:54 -0000 1.8 +++ .cvsignore 6 Jan 2007 00:00:42 -0000 1.9 @@ -1 +1 @@ -libXau-1.0.2.tar.bz2 +libXau-1.0.3.tar.bz2 Index: libXau.spec =================================================================== RCS file: /cvs/dist/rpms/libXau/devel/libXau.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libXau.spec 20 Nov 2006 15:22:54 -0000 1.16 +++ libXau.spec 6 Jan 2007 00:00:42 -0000 1.17 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXau runtime library Name: libXau -Version: 1.0.2 -Release: 1 +Version: 1.0.3 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -75,9 +75,12 @@ %{_libdir}/libXau.so %{_libdir}/pkgconfig/xau.pc #%dir %{_mandir}/man3x -%{_mandir}/man3/*.3x* +%{_mandir}/man3/*.3* %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.3-1 +- Update to 1.0.3 + * Mon Nov 20 2006 Adam Jackson 1.0.2-1 - Update to 1.0.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXau/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 15:22:54 -0000 1.9 +++ sources 6 Jan 2007 00:00:42 -0000 1.10 @@ -1 +1 @@ -aeea2b8949d5aab2ce53286b8dfc64b9 libXau-1.0.2.tar.bz2 +75a9f2b85cd1617b5ca98c9095323853 libXau-1.0.3.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 00:08:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:08:39 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.390,1.391 Message-ID: <200701060008.l0608dOw024204@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24189 Modified Files: eclipse.spec Log Message: disable org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64 Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- eclipse.spec 5 Jan 2007 20:25:27 -0000 1.390 +++ eclipse.spec 6 Jan 2007 00:08:36 -0000 1.391 @@ -1308,6 +1308,7 @@ %else aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \ --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar + --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_3.2.1.R32x_v20060919.jar %endif %endif @@ -1708,7 +1709,8 @@ %changelog * Fri Jan 05 2007 Ben Konrath 3.2.1-27 - Use /g in tomcat version replacement. -- Disable com.jcraft.jsch_0.1.28.jar on ia64. +- Disable com.jcraft.jsch_0.1.28.jar and + org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64. * Tue Dec 19 2006 Ben Konrath 3.2.1-26 - Use sed instead of patch for tomcat version. From fedora-cvs-commits at redhat.com Sat Jan 6 00:09:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:09:30 -0500 Subject: rpms/libXfontcache/devel .cvsignore, 1.8, 1.9 libXfontcache.spec, 1.16, 1.17 sources, 1.8, 1.9 Message-ID: <200701060009.l0609UDV024293@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXfontcache/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24267/devel Modified Files: .cvsignore libXfontcache.spec sources Log Message: auto-import libXfontcache-1.0.4-1.fc7 on branch devel from libXfontcache-1.0.4-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXfontcache/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Nov 2006 17:08:09 -0000 1.8 +++ .cvsignore 6 Jan 2007 00:09:28 -0000 1.9 @@ -1 +1 @@ -libXfontcache-1.0.3.tar.bz2 +libXfontcache-1.0.4.tar.bz2 Index: libXfontcache.spec =================================================================== RCS file: /cvs/dist/rpms/libXfontcache/devel/libXfontcache.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libXfontcache.spec 20 Nov 2006 17:08:09 -0000 1.16 +++ libXfontcache.spec 6 Jan 2007 00:09:28 -0000 1.17 @@ -1,6 +1,6 @@ Summary: X.Org X11 libXfontcache runtime library Name: libXfontcache -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries @@ -79,6 +79,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.4-1 +- Update to 1.0.4 + * Mon Nov 20 2006 Adam Jackson 1.0.3-1.fc7 - Update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXfontcache/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Nov 2006 17:08:09 -0000 1.8 +++ sources 6 Jan 2007 00:09:28 -0000 1.9 @@ -1 +1 @@ -a21c8f8b89cdc7fe1780d45bb6b82c13 libXfontcache-1.0.3.tar.bz2 +1adca018aa7bf2d215f20a69c10828ad libXfontcache-1.0.4.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 00:12:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:12:49 -0500 Subject: rpms/libXres/devel .cvsignore, 1.8, 1.9 libXres.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200701060012.l060CnO7024411@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXres/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24385/devel Modified Files: .cvsignore libXres.spec sources Log Message: auto-import libXres-1.0.3-1.fc7 on branch devel from libXres-1.0.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXres/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Nov 2006 19:20:11 -0000 1.8 +++ .cvsignore 6 Jan 2007 00:12:42 -0000 1.9 @@ -1 +1 @@ -libXres-1.0.2.tar.bz2 +libXres-1.0.3.tar.bz2 Index: libXres.spec =================================================================== RCS file: /cvs/dist/rpms/libXres/devel/libXres.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libXres.spec 20 Nov 2006 19:20:11 -0000 1.16 +++ libXres.spec 6 Jan 2007 00:12:42 -0000 1.17 @@ -1,6 +1,6 @@ Summary: X.Org X11 libXres runtime library Name: libXres -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries @@ -79,6 +79,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.3-1 +- Update to 1.0.3 + * Mon Nov 20 2006 Adam Jackson 1.0.2-1 - Update to 1.0.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXres/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 19:20:11 -0000 1.9 +++ sources 6 Jan 2007 00:12:42 -0000 1.10 @@ -1 +1 @@ -a848b48f320e7f15210cbc9e9cd02d18 libXres-1.0.2.tar.bz2 +de66ffb657aba64c9d6dbdeabb757f3e libXres-1.0.3.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 00:37:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:37:45 -0500 Subject: rpms/gtk2/devel gtk+-2.10.7-cursor-blink.patch, NONE, 1.1 gtk+-2.10.7-search.patch, NONE, 1.1 .cvsignore, 1.62, 1.63 gtk2.spec, 1.202, 1.203 sources, 1.68, 1.69 Message-ID: <200701060037.l060bjHZ030352@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28267 Modified Files: .cvsignore gtk2.spec sources Added Files: gtk+-2.10.7-cursor-blink.patch gtk+-2.10.7-search.patch Log Message: 2.10.7 gtk+-2.10.7-cursor-blink.patch: gtkentry.c | 69 ++++++++++++++++++++++++++++++++++++++++--------- gtksettings.c | 32 ++++++++++++++++++++++ gtktextview.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 156 insertions(+), 26 deletions(-) --- NEW FILE gtk+-2.10.7-cursor-blink.patch --- --- gtk+-2.10.7/gtk/gtksettings.c.cursor-blink 2006-12-30 18:35:43.000000000 -0500 +++ gtk+-2.10.7/gtk/gtksettings.c 2007-01-05 18:56:11.000000000 -0500 @@ -64,6 +64,7 @@ PROP_DOUBLE_CLICK_DISTANCE, PROP_CURSOR_BLINK, PROP_CURSOR_BLINK_TIME, + PROP_CURSOR_BLINK_TIMEOUT, PROP_SPLIT_CURSOR, PROP_THEME_NAME, PROP_ICON_THEME_NAME, @@ -201,6 +202,15 @@ GTK_PARAM_READWRITE), NULL); g_assert (result == PROP_DOUBLE_CLICK_DISTANCE); + + /** + * GtkSettings:gtk-cursor-blink: + * + * Whether the cursor should blink. + * + * Also see the gtk-cursor-blink-timeout setting, which allows + * more flexible control over cursor blinking. + */ result = settings_install_property_parser (class, g_param_spec_boolean ("gtk-cursor-blink", P_("Cursor Blink"), @@ -212,11 +222,31 @@ result = settings_install_property_parser (class, g_param_spec_int ("gtk-cursor-blink-time", P_("Cursor Blink Time"), - P_("Length of the cursor blink cycle, in milleseconds"), + P_("Length of the cursor blink cycle, in milliseconds"), 100, G_MAXINT, 1200, GTK_PARAM_READWRITE), NULL); g_assert (result == PROP_CURSOR_BLINK_TIME); + + /** + * GtkSettings:gtk-cursor-blink-timeout: + * + * Time after which the cursor stops blinking, in seconds. + * The timer is reset after each user interaction. + * + * Setting this to zero has the same effect as setting + * gtk-cursor-blinks to %FALSE. + * + * Since: 2.12 + */ + result = settings_install_property_parser (class, + g_param_spec_int ("gtk-cursor-blink-timeout", + P_("Cursor Blink Timeout"), + P_("Time after which the cursor stops blinking, in seconds"), + 1, G_MAXINT, 60, + GTK_PARAM_READWRITE), + NULL); + g_assert (result == PROP_CURSOR_BLINK_TIMEOUT); result = settings_install_property_parser (class, g_param_spec_boolean ("gtk-split-cursor", P_("Split Cursor"), --- gtk+-2.10.7/gtk/gtkentry.c.cursor-blink 2007-01-05 18:56:11.000000000 -0500 +++ gtk+-2.10.7/gtk/gtkentry.c 2007-01-05 18:58:58.000000000 -0500 @@ -82,6 +82,7 @@ { gfloat xalign; gint insert_pos; + guint blink_time; /* time in msec the cursor has blinked since last user event */ guint real_changed : 1; guint change_count : 8; }; @@ -334,6 +335,7 @@ GtkStateType previous_state); static void gtk_entry_check_cursor_blink (GtkEntry *entry); static void gtk_entry_pend_cursor_blink (GtkEntry *entry); +static void gtk_entry_reset_blink_time (GtkEntry *entry); static void get_text_area_size (GtkEntry *entry, gint *x, gint *y, @@ -1654,6 +1656,8 @@ (entry->button && event->button != entry->button)) return FALSE; + gtk_entry_reset_blink_time (entry); + entry->button = event->button; if (!GTK_WIDGET_HAS_FOCUS (widget)) @@ -1744,7 +1748,7 @@ entry->drag_start_y = event->y + entry->scroll_offset; } else - gtk_editable_set_position (editable, tmp_pos); + gtk_editable_set_position (editable, tmp_pos); break; case GDK_2BUTTON_PRESS: @@ -2006,6 +2010,7 @@ { GtkEntry *entry = GTK_ENTRY (widget); + gtk_entry_reset_blink_time (entry); gtk_entry_pend_cursor_blink (entry); if (entry->editable) @@ -2078,6 +2083,7 @@ "direction_changed", G_CALLBACK (gtk_entry_keymap_direction_changed), entry); + gtk_entry_reset_blink_time (entry); gtk_entry_check_cursor_blink (entry); return FALSE; @@ -5281,9 +5287,10 @@ * - the widget has focus */ -#define CURSOR_ON_MULTIPLIER 0.66 -#define CURSOR_OFF_MULTIPLIER 0.34 -#define CURSOR_PEND_MULTIPLIER 1.0 +#define CURSOR_ON_MULTIPLIER 2 +#define CURSOR_OFF_MULTIPLIER 1 +#define CURSOR_PEND_MULTIPLIER 3 +#define CURSOR_DIVIDER 3 static gboolean cursor_blinks (GtkEntry *entry) @@ -5315,6 +5322,17 @@ return time; } +static gint +get_cursor_blink_timeout (GtkEntry *entry) +{ + GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (entry)); + gint timeout; + + g_object_get (settings, "gtk-cursor-blink-timeout", &timeout, NULL); + + return timeout; +} + static void show_cursor (GtkEntry *entry) { @@ -5346,11 +5364,14 @@ blink_cb (gpointer data) { GtkEntry *entry; + GtkEntryPrivate *priv; + gint blink_timeout; GDK_THREADS_ENTER (); entry = GTK_ENTRY (data); - + priv = GTK_ENTRY_GET_PRIVATE (entry); + if (!GTK_WIDGET_HAS_FOCUS (entry)) { g_warning ("GtkEntry - did not receive focus-out-event. If you\n" @@ -5363,18 +5384,27 @@ } g_assert (entry->selection_bound == entry->current_pos); - - if (entry->cursor_visible) + + blink_timeout = get_cursor_blink_timeout (entry); + if (priv->blink_time > 1000 * blink_timeout && + blink_timeout < G_MAXINT/1000) + { + /* we've blinked enough without the user doing anything, stop blinking */ + show_cursor (entry); + entry->blink_timeout = 0; + } + else if (entry->cursor_visible) { hide_cursor (entry); - entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_OFF_MULTIPLIER, + entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); } else { show_cursor (entry); - entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER, + priv->blink_time += get_cursor_time (entry); + entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); } @@ -5388,14 +5418,18 @@ static void gtk_entry_check_cursor_blink (GtkEntry *entry) { + GtkEntryPrivate *priv; + + priv = GTK_ENTRY_GET_PRIVATE (entry); + if (cursor_blinks (entry)) { if (!entry->blink_timeout) { - entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER, + show_cursor (entry); + entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); - show_cursor (entry); } } else @@ -5419,13 +5453,24 @@ if (entry->blink_timeout != 0) g_source_remove (entry->blink_timeout); - entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_PEND_MULTIPLIER, + entry->blink_timeout = g_timeout_add (get_cursor_time (entry) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER, blink_cb, entry); show_cursor (entry); } } +static void +gtk_entry_reset_blink_time (GtkEntry *entry) +{ + GtkEntryPrivate *priv; + + priv = GTK_ENTRY_GET_PRIVATE (entry); + + priv->blink_time = 0; +} + + /* completion */ static gint gtk_entry_completion_timeout (gpointer data) --- gtk+-2.10.7/gtk/gtktextview.c.cursor-blink 2007-01-02 01:49:04.000000000 -0500 +++ gtk+-2.10.7/gtk/gtktextview.c 2007-01-05 18:56:11.000000000 -0500 @@ -99,6 +99,16 @@ #define SPACE_FOR_CURSOR 1 +typedef struct _GtkTextViewPrivate GtkTextViewPrivate; + +#define GTK_TEXT_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_VIEW, GtkTextViewPrivate)) + +struct _GtkTextViewPrivate +{ + guint blink_time; /* time in msec the cursor has blinked since last user event */ +}; + + struct _GtkTextPendingScroll { GtkTextMark *mark; @@ -291,6 +301,7 @@ static void gtk_text_view_check_cursor_blink (GtkTextView *text_view); static void gtk_text_view_pend_cursor_blink (GtkTextView *text_view); static void gtk_text_view_stop_cursor_blink (GtkTextView *text_view); +static void gtk_text_view_reset_blink_time (GtkTextView *text_view); static void gtk_text_view_value_changed (GtkAdjustment *adj, GtkTextView *view); @@ -1008,6 +1019,8 @@ gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "move_focus", 1, GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD); + + g_type_class_add_private (gobject_class, sizeof (GtkTextViewPrivate)); } static void @@ -3920,6 +3933,7 @@ if (obscure) gtk_text_view_obscure_mouse_cursor (text_view); + gtk_text_view_reset_blink_time (text_view); gtk_text_view_pend_cursor_blink (text_view); return retval; @@ -3963,6 +3977,8 @@ return FALSE; } + gtk_text_view_reset_blink_time (text_view); + #if 0 /* debug hack */ if (event->button == 3 && (event->state & GDK_CONTROL_MASK) != 0) @@ -4104,7 +4120,9 @@ gtk_widget_queue_draw (widget); DV(g_print (G_STRLOC": focus_in_event\n")); - + + gtk_text_view_reset_blink_time (text_view); + if (text_view->cursor_visible && text_view->layout) { gtk_text_layout_set_cursor_visible (text_view->layout, TRUE); @@ -4435,9 +4453,10 @@ g_slist_free (copy); } -#define CURSOR_ON_MULTIPLIER 0.66 -#define CURSOR_OFF_MULTIPLIER 0.34 -#define CURSOR_PEND_MULTIPLIER 1.0 +#define CURSOR_ON_MULTIPLIER 2 +#define CURSOR_OFF_MULTIPLIER 1 +#define CURSOR_PEND_MULTIPLIER 3 +#define CURSOR_DIVIDER 3 static gboolean cursor_blinks (GtkTextView *text_view) @@ -4482,6 +4501,18 @@ return time; } +static gint +get_cursor_blink_timeout (GtkTextView *text_view) +{ + GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view)); + gint time; + + g_object_get (settings, "gtk-cursor-blink-timeout", &time, NULL); + + return time; +} + + /* * Blink! */ @@ -4490,12 +4521,15 @@ blink_cb (gpointer data) { GtkTextView *text_view; + GtkTextViewPrivate *priv; gboolean visible; + gint blink_timeout; GDK_THREADS_ENTER (); text_view = GTK_TEXT_VIEW (data); - + priv = GTK_TEXT_VIEW_GET_PRIVATE (text_view); + if (!GTK_WIDGET_HAS_FOCUS (text_view)) { g_warning ("GtkTextView - did not receive focus-out-event. If you\n" @@ -4512,14 +4546,25 @@ visible = gtk_text_layout_get_cursor_visible (text_view->layout); - if (visible) - text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER, - blink_cb, - text_view); - else - text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_ON_MULTIPLIER, + blink_timeout = get_cursor_blink_timeout (text_view); + if (priv->blink_time > 1000 * blink_timeout && + blink_timeout < G_MAXINT/1000) + { + /* we've blinked enough without the user doing anything, stop blinking */ + visible = 0; + text_view->blink_timeout = 0; + } + else if (visible) + text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); + else + { + text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER, + blink_cb, + text_view); + priv->blink_time += get_cursor_time (text_view); + } /* Block changed_handler while changing the layout's cursor visibility * because it would expose the whole paragraph. Instead, we expose @@ -4565,7 +4610,7 @@ { gtk_text_layout_set_cursor_visible (text_view->layout, TRUE); - text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER, + text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); } @@ -4594,12 +4639,22 @@ gtk_text_view_stop_cursor_blink (text_view); gtk_text_layout_set_cursor_visible (text_view->layout, TRUE); - text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_PEND_MULTIPLIER, + text_view->blink_timeout = g_timeout_add (get_cursor_time (text_view) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER, blink_cb, text_view); } } +static void +gtk_text_view_reset_blink_time (GtkTextView *text_view) +{ + GtkTextViewPrivate *priv; + + priv = GTK_TEXT_VIEW_GET_PRIVATE (text_view); + + priv->blink_time = 0; +} + /* * Key binding handlers gtk+-2.10.7-search.patch: Makefile.am | 10 gtkfilechooserdefault.c | 1510 ++++++++++++++++++++++++++++++++++++----------- gtkfilechooserprivate.h | 35 - gtkquery.c | 142 ++++ gtkquery.h | 74 ++ gtksearchengine.c | 197 ++++++ gtksearchengine.h | 91 ++ gtksearchenginebeagle.c | 420 +++++++++++++ gtksearchenginebeagle.h | 59 + gtksearchenginesimple.c | 378 +++++++++++ gtksearchenginesimple.h | 59 + gtksearchenginetracker.c | 362 +++++++++++ gtksearchenginetracker.h | 59 + 13 files changed, 3051 insertions(+), 345 deletions(-) --- NEW FILE gtk+-2.10.7-search.patch --- --- /dev/null 2007-01-05 16:56:08.831882476 -0500 +++ gtk+-2.10.7/gtk/gtksearchenginetracker.h 2007-01-05 18:41:06.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Mr Jamie McCracken + * + * This 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 of the License, or (at your option) any later version. + * + * This 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 this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Jamie McCracken (jamiemcc at gnome.org) + * + * Based on nautilus-search-engine-tracker.h + */ + +#ifndef __GTK_SEARCH_ENGINE_TRACKER_H__ +#define __GTK_SEARCH_ENGINE_TRACKER_H__ + +#include "gtksearchengine.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_SEARCH_ENGINE_TRACKER (_gtk_search_engine_tracker_get_type ()) +#define GTK_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTracker)) +#define GTK_SEARCH_ENGINE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTrackerClass)) +#define GTK_IS_SEARCH_ENGINE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER)) +#define GTK_IS_SEARCH_ENGINE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE_TRACKER)) +#define GTK_SEARCH_ENGINE_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE_TRACKER, GtkSearchEngineTrackerClass)) + +typedef struct _GtkSearchEngineTracker GtkSearchEngineTracker; +typedef struct _GtkSearchEngineTrackerClass GtkSearchEngineTrackerClass; +typedef struct _GtkSearchEngineTrackerPrivate GtkSearchEngineTrackerPrivate; + +struct _GtkSearchEngineTracker +{ + GtkSearchEngine parent; + + GtkSearchEngineTrackerPrivate *priv; +}; + +struct _GtkSearchEngineTrackerClass +{ + GtkSearchEngineClass parent_class; +}; + +GType _gtk_search_engine_tracker_get_type (void); + +GtkSearchEngine* _gtk_search_engine_tracker_new (void); + +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */ --- /dev/null 2007-01-05 16:56:08.831882476 -0500 +++ gtk+-2.10.7/gtk/gtksearchengine.h 2007-01-05 18:41:06.000000000 -0500 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2005 Novell, Inc. + * + * This 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 of the License, or (at your option) any later version. + * + * This 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 this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Anders Carlsson + * + * Based on nautilus-search-engine.h + */ + +#ifndef __GTK_SEARCH_ENGINE_H__ +#define __GTK_SEARCH_ENGINE_H__ + +#include +#include "gtkquery.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_SEARCH_ENGINE (_gtk_search_engine_get_type ()) +#define GTK_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngine)) +#define GTK_SEARCH_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass)) +#define GTK_IS_SEARCH_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE)) +#define GTK_IS_SEARCH_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE)) +#define GTK_SEARCH_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE, GtkSearchEngineClass)) + +typedef struct _GtkSearchEngine GtkSearchEngine; +typedef struct _GtkSearchEngineClass GtkSearchEngineClass; +typedef struct _GtkSearchEnginePrivate GtkSearchEnginePrivate; + +struct _GtkSearchEngine +{ + GObject parent; + + GtkSearchEnginePrivate *priv; +}; + +struct _GtkSearchEngineClass +{ + GObjectClass parent_class; + + /* VTable */ + void (*set_query) (GtkSearchEngine *engine, + GtkQuery *query); + void (*start) (GtkSearchEngine *engine); + void (*stop) (GtkSearchEngine *engine); + gboolean (*is_indexed) (GtkSearchEngine *engine); + + /* Signals */ + void (*hits_added) (GtkSearchEngine *engine, + GList *hits); + void (*hits_subtracted) (GtkSearchEngine *engine, + GList *hits); + void (*finished) (GtkSearchEngine *engine); + void (*error) (GtkSearchEngine *engine, + const gchar *error_message); +}; + +GType _gtk_search_engine_get_type (void); +gboolean _gtk_search_engine_enabled (void); + +GtkSearchEngine* _gtk_search_engine_new (void); + +void _gtk_search_engine_set_query (GtkSearchEngine *engine, + GtkQuery *query); +void _gtk_search_engine_start (GtkSearchEngine *engine); +void _gtk_search_engine_stop (GtkSearchEngine *engine); +gboolean _gtk_search_engine_is_indexed (GtkSearchEngine *engine); + +void _gtk_search_engine_hits_added (GtkSearchEngine *engine, + GList *hits); +void _gtk_search_engine_hits_subtracted (GtkSearchEngine *engine, + GList *hits); +void _gtk_search_engine_finished (GtkSearchEngine *engine); +void _gtk_search_engine_error (GtkSearchEngine *engine, + const gchar *error_message); + +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_H__ */ --- /dev/null 2007-01-05 16:56:08.831882476 -0500 +++ gtk+-2.10.7/gtk/gtksearchenginebeagle.h 2007-01-05 18:41:06.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Novell, Inc. + * + * This 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 of the License, or (at your option) any later version. + * + * This 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 this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Anders Carlsson + * + * Based on nautilus-search-engine-beagle.h + */ + +#ifndef __GTK_SEARCH_ENGINE_BEAGLE_H__ +#define __GTK_SEARCH_ENGINE_BEAGLE_H__ + +#include "gtksearchengine.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_SEARCH_ENGINE_BEAGLE (_gtk_search_engine_beagle_get_type ()) +#define GTK_SEARCH_ENGINE_BEAGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagle)) +#define GTK_SEARCH_ENGINE_BEAGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagleClass)) +#define GTK_IS_SEARCH_ENGINE_BEAGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE)) +#define GTK_IS_SEARCH_ENGINE_BEAGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEARCH_ENGINE_BEAGLE)) +#define GTK_SEARCH_ENGINE_BEAGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEARCH_ENGINE_BEAGLE, GtkSearchEngineBeagleClass)) + +typedef struct _GtkSearchEngineBeagle GtkSearchEngineBeagle; +typedef struct _GtkSearchEngineBeagleClass GtkSearchEngineBeagleClass; +typedef struct _GtkSearchEngineBeaglePrivate GtkSearchEngineBeaglePrivate; + [...4035 lines suppressed...] + * Based on nautilus-query.c + */ + +#include +#include + +#include "gtkquery.h" + +struct _GtkQueryPrivate +{ + gchar *text; + gchar *location_uri; + GList *mime_types; +}; + +G_DEFINE_TYPE (GtkQuery, _gtk_query, G_TYPE_OBJECT); + +static void +finalize (GObject *object) +{ + GtkQuery *query; + + query = GTK_QUERY (object); + + g_free (query->priv->text); + + G_OBJECT_CLASS (_gtk_query_parent_class)->finalize (object); +} + +static void +_gtk_query_class_init (GtkQueryClass *class) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (class); + gobject_class->finalize = finalize; + + g_type_class_add_private (gobject_class, sizeof (GtkQueryPrivate)); +} + +static void +_gtk_query_init (GtkQuery *query) +{ + query->priv = G_TYPE_INSTANCE_GET_PRIVATE (query, GTK_TYPE_QUERY, GtkQueryPrivate); +} + +GtkQuery * +_gtk_query_new (void) +{ + return g_object_new (GTK_TYPE_QUERY, NULL); +} + + +gchar * +_gtk_query_get_text (GtkQuery *query) +{ + return g_strdup (query->priv->text); +} + +void +_gtk_query_set_text (GtkQuery *query, + const gchar *text) +{ + g_free (query->priv->text); + query->priv->text = g_strdup (text); +} + +gchar * +_gtk_query_get_location (GtkQuery *query) +{ + return g_strdup (query->priv->location_uri); +} + +void +_gtk_query_set_location (GtkQuery *query, + const gchar *uri) +{ + g_free (query->priv->location_uri); + query->priv->location_uri = g_strdup (uri); +} + +GList * +_gtk_query_get_mime_types (GtkQuery *query) +{ + GList *list, *l; + gchar *mime_type; + + list = NULL; + for (l = query->priv->mime_types; l; l = l->next) + { + mime_type = (gchar*)l->data; + list = g_list_prepend (list, g_strdup (mime_type)); + } + + return list; +} + +void +_gtk_query_set_mime_types (GtkQuery *query, + GList *mime_types) +{ + GList *l; + gchar *mime_type; + + g_list_foreach (query->priv->mime_types, (GFunc)g_free, NULL); + g_list_free (query->priv->mime_types); + query->priv->mime_types = NULL; + + for (l = mime_types; l; l = l->next) + { + mime_type = (gchar*)l->data; + query->priv->mime_types = g_list_prepend (query->priv->mime_types, g_strdup (mime_type)); + } +} + +void +_gtk_query_add_mime_type (GtkQuery *query, + const gchar *mime_type) +{ + query->priv->mime_types = g_list_prepend (query->priv->mime_types, + g_strdup (mime_type)); +} + --- /dev/null 2007-01-05 16:56:08.831882476 -0500 +++ gtk+-2.10.7/gtk/gtkquery.h 2007-01-05 18:41:06.000000000 -0500 @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2005 Novell, Inc. + * + * This 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 of the License, or (at your option) any later version. + * + * This 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 this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * + * Author: Anders Carlsson + * + * Based on nautilus-query.h + */ + +#ifndef __GTK_QUERY_H__ +#define __GTK_QUERY_H__ + +#include + +G_BEGIN_DECLS + +#define GTK_TYPE_QUERY (_gtk_query_get_type ()) +#define GTK_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_QUERY, GtkQuery)) +#define GTK_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_QUERY, GtkQueryClass)) +#define GTK_IS_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_QUERY)) +#define GTK_IS_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_QUERY)) +#define GTK_QUERY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_QUERY, GtkQueryClass)) + +typedef struct _GtkQuery GtkQuery; +typedef struct _GtkQueryClass GtkQueryClass; +typedef struct _GtkQueryPrivate GtkQueryPrivate; + +struct _GtkQuery +{ + GObject parent; + + GtkQueryPrivate *priv; +}; + +struct _GtkQueryClass +{ + GObjectClass parent_class; +}; + +GType _gtk_query_get_type (void); +gboolean _gtk_query_enabled (void); + +GtkQuery* _gtk_query_new (void); + +gchar* _gtk_query_get_text (GtkQuery *query); +void _gtk_query_set_text (GtkQuery *query, + const gchar *text); + +gchar* _gtk_query_get_location (GtkQuery *query); +void _gtk_query_set_location (GtkQuery *query, + const gchar *uri); + +GList* _gtk_query_get_mime_types (GtkQuery *query); +void _gtk_query_set_mime_types (GtkQuery *query, + GList *mime_types); +void _gtk_query_add_mime_type (GtkQuery *query, + const gchar *mime_type); + +G_END_DECLS + +#endif /* __GTK_QUERY_H__ */ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 23 Oct 2006 03:07:03 -0000 1.62 +++ .cvsignore 6 Jan 2007 00:37:43 -0000 1.63 @@ -45,3 +45,4 @@ gtk+-2.10.3.tar.bz2 gtk+-2.10.4.tar.bz2 gtk+-2.10.6.tar.bz2 +gtk+-2.10.7.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- gtk2.spec 22 Dec 2006 03:22:00 -0000 1.202 +++ gtk2.spec 6 Jan 2007 00:37:43 -0000 1.203 @@ -10,16 +10,16 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.10.6 +%define base_version 2.10.7 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 9%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries -Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.gz Source1: update-scripts.tar.gz # Biarch changes @@ -27,21 +27,15 @@ # Fedora patch Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch # Filechooser search -Patch2: gtk+-2.10.4-search.patch +Patch2: gtk+-2.10.7-search.patch # use fam for recent-files Patch3: gtk+-2.10.3-fam.patch # backport from HEAD -Patch7: gtk+-2.10.2-cursor-blink.patch +Patch7: gtk+-2.10.7-cursor-blink.patch # fixed in upstream cvs Patch10: gtk+-2.10.4-im-reset.patch -Patch11: gtk+-2.10.4-strncpy.patch -Patch12: gtk+-2.10.4-panel-crash.patch -Patch13: gtk+-2.10.4-printernames.patch -Patch14: gtk+-2.10.4-message-dialog-a11y.patch -Patch15: gtk+-2.10.4-mnemonic-clipping.patch -Patch16: gtk+-2.10.4-close-loader.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -127,15 +121,9 @@ %patch2 -p1 -b .search %patch3 -p1 -b .fam -%patch7 -p0 -b .cursor-blink +%patch7 -p1 -b .cursor-blink %patch10 -p1 -b .im-reset -%patch11 -p1 -b .strncpy -%patch12 -p1 -b .panel-crash -%patch13 -p1 -b .printernames -%patch14 -p1 -b .message-dialog-ally -%patch15 -p1 -b .mnemonic-clipping -%patch16 -p1 -b .close-loader for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- sources 21 Dec 2006 15:28:54 -0000 1.68 +++ sources 6 Jan 2007 00:37:43 -0000 1.69 @@ -1,2 +1,2 @@ -13c62b610c910255934452d0617403f7 gtk+-2.10.6.tar.bz2 25e73f5bdf6a1272799d0536a869f645 update-scripts.tar.gz +acb0c10be4495928db68d2279e34f20c gtk+-2.10.7.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 00:43:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:43:54 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.203,1.204 Message-ID: <200701060043.l060hs4e002670@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2584 Modified Files: gtk2.spec Log Message: fix spec Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- gtk2.spec 6 Jan 2007 00:37:43 -0000 1.203 +++ gtk2.spec 6 Jan 2007 00:43:51 -0000 1.204 @@ -19,7 +19,7 @@ Release: 1%{?dist} License: LGPL Group: System Environment/Libraries -Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.gz +Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 Source1: update-scripts.tar.gz # Biarch changes From fedora-cvs-commits at redhat.com Sat Jan 6 00:44:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 19:44:26 -0500 Subject: rpms/jwhois/devel jwhois-3.2.3-com-net.patch, NONE, 1.1 jwhois-3.2.3-config-cvs.patch, 1.3, 1.4 jwhois.spec, 1.32, 1.33 Message-ID: <200701060044.l060iQNB003150@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/jwhois/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3042 Modified Files: jwhois-3.2.3-config-cvs.patch jwhois.spec Added Files: jwhois-3.2.3-com-net.patch Log Message: * Sat Jan 6 2007 Miloslav Trmac - 3.2.3-10 - Add automatic redirection for .com and .net domains (patch by Wolfgang Rupprecht ) Resolves: #221668 - Update to upstream config as of Jan 6 2007 jwhois-3.2.3-com-net.patch: jwhois.conf | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE jwhois-3.2.3-com-net.patch --- Patch by Wolfgang Rupprecht . --- jwhois-3.2.3/example/jwhois.conf.com-net 2007-01-06 01:32:58.000000000 +0100 +++ jwhois-3.2.3/example/jwhois.conf 2007-01-06 01:34:02.000000000 +0100 @@ -689,6 +689,10 @@ whois-redirect = ".*Whois Server: \\(.*\\)"; } + ".*\\.verisign-grs\\.com" { + whois-redirect = ".*Whois Server: \\(.*\\)"; + } + "whois\\.crsnic\\.net" { whois-redirect = ".*Whois Server: \\(.*\\)"; } jwhois-3.2.3-config-cvs.patch: jwhois.conf | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) Index: jwhois-3.2.3-config-cvs.patch =================================================================== RCS file: /cvs/dist/rpms/jwhois/devel/jwhois-3.2.3-config-cvs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jwhois-3.2.3-config-cvs.patch 31 Oct 2006 16:49:08 -0000 1.3 +++ jwhois-3.2.3-config-cvs.patch 6 Jan 2007 00:44:24 -0000 1.4 @@ -6,10 +6,10 @@ =================================================================== RCS file: /sources/jwhois/jwhois/example/jwhois.conf,v retrieving revision 1.119 -retrieving revision 1.133 -diff -u -r1.119 -r1.133 +retrieving revision 1.134 +diff -u -r1.119 -r1.134 --- example/jwhois.conf 9 Jul 2005 18:31:51 -0000 1.119 -+++ example/jwhois.conf 27 Sep 2006 08:14:58 -0000 1.133 ++++ example/jwhois.conf 6 Nov 2006 10:28:15 -0000 1.134 @@ -112,8 +74,13 @@ # default = "whois-servers"; @@ -103,6 +103,15 @@ query-format = "domain $*"; } "\\.ng$" = "whois.rg.net"; +@@ -284,7 +258,7 @@ + "\\.to$" = "whois.tonic.to"; + "\\.tr$" = "whois.metu.edu.tr"; + "\\.tt$" = "www.nic.tt"; +- "\\.tv$" = "whois.tv"; ++ "\\.tv$" = "whois.nic.tv"; + "\\.tw$" = "whois.twnic.net"; + "\\.ua$" = "whois.com.ua"; + "\\.ug$" = "whois.co.ug"; @@ -412,6 +386,7 @@ "24.132.0.0/16" = "whois.ripe.net"; Index: jwhois.spec =================================================================== RCS file: /cvs/dist/rpms/jwhois/devel/jwhois.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- jwhois.spec 5 Jan 2007 05:14:16 -0000 1.32 +++ jwhois.spec 6 Jan 2007 00:44:24 -0000 1.33 @@ -1,6 +1,6 @@ Name: jwhois Version: 3.2.3 -Release: 9 +Release: 10 URL: http://www.gnu.org/software/jwhois/ Source0: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig @@ -10,6 +10,7 @@ Patch3: jwhois-3.2.3-ipv6.patch Patch4: jwhois-3.2.3-uninitialized.patch Patch5: jwhois-3.2.3-idn.patch +Patch6: jwhois-3.2.3-com-net.patch License: GPL Group: Applications/Internet Summary: Internet whois/nicname client @@ -30,6 +31,7 @@ %patch3 -p1 -b .ipv6 %patch4 -p1 -b .uninitialized %patch5 -p1 -b .idn +%patch6 -p1 -b .com-net iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_ mv doc/sv/jwhois.1_ doc/sv/jwhois.1 @@ -71,6 +73,12 @@ [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT %changelog +* Sat Jan 6 2007 Miloslav Trmac - 3.2.3-10 +- Add automatic redirection for .com and .net domains (patch by Wolfgang + Rupprecht ) + Resolves: #221668 +- Update to upstream config as of Jan 6 2007 + * Fri Jan 5 2007 Miloslav Trmac - 3.2.3-9 - Ignore install-info errors in scriptlets - Remove the trailing dot from Summary: From fedora-cvs-commits at redhat.com Sat Jan 6 03:22:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 22:22:19 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.391,1.392 Message-ID: <200701060322.l063MJIa014095@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14036 Modified Files: eclipse.spec Log Message: fix typo in aot-compile-line Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.391 retrieving revision 1.392 diff -u -r1.391 -r1.392 --- eclipse.spec 6 Jan 2007 00:08:36 -0000 1.391 +++ eclipse.spec 6 Jan 2007 03:22:16 -0000 1.392 @@ -1307,7 +1307,7 @@ aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION %else aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \ - --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar + --exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar \ --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_3.2.1.R32x_v20060919.jar %endif %endif From fedora-cvs-commits at redhat.com Sat Jan 6 03:39:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 22:39:19 -0500 Subject: rpms/libXv/devel .cvsignore, 1.7, 1.8 libXv.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <200701060339.l063dJdt017333@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17306/devel Modified Files: .cvsignore libXv.spec sources Log Message: auto-import libXv-1.0.3-1.fc7 on branch devel from libXv-1.0.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXv/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2006 19:26:25 -0000 1.7 +++ .cvsignore 6 Jan 2007 03:39:17 -0000 1.8 @@ -1 +1 @@ -libXv-1.0.2.tar.bz2 +libXv-1.0.3.tar.bz2 Index: libXv.spec =================================================================== RCS file: /cvs/dist/rpms/libXv/devel/libXv.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libXv.spec 20 Nov 2006 19:26:25 -0000 1.17 +++ libXv.spec 6 Jan 2007 03:39:17 -0000 1.18 @@ -1,6 +1,6 @@ Summary: X.Org X11 libXv runtime library Name: libXv -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries @@ -82,6 +82,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.3-1 +- Update to 1.0.3 + * Mon Nov 20 2006 Adam Jackson 1.0.2-1.fc7 - Update to 1.0.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXv/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Nov 2006 19:26:25 -0000 1.7 +++ sources 6 Jan 2007 03:39:17 -0000 1.8 @@ -1 +1 @@ -b51c65a2d38ddb4a2e7ddd9ccfd13e1a libXv-1.0.2.tar.bz2 +f1c4109fa804aeaf7188b66c5cdd9f57 libXv-1.0.3.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 03:45:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 22:45:46 -0500 Subject: rpms/libXvMC/devel .cvsignore, 1.8, 1.9 libXvMC.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200701060345.l063jkrg017465@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXvMC/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17439/devel Modified Files: .cvsignore libXvMC.spec sources Log Message: auto-import libXvMC-1.0.4-1.fc7 on branch devel from libXvMC-1.0.4-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXvMC/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Nov 2006 19:28:14 -0000 1.8 +++ .cvsignore 6 Jan 2007 03:45:44 -0000 1.9 @@ -1 +1 @@ -libXvMC-1.0.3.tar.bz2 +libXvMC-1.0.4.tar.bz2 Index: libXvMC.spec =================================================================== RCS file: /cvs/dist/rpms/libXvMC/devel/libXvMC.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libXvMC.spec 20 Nov 2006 19:28:14 -0000 1.18 +++ libXvMC.spec 6 Jan 2007 03:45:44 -0000 1.19 @@ -1,6 +1,6 @@ Summary: X.Org X11 libXvMC runtime library Name: libXvMC -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries @@ -89,6 +89,9 @@ %{_libdir}/pkgconfig/xvmc.pc %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.4-1 +- Update to 1.0.4 + * Mon Nov 20 2006 Adam Jackson 1.0.3-1 - Update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXvMC/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Nov 2006 19:28:14 -0000 1.8 +++ sources 6 Jan 2007 03:45:44 -0000 1.9 @@ -1 +1 @@ -c818d0cb8488f2a352fb3acaf09cfc3a libXvMC-1.0.3.tar.bz2 +b54600573daf9d1a29b952e8d35b389e libXvMC-1.0.4.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 03:57:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 22:57:31 -0500 Subject: rpms/libXfont/devel .cvsignore, 1.11, 1.12 libXfont.spec, 1.28, 1.29 sources, 1.12, 1.13 Message-ID: <200701060357.l063vVET005587@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libXfont/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5561/devel Modified Files: .cvsignore libXfont.spec sources Log Message: auto-import libXfont-1.2.6-1.fc7 on branch devel from libXfont-1.2.6-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libXfont/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 1 Dec 2006 21:07:53 -0000 1.11 +++ .cvsignore 6 Jan 2007 03:57:24 -0000 1.12 @@ -1 +1 @@ -libXfont-1.2.5.tar.bz2 +libXfont-1.2.6.tar.bz2 Index: libXfont.spec =================================================================== RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libXfont.spec 1 Dec 2006 21:07:53 -0000 1.28 +++ libXfont.spec 6 Jan 2007 03:57:24 -0000 1.29 @@ -1,6 +1,6 @@ Summary: X.Org X11 libXfont runtime library Name: libXfont -Version: 1.2.5 +Version: 1.2.6 Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries @@ -100,6 +100,9 @@ %{_libdir}/pkgconfig/xfont.pc %changelog +* Fri Jan 05 2007 Adam Jackson 1.2.6-1 +- Update to 1.2.6 + * Fri Dec 1 2006 Adam Jackson 1.2.5-1 - Update to 1.2.5 from upstream. Drops CID font support. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libXfont/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Dec 2006 21:07:53 -0000 1.12 +++ sources 6 Jan 2007 03:57:24 -0000 1.13 @@ -1 +1 @@ -373e14323b70e33c7dfed7e4cf9ebbf7 libXfont-1.2.5.tar.bz2 +9f2c956b9a01f20a247a155d75270737 libXfont-1.2.6.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 04:18:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:18:41 -0500 Subject: rpms/libfontenc/devel .cvsignore, 1.9, 1.10 libfontenc.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200701060418.l064IfmW026311@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libfontenc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26284/devel Modified Files: .cvsignore libfontenc.spec sources Log Message: auto-import libfontenc-1.0.4-1.fc7 on branch devel from libfontenc-1.0.4-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libfontenc/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Nov 2006 19:30:23 -0000 1.9 +++ .cvsignore 6 Jan 2007 04:18:39 -0000 1.10 @@ -1 +1 @@ -libfontenc-1.0.3.tar.bz2 +libfontenc-1.0.4.tar.bz2 Index: libfontenc.spec =================================================================== RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libfontenc.spec 20 Nov 2006 19:30:23 -0000 1.18 +++ libfontenc.spec 6 Jan 2007 04:18:39 -0000 1.19 @@ -1,6 +1,6 @@ Summary: X.Org X11 libfontenc runtime library Name: libfontenc -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries @@ -86,6 +86,9 @@ %{_libdir}/pkgconfig/fontenc.pc %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.4-1 +- Update to 1.0.4 + * Mon Nov 20 2006 Adam Jackson 1.0.3-1.fc7 - Update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libfontenc/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Nov 2006 19:30:23 -0000 1.9 +++ sources 6 Jan 2007 04:18:39 -0000 1.10 @@ -1 +1 @@ -96711208ac27ff70a17bb07a3bf90f98 libfontenc-1.0.3.tar.bz2 +5cd16a2e51ca7b96a3081c7486ff98b9 libfontenc-1.0.4.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 04:20:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:20:44 -0500 Subject: rpms/xorg-x11-util-macros/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xorg-x11-util-macros.spec, 1.20, 1.21 Message-ID: <200701060420.l064KiHb026429@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-util-macros/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26403/devel Modified Files: .cvsignore sources xorg-x11-util-macros.spec Log Message: auto-import xorg-x11-util-macros-1.1.4-1.fc7 on branch devel from xorg-x11-util-macros-1.1.4-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 1 Dec 2006 21:03:40 -0000 1.9 +++ .cvsignore 6 Jan 2007 04:20:42 -0000 1.10 @@ -1 +1 @@ -util-macros-1.1.3.tar.bz2 +util-macros-1.1.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 Dec 2006 21:03:40 -0000 1.9 +++ sources 6 Jan 2007 04:20:42 -0000 1.10 @@ -1 +1 @@ -9bccd466f8cd493114142dbd97df2783 util-macros-1.1.3.tar.bz2 +3a2ae1dec09aa32a808a25b14838c49d util-macros-1.1.4.tar.bz2 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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xorg-x11-util-macros.spec 1 Dec 2006 21:03:40 -0000 1.20 +++ xorg-x11-util-macros.spec 6 Jan 2007 04:20:42 -0000 1.21 @@ -3,7 +3,7 @@ Summary: X.Org X11 Autotools macros Name: xorg-x11-util-macros -Version: 1.1.3 +Version: 1.1.4 Release: 1%{?dist} License: The Open Group License Group: Development/System @@ -38,6 +38,9 @@ %{_datadir}/aclocal/xorg-macros.m4 %changelog +* Fri Jan 05 2007 Adam Jackson 1.1.4-1 +- Update to 1.1.4 + * Fri Dec 1 2006 Adam Jackson 1.1.3-1 - Update to 1.1.3 From fedora-cvs-commits at redhat.com Sat Jan 6 04:22:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:22:07 -0500 Subject: rpms/xorg-x11-util-macros/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xorg-x11-util-macros.spec, 1.21, 1.22 Message-ID: <200701060422.l064M7ru026527@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-util-macros/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26501/devel Modified Files: .cvsignore sources xorg-x11-util-macros.spec Log Message: auto-import xorg-x11-util-macros-1.1.5-1.fc7 on branch devel from xorg-x11-util-macros-1.1.5-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Jan 2007 04:20:42 -0000 1.10 +++ .cvsignore 6 Jan 2007 04:22:05 -0000 1.11 @@ -1 +1 @@ -util-macros-1.1.4.tar.bz2 +util-macros-1.1.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Jan 2007 04:20:42 -0000 1.10 +++ sources 6 Jan 2007 04:22:05 -0000 1.11 @@ -1 +1 @@ -3a2ae1dec09aa32a808a25b14838c49d util-macros-1.1.4.tar.bz2 +51952682d8b42aeda3af5cee0133ce2c util-macros-1.1.5.tar.bz2 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xorg-x11-util-macros.spec 6 Jan 2007 04:20:42 -0000 1.21 +++ xorg-x11-util-macros.spec 6 Jan 2007 04:22:05 -0000 1.22 @@ -3,7 +3,7 @@ Summary: X.Org X11 Autotools macros Name: xorg-x11-util-macros -Version: 1.1.4 +Version: 1.1.5 Release: 1%{?dist} License: The Open Group License Group: Development/System @@ -38,8 +38,8 @@ %{_datadir}/aclocal/xorg-macros.m4 %changelog -* Fri Jan 05 2007 Adam Jackson 1.1.4-1 -- Update to 1.1.4 +* Fri Jan 05 2007 Adam Jackson 1.1.5-1 +- Update to 1.1.5 * Fri Dec 1 2006 Adam Jackson 1.1.3-1 - Update to 1.1.3 From fedora-cvs-commits at redhat.com Sat Jan 6 04:30:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:30:06 -0500 Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.21, 1.22 sources, 1.19, 1.20 xorg-x11-proto-devel.spec, 1.46, 1.47 Message-ID: <200701060430.l064U6uX026704@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26665/devel Modified Files: .cvsignore sources xorg-x11-proto-devel.spec Log Message: auto-import xorg-x11-proto-devel-7.1-11.fc7 on branch devel from xorg-x11-proto-devel-7.1-11.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 20 Sep 2006 15:45:42 -0000 1.21 +++ .cvsignore 6 Jan 2007 04:30:04 -0000 1.22 @@ -6,9 +6,9 @@ fixesproto-4.0.tar.bz2 fontcacheproto-0.1.2.tar.bz2 fontsproto-2.0.2.tar.bz2 -glproto-1.4.7.tar.bz2 +glproto-1.4.8.tar.bz2 inputproto-1.3.2.tar.bz2 -printproto-1.0.3.tar.bz2 +kbproto-1.0.3.tar.bz2 randrproto-1.1.2.tar.bz2 recordproto-1.13.2.tar.bz2 renderproto-0.9.2.tar.bz2 @@ -25,7 +25,5 @@ xf86rushproto-1.1.2.tar.bz2 xf86vidmodeproto-2.2.2.tar.bz2 xineramaproto-1.1.2.tar.bz2 -xproto-7.0.7.tar.bz2 xproxymanagementprotocol-1.0.2.tar.bz2 -kbproto-1.0.3.tar.bz2 -glproto-1.4.8.tar.bz2 +xproto-7.0.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 20 Sep 2006 15:45:42 -0000 1.19 +++ sources 6 Jan 2007 04:30:04 -0000 1.20 @@ -6,8 +6,9 @@ 8b298cc3424597f8138c7faf7763dce9 fixesproto-4.0.tar.bz2 60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2 c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2 +3dfbd17203c0c88b94b6f579f24c11cc glproto-1.4.8.tar.bz2 e0b7df0fc69f0712aa7f2161faa94e1d inputproto-1.3.2.tar.bz2 -0f4e7982c6d4ec3b2cf38502dd1293a3 printproto-1.0.3.tar.bz2 +6092cdb0a1225f95356ddbe6c2abaad5 kbproto-1.0.3.tar.bz2 8e72173ad7aa8abe218e6e7fe0903842 randrproto-1.1.2.tar.bz2 0ed4706564a34fc2aff724aa16d3ff00 recordproto-1.13.2.tar.bz2 28fbe8a59ebd31f098b90ec64f3d133a renderproto-0.9.2.tar.bz2 @@ -24,7 +25,5 @@ b6a96ffdae084e27487a58314008b000 xf86rushproto-1.1.2.tar.bz2 f00844a63d6e76b69eb0eb5e41eed843 xf86vidmodeproto-2.2.2.tar.bz2 1cc292c562962ad0ad3a253cae68c632 xineramaproto-1.1.2.tar.bz2 -d0b9334f2cde90ad19ff94038395347d xproto-7.0.7.tar.bz2 d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2 -6092cdb0a1225f95356ddbe6c2abaad5 kbproto-1.0.3.tar.bz2 -3dfbd17203c0c88b94b6f579f24c11cc glproto-1.4.8.tar.bz2 +2ed80e90992e7455eaac4c3e977ebd01 xproto-7.0.10.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.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- xorg-x11-proto-devel.spec 3 Oct 2006 16:08:20 -0000 1.46 +++ xorg-x11-proto-devel.spec 6 Jan 2007 04:30:04 -0000 1.47 @@ -10,7 +10,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.1 -Release: 10%{?dist} +Release: 11%{?dist} License: The Open Group License Group: Development/System URL: http://www.x.org @@ -43,7 +43,7 @@ Source26: ftp://ftp.x.org/pub/individual/proto/xf86rushproto-1.1.2.tar.bz2 Source27: ftp://ftp.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2 Source28: ftp://ftp.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2 -Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.7.tar.bz2 +Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2 BuildRequires: pkgconfig @@ -187,14 +187,6 @@ %{_includedir}/X11/extensions/fontcacheP.h %{_includedir}/X11/extensions/fontcachstr.h %{_includedir}/X11/extensions/lbxstr.h -%if 0 -%{_includedir}/X11/extensions/lbxbuf.h -%{_includedir}/X11/extensions/lbxbufstr.h -%{_includedir}/X11/extensions/lbxdeltastr.h -%{_includedir}/X11/extensions/lbximage.h -%{_includedir}/X11/extensions/lbxopts.h -%{_includedir}/X11/extensions/lbxzlib.h -%endif %{_includedir}/X11/extensions/mitmiscstr.h %{_includedir}/X11/extensions/multibuf.h %{_includedir}/X11/extensions/multibufst.h @@ -281,6 +273,9 @@ %{_libdir}/pkgconfig/xproxymngproto.pc %changelog +* Fri Jan 05 2007 Adam Jackson 7.1-11 +- xproto 7.0.10 + * Tue Oct 3 2006 Adam Jackson 7.1-10 - Install just enough LBX headers to make libXext build. (#203815) From fedora-cvs-commits at redhat.com Sat Jan 6 04:41:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:41:05 -0500 Subject: rpms/xorg-x11-xdm/devel .cvsignore, 1.9, 1.10 sources, 1.8, 1.9 xorg-x11-xdm.spec, 1.32, 1.33 Message-ID: <200701060441.l064f52k014984@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14926/devel Modified Files: .cvsignore sources xorg-x11-xdm.spec Log Message: auto-import xorg-x11-xdm-1.1.3-1.fc7 on branch devel from xorg-x11-xdm-1.1.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 28 Jun 2006 08:28:11 -0000 1.9 +++ .cvsignore 6 Jan 2007 04:41:03 -0000 1.10 @@ -1,2 +1 @@ -*.tar.bz2 -*.tar.gz +xdm-1.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Jun 2006 08:28:11 -0000 1.8 +++ sources 6 Jan 2007 04:41:03 -0000 1.9 @@ -1 +1 @@ -205cbf9cd4161dffd63d3516e681dbed xdm-1.0.5.tar.bz2 +619d0549c6c20ca15aa77769f2fbabe2 xdm-1.1.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.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- xorg-x11-xdm.spec 24 Jul 2006 08:21:16 -0000 1.32 +++ xorg-x11-xdm.spec 6 Jan 2007 04:41:03 -0000 1.33 @@ -2,8 +2,8 @@ Summary: X.Org X11 xdm - X Display Manager Name: xorg-x11-%{pkgname} -Version: 1.0.5 -Release: 5%{?dist} +Version: 1.1.3 +Release: 1%{?dist} # NOTE: Remove Epoch line if/when the package ever gets renamed. Epoch: 1 License: MIT/X11 @@ -150,6 +150,9 @@ %{_mandir}/man1/*.1* %changelog +* Fri Jan 05 2007 Adam Jackson 1:1.1.3-1 +- Update to 1.1.3 + * Mon Jul 24 2006 Mike A. Harris 1:1.0.5-5.fc6 - Added xdm-1.0.5-sessreg-utmp-fix-bug177890.patch to restore GiveConsole to what we shipped in 6.8.2, and also fix bug (#177890) From fedora-cvs-commits at redhat.com Sat Jan 6 04:44:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:44:05 -0500 Subject: rpms/xorg-x11-xtrans-devel/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-xtrans-devel.spec, 1.17, 1.18 Message-ID: <200701060444.l064i5Se017387@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17334/devel Modified Files: .cvsignore sources xorg-x11-xtrans-devel.spec Log Message: auto-import xorg-x11-xtrans-devel-1.0.3-1.fc7 on branch devel from xorg-x11-xtrans-devel-1.0.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Jul 2006 09:41:22 -0000 1.7 +++ .cvsignore 6 Jan 2007 04:44:03 -0000 1.8 @@ -1,2 +1 @@ -xtrans-1.0.0.tar.bz2 -xtrans-1.0.1.tar.bz2 +xtrans-1.0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Jul 2006 09:41:22 -0000 1.7 +++ sources 6 Jan 2007 04:44:03 -0000 1.8 @@ -1 +1 @@ -9b2515bf5ff632cf07bc9901e7274d0f xtrans-1.0.1.tar.bz2 +bb196907ea1e182dcb396eb22f7d2c1a xtrans-1.0.3.tar.bz2 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xorg-x11-xtrans-devel.spec 12 Jul 2006 09:23:22 -0000 1.17 +++ xorg-x11-xtrans-devel.spec 6 Jan 2007 04:44:03 -0000 1.18 @@ -5,8 +5,8 @@ Summary: X.Org X11 developmental X transport library Name: xorg-x11-xtrans-devel -Version: 1.0.1 -Release: 1.1%{?dist} +Version: 1.0.3 +Release: 1%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -57,6 +57,9 @@ %{_datadir}/aclocal/xtrans.m4 %changelog +* Fri Jan 05 2007 Adam Jackson 1.0.3-1 +- Update to 1.0.3 + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Sat Jan 6 04:48:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:48:56 -0500 Subject: rpms/xorg-x11-drv-mga/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-mga.spec, 1.17, 1.18 Message-ID: <200701060448.l064muow008970@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-mga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8913/devel Modified Files: .cvsignore sources xorg-x11-drv-mga.spec Log Message: auto-import xorg-x11-drv-mga-1.4.6.1-1.fc7 on branch devel from xorg-x11-drv-mga-1.4.6.1-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 1 Dec 2006 20:58:09 -0000 1.8 +++ .cvsignore 6 Jan 2007 04:48:54 -0000 1.9 @@ -1 +1 @@ -xf86-video-mga-1.4.5.tar.bz2 +xf86-video-mga-1.4.6.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 1 Dec 2006 20:58:09 -0000 1.8 +++ sources 6 Jan 2007 04:48:54 -0000 1.9 @@ -1 +1 @@ -bfecd6814cfbe2d7a678724aaab81d0d xf86-video-mga-1.4.5.tar.bz2 +a678b429a35648f96d3ebf328300de46 xf86-video-mga-1.4.6.1.tar.bz2 Index: xorg-x11-drv-mga.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-mga/devel/xorg-x11-drv-mga.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xorg-x11-drv-mga.spec 4 Dec 2006 21:34:58 -0000 1.17 +++ xorg-x11-drv-mga.spec 6 Jan 2007 04:48:54 -0000 1.18 @@ -10,8 +10,8 @@ Summary: Xorg X11 mga video driver Name: xorg-x11-drv-mga -Version: 1.4.5 -Release: 2%{?dist} +Version: 1.4.6.1 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -69,6 +69,9 @@ %{_mandir}/man4/mga.4* %changelog +* Fri Jan 05 2007 Adam Jackson 1.4.6.1-1 +- Update to 1.4.6.1 + * Mon Dec 4 2006 Adam Jackson 1.4.5-2 - mga-1.4.5-no-hal-advertising.patch: Don't link to the HAL module as it's non-free. From fedora-cvs-commits at redhat.com Sat Jan 6 04:51:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 5 Jan 2007 23:51:57 -0500 Subject: rpms/xorg-x11-drv-nv/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xorg-x11-drv-nv.spec, 1.28, 1.29 Message-ID: <200701060451.l064pvGw011424@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-nv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11369/devel Modified Files: .cvsignore sources xorg-x11-drv-nv.spec Log Message: auto-import xorg-x11-drv-nv-1.2.2.1-1.fc7 on branch devel from xorg-x11-drv-nv-1.2.2.1-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 1 Dec 2006 21:22:44 -0000 1.10 +++ .cvsignore 6 Jan 2007 04:51:55 -0000 1.11 @@ -1 +1 @@ -xf86-video-nv-1.2.1.tar.bz2 +xf86-video-nv-1.2.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 1 Dec 2006 21:22:44 -0000 1.10 +++ sources 6 Jan 2007 04:51:55 -0000 1.11 @@ -1 +1 @@ -7955c5afb18f60711311f0678411eade xf86-video-nv-1.2.1.tar.bz2 +e4dc415b1e45db0bbdacc203ed33024a xf86-video-nv-1.2.2.1.tar.bz2 Index: xorg-x11-drv-nv.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- xorg-x11-drv-nv.spec 1 Dec 2006 21:22:44 -0000 1.28 +++ xorg-x11-drv-nv.spec 6 Jan 2007 04:51:55 -0000 1.29 @@ -6,7 +6,7 @@ Summary: Xorg X11 nv video driver Name: xorg-x11-drv-nv -Version: 1.2.1 +Version: 1.2.2.1 Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 @@ -65,6 +65,9 @@ %{_mandir}/man4/nv.4* %changelog +* Fri Jan 05 2007 Adam Jackson 1.2.2.1-1 +- Update to 1.2.2.1 + * Fri Dec 1 2006 Adam Jackson 1.2.1-1 - Update to 1.2.1 From fedora-cvs-commits at redhat.com Sat Jan 6 05:01:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 00:01:31 -0500 Subject: rpms/xorg-x11-drv-fbdev/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-fbdev.spec, 1.14, 1.15 fbdev-0.2.0-debug.patch, 1.1, NONE Message-ID: <200701060501.l0651VEm018278@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-fbdev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18223/devel Modified Files: .cvsignore sources xorg-x11-drv-fbdev.spec Removed Files: fbdev-0.2.0-debug.patch Log Message: auto-import xorg-x11-drv-fbdev-0.3.1-1.fc7 on branch devel from xorg-x11-drv-fbdev-0.3.1-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 May 2006 17:57:32 -0000 1.8 +++ .cvsignore 6 Jan 2007 05:01:29 -0000 1.9 @@ -1 +1 @@ -xf86-video-fbdev-0.3.0.tar.bz2 +xf86-video-fbdev-0.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 May 2006 17:57:32 -0000 1.8 +++ sources 6 Jan 2007 05:01:29 -0000 1.9 @@ -1 +1 @@ -2472494502317c2582b90ccf64da5044 xf86-video-fbdev-0.3.0.tar.bz2 +9ae810c6c6c3c9713a67866fe794d4ff xf86-video-fbdev-0.3.1.tar.bz2 Index: xorg-x11-drv-fbdev.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-fbdev/devel/xorg-x11-drv-fbdev.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-fbdev.spec 29 Aug 2006 01:33:42 -0000 1.14 +++ xorg-x11-drv-fbdev.spec 6 Jan 2007 05:01:29 -0000 1.15 @@ -6,8 +6,8 @@ Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev -Version: 0.3.0 -Release: 2 +Version: 0.3.1 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -17,9 +17,6 @@ ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -# FIXME: move me upstream -Patch0: fbdev-0.2.0-debug.patch - Patch1: fbdev-0.3.0-32fbbpp.patch BuildRequires: pkgconfig @@ -32,8 +29,9 @@ %prep %setup -q -n %{tarball}-%{version} -%patch0 -p1 -b .debug -%patch1 -p1 -b .fbbpp +# Not sure if this is still necessary, it doesn't apply anymore and the new +# code looks like it'll have the same effect. XXX check with katzj. +# %patch1 -p1 -b .fbbpp %build %configure --disable-static @@ -60,6 +58,9 @@ %{_mandir}/man4/fbdev.4* %changelog +* Fri Jan 05 2007 Adam Jackson 0.3.1-1 +- Update to 0.3.1 + * Mon Aug 28 2006 Jeremy Katz - 0.3.0-2 - adjust to prefer 32bpp over 24bpp for fbbpp (#204117) --- fbdev-0.2.0-debug.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 6 05:04:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 00:04:50 -0500 Subject: rpms/kernel/FC-6 .cvsignore, 1.546, 1.547 kernel-2.6.spec, 1.2887, 1.2888 sources, 1.509, 1.510 linux-2.6-ext3-robustness.patch, 1.1, NONE linux-2.6-fs-cramfs-corruption-oops.patch, 1.1, NONE Message-ID: <200701060504.l0654oZO019581@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19409 Modified Files: .cvsignore kernel-2.6.spec sources Removed Files: linux-2.6-ext3-robustness.patch linux-2.6-fs-cramfs-corruption-oops.patch Log Message: 2.6.19.2rc1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v retrieving revision 1.546 retrieving revision 1.547 diff -u -r1.546 -r1.547 --- .cvsignore 21 Dec 2006 21:45:13 -0000 1.546 +++ .cvsignore 6 Jan 2007 05:04:47 -0000 1.547 @@ -5,3 +5,4 @@ linux-2.6.19.tar.bz2 patch-2.6.19.1.bz2 xen-3.0.3-11774.tar.bz2 +patch-2.6.19.2-rc1.gz Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2887 retrieving revision 1.2888 diff -u -r1.2887 -r1.2888 --- kernel-2.6.spec 2 Jan 2007 18:09:40 -0000 1.2887 +++ kernel-2.6.spec 6 Jan 2007 05:04:47 -0000 1.2888 @@ -314,6 +314,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.19.1.bz2 +Patch2: patch-2.6.19.2-rc1.gz # Patches 10 through 99 are for things that are going upstream really soon. Patch10: linux-2.6-utrace.patch @@ -427,9 +428,6 @@ # Various NFS changes. -# EXT3/JBD fixes -Patch1452: linux-2.6-ext3-robustness.patch - # Device mapper / MD layer # Misc bits. @@ -442,7 +440,6 @@ Patch1731: linux-2.6-cpufreq-unload-smi.patch Patch1740: linux-2.6-softlockup-disable.patch Patch1750: linux-2.6-usb-storage-reboot.patch -Patch1761: linux-2.6-fs-cramfs-corruption-oops.patch Patch1770: linux-2.6-optimise-spinlock-debug.patch Patch1771: linux-2.6-silence-noise.patch Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch @@ -797,6 +794,7 @@ # Update to latest upstream. %patch1 -p1 +%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -979,10 +977,6 @@ # NFS -# EXT3 -# More ext3 robustness fixes. -%patch1452 -p1 - # Device mapper / MD layer # Misc fixes @@ -1004,8 +998,6 @@ %patch1740 -p1 # USB storage not seen upon reboot %patch1750 -p1 -# Fix up oops in cramfs when encountering corrupt images. -%patch1761 -p1 # Speed up spinlock debug. %patch1770 -p1 # Silence some useless messages that still get printed with 'quiet' @@ -2017,6 +2009,9 @@ %endif %changelog +* Sat Jan 6 2007 Dave Jones +- 2.6.19.2rc1 + * Tue Jan 2 2007 Dave Jones - Make serial ATA work again. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v retrieving revision 1.509 retrieving revision 1.510 diff -u -r1.509 -r1.510 --- sources 21 Dec 2006 21:45:14 -0000 1.509 +++ sources 6 Jan 2007 05:04:48 -0000 1.510 @@ -1,3 +1,4 @@ 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 899a0932373a5299b69b9579fceb099e patch-2.6.19.1.bz2 a9d44b2651b0898e103395b2a7a4f263 xen-3.0.3-11774.tar.bz2 +6c3614340ffaaa464c2ee2aee55871f6 patch-2.6.19.2-rc1.gz --- linux-2.6-ext3-robustness.patch DELETED --- --- linux-2.6-fs-cramfs-corruption-oops.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 6 05:06:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 00:06:19 -0500 Subject: rpms/xorg-x11-drv-evdev/devel xorg-x11-drv-evdev.spec,1.15,1.16 Message-ID: <200701060506.l0656JWZ020344@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20313 Modified Files: xorg-x11-drv-evdev.spec Log Message: note to self Index: xorg-x11-drv-evdev.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xorg-x11-drv-evdev.spec 12 Jul 2006 08:58:43 -0000 1.15 +++ xorg-x11-drv-evdev.spec 6 Jan 2007 05:06:16 -0000 1.16 @@ -1,3 +1,5 @@ +# Note to self: don't update to 1.1.5 until we have an input-hotplug server. + %define tarball xf86-input-evdev %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/input From fedora-cvs-commits at redhat.com Sat Jan 6 05:09:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 00:09:06 -0500 Subject: rpms/xorg-x11-drv-rendition/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-rendition.spec, 1.14, 1.15 Message-ID: <200701060509.l065962Q021123@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-rendition/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21059/devel Modified Files: .cvsignore sources xorg-x11-drv-rendition.spec Log Message: auto-import xorg-x11-drv-rendition-4.1.3-1.fc7 on branch devel from xorg-x11-drv-rendition-4.1.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 03:24:01 -0000 1.7 +++ .cvsignore 6 Jan 2007 05:09:00 -0000 1.8 @@ -1 +1 @@ -xf86-video-rendition-4.1.0.tar.bz2 +xf86-video-rendition-4.1.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 03:24:01 -0000 1.7 +++ sources 6 Jan 2007 05:09:02 -0000 1.8 @@ -1 +1 @@ -6864a3348f66bac9533b35ee2110c6e2 xf86-video-rendition-4.1.0.tar.bz2 +a8b97feccb32184820d5856fe78d34db xf86-video-rendition-4.1.3.tar.bz2 Index: xorg-x11-drv-rendition.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-rendition/devel/xorg-x11-drv-rendition.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-rendition.spec 12 Jul 2006 17:15:49 -0000 1.14 +++ xorg-x11-drv-rendition.spec 6 Jan 2007 05:09:02 -0000 1.15 @@ -6,8 +6,8 @@ Summary: Xorg X11 rendition video driver Name: xorg-x11-drv-rendition -Version: 4.1.0 -Release: 3.1 +Version: 4.1.3 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -58,6 +58,9 @@ %{_mandir}/man4/rendition.4* %changelog +* Fri Jan 05 2007 Adam Jackson 4.1.3-1 +- Update to 4.1.3 + * Wed Jul 12 2006 Jesse Keating - 4.1.0-3.1 - rebuild From fedora-cvs-commits at redhat.com Sat Jan 6 09:35:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 04:35:44 -0500 Subject: rpms/gcc/FC-6 gcc41-pr24036-revert.patch, NONE, 1.1 gcc41-pr30001.patch, NONE, 1.1 gcc41-pr30045.patch, NONE, 1.1 gcc41-pr30189.patch, NONE, 1.1 .cvsignore, 1.178, 1.179 gcc41.spec, 1.112, 1.113 sources, 1.180, 1.181 gcc41-pr27266.patch, 1.1, NONE gcc41-pr29166.patch, 1.1, NONE gcc41-pr29241.patch, 1.1, NONE gcc41-pr29612.patch, 1.1, NONE gcc41-pr30230.patch, 1.1, NONE gcc41-pr30262.patch, 1.1, NONE Message-ID: <200701060935.l069ZicN007415@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7390/FC-6 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-pr24036-revert.patch gcc41-pr30001.patch gcc41-pr30045.patch gcc41-pr30189.patch Removed Files: gcc41-pr27266.patch gcc41-pr29166.patch gcc41-pr29241.patch gcc41-pr29612.patch gcc41-pr30230.patch gcc41-pr30262.patch Log Message: auto-import gcc-4.1.1-51.fc6 on branch FC-6 from gcc-4.1.1-51.fc6.src.rpm gcc41-pr24036-revert.patch: 0 files changed --- NEW FILE gcc41-pr24036-revert.patch --- 2006-12-21 Jakub Jelinek Revert: 2006-12-16 Joseph Myers David Edelsohn PR target/24036 * doc/tm.texi (HARD_REGNO_NREGS_HAS_PADDING, HARD_REGNO_NREGS_WITH_PADDING): Document new target macros. * defaults.h (HARD_REGNO_NREGS_HAS_PADDING, HARD_REGNO_NREGS_WITH_PADDING): Define. * config/i386/i386.h (HARD_REGNO_NREGS_HAS_PADDING, HARD_REGNO_NREGS_WITH_PADDING): Define. * rtlanal.c (subreg_regno_offset, subreg_offset_representable_p): Use new macros to detect modes with holes; do not look at integer units. (subreg_offset_representable_p): Check for and disallow cases where the modes use different numbers of bits from registers. * config/rs6000/rs6000.c (rs6000_emit_move): Handle TFmode constant for soft-float. (rs6000_hard_regno_nregs): Use UNITS_PER_FP_WORD for e500 GPRs containing doubles. (rs6000_split_multireg_move): Use DFmode reg_mode for TFmode moves in E500 double case. * config/rs6000/rs6000.md (movtf): Allow soft-float. (movtf_softfloat): New. --- gcc/doc/tm.texi (revision 119967) +++ gcc/doc/tm.texi (revision 119966) @@ -1937,33 +1937,6 @@ definition of this macro is @end smallexample @end defmac - at defmac HARD_REGNO_NREGS_HAS_PADDING (@var{regno}, @var{mode}) -A C expression that is nonzero if a value of mode @var{mode}, stored -in memory, ends with padding that causes it to take up more space than -in registers starting at register number @var{regno} (as determined by -multiplying GCC's notion of the size of the register when containing -this mode by the number of registers returned by - at code{HARD_REGNO_NREGS}). By default this is zero. - -For example, if a floating-point value is stored in three 32-bit -registers but takes up 128 bits in memory, then this would be -nonzero. - -This macros only needs to be defined if there are cases where - at code{subreg_regno_offset} and @code{subreg_offset_representable_p} -would otherwise wrongly determine that a @code{subreg} can be -represented by an offset to the register number, when in fact such a - at code{subreg} would contain some of the padding not stored in -registers and so not be representable. - at end defmac - - at defmac HARD_REGNO_NREGS_WITH_PADDING (@var{regno}, @var{mode}) -For values of @var{regno} and @var{mode} for which - at code{HARD_REGNO_NREGS_HAS_PADDING} returns nonzero, a C expression -returning the greater number of registers required to hold the value -including any padding. In the example above, the value would be four. - at end defmac - @defmac REGMODE_NATURAL_SIZE (@var{mode}) Define this macro if the natural size of registers that hold values of mode @var{mode} is not the word size. It is a C expression that --- gcc/defaults.h (revision 119967) +++ gcc/defaults.h (revision 119966) @@ -867,9 +867,4 @@ Software Foundation, 51 Franklin Street, #define INCOMING_FRAME_SP_OFFSET 0 #endif -#ifndef HARD_REGNO_NREGS_HAS_PADDING -#define HARD_REGNO_NREGS_HAS_PADDING(REGNO, MODE) 0 -#define HARD_REGNO_NREGS_WITH_PADDING(REGNO, MODE) -1 -#endif - #endif /* ! GCC_DEFAULTS_H */ --- gcc/rtlanal.c (revision 119967) +++ gcc/rtlanal.c (revision 119966) @@ -3138,15 +3138,34 @@ unsigned int subreg_regno_offset (unsigned int xregno, enum machine_mode xmode, unsigned int offset, enum machine_mode ymode) { - int nregs_xmode, nregs_ymode; + int nregs_xmode, nregs_ymode, nregs_xmode_unit_int; int mode_multiple, nregs_multiple; int y_offset; + enum machine_mode xmode_unit, xmode_unit_int; gcc_assert (xregno < FIRST_PSEUDO_REGISTER); + if (GET_MODE_INNER (xmode) == VOIDmode) + xmode_unit = xmode; + else + xmode_unit = GET_MODE_INNER (xmode); + + if (FLOAT_MODE_P (xmode_unit)) + { + xmode_unit_int = int_mode_for_mode (xmode_unit); + if (xmode_unit_int == BLKmode) + /* It's probably bad to be here; a port should have an integer mode + that's the same size as anything of which it takes a SUBREG. */ + xmode_unit_int = xmode_unit; + } + else + xmode_unit_int = xmode_unit; + + nregs_xmode_unit_int = hard_regno_nregs[xregno][xmode_unit_int]; + /* Adjust nregs_xmode to allow for 'holes'. */ - if (HARD_REGNO_NREGS_HAS_PADDING (xregno, xmode)) - nregs_xmode = HARD_REGNO_NREGS_WITH_PADDING (xregno, xmode); + if (nregs_xmode_unit_int != hard_regno_nregs[xregno][xmode_unit]) + nregs_xmode = nregs_xmode_unit_int * GET_MODE_NUNITS (xmode); else nregs_xmode = hard_regno_nregs[xregno][xmode]; @@ -3184,31 +3203,38 @@ bool subreg_offset_representable_p (unsigned int xregno, enum machine_mode xmode, unsigned int offset, enum machine_mode ymode) { - int nregs_xmode, nregs_ymode; + int nregs_xmode, nregs_ymode, nregs_xmode_unit, nregs_xmode_unit_int; int mode_multiple, nregs_multiple; int y_offset; - int regsize_xmode, regsize_ymode; + enum machine_mode xmode_unit, xmode_unit_int; gcc_assert (xregno < FIRST_PSEUDO_REGISTER); + if (GET_MODE_INNER (xmode) == VOIDmode) + xmode_unit = xmode; + else + xmode_unit = GET_MODE_INNER (xmode); + + if (FLOAT_MODE_P (xmode_unit)) + { + xmode_unit_int = int_mode_for_mode (xmode_unit); + if (xmode_unit_int == BLKmode) + /* It's probably bad to be here; a port should have an integer mode + that's the same size as anything of which it takes a SUBREG. */ + xmode_unit_int = xmode_unit; + } + else + xmode_unit_int = xmode_unit; + + nregs_xmode_unit = hard_regno_nregs[xregno][xmode_unit]; + nregs_xmode_unit_int = hard_regno_nregs[xregno][xmode_unit_int]; + /* If there are holes in a non-scalar mode in registers, we expect that it is made up of its units concatenated together. */ - if (HARD_REGNO_NREGS_HAS_PADDING (xregno, xmode)) + if (nregs_xmode_unit != nregs_xmode_unit_int) { - enum machine_mode xmode_unit; - - nregs_xmode = HARD_REGNO_NREGS_WITH_PADDING (xregno, xmode); - if (GET_MODE_INNER (xmode) == VOIDmode) - xmode_unit = xmode; - else - xmode_unit = GET_MODE_INNER (xmode); - gcc_assert (HARD_REGNO_NREGS_HAS_PADDING (xregno, xmode_unit)); - gcc_assert (nregs_xmode - == (GET_MODE_NUNITS (xmode) - * HARD_REGNO_NREGS_WITH_PADDING (xregno, xmode_unit))); - gcc_assert (hard_regno_nregs[xregno][xmode] - == (hard_regno_nregs[xregno][xmode_unit] - * GET_MODE_NUNITS (xmode))); + gcc_assert (nregs_xmode_unit * GET_MODE_NUNITS (xmode) + == hard_regno_nregs[xregno][xmode]); /* You can only ask for a SUBREG of a value with holes in the middle if you don't cross the holes. (Such a SUBREG should be done by @@ -3218,12 +3244,15 @@ subreg_offset_representable_p (unsigned 3 for each part, but in memory it's two 128-bit parts. Padding is assumed to be at the end (not necessarily the 'high part') of each unit. */ - if ((offset / GET_MODE_SIZE (xmode_unit) + 1 - < GET_MODE_NUNITS (xmode)) - && (offset / GET_MODE_SIZE (xmode_unit) + if (nregs_xmode_unit != nregs_xmode_unit_int + && (offset / GET_MODE_SIZE (xmode_unit_int) + 1 + < GET_MODE_NUNITS (xmode)) + && (offset / GET_MODE_SIZE (xmode_unit_int) != ((offset + GET_MODE_SIZE (ymode) - 1) - / GET_MODE_SIZE (xmode_unit)))) + / GET_MODE_SIZE (xmode_unit_int)))) return false; + + nregs_xmode = nregs_xmode_unit_int * GET_MODE_NUNITS (xmode); } else nregs_xmode = hard_regno_nregs[xregno][xmode]; @@ -3237,15 +3266,6 @@ subreg_offset_representable_p (unsigned ? WORDS_BIG_ENDIAN : BYTES_BIG_ENDIAN)) return true; - /* If registers store different numbers of bits in the different - modes, we cannot generally form this subreg. */ - regsize_xmode = GET_MODE_SIZE (xmode) / nregs_xmode; - regsize_ymode = GET_MODE_SIZE (ymode) / nregs_ymode; - if (regsize_xmode > regsize_ymode && nregs_ymode > 1) - return false; - if (regsize_ymode > regsize_xmode && nregs_xmode > 1) - return false; - /* Lowpart subregs are otherwise valid. */ if (offset == subreg_lowpart_offset (ymode, xmode)) return true; --- gcc/config/i386/i386.h (revision 119967) +++ gcc/config/i386/i386.h (revision 119966) @@ -827,15 +827,6 @@ do { \ ? (TARGET_64BIT ? 4 : 6) \ : ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD))) -#define HARD_REGNO_NREGS_HAS_PADDING(REGNO, MODE) \ - ((TARGET_128BIT_LONG_DOUBLE && !TARGET_64BIT) \ - ? (FP_REGNO_P (REGNO) || SSE_REGNO_P (REGNO) || MMX_REGNO_P (REGNO) \ - ? 0 \ - : ((MODE) == XFmode || (MODE) == XCmode)) \ - : 0) - -#define HARD_REGNO_NREGS_WITH_PADDING(REGNO, MODE) ((MODE) == XFmode ? 4 : 8) - #define VALID_SSE2_REG_MODE(MODE) \ ((MODE) == V16QImode || (MODE) == V8HImode || (MODE) == V2DFmode \ || (MODE) == V2DImode || (MODE) == DFmode) --- gcc/config/rs6000/rs6000.c (revision 119967) +++ gcc/config/rs6000/rs6000.c (revision 119966) @@ -3573,6 +3573,9 @@ rs6000_hard_regno_nregs (int regno, enum if (FP_REGNO_P (regno)) return (GET_MODE_SIZE (mode) + UNITS_PER_FP_WORD - 1) / UNITS_PER_FP_WORD; + if (TARGET_E500_DOUBLE && mode == DFmode) + return 1; + if (SPE_SIMD_REGNO_P (regno) && TARGET_SPE && SPE_VECTOR_MODE (mode)) return (GET_MODE_SIZE (mode) + UNITS_PER_SPE_WORD - 1) / UNITS_PER_SPE_WORD; @@ -3580,14 +3583,6 @@ rs6000_hard_regno_nregs (int regno, enum return (GET_MODE_SIZE (mode) + UNITS_PER_ALTIVEC_WORD - 1) / UNITS_PER_ALTIVEC_WORD; - /* The value returned for SCmode in the E500 double case is 2 for - ABI compatibility; storing an SCmode value in a single register - would require function_arg and rs6000_spe_function_arg to handle - SCmode so as to pass the value correctly in a pair of - registers. */ - if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode) - return (GET_MODE_SIZE (mode) + UNITS_PER_FP_WORD - 1) / UNITS_PER_FP_WORD; - return (GET_MODE_SIZE (mode) + UNITS_PER_WORD - 1) / UNITS_PER_WORD; } @@ -3956,7 +3951,8 @@ rs6000_emit_move (rtx dest, rtx source, /* 128-bit constant floating-point values on Darwin should really be loaded as two parts. */ - if (!TARGET_IEEEQUAD && TARGET_LONG_DOUBLE_128 + if (!TARGET_IEEEQUAD + && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128 && mode == TFmode && GET_CODE (operands[1]) == CONST_DOUBLE) { /* DImode is used, not DFmode, because simplify_gen_subreg doesn't @@ -12402,8 +12398,6 @@ rs6000_split_multireg_move (rtx dst, rtx reg_mode = DFmode; else if (ALTIVEC_REGNO_P (reg)) reg_mode = V16QImode; - else if (TARGET_E500_DOUBLE && mode == TFmode) - reg_mode = DFmode; else reg_mode = word_mode; reg_mode_size = GET_MODE_SIZE (reg_mode); --- gcc/config/rs6000/rs6000.md (revision 119967) +++ gcc/config/rs6000/rs6000.md (revision 119966) @@ -7789,7 +7789,8 @@ (define_insn "*movdf_softfloat64" (define_expand "movtf" [(set (match_operand:TF 0 "general_operand" "") (match_operand:TF 1 "any_operand" ""))] - "!TARGET_IEEEQUAD && TARGET_LONG_DOUBLE_128" + "!TARGET_IEEEQUAD + && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "{ rs6000_emit_move (operands[0], operands[1], TFmode); DONE; }") ; It's important to list the o->f and f->o moves before f->f because @@ -7808,19 +7809,6 @@ (define_insn_and_split "*movtf_internal" { rs6000_split_multireg_move (operands[0], operands[1]); DONE; } [(set_attr "length" "8,8,8,20,20,16")]) -(define_insn_and_split "*movtf_softfloat" - [(set (match_operand:TF 0 "nonimmediate_operand" "=r,Y,r") - (match_operand:TF 1 "input_operand" "YGHF,r,r"))] - "!TARGET_IEEEQUAD - && (TARGET_SOFT_FLOAT || !TARGET_FPRS) && TARGET_LONG_DOUBLE_128 - && (gpc_reg_operand (operands[0], TFmode) - || gpc_reg_operand (operands[1], TFmode))" - "#" - "&& reload_completed" - [(pc)] -{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; } - [(set_attr "length" "20,20,16")]) - (define_expand "extenddftf2" [(parallel [(set (match_operand:TF 0 "nonimmediate_operand" "") (float_extend:TF (match_operand:DF 1 "input_operand" ""))) gcc41-pr30001.patch: 0 files changed --- NEW FILE gcc41-pr30001.patch --- 2006-12-28 Tom Tromey PR preprocessor/30001: * charset.c (_cpp_convert_input): Check that to.len is greater than zero. --- libcpp/charset.c (revision 120244) +++ libcpp/charset.c (revision 120245) @@ -1,5 +1,5 @@ /* CPP Library - charsets - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges. @@ -1628,7 +1628,7 @@ _cpp_convert_input (cpp_reader *pfile, c terminate with another \r, not an \n, so that we do not mistake the \r\n sequence for a single DOS line ending and erroneously issue the "No newline at end of file" diagnostic. */ - if (to.text[to.len - 1] == '\r') + if (to.len && to.text[to.len - 1] == '\r') to.text[to.len] = '\r'; else to.text[to.len] = '\n'; gcc41-pr30045.patch: 0 files changed --- NEW FILE gcc41-pr30045.patch --- 2006-12-19 Andrew Pinski PR tree-opt/30045 * tree-vrp.c (nonnull_arg_p): Treat the static decl as always non null. * gcc.dg/pr30045.c: New test. --- gcc/tree-vrp.c (revision 120068) +++ gcc/tree-vrp.c (revision 120069) @@ -102,6 +102,10 @@ nonnull_arg_p (tree arg) gcc_assert (TREE_CODE (arg) == PARM_DECL && POINTER_TYPE_P (TREE_TYPE (arg))); + /* The static chain decl is always non null. */ + if (arg == cfun->static_chain_decl) + return true; + fntype = TREE_TYPE (current_function_decl); attrs = lookup_attribute ("nonnull", TYPE_ATTRIBUTES (fntype)); --- gcc/testsuite/gcc.dg/pr30045.c (revision 0) +++ gcc/testsuite/gcc.dg/pr30045.c (revision 120069) @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fno-inline" } */ +int f(int *a) +{ + int __attribute__((nonnull(1))) g(int *b) + { + int **c = &a; + if (b) + return *a + **c; + return *b; + } + if (a) + return g(a); + return 1; +} gcc41-pr30189.patch: dwarf2out.c | 5 ++++- testsuite/gcc.dg/pr30189.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) --- NEW FILE gcc41-pr30189.patch --- 2007-01-03 Alexandre Oliva PR debug/30189 * dwarf2out.c (modified_type_die): Follow DECL_ORIGINAL_TYPE even if cv-qualification is the same. * gcc.dg/pr30189.c: New test. --- gcc/dwarf2out.c.orig 2007-01-02 17:48:15.000000000 -0200 +++ gcc/dwarf2out.c 2007-01-02 17:51:53.000000000 -0200 @@ -8407,7 +8407,10 @@ modified_type_die (tree type, int is_con mod_type_die = lookup_type_die (qualified_type); } else if (is_const_type < TYPE_READONLY (dtype) - || is_volatile_type < TYPE_VOLATILE (dtype)) + || is_volatile_type < TYPE_VOLATILE (dtype) + || (is_const_type <= TYPE_READONLY (dtype) + && is_volatile_type <= TYPE_VOLATILE (dtype) + && DECL_ORIGINAL_TYPE (type_name) != type)) /* cv-unqualified version of named type. Just use the unnamed type to which it refers. */ mod_type_die --- gcc/testsuite/gcc.dg/pr30189.c 1970-01-01 00:00:00.000000000 +0000 +++ gcc/testsuite/gcc.dg/pr30189.c 2007-01-03 14:14:16.000000000 -0200 @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-g -O" } */ + +extern void foo (void); + +static +void baz (int i) +{ + foo (); + typedef char A[i]; + struct { A b; } *x = 0; +} + +void +bar (i) +{ + baz (i); +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-6/.cvsignore,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- .cvsignore 21 Dec 2006 00:26:06 -0000 1.178 +++ .cvsignore 6 Jan 2007 09:35:42 -0000 1.179 @@ -1 +1 @@ -gcc-4.1.1-20061220.tar.bz2 +gcc-4.1.1-20070105.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-6/gcc41.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gcc41.spec 21 Dec 2006 00:26:06 -0000 1.112 +++ gcc41.spec 6 Jan 2007 09:35:42 -0000 1.113 @@ -1,8 +1,9 @@ -%define DATE 20061220 +%define DATE 20070105 %define gcc_version 4.1.1 -%define gcc_release 47 +%define gcc_release 51 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 +%define include_gappletviewer 1 %ifarch %{ix86} x86_64 ia64 %define build_ada 1 %else @@ -122,10 +123,10 @@ Patch14: gcc41-objc-rh185398.patch Patch15: gcc41-tests.patch Patch16: gcc41-pr25874.patch -Patch17: gcc41-pr29241.patch +Patch17: gcc41-pr30189.patch Patch18: gcc41-i386-tune-geode.patch Patch19: gcc41-hash-style-gnu.patch -Patch20: gcc41-pr29612.patch +Patch20: gcc41-pr30001.patch Patch21: gcc41-java-libdotdotlib.patch Patch22: gcc41-pr28709.patch Patch23: gcc41-pr28755.patch @@ -140,11 +141,9 @@ Patch32: gcc41-ppc64-libffi-unwind.patch Patch33: gcc41-pr30113.patch Patch34: gcc41-pr30110.patch -Patch35: gcc41-pr29166.patch -Patch36: gcc41-pr27266.patch -Patch37: gcc41-pr30143.patch -Patch38: gcc41-pr30262.patch -Patch39: gcc41-pr30230.patch +Patch35: gcc41-pr30143.patch +Patch36: gcc41-pr30045.patch +Patch37: gcc41-pr24036-revert.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -436,10 +435,10 @@ %patch14 -p0 -b .objc-rh185398~ %patch15 -p0 -b .tests~ %patch16 -p0 -b .pr25874~ -%patch17 -p0 -b .pr29241~ +%patch17 -p0 -b .pr30189~ %patch18 -p0 -b .i386-tune-geode~ %patch19 -p0 -b .hash-style-gnu~ -%patch20 -p0 -b .pr29612~ +%patch20 -p0 -b .pr30001~ %patch21 -p0 -b .java-libdotdotlib~ %patch22 -p0 -b .pr28709~ %patch23 -p0 -b .pr28755~ @@ -454,11 +453,9 @@ %patch32 -p0 -b .ppc64-libffi-unwind~ %patch33 -p0 -b .pr30113~ %patch34 -p0 -b .pr30110~ -%patch35 -p0 -b .pr29166~ -%patch36 -p0 -b .pr27266~ -%patch37 -p0 -b .pr30143~ -%patch38 -p0 -b .pr30262~ -%patch39 -p0 -b .pr30230~ +%patch35 -p0 -b .pr30143~ +%patch36 -p0 -b .pr30045~ +%patch37 -p0 -b .pr24036-revert~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1395,7 +1392,9 @@ %{_prefix}/bin/grmic %{_prefix}/bin/grmiregistry %{_prefix}/bin/gcj-dbtool +%if %{include_gappletviewer} %{_prefix}/bin/gappletviewer +%endif %{_prefix}/bin/gjarsigner %{_prefix}/bin/gkeytool %{_mandir}/man1/fastjar.1* @@ -1414,7 +1413,9 @@ %{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so %{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so %{_prefix}/%{_lib}/gcj-%{version}/libjawt.so +%if %{include_gappletviewer} %{_prefix}/%{_lib}/gcj-%{version}/libgcjwebplugin.so +%endif %{_prefix}/%{_lib}/gcj-%{version}/libjvm.so %dir %{_prefix}/share/java %{_prefix}/share/java/[^s]* @@ -1423,7 +1424,9 @@ %{_prefix}/%{_lib}/logging.properties %dir %{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_prefix}/%{_lib}/gcj-%{version}/classmap.db +%if %{include_gappletviewer} %doc rpm.doc/README.libgcjwebplugin.so +%endif %files -n libgcj-devel %defattr(-,root,root) @@ -1524,9 +1527,36 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog -* Wed Dec 20 2006 Jakub Jelinek 4.1.1-47.fc6 +* Fri Jan 5 2007 Jakub Jelinek 4.1.1-51.fc6 +- update from gcc-4_1-branch (-r120325:120507) + - PRs c++/30382, middle-end/27826, middle-end/28116, + tree-optimization/30212 + +* Thu Jan 4 2007 Jakub Jelinek 4.1.1-51 +- fix complex division with -std=c99 or -std=gnu99 (PR c/30360) + +* Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 +- backwards compatibility with old layout of struct _Unwind_Context + (#220627) +- fix preprocessor defines in assembly preprocessed with -std=... + (Steven Bosscher, PR c/25993) +- fix PCH creation with templates (Jason Merrill, PR c++/28217) +- fix dwarf2out ICE (Alexandre Oliva, #217529, PR debug/30189) + +* Tue Jan 2 2007 Jakub Jelinek 4.1.1-49 +- update from gcc-4_1-branch (-r120062:120325) + - PRs debug/26964, fortran/30200, libfortran/30145 +- fix endless recursion in negate_expr/fold_unary (PR middle-end/30286) +- fix cpp problem on empty source files (Tom Tromey, PR preprocessor/30001) +- improve constructor disambiguation (Mark Mitchell, PR c++/28261, + PR c++/29535) +- fix handling of non-NULL attribute on nested functions (Andrew Pinski, + PR tree-opt/30045) +- fix ICE with friend templatized static member function (PR c++/29054) + +* Wed Dec 20 2006 Jakub Jelinek 4.1.1-48 - update from gcc-4_1-branch (-r119833:120062) - - PRs libstdc++/11953, target/24036 + - PRs libstdc++/11953 - fix ia64 EH region boundaries where last br.call in the region is not at the end of a bundle (#219596, PR target/30230) - fix DI resp. TImode __sync_*_compare_and_swap on i?86 resp. x86_64 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-6/sources,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- sources 21 Dec 2006 00:26:06 -0000 1.180 +++ sources 6 Jan 2007 09:35:42 -0000 1.181 @@ -1 +1 @@ -750bda4d0c5278dd34f79731ac8a7f9d gcc-4.1.1-20061220.tar.bz2 +4b9c1eb1d83c309010044b827b8c3e45 gcc-4.1.1-20070105.tar.bz2 --- gcc41-pr27266.patch DELETED --- --- gcc41-pr29166.patch DELETED --- --- gcc41-pr29241.patch DELETED --- --- gcc41-pr29612.patch DELETED --- --- gcc41-pr30230.patch DELETED --- --- gcc41-pr30262.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 6 15:06:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 10:06:14 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch, NONE, 1.1 openoffice.org.spec, 1.989, 1.990 Message-ID: <200701061506.l06F6EUu024082@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23984 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch Log Message: Resolves: rhbz#221491 openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch: source/core/layout/ssfrm.cxx | 0 sw/source/core/layout/ssfrm.cxx | 9 +++++++++ 2 files changed, 9 insertions(+) --- NEW FILE openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch --- Index: source/core/layout/ssfrm.cxx =================================================================== RCS file: /cvs/sw/sw/source/core/layout/ssfrm.cxx,v retrieving revision 1.45 diff -u -r1.45 ssfrm.cxx --- openoffice.org.orig/sw/source/core/layout/ssfrm.cxx 16 Sep 2006 21:24:12 -0000 1.45 +++ openoffice.org/sw/source/core/layout/ssfrm.cxx 6 Jan 2007 14:50:07 -0000 @@ -577,7 +577,16 @@ // --> OD 2004-06-30 #i28701# SwAnchoredObject* pAnchoredObj = (*pFrm->GetDrawObjs())[0]; if ( pAnchoredObj->ISA(SwFlyFrm) ) + { + + //cmc: flush any accessible events that might be related to + //this object + if ((ViewShell *pSh = GetShell())) + if ((SwViewImp *pImp = pSh ? pSh->Imp() : 0)) + pImp->FireAccessibleEvents(); + delete pAnchoredObj; + } else { SdrObject* pSdrObj = pAnchoredObj->DrawObj(); Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.989 retrieving revision 1.990 diff -u -r1.989 -r1.990 --- openoffice.org.spec 3 Jan 2007 16:12:09 -0000 1.989 +++ openoffice.org.spec 6 Jan 2007 15:06:11 -0000 1.990 @@ -1,6 +1,6 @@ %define oootag OOE680 %define ooomilestone 6 -%define rh_rpm_release 10 +%define rh_rpm_release 11 # gcc#19664# %define stlvisibilityfcked 1 @@ -127,6 +127,7 @@ Patch59: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch Patch60: workspace.impress115.patch Patch61: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch +Patch62: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch %define instdir %{_libdir}/openoffice.org2.1 @@ -991,6 +992,7 @@ %patch59 -p1 -b .gccXXXXX.basegfx.crash.patch %patch60 -p1 -b .workspace.impress115.patch %patch61 -p1 -b .ooo72349.svx.scriptrange.patch +%patch62 -p1 -b .ooo73201.sw.a11yloadcrash.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -2575,6 +2577,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Sat Jan 06 2007 Caolan McNamara - 1:2.1.0-6.11 +- Resolves: rhbz#221491 openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch + * Wed Jan 03 2007 Caolan McNamara - 1:2.1.0-6.10 - Resolves: rhbz#216094 add workspace.impress115.patch From fedora-cvs-commits at redhat.com Sat Jan 6 15:21:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 10:21:07 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.392,1.393 Message-ID: <200701061521.l06FL7ep023335@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22939 Modified Files: eclipse.spec Log Message: * Fri Jan 05 2007 Ben Konrath 3.2.1-27 - Use /g in tomcat version replacement. - Disable com.jcraft.jsch_0.1.28.jar and org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.392 retrieving revision 1.393 diff -u -r1.392 -r1.393 --- eclipse.spec 6 Jan 2007 03:22:16 -0000 1.392 +++ eclipse.spec 6 Jan 2007 15:21:05 -0000 1.393 @@ -1466,7 +1466,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.rcp_* %if %{gcj_support} %{_libdir}/gcj/%{name}/org.eclipse.update.configurator_* +%ifnarch ia64 %{_libdir}/gcj/%{name}/org.eclipse.osgi_* +%endif %{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_* %{_libdir}/gcj/%{name}/com.ibm.icu_* %{_libdir}/gcj/%{name}/org.eclipse.jface_* @@ -1513,7 +1515,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.jface.text_* %{_datadir}/%{name}/plugins/org.eclipse.ui.intro_* %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_* +%ifnarch ia64 %{_datadir}/%{name}/plugins/com.jcraft.jsch_* +%endif %{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_* %{_datadir}/%{name}/plugins/org.eclipse.ant.core_* %{_datadir}/%{name}/plugins/org.eclipse.help.appserver_* From fedora-cvs-commits at redhat.com Sat Jan 6 15:39:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 10:39:23 -0500 Subject: rpms/agg/FC-6 agg.spec,1.13,1.14 sources,1.3,1.4 Message-ID: <200701061539.l06FdNG1027262@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/agg/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27247 Modified Files: agg.spec sources Log Message: Resolves: rhbz#214970 rebuild with new 2.4 sources, sources were changed upstream silently Index: agg.spec =================================================================== RCS file: /cvs/dist/rpms/agg/FC-6/agg.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- agg.spec 12 Jul 2006 05:07:41 -0000 1.13 +++ agg.spec 6 Jan 2007 15:39:21 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Anti-Grain Geometry Name: agg Version: 2.4 -Release: 2.1 +Release: 2.2 Group: System Environment/Libraries URL: http://www.antigrain.com License: MIT @@ -57,6 +57,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sat Jan 06 2006 Caolan McNamara - 2.4-2.2 +- Resolves: rhbz#214970 rebuild with new 2.4 sources + * Wed Jul 12 2006 Jesse Keating - 2.4-2.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/agg/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 May 2006 07:04:10 -0000 1.3 +++ sources 6 Jan 2007 15:39:21 -0000 1.4 @@ -1 +1 @@ -e3456e477526eebb4d2f1d108b96867c agg-2.4.tar.gz +863d9992fd83c5d40fe1c011501ecf0e agg-2.4.tar.gz From fedora-cvs-commits at redhat.com Sat Jan 6 15:39:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 10:39:41 -0500 Subject: rpms/agg/FC-6 agg.spec,1.14,1.15 Message-ID: <200701061539.l06Fdf8F027288@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/agg/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27274 Modified Files: agg.spec Log Message: Resolves: rhbz#214970 rebuild with new 2.4 sources, sources were changed upstream silently Index: agg.spec =================================================================== RCS file: /cvs/dist/rpms/agg/FC-6/agg.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- agg.spec 6 Jan 2007 15:39:21 -0000 1.14 +++ agg.spec 6 Jan 2007 15:39:39 -0000 1.15 @@ -57,7 +57,7 @@ rm -r $RPM_BUILD_ROOT %changelog -* Sat Jan 06 2006 Caolan McNamara - 2.4-2.2 +* Sat Jan 06 2007 Caolan McNamara - 2.4-2.2 - Resolves: rhbz#214970 rebuild with new 2.4 sources * Wed Jul 12 2006 Jesse Keating - 2.4-2.1 From fedora-cvs-commits at redhat.com Sat Jan 6 16:19:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 11:19:30 -0500 Subject: rpms/agg/devel .cvsignore, 1.3, 1.4 agg.spec, 1.14, 1.15 sources, 1.4, 1.5 Message-ID: <200701061619.l06GJUEc003575@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/agg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3559 Modified Files: .cvsignore agg.spec sources Log Message: bump to 2.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/agg/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 May 2006 07:04:10 -0000 1.3 +++ .cvsignore 6 Jan 2007 16:19:28 -0000 1.4 @@ -1,2 +1,3 @@ agg23.tar.gz agg-2.4.tar.gz +agg-2.5.tar.gz Index: agg.spec =================================================================== RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- agg.spec 10 Nov 2006 12:07:43 -0000 1.14 +++ agg.spec 6 Jan 2007 16:19:28 -0000 1.15 @@ -1,10 +1,10 @@ Summary: Anti-Grain Geometry Name: agg -Version: 2.4 -Release: 3 +Version: 2.5 +Release: 1 Group: System Environment/Libraries URL: http://www.antigrain.com -License: MIT +License: GPL Source: http://www.antigrain.com/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel @@ -57,6 +57,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Sat Jan 06 2007 Caolan McNamara - 2.5-1 +- bump to 2.5 + * Fri Nov 10 2006 Caolan McNamara - 2.4-3 - Resolves: rhbz#214970 rebuild with new 2.4 sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/agg/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Nov 2006 12:07:43 -0000 1.4 +++ sources 6 Jan 2007 16:19:28 -0000 1.5 @@ -1 +1 @@ -863d9992fd83c5d40fe1c011501ecf0e agg-2.4.tar.gz +ddc67cbdc7d51e1ec984c2ac2724c08a agg-2.5.tar.gz From fedora-cvs-commits at redhat.com Sat Jan 6 16:31:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 11:31:24 -0500 Subject: rpms/agg/devel agg-2.4-depends.patch,1.1,1.2 Message-ID: <200701061631.l06GVOKr017319@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/agg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17263 Modified Files: agg-2.4-depends.patch Log Message: upgrade to 2.5 agg-2.4-depends.patch: font_freetype/Makefile.am | 3 ++- src/platform/X11/Makefile.am | 2 +- src/platform/sdl/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) Index: agg-2.4-depends.patch =================================================================== RCS file: /cvs/dist/rpms/agg/devel/agg-2.4-depends.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- agg-2.4-depends.patch 10 Jul 2006 14:24:17 -0000 1.1 +++ agg-2.4-depends.patch 6 Jan 2007 16:31:21 -0000 1.2 @@ -26,10 +26,9 @@ diff -ru agg-2.4.orig/src/platform/X11/Makefile.am agg-2.4/src/platform/X11/Makefile.am --- agg-2.4.orig/src/platform/X11/Makefile.am 2005-10-19 19:11:35.000000000 +0100 +++ agg-2.4/src/platform/X11/Makefile.am 2006-07-10 15:11:55.000000000 +0100 -@@ -4,5 +4,5 @@ libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L at x_libraries@ libaggplatformX11_la_SOURCES = agg_platform_support.cpp - libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include @x_includes@ + libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I at x_includes@ -libaggplatformX11_la_LIBADD = -lX11 +libaggplatformX11_la_LIBADD = -lX11 ../../libagg.la endif From fedora-cvs-commits at redhat.com Sat Jan 6 16:32:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 11:32:48 -0500 Subject: rpms/agg/devel agg23-optional-gpc.patch,1.1,NONE Message-ID: <200701061632.l06GWmsP018422@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/agg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18370 Removed Files: agg23-optional-gpc.patch Log Message: upgrade to 2.5 --- agg23-optional-gpc.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 6 18:20:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 13:20:18 -0500 Subject: rpms/kernel/devel .cvsignore, 1.559, 1.560 kernel-2.6.spec, 1.2904, 1.2905 linux-2.6-compile-fixes.patch, 1.129, 1.130 linux-2.6-execshield.patch, 1.46, 1.47 sources, 1.522, 1.523 upstream, 1.450, 1.451 Message-ID: <200701061820.l06IKIbH017680@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17659 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch linux-2.6-execshield.patch sources upstream Log Message: git4 (also move the execshield compile fix to execshield) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.559 retrieving revision 1.560 diff -u -r1.559 -r1.560 --- .cvsignore 2 Jan 2007 04:31:26 -0000 1.559 +++ .cvsignore 6 Jan 2007 18:20:16 -0000 1.560 @@ -5,3 +5,4 @@ xen-11633.tar.bz2 linux-2.6.19.tar.bz2 patch-2.6.20-rc3.bz2 +patch-2.6.20-rc3-git4.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2904 retrieving revision 1.2905 diff -u -r1.2904 -r1.2905 --- kernel-2.6.spec 2 Jan 2007 04:31:26 -0000 1.2904 +++ kernel-2.6.spec 6 Jan 2007 18:20:16 -0000 1.2905 @@ -301,6 +301,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.20-rc3.bz2 +Patch2: patch-2.6.20-rc3-git4.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -772,6 +773,7 @@ # Update to latest upstream. %patch1 -p1 +%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -1988,6 +1990,9 @@ # - tux. %changelog +* Sat Jan 6 2007 Dave Jones +- 2.6.20rc3-git4 + * Mon Jan 1 2007 Dave Jones - 2.6.20rc3 linux-2.6-compile-fixes.patch: linux-2.6.19.noarch/drivers/macintosh/via-pmu.c | 1 + linux-2.6.19.noarch/include/asm-powerpc/io.h | 1 + linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ 3 files changed, 6 insertions(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- linux-2.6-compile-fixes.patch 31 Dec 2006 19:42:34 -0000 1.129 +++ linux-2.6-compile-fixes.patch 6 Jan 2007 18:20:16 -0000 1.130 @@ -5,57 +5,6 @@ # to do a compile to figure out what your diff is fixing. Thanks. # -arch/i386/kernel/process.c: In function '__switch_to': -arch/i386/kernel/process.c:645: error: implicit declaration of function 'load_user_cs_desc' -arch/i386/kernel/process.c: In function 'arch_add_exec_range': -arch/i386/kernel/process.c:915: error: implicit declaration of function 'set_user_cs' - ---- linux-2.6.19.noarch/include/asm-i386/desc.h~ 2006-12-08 06:52:55.000000000 -0500 -+++ linux-2.6.19.noarch/include/asm-i386/desc.h 2006-12-08 06:53:14.000000000 -0500 -@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas - return base; - } - -+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) -+{ -+ limit = (limit - 1) / PAGE_SIZE; -+ desc->a = limit & 0xffff; -+ desc->b = (limit & 0xf0000) | 0x00c0fb00; -+} -+ -+#define load_user_cs_desc(cpu, mm) \ -+ 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); -+extern void arch_flush_exec_range(struct mm_struct *mm); -+ - #else /* __ASSEMBLY__ */ - - /* -@@ -208,20 +222,6 @@ static inline unsigned long get_desc_bas - shll $16, base; \ - movw idx*8+2(gdt), lo_w; - --static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) --{ -- limit = (limit - 1) / PAGE_SIZE; -- desc->a = limit & 0xffff; -- desc->b = (limit & 0xf0000) | 0x00c0fb00; --} -- --#define load_user_cs_desc(cpu, mm) \ -- 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); --extern void arch_flush_exec_range(struct mm_struct *mm); -- - #endif /* !__ASSEMBLY__ */ - - #endif - - drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices': drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console' drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices': linux-2.6-execshield.patch: linux-2.6.19.noarch/drivers/char/random.c | 8 + linux-2.6.19.noarch/include/asm-i386/desc.h | 14 ++ linux-2.6/arch/i386/kernel/cpu/common.c | 7 + linux-2.6/arch/i386/kernel/process.c | 59 +++++++++ linux-2.6/arch/i386/kernel/smp.c | 3 linux-2.6/arch/i386/kernel/sysenter.c | 6 linux-2.6/arch/i386/kernel/traps.c | 93 +++++++++++++- linux-2.6/arch/i386/mm/init.c | 6 linux-2.6/arch/i386/mm/mmap.c | 6 linux-2.6/arch/i386/mm/pageattr.c | 8 + linux-2.6/arch/ia64/ia32/binfmt_elf32.c | 2 linux-2.6/arch/powerpc/kernel/vdso.c | 3 linux-2.6/arch/x86_64/ia32/ia32_binfmt.c | 6 linux-2.6/arch/x86_64/ia32/syscall32.c | 4 linux-2.6/arch/x86_64/kernel/process.c | 6 linux-2.6/arch/x86_64/kernel/setup64.c | 40 ------ linux-2.6/arch/x86_64/mm/fault.c | 2 linux-2.6/arch/x86_64/mm/mmap.c | 98 +++++++++++--- linux-2.6/fs/binfmt_elf.c | 134 ++++++++++++++++---- linux-2.6/fs/proc/array.c | 8 - linux-2.6/fs/proc/base.c | 8 - linux-2.6/fs/proc/task_mmu.c | 29 +++- linux-2.6/include/asm-i386/a.out.h | 2 linux-2.6/include/asm-i386/elf.h | 6 linux-2.6/include/asm-i386/mmu.h | 4 linux-2.6/include/asm-i386/page.h | 5 linux-2.6/include/asm-i386/pgalloc.h | 1 linux-2.6/include/asm-i386/processor.h | 8 + linux-2.6/include/asm-ia64/pgalloc.h | 4 linux-2.6/include/asm-powerpc/elf.h | 3 linux-2.6/include/asm-powerpc/pgalloc.h | 5 linux-2.6/include/asm-ppc/pgalloc.h | 5 linux-2.6/include/asm-s390/pgalloc.h | 4 linux-2.6/include/asm-sparc/pgalloc.h | 4 linux-2.6/include/asm-sparc64/pgalloc.h | 4 linux-2.6/include/asm-x86_64/pgalloc.h | 7 + linux-2.6/include/linux/mm.h | 16 ++ linux-2.6/include/linux/resource.h | 5 linux-2.6/include/linux/sched.h | 9 + linux-2.6/include/linux/sysctl.h | 3 linux-2.6/kernel/signal.c | 33 +++++ linux-2.6/kernel/sysctl.c | 56 ++++++++ linux-2.6/mm/fremap.c | 16 +- linux-2.6/mm/mmap.c | 183 ++++++++++++++++++++++++++-- linux-2.6/mm/mprotect.c | 6 linux-2.6/mm/mremap.c | 4 46 files changed, 798 insertions(+), 145 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- linux-2.6-execshield.patch 15 Dec 2006 15:19:56 -0000 1.46 +++ linux-2.6-execshield.patch 6 Jan 2007 18:20:16 -0000 1.47 @@ -1436,11 +1436,9 @@ #endif -Index: linux-2.6/include/asm-i386/desc.h -=================================================================== ---- linux-2.6.orig/include/asm-i386/desc.h -+++ linux-2.6/include/asm-i386/desc.h -@@ -193,6 +193,20 @@ static inline unsigned long get_desc_bas +--- linux-2.6.19.noarch/include/asm-i386/desc.h~ 2006-12-08 06:52:55.000000000 -0500 ++++ linux-2.6.19.noarch/include/asm-i386/desc.h 2006-12-08 06:53:14.000000000 -0500 +@@ -185,6 +185,20 @@ static inline unsigned long get_desc_bas return base; } @@ -1458,9 +1456,9 @@ +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__ */ + #else /* __ASSEMBLY__ */ - #endif + /* Index: linux-2.6/include/asm-i386/elf.h =================================================================== --- linux-2.6.orig/include/asm-i386/elf.h Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.522 retrieving revision 1.523 diff -u -r1.522 -r1.523 --- sources 2 Jan 2007 04:31:26 -0000 1.522 +++ sources 6 Jan 2007 18:20:16 -0000 1.523 @@ -1,3 +1,4 @@ 93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 69e8bfe3fbba5931833e7f6da51f6186 patch-2.6.20-rc3.bz2 +0ebd23abb7226d13533a9da9134bdc4c patch-2.6.20-rc3-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.450 retrieving revision 1.451 diff -u -r1.450 -r1.451 --- upstream 2 Jan 2007 04:31:26 -0000 1.450 +++ upstream 6 Jan 2007 18:20:16 -0000 1.451 @@ -1,2 +1,3 @@ linux-2.6.19.tar.bz2 patch-2.6.20-rc3.bz2 +patch-2.6.20-rc3-git4.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 18:22:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 13:22:16 -0500 Subject: rpms/kernel/devel patch-2.6.20-rc3-git4.bz2.sign,NONE,1.1 Message-ID: <200701061822.l06IMGUF017796@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17783 Added Files: patch-2.6.20-rc3-git4.bz2.sign Log Message: sign --- NEW FILE patch-2.6.20-rc3-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFnGjDyGugalF9Dw4RAkUaAJ9swLAGDfG7gpcy0ZDsr/LIv5RpLQCfW/ZV +1EzFOi/ryPiw+xNLmnGcZo= =ox58 -----END PGP SIGNATURE----- From fedora-cvs-commits at redhat.com Sat Jan 6 20:37:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 15:37:40 -0500 Subject: rpms/pyxf86config/devel .cvsignore, 1.21, 1.22 pyxf86config.spec, 1.40, 1.41 sources, 1.21, 1.22 Message-ID: <200701062037.l06Kbeuc009815@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pyxf86config/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9754/devel Modified Files: .cvsignore pyxf86config.spec sources Log Message: auto-import pyxf86config-0.3.32-1 on branch devel from pyxf86config-0.3.32-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 21 Sep 2006 21:42:26 -0000 1.21 +++ .cvsignore 6 Jan 2007 20:37:38 -0000 1.22 @@ -1 +1 @@ -pyxf86config-0.3.31.tar.bz2 +pyxf86config-0.3.32.tar.bz2 Index: pyxf86config.spec =================================================================== RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- pyxf86config.spec 7 Dec 2006 16:17:49 -0000 1.40 +++ pyxf86config.spec 6 Jan 2007 20:37:38 -0000 1.41 @@ -1,18 +1,20 @@ +%define pyver %(python -c 'import sys ; print sys.version[:3]') + Summary: Python wrappers for libxf86config Name: pyxf86config -Version: 0.3.31 -Release: 4%{?dist} +Version: 0.3.32 +Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-root Requires: glib2 +Requires: python-abi = %{pyver} BuildRequires: glib2-devel BuildRequires: libX11-devel BuildRequires: python-devel -BuildRequires: libxf86config-devel >= 1.1.1-52 - +BuildRequires: xorg-x11-server-sdk ExcludeArch: s390 s390x %description @@ -24,8 +26,7 @@ %build export CFLAGS="$RPM_OPT_FLAGS -fPIC" -pyver=$(python -c 'import sys ; print sys.version[:3]') -%configure --x-libraries=%{_libdir} --with-python-version=$pyver +%configure --x-libraries=%{_libdir} --with-python-version=%{pyver} make %install @@ -43,37 +44,22 @@ %changelog -* Thu Dec 7 2006 Jeremy Katz - 0.3.31-4 -- rebuild against python 2.5 - -* Tue Dec 5 2006 Adam Jackson 0.3.31-3 -- Update libxf86config-devel BR to a sufficiently new version to not print the - "Comment all HorizSync and VertSync values to use DDC" message, and - rebuild. (#216288) +* Sat Jan 6 2007 Jeremy Katz - 0.3.32-1 +- Fix inconsistent PyObject/PyMem usage (#219918, #220993) -* Sun Oct 01 2006 Jesse Keating - 0.3.31-2 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Adam Jackson 0.3.31-1.fc6 +* Thu Sep 21 2006 Adam Jackson 0.3.31-1 - Add a .size() method to genlists. -- Use bzip2 archive +- Use bzip2 archive. -* Fri Aug 25 2006 Adam Jackson 0.3.30-1.fc6 +* Fri Aug 25 2006 Adam Jackson 0.3.30-1 - Remove a stray reference to XFree86. -* Wed Aug 23 2006 Adam Jackson 0.3.29-1.fc6 +* Wed Aug 23 2006 Adam Jackson 0.3.29-1 - Default depth of 24. -* Mon Aug 21 2006 Adam Jackson 0.3.28-1.fc6 +* Mon Aug 21 2006 Adam Jackson 0.3.28-1 - Decode degenerate ranges correctly. (#132679) -* Wed Jul 26 2006 Mike A. Harris 0.3.27-2.fc6 -- Remove dependency on xorg-x11-server-sdk, and replace it with correct dep - on "libxf86config-devel >= 1.1.1-7", and rebuild in order to pick up - necessary fixes in the static library. -- Use Fedora Extras style BuildRoot tag. -- Use {?dist} tag in Release - * Tue Jul 25 2006 Chris Lumens 0.3.27-1 - Remove gigantic keyboard comment. - Don't write out an empty modules section. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 21 Sep 2006 21:42:26 -0000 1.21 +++ sources 6 Jan 2007 20:37:38 -0000 1.22 @@ -1 +1 @@ -a5baf5616273553fc2dcb7d7070021e3 pyxf86config-0.3.31.tar.bz2 +0d3a285fe10493d2ca43722444c04c58 pyxf86config-0.3.32.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 6 21:07:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 16:07:16 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.393,1.394 Message-ID: <200701062107.l06L7G2g020180@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19681 Modified Files: eclipse.spec Log Message: * Fri Jan 05 2007 Ben Konrath 3.2.1-27 - Use /g in tomcat version replacement. - Disable com.jcraft.jsch_0.1.28.jar and org.eclipse.osgi_3.2.1.R32x_v20060919.jar on ia64. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.393 retrieving revision 1.394 diff -u -r1.393 -r1.394 --- eclipse.spec 6 Jan 2007 15:21:05 -0000 1.393 +++ eclipse.spec 6 Jan 2007 21:07:14 -0000 1.394 @@ -1515,9 +1515,7 @@ %{_datadir}/%{name}/plugins/org.eclipse.jface.text_* %{_datadir}/%{name}/plugins/org.eclipse.ui.intro_* %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_* -%ifnarch ia64 %{_datadir}/%{name}/plugins/com.jcraft.jsch_* -%endif %{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_* %{_datadir}/%{name}/plugins/org.eclipse.ant.core_* %{_datadir}/%{name}/plugins/org.eclipse.help.appserver_* @@ -1576,7 +1574,9 @@ %{_libdir}/gcj/%{name}/org.eclipse.jface.text_* %{_libdir}/gcj/%{name}/org.eclipse.ui.intro_* #%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_* +%ifnarch ia64 %{_libdir}/gcj/%{name}/com.jcraft.jsch_* +%endif %{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_* %{_libdir}/gcj/%{name}/org.eclipse.ant.core_* %{_libdir}/gcj/%{name}/org.eclipse.help.appserver_* From fedora-cvs-commits at redhat.com Sat Jan 6 21:33:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 16:33:35 -0500 Subject: rpms/python/FC-6 shmmodule.c,1.3,1.4 Message-ID: <200701062133.l06LXZc3009203@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/python/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27418 Modified Files: shmmodule.c Log Message: - fix shm module for 64bit systems (#218778) Index: shmmodule.c =================================================================== RCS file: /cvs/dist/rpms/python/FC-6/shmmodule.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- shmmodule.c 9 Sep 2004 11:02:53 -0000 1.3 +++ shmmodule.c 6 Jan 2007 21:33:33 -0000 1.4 @@ -322,7 +322,8 @@ PyShmObj *self; PyObject *args; { - unsigned long n, offset = 0; + unsigned long offset = 0; + int n; char buf[128]; char *addr; @@ -429,7 +430,8 @@ PyObject *args; { char *data; - unsigned long n, offset = 0; + unsigned long offset = 0; + int n; char buf[128]; char *addr; From fedora-cvs-commits at redhat.com Sat Jan 6 22:28:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 17:28:30 -0500 Subject: rpms/avahi/FC-5 avahi.spec,1.53,1.54 Message-ID: <200701062228.l06MSUXd031679@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/avahi/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31664 Modified Files: avahi.spec Log Message: * Sat Jan 6 2007 Martin Bacovsky - 0.6.11-3.fc5 - Resolves: #221726 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- avahi.spec 28 Nov 2006 17:27:08 -0000 1.53 +++ avahi.spec 6 Jan 2007 22:28:27 -0000 1.54 @@ -6,7 +6,7 @@ %endif Name: avahi Version: 0.6.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -54,6 +54,7 @@ Patch16: avahi-sharp-lock.patch Patch17: avahi-0.6.11-use-ipv6-yes.patch Patch18: avahi-0.6.11-netlink-source.patch +Patch19: avahi-0-6-11-dos.patch %description Avahi is a system which facilitates service discovery on @@ -202,6 +203,7 @@ #^- this patch now upstream %patch17 -p1 -b .use-ipv6-yes %patch18 -p1 -b .netlink-source +%patch18 -p1 -b .dos-bz221726 %build # auto* update needed for avahi-0.5.2-fedora.patch aclocal -I common @@ -412,6 +414,9 @@ %endif %changelog +* Sat Jan 6 2007 Martin Bacovsky - 0.6.11-3.fc5 +- Resolves: #221726 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon + * Tue Nov 28 2006 Martin Bacovsky - 0.6.11-2.fc5 - fix bug #216655 - CVE-2006-5461 - avahi did not verify the sender identity of netlink messages From fedora-cvs-commits at redhat.com Sat Jan 6 22:30:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 17:30:57 -0500 Subject: rpms/avahi/FC-5 avahi-0.6.11-dos.patch,NONE,1.1 Message-ID: <200701062230.l06MUvOj012462@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/avahi/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4347 Added Files: avahi-0.6.11-dos.patch Log Message: * Sat Jan 6 2007 Martin Bacovsky - 0.6.11-3.fc5 - Resolves: #221726 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon avahi-0.6.11-dos.patch: dns.c | 3 ++- dns.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE avahi-0.6.11-dos.patch --- Index: trunk/avahi-core/dns.c =================================================================== --- trunk/avahi-core/dns.c (revision 1203) +++ trunk/avahi-core/dns.c (revision 1341) @@ -333,7 +333,8 @@ int compressed = 0; int first_label = 1; + int i; assert(p && ret_name && l); - for (;;) { + for (i = 0; i < AVAHI_DNS_LABELS_MAX; i++) { uint8_t n; Index: trunk/avahi-core/dns.h =================================================================== --- trunk/avahi-core/dns.h (revision 867) +++ trunk/avahi-core/dns.h (revision 1341) @@ -29,4 +29,5 @@ #define AVAHI_DNS_PACKET_HEADER_SIZE 12 #define AVAHI_DNS_PACKET_EXTRA_SIZE 48 +#define AVAHI_DNS_LABELS_MAX 127 typedef struct AvahiDnsPacket { From fedora-cvs-commits at redhat.com Sat Jan 6 22:42:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 17:42:56 -0500 Subject: rpms/setroubleshoot/devel .cvsignore, 1.61, 1.62 setroubleshoot.spec, 1.75, 1.76 sources, 1.71, 1.72 Message-ID: <200701062242.l06MguSf021500@cvs.devel.redhat.com> Author: jdennis Update of /cvs/dist/rpms/setroubleshoot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21435/devel Modified Files: .cvsignore setroubleshoot.spec sources Log Message: auto-import setroubleshoot-1.8.13-1 on branch devel from setroubleshoot-1.8.13-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 20 Dec 2006 15:36:56 -0000 1.61 +++ .cvsignore 6 Jan 2007 22:42:53 -0000 1.62 @@ -1 +1 @@ -setroubleshoot-1.8.12.tar.gz +setroubleshoot-1.8.13.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- setroubleshoot.spec 20 Dec 2006 15:36:56 -0000 1.75 +++ setroubleshoot.spec 6 Jan 2007 22:42:54 -0000 1.76 @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 1.8.12 +Version: 1.8.13 Release: 1%{?dist} License: GPL Group: Applications/System @@ -60,7 +60,8 @@ make DESTDIR=%{buildroot} install %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name} %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -touch %{buildroot}%{pkgvardatadir}/database.xml +touch %{buildroot}%{pkgvardatadir}/audit_listener_database.xml +touch %{buildroot}%{pkgvardatadir}/email_alert_recipients %find_lang %{name} %post @@ -97,7 +98,8 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %dir %{pkgrundir} %dir %{pkgvardatadir} -%ghost %attr(0644,root,root) %{pkgvardatadir}/database.xml +%ghost %attr(0644,root,root) %{pkgvardatadir}/audit_listener_database.xml +%ghost %attr(0644,root,root) %{pkgvardatadir}/email_alert_recipients %{_mandir}/man8/sealert.8.gz /etc/rc.d/init.d/%{name} @@ -106,6 +108,42 @@ %{_datadir}/dbus-1/services/sealert.service %changelog +* Sat Jan 6 2007 John Dennis - 1.8.13-1 + - update translations + + - change SETroubleshootDatabase so it is optional if it's backed + by a file, this fixes the problem of us littering temporary files + when scanning logfiles which does not require persistence. + + - disable the view logfile menu item if no logfile has been opened + + - fix redundant log messages for case where there is no log file and + the console flag is set. When there is no log file the logging + module opens a console stream, thus the console stream produced + by the console flag was redundant. + + - add username and password command line arguments + rework startup logic so that all command line args are processed + before we do any real work + + - rework the email preferences so that each email address can + have a filter type associated with it. + + add a new filter_type "Ignore After First Alert" which filters + after the first alert has been delivered + + - add UI for setting the email addresses alerts are sent to. + Add menu item to edit email list, add email list dialog. + Remove 'recipient' config file entry, now list is stored + in seperate file. Add rpc to query and set the email list, + the GUI calls this to get the current list from the server + and set it in the server, it is the server which reads and + writes the file. Add 'enable' flag to each email entry. + Modify how the server iterates over the email list when it + receives an alert. When marking an alert as having been sent + the username is the email address but with 'email:' prepended so + as not to collide with non-email filtering options for the same user. + * Wed Dec 20 2006 John Dennis - 1.8.12-1 - remove obsolte requires for python element tree Index: sources =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- sources 20 Dec 2006 17:59:53 -0000 1.71 +++ sources 6 Jan 2007 22:42:54 -0000 1.72 @@ -1 +1 @@ -bd4e25a8b8f425e7b3eda8a322472d5b setroubleshoot-1.8.12.tar.gz +7634020086a22da76163023f93004806 setroubleshoot-1.8.13.tar.gz From fedora-cvs-commits at redhat.com Sat Jan 6 23:38:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 18:38:42 -0500 Subject: rpms/avahi/FC-5 avahi.spec,1.54,1.55 Message-ID: <200701062338.l06Ncgmu029698@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/avahi/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29680 Modified Files: avahi.spec Log Message: * Sat Jan 6 2007 Martin Bacovsky - 0.6.11-3.fc5 - Resolves: #221726 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- avahi.spec 6 Jan 2007 22:28:27 -0000 1.54 +++ avahi.spec 6 Jan 2007 23:38:39 -0000 1.55 @@ -54,7 +54,7 @@ Patch16: avahi-sharp-lock.patch Patch17: avahi-0.6.11-use-ipv6-yes.patch Patch18: avahi-0.6.11-netlink-source.patch -Patch19: avahi-0-6-11-dos.patch +Patch19: avahi-0.6.11-dos.patch %description Avahi is a system which facilitates service discovery on From fedora-cvs-commits at redhat.com Sat Jan 6 23:53:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 6 Jan 2007 18:53:04 -0500 Subject: rpms/avahi/FC-5 avahi.spec,1.55,1.56 Message-ID: <200701062353.l06Nr4r1017815@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/avahi/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17787 Modified Files: avahi.spec Log Message: * Sat Jan 6 2007 Martin Bacovsky - 0.6.11-3.fc5 - Resolves: #221726 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- avahi.spec 6 Jan 2007 23:38:39 -0000 1.55 +++ avahi.spec 6 Jan 2007 23:53:02 -0000 1.56 @@ -203,7 +203,7 @@ #^- this patch now upstream %patch17 -p1 -b .use-ipv6-yes %patch18 -p1 -b .netlink-source -%patch18 -p1 -b .dos-bz221726 +%patch19 -p1 -b .dos-bz221726 %build # auto* update needed for avahi-0.5.2-fedora.patch aclocal -I common From fedora-cvs-commits at redhat.com Sun Jan 7 16:18:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 11:18:09 -0500 Subject: rpms/avahi/FC-6 .cvsignore, 1.14, 1.15 avahi.spec, 1.71, 1.72 sources, 1.14, 1.15 avahi-0.6.11-param.patch, 1.1, NONE avahi-0.6.9-bz185972.patch, 1.1, NONE Message-ID: <200701071618.l07GI9CV023742@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/avahi/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23727 Modified Files: .cvsignore avahi.spec sources Removed Files: avahi-0.6.11-param.patch avahi-0.6.9-bz185972.patch Log Message: * Sun Jan 7 2007 Martin Bacovsky - 0.6.16-1.fc6 - Resolves: #221440 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon - Resolves: #219218 - avahi package does not create group "netdev" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-6/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 23 Nov 2006 15:31:20 -0000 1.14 +++ .cvsignore 7 Jan 2007 16:18:06 -0000 1.15 @@ -1 +1 @@ -avahi-0.6.15.tar.gz +avahi-0.6.16.tar.gz Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-6/avahi.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- avahi.spec 23 Nov 2006 15:31:20 -0000 1.71 +++ avahi.spec 7 Jan 2007 16:18:06 -0000 1.72 @@ -5,7 +5,7 @@ %define WITH_MONO 0 %endif Name: avahi -Version: 0.6.15 +Version: 0.6.16 Release: 1%{?dist} Summary: Local network service discovery Group: System Environment/Base @@ -38,13 +38,11 @@ Source0: %{name}-%{version}.tar.gz # enable mono's mcs to work in beehive buildroot: Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch -Patch13: avahi-0.6.9-bz185972.patch Patch14: avahi-0.6.9-bz189427.patch Patch15: avahi-0.6.9-mono-libdir.patch Patch17: avahi-0.6.11-use-ipv6-yes.patch -Patch21: avahi-0.6.11-align.patch - Patch20: avahi-0.6.15-initscript.patch +Patch21: avahi-0.6.11-align.patch %description @@ -60,7 +58,6 @@ Summary: Tools for mDNS browsing and publishing Group: System Environment/Base Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade, gdbm - %description tools Tools that use avahi to browse and publish mDNS services and hosts. @@ -166,7 +163,6 @@ %if %{WITH_MONO} %patch6 -p1 -b .MONO_SHARED_DIR %endif -%patch13 -p1 -b .bz185972 %patch14 -p1 -b .bz189427 %patch15 -p1 -b .mono-libdir %patch17 -p1 -b .use-ipv6-yes @@ -385,6 +381,10 @@ %endif %changelog +* Sun Jan 7 2007 Martin Bacovsky - 0.6.16-1.fc6 +- Resolves: #221440 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon +- Resolves: #219218 - avahi package does not create group "netdev" + * Thu Nov 23 2006 Martin Bacovsky - 0.6.15-1 - Upgrade to 0.6.15 - patches revision Index: sources =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 23 Nov 2006 15:31:20 -0000 1.14 +++ sources 7 Jan 2007 16:18:06 -0000 1.15 @@ -1 +1 @@ -94dbd41336d18c47fc8213735a3fbf8e avahi-0.6.15.tar.gz +3cbc460bbd55bae35f7b57443c063640 avahi-0.6.16.tar.gz --- avahi-0.6.11-param.patch DELETED --- --- avahi-0.6.9-bz185972.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 7 21:26:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 16:26:24 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2888,1.2889 Message-ID: <200701072126.l07LQOj0002499@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2082 Modified Files: kernel-2.6.spec Log Message: disable nmi watchdog by default Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2888 retrieving revision 1.2889 diff -u -r1.2888 -r1.2889 --- kernel-2.6.spec 6 Jan 2007 05:04:47 -0000 1.2888 +++ kernel-2.6.spec 7 Jan 2007 21:26:22 -0000 1.2889 @@ -463,6 +463,7 @@ Patch2102: linux-2.6-defaults-phys-start.patch Patch2103: linux-2.6-defaults-unicode-vt.patch Patch2104: linux-2.6-defaults-disable-split-ptlock.patch +Patch2105: linux-2.6-defaults-nonmi.patch # SATA Bits @@ -1033,6 +1034,8 @@ %patch2103 -p1 # Disable split page table lock %patch2104 -p1 +# Disable NMI watchdog by default. +%patch2105 -p1 # ACPI patches @@ -2009,6 +2012,9 @@ %endif %changelog +* Sun Jan 7 2007 Dave Jones +- Disable NMI watchdog by default. + * Sat Jan 6 2007 Dave Jones - 2.6.19.2rc1 From fedora-cvs-commits at redhat.com Sun Jan 7 22:08:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 17:08:09 -0500 Subject: rpms/gcc/FC-5 gcc41-hash-style-gnu.patch, NONE, 1.1 gcc41-i386-tune-geode.patch, NONE, 1.1 gcc41-java-libdotdotlib.patch, NONE, 1.1 gcc41-libjava-anonverscript.patch, NONE, 1.1 gcc41-ppc64-libffi-unwind.patch, NONE, 1.1 gcc41-pr24036-revert.patch, NONE, 1.1 gcc41-pr27567.patch, NONE, 1.1 gcc41-pr27898.patch, NONE, 1.1 gcc41-pr28709.patch, NONE, 1.1 gcc41-pr28755.patch, NONE, 1.1 gcc41-pr29059.patch, NONE, 1.1 gcc41-pr29272.patch, NONE, 1.1 gcc41-pr29299.patch, NONE, 1.1 gcc41-pr29703.patch, NONE, 1.1 gcc41-pr30001.patch, NONE, 1.1 gcc41-pr30045.patch, NONE, 1.1 gcc41-pr30110.patch, NONE, 1.1 gcc41-pr30113.patch, NONE, 1.1 gcc41-pr30143.patch, NONE, 1.1 gcc41-pr30189.patch, NONE, 1.1 gcc41-strncat-chk.patch, NONE, 1.1 protoize.1, NONE, 1.1 .cvsignore, 1.142, 1.143 gcc41-mni.patch, 1.1, 1.2 gcc41-objc-rh185398.patch, 1.1, 1.2 gcc41-pr20297-test.patch, 1.1, 1.2 gcc41-pr25874.patch, 1.1, 1.2 gcc41-tests.patch, 1.1, 1.2 gcc41.spec, 1.47, 1.48 sources, 1.144, 1.145 gcc41-ppc64-ldouble-stdarg.patch, 1.1, NONE gcc41-pr26881.patch, 1.1, ! NONE gcc41-pr26885.patch, 1.1, NONE gcc41-pr27532.patch, 1.1, NONE gcc41-pr27758.patch, 1.1, NONE gcc41-sw2438.patch, 1.1, NONE gcc41-x86_64-sse3.patch, 1.1, NONE Message-ID: <200701072208.l07M89fU023403@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23388 Modified Files: .cvsignore gcc41-mni.patch gcc41-objc-rh185398.patch gcc41-pr20297-test.patch gcc41-pr25874.patch gcc41-tests.patch gcc41.spec sources Added Files: gcc41-hash-style-gnu.patch gcc41-i386-tune-geode.patch gcc41-java-libdotdotlib.patch gcc41-libjava-anonverscript.patch gcc41-ppc64-libffi-unwind.patch gcc41-pr24036-revert.patch gcc41-pr27567.patch gcc41-pr27898.patch gcc41-pr28709.patch gcc41-pr28755.patch gcc41-pr29059.patch gcc41-pr29272.patch gcc41-pr29299.patch gcc41-pr29703.patch gcc41-pr30001.patch gcc41-pr30045.patch gcc41-pr30110.patch gcc41-pr30113.patch gcc41-pr30143.patch gcc41-pr30189.patch gcc41-strncat-chk.patch protoize.1 Removed Files: gcc41-ppc64-ldouble-stdarg.patch gcc41-pr26881.patch gcc41-pr26885.patch gcc41-pr27532.patch gcc41-pr27758.patch gcc41-sw2438.patch gcc41-x86_64-sse3.patch Log Message: 4.1.1-51.fc5 gcc41-hash-style-gnu.patch: alpha/linux-elf.h | 2 +- i386/linux.h | 2 +- i386/linux64.h | 2 +- ia64/linux.h | 2 +- rs6000/linux64.h | 4 ++-- rs6000/sysv4.h | 2 +- s390/linux.h | 2 +- sparc/linux.h | 2 +- sparc/linux64.h | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) --- NEW FILE gcc41-hash-style-gnu.patch --- 2006-07-11 Jakub Jelinek * config/i386/linux.h (LINK_SPEC): Add --hash-style=gnu. * config/i386/linux64.h (LINK_SPEC): Likewise. * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, LINK_OS_LINUX_SPEC64): Likewise. * config/s390/linux.h (LINK_SPEC): Likewise. * config/ia64/linux.h (LINK_SPEC): Likewise. * config/sparc/linux.h (LINK_SPEC): Likewise. * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, LINK_ARCH64_SPEC): Likewise. * config/alpha/linux-elf.h (LINK_SPEC): Likewise. --- gcc/config/rs6000/sysv4.h.jj 2006-07-11 10:54:00.000000000 +0200 +++ gcc/config/rs6000/sysv4.h 2006-07-11 12:51:39.000000000 +0200 @@ -1039,7 +1039,7 @@ extern int fixuplabelno; #define LINK_START_LINUX_SPEC "" -#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ +#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" --- gcc/config/rs6000/linux64.h.jj 2006-07-11 10:54:00.000000000 +0200 +++ gcc/config/rs6000/linux64.h 2006-07-11 12:52:14.000000000 +0200 @@ -337,11 +337,11 @@ extern int dot_symbols; #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" -#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ +#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" -#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ +#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=gnu %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ %{!dynamic-linker:-dynamic-linker /lib64/ld64.so.1}}}" --- gcc/config/alpha/linux-elf.h.jj 2006-07-11 10:54:01.000000000 +0200 +++ gcc/config/alpha/linux-elf.h 2006-07-11 12:53:48.000000000 +0200 @@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA. */ #define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2" -#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ +#define LINK_SPEC "-m elf64alpha --hash-style=gnu %{G*} %{relax:-relax} \ %{O*:-O3} %{!O*:-O1} \ %{shared:-shared} \ %{!shared: \ --- gcc/config/s390/linux.h.jj 2006-07-11 10:54:02.000000000 +0200 +++ gcc/config/s390/linux.h 2006-07-11 12:52:39.000000000 +0200 @@ -79,7 +79,7 @@ Software Foundation, 51 Franklin Street, #undef LINK_SPEC #define LINK_SPEC \ - "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ + "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=gnu \ %{shared:-shared} \ %{!shared: \ %{static:-static} \ --- gcc/config/sparc/linux.h.jj 2006-07-11 10:54:03.000000000 +0200 +++ gcc/config/sparc/linux.h 2006-07-11 12:54:16.000000000 +0200 @@ -127,7 +127,7 @@ Boston, MA 02110-1301, USA. */ /* If ELF is the default format, we should not use /lib/elf. */ #undef LINK_SPEC -#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ +#define LINK_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \ %{!mno-relax:%{!r:-relax}} \ %{!shared: \ %{!ibcs: \ --- gcc/config/sparc/linux64.h.jj 2006-07-11 10:54:03.000000000 +0200 +++ gcc/config/sparc/linux64.h 2006-07-11 12:55:10.000000000 +0200 @@ -157,7 +157,7 @@ Boston, MA 02110-1301, USA. */ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ { "link_arch", LINK_ARCH_SPEC }, -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ +#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ @@ -166,7 +166,7 @@ Boston, MA 02110-1301, USA. */ %{static:-static}}} \ " -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ +#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ @@ -247,7 +247,7 @@ Boston, MA 02110-1301, USA. */ #else /* !SPARC_BI_ARCH */ #undef LINK_SPEC -#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ +#define LINK_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ --- gcc/config/i386/linux.h.jj 2006-07-11 10:54:05.000000000 +0200 +++ gcc/config/i386/linux.h 2006-07-11 12:44:45.000000000 +0200 @@ -113,7 +113,7 @@ Boston, MA 02110-1301, USA. */ { "dynamic_linker", DYNAMIC_LINKER } #undef LINK_SPEC -#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ +#define LINK_SPEC "-m %(link_emulation) --hash-style=gnu %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ --- gcc/config/i386/linux64.h.jj 2006-07-11 10:54:04.000000000 +0200 +++ gcc/config/i386/linux64.h 2006-07-11 12:45:02.000000000 +0200 @@ -55,7 +55,7 @@ Boston, MA 02110-1301, USA. */ done. */ #undef LINK_SPEC -#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ +#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=gnu \ %{shared:-shared} \ %{!shared: \ %{!static: \ --- gcc/config/ia64/linux.h.jj 2006-07-11 10:54:06.000000000 +0200 +++ gcc/config/ia64/linux.h 2006-07-11 12:48:19.000000000 +0200 @@ -40,7 +40,7 @@ do { \ linux.h file. */ #undef LINK_SPEC -#define LINK_SPEC "\ +#define LINK_SPEC "--hash-style=gnu \ %{shared:-shared} \ %{!shared: \ %{!static: \ gcc41-i386-tune-geode.patch: geode.md | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ i386.c | 87 ++++++++++++++++++++++++++++++----- i386.h | 34 +++++++++----- i386.md | 3 - 4 files changed, 251 insertions(+), 26 deletions(-) --- NEW FILE gcc41-i386-tune-geode.patch --- 2006-08-14 Vladimir Makarov * config/i386/i386.h (TARGET_GEODE): (TARGET_CPU_CPP_BUILTINS): Add code for geode. (TARGET_CPU_DEFAULT_geode): New macro. (TARGET_CPU_DEFAULT_k6, TARGET_CPU_DEFAULT_k6_2, TARGET_CPU_DEFAULT_k6_3, TARGET_CPU_DEFAULT_athlon, TARGET_CPU_DEFAULT_athlon_sse, TARGET_CPU_DEFAULT_k8, TARGET_CPU_DEFAULT_pentium_m, TARGET_CPU_DEFAULT_prescott, TARGET_CPU_DEFAULT_nocona, TARGET_CPU_DEFAULT_generic): Increase the macro values. (TARGET_CPU_DEFAULT_NAMES): Add geode. (processor_type): Add PROCESSOR_GEODE. * config/i386/i386.md: Include geode.md. (cpu): Add geode. * config/i386/i386.c (geode_cost): New initialized global variable. (m_GEODE, m_K6_GEODE): New macros. (x86_use_leave, x86_push_memory, x86_deep_branch, x86_use_sahf, x86_use_himode_fiop, x86_promote_QImode, x86_add_esp_4, x86_add_esp_8, x86_rep_movl_optimal, x86_ext_80387_constants, x86_schedule): Use m_K6_GEODE instead of m_K6. (x86_movx, x86_cmove): Set up m_GEODE. (x86_integer_DFmode_moves): Clear m_GEODE. (processor_target_table): Add entry for geode. (processor_alias_table): Ditto. * config/i386/geode.md: New file. --- gcc/config/i386/i386.h.jj 2006-08-09 17:53:56.000000000 +0200 +++ gcc/config/i386/i386.h 2006-08-15 11:03:45.000000000 +0200 @@ -130,6 +130,7 @@ extern const struct processor_costs *ix8 #define TARGET_486 (ix86_tune == PROCESSOR_I486) #define TARGET_PENTIUM (ix86_tune == PROCESSOR_PENTIUM) #define TARGET_PENTIUMPRO (ix86_tune == PROCESSOR_PENTIUMPRO) +#define TARGET_GEODE (ix86_tune == PROCESSOR_GEODE) #define TARGET_K6 (ix86_tune == PROCESSOR_K6) #define TARGET_ATHLON (ix86_tune == PROCESSOR_ATHLON) #define TARGET_PENTIUM4 (ix86_tune == PROCESSOR_PENTIUM4) @@ -351,6 +352,10 @@ extern int x86_prefetch_sse; break; \ } \ } \ + else if (TARGET_GEODE) \ + { \ + builtin_define ("__tune_geode__"); \ + } \ else if (TARGET_K6) \ { \ builtin_define ("__tune_k6__"); \ @@ -412,6 +417,11 @@ extern int x86_prefetch_sse; builtin_define ("__pentiumpro"); \ builtin_define ("__pentiumpro__"); \ } \ + else if (ix86_arch == PROCESSOR_GEODE) \ + { \ + builtin_define ("__geode"); \ + builtin_define ("__geode__"); \ + } \ else if (ix86_arch == PROCESSOR_K6) \ { \ \ @@ -456,20 +466,21 @@ extern int x86_prefetch_sse; #define TARGET_CPU_DEFAULT_pentium2 5 #define TARGET_CPU_DEFAULT_pentium3 6 #define TARGET_CPU_DEFAULT_pentium4 7 -#define TARGET_CPU_DEFAULT_k6 8 -#define TARGET_CPU_DEFAULT_k6_2 9 -#define TARGET_CPU_DEFAULT_k6_3 10 -#define TARGET_CPU_DEFAULT_athlon 11 -#define TARGET_CPU_DEFAULT_athlon_sse 12 -#define TARGET_CPU_DEFAULT_k8 13 -#define TARGET_CPU_DEFAULT_pentium_m 14 -#define TARGET_CPU_DEFAULT_prescott 15 -#define TARGET_CPU_DEFAULT_nocona 16 -#define TARGET_CPU_DEFAULT_generic 17 +#define TARGET_CPU_DEFAULT_geode 8 +#define TARGET_CPU_DEFAULT_k6 9 +#define TARGET_CPU_DEFAULT_k6_2 10 +#define TARGET_CPU_DEFAULT_k6_3 11 +#define TARGET_CPU_DEFAULT_athlon 12 +#define TARGET_CPU_DEFAULT_athlon_sse 13 +#define TARGET_CPU_DEFAULT_k8 14 +#define TARGET_CPU_DEFAULT_pentium_m 15 +#define TARGET_CPU_DEFAULT_prescott 16 +#define TARGET_CPU_DEFAULT_nocona 17 +#define TARGET_CPU_DEFAULT_generic 18 #define TARGET_CPU_DEFAULT_NAMES {"i386", "i486", "pentium", "pentium-mmx",\ "pentiumpro", "pentium2", "pentium3", \ - "pentium4", "k6", "k6-2", "k6-3",\ + "pentium4", "geode", "k6", "k6-2", "k6-3", \ "athlon", "athlon-4", "k8", \ "pentium-m", "prescott", "nocona", \ "generic"} @@ -2117,6 +2128,7 @@ enum processor_type PROCESSOR_I486, /* 80486DX, 80486SX, 80486DX[24] */ PROCESSOR_PENTIUM, PROCESSOR_PENTIUMPRO, + PROCESSOR_GEODE, PROCESSOR_K6, PROCESSOR_ATHLON, PROCESSOR_PENTIUM4, --- gcc/config/i386/i386.md.jj 2006-08-09 17:53:56.000000000 +0200 +++ gcc/config/i386/i386.md 2006-08-15 11:03:45.000000000 +0200 @@ -185,7 +185,7 @@ ;; Processor type. This attribute must exactly match the processor_type ;; enumeration in i386.h. -(define_attr "cpu" "i386,i486,pentium,pentiumpro,k6,athlon,pentium4,k8,nocona,generic32,generic64" +(define_attr "cpu" "i386,i486,pentium,pentiumpro,geode,k6,athlon,pentium4,k8,nocona,generic32,generic64" (const (symbol_ref "ix86_tune"))) ;; A basic instruction type. Refinements due to arguments to be @@ -467,6 +467,7 @@ (include "ppro.md") (include "k6.md") (include "athlon.md") +(include "geode.md") ;; Operand and operator predicates --- gcc/config/i386/i386.c.jj 2006-08-09 17:53:58.000000000 +0200 +++ gcc/config/i386/i386.c 2006-08-15 11:06:09.000000000 +0200 @@ -325,6 +325,60 @@ struct processor_costs pentiumpro_cost = }; static const +struct processor_costs geode_cost = { + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (1), /* cost of a lea instruction */ + COSTS_N_INSNS (2), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (3), /* cost of starting multiply for QI */ + COSTS_N_INSNS (4), /* HI */ + COSTS_N_INSNS (7), /* SI */ + COSTS_N_INSNS (7), /* DI */ + COSTS_N_INSNS (7)}, /* other */ + 0, /* cost of multiply per each bit set */ + {COSTS_N_INSNS (15), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (23), /* HI */ + COSTS_N_INSNS (39), /* SI */ + COSTS_N_INSNS (39), /* DI */ + COSTS_N_INSNS (39)}, /* other */ + COSTS_N_INSNS (1), /* cost of movsx */ + COSTS_N_INSNS (1), /* cost of movzx */ + 8, /* "large" insn */ + 4, /* MOVE_RATIO */ + 1, /* cost for loading QImode using movzbl */ + {1, 1, 1}, /* cost of loading integer registers + in QImode, HImode and SImode. + Relative to reg-reg move (2). */ + {1, 1, 1}, /* cost of storing integer registers */ + 1, /* cost of reg,reg fld/fst */ + {1, 1, 1}, /* cost of loading fp registers + in SFmode, DFmode and XFmode */ + {4, 6, 6}, /* cost of storing fp registers + in SFmode, DFmode and XFmode */ + + 1, /* cost of moving MMX register */ + {1, 1}, /* cost of loading MMX registers + in SImode and DImode */ + {1, 1}, /* cost of storing MMX registers + in SImode and DImode */ + 1, /* cost of moving SSE register */ + {1, 1, 1}, /* cost of loading SSE registers + in SImode, DImode and TImode */ + {1, 1, 1}, /* cost of storing SSE registers + in SImode, DImode and TImode */ + 1, /* MMX or SSE register to integer */ + 32, /* size of prefetch block */ + 1, /* number of parallel prefetches */ + 1, /* Branch cost */ + COSTS_N_INSNS (6), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (11), /* cost of FMUL instruction. */ + COSTS_N_INSNS (47), /* cost of FDIV instruction. */ + COSTS_N_INSNS (1), /* cost of FABS instruction. */ + COSTS_N_INSNS (1), /* cost of FCHS instruction. */ + COSTS_N_INSNS (54), /* cost of FSQRT instruction. */ +}; + +static const struct processor_costs k6_cost = { COSTS_N_INSNS (1), /* cost of an add instruction */ COSTS_N_INSNS (2), /* cost of a lea instruction */ @@ -703,6 +757,8 @@ const struct processor_costs *ix86_cost #define m_486 (1< * configure.ac (toolexeclibdir, dbexecdir): Canonicalize /lib/../lib to /lib. * configure: Rebuilt. --- libjava/configure.ac.jj 2006-07-20 14:01:02.000000000 +0200 +++ libjava/configure.ac 2006-07-20 16:36:31.000000000 +0200 @@ -1262,6 +1262,7 @@ case ${version_specific_libs} in multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. + ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;; *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; esac ;; @@ -1278,6 +1279,10 @@ case $multi_os_directory in dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /. ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`" ;; + ../lib*) + dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))' + ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" + ;; *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" --- libjava/configure.jj 2006-07-20 14:01:02.000000000 +0200 +++ libjava/configure 2006-07-20 16:45:24.000000000 +0200 @@ -14863,6 +14864,7 @@ case ${version_specific_libs} in multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. + ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;; *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; esac ;; @@ -14879,6 +14881,10 @@ case $multi_os_directory in dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /. ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`" ;; + ../lib*) + dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))' + ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" + ;; *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" gcc41-libjava-anonverscript.patch: Makefile.am | 7 ++++ Makefile.in | 41 ++++++++++++++------------- configure | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 13 ++++++++ libgcj.ver | 7 ++++ 5 files changed, 135 insertions(+), 20 deletions(-) --- NEW FILE gcc41-libjava-anonverscript.patch --- 2006-11-21 Jakub Jelinek * configure.ac (libjava_cv_anon_version_script): New test. (ANONVERSCRIPT): New AM_CONDITIONAL. * configure: Rebuilt. * Makefile.am (extra_ldflags_libjava): Link with -Wl,--version-script if ANONVERSCRIPT. * Makefile.in: Rebuilt. (libgcj_la_DEPENDENCIES): Depend on libgcj.ver. * libgcj.ver: New file. --- libjava/configure.ac.jj 2006-11-04 22:39:14.000000000 +0100 +++ libjava/configure.ac 2006-11-21 14:23:01.000000000 +0100 @@ -1489,6 +1489,19 @@ fi # See if we support thread-local storage. GCC_CHECK_TLS +# See if linker supports anonymous version scripts. +AC_CACHE_CHECK([whether ld supports anonymous version scripts], + [libjava_cv_anon_version_script], + [save_CFLAGS="$CFLAGS"; save_LDFLAGS="$LDFLAGS" + libjava_cv_anon_version_script=no + CFLAGS="$CFLAGS -fPIC"; LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" + echo '{ global: globalsymb*; local: *; };' > conftest.map + AC_TRY_LINK(void globalsymbol (void) {} void localsymbol (void) {},, + [libjava_cv_anon_version_script=yes], []) + CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS" + ]) +AM_CONDITIONAL(ANONVERSCRIPT, test "$libjava_cv_anon_version_script" = yes) + # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= --- libjava/Makefile.am.jj 2006-09-22 13:49:10.000000000 +0200 +++ libjava/Makefile.am 2006-11-21 14:10:49.000000000 +0100 @@ -93,6 +93,10 @@ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 extra_ldflags_libjava = @extra_ldflags_libjava@ +if ANONVERSCRIPT +extra_ldflags_libjava += -Wl,--version-script=$(srcdir)/libgcj.ver +endif + GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \ @@ -229,6 +233,9 @@ libgcj_la_LIBADD = \ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ $(all_packages_source_files:.list=.lo) \ $(LIBLTDL) $(libgcj_la_LIBADD) +if ANONVERSCRIPT +libgcj_la_DEPENDENCIES += $(srcdir)/libgcj.ver +endif libgcj_la_LINK = $(LIBLINK) libgcj_tools_la_SOURCES = classpath/tools/tools.jar --- libjava/libgcj.ver.jj 2006-11-21 14:08:08.000000000 +0100 +++ libjava/libgcj.ver 2006-11-21 14:08:01.000000000 +0100 @@ -0,0 +1,7 @@ +# Anonymous GNU ld version script to hide boehm-gc, libffi and fdlibm +# symbols in libgcj.so. + +{ + global: Jv*; _Jv_*; __gcj_personality_v0; _Z*; + local: *; +}; --- libjava/configure.jj 2006-11-04 22:39:14.000000000 +0100 +++ libjava/configure 2006-11-21 14:23:04.000000000 +0100 @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRU! E am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GCJH INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THRE! ADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREA! DS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRU! E am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GCJH INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THRE! ADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREA! DS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -16638,6 +16639,82 @@ _ACEOF fi +# See if linker supports anonymous version scripts. +echo "$as_me:$LINENO: checking whether ld supports anonymous version scripts" >&5 +echo $ECHO_N "checking whether ld supports anonymous version scripts... $ECHO_C" >&6 +if test "${libjava_cv_anon_version_script+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + save_CFLAGS="$CFLAGS"; save_LDFLAGS="$LDFLAGS" + libjava_cv_anon_version_script=no + CFLAGS="$CFLAGS -fPIC"; LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" + echo '{ global: globalsymb*; local: *; };' > conftest.map + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } +fi +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +void globalsymbol (void) {} void localsymbol (void) {} +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (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); }; } && + { ac_try='test -s conftest$ac_exeext' + { (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 + libjava_cv_anon_version_script=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS" + +fi +echo "$as_me:$LINENO: result: $libjava_cv_anon_version_script" >&5 +echo "${ECHO_T}$libjava_cv_anon_version_script" >&6 + + +if test "$libjava_cv_anon_version_script" = yes; then + ANONVERSCRIPT_TRUE= + ANONVERSCRIPT_FALSE='#' +else + ANONVERSCRIPT_TRUE='#' + ANONVERSCRIPT_FALSE= +fi + + # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= @@ -16903,6 +16980,13 @@ echo "$as_me: error: conditional \"NEEDS Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ANONVERSCRIPT_TRUE}" && test -z "${ANONVERSCRIPT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ANONVERSCRIPT\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ANONVERSCRIPT\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -17665,6 +17749,8 @@ s, at libstdcxx_incdir@,$libstdcxx_incdir,; s, at ALLOCA@,$ALLOCA,;t t s, at PERL@,$PERL,;t t s, at SYSDEP_SOURCES@,$SYSDEP_SOURCES,;t t +s, at ANONVERSCRIPT_TRUE@,$ANONVERSCRIPT_TRUE,;t t +s, at ANONVERSCRIPT_FALSE@,$ANONVERSCRIPT_FALSE,;t t s, at LD_START_STATIC_SPEC@,$LD_START_STATIC_SPEC,;t t s, at LD_FINISH_STATIC_SPEC@,$LD_FINISH_STATIC_SPEC,;t t s, at here@,$here,;t t --- libjava/Makefile.in.jj 2006-11-04 22:39:14.000000000 +0100 +++ libjava/Makefile.in 2006-11-21 14:12:00.000000000 +0100 @@ -48,15 +48,17 @@ target_triplet = @target@ @NATIVE_TRUE@ gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \ @NATIVE_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) @BASH_JAR_TRUE at am__append_4 = scripts/jar - at USING_GCC_TRUE@am__append_5 = $(WARNINGS) - at USING_BOEHMGC_TRUE@am__append_6 = boehm.cc - at USING_NOGC_TRUE@am__append_7 = nogc.cc - at USING_POSIX_PLATFORM_TRUE@am__append_8 = posix.cc - at USING_WIN32_PLATFORM_TRUE@am__append_9 = win32.cc - at USING_DARWIN_CRT_TRUE@am__append_10 = darwin.cc - at USING_POSIX_THREADS_TRUE@am__append_11 = posix-threads.cc - at USING_WIN32_THREADS_TRUE@am__append_12 = win32-threads.cc - at USING_NO_THREADS_TRUE@am__append_13 = no-threads.cc + at ANONVERSCRIPT_TRUE@am__append_5 = -Wl,--version-script=$(srcdir)/libgcj.ver + at USING_GCC_TRUE@am__append_6 = $(WARNINGS) + at USING_BOEHMGC_TRUE@am__append_7 = boehm.cc + at USING_NOGC_TRUE@am__append_8 = nogc.cc + at USING_POSIX_PLATFORM_TRUE@am__append_9 = posix.cc + at USING_WIN32_PLATFORM_TRUE@am__append_10 = win32.cc + at USING_DARWIN_CRT_TRUE@am__append_11 = darwin.cc + at USING_POSIX_THREADS_TRUE@am__append_12 = posix-threads.cc + at USING_WIN32_THREADS_TRUE@am__append_13 = win32-threads.cc + at USING_NO_THREADS_TRUE@am__append_14 = no-threads.cc + at ANONVERSCRIPT_TRUE@am__append_15 = $(srcdir)/libgcj.ver DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ $(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../depcomp $(srcdir)/../install-sh \ @@ -68,7 +70,7 @@ DIST_COMMON = README $(am__configure_dep $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS @MAINTAINER_MODE_TRUE@@NATIVE_TRUE at noinst_PROGRAMS = \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT) - at XLIB_AWT_TRUE@am__append_14 = $(xlib_nat_headers) + at XLIB_AWT_TRUE@am__append_16 = $(xlib_nat_headers) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -473,6 +475,8 @@ ALLOCA = @ALLOCA@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ +ANONVERSCRIPT_FALSE = @ANONVERSCRIPT_FALSE@ +ANONVERSCRIPT_TRUE = @ANONVERSCRIPT_TRUE@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -653,7 +657,7 @@ build_vendor = @build_vendor@ datadir = @datadir@ dbexecdir = @dbexecdir@ exec_prefix = @exec_prefix@ -extra_ldflags_libjava = @extra_ldflags_libjava@ +extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_5) gxx_include_dir = @gxx_include_dir@ here = @here@ host = @host@ @@ -763,7 +767,7 @@ AM_GCJFLAGS = \ --encoding=UTF-8 \ -Wno-deprecated -fbootstrap-classes -AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_5) +AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_6) PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long JCFLAGS = -g JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) @@ -785,9 +789,9 @@ libgij_la_LDFLAGS = -rpath $(toolexeclib libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \ stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \ java/lang/Class.java java/lang/Object.java $(nat_source_files) \ - $(am__append_6) $(am__append_7) $(am__append_8) \ - $(am__append_9) $(am__append_10) $(am__append_11) \ - $(am__append_12) $(am__append_13) + $(am__append_7) $(am__append_8) $(am__append_9) \ + $(am__append_10) $(am__append_11) $(am__append_12) \ + $(am__append_13) $(am__append_14) nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) @@ -805,9 +809,8 @@ libgcj_la_LIBADD = \ $(LIBFFI) $(ZLIBS) $(GCLIBS) libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ - $(all_packages_source_files:.list=.lo) \ - $(LIBLTDL) $(libgcj_la_LIBADD) - + $(all_packages_source_files:.list=.lo) $(LIBLTDL) \ + $(libgcj_la_LIBADD) $(am__append_15) libgcj_la_LINK = $(LIBLINK) libgcj_tools_la_SOURCES = classpath/tools/tools.jar libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes @@ -7460,7 +7463,7 @@ gnu/gcj/xlib/natXImage.cc \ gnu/gcj/xlib/natXUnmapEvent.cc sourcesdir = $(jardir) -headers_to_make = $(nat_headers) $(am__append_14) +headers_to_make = $(nat_headers) $(am__append_16) # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and gcc41-ppc64-libffi-unwind.patch: linux64.S | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE gcc41-ppc64-libffi-unwind.patch --- 2006-11-24 Jakub Jelinek * src/powerpc/linux64.S (ffi_call_LINUX64): Move restore of r2 immediately after bctrl instruction. --- libffi/src/powerpc/linux64.S.jj 2006-08-02 20:55:10.000000000 +0200 +++ libffi/src/powerpc/linux64.S 2006-11-24 21:57:06.000000000 +0100 @@ -47,8 +47,8 @@ ffi_call_LINUX64: std %r0, 16(%r1) mr %r28, %r1 /* our AP. */ - stdux %r1, %r1, %r4 .LCFI0: + stdux %r1, %r1, %r4 mr %r31, %r5 /* flags, */ mr %r30, %r6 /* rvalue, */ mr %r29, %r7 /* function address. */ @@ -100,6 +100,10 @@ ffi_call_LINUX64: /* Make the call. */ bctrl + /* This must follow the call immediately, the unwinder + uses this to find out if r2 has been saved or not. */ + ld %r2, 40(%r1) + /* Now, deal with the return value. */ mtcrf 0x01, %r31 bt- 30, .Ldone_return_value @@ -109,7 +113,6 @@ ffi_call_LINUX64: .Ldone_return_value: /* Restore the registers we used and return. */ - ld %r2, 40(%r1) mr %r1, %r28 ld %r0, 16(%r28) ld %r28, -32(%r1) gcc41-pr24036-revert.patch: 0 files changed --- NEW FILE gcc41-pr24036-revert.patch --- 2006-12-21 Jakub Jelinek Revert: 2006-12-16 Joseph Myers David Edelsohn PR target/24036 * doc/tm.texi (HARD_REGNO_NREGS_HAS_PADDING, HARD_REGNO_NREGS_WITH_PADDING): Document new target macros. * defaults.h (HARD_REGNO_NREGS_HAS_PADDING, HARD_REGNO_NREGS_WITH_PADDING): Define. * config/i386/i386.h (HARD_REGNO_NREGS_HAS_PADDING, HARD_REGNO_NREGS_WITH_PADDING): Define. * rtlanal.c (subreg_regno_offset, subreg_offset_representable_p): Use new macros to detect modes with holes; do not look at integer units. (subreg_offset_representable_p): Check for and disallow cases where the modes use different numbers of bits from registers. * config/rs6000/rs6000.c (rs6000_emit_move): Handle TFmode constant for soft-float. (rs6000_hard_regno_nregs): Use UNITS_PER_FP_WORD for e500 GPRs containing doubles. (rs6000_split_multireg_move): Use DFmode reg_mode for TFmode moves in E500 double case. * config/rs6000/rs6000.md (movtf): Allow soft-float. (movtf_softfloat): New. --- gcc/doc/tm.texi (revision 119967) +++ gcc/doc/tm.texi (revision 119966) @@ -1937,33 +1937,6 @@ definition of this macro is @end smallexample @end defmac - at defmac HARD_REGNO_NREGS_HAS_PADDING (@var{regno}, @var{mode}) -A C expression that is nonzero if a value of mode @var{mode}, stored -in memory, ends with padding that causes it to take up more space than -in registers starting at register number @var{regno} (as determined by -multiplying GCC's notion of the size of the register when containing -this mode by the number of registers returned by - at code{HARD_REGNO_NREGS}). By default this is zero. - -For example, if a floating-point value is stored in three 32-bit -registers but takes up 128 bits in memory, then this would be -nonzero. - -This macros only needs to be defined if there are cases where - at code{subreg_regno_offset} and @code{subreg_offset_representable_p} -would otherwise wrongly determine that a @code{subreg} can be -represented by an offset to the register number, when in fact such a - at code{subreg} would contain some of the padding not stored in -registers and so not be representable. - at end defmac - - at defmac HARD_REGNO_NREGS_WITH_PADDING (@var{regno}, @var{mode}) -For values of @var{regno} and @var{mode} for which - at code{HARD_REGNO_NREGS_HAS_PADDING} returns nonzero, a C expression -returning the greater number of registers required to hold the value -including any padding. In the example above, the value would be four. - at end defmac - @defmac REGMODE_NATURAL_SIZE (@var{mode}) Define this macro if the natural size of registers that hold values of mode @var{mode} is not the word size. It is a C expression that --- gcc/defaults.h (revision 119967) +++ gcc/defaults.h (revision 119966) @@ -867,9 +867,4 @@ Software Foundation, 51 Franklin Street, #define INCOMING_FRAME_SP_OFFSET 0 #endif -#ifndef HARD_REGNO_NREGS_HAS_PADDING -#define HARD_REGNO_NREGS_HAS_PADDING(REGNO, MODE) 0 -#define HARD_REGNO_NREGS_WITH_PADDING(REGNO, MODE) -1 -#endif - #endif /* ! GCC_DEFAULTS_H */ --- gcc/rtlanal.c (revision 119967) +++ gcc/rtlanal.c (revision 119966) @@ -3138,15 +3138,34 @@ unsigned int subreg_regno_offset (unsigned int xregno, enum machine_mode xmode, unsigned int offset, enum machine_mode ymode) { - int nregs_xmode, nregs_ymode; + int nregs_xmode, nregs_ymode, nregs_xmode_unit_int; int mode_multiple, nregs_multiple; int y_offset; + enum machine_mode xmode_unit, xmode_unit_int; gcc_assert (xregno < FIRST_PSEUDO_REGISTER); + if (GET_MODE_INNER (xmode) == VOIDmode) + xmode_unit = xmode; + else + xmode_unit = GET_MODE_INNER (xmode); + + if (FLOAT_MODE_P (xmode_unit)) + { + xmode_unit_int = int_mode_for_mode (xmode_unit); + if (xmode_unit_int == BLKmode) + /* It's probably bad to be here; a port should have an integer mode + that's the same size as anything of which it takes a SUBREG. */ + xmode_unit_int = xmode_unit; + } + else + xmode_unit_int = xmode_unit; + + nregs_xmode_unit_int = hard_regno_nregs[xregno][xmode_unit_int]; + /* Adjust nregs_xmode to allow for 'holes'. */ - if (HARD_REGNO_NREGS_HAS_PADDING (xregno, xmode)) - nregs_xmode = HARD_REGNO_NREGS_WITH_PADDING (xregno, xmode); + if (nregs_xmode_unit_int != hard_regno_nregs[xregno][xmode_unit]) + nregs_xmode = nregs_xmode_unit_int * GET_MODE_NUNITS (xmode); else nregs_xmode = hard_regno_nregs[xregno][xmode]; @@ -3184,31 +3203,38 @@ bool subreg_offset_representable_p (unsigned int xregno, enum machine_mode xmode, unsigned int offset, enum machine_mode ymode) { - int nregs_xmode, nregs_ymode; + int nregs_xmode, nregs_ymode, nregs_xmode_unit, nregs_xmode_unit_int; int mode_multiple, nregs_multiple; int y_offset; - int regsize_xmode, regsize_ymode; + enum machine_mode xmode_unit, xmode_unit_int; gcc_assert (xregno < FIRST_PSEUDO_REGISTER); + if (GET_MODE_INNER (xmode) == VOIDmode) + xmode_unit = xmode; + else + xmode_unit = GET_MODE_INNER (xmode); + + if (FLOAT_MODE_P (xmode_unit)) + { + xmode_unit_int = int_mode_for_mode (xmode_unit); + if (xmode_unit_int == BLKmode) + /* It's probably bad to be here; a port should have an integer mode + that's the same size as anything of which it takes a SUBREG. */ + xmode_unit_int = xmode_unit; + } + else + xmode_unit_int = xmode_unit; + + nregs_xmode_unit = hard_regno_nregs[xregno][xmode_unit]; + nregs_xmode_unit_int = hard_regno_nregs[xregno][xmode_unit_int]; + /* If there are holes in a non-scalar mode in registers, we expect that it is made up of its units concatenated together. */ - if (HARD_REGNO_NREGS_HAS_PADDING (xregno, xmode)) + if (nregs_xmode_unit != nregs_xmode_unit_int) { - enum machine_mode xmode_unit; - - nregs_xmode = HARD_REGNO_NREGS_WITH_PADDING (xregno, xmode); - if (GET_MODE_INNER (xmode) == VOIDmode) - xmode_unit = xmode; - else - xmode_unit = GET_MODE_INNER (xmode); - gcc_assert (HARD_REGNO_NREGS_HAS_PADDING (xregno, xmode_unit)); - gcc_assert (nregs_xmode - == (GET_MODE_NUNITS (xmode) - * HARD_REGNO_NREGS_WITH_PADDING (xregno, xmode_unit))); - gcc_assert (hard_regno_nregs[xregno][xmode] - == (hard_regno_nregs[xregno][xmode_unit] - * GET_MODE_NUNITS (xmode))); + gcc_assert (nregs_xmode_unit * GET_MODE_NUNITS (xmode) + == hard_regno_nregs[xregno][xmode]); /* You can only ask for a SUBREG of a value with holes in the middle if you don't cross the holes. (Such a SUBREG should be done by @@ -3218,12 +3244,15 @@ subreg_offset_representable_p (unsigned 3 for each part, but in memory it's two 128-bit parts. Padding is assumed to be at the end (not necessarily the 'high part') of each unit. */ - if ((offset / GET_MODE_SIZE (xmode_unit) + 1 - < GET_MODE_NUNITS (xmode)) - && (offset / GET_MODE_SIZE (xmode_unit) + if (nregs_xmode_unit != nregs_xmode_unit_int + && (offset / GET_MODE_SIZE (xmode_unit_int) + 1 + < GET_MODE_NUNITS (xmode)) + && (offset / GET_MODE_SIZE (xmode_unit_int) != ((offset + GET_MODE_SIZE (ymode) - 1) - / GET_MODE_SIZE (xmode_unit)))) + / GET_MODE_SIZE (xmode_unit_int)))) return false; + + nregs_xmode = nregs_xmode_unit_int * GET_MODE_NUNITS (xmode); } else nregs_xmode = hard_regno_nregs[xregno][xmode]; @@ -3237,15 +3266,6 @@ subreg_offset_representable_p (unsigned ? WORDS_BIG_ENDIAN : BYTES_BIG_ENDIAN)) return true; - /* If registers store different numbers of bits in the different - modes, we cannot generally form this subreg. */ - regsize_xmode = GET_MODE_SIZE (xmode) / nregs_xmode; - regsize_ymode = GET_MODE_SIZE (ymode) / nregs_ymode; - if (regsize_xmode > regsize_ymode && nregs_ymode > 1) - return false; - if (regsize_ymode > regsize_xmode && nregs_xmode > 1) - return false; - /* Lowpart subregs are otherwise valid. */ if (offset == subreg_lowpart_offset (ymode, xmode)) return true; --- gcc/config/i386/i386.h (revision 119967) +++ gcc/config/i386/i386.h (revision 119966) @@ -827,15 +827,6 @@ do { \ ? (TARGET_64BIT ? 4 : 6) \ : ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD))) -#define HARD_REGNO_NREGS_HAS_PADDING(REGNO, MODE) \ - ((TARGET_128BIT_LONG_DOUBLE && !TARGET_64BIT) \ - ? (FP_REGNO_P (REGNO) || SSE_REGNO_P (REGNO) || MMX_REGNO_P (REGNO) \ - ? 0 \ - : ((MODE) == XFmode || (MODE) == XCmode)) \ - : 0) - -#define HARD_REGNO_NREGS_WITH_PADDING(REGNO, MODE) ((MODE) == XFmode ? 4 : 8) - #define VALID_SSE2_REG_MODE(MODE) \ ((MODE) == V16QImode || (MODE) == V8HImode || (MODE) == V2DFmode \ || (MODE) == V2DImode || (MODE) == DFmode) --- gcc/config/rs6000/rs6000.c (revision 119967) +++ gcc/config/rs6000/rs6000.c (revision 119966) @@ -3573,6 +3573,9 @@ rs6000_hard_regno_nregs (int regno, enum if (FP_REGNO_P (regno)) return (GET_MODE_SIZE (mode) + UNITS_PER_FP_WORD - 1) / UNITS_PER_FP_WORD; + if (TARGET_E500_DOUBLE && mode == DFmode) + return 1; + if (SPE_SIMD_REGNO_P (regno) && TARGET_SPE && SPE_VECTOR_MODE (mode)) return (GET_MODE_SIZE (mode) + UNITS_PER_SPE_WORD - 1) / UNITS_PER_SPE_WORD; @@ -3580,14 +3583,6 @@ rs6000_hard_regno_nregs (int regno, enum return (GET_MODE_SIZE (mode) + UNITS_PER_ALTIVEC_WORD - 1) / UNITS_PER_ALTIVEC_WORD; - /* The value returned for SCmode in the E500 double case is 2 for - ABI compatibility; storing an SCmode value in a single register - would require function_arg and rs6000_spe_function_arg to handle - SCmode so as to pass the value correctly in a pair of - registers. */ - if (TARGET_E500_DOUBLE && FLOAT_MODE_P (mode) && mode != SCmode) - return (GET_MODE_SIZE (mode) + UNITS_PER_FP_WORD - 1) / UNITS_PER_FP_WORD; - return (GET_MODE_SIZE (mode) + UNITS_PER_WORD - 1) / UNITS_PER_WORD; } @@ -3956,7 +3951,8 @@ rs6000_emit_move (rtx dest, rtx source, /* 128-bit constant floating-point values on Darwin should really be loaded as two parts. */ - if (!TARGET_IEEEQUAD && TARGET_LONG_DOUBLE_128 + if (!TARGET_IEEEQUAD + && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128 && mode == TFmode && GET_CODE (operands[1]) == CONST_DOUBLE) { /* DImode is used, not DFmode, because simplify_gen_subreg doesn't @@ -12402,8 +12398,6 @@ rs6000_split_multireg_move (rtx dst, rtx reg_mode = DFmode; else if (ALTIVEC_REGNO_P (reg)) reg_mode = V16QImode; - else if (TARGET_E500_DOUBLE && mode == TFmode) - reg_mode = DFmode; else reg_mode = word_mode; reg_mode_size = GET_MODE_SIZE (reg_mode); --- gcc/config/rs6000/rs6000.md (revision 119967) +++ gcc/config/rs6000/rs6000.md (revision 119966) @@ -7789,7 +7789,8 @@ (define_insn "*movdf_softfloat64" (define_expand "movtf" [(set (match_operand:TF 0 "general_operand" "") (match_operand:TF 1 "any_operand" ""))] - "!TARGET_IEEEQUAD && TARGET_LONG_DOUBLE_128" + "!TARGET_IEEEQUAD + && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "{ rs6000_emit_move (operands[0], operands[1], TFmode); DONE; }") ; It's important to list the o->f and f->o moves before f->f because @@ -7808,19 +7809,6 @@ (define_insn_and_split "*movtf_internal" { rs6000_split_multireg_move (operands[0], operands[1]); DONE; } [(set_attr "length" "8,8,8,20,20,16")]) -(define_insn_and_split "*movtf_softfloat" - [(set (match_operand:TF 0 "nonimmediate_operand" "=r,Y,r") - (match_operand:TF 1 "input_operand" "YGHF,r,r"))] - "!TARGET_IEEEQUAD - && (TARGET_SOFT_FLOAT || !TARGET_FPRS) && TARGET_LONG_DOUBLE_128 - && (gpc_reg_operand (operands[0], TFmode) - || gpc_reg_operand (operands[1], TFmode))" - "#" - "&& reload_completed" - [(pc)] -{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; } - [(set_attr "length" "20,20,16")]) - (define_expand "extenddftf2" [(parallel [(set (match_operand:TF 0 "nonimmediate_operand" "") (float_extend:TF (match_operand:DF 1 "input_operand" ""))) gcc41-pr27567.patch: builtins.c | 315 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 255 insertions(+), 60 deletions(-) --- NEW FILE gcc41-pr27567.patch --- 2006-09-01 Jakub Jelinek PR middle-end/27567 * builtins.c (fold_builtin_memcpy, fold_builtin_memmove): Remove. (fold_builtin_mempcpy): Rename to... (fold_builtin_memory_op): ... this. Optimize one element copy into an assignment. (fold_builtin_memset, fold_builtin_bzero, fold_builtin_bcopy): New functions. (expand_builtin_strcpy, expand_builtin_strncpy): Handle COMPOUND_EXPR. (expand_builtin_memcpy, expand_builtin_mempcpy, expand_builtin_memmove): Likewise. Use fold_builtin_memory_op. (fold_builtin_1): Handle BUILT_IN_MEMSET, BUILT_IN_BZERO and BUILT_IN_BCOPY. Use fold_builtin_memory_op for BUILT_IN_MEM{CPY,PCPY,MOVE}. --- gcc/builtins.c.jj 2006-08-28 13:00:23.000000000 +0200 +++ gcc/builtins.c 2006-09-01 11:55:51.000000000 +0200 @@ -160,9 +160,7 @@ static tree fold_builtin_ceil (tree, tre static tree fold_builtin_round (tree, tree); static tree fold_builtin_int_roundingfn (tree, tree); static tree fold_builtin_bitop (tree, tree); -static tree fold_builtin_memcpy (tree, tree); -static tree fold_builtin_mempcpy (tree, tree, int); -static tree fold_builtin_memmove (tree, tree); +static tree fold_builtin_memory_op (tree, tree, bool, int); static tree fold_builtin_strchr (tree, tree); static tree fold_builtin_memcmp (tree); static tree fold_builtin_strcmp (tree); @@ -2890,10 +2888,19 @@ expand_builtin_memcpy (tree exp, rtx tar unsigned int dest_align = get_pointer_alignment (dest, BIGGEST_ALIGNMENT); rtx dest_mem, src_mem, dest_addr, len_rtx; - tree result = fold_builtin_memcpy (fndecl, arglist); + tree result = fold_builtin_memory_op (arglist, TREE_TYPE (TREE_TYPE (fndecl)), + false, /*endp=*/0); if (result) - return expand_expr (result, target, mode, EXPAND_NORMAL); + { + while (TREE_CODE (result) == COMPOUND_EXPR) + { + expand_expr (TREE_OPERAND (result, 0), const0_rtx, VOIDmode, + EXPAND_NORMAL); + result = TREE_OPERAND (result, 1); + } + return expand_expr (result, target, mode, EXPAND_NORMAL); + } /* If DEST is not a pointer type, call the normal function. */ if (dest_align == 0) @@ -2979,11 +2986,19 @@ expand_builtin_mempcpy (tree arglist, tr unsigned int dest_align = get_pointer_alignment (dest, BIGGEST_ALIGNMENT); rtx dest_mem, src_mem, len_rtx; - tree result = fold_builtin_mempcpy (arglist, type, endp); + tree result = fold_builtin_memory_op (arglist, type, false, endp); if (result) - return expand_expr (result, target, mode, EXPAND_NORMAL); - + { + while (TREE_CODE (result) == COMPOUND_EXPR) + { + expand_expr (TREE_OPERAND (result, 0), const0_rtx, VOIDmode, + EXPAND_NORMAL); + result = TREE_OPERAND (result, 1); + } + return expand_expr (result, target, mode, EXPAND_NORMAL); + } + /* If either SRC or DEST is not a pointer type, don't do this operation in-line. */ if (dest_align == 0 || src_align == 0) @@ -3053,10 +3068,18 @@ expand_builtin_memmove (tree arglist, tr unsigned int src_align = get_pointer_alignment (src, BIGGEST_ALIGNMENT); unsigned int dest_align = get_pointer_alignment (dest, BIGGEST_ALIGNMENT); - tree result = fold_builtin_memmove (arglist, type); + tree result = fold_builtin_memory_op (arglist, type, false, /*endp=*/3); if (result) - return expand_expr (result, target, mode, EXPAND_NORMAL); + { + while (TREE_CODE (result) == COMPOUND_EXPR) + { + expand_expr (TREE_OPERAND (result, 0), const0_rtx, VOIDmode, + EXPAND_NORMAL); + result = TREE_OPERAND (result, 1); + } + return expand_expr (result, target, mode, EXPAND_NORMAL); + } /* If DEST is not a pointer type, call the normal function. */ if (dest_align == 0) @@ -3204,7 +3227,15 @@ expand_builtin_strcpy (tree fndecl, tree { tree result = fold_builtin_strcpy (fndecl, arglist, 0); if (result) - return expand_expr (result, target, mode, EXPAND_NORMAL); + { + while (TREE_CODE (result) == COMPOUND_EXPR) + { + expand_expr (TREE_OPERAND (result, 0), const0_rtx, VOIDmode, + EXPAND_NORMAL); + result = TREE_OPERAND (result, 1); + } + return expand_expr (result, target, mode, EXPAND_NORMAL); + } return expand_movstr (TREE_VALUE (arglist), TREE_VALUE (TREE_CHAIN (arglist)), @@ -3330,7 +3361,15 @@ expand_builtin_strncpy (tree exp, rtx ta tree result = fold_builtin_strncpy (fndecl, arglist, slen); if (result) - return expand_expr (result, target, mode, EXPAND_NORMAL); + { + while (TREE_CODE (result) == COMPOUND_EXPR) + { + expand_expr (TREE_OPERAND (result, 0), const0_rtx, VOIDmode, + EXPAND_NORMAL); + result = TREE_OPERAND (result, 1); + } + return expand_expr (result, target, mode, EXPAND_NORMAL); + } /* We must be passed a constant len and src parameter. */ if (!host_integerp (len, 1) || !slen || !host_integerp (slen, 1)) @@ -7982,78 +8021,121 @@ fold_builtin_exponent (tree fndecl, tree return 0; } -/* Fold function call to builtin memcpy. Return +/* Fold function call to builtin memset. Return NULL_TREE if no simplification can be made. */ static tree -fold_builtin_memcpy (tree fndecl, tree arglist) +fold_builtin_memset (tree arglist, tree type, bool ignore) { - tree dest, src, len; + tree dest, c, len, var, ret; + unsigned HOST_WIDE_INT length, cval; if (!validate_arglist (arglist, - POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) + POINTER_TYPE, INTEGER_TYPE, INTEGER_TYPE, VOID_TYPE)) return 0; dest = TREE_VALUE (arglist); - src = TREE_VALUE (TREE_CHAIN (arglist)); + c = TREE_VALUE (TREE_CHAIN (arglist)); len = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist))); + if (! host_integerp (len, 1)) + return 0; + /* If the LEN parameter is zero, return DEST. */ if (integer_zerop (len)) - return omit_one_operand (TREE_TYPE (TREE_TYPE (fndecl)), dest, src); + return omit_one_operand (type, dest, c); - /* If SRC and DEST are the same (and not volatile), return DEST. */ - if (operand_equal_p (src, dest, 0)) - return omit_one_operand (TREE_TYPE (TREE_TYPE (fndecl)), dest, len); + if (! host_integerp (c, 1) || TREE_SIDE_EFFECTS (dest)) + return 0; - return 0; + var = dest; + STRIP_NOPS (var); + if (TREE_CODE (var) != ADDR_EXPR) + return 0; + + var = TREE_OPERAND (var, 0); + if (TREE_THIS_VOLATILE (var)) + return 0; + + if (!INTEGRAL_TYPE_P (TREE_TYPE (var)) + && !POINTER_TYPE_P (TREE_TYPE (var))) + return 0; + + length = tree_low_cst (len, 1); + if (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (var))) != length + || get_pointer_alignment (dest, BIGGEST_ALIGNMENT) / BITS_PER_UNIT + < (int) length) + return 0; + + if (length > HOST_BITS_PER_WIDE_INT / BITS_PER_UNIT) + return 0; + + if (integer_zerop (c)) + cval = 0; + else + { + if (CHAR_BIT != 8 || BITS_PER_UNIT != 8 || HOST_BITS_PER_WIDE_INT > 64) + return 0; + + cval = tree_low_cst (c, 1); + cval &= 0xff; + cval |= cval << 8; + cval |= cval << 16; + cval |= (cval << 31) << 1; + } + + ret = build_int_cst_type (TREE_TYPE (var), cval); + ret = build2 (MODIFY_EXPR, TREE_TYPE (var), var, ret); + if (ignore) + return ret; + + return omit_one_operand (type, dest, ret); } -/* Fold function call to builtin mempcpy. Return +/* Fold function call to builtin memset. Return NULL_TREE if no simplification can be made. */ static tree -fold_builtin_mempcpy (tree arglist, tree type, int endp) +fold_builtin_bzero (tree arglist, bool ignore) { - if (validate_arglist (arglist, - POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) - { - tree dest = TREE_VALUE (arglist); - tree src = TREE_VALUE (TREE_CHAIN (arglist)); - tree len = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist))); + tree dest, size, newarglist; - /* If the LEN parameter is zero, return DEST. */ - if (integer_zerop (len)) - return omit_one_operand (type, dest, src); + if (!validate_arglist (arglist, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) + return 0; - /* If SRC and DEST are the same (and not volatile), return DEST+LEN. */ - if (operand_equal_p (src, dest, 0)) - { - if (endp == 0) - return omit_one_operand (type, dest, len); + if (!ignore) + return 0; - if (endp == 2) - len = fold_build2 (MINUS_EXPR, TREE_TYPE (len), len, - ssize_int (1)); - - len = fold_convert (TREE_TYPE (dest), len); - len = fold_build2 (PLUS_EXPR, TREE_TYPE (dest), dest, len); - return fold_convert (type, len); - } - } - return 0; + dest = TREE_VALUE (arglist); + size = TREE_VALUE (TREE_CHAIN (arglist)); + + /* New argument list transforming bzero(ptr x, int y) to + memset(ptr x, int 0, size_t y). This is done this way + so that if it isn't expanded inline, we fallback to + calling bzero instead of memset. */ + + newarglist = build_tree_list (NULL_TREE, fold_convert (sizetype, size)); + newarglist = tree_cons (NULL_TREE, integer_zero_node, newarglist); + newarglist = tree_cons (NULL_TREE, dest, newarglist); + return fold_builtin_memset (newarglist, void_type_node, ignore); } -/* Fold function call to builtin memmove. Return - NULL_TREE if no simplification can be made. */ +/* Fold function call to builtin mem{{,p}cpy,move}. Return + NULL_TREE if no simplification can be made. + If ENDP is 0, return DEST (like memcpy). + If ENDP is 1, return DEST+LEN (like mempcpy). + If ENDP is 2, return DEST+LEN-1 (like stpcpy). + If ENDP is 3, return DEST, additionally *SRC and *DEST may overlap + (memmove). */ static tree -fold_builtin_memmove (tree arglist, tree type) +fold_builtin_memory_op (tree arglist, tree type, bool ignore, int endp) { - tree dest, src, len; + tree dest, src, len, destvar, srcvar, expr; + unsigned HOST_WIDE_INT length; - if (!validate_arglist (arglist, - POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) + if (! validate_arglist (arglist, + POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) return 0; dest = TREE_VALUE (arglist); @@ -8064,11 +8146,115 @@ fold_builtin_memmove (tree arglist, tree if (integer_zerop (len)) return omit_one_operand (type, dest, src); - /* If SRC and DEST are the same (and not volatile), return DEST. */ + /* If SRC and DEST are the same (and not volatile), return + DEST{,+LEN,+LEN-1}. */ if (operand_equal_p (src, dest, 0)) - return omit_one_operand (type, dest, len); + expr = len; + else + { + if (! host_integerp (len, 1)) + return 0; - return 0; + if (TREE_SIDE_EFFECTS (dest) || TREE_SIDE_EFFECTS (src)) + return 0; + + destvar = dest; + STRIP_NOPS (destvar); + if (TREE_CODE (destvar) != ADDR_EXPR) + return 0; + + destvar = TREE_OPERAND (destvar, 0); + if (TREE_THIS_VOLATILE (destvar)) + return 0; + + if (!INTEGRAL_TYPE_P (TREE_TYPE (destvar)) + && !POINTER_TYPE_P (TREE_TYPE (destvar)) + && !SCALAR_FLOAT_TYPE_P (TREE_TYPE (destvar))) + return 0; + + srcvar = src; + STRIP_NOPS (srcvar); + if (TREE_CODE (srcvar) != ADDR_EXPR) + return 0; + + srcvar = TREE_OPERAND (srcvar, 0); + if (TREE_THIS_VOLATILE (srcvar)) + return 0; + + if (!INTEGRAL_TYPE_P (TREE_TYPE (srcvar)) + && !POINTER_TYPE_P (TREE_TYPE (srcvar)) + && !SCALAR_FLOAT_TYPE_P (TREE_TYPE (srcvar))) + return 0; + + length = tree_low_cst (len, 1); + if (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (destvar))) != length + || get_pointer_alignment (dest, BIGGEST_ALIGNMENT) / BITS_PER_UNIT + < (int) length + || GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (srcvar))) != length + || get_pointer_alignment (src, BIGGEST_ALIGNMENT) / BITS_PER_UNIT + < (int) length) + return 0; + + if ((INTEGRAL_TYPE_P (TREE_TYPE (srcvar)) + || POINTER_TYPE_P (TREE_TYPE (srcvar))) + && (INTEGRAL_TYPE_P (TREE_TYPE (destvar)) + || POINTER_TYPE_P (TREE_TYPE (destvar)))) + expr = fold_convert (TREE_TYPE (destvar), srcvar); + else + expr = fold_build1 (VIEW_CONVERT_EXPR, TREE_TYPE (destvar), srcvar); + expr = build2 (MODIFY_EXPR, TREE_TYPE (destvar), destvar, expr); + } + + if (ignore) + return expr; + + if (endp == 0 || endp == 3) + return omit_one_operand (type, dest, expr); + + if (expr == len) + expr = 0; + + if (endp == 2) + len = fold_build2 (MINUS_EXPR, TREE_TYPE (len), len, + ssize_int (1)); + + len = fold_convert (TREE_TYPE (dest), len); + dest = fold_build2 (PLUS_EXPR, TREE_TYPE (dest), dest, len); + dest = fold_convert (type, dest); + if (expr) + dest = omit_one_operand (type, dest, expr); + return dest; +} + +/* Fold function call to builtin bcopy. Return NULL_TREE if no + simplification can be made. */ + +static tree +fold_builtin_bcopy (tree arglist, bool ignore) +{ + tree src, dest, size, newarglist; + + if (!validate_arglist (arglist, + POINTER_TYPE, POINTER_TYPE, INTEGER_TYPE, VOID_TYPE)) + return 0; + + if (! ignore) + return 0; + + src = TREE_VALUE (arglist); + dest = TREE_VALUE (TREE_CHAIN (arglist)); + size = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist))); + + /* New argument list transforming bcopy(ptr x, ptr y, int z) to + memmove(ptr y, ptr x, size_t z). This is done this way + so that if it isn't expanded inline, we fallback to + calling bcopy instead of memmove. */ + + newarglist = build_tree_list (NULL_TREE, fold_convert (sizetype, size)); + newarglist = tree_cons (NULL_TREE, src, newarglist); + newarglist = tree_cons (NULL_TREE, dest, newarglist); + + return fold_builtin_memory_op (newarglist, void_type_node, true, /*endp=*/3); } /* Fold function call to builtin strcpy. If LEN is not NULL, it represents @@ -9039,14 +9225,23 @@ fold_builtin_1 (tree fndecl, tree arglis case BUILT_IN_PARITYLL: return fold_builtin_bitop (fndecl, arglist); + case BUILT_IN_MEMSET: + return fold_builtin_memset (arglist, type, ignore); + case BUILT_IN_MEMCPY: - return fold_builtin_memcpy (fndecl, arglist); + return fold_builtin_memory_op (arglist, type, ignore, /*endp=*/0); case BUILT_IN_MEMPCPY: - return fold_builtin_mempcpy (arglist, type, /*endp=*/1); + return fold_builtin_memory_op (arglist, type, ignore, /*endp=*/1); case BUILT_IN_MEMMOVE: - return fold_builtin_memmove (arglist, type); + return fold_builtin_memory_op (arglist, type, ignore, /*endp=*/3); + + case BUILT_IN_BZERO: + return fold_builtin_bzero (arglist, ignore); + + case BUILT_IN_BCOPY: + return fold_builtin_bcopy (arglist, ignore); case BUILT_IN_SIGNBIT: case BUILT_IN_SIGNBITF: gcc41-pr27898.patch: c-typeck.c | 50 ++++++++++++++++++++++++--------------------- testsuite/gcc.dg/pr27898.c | 8 +++++++ 2 files changed, 35 insertions(+), 23 deletions(-) --- NEW FILE gcc41-pr27898.patch --- 2006-07-06 Alexandre Oliva PR c/27898 * c-typeck.c (tagged_types_tu_compatible_p): Enable exact matches between anonymous union fields. 2006-08-18 Jakub Jelinek PR c/27898 * gcc.dg/pr27898.c: New test. --- gcc/testsuite/gcc.dg/pr27898.c.jj 2006-08-18 09:19:33.000000000 +0200 +++ gcc/testsuite/gcc.dg/pr27898.c 2006-08-18 09:19:27.000000000 +0200 @@ -0,0 +1,8 @@ +/* PR c/27898 */ +/* { dg-do compile } */ +/* { dg-options "--combine" } */ +/* { dg-additional-sources "pr27898.c" } */ + +union u { struct { int i; }; }; + +extern int foo (union u *); --- gcc/c-typeck.c.jj 2006-08-17 09:55:11.000000000 +0200 +++ gcc/c-typeck.c 2006-08-18 09:14:15.000000000 +0200 @@ -1072,11 +1072,12 @@ tagged_types_tu_compatible_p (tree t1, t { int result; - - if (DECL_NAME (s1) == NULL - || DECL_NAME (s1) != DECL_NAME (s2)) + if (DECL_NAME (s1) != DECL_NAME (s2)) break; result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2)); + + if (result != 1 && !DECL_NAME (s1)) + break; if (result == 0) { tu->val = 0; @@ -1103,28 +1104,31 @@ tagged_types_tu_compatible_p (tree t1, t { bool ok = false; - if (DECL_NAME (s1) != NULL) - for (s2 = TYPE_FIELDS (t2); s2; s2 = TREE_CHAIN (s2)) - if (DECL_NAME (s1) == DECL_NAME (s2)) - { - int result; - result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2)); - if (result == 0) - { - tu->val = 0; - return 0; - } - if (result == 2) - needs_warning = true; - - if (TREE_CODE (s1) == FIELD_DECL - && simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1), - DECL_FIELD_BIT_OFFSET (s2)) != 1) - break; + for (s2 = TYPE_FIELDS (t2); s2; s2 = TREE_CHAIN (s2)) + if (DECL_NAME (s1) == DECL_NAME (s2)) + { + int result; + + result = comptypes_internal (TREE_TYPE (s1), TREE_TYPE (s2)); - ok = true; + if (result != 1 && !DECL_NAME (s1)) + continue; + if (result == 0) + { + tu->val = 0; + return 0; + } + if (result == 2) + needs_warning = true; + + if (TREE_CODE (s1) == FIELD_DECL + && simple_cst_equal (DECL_FIELD_BIT_OFFSET (s1), + DECL_FIELD_BIT_OFFSET (s2)) != 1) break; - } + + ok = true; + break; + } if (!ok) { tu->val = 0; gcc41-pr28709.patch: gcc/testsuite/gcc.dg/cpp/paste14.c | 7 +++++++ libcpp/macro.c | 35 ++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 17 deletions(-) --- NEW FILE gcc41-pr28709.patch --- 2006-08-16 Jakub Jelinek PR preprocessor/28709 * macro.c (paste_tokens): Do error reporting here, use BUF with the spelled LHS token as opposed to spelling it again. (paste_all_tokens): Don't report errors here, just break on failure. * gcc.dg/cpp/paste14.c: New test. --- libcpp/macro.c.jj 2006-06-09 23:07:54.000000000 +0200 +++ libcpp/macro.c 2006-08-16 17:30:17.000000000 +0200 @@ -430,15 +430,14 @@ stringify_arg (cpp_reader *pfile, macro_ static bool paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs) { - unsigned char *buf, *end; + unsigned char *buf, *end, *lhsend; const cpp_token *lhs; unsigned int len; - bool valid; lhs = *plhs; len = cpp_token_len (lhs) + cpp_token_len (rhs) + 1; buf = (unsigned char *) alloca (len); - end = cpp_spell_token (pfile, lhs, buf, false); + end = lhsend = cpp_spell_token (pfile, lhs, buf, false); /* Avoid comment headers, since they are still processed in stage 3. It is simpler to insert a space here, rather than modifying the @@ -455,10 +454,22 @@ paste_tokens (cpp_reader *pfile, const c /* Set pfile->cur_token as required by _cpp_lex_direct. */ pfile->cur_token = _cpp_temp_token (pfile); *plhs = _cpp_lex_direct (pfile); - valid = pfile->buffer->cur == pfile->buffer->rlimit; - _cpp_pop_buffer (pfile); + if (pfile->buffer->cur != pfile->buffer->rlimit) + { + _cpp_pop_buffer (pfile); + _cpp_backup_tokens (pfile, 1); + *lhsend = '\0'; - return valid; + /* Mandatory error for all apart from assembler. */ + if (CPP_OPTION (pfile, lang) != CLK_ASM) + cpp_error (pfile, CPP_DL_ERROR, + "pasting \"%s\" and \"%s\" does not give a valid preprocessing token", + buf, cpp_token_as_text (pfile, rhs)); + return false; + } + + _cpp_pop_buffer (pfile); + return true; } /* Handles an arbitrarily long sequence of ## operators, with initial @@ -490,17 +501,7 @@ paste_all_tokens (cpp_reader *pfile, con abort (); if (!paste_tokens (pfile, &lhs, rhs)) - { - _cpp_backup_tokens (pfile, 1); - - /* Mandatory error for all apart from assembler. */ - if (CPP_OPTION (pfile, lang) != CLK_ASM) - cpp_error (pfile, CPP_DL_ERROR, - "pasting \"%s\" and \"%s\" does not give a valid preprocessing token", - cpp_token_as_text (pfile, lhs), - cpp_token_as_text (pfile, rhs)); - break; - } + break; } while (rhs->flags & PASTE_LEFT); --- gcc/testsuite/gcc.dg/cpp/paste14.c.jj 2006-08-16 16:51:45.000000000 +0200 +++ gcc/testsuite/gcc.dg/cpp/paste14.c 2006-08-16 16:53:30.000000000 +0200 @@ -0,0 +1,7 @@ +/* PR preprocessor/28709 */ +/* { dg-do preprocess } */ + +#define foo - ## >> +foo /* { dg-error "pasting \"-\" and \">>\"" } */ +#define bar = ## == +bar /* { dg-error "pasting \"=\" and \"==\"" } */ gcc41-pr28755.patch: expr.c | 16 ++++++++++++++-- testsuite/gcc.dg/pr28755.c | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) --- NEW FILE gcc41-pr28755.patch --- 2006-08-17 Jakub Jelinek PR middle-end/28755 * expr.c (expand_expr_real_1) : Make sure the const array field optimization doesn't create an extra constant MEM. * gcc.dg/pr28755.c: New test. --- gcc/expr.c.jj 2006-08-09 17:54:03.000000000 +0200 +++ gcc/expr.c 2006-08-17 13:00:33.000000000 +0200 @@ -7105,13 +7105,25 @@ expand_expr_real_1 (tree exp, rtx target field, value) if (tree_int_cst_equal (field, index)) { - if (!TREE_SIDE_EFFECTS (value)) + if (TREE_SIDE_EFFECTS (value)) + break; + + if (TREE_CODE (value) != CONSTRUCTOR) return expand_expr (fold (value), target, tmode, modifier); + + /* For CONSTRUCTOR this optimization is not always + a win - if expand_expr creates a temporary + constant, we just waste unnecessarily rodata + space. */ + temp = expand_expr (value, target, tmode, modifier); + if (temp == target + || (temp && GET_CODE (temp) != MEM)) + return temp; break; } } - else if(TREE_CODE (init) == STRING_CST) + else if (TREE_CODE (init) == STRING_CST) { tree index1 = index; tree low_bound = array_ref_low_bound (exp); --- gcc/testsuite/gcc.dg/pr28755.c.jj 2006-08-17 12:59:57.000000000 +0200 +++ gcc/testsuite/gcc.dg/pr28755.c 2006-08-17 12:59:57.000000000 +0200 @@ -0,0 +1,22 @@ +/* PR middle-end/28755 */ +/* { dg-do compile } */ +/* { dg-options "-Os" } */ +/* { dg-final { scan-assembler-times "2112543726\|7deadbee" 2 } } */ + +struct S +{ + void *s1; + unsigned s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14; +}; + +const struct S array[] = { + { (void *) 0, 60, 640, 2112543726, 39682, 48, 16, 33, 10, 96, 2, 0, 0, 4 }, + { (void *) 0, 60, 2112543726, 192, 18251, 16, 33, 10, 96, 2, 0, 0, 4, 212 } +}; + +void +foo (struct S *x) +{ + x[0] = array[0]; + x[5] = array[1]; +} gcc41-pr29059.patch: 0 files changed --- NEW FILE gcc41-pr29059.patch --- 2006-09-16 Andrew Pinski PR tree-opt/29059 * tree-ssa-propagate.c (set_rhs): Reject MODIFY_EXPR right away for the expr argument. * gcc.c-torture/compile/strcpy-1.c: New test. * gcc.c-torture/compile/strcpy-2.c: New test. * gcc.c-torture/compile/memcpy-1.c: New test. * gcc.c-torture/compile/memcpy-2.c: New test. --- gcc/tree-ssa-propagate.c (revision 116996) +++ gcc/tree-ssa-propagate.c (revision 116997) @@ -588,7 +588,8 @@ set_rhs (tree *stmt_p, tree expr) && !is_gimple_val (TREE_OPERAND (TREE_OPERAND (expr, 0), 1))) return false; } - else if (code == COMPOUND_EXPR) + else if (code == COMPOUND_EXPR + || code == MODIFY_EXPR) return false; switch (TREE_CODE (stmt)) --- gcc/testsuite/gcc.c-torture/compile/strcpy-1.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/strcpy-1.c (revision 116997) @@ -0,0 +1,15 @@ + + +typedef struct +{ + char str[20]; +}STACK; +STACK stack[15]; +int level; +rezero () +{ + level = 0; + __builtin_strcpy (stack[level].str, ""); +} + + --- gcc/testsuite/gcc.c-torture/compile/strcpy-2.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/strcpy-2.c (revision 116997) @@ -0,0 +1,7 @@ +char wrkstr_un[270]; +extern void +LoadUserAlph (char *s) +{ + s = &wrkstr_un[0]; + __builtin_strcpy (s, ""); +}; --- gcc/testsuite/gcc.c-torture/compile/memcpy-1.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/memcpy-1.c (revision 116997) @@ -0,0 +1,9 @@ +static const char OggFLAC__MAPPING_VERSION_MAJOR = 1; +void f(void) +{ + char synthetic_first_packet_body[10]; + char *b = &synthetic_first_packet_body[4]; + __builtin_memcpy (b, &OggFLAC__MAPPING_VERSION_MAJOR, (1u)); +} + + --- gcc/testsuite/gcc.c-torture/compile/memcpy-2.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/memcpy-2.c (revision 116997) @@ -0,0 +1,10 @@ +static const char OggFLAC__MAPPING_VERSION_MAJOR = 1; +void f(void) +{ + char synthetic_first_packet_body[10]; + char *b = synthetic_first_packet_body; + b+=4u; + __builtin_memcpy (b, &OggFLAC__MAPPING_VERSION_MAJOR, (1u)); +} + + gcc41-pr29272.patch: builtins.c | 31 +++++++++++++++++++++++++-- testsuite/gcc.c-torture/execute/20060930-1.c | 31 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) --- NEW FILE gcc41-pr29272.patch --- 2006-09-28 Jakub Jelinek PR middle-end/29272 * builtins.c (fold_builtin_memset, fold_builtin_memory_op): Restrict single entry optimization to variables and components thereof. * gcc.c-torture/execute/20060930-1.c: New test. --- gcc/builtins.c.jj 2006-09-22 10:29:55.000000000 +0200 +++ gcc/builtins.c 2006-09-28 20:31:30.000000000 +0200 @@ -7905,7 +7905,7 @@ fold_builtin_exponent (tree fndecl, tree static tree fold_builtin_memset (tree arglist, tree type, bool ignore) { - tree dest, c, len, var, ret; + tree dest, c, len, var, ret, inner; unsigned HOST_WIDE_INT length, cval; if (!validate_arglist (arglist, @@ -7939,6 +7939,15 @@ fold_builtin_memset (tree arglist, tree && !POINTER_TYPE_P (TREE_TYPE (var))) return 0; + /* If var is a VAR_DECL or a component thereof, + we can use its alias set, otherwise we'd need to make + sure we go through alias set 0. */ + inner = var; + while (handled_component_p (inner)) + inner = TREE_OPERAND (inner, 0); + if (! SSA_VAR_P (inner)) + return 0; + length = tree_low_cst (len, 1); if (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (var))) != length || get_pointer_alignment (dest, BIGGEST_ALIGNMENT) / BITS_PER_UNIT @@ -8009,7 +8018,7 @@ fold_builtin_bzero (tree arglist, bool i static tree fold_builtin_memory_op (tree arglist, tree type, bool ignore, int endp) { - tree dest, src, len, destvar, srcvar, expr; + tree dest, src, len, destvar, srcvar, expr, inner; unsigned HOST_WIDE_INT length; if (! validate_arglist (arglist, @@ -8050,6 +8059,15 @@ fold_builtin_memory_op (tree arglist, tr && !SCALAR_FLOAT_TYPE_P (TREE_TYPE (destvar))) return 0; + /* If destvar is a VAR_DECL or a component thereof, + we can use its alias set, otherwise we'd need to make + sure we go through alias set 0. */ + inner = destvar; + while (handled_component_p (inner)) + inner = TREE_OPERAND (inner, 0); + if (! SSA_VAR_P (inner)) + return 0; + srcvar = src; STRIP_NOPS (srcvar); if (TREE_CODE (srcvar) != ADDR_EXPR) @@ -8064,6 +8082,15 @@ fold_builtin_memory_op (tree arglist, tr && !SCALAR_FLOAT_TYPE_P (TREE_TYPE (srcvar))) return 0; + /* If srcvar is a VAR_DECL or a component thereof, + we can use its alias set, otherwise we'd need to make + sure we go through alias set 0. */ + inner = srcvar; + while (handled_component_p (inner)) + inner = TREE_OPERAND (inner, 0); + if (! SSA_VAR_P (inner)) + return 0; + length = tree_low_cst (len, 1); if (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (destvar))) != length || get_pointer_alignment (dest, BIGGEST_ALIGNMENT) / BITS_PER_UNIT --- gcc/testsuite/gcc.c-torture/execute/20060930-1.c.jj 2006-09-30 21:10:17.000000000 +0200 +++ gcc/testsuite/gcc.c-torture/execute/20060930-1.c 2006-09-30 21:09:33.000000000 +0200 @@ -0,0 +1,31 @@ +/* PR middle-end/29272 */ + +extern void abort (void); + +struct S { struct S *s; } s; +struct T { struct T *t; } t; + +static inline void +foo (void *s) +{ + struct T *p = s; + __builtin_memcpy (&p->t, &t.t, sizeof (t.t)); +} + +void * +__attribute__((noinline)) +bar (void *p, struct S *q) +{ + q->s = &s; + foo (p); + return q->s; +} + +int +main (void) +{ + t.t = &t; + if (bar (&s, &s) != (void *) &t) + abort (); + return 0; +} gcc41-pr29299.patch: 0 files changed --- NEW FILE gcc41-pr29299.patch --- 2006-10-18 Jan Hubicka PR middle-end/29299 * cfgexpand.c (expand_used_vars_for_block): Vars marked used by user are used. 2006-10-15 Jan Hubicka Richard Guenther PR middle-end/29299 * cgraphunit.c (cgraph_finalize_compilation_unit): Call process_function_and_variable_attributes on all variables, including those discovered during cgraph construction phase. * gcc.dg/pr29299.c: New testcase. --- gcc/cgraphunit.c (revision 117745) +++ gcc/cgraphunit.c (revision 117863) @@ -1055,6 +1055,7 @@ cgraph_finalize_compilation_unit (void) /* Keep track of already processed nodes when called multiple times for intermodule optimization. */ static struct cgraph_node *first_analyzed; + struct cgraph_node *first_processed = first_analyzed; static struct cgraph_varpool_node *first_analyzed_var; if (errorcount || sorrycount) @@ -1077,7 +1078,10 @@ cgraph_finalize_compilation_unit (void) } timevar_push (TV_CGRAPH); - process_function_and_variable_attributes (first_analyzed, first_analyzed_var); + process_function_and_variable_attributes (first_processed, + first_analyzed_var); + first_processed = cgraph_nodes; + first_analyzed_var = cgraph_varpool_nodes; cgraph_varpool_analyze_pending_decls (); if (cgraph_dump_file) { @@ -1119,11 +1123,16 @@ cgraph_finalize_compilation_unit (void) if (!edge->callee->reachable) cgraph_mark_reachable_node (edge->callee); + /* We finalize local static variables during constructing callgraph + edges. Process their attributes too. */ + process_function_and_variable_attributes (first_processed, + first_analyzed_var); + first_processed = cgraph_nodes; + first_analyzed_var = cgraph_varpool_nodes; cgraph_varpool_analyze_pending_decls (); } /* Collect entry points to the unit. */ - if (cgraph_dump_file) { fprintf (cgraph_dump_file, "Unit entry points:"); @@ -1163,7 +1172,6 @@ cgraph_finalize_compilation_unit (void) dump_cgraph (cgraph_dump_file); } first_analyzed = cgraph_nodes; - first_analyzed_var = cgraph_varpool_nodes; ggc_collect (); timevar_pop (TV_CGRAPH); } --- gcc/cfgexpand.c (revision 117745) +++ gcc/cfgexpand.c (revision 117863) @@ -764,7 +764,12 @@ expand_used_vars_for_block (tree block, /* Expand all variables at this level. */ for (t = BLOCK_VARS (block); t ; t = TREE_CHAIN (t)) - if (TREE_USED (t)) + if (TREE_USED (t) + /* Force local static variables to be output when marked by + used attribute. For unit-at-a-time, cgraph code already takes + care of this. */ + || (!flag_unit_at_a_time && TREE_STATIC (t) + && DECL_PRESERVE_P (t))) expand_one_var (t, toplevel); this_sv_num = stack_vars_num; --- gcc/testsuite/gcc.dg/pr29299.c (revision 0) +++ gcc/testsuite/gcc.dg/pr29299.c (revision 117863) @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O" } */ + +static int bof __attribute__((used)); +int foo() +{ + static int barbarbarbar __attribute__((used)); +}; + +/* { dg-final { scan-assembler "barbarbarbar" } } */ gcc41-pr29703.patch: Matcher.java | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gcc41-pr29703.patch --- 2006-11-06 Ito Kazumitsu PR classpath/29703 * java/util/regex/Matcher.java(reset): Reset inputCharIndexed. --- libjava/classpath/java/util/regex/Matcher.java.orig 2006-08-25 05:06:23.000000000 -0700 +++ libjava/classpath/java/util/regex/Matcher.java 2006-11-07 12:10:00.000000000 -0800 @@ -278,6 +278,7 @@ public Matcher reset (CharSequence input) { this.input = input; + this.inputCharIndexed = RE.makeCharIndexed(input, 0); return reset(); } gcc41-pr30001.patch: 0 files changed --- NEW FILE gcc41-pr30001.patch --- 2006-12-28 Tom Tromey PR preprocessor/30001: * charset.c (_cpp_convert_input): Check that to.len is greater than zero. --- libcpp/charset.c (revision 120244) +++ libcpp/charset.c (revision 120245) @@ -1,5 +1,5 @@ /* CPP Library - charsets - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges. @@ -1628,7 +1628,7 @@ _cpp_convert_input (cpp_reader *pfile, c terminate with another \r, not an \n, so that we do not mistake the \r\n sequence for a single DOS line ending and erroneously issue the "No newline at end of file" diagnostic. */ - if (to.text[to.len - 1] == '\r') + if (to.len && to.text[to.len - 1] == '\r') to.text[to.len] = '\r'; else to.text[to.len] = '\n'; gcc41-pr30045.patch: 0 files changed --- NEW FILE gcc41-pr30045.patch --- 2006-12-19 Andrew Pinski PR tree-opt/30045 * tree-vrp.c (nonnull_arg_p): Treat the static decl as always non null. * gcc.dg/pr30045.c: New test. --- gcc/tree-vrp.c (revision 120068) +++ gcc/tree-vrp.c (revision 120069) @@ -102,6 +102,10 @@ nonnull_arg_p (tree arg) gcc_assert (TREE_CODE (arg) == PARM_DECL && POINTER_TYPE_P (TREE_TYPE (arg))); + /* The static chain decl is always non null. */ + if (arg == cfun->static_chain_decl) + return true; + fntype = TREE_TYPE (current_function_decl); attrs = lookup_attribute ("nonnull", TYPE_ATTRIBUTES (fntype)); --- gcc/testsuite/gcc.dg/pr30045.c (revision 0) +++ gcc/testsuite/gcc.dg/pr30045.c (revision 120069) @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fno-inline" } */ +int f(int *a) +{ + int __attribute__((nonnull(1))) g(int *b) + { + int **c = &a; + if (b) + return *a + **c; + return *b; + } + if (a) + return g(a); + return 1; +} gcc41-pr30110.patch: 0 files changed --- NEW FILE gcc41-pr30110.patch --- 2006-12-08 Ben Konrath PR libgcj/30110: * Makefile.am: Add contents of classpath/external to src.zip. * Makefile.in: Regenerate. --- libjava/Makefile.am (revision 119663) +++ libjava/Makefile.am (revision 119664) @@ -913,6 +913,27 @@ src.zip: echo $(srcdir)/classpath; \ echo $$file; \ done ); \ + ( cd $(srcdir)/classpath/external/sax; \ + find org -name '*.java' -print | \ + while read file; do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir)/classpath/external/sax; \ + echo $$file; \ + done ); \ + ( cd $(srcdir)/classpath/external/relaxngDatatype; \ + find org -name '*.java' -print | \ + while read file; do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir)/classpath/external/relaxngDatatype; \ + echo $$file; \ + done ); \ + ( cd $(srcdir)/classpath/external/w3c_dom; \ + find org -name '*.java' -print | \ + while read file; do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir)/classpath/external/w3c_dom; \ + echo $$file; \ + done ); \ ## Now the build tree. ( cd classpath; \ find gnu java -name '*.java' -print | \ --- libjava/Makefile.in (revision 119663) +++ libjava/Makefile.in (revision 119664) @@ -11864,6 +11864,27 @@ src.zip: echo $(srcdir)/classpath; \ echo $$file; \ done ); \ + ( cd $(srcdir)/classpath/external/sax; \ + find org -name '*.java' -print | \ + while read file; do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir)/classpath/external/sax; \ + echo $$file; \ + done ); \ + ( cd $(srcdir)/classpath/external/relaxngDatatype; \ + find org -name '*.java' -print | \ + while read file; do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir)/classpath/external/relaxngDatatype; \ + echo $$file; \ + done ); \ + ( cd $(srcdir)/classpath/external/w3c_dom; \ + find org -name '*.java' -print | \ + while read file; do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir)/classpath/external/w3c_dom; \ + echo $$file; \ + done ); \ ( cd classpath; \ find gnu java -name '*.java' -print | \ while read file; do \ gcc41-pr30113.patch: 0 files changed --- NEW FILE gcc41-pr30113.patch --- 2006-12-11 Zdenek Dvorak PR rtl-optimization/30113 * loop-iv.c (implies_p): Require the mode of the operands to be scalar. --- gcc/loop-iv.c (revision 119747) +++ gcc/loop-iv.c (revision 119748) @@ -1490,7 +1490,7 @@ implies_p (rtx a, rtx b) mode = VOIDmode; } - if (mode != VOIDmode + if (SCALAR_INT_MODE_P (mode) && rtx_equal_p (op1, opb1) && simplify_gen_binary (MINUS, mode, opb0, op0) == const1_rtx) return true; gcc41-pr30143.patch: 0 files changed --- NEW FILE gcc41-pr30143.patch --- 2006-12-20 Andrew Pinski PR middle-end/30143 * omp-low.c (init_tmp_var): New function. (save_tmp_var): New function. (lower_omp_1): Use them for VAR_DECL. * gcc.dg/gomp/complex-1.c: New testcase. --- gcc/omp-low.c (revision 119958) +++ gcc/omp-low.c (working copy) @@ -4188,6 +4188,40 @@ lower_regimplify (tree *tp, struct walk_ tsi_link_before (&wi->tsi, pre, TSI_SAME_STMT); } +/* Copy EXP into a temporary. Insert the initialization statement before TSI. */ + +static tree +init_tmp_var (tree exp, tree_stmt_iterator *tsi) +{ + tree t, stmt; + + t = create_tmp_var (TREE_TYPE (exp), NULL); + if (TREE_CODE (TREE_TYPE (t)) == COMPLEX_TYPE) + DECL_COMPLEX_GIMPLE_REG_P (t) = 1; + stmt = build2 (MODIFY_EXPR, TREE_TYPE (t), t, exp); + SET_EXPR_LOCUS (stmt, EXPR_LOCUS (tsi_stmt (*tsi))); + tsi_link_before (tsi, stmt, TSI_SAME_STMT); + + return t; +} + +/* Similarly, but copy from the temporary and insert the statement + after the iterator. */ + +static tree +save_tmp_var (tree exp, tree_stmt_iterator *tsi) +{ + tree t, stmt; + + t = create_tmp_var (TREE_TYPE (exp), NULL); + if (TREE_CODE (TREE_TYPE (t)) == COMPLEX_TYPE) + DECL_COMPLEX_GIMPLE_REG_P (t) = 1; + stmt = build2 (MODIFY_EXPR, TREE_TYPE (t), exp, t); + SET_EXPR_LOCUS (stmt, EXPR_LOCUS (tsi_stmt (*tsi))); + tsi_link_after (tsi, stmt, TSI_SAME_STMT); + + return t; +} /* Callback for walk_stmts. Lower the OpenMP directive pointed by TP. */ @@ -4253,7 +4287,17 @@ lower_omp_1 (tree *tp, int *walk_subtree case VAR_DECL: if (ctx && DECL_HAS_VALUE_EXPR_P (t)) - lower_regimplify (tp, wi); + { + lower_regimplify (&t, wi); + if (wi->val_only) + { + if (wi->is_lhs) + t = save_tmp_var (t, &wi->tsi); + else + t = init_tmp_var (t, &wi->tsi); + } + *tp = t; + } break; case ADDR_EXPR: --- gcc/testsuite/gcc.dg/gomp/complex-1.c (revision 0) +++ gcc/testsuite/gcc.dg/gomp/complex-1.c (revision 0) @@ -0,0 +1,13 @@ +/* { dg-do compile } */ +/* { dg-options "-fopenmp -O1" } */ +/* PR middle-end/30143 */ + + +int f (int n) +{ + int i; + _Complex float t; +#pragma omp parallel + for (i = 1; i < n - 1; ++i) + t+=1; +} gcc41-pr30189.patch: dwarf2out.c | 5 ++++- testsuite/gcc.dg/pr30189.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) --- NEW FILE gcc41-pr30189.patch --- 2007-01-03 Alexandre Oliva PR debug/30189 * dwarf2out.c (modified_type_die): Follow DECL_ORIGINAL_TYPE even if cv-qualification is the same. * gcc.dg/pr30189.c: New test. --- gcc/dwarf2out.c.orig 2007-01-02 17:48:15.000000000 -0200 +++ gcc/dwarf2out.c 2007-01-02 17:51:53.000000000 -0200 @@ -8407,7 +8407,10 @@ modified_type_die (tree type, int is_con mod_type_die = lookup_type_die (qualified_type); } else if (is_const_type < TYPE_READONLY (dtype) - || is_volatile_type < TYPE_VOLATILE (dtype)) + || is_volatile_type < TYPE_VOLATILE (dtype) + || (is_const_type <= TYPE_READONLY (dtype) + && is_volatile_type <= TYPE_VOLATILE (dtype) + && DECL_ORIGINAL_TYPE (type_name) != type)) /* cv-unqualified version of named type. Just use the unnamed type to which it refers. */ mod_type_die --- gcc/testsuite/gcc.dg/pr30189.c 1970-01-01 00:00:00.000000000 +0000 +++ gcc/testsuite/gcc.dg/pr30189.c 2007-01-03 14:14:16.000000000 -0200 @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-g -O" } */ + +extern void foo (void); + +static +void baz (int i) +{ + foo (); + typedef char A[i]; + struct { A b; } *x = 0; +} + +void +bar (i) +{ + baz (i); +} gcc41-strncat-chk.patch: builtins.c | 22 +++++++++++++++++ testsuite/gcc.dg/builtin-strncat-chk-1.c | 38 +++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) --- NEW FILE gcc41-strncat-chk.patch --- 2006-09-18 Jakub Jelinek * builtins.c (expand_builtin, maybe_emit_chk_warning): Handle BUILT_IN_STRNCAT_CHK. * gcc.dg/builtin-strncat-chk-1.c: New test. --- gcc/builtins.c.jj 2006-09-02 08:54:22.000000000 +0200 +++ gcc/builtins.c 2006-09-18 16:54:57.000000000 +0200 @@ -6437,6 +6437,7 @@ expand_builtin (tree exp, rtx target, rt case BUILT_IN_STPCPY_CHK: case BUILT_IN_STRNCPY_CHK: case BUILT_IN_STRCAT_CHK: + case BUILT_IN_STRNCAT_CHK: case BUILT_IN_SNPRINTF_CHK: case BUILT_IN_VSNPRINTF_CHK: maybe_emit_chk_warning (exp, fcode); @@ -10128,6 +10129,11 @@ maybe_emit_chk_warning (tree exp, enum b arg_mask = 6; is_strlen = 1; break; + case BUILT_IN_STRNCAT_CHK: + /* For __strncat_chk the warning will be emitted only if overflowing + by at least strlen (dest) + 1 bytes. */ + arg_mask = 12; + break; case BUILT_IN_STRNCPY_CHK: arg_mask = 12; break; @@ -10165,6 +10171,22 @@ maybe_emit_chk_warning (tree exp, enum b if (! len || ! host_integerp (len, 1) || tree_int_cst_lt (len, size)) return; } + else if (fcode == BUILT_IN_STRNCAT_CHK) + { + tree src = TREE_VALUE (TREE_CHAIN (arglist)); + if (! src || ! host_integerp (len, 1) || tree_int_cst_lt (len, size)) + return; + src = c_strlen (src, 1); + if (! src || ! host_integerp (src, 1)) + { + locus = EXPR_LOCATION (exp); + warning (0, "%Hcall to %D might overflow destination buffer", + &locus, get_callee_fndecl (exp)); + return; + } + else if (tree_int_cst_lt (src, size)) + return; + } else if (! host_integerp (len, 1) || ! tree_int_cst_lt (size, len)) return; --- gcc/testsuite/gcc.dg/builtin-strncat-chk-1.c.jj 2006-09-18 13:07:54.000000000 +0200 +++ gcc/testsuite/gcc.dg/builtin-strncat-chk-1.c 2006-09-18 16:55:09.000000000 +0200 @@ -0,0 +1,38 @@ +/* Test whether buffer overflow warnings for __strncat_chk builtin + are emitted properly. */ +/* { dg-do compile } */ +/* { dg-options "-O2 -std=gnu99" } */ + +extern void abort (void); + +#include "../gcc.c-torture/execute/builtins/chk.h" + +char buf1[20]; +char *q; + +void +test (int arg, ...) +{ + char *p = &buf1[10]; + + *p = 0; + strncat (p, "abcdefg", 9); + *p = 0; + strncat (p, "abcdefghi", 9); + *p = 0; + strncat (p, "abcdefghij", 9); + *p = 0; + strncat (p, "abcdefghi", 10); + *p = 0; + strncat (p, "abcdefghij", 10); /* { dg-warning "will always overflow" } */ + *p = 0; + strncat (p, "abcdefgh", 11); + *p = 0; + strncat (p, "abcdefghijkl", 11); /* { dg-warning "will always overflow" } */ + *p = 0; + strncat (p, q, 9); + *p = 0; + strncat (p, q, 10); /* { dg-warning "might overflow" } */ + *p = 0; + strncat (p, q, 11); /* { dg-warning "might overflow" } */ +} --- NEW FILE protoize.1 --- .\" Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation .\" See section COPYING for conditions for redistribution .\" .TH protoize 1 "8 December 2006" "GCC" "GNU" .SH NAME protoize, unprotoize \- automatically add or remove function prototypes .SH SYNOPSIS .HP 7 \fBprotoize\fR [\-CfgklNnqv] [\-B \fIDIRECTORY\fR] [\-c \fICOMPILATION-OPTIONS\fR] [\-d \fIDIRECTORY\fR] [\-i \fISTRING\fR] [\-p \fIPROGRAM\fR] [\-x \fIFILE\fR] [\fIFILE\fR...] .HP 7 \fBunprotoize\fR [\-fkNnqv] [\-c \fICOMPILATION-OPTIONS\fR] [\-d \fIDIRECTORY\fR] [\-i \fISTRING\fR] [\-p \fIPROGRAM\fR] [\-x \fIFILE\fR] [\fIFILE\fR...] .SH DESCRIPTION .PP \fBprotoize\fR is an optional part of GCC. You can use it to add prototypes to a program, thus converting the program to ANSI C in one respect. The companion program \fBunprotoize\fR does the reverse: it removes argument types from any prototypes that are found. .PP When you run these programs, you must specify a set of source files as command line arguments. The conversion programs start out by compiling these files to see what functions they define. The information gathered about a file \fIFOO\fR is saved in a file named \fIFOO.X\fR. .PP After scanning comes the actual conversion. The specified files are all eligible to be converted; any files they include (whether sources or just headers) are eligible as well. .PP But not all the eligible files are converted. By default, \fBprotoize\fR and \fBunprotoize\fR convert only source and header files in the current directory. You can specify additional directories whose files should be converted with the \fB\-d\fR \fIDIRECTORY\fR option. You can also specify particular files to exclude with the \fB\-x\fR \fIFILE\fR option. A file is converted if it is eligible, its directory name matches one of the specified directory names, and its name within the directory has not been excluded. .PP Basic conversion with \fBprotoize\fR consists of rewriting most function definitions and function declarations to specify the types of the arguments. The only ones not rewritten are those for varargs functions. .PP \fBprotoize\fR optionally inserts prototype declarations at the beginning of the source file, to make them available for any calls that precede the function's definition. Or it can insert prototype declarations with block scope in the blocks where undeclared functions are called. .PP Basic conversion with \fBunprotoize\fR consists of rewriting most function declarations to remove any argument types, and rewriting function definitions to the old-style pre-ANSI form. .PP Both conversion programs print a warning for any function declaration or definition that they can't convert. You can suppress these warnings with the \fB\-q\fR option. .PP The output from \fBprotoize\fR or \fBunprotoize\fR replaces the original source file. The original file is renamed to a name ending with \fI.save\fR. If the \fI.save\fR file already exists, then the source file is simply discarded. .PP \fBprotoize\fR and \fBunprotoize\fR both depend on \fBgcc\fR\|(1) to scan the program and collect information about the functions it uses. .PP The options are as follows: .TP \fB\-B\fR \fIDIRECTORY\fR Look for the file \fISYSCALLS.c.X\fR in \fIdirectory\fR, instead of the usual directory (normally \fI/usr/local/lib\fR). This file contains prototype information about standard system functions. This option applies only to \fBprotoize\fR. .TP \fB\-C\fR Rename files to end in \fI.C\fR instead of \fI.c\fR. This is convenient if you are converting a C program to C++. This option applies only to \fBprotoize\fR. .TP \fB\-c\fR \fICOMPILATION-OPTIONS\fR Use \fICOMPILATION-OPTIONS\fR as the options when running \fBgcc\fR\|(1) to produce the \fI.X\fR files. The special option \fB\-aux-info\fR is always passed in addition, to tell gcc to write a \fI.X\fR file. Note that the compilation options must be given as a single argument to \fBprotoize\fR or \fBunprotoize\fR. If you want to specify several gcc options, you must quote the entire set of compilation options to make them a single word in the shell. There are certain gcc arguments that you cannot use, because they would produce the wrong kind of output. These include \fB\-g\fR, \fB\-O\fR, \fB\-c\fR, \fB\-S\fR,\fB\-o\fR. If you include these in the \fICOMPILATION-OPTIONS\fR, they are ignored. .TP \fB\-d\fR \fIDIRECTORY\fR Specify additional directories whose files should be converted. .TP \fB\-g\fR Add explicit global declarations. This means inserting explicit declarations at the beginning of each source file for each function that is called in the file and was not declared. These declarations precede the first function definition that contains a call to an undeclared function. This option applies only to .\fBprotoize\fR. .TP \fB\-i\fR \fISTRING\fR Indent old-style parameter declarations with the string \fISTRING\fR. This option applies only to \fBprotoize\fR. \fBunprotoize\fR converts prototyped function definitions to old-style function definitions, where the arguments are declared between the argument list and the initial \fB{\fR. By default, \fBunprotoize\fR uses five spaces as the indentation. If you want to indent with just one space instead, use \fB\-i " "\fR. .TP \fB\-k\fR Keep the \fI.X\fR files. Normally, they are deleted after conversion is finished. .TP \fB\-l\fR Add explicit local declarations. \fBprotoize\fR with \fB\-l\fR inserts a prototype declaration for each function in each block which calls the function without any declaration. This option applies only to \fBprotoize\fR. .TP \fB\-N\fR Make no \fI.save\fR files. The original files are simply deleted. Use this option with caution. .TP \fB\-n\fR Make no real changes. This mode just prints information about the conversions that would have been done without \fB\-n\fR. .TP \fB\-p\fR \fIPROGRAM\fR Use the program \fBPROGRAM\fR as the compiler. Normally, the name \fBgcc\fR is used. .TP \fB\-q\fR Work quietly. Most warnings are suppressed. .TP \fB\-v\fR Print the version number, just like \fB\-v\fR for gcc. .TP \fB\-x\fR \fBFILE\fR List of files to exclude from the conversion process. .PP If you need special compiler options to compile one of your program's source files, then you should generate that file's \fI.X\fR file specially, by running gcc on that source file with the appropriate options and the option \fB\-aux-info\fR. Then run \fBprotoize\fR on the entire set of files. \fBprotoize\fR will use the existing \fI.X\fR file because it is newer than the source file. For example: .PP .DL $ gcc -Dfoo=bar file1.c -aux-info .DL $ protoize *.c .PP You need to include the special files along with the rest in the \fBprotoize\fR command, even though their \fI.X\fR files already exist, because otherwise they won't get converted. .PP .SH SEE ALSO \fBgcc\fR\|(1), and the Info entry for \fBgcc\fR, particularly \fBRunning protoize\fR section. .SH HISTORY Ron Guilmette implemented the \fBprotoize\fR and \fBunprotoize\fR tools. .SH AUTHORS See the GCC manual for the contributors to GCC. .SH CAVEATS The conversion programs \fBprotoize\fR and \fBunprotoize\fR can sometimes change a source file in a way that won't work unless you rearrange it. .PP \fBprotoize\fR can insert references to a type name or type tag before the definition, or in a file where they are not defined. .PP If this happens, compiler error messages should indicate where the new references are, so fixing the file by hand is straightforward. .PP There are some C constructs which \fBprotoize\fR cannot figure out. For example, it can't determine argument types for declaring a pointer-to-function variable; this must be done by hand. \fBprotoize\fR inserts a comment containing \fB???\fR each time it finds such a variable; all such variables can be found by searching for this string. ANSI C does not require declaring the argument types of pointer-to-function types. .PP Using \fBunprotoize\fR can easily introduce bugs. If the program relied on prototypes to bring about conversion of arguments, these conversions will not take place in the program without prototypes. One case in which you can be sure \fBunprotoize\fR is safe is when you are removing prototypes that were made with \fBprotoize\fR; if the program worked before without any prototypes, it will work again without them. .PP You can find all the places where this problem might occur by compiling the program with the \fB\-Wconversion\fR option. It prints a warning whenever an argument is converted. .PP Both conversion programs can be confused if there are macro calls in and around the text to be converted. In other words, the standard syntax for a declaration or definition must not result from expanding a macro. This problem is inherent in the design of C and cannot be fixed. If only a few functions have confusing macro calls, you can easily convert them manually. .PP \fBprotoize\fR cannot get the argument types for a function whose definition was not actually compiled due to preprocessing conditionals. When this happens, \fBprotoize\fR changes nothing in regard to such a function. \fBprotoize\fR tries to detect such instances and warn about them. .PP You can generally work around this problem by using \fBprotoize\fR step by step, each time specifying a different set of \fB\-D\fR options for compilation, until all of the functions have been converted. There is no automatic way to verify that you have got them all, however. .PP Confusion may result if there is an occasion to convert a function declaration or definition in a region of source code where there is more than one formal parameter list present. Thus, attempts to convert code containing multiple (conditionally compiled) versions of a single function header (in the same vicinity) may not produce the desired (or expected) results. .PP If you plan on converting source files which contain such code, it is recommended that you first make sure that each conditionally compiled region of source code which contains an alternative function header also contains at least one additional follower token (past the final right parenthesis of the function header). This should circumvent the problem. .PP \fBunprotoize\fR can become confused when trying to convert a function definition or declaration which contains a declaration for a pointer-to-function formal argument which has the same name as the function being defined or declared. We recommand you avoid such choices of formal parameter names. .PP It might be necessary to correct some of the indentation by hand and break long lines. (The conversion programs don't write lines longer than eighty characters in any case.) .SH BUGS For instructions on reporting bugs, see the GCC manual. .SH COPYING Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. .PP Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. .PP Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/.cvsignore,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- .cvsignore 25 May 2006 20:50:25 -0000 1.142 +++ .cvsignore 7 Jan 2007 22:08:06 -0000 1.143 @@ -1 +1 @@ -gcc-4.1.1-20060525.tar.bz2 +gcc-4.1.1-20070107.tar.bz2 gcc41-mni.patch: config.gcc | 6 config/i386/i386.c | 216 ++++++++++++++++- config/i386/i386.h | 2 config/i386/i386.md | 9 config/i386/i386.opt | 4 config/i386/sse.md | 577 +++++++++++++++++++++++++++++++++++++++++++++++- config/i386/tmmintrin.h | 224 ++++++++++++++++++ doc/extend.texi | 46 +++ doc/invoke.texi | 3 9 files changed, 1067 insertions(+), 20 deletions(-) Index: gcc41-mni.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41-mni.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-mni.patch 27 Feb 2006 16:57:32 -0000 1.1 +++ gcc41-mni.patch 7 Jan 2007 22:08:06 -0000 1.2 @@ -87,7 +87,7 @@ ia64-*-*) --- gcc/config/i386/i386.c.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.c 2006-02-24 13:39:19.000000000 -0800 -@@ -1446,11 +1446,12 @@ override_options (void) +@@ -1447,11 +1447,12 @@ override_options (void) PTA_SSE = 1, PTA_SSE2 = 2, PTA_SSE3 = 4, @@ -105,7 +105,7 @@ } flags; } const processor_alias_table[] = -@@ -1645,6 +1646,9 @@ override_options (void) +@@ -1646,6 +1647,9 @@ override_options (void) if (processor_alias_table[i].flags & PTA_SSE3 && !(target_flags_explicit & MASK_SSE3)) target_flags |= MASK_SSE3; @@ -115,7 +115,7 @@ if (processor_alias_table[i].flags & PTA_PREFETCH_SSE) x86_prefetch_sse = true; if (TARGET_64BIT && !(processor_alias_table[i].flags & PTA_64BIT)) -@@ -1836,6 +1840,10 @@ override_options (void) +@@ -1835,6 +1839,10 @@ override_options (void) if (!TARGET_80387) target_flags |= MASK_NO_FANCY_MATH_387; @@ -126,7 +126,7 @@ /* Turn on SSE2 builtins for -msse3. */ if (TARGET_SSE3) target_flags |= MASK_SSE2; -@@ -14147,6 +14155,41 @@ enum ix86_builtins +@@ -14198,6 +14206,41 @@ enum ix86_builtins IX86_BUILTIN_MONITOR, IX86_BUILTIN_MWAIT, @@ -168,7 +168,7 @@ IX86_BUILTIN_VEC_INIT_V2SI, IX86_BUILTIN_VEC_INIT_V4HI, IX86_BUILTIN_VEC_INIT_V8QI, -@@ -14487,7 +14530,33 @@ static const struct builtin_description +@@ -14538,7 +14581,33 @@ static const struct builtin_description { MASK_SSE3, CODE_FOR_sse3_haddv4sf3, "__builtin_ia32_haddps", IX86_BUILTIN_HADDPS, 0, 0 }, { MASK_SSE3, CODE_FOR_sse3_haddv2df3, "__builtin_ia32_haddpd", IX86_BUILTIN_HADDPD, 0, 0 }, { MASK_SSE3, CODE_FOR_sse3_hsubv4sf3, "__builtin_ia32_hsubps", IX86_BUILTIN_HSUBPS, 0, 0 }, @@ -203,7 +203,7 @@ }; static const struct builtin_description bdesc_1arg[] = -@@ -14532,8 +14601,16 @@ static const struct builtin_description +@@ -14583,8 +14652,16 @@ static const struct builtin_description { MASK_SSE2, CODE_FOR_sse2_cvttps2dq, 0, IX86_BUILTIN_CVTTPS2DQ, 0, 0 }, /* SSE3 */ @@ -222,7 +222,7 @@ }; static void -@@ -14678,6 +14755,16 @@ ix86_init_mmx_sse_builtins (void) +@@ -14719,6 +14796,16 @@ ix86_init_mmx_sse_builtins (void) /* Normal vector unops. */ tree v4sf_ftype_v4sf = build_function_type_list (V4SF_type_node, V4SF_type_node, NULL_TREE); @@ -239,7 +239,7 @@ /* Normal vector binops. */ tree v4sf_ftype_v4sf_v4sf -@@ -14697,6 +14784,12 @@ ix86_init_mmx_sse_builtins (void) +@@ -14738,6 +14825,12 @@ ix86_init_mmx_sse_builtins (void) long_long_unsigned_type_node, long_long_unsigned_type_node, NULL_TREE); @@ -252,7 +252,7 @@ tree v2si_ftype_v2sf = build_function_type_list (V2SI_type_node, V2SF_type_node, NULL_TREE); tree v2sf_ftype_v2si -@@ -14801,6 +14894,9 @@ ix86_init_mmx_sse_builtins (void) +@@ -14842,6 +14935,9 @@ ix86_init_mmx_sse_builtins (void) tree v2di_ftype_v2di_int = build_function_type_list (V2DI_type_node, V2DI_type_node, integer_type_node, NULL_TREE); @@ -262,7 +262,7 @@ tree v4si_ftype_v4si_int = build_function_type_list (V4SI_type_node, V4SI_type_node, integer_type_node, NULL_TREE); -@@ -14926,6 +15022,50 @@ ix86_init_mmx_sse_builtins (void) +@@ -14967,6 +15063,50 @@ ix86_init_mmx_sse_builtins (void) def_builtin (d->mask, d->name, type, d->code); } @@ -313,10 +313,10 @@ /* Add the remaining MMX insns with somewhat more complicated types. */ def_builtin (MASK_MMX, "__builtin_ia32_emms", void_ftype_void, IX86_BUILTIN_EMMS); def_builtin (MASK_MMX, "__builtin_ia32_psllw", v4hi_ftype_v4hi_di, IX86_BUILTIN_PSLLW); -@@ -15128,15 +15268,15 @@ ix86_init_mmx_sse_builtins (void) - void_ftype_unsigned_unsigned, - IX86_BUILTIN_MWAIT); - } +@@ -15157,15 +15297,15 @@ ix86_init_mmx_sse_builtins (void) + def_builtin (MASK_SSE3, "__builtin_ia32_mwait", + void_ftype_unsigned_unsigned, + IX86_BUILTIN_MWAIT); - def_builtin (MASK_SSE3, "__builtin_ia32_movshdup", - v4sf_ftype_v4sf, - IX86_BUILTIN_MOVSHDUP); @@ -335,7 +335,7 @@ /* Access to the vec_init patterns. */ ftype = build_function_type_list (V2SI_type_node, integer_type_node, integer_type_node, NULL_TREE); -@@ -15627,7 +15767,7 @@ ix86_expand_builtin (tree exp, rtx targe +@@ -15656,7 +15796,7 @@ ix86_expand_builtin (tree exp, rtx targe tree arglist = TREE_OPERAND (exp, 1); tree arg0, arg1, arg2; rtx op0, op1, op2, pat; @@ -344,7 +344,7 @@ unsigned int fcode = DECL_FUNCTION_CODE (fndecl); switch (fcode) -@@ -16004,6 +16144,52 @@ ix86_expand_builtin (tree exp, rtx targe +@@ -16025,6 +16165,52 @@ ix86_expand_builtin (tree exp, rtx targe return ix86_expand_unop_builtin (CODE_FOR_sse3_lddqu, arglist, target, 1); gcc41-objc-rh185398.patch: 20060406-1.m | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+) Index: gcc41-objc-rh185398.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41-objc-rh185398.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-objc-rh185398.patch 9 May 2006 10:08:20 -0000 1.1 +++ gcc41-objc-rh185398.patch 7 Jan 2007 22:08:06 -0000 1.2 @@ -1,56 +1,7 @@ 2006-04-06 Jakub Jelinek - * objc-act.c (objc_push_param): If changing type, run relayout_decl - on the parameter. - * objc/compile/20060406-1.m: New test. ---- gcc/objc/objc-act.c.jj 2006-03-04 08:01:27.000000000 +0100 -+++ gcc/objc/objc-act.c 2006-04-06 16:56:57.000000000 +0200 -@@ -1,6 +1,6 @@ - /* Implement classes and message passing for Objective C. - Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000, -- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+ 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Contributed by Steve Naroff. - - This file is part of GCC. -@@ -8222,21 +8222,29 @@ static GTY(()) tree objc_parmlist = NULL - static void - objc_push_parm (tree parm) - { -+ tree type = TREE_TYPE (parm); -+ - /* Decay arrays and functions into pointers. */ - if (TREE_CODE (TREE_TYPE (parm)) == ARRAY_TYPE) -- TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (TREE_TYPE (parm))); -+ TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (type)); - else if (TREE_CODE (TREE_TYPE (parm)) == FUNCTION_TYPE) -- TREE_TYPE (parm) = build_pointer_type (TREE_TYPE (parm)); -+ TREE_TYPE (parm) = build_pointer_type (type); - - DECL_ARG_TYPE (parm) - = lang_hooks.types.type_promotes_to (TREE_TYPE (parm)); - -+ if (type != TREE_TYPE (parm)) -+ { -+ relayout_decl (parm); -+ type = TREE_TYPE (parm); -+ } -+ - /* Record constancy and volatility. */ - c_apply_type_quals_to_decl -- ((TYPE_READONLY (TREE_TYPE (parm)) ? TYPE_QUAL_CONST : 0) -- | (TYPE_RESTRICT (TREE_TYPE (parm)) ? TYPE_QUAL_RESTRICT : 0) -- | (TYPE_VOLATILE (TREE_TYPE (parm)) ? TYPE_QUAL_VOLATILE : 0), parm); -- -+ ((TYPE_READONLY (type) ? TYPE_QUAL_CONST : 0) -+ | (TYPE_RESTRICT (type) ? TYPE_QUAL_RESTRICT : 0) -+ | (TYPE_VOLATILE (type) ? TYPE_QUAL_VOLATILE : 0), parm); -+ - objc_parmlist = chainon (objc_parmlist, parm); - } - --- gcc/testsuite/objc/compile/20060406-1.m.jj 2006-04-06 17:25:59.000000000 +0200 +++ gcc/testsuite/objc/compile/20060406-1.m 2006-04-06 17:20:48.000000000 +0200 @@ -0,0 +1,21 @@ gcc41-pr20297-test.patch: gcc.dg/visibility-11.c | 24 ------------------------ gcc.target/i386/visibility-1.c | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) Index: gcc41-pr20297-test.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41-pr20297-test.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr20297-test.patch 9 May 2006 10:08:20 -0000 1.1 +++ gcc41-pr20297-test.patch 7 Jan 2007 22:08:06 -0000 1.2 @@ -22,7 +22,7 @@ -extern void* memcpy (void *, const void *, __SIZE_TYPE__); -#pragma GCC visibility pop - --struct a { int a[10]; }; +-struct a { int a[1024]; }; - -extern void *bar (struct a *, struct a *, int); - @@ -50,7 +50,7 @@ +extern void* memcpy (void *, const void *, __SIZE_TYPE__); +#pragma GCC visibility pop + -+struct a { int a[10]; }; ++struct a { int a[1024]; }; + +extern void *bar (struct a *, struct a *, int); + gcc41-pr25874.patch: omp-low.c | 10 ++++++++++ testsuite/g++.dg/gomp/pr25874.C | 2 ++ testsuite/gcc.dg/gomp/pr25874.c | 2 ++ 3 files changed, 14 insertions(+) Index: gcc41-pr25874.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41-pr25874.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr25874.patch 9 May 2006 10:08:20 -0000 1.1 +++ gcc41-pr25874.patch 7 Jan 2007 22:08:06 -0000 1.2 @@ -9,7 +9,7 @@ --- gcc/omp-low.c.jj 2006-04-18 13:31:18.000000000 +0200 +++ gcc/omp-low.c 2006-04-18 13:57:03.000000000 +0200 -@@ -2278,6 +2278,7 @@ expand_omp_parallel (struct omp_region * +@@ -2421,6 +2421,7 @@ expand_omp_parallel (struct omp_region * block_stmt_iterator si; tree entry_stmt; edge e; @@ -17,15 +17,15 @@ entry_stmt = last_stmt (region->entry); child_fn = OMP_PARALLEL_FN (entry_stmt); -@@ -2310,6 +2311,7 @@ expand_omp_parallel (struct omp_region * - new_bb = entry_bb; - remove_edge (entry_succ_e); - make_edge (new_bb, exit_succ_e->dest, EDGE_FALLTHRU); +@@ -2456,6 +2457,7 @@ expand_omp_parallel (struct omp_region * + exit_succ_e = single_succ_edge (exit_bb); + make_edge (new_bb, exit_succ_e->dest, EDGE_FALLTHRU); + } + do_cleanup_cfg = true; } else { -@@ -2385,6 +2387,14 @@ expand_omp_parallel (struct omp_region * +@@ -2546,6 +2548,14 @@ expand_omp_parallel (struct omp_region * /* Emit a library call to launch the children threads. */ expand_parallel_call (region, new_bb, entry_stmt, ws_args); gcc41-tests.patch: g++.dg/debug/vartrack1.C | 99 +++++++++++++++++++++++++++++++++++++ g++.dg/opt/ifcvt1.C | 17 ++++++ g++.dg/opt/pr15054-2.C | 39 ++++++++++++++ g++.dg/template/array17.C | 23 ++++++++ gcc.c-torture/execute/20060412-1.c | 33 ++++++++++++ gcc.c-torture/execute/20060420-1.c | 71 ++++++++++++++++++++++++++ gcc.dg/20060425-2.c | 10 +++ gcc.dg/tls/opt-13.c | 16 +++++ gcc.target/powerpc/altivec-23.c | 25 +++++++++ 9 files changed, 333 insertions(+) Index: gcc41-tests.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41-tests.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-tests.patch 9 May 2006 10:08:20 -0000 1.1 +++ gcc41-tests.patch 7 Jan 2007 22:08:06 -0000 1.2 @@ -1,6 +1,16 @@ +2006-12-08 Jakub Jelinek + + * g++.dg/debug/vartrack1.C: New test. + + * g++.dg/opt/ifcvt1.C: New test. + +2006-12-08 Alexandre Oliva + + * g++.dg/template/array17.C: New test. + 2006-05-05 Jakub Jelinek - * gcc.dg/tls/opt-12.c: New test. + * gcc.dg/tls/opt-13.c: New test. 2006-04-25 Jakub Jelinek @@ -213,8 +223,8 @@ + v = 0.; + return v; +} ---- gcc/testsuite/gcc.dg/tls/opt-12.c 2006-04-19 19:21:31.748476000 +0200 -+++ gcc/testsuite/gcc.dg/tls/opt-12.c 2006-05-05 11:01:33.000000000 +0200 +--- gcc/testsuite/gcc.dg/tls/opt-13.c 2006-04-19 19:21:31.748476000 +0200 ++++ gcc/testsuite/gcc.dg/tls/opt-13.c 2006-05-05 11:01:33.000000000 +0200 @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ @@ -232,3 +242,151 @@ + __builtin_strcpy (thr.b, "abcd"); + return 0; +} +--- gcc/testsuite/g++.dg/debug/vartrack1.C 2004-06-24 14:04:38.000000000 -0400 ++++ gcc/testsuite/g++.dg/debug/vartrack1.C 2006-12-08 05:29:41.000000000 -0500 +@@ -0,0 +1,99 @@ ++// This testcase used to hang the compiler in vt_find_locations. ++// { dg-do compile } ++// { dg-options "-O2 -g" } ++ ++struct S ++{ ++ int a; ++ S *b, *c, *d; ++}; ++ ++struct T ++{ ++ void f1 (S *x); ++ void f2 (S *x); ++ void f3 (S *x, S *y); ++ S *e; ++}; ++ ++void ++T::f3 (S *x, S *y) ++{ ++ while (x != this->e && (!x || x->a == 1)) ++ { ++ if (x == y->c) ++ { ++ S *w = y->d; ++ if (w && w->a == 0) ++ { ++ w->a = 1; ++ y->a = 0; ++ f2 (y); ++ w = y->d; ++ } ++ if (w && (!w->c || w->c->a == 1) && (!w->d || w->d->a == 1)) ++ { ++ w->a = 0; ++ x = y; ++ y = x->b; ++ } ++ else ++ { ++ if (w && (!w->d || w->d->a == 1)) ++ { ++ if (w->c) ++ w->c->a = 1; ++ w->a = 0; ++ f1 (w); ++ w = y->d; ++ } ++ if (w) ++ { ++ w->a = y->a; ++ if (w->d) ++ w->d->a = 1; ++ } ++ y->a = 1; ++ f2 (y); ++ x = e; ++ } ++ } ++ else ++ { ++ S *w = y->c; ++ if (w && w->a == 0) ++ { ++ w->a = 1; ++ y->a = 0; ++ f1 (y); ++ w = y->c; ++ } ++ if (w && (!w->c || w->c->a == 1) && (!w->d || w->d->a == 1)) ++ { ++ w->a = 0; ++ x = y; ++ y = x->b; ++ } ++ else ++ { ++ if (w && (!w->c || w->c->a == 1)) ++ { ++ w->a = 0; ++ if (w->d) ++ w->d->a = 1; ++ f2 (w); ++ w = y->c; ++ } ++ if (w) ++ { ++ w->a = y->a; ++ if (w->c) ++ w->c->a = 1; ++ } ++ y->a = 1; ++ f1 (y); ++ x = e; ++ } ++ } ++ } ++} +--- gcc/testsuite/g++.dg/opt/ifcvt1.C 2006-10-04 16:28:56.502613000 +0200 ++++ gcc/testsuite/g++.dg/opt/ifcvt1.C 2006-12-08 12:23:23.000000000 +0100 +@@ -0,0 +1,17 @@ ++// { dg-do compile } ++// { dg-options "-O2 -fnon-call-exceptions" } ++ ++struct S { ~S () throw () {} }; ++double bar (); ++ ++int ++foo () ++{ ++ S a; ++ int i = 0; ++ double c = bar (); ++ c = c < 0 ? -c : c; ++ if (c <= 1.e-8) ++ i += 24; ++ return i; ++} +--- gcc/testsuite/g++.dg/template/array17.C 2006-10-04 16:28:56.502613000 +0200 ++++ gcc/testsuite/g++.dg/template/array17.C 2006-12-08 12:38:27.000000000 +0100 +@@ -0,0 +1,23 @@ ++// { dg-do compile } ++ ++template ++struct V { ++ T& operator[](int); ++}; ++ ++struct S { ++ S operator +(int); ++ template T value(); ++}; ++ ++template ++void R (T v) ++{ ++ v[(S() + 0).template value()][0] = 0; ++} ++ ++int ++main () ++{ ++ R(V >()); ++} Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gcc41.spec 25 May 2006 20:50:25 -0000 1.47 +++ gcc41.spec 7 Jan 2007 22:08:06 -0000 1.48 @@ -1,6 +1,6 @@ -%define DATE 20060525 +%define DATE 20070107 %define gcc_version 4.1.1 -%define gcc_release 1 +%define gcc_release 51 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -24,11 +24,12 @@ Summary: Various compilers (C, C++, Objective-C, Java, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}.fc5 +Release: %{gcc_release}%{?dist} License: GPL Group: Development/Languages Source0: gcc-%{version}-%{DATE}.tar.bz2 Source1: libgcc_post_upgrade.c +Source2: protoize.1 URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Need binutils with -pie support >= 2.14.90.0.4-4 @@ -36,10 +37,12 @@ # Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2 # Need binutils which support .weakref >= 2.16.91.0.3-1 BuildRequires: binutils >= 2.16.91.0.3-1 -BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo +BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo, sharutils +BuildRequires: /usr/bin/fastjar # Make sure pthread.h doesn't contain __thread tokens # Make sure glibc supports stack protector BuildRequires: glibc-devel >= 2.3.90-2 +BuildRequires: elfutils-devel >= 0.72 %ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha # Make sure glibc supports TFmode long double BuildRequires: glibc >= 2.3.90-35 @@ -52,6 +55,9 @@ # Ada requires Ada to build BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 %endif +%ifarch ia64 +BuildRequires: libunwind >= 0.98 +%endif Requires: cpp = %{version}-%{release} # Need .eh_frame ld optimizations # Need proper visibility support @@ -91,7 +97,6 @@ Obsoletes: gcc34 Obsoletes: gcc35 Obsoletes: gcc4 -Provides: gcc4 = %{version}-%{release} Prereq: /sbin/install-info AutoReq: true @@ -104,24 +109,39 @@ Patch7: gcc41-ada-tweaks.patch Patch8: gcc41-java-slow_pthread_self.patch Patch9: gcc41-ppc32-retaddr.patch -Patch10: gcc41-x86_64-sse3.patch -Patch11: gcc41-mni.patch -Patch12: gcc41-dsohandle.patch -Patch13: gcc41-rh184446.patch -Patch14: gcc41-pr21764.patch -Patch15: gcc41-pr21581.patch -Patch16: gcc41-pr20297-test.patch -Patch17: gcc41-java-pr13212.patch -Patch18: gcc41-objc-rh185398.patch -Patch19: gcc41-tests.patch -Patch20: gcc41-ppc64-ldouble-stdarg.patch -Patch21: gcc41-pr25874.patch -Patch22: gcc41-pr26881.patch -Patch23: gcc41-pr27532.patch -Patch24: gcc41-pr26885.patch -Patch25: gcc41-pr27758.patch -Patch26: gcc41-rh192700.patch -Patch27: gcc41-sw2438.patch +Patch10: gcc41-mni.patch +Patch11: gcc41-dsohandle.patch +Patch12: gcc41-rh184446.patch +Patch13: gcc41-pr20297-test.patch +Patch14: gcc41-objc-rh185398.patch +Patch15: gcc41-tests.patch +Patch16: gcc41-pr25874.patch +Patch17: gcc41-pr30189.patch +Patch18: gcc41-i386-tune-geode.patch +Patch19: gcc41-hash-style-gnu.patch +Patch20: gcc41-pr30001.patch +Patch21: gcc41-java-libdotdotlib.patch +Patch22: gcc41-pr28709.patch +Patch23: gcc41-pr28755.patch +Patch24: gcc41-pr27898.patch +Patch25: gcc41-pr27567.patch +Patch26: gcc41-pr29272.patch +Patch27: gcc41-pr29059.patch +Patch28: gcc41-strncat-chk.patch +Patch29: gcc41-pr29703.patch +Patch30: gcc41-pr29299.patch +Patch31: gcc41-libjava-anonverscript.patch +Patch32: gcc41-ppc64-libffi-unwind.patch +Patch33: gcc41-pr30113.patch +Patch34: gcc41-pr30110.patch +Patch35: gcc41-pr30143.patch +Patch36: gcc41-pr30045.patch +Patch37: gcc41-pr24036-revert.patch + +Patch100: gcc41-pr21764.patch +Patch101: gcc41-pr21581.patch +Patch102: gcc41-java-pr13212.patch +Patch103: gcc41-rh192700.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -156,7 +176,6 @@ Obsoletes: gcc34-c++ Obsoletes: gcc35-c++ Obsoletes: gcc4-c++ -Provides: gcc4-c++ = %{version}-%{release} Autoreq: true %description c++ @@ -169,7 +188,6 @@ Group: System Environment/Libraries Obsoletes: libstdc++3 Obsoletes: libstdc++34 -Provides: libstdc++34 Autoreq: true %description -n libstdc++ @@ -179,10 +197,9 @@ %package -n libstdc++-devel Summary: Header files and libraries for C++ development Group: Development/Libraries -Requires: libstdc++ = %{version}-%{release} +Requires: libstdc++ = %{version}-%{release}, %{_prefix}/%{_lib}/libstdc++.so.6 Obsoletes: libstdc++3-devel Obsoletes: libstdc++34-devel -Provides: libstdc++34-devel Autoreq: true %description -n libstdc++-devel @@ -282,12 +299,11 @@ Group: Development/Languages Requires: gcc = %{version}-%{release} Requires: libgcj = %{version}-%{release} -Requires: libgcj-devel = %{version}-%{release}, zlib-devel +Requires: libgcj-devel = %{version}-%{release} Obsoletes: gcc3-java Obsoletes: gcc34-java Obsoletes: gcc35-java Obsoletes: gcc4-java -Provides: gcc4-java Prereq: /sbin/install-info Autoreq: true @@ -313,7 +329,6 @@ Obsoletes: libgcj3 Obsoletes: libgcj34 Obsoletes: libgcj4 -Provides: libgcj4 Autoreq: true %description -n libgcj @@ -323,11 +338,12 @@ %package -n libgcj-devel Summary: Libraries for Java development using GCC Group: Development/Languages -Requires: zip >= 2.1, libgcj = %{version}-%{release} +Requires: libgcj = %{version}-%{release}, %{_prefix}/%{_lib}/libgcj.so.7 +Requires: zlib-devel, %{_prefix}/%{_lib}/libz.so +Requires: /bin/awk Obsoletes: libgcj3-devel Obsoletes: libgcj34-devel Obsoletes: libgcj4-devel -Provides: libgcj4-devel Autoreq: true %description -n libgcj-devel @@ -339,7 +355,6 @@ Group: System Environment/Libraries Requires: libgcj = %{version}-%{release} Obsoletes: libgcj4-src -Provides: libgcj4-src Autoreq: true %description -n libgcj-src @@ -409,24 +424,39 @@ %patch7 -p0 -b .ada-tweaks~ %patch8 -p0 -b .java-slow_pthread_self~ %patch9 -p0 -b .ppc32-retaddr~ -%patch10 -p0 -b .x86_64-sse3~ -%patch11 -p0 -b .mni~ -%patch12 -p0 -b .dsohandle~ -%patch13 -p0 -b .rh184446~ -%patch14 -p0 -b .pr21764~ -#%patch15 -p0 -b .pr21581~ -%patch16 -p0 -E -b .pr20297-test~ -%patch17 -p0 -b .java-pr13212~ -%patch18 -p0 -b .objc-rh185398~ -%patch19 -p0 -b .tests~ -%patch20 -p0 -b .ppc64-ldouble-stdarg~ -%patch21 -p0 -b .pr25874~ -%patch22 -p0 -b .pr26881~ -%patch23 -p0 -b .pr27532~ -%patch24 -p0 -b .pr26885~ -%patch25 -p0 -b .pr27758~ -%patch26 -p0 -b .rh192700~ -%patch27 -p0 -b .sw2438~ +%patch10 -p0 -b .mni~ +%patch11 -p0 -b .dsohandle~ +%patch12 -p0 -b .rh184446~ +%patch13 -p0 -E -b .pr20297-test~ +%patch14 -p0 -b .objc-rh185398~ +%patch15 -p0 -b .tests~ +%patch16 -p0 -b .pr25874~ +%patch17 -p0 -b .pr30189~ +%patch18 -p0 -b .i386-tune-geode~ +#%patch19 -p0 -b .hash-style-gnu~ +%patch20 -p0 -b .pr30001~ +%patch21 -p0 -b .java-libdotdotlib~ +%patch22 -p0 -b .pr28709~ +%patch23 -p0 -b .pr28755~ +%patch24 -p0 -b .pr27898~ +%patch25 -p0 -b .pr27567~ +%patch26 -p0 -b .pr29272~ +%patch27 -p0 -b .pr29059~ +%patch28 -p0 -b .strncat-chk~ +%patch29 -p0 -b .pr29703~ +%patch30 -p0 -b .pr29299~ +%patch31 -p0 -b .libjava-anonverscript~ +%patch32 -p0 -b .ppc64-libffi-unwind~ +%patch33 -p0 -b .pr30113~ +%patch34 -p0 -b .pr30110~ +%patch35 -p0 -b .pr30143~ +%patch36 -p0 -b .pr30045~ +%patch37 -p0 -b .pr24036-revert~ + +%patch100 -p0 -b .pr21764~ +#%patch101 -p0 -b .pr21581~ +%patch102 -p0 -b .java-pr13212~ +%patch103 -p0 -b .rh192700~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -478,7 +508,7 @@ OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'` %ifarch sparc sparc64 -OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g'` +OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'` %endif %ifarch sparc64 cat > gcc64 <<"EOF" @@ -537,16 +567,15 @@ %ifarch %{ix86} x86_64 --with-cpu=generic \ %endif +%ifarch s390 s390x + --with-tune=z9-109 \ +%endif %ifnarch sparc ppc --host=%{gcc_target_platform} %endif #GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap -%ifarch %{ix86} x86_64 ppc ppc64 GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap -%else -GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap-lean -%endif # run the tests. make %{?_smp_mflags} -k check RUNTESTFLAGS="ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++" || : @@ -562,9 +591,12 @@ ( ../contrib/test_summary || : ) 2>&1 | sed -n '/^cat.*EOF/,/^EOF/{/^cat.*EOF/d;/^EOF/d;/^LAST_UPDATED:/d;p;}' echo ====================TESTING END===================== mkdir testlogs-%{_target_platform}-%{version}-%{release} -for i in `find . -name \*.log | grep testsuite/ | grep -v 'config.log\|acats\|ada'`; do +for i in `find . -name \*.log | grep -F testsuite/ | grep -v 'config.log\|acats\|ada'`; do ln $i testlogs-%{_target_platform}-%{version}-%{release}/ || : done +for i in `find . -name \*.log | grep -F testsuite.ssp/ | grep -v 'config.log\|acats\|ada'`; do + ln $i testlogs-%{_target_platform}-%{version}-%{release}/ssp-`basename $i` || : +done tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \ | uuencode testlogs-%{_target_platform}.tar.bz2 || : rm -rf testlogs-%{_target_platform}-%{version}-%{release} @@ -590,8 +622,8 @@ cp -p $i rpm.doc/changelogs/$i done -(cd gcc/f; for i in ChangeLog*; do - cp -p $i ../../rpm.doc/gfortran/$i.f +(cd gcc/fortran; for i in ChangeLog*; do + cp -p $i ../../rpm.doc/gfortran/$i done) (cd libgfortran; for i in ChangeLog*; do cp -p $i ../rpm.doc/gfortran/$i.libgfortran @@ -707,7 +739,7 @@ fi find $RPM_BUILD_ROOT -name \*.la | xargs rm -f -if [ "%{build_java}" -gt 0 ]; then +%if %{build_java} # gcj -static doesn't work properly anyway, unless using --whole-archive # and saving 35MB is not bad. find $RPM_BUILD_ROOT -name libgcj.a -o -name lib-gnu-java-awt-peer-gtk.a \ @@ -717,7 +749,7 @@ mv $RPM_BUILD_ROOT%{_prefix}/lib/libgcj.spec $FULLPATH/ sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' \ $FULLPATH/libgcj.spec -fi +%endif mkdir -p $RPM_BUILD_ROOT/%{_lib} mv -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgcc_s.so.1 $RPM_BUILD_ROOT/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1 @@ -959,6 +991,10 @@ touch $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db %endif +install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/protoize.1 +echo '.so man1/protoize.1' > $RPM_BUILD_ROOT%{_mandir}/man1/unprotoize.1 +chmod 644 $RPM_BUILD_ROOT%{_mandir}/man1/unprotoize.1 + %clean rm -rf $RPM_BUILD_ROOT @@ -1083,6 +1119,8 @@ %{_prefix}/bin/%{gcc_target_platform}-gcc %{_mandir}/man1/gcc.1* %{_mandir}/man1/gcov.1* +%{_mandir}/man1/protoize.1* +%{_mandir}/man1/unprotoize.1* %{_infodir}/gcc* %dir %{_prefix}/lib/gcc %dir %{_prefix}/lib/gcc/%{gcc_target_platform} @@ -1469,6 +1507,424 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Fri Jan 5 2007 Jakub Jelinek 4.1.1-51.fc5 +- update from gcc-4_1-branch (-r120325:120507) + - PRs c++/30382, middle-end/27826, middle-end/28116, + tree-optimization/30212 + +* Thu Jan 4 2007 Jakub Jelinek 4.1.1-51 +- fix complex division with -std=c99 or -std=gnu99 (PR c/30360) + +* Wed Jan 3 2007 Jakub Jelinek 4.1.1-50 +- fix preprocessor defines in assembly preprocessed with -std=... + (Steven Bosscher, PR c/25993) +- fix PCH creation with templates (Jason Merrill, PR c++/28217) +- fix dwarf2out ICE (Alexandre Oliva, #217529, PR debug/30189) + +* Tue Jan 2 2007 Jakub Jelinek 4.1.1-49 +- update from gcc-4_1-branch (-r120062:120325) + - PRs debug/26964, fortran/30200, libfortran/30145 +- fix endless recursion in negate_expr/fold_unary (PR middle-end/30286) +- fix cpp problem on empty source files (Tom Tromey, PR preprocessor/30001) +- improve constructor disambiguation (Mark Mitchell, PR c++/28261, + PR c++/29535) +- fix handling of non-NULL attribute on nested functions (Andrew Pinski, + PR tree-opt/30045) +- fix ICE with friend templatized static member function (PR c++/29054) + +* Wed Dec 20 2006 Jakub Jelinek 4.1.1-48 +- update from gcc-4_1-branch (-r119833:120062) + - PRs libstdc++/11953 +- fix ia64 EH region boundaries where last br.call in the region + is not at the end of a bundle (#219596, PR target/30230) +- fix DI resp. TImode __sync_*_compare_and_swap on i?86 resp. x86_64 + (Kazu Hirata, #220258, PR target/27266) +- fix asm vs. nested functions or OpenMP (#220250, PRs middle-end/30262, + middle-end/30263) +- fix handling of complex shared OpenMP vars (Andrew Pinski, + PR middle-end/30143) + +* Thu Dec 14 2006 Jakub Jelinek 4.1.1-47 +- fix ia64 prologue generation (Andreas Schwab, #219594, PR target/29166) +- fix ppc64 divdi3 (PR target/30185) + +* Wed Dec 13 2006 Jakub Jelinek 4.1.1-46 +- update from gcc-4_1-branch (-r119654:119833) + - PRs c++/27316, c++/28740, c++/29732, fortran/29820, fortran/29821, + fortran/29912, fortran/29916, fortran/30003, libstdc++/26497, + libstdc++/28125, libstdc++/28265, target/30039 +- fix loop unswitching (Zdenek Dvorak, #219138, PR rtl-optimization/30113) + +* Fri Dec 8 2006 Jakub Jelinek 4.1.1-45 +- update from gcc-4_1-branch (-r119343:119654) + - PRs c++/14329, c++/28284, c++/29632, c++/29728, c++/29729, c++/29730, + c++/29733, c++/30022, libfortran/29810 +- add protoize.1 and unprotoize.1 man pages (#188914) +- fix RTL sharing problem in combine (#218603, PR rtl-optimization/27761) +- additions to libgcj-src (Ben Konrath, PR libgcj/30110) + +* Fri Dec 1 2006 Jakub Jelinek 4.1.1-44 +- fix OpenMP loops with 0 iterations (PR libgomp/29947) + +* Thu Nov 30 2006 Jakub Jelinek 4.1.1-43 +- update from gcc-4_1-branch (-r119167:119343) + - PRs c++/29022, fortran/29391, fortran/29489, fortran/29982, + libgfortran/29936, target/29319, tree-opt/29964 +- fix -fopenmp ICEs on omp constructs where the body never returns + (PR middle-end/29965) + +* Fri Nov 24 2006 Jakub Jelinek 4.1.1-42 +- update from gcc-4_1-branch (-r119021:119167) + - fix s390{,x} __sync_* builtins +- fix ppc64 libffi unwind info + +* Thu Nov 23 2006 Jakub Jelinek 4.1.1-41 +- fix ICE with -fopenmp -fexceptions on ia64 (#216988, PR c/29955) +- fix parsing of C++ if/switch/etc. conditions (PR c++/29886) + +* Wed Nov 22 2006 Jakub Jelinek 4.1.1-40 +- disallow multiple vector_size attributes (PR c/29736) +- don't ICE on main returning int with vector_size attribute (PR c++/29735) +- hide symbols that shouldn't be exported from libgcj.so (GC_*, ffi_*, + lt_* etc., #216120) + +* Tue Nov 20 2006 Jakub Jelinek 4.1.1-39 +- update from gcc-4_1-branch (-r118891:119021) + - PRs middle-end/26306, middle-end/29753, target/18553, target/29114, + target/29449, tree-opt/29788, tree-optimization/28888 +- fix some C++ vector conversions (PR c++/29734) +- fix C++ ICE with value dependent const brace enclosed initializer + (PR c++/29570) + +* Thu Nov 16 2006 Jakub Jelinek 4.1.1-38 +- update from gcc-4_1-branch (-r118805:118891) + - PRs rtl-optimization/29797 +- fix forwprop switch optimization (PR middle-end/29584) +- remove old *34* provides (#215839) + +* Tue Nov 14 2006 Jakub Jelinek 4.1.1-37 +- fix up check_effective_target_fopenmp tcl test for the testsuite + framework backport changes + +* Tue Nov 14 2006 Jakub Jelinek 4.1.1-36 +- update from gcc-4_1-branch (-r118571:118805) + - PRs c++/29106, c++/29518, fortran/24518, fortran/29216, fortran/29314, + fortran/29371, fortran/29387, fortran/29392, fortran/29490, + fortran/29565, fortran/29630, fortran/29679, fortran/29713, + middle-end/21032, testsuite/28703, tree-opt/28545 +- honor initial conditions and variable types in conversion to perfect + nesting for -ftree-loop-linear optimizations (#209297, + PR tree-optimization/29581) + +* Sat Nov 11 2006 Jakub Jelinek 4.1.1-35 +- fix libgcj_bc.so dummy lib on i?86/x86_64/ia64/s390/s390x + +* Sat Nov 11 2006 Jakub Jelinek 4.1.1-34 +- fix ICE on Fortran !$omp continued line followed by !$ conditional + line (PR fortran/29759) + +* Wed Nov 8 2006 Jakub Jelinek 4.1.1-33 +- update from gcc-4_1-branch (-r118468:118571) + - PRs fortran/24398, fortran/27701, fortran/29098, fortran/29115, + fortran/29211, fortran/29232, fortran/29364, fortran/29373, + fortran/29407, libfortran/29627, tree-optimization/29610 +- fix # handling in libcpp when switching + from system header to non-system header or main source + (PR preprocessor/29612) +- fix gcc configury detection of ld COMDAT support + +* Sat Nov 4 2006 Jakub Jelinek 4.1.1-32 +- update from gcc-4_1-branch (-r118025:118468) + - PRs bootstrap/28400, fortran/29067, libgfortran/29563, middle-end/29250, + rtl-optimization/28970, rtl-optimization/29631, target/29377, + tree-optimization/27891 + - fix infinite recursion in make_vector_type (#212848, + PR tree-optimization/29637) +- merge gomp fixes from the trunk (-r118133:118134) + - PR fortran/29629 +- fix A < 0 ? : 0 optimization (#213821, PR middle-end/29695) +- fix ICE in gfc_get_derived_type (Paul Thomas, #212936, PR fortran/29641) + +* Wed Oct 25 2006 Jakub Jelinek 4.1.1-31 +- update from gcc-4_1-branch (-r117629:118025) + - PRs c++/20647, c++/25878, c++/26884, c++/27787, c++/28506, c++/28906, + c++/29020, c++/29175, c++/29318, c++/29408, c++/29435, c/27184, + c/29092, fortran/25091, fortran/25092, fortran/29284, fortran/29321, + fortran/29322, fortran/29393, fortran/29403, gcov/profile/26570, + inline-asm/29119, middle-end/20491, rtl-optimization/29323, + target/25519, target/28825, target/28960, target/29300, + testsuite/28829, tree-optimization/26969 + - fix libstdc++.so backwards compatibility with GCC 3.4.x (#210452) +- fix always_inline attribute at -O0 (Jan Hubicka, PR middle-end/29241) +- fix function local static vars with used attribute (Jan Hubicka, + Richard Guenther, PR middle-end/29299) + +* Wed Oct 11 2006 Jakub Jelinek 4.1.1-30 +- update from gcc-4_1-branch (-r117464:117629) + - PRs c++/28302, c++/28349, c++/28450, c++/29002, libstdc++/29095, + libstdc++/29354, libstdc++/29368, target/28490 +- fix gnu.xml.transform.TransformerImpl (Tom Tromey, #208854, + PR classpath/29362) + +* Fri Oct 6 2006 Jakub Jelinek 4.1.1-29 +- update from gcc-4_1-branch (-r117266:117464) + - PRs bootstrap/26764, bootstrap/27334, c++/29080, c++/29138, c++/29226, + c/27489, c/27490, debug/28980, fortran/18791, libfortran/18791, + middle-end/28862, objc/29195, other/25035, tree-opt/28952 + - fix s390{,x} address legitimization with TLS symbols (Angel Nunez + Mencias) +- fix -fno-automatic with Fortran auto arrays with non-constant size + (#203928, PR fortran/28415) +- fix char and short __sync_fetch_and_XXX (PR target/28924) +- fix emitting of vector constants with incomplete initializers (PR c/29091) +- fix ICE with multiple exit loop and -ftree-loop-linear + (#208935, PR tree-optimization/29290) + +* Sat Sep 30 2006 Jakub Jelinek 4.1.1-28 +- fix i386/x86_64 legitimize_pic_address with TLS symbols (PR target/29198) +- fix gimplification of post-increment with side-effects on the inner + expression (PR c/29154) + +* Thu Sep 28 2006 Jakub Jelinek 4.1.1-27 +- update from gcc-4_1-branch (-r117225:117266) + - PR target/29230 +- restrict single entry mem{{,p}cpy,move,set} optimization to vars + and components thereof (PR middle-end/29272) + +* Tue Sep 26 2006 Jakub Jelinek 4.1.1-26 +- update from gcc-4_1-branch (-r117162:117225) + - PRs classpath/28661, libgcj/29178, libstdc++/29179, libstdc++/29224 + - fix unwind info generation, broken in gcc-4.1.1-21 + (Roger Sayle, PR debug/29132) + +* Sat Sep 23 2006 Jakub Jelinek 4.1.1-25 +- update from gcc-4_1-branch (-r117069:117162) + - PRs c++/28996, c++/29087, middle-end/26983 +- fix -fprofile-use with anonymous namespaces (Jan Hubicka, PRs profile/20815, + profile/26399) +- fix #pragma omp parallel and #pragma omp section that call nested + functions (PRs middle-end/25261, middle-end/28790) + +* Wed Sep 20 2006 Jakub Jelinek 4.1.1-24 +- update from gcc-4_1-branch (-r117000:117069) + - PRs fortran/21918, fortran/28526, fortran/28817, fortran/29060, + fortran/29101, middle-end/27226, middle-end/4520, + tree-optimization/28900 +- add support for Fortran OpenMP conditional inclusion (PR fortran/29097) +- add some -D_FORTIFY_SOURCE compile time strncat buffer overflow checks + +* Sun Sep 17 2006 Jakub Jelinek 4.1.1-23 +- update from gcc-4_1-branch (-r116958:117000) + - PRs fortran/29051, target/28946 +- fix single entry mem{{,p}cpy,move,set} optimization (Andrew Pinski, + PR tree-opt/29059) + +* Fri Sep 15 2006 Jakub Jelinek 4.1.1-22 +- update from gcc-4_1-branch (-r116778:116958) + - PRs ada/21952, ada/29025, c++/26957, fortran/28890, fortran/28923, + fortran/28959, libfortran/28890, libfortran/28923, libfortran/28947, + middle-end/28493, other/23541, other/26507, rtl-optimization/28243, + rtl-optimization/28634, rtl-optimization/28636, rtl-optimization/28726, + target/13685, target/26504, target/27537, target/27681, target/28621, + target/29006, testsuite/28950, testsuite/29007 +- fix #pragma omp atomic (PR middle-end/28046) +- speed up dominance frontiers calculation (Jan Hubicka) +- fix gcc-gfortran %%doc (#206333) +- fix gcc-debuginfo (#205500) + +* Fri Sep 8 2006 Jakub Jelinek 4.1.1-21 +- update from gcc-4_1-branch (-r116498:116778) + - PRs c++/19809, c++/26102, c++/26195, c++/26571, c++/26670, c++/26671, + c++/26696, c++/26917, c++/28860, c++/28878, c++/28886, fortran/20067, + fortran/24866, fortran/25077, fortran/25102, fortran/28005, + fortran/28873, fortran/28885, fortran/28908, libfortran/28005, + middle-end/27724, middle-end/28814, other/22313, + rtl-optimization/27616, rtl-optimization/28386, target/24367 +- add primitive class object symbols to libgcj_bc.so (Tom Tromey, + PR libgcj/28698) +- optimize single entry memcpy/mempcpy/memmove/memset already at the tree + level (PR middle-end/27567) +- add dependencies to *-devel subpackages, so that e.g. ppc64 + libstdc++-devel requires 64-bit libstdc++, similarly for libgcj-devel + and libgcj/zlib-devel + +* Fri Aug 25 2006 Jakub Jelinek 4.1.1-20 +- update from gcc-4_1-branch (-r116389:116498) + - PRs c++/28056, c++/28058, c++/28595, c++/28853, c/27558, + c/27893, c/28299, c/28418, driver/27622, libfortran/28452, + libfortran/28542, target/27075 +- optimize A / (B << N) where A and B is positive and B is a power of two + (Alan Modra, #195924, PR rtl-optimization/26026) +- fix attribute handling in C++ (Jason Merrill, #204277, #204035, + PRs c++/28659, c++/28863) + +* Fri Aug 25 2006 Jakub Jelinek 4.1.1-19 +- update from gcc-4_1-branch (-r116223:116389) + - PRs c++/23372, c++/27714, c++/28346, c++/28385, fortran/18111, + fortran/20886, fortran/25217, fortran/25828, fortran/28425, + fortran/28496, fortran/28601, fortran/28630, fortran/28660, + fortran/28735, fortran/28762, fortran/28771, fortran/28788, + libstdc++/28765, target/27565 +- fix ICE in add_reg_br_prob_note (PR middle-end/28683) + +* Fri Aug 18 2006 Jakub Jelinek 4.1.1-18 +- update from gcc-4_1-branch (-r116176:116223) + - PRs c++/28593, c++/28606, c++/28710, c/27697, middle-end/20256, + middle-end/25211, middle-end/26435 +- don't waste .rodata space when copying from const array with large + entries (PR middle-end/28755) +- fix --combine with anonymous structures in unions (Alexandre Oliva, + PR c/27898) +- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* + (#203001) + +* Wed Aug 16 2006 Jakub Jelinek 4.1.1-17 +- update from gcc-4_1-branch (-r116082:116176) + - PRs c++/27894, c++/28677, c/28649, middle-end/28075, + rtl-optimization/23454 +- merge gomp fixes from the trunk (-r116152:116154) + - PRs middle-end/28713, middle-end/28724 +- add -march=geode and -mtune=geode support (Vlad Makarov) +- use %gs rather than %fs register on x86_64 with + -mcmodel=kernel -fstack-protector (Arjan van de Ven, #202842) +- don't create jar manifest in libgcj-tools-4.*.jar (#200887) +- externally_visible attribute fixes (Jan Hubicka, PRs c/25795, c++/27369) +- --combine fixes for aggregates with attributes (PRs c/28706, c/28712) +- further externally_visible attr fixes (PR c/28744) +- fix invalid token pasting error message (PR preprocessor/28709) +- obey OpenMP 2.5 chapter 4 env var requirements (whitespace rules + and case insensitivity in the env vars; PR libgomp/28725) +- fix OPT_FLAGS on sparc + +* Sat Aug 12 2006 Jakub Jelinek 4.1.1-16 +- fix multilib conflict in libgcj-tools-4.1.1.jar (#200887) + +* Fri Aug 11 2006 Jakub Jelinek 4.1.1-15 +- update from gcc-4_1-branch (-r115877:116082) + - PRs c++/27508, c++/28148, c++/28250, c++/28256, c++/28257, c++/28259, + c++/28267, c++/28274, c++/28347, c++/28432, c++/28557, c++/28594, + c++/28637, c++/28638, c++/28639, c++/28640, c++/28641, c/27721, + c/28136, fortran/27981, fortran/28548, fortran/28590, + middle-end/28651, rtl-optimization/27291, rtl-optimization/28221, + target/27566, target/27827 +- fix Fortran ICE with nested function (Paul Thomas, #200618, + PR fortran/28600) + +* Wed Aug 2 2006 Jakub Jelinek 4.1.1-14 +- update from gcc-4_1-branch (-r115644:115877) + - PRs c++/27572, c++/27668, c++/27962, c++/28025, c++/28258, c++/28523, + debug/25468, fortran/20892, fortran/27874, fortran/28129, + fortran/28439, libgfortran/28335, libgfortran/28339, + middle-end/28402, middle-end/28403, middle-end/28473, + target/27287, target/28247, tree-optimization/26719, + tree-optimization/27639, tree-optimization/27795, + tree-optimization/28029, tree-optimization/28238 +- BuildRequire firefox-devel instead of mozilla-devel + +* Tue Jul 25 2006 Alexandre Oliva 4.1.1-13 +- backport fix by Andrew Haley for build problems related with the + bootstrap ClassLoader + +* Mon Jul 24 2006 Alexandre Oliva 4.1.1-12 +- backport fix by Mark Wielaard for NullPointerException in GCJ web plugin + +* Fri Jul 21 2006 Jakub Jelinek 4.1.1-11 +- update from gcc-4_1-branch (-r115565:115644) + - PRs target/27363, c++/27495, c++/28048, c++/28235, c++/28337, c++/28338, + c++/28363, middle-end/28283 + +* Tue Jul 18 2006 Jakub Jelinek 4.1.1-9 +- update from gcc-4_1-branch (-r115330:115565) + - PRs c++/28016, c++/28051, c++/28249, c++/28291, c++/28294, c++/28304, + c++/28343, c/26993, c/28286, fortran/20844, fortran/20893, + fortran/20903, fortran/25097, fortran/27980, fortran/28201, + fortran/28353, fortran/28384, libstdc++/27878, + tree-optimization/19505, tree-optimization/28162, + tree-optimization/28187 +- fix directory traversal issue in fastjar (Richard Guenther, CVE-2006-3619, + PR fastjar/28359) +- fix ICE on complex assignment in nested fn (Richard Henderson, + PR middle-end/27889) +- fix __builtin_constant_p in initializers (Mark Shinwell, #198849) +- fix tree verification - IDENTIFIER_NODE can be shared (Diego Novillo) +- fix duplicate_eh_regions +- handle > 99 tree dumps in the testsuite + +* Sat Jul 15 2006 Jakub Jelinek 4.1.1-8 +- fix handling of C++ template static data members in anonymous namespace + (PR c++/28370) +- fix Fortran OpenMP handling of !$omp parallel do with lastprivate on the + iteration variable (PR fortran/28390) +- backported reassociation pass rewrite (Daniel Berlin, Jeff Law, + Roger Sayle, Peter Bergner, PRs ada/24994, tree-optimization/26854) +- BuildReq sharutils for uuencode + +* Tue Jul 11 2006 Jakub Jelinek 4.1.1-7 +- update from gcc-4_1-branch (-r115058:115330) + - PRs c++/13983, c++/17519, c++/18681, c++/18698, c++/26577, c++/27019, + c++/27424, c++/27768, c++/27820, c++/28114, fortran/23420, + fortran/23862, fortran/24748, fortran/26801, fortran/27965, + fortran/28081, fortran/28094, fortran/28167, fortran/28174, + fortran/28213, fortran/28237, middle-end/27428, target/28084, + target/28207, tree-optimization/28218 +- fix ppc insvdi_internal2/3 (David Edelsohn, Alan Modra, #197755, + PR target/28170) +- avoid TFmode PRE_INC/PRE_DEC on ppc (David Edelsohn, PR target/28150) + +* Thu Jun 29 2006 Jakub Jelinek 4.1.1-6 +- update from gcc-4_1-branch (-r114766:115058) + - PRs c++/27821, c++/28109, c++/28110, c++/28112, fortran/16206, + fortran/18769, fortran/19310, fortran/19904, fortran/20867, + fortran/20874, fortran/20876, fortran/22038, fortran/25049, + fortran/25050, fortran/25056, fortran/25073, fortran/27554, + fortran/27715, fortran/27784, fortran/27895, fortran/27958, + fortran/28118, fortran/28119, libfortran/27784, libfortran/27895, + libgcj/28178, middle-end/28045, middle-end/28151, target/27082, + target/27861, tree-optimization/27781 +- fix a reload problem that lead sometimes to writes to read-only objects + (Bernd Schmidt, #196736, PR middle-end/26991, PR rtl-optimization/25636) +- ppc -mcpu=power6 initial support (Pete Steinmetz, #195924) + +* Tue Jun 20 2006 Jakub Jelinek 4.1.1-5 +- fix C++ #pragma omp atomic (Mark Mitchell) + +* Mon Jun 19 2006 Jakub Jelinek 4.1.1-4 +- update from gcc-4_1-branch (-r114555:114766) + - PRs bootstrap/22541, c++/21210, c++/26559, c++/27227, c++/27648, + c++/27665, c++/27666, c++/27689, c++/27884, c++/27933, c++/27951, + fortran/27786, java/28024, middle-end/27733, middle-end/27802, + target/27858, tree-optimization/27830 +- merge gomp changes from the trunk (-r114642:114643) + - PR libgomp/28008 +- fix -fmerge-all-constants +- fix #pragma omp critical handling if not --enable-linux-futex + +* Tue Jun 13 2006 Jakub Jelinek 4.1.1-3 +- add BuildRequires for elfutils-devel on ia64 +- fix a reload bug visible on s390x (Andreas Krebbel, #193912, + PR middle-end/27959) + +* Mon Jun 12 2006 Jakub Jelinek 4.1.1-2 +- update from gcc-4_1-branch (-r114107:114555) + - PRs ada/27769, c++/20173, c++/26068, c++/26433, c++/26496, c++/27177, + c++/27385, c++/27447, c++/27451, c++/27601, c++/27713, c++/27716, + c++/27722, c++/27801, c++/27806, c++/27807, c++/27819, c/25161, + c/26818, c/27020, c/27718, fortran/14067, fortran/16943, + fortran/18003, fortran/19015, fortran/19777, fortran/20839, + fortran/20877, fortran/23091, fortran/23151, fortran/24168, + fortran/24558, fortran/25047, fortran/25058, fortran/25082, + fortran/25090, fortran/25098, fortran/25147, fortran/25746, + fortran/26551, fortran/27155, fortran/27320, fortran/27411, + fortran/27449, fortran/27470, fortran/27524, fortran/27552, + fortran/27584, fortran/27613, fortran/27655, fortran/27662, + fortran/27709, fortran/27897, libgcj/26483, libgfortran/24459, + libgfortran/27757, middle-end/27743, middle-end/27793, + target/25758, target/26223, target/27790, target/27842, + testsuite/27705, tree-optimization/26242, tree-optimization/26622 +- merge gomp changes from the trunk (-r114518:114520 and -r114524:114525) + - PRs preprocessor/27746, c/27747, c++/27748, fortran/27916 +- don't generate decls with the same DECL_UID in C++ FE (PR middle-end/27793) + * Thu May 25 2006 Jakub Jelinek 4.1.1-1.fc5 - update from gcc-4_1-branch (-r113848:114107) - GCC 4.1.1 release Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/sources,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- sources 25 May 2006 20:50:25 -0000 1.144 +++ sources 7 Jan 2007 22:08:06 -0000 1.145 @@ -1 +1 @@ -5d866ef97be7903a6fc3ab28c0f39e50 gcc-4.1.1-20060525.tar.bz2 +7a420c5a8dc3fee9f99b4264e2add137 gcc-4.1.1-20070107.tar.bz2 --- gcc41-ppc64-ldouble-stdarg.patch DELETED --- --- gcc41-pr26881.patch DELETED --- --- gcc41-pr26885.patch DELETED --- --- gcc41-pr27532.patch DELETED --- --- gcc41-pr27758.patch DELETED --- --- gcc41-sw2438.patch DELETED --- --- gcc41-x86_64-sse3.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 7 22:25:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 17:25:47 -0500 Subject: rpms/gcc/FC-5 gcc41-java-libdotdotlib.patch,1.1,1.2 Message-ID: <200701072225.l07MPls2011726@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11708 Modified Files: gcc41-java-libdotdotlib.patch Log Message: 4.1.1-51.fc5 gcc41-java-libdotdotlib.patch: configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) Index: gcc41-java-libdotdotlib.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41-java-libdotdotlib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-java-libdotdotlib.patch 7 Jan 2007 22:08:06 -0000 1.1 +++ gcc41-java-libdotdotlib.patch 7 Jan 2007 22:25:45 -0000 1.2 @@ -4,9 +4,9 @@ to /lib. * configure: Rebuilt. ---- libjava/configure.ac.jj 2006-07-20 14:01:02.000000000 +0200 -+++ libjava/configure.ac 2006-07-20 16:36:31.000000000 +0200 -@@ -1262,6 +1262,7 @@ case ${version_specific_libs} in +--- libjava/configure.ac.jj 2006-12-22 12:39:58.000000000 +0100 ++++ libjava/configure.ac 2007-01-07 23:24:11.000000000 +0100 +@@ -1255,6 +1255,7 @@ case ${version_specific_libs} in multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. @@ -14,20 +14,17 @@ *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; esac ;; -@@ -1278,6 +1279,10 @@ case $multi_os_directory in - dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /. - ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`" - ;; -+ ../lib*) -+ dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))' -+ ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" -+ ;; - *) - dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' - ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" ---- libjava/configure.jj 2006-07-20 14:01:02.000000000 +0200 -+++ libjava/configure 2006-07-20 16:45:24.000000000 +0200 -@@ -14863,6 +14864,7 @@ case ${version_specific_libs} in +@@ -1267,6 +1268,7 @@ AC_SUBST(toolexeclibdir) + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. ++ ../lib*) dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))' ;; + *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; + esac + AC_SUBST(dbexecdir) +--- libjava/configure.jj 2006-12-22 12:39:58.000000000 +0100 ++++ libjava/configure 2007-01-07 23:24:35.000000000 +0100 +@@ -14834,6 +14834,7 @@ case ${version_specific_libs} in multi_os_directory=`$CC -print-multi-os-directory` case $multi_os_directory in .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /. @@ -35,14 +32,11 @@ *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;; esac ;; -@@ -14879,6 +14881,10 @@ case $multi_os_directory in - dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /. - ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`" - ;; -+ ../lib*) -+ dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))' -+ ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" -+ ;; - *) - dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' - ac_configure_args="$ac_configure_args --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat $srcdir/../gcc/BASE-VER`" +@@ -14846,6 +14847,7 @@ esac + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. ++ ../lib*) dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory'/gcj-$(gcc_version))' ;; + *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; + esac + From fedora-cvs-commits at redhat.com Sun Jan 7 22:35:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 17:35:03 -0500 Subject: rpms/gcc/FC-5 gcc41.spec,1.48,1.49 Message-ID: <200701072235.l07MZ3Do028034@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27990 Modified Files: gcc41.spec Log Message: 4.1.1-51.fc5 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gcc41.spec 7 Jan 2007 22:08:06 -0000 1.48 +++ gcc41.spec 7 Jan 2007 22:35:01 -0000 1.49 @@ -445,7 +445,7 @@ %patch28 -p0 -b .strncat-chk~ %patch29 -p0 -b .pr29703~ %patch30 -p0 -b .pr29299~ -%patch31 -p0 -b .libjava-anonverscript~ +#%patch31 -p0 -b .libjava-anonverscript~ %patch32 -p0 -b .ppc64-libffi-unwind~ %patch33 -p0 -b .pr30113~ %patch34 -p0 -b .pr30110~ From fedora-cvs-commits at redhat.com Sun Jan 7 22:43:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 17:43:16 -0500 Subject: rpms/gcc/FC-5 gcc41.spec,1.49,1.50 gcc41-rh192700.patch,1.1,NONE Message-ID: <200701072243.l07MhGc9001923@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1881 Modified Files: gcc41.spec Removed Files: gcc41-rh192700.patch Log Message: 4.1.1-51.fc5 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gcc41.spec 7 Jan 2007 22:35:01 -0000 1.49 +++ gcc41.spec 7 Jan 2007 22:43:14 -0000 1.50 @@ -141,7 +141,6 @@ Patch100: gcc41-pr21764.patch Patch101: gcc41-pr21581.patch Patch102: gcc41-java-pr13212.patch -Patch103: gcc41-rh192700.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -456,7 +455,6 @@ %patch100 -p0 -b .pr21764~ #%patch101 -p0 -b .pr21581~ %patch102 -p0 -b .java-pr13212~ -%patch103 -p0 -b .rh192700~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c --- gcc41-rh192700.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 7 22:47:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 17:47:46 -0500 Subject: rpms/gdb/devel gdbcompare,1.1,1.2 Message-ID: <200701072247.l07MlkRi025719@cvs.devel.redhat.com> Author: jkratoch Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25398 Modified Files: gdbcompare Log Message: Properly sort both the versioned and the scratch builds against each other. Index: gdbcompare =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdbcompare,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdbcompare 12 Dec 2006 22:56:16 -0000 1.1 +++ gdbcompare 7 Jan 2007 22:47:44 -0000 1.2 @@ -25,7 +25,8 @@ system("rm -f tests/gdbcompare-*.diff") and die; for my $arch (sort keys(%arch)) { - my @sorted=sort { ($a=~/([-.])[^-.]+[.]\w+$/)[0] cmp ($b=~/([-.])[^-.]+[.]\w+$/)[0];; } @{$arch{$arch}}; + sub trans { return {"."=>0,"-"=>1}->{($_[0]=~/([-.])[^-.]+[.]\w+$/)[0]}.$_[0]; }; + my @sorted=sort { my $a1=trans $a; my $b1=trans $b; $b1 cmp $a1; } @{$arch{$arch}}; do { system $_ and die $_; } for "diff -u tests/'".$sorted[1]."' tests/'".$sorted[0]."' >tests/gdbcompare-'$arch'.diff;true"; } From fedora-cvs-commits at redhat.com Sun Jan 7 23:07:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 18:07:14 -0500 Subject: rpms/gnome-python2/devel .cvsignore, 1.21, 1.22 gnome-python.spec, 1.54, 1.55 sources, 1.21, 1.22 Message-ID: <200701072307.l07N7EXf007869@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7738 Modified Files: .cvsignore gnome-python.spec sources Log Message: * Sun Jan 07 2007 Matthew Barnes - 2.17.1-1 - Update to 2.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 6 Nov 2006 01:32:17 -0000 1.21 +++ .cvsignore 7 Jan 2007 23:07:12 -0000 1.22 @@ -1 +1 @@ -gnome-python-2.16.2.tar.bz2 +gnome-python-2.17.1.tar.bz2 Index: gnome-python.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- gnome-python.spec 1 Jan 2007 01:53:27 -0000 1.54 +++ gnome-python.spec 7 Jan 2007 23:07:12 -0000 1.55 @@ -6,8 +6,8 @@ ### Abstract ### Name: gnome-python2 -Version: 2.16.2 -Release: 5%{?dist} +Version: 2.17.1 +Release: 1%{?dist} License: LGPL Group: Development/Languages Summary: The sources for the PyGNOME Python extension module @@ -198,6 +198,9 @@ rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo} %changelog +* Sun Jan 07 2007 Matthew Barnes - 2.17.1-1 +- Update to 2.17.1 + * Sun Dec 31 2006 Matthew Barnes - 2.16.2-5 - Bonobo subpackage requires pyorbit >= 2.0.1, not 2.0.l (RH bug #150885). Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 6 Nov 2006 01:32:17 -0000 1.21 +++ sources 7 Jan 2007 23:07:12 -0000 1.22 @@ -1 +1 @@ -b365a772c8c9eac24b368c7e26845dc8 gnome-python-2.16.2.tar.bz2 +a11fa983a7d6d2b6adc5efec7ba3aaa8 gnome-python-2.17.1.tar.bz2 From fedora-cvs-commits at redhat.com Sun Jan 7 23:55:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 18:55:10 -0500 Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.9, 1.10 gnome-python-desktop.spec, 1.24, 1.25 sources, 1.9, 1.10 Message-ID: <200701072355.l07NtAFB030546@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30531 Modified Files: .cvsignore gnome-python-desktop.spec sources Log Message: * Sun Jan 07 2007 Matthew Barnes - 2.17.2-1 - Update to 2.17.2 - New gnome-python2-bugbuddy subpackage. - Update version requirements to match configure.ac. - Use python_sitearch macro for installing libraries. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Oct 2006 00:55:03 -0000 1.9 +++ .cvsignore 7 Jan 2007 23:55:07 -0000 1.10 @@ -1 +1 @@ -gnome-python-desktop-2.17.1.tar.bz2 +gnome-python-desktop-2.17.2.tar.bz2 Index: gnome-python-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnome-python-desktop.spec 7 Dec 2006 19:58:59 -0000 1.24 +++ gnome-python-desktop.spec 7 Jan 2007 23:55:07 -0000 1.25 @@ -1,40 +1,54 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%define bug_buddy_version 2.16.0 %define glib_version 2.6.0 -%define gtk_version 2.4.0 +%define gnome_desktop_version 2.10.0 +%define gnome_keyring_version 0.5.0 +%define gnome_media_version 2.12.0 %define gnome_panel_version 2.2.0 -%define gnome_python_version 2.9.0 +%define gnome_python_version 2.10.0 +%define gtk_version 2.4.0 %define gtksourceview_version 1.1.90 -%define libwnck_version 2.8.0 -%define libgtop_version 2.9.5 +%define libgtop_version 2.13.0 +%define librsvg2_version 2.13.93 +%define libwnck_version 2.15.5 +%define metacity_version 2.17.0 %define nautilus_cd_burner_version 2.15.3 -%define gnome_media_version 2.12.0 -%define nautilus_version 2.12.0 -%define metacity_version 2.15.5 +%define pygtk_version 2.10.3 +%define totem_version 1.4.0 + +### Abstract ### -Summary: The sources for additional PyGNOME Python extension modules for the GNOME desktop Name: gnome-python2-desktop -Version: 2.17.1 -Release: 2%{?dist} +Version: 2.17.2 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Languages -Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-desktop/2.13/gnome-python-desktop-%{version}.tar.bz2 - +Summary: The sources for additional PyGNOME Python extension modules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Source: gnome-python-desktop-%{version}.tar.bz2 + +### Dependencies ### Requires: gnome-python2 >= %{gnome_python_version} + +### Build Dependencies ### + BuildRequires: glib2-devel >= %{glib_version} -BuildRequires: gtk2-devel >= %{gtk_version} -BuildRequires: pygtk2-devel >= %{gtk_version} -BuildRequires: gnome-python2-devel >= %{gnome_python_version} +BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} +BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} -BuildRequires: libgnomeprintui22-devel +BuildRequires: gnome-python2-devel >= %{gnome_python_version} +BuildRequires: gtk2-devel >= %{gtk_version} BuildRequires: gtksourceview-devel >= %{gtksourceview_version} -BuildRequires: libwnck-devel >= %{libwnck_version} +BuildRequires: libgnomeprintui22-devel BuildRequires: libgtop2-devel >= %{libgtop_version} -BuildRequires: totem-devel -BuildRequires: python-devel +BuildRequires: librsvg2-devel >= %{librsvg2_version} +BuildRequires: libwnck-devel >= %{libwnck_version} BuildRequires: metacity >= %{metacity_version} -BuildRequires: librsvg2-devel -BuildRequires: gnome-desktop-devel +BuildRequires: pygtk2-devel >= %{pygtk_version} +BuildRequires: python-devel +BuildRequires: totem-devel >= %{totem_version} %ifnarch s390 s390x BuildRequires: gnome-media-devel >= %{gnome_media_version} BuildRequires: nautilus-cd-burner-devel >= %{nautilus_cd_burner_version} @@ -44,11 +58,10 @@ The gnome-python-desktop package contains the source packages for additional Python bindings for GNOME. It should be used together with gnome-python. - %package -n gnome-python2-applet -Requires: %{name} = %{version}-%{release} Summary: Python bindings for GNOME Panel applets. Group: Development/Languages +Requires: %{name} = %{version}-%{release} # applets from GNOME 1.4 are no longer supported - we only have 1 panel Obsoletes: pygnome-applet @@ -56,45 +69,52 @@ This module contains a wrapper that allows GNOME Panel applets to be written in Python. +%package -n gnome-python2-bugbuddy +Summary: Python bindings for interacting with bug-buddy +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: bug-buddy >= %{bug_buddy_version} + +%description -n gnome-python2-bugbuddy +This module contains a wrapper that allows the use of bug-buddy via +Python. %package -n gnome-python2-gnomeprint -Requires: %{name} = %{version}-%{release} Summary: Python bindings for interacting with libgnomeprint Group: Development/Languages -Requires: libgnomeprint22, libgnomeprintui22 +Requires: %{name} = %{version}-%{release} +Requires: libgnomeprint22 +Requires: libgnomeprintui22 %description -n gnome-python2-gnomeprint This module contains a wrapper that allows the use of libgnomeprint via Python. - %package -n gnome-python2-gtksourceview -Requires: %{name} = %{version}-%{release} Summary: Python bindings for interacting with the gtksourceview library Group: Development/Languages -Requires: gtksourceview >= %{gtksourceview_version} +Requires: %{name} = %{version}-%{release} +Requires: gtksourceview >= %{gtksourceview_version} Requires: gnome-python2-gnomeprint %description -n gnome-python2-gtksourceview This module contains a wrapper that allows the use of gtksourceview via Python. - %package -n gnome-python2-libwnck Summary: Python bindings for interacting with libwnck Group: Development/Languages -Requires: libwnck >= %{libwnck_version} +Requires: libwnck >= %{libwnck_version} %description -n gnome-python2-libwnck This module contains a wrapper that allows the use of libwnck via Python. - %package -n gnome-python2-libgtop2 -Requires: %{name} = %{version}-%{release} Summary: Python bindings for interacting with libgtop Group: Development/Languages -Requires: libgtop2 >= %{libgtop_version} +Requires: %{name} = %{version}-%{release} +Requires: libgtop2 >= %{libgtop_version} %description -n gnome-python2-libgtop2 This module contains a wrapper that allows the use of libgtop via @@ -102,10 +122,10 @@ %ifnarch s390 s390x %package -n gnome-python2-nautilus-cd-burner -Requires: %{name} = %{version}-%{release} Summary: Python bindings for interacting with nautilus-cd-burner Group: Development/Languages -Requires: nautilus-cd-burner >= %{nautilus_cd_burner_version} +Requires: %{name} = %{version}-%{release} +Requires: nautilus-cd-burner >= %{nautilus_cd_burner_version} %description -n gnome-python2-nautilus-cd-burner This module contains a wrapper that allows the use of nautilus-cd-burner @@ -113,48 +133,49 @@ %endif %package -n gnome-python2-metacity -Requires: %{name} = %{version}-%{release} Summary: Python bindings for interacting with metacity Group: Development/Languages -Requires: metacity >= %{metacity_version} +Requires: %{name} = %{version}-%{release} +Requires: metacity >= %{metacity_version} %description -n gnome-python2-metacity This module contains a wrapper that allows the use of metacity via Python. %package -n gnome-python2-totem -Requires: %{name} = %{version}-%{release} Summary: Python bindings for interacting with totem Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: totem >= %{totem_version} %description -n gnome-python2-totem This module contains a wrapper that allows the use of totem via Python. %package -n gnome-python2-rsvg -Requires: librsvg2 Summary: Python bindings for interacting with librsvg Group: Development/Languages +Requires: librsvg2 >= %{librsvg2_version} %description -n gnome-python2-rsvg This module contains a wrapper that allows the use of librsvg via Python. %package -n gnome-python2-gnomedesktop -Requires: %{name} = %{version}-%{release} -Requires: gnome-desktop Summary: Python bindings for interacting with gnome-desktop Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: gnome-desktop >= %{gnome_desktop_version} %description -n gnome-python2-gnomedesktop This module contains a wrapper that allows the use of gnome-desktop via Python. %package -n gnome-python2-gnomekeyring -Requires: %{name} = %{version}-%{release} -Requires: gnome-keyring Summary: Python bindings for interacting with gnome-keyring Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: gnome-keyring >= %{gnome_keyring_version} %description -n gnome-python2-gnomekeyring This module contains a wrapper that allows the use of gnome-keyring @@ -178,7 +199,6 @@ %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS @@ -187,68 +207,71 @@ %files -n gnome-python2-applet %defattr(-,root,root,-) -%dir %{_libdir}/python?.?/site-packages/gtk-2.0/gnome/applet.* -%{_libdir}/python?.?/site-packages/gtk-2.0/gnomeapplet.so +%dir %{python_sitearch}/gtk-2.0/gnome/applet.* +%{python_sitearch}/gtk-2.0/gnomeapplet.so +%files -n gnome-python2-bugbuddy +%defattr(-,root,root,-) +%{python_sitearch}/gtk-2.0/bugbuddy.py* %files -n gnome-python2-gnomeprint %defattr(-,root,root,-) -%{_libdir}/python?.?/site-packages/gtk-2.0/gnomeprint/ +%{python_sitearch}/gtk-2.0/gnomeprint/ %{_datadir}/gtk-doc/html/pygnomeprint %{_datadir}/gtk-doc/html/pygnomeprintui %defattr(644,root,root,755) %doc ../gnome-python-desktop-%{version}/examples/gnomeprint/* - %files -n gnome-python2-gtksourceview %defattr(-,root,root,-) -%{_libdir}/python?.?/site-packages/gtk-2.0/gtksourceview.so +%{python_sitearch}/gtk-2.0/gtksourceview.so %{_datadir}/gtk-doc/html/pygtksourceview %defattr(644,root,root,755) %doc ../gnome-python-desktop-%{version}/examples/gtksourceview/* - %files -n gnome-python2-libwnck %defattr(-,root,root,-) -%{_libdir}/python?.?/site-packages/gtk-2.0/wnck.so - +%{python_sitearch}/gtk-2.0/wnck.so %files -n gnome-python2-libgtop2 %defattr(-,root,root,-) -%{_libdir}/python?.?/site-packages/gtk-2.0/gtop.so - +%{python_sitearch}/gtk-2.0/gtop.so %ifnarch s390 s390x %files -n gnome-python2-nautilus-cd-burner %defattr(-,root,root,-) -%{_libdir}/python?.?/site-packages/gtk-2.0/nautilusburn.so +%{python_sitearch}/gtk-2.0/nautilusburn.so %defattr(644,root,root,755) %doc ../gnome-python-desktop-%{version}/examples/nautilusburn/* %endif - %files -n gnome-python2-metacity %defattr(-,root,root,-) -%{_libdir}/python?.?/site-packages/gtk-2.0/metacity.so - +%{python_sitearch}/gtk-2.0/metacity.so %files -n gnome-python2-totem %defattr(-,root,root,-) %ifnarch s390 s390x -%{_libdir}/python?.?/site-packages/gtk-2.0/mediaprofiles.so +%{python_sitearch}/gtk-2.0/mediaprofiles.so %endif -%{_libdir}/python?.?/site-packages/gtk-2.0/totem +%{python_sitearch}/gtk-2.0/totem %files -n gnome-python2-rsvg -%{_libdir}/python?.?/site-packages/gtk-2.0/rsvg.so +%{python_sitearch}/gtk-2.0/rsvg.so %files -n gnome-python2-gnomedesktop -%{_libdir}/python?.?/site-packages/gtk-2.0/gnomedesktop +%{python_sitearch}/gtk-2.0/gnomedesktop %files -n gnome-python2-gnomekeyring -%{_libdir}/python?.?/site-packages/gtk-2.0/gnomekeyring.so +%{python_sitearch}/gtk-2.0/gnomekeyring.so %changelog +* Sun Jan 07 2007 Matthew Barnes - 2.17.2-1 +- Update to 2.17.2 +- New gnome-python2-bugbuddy subpackage. +- Update version requirements to match configure.ac. +- Use python_sitearch macro for installing libraries. + * Thu Dec 7 2006 Jeremy Katz - 2.17.1-2 - rebuild for python 2.5 - BR gnome-python2-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Oct 2006 00:55:03 -0000 1.9 +++ sources 7 Jan 2007 23:55:07 -0000 1.10 @@ -1 +1 @@ -ad8cef1adbda96790e86c78b9c0f8e3b gnome-python-desktop-2.17.1.tar.bz2 +3c6fa24860ae4604b118f59cd48adccf gnome-python-desktop-2.17.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 8 01:41:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 20:41:24 -0500 Subject: rpms/kernel/devel/configs config-x86-generic,1.73,1.74 Message-ID: <200701080141.l081fOVI017110@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17073/configs Modified Files: config-x86-generic Log Message: rc4 Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- config-x86-generic 13 Dec 2006 21:35:14 -0000 1.73 +++ config-x86-generic 8 Jan 2007 01:41:22 -0000 1.74 @@ -306,6 +306,7 @@ # CONFIG_PARAVIRT is not set CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x400000 +CONFIG_PHYSICAL_START=0x1000000 CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y From fedora-cvs-commits at redhat.com Mon Jan 8 01:41:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 20:41:24 -0500 Subject: rpms/kernel/devel patch-2.6.20-rc4.bz2.sign, NONE, 1.1 .cvsignore, 1.560, 1.561 kernel-2.6.spec, 1.2905, 1.2906 linux-2.6-compile-fixes.patch, 1.130, 1.131 sources, 1.523, 1.524 upstream, 1.451, 1.452 patch-2.6.20-rc3-git4.bz2.sign, 1.1, NONE patch-2.6.20-rc3.bz2.sign, 1.1, NONE Message-ID: <200701080141.l081fO5B017099@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17073 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-compile-fixes.patch sources upstream Added Files: patch-2.6.20-rc4.bz2.sign Removed Files: patch-2.6.20-rc3-git4.bz2.sign patch-2.6.20-rc3.bz2.sign Log Message: rc4 --- NEW FILE patch-2.6.20-rc4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFoJUsyGugalF9Dw4RAik2AJ4zh2A2v2BjmS9/o7/hmpxCxHE/rACfT5SK WZH0iZ4E2ZJiLAUkoPA/3oA= =N5H4 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.560 retrieving revision 1.561 diff -u -r1.560 -r1.561 --- .cvsignore 6 Jan 2007 18:20:16 -0000 1.560 +++ .cvsignore 8 Jan 2007 01:41:21 -0000 1.561 @@ -4,5 +4,4 @@ kernel-2.6.19 xen-11633.tar.bz2 linux-2.6.19.tar.bz2 -patch-2.6.20-rc3.bz2 -patch-2.6.20-rc3-git4.bz2 +patch-2.6.20-rc4.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2905 retrieving revision 1.2906 diff -u -r1.2905 -r1.2906 --- kernel-2.6.spec 6 Jan 2007 18:20:16 -0000 1.2905 +++ kernel-2.6.spec 8 Jan 2007 01:41:21 -0000 1.2906 @@ -300,8 +300,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.20-rc3.bz2 -Patch2: patch-2.6.20-rc3-git4.bz2 +Patch1: patch-2.6.20-rc4.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -773,7 +772,6 @@ # Update to latest upstream. %patch1 -p1 -%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -1990,6 +1988,9 @@ # - tux. %changelog +* Sun Jan 7 2007 Dave Jones +- 2.6.20rc4 + * Sat Jan 6 2007 Dave Jones - 2.6.20rc3-git4 linux-2.6-compile-fixes.patch: linux-2.6.19.noarch/include/asm-powerpc/io.h | 1 + linux-2.6.19.ppc64iseries/arch/powerpc/lib/locks.c | 4 ++++ 2 files changed, 5 insertions(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- linux-2.6-compile-fixes.patch 6 Jan 2007 18:20:16 -0000 1.130 +++ linux-2.6-compile-fixes.patch 8 Jan 2007 01:41:21 -0000 1.131 @@ -5,25 +5,6 @@ # to do a compile to figure out what your diff is fixing. Thanks. # -drivers/macintosh/via-pmu.c: In function 'pmac_suspend_devices': -drivers/macintosh/via-pmu.c:2014: error: implicit declaration of function 'pm_prepare_console' -drivers/macintosh/via-pmu.c: In function 'pmac_wakeup_devices': -drivers/macintosh/via-pmu.c:2139: error: implicit declaration of function 'pm_restore_console' - -Signed-off-by: Dave Jones - ---- linux-2.6.19.noarch/drivers/macintosh/via-pmu.c~ 2006-12-12 11:18:03.000000000 -0500 -+++ linux-2.6.19.noarch/drivers/macintosh/via-pmu.c 2006-12-12 11:18:33.000000000 -0500 -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - #include - #include - #include - - #drivers/ieee1394/sbp2.c: In function 'sbp2_prep_command_orb_sg': #drivers/ieee1394/sbp2.c:1473: error: implicit declaration of function 'sg_dma_len' Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.523 retrieving revision 1.524 diff -u -r1.523 -r1.524 --- sources 6 Jan 2007 18:20:16 -0000 1.523 +++ sources 8 Jan 2007 01:41:21 -0000 1.524 @@ -1,4 +1,3 @@ 93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 -69e8bfe3fbba5931833e7f6da51f6186 patch-2.6.20-rc3.bz2 -0ebd23abb7226d13533a9da9134bdc4c patch-2.6.20-rc3-git4.bz2 +9b325c6086ad2a3fcde643f01a4c4640 patch-2.6.20-rc4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.451 retrieving revision 1.452 diff -u -r1.451 -r1.452 --- upstream 6 Jan 2007 18:20:16 -0000 1.451 +++ upstream 8 Jan 2007 01:41:21 -0000 1.452 @@ -1,3 +1,2 @@ linux-2.6.19.tar.bz2 -patch-2.6.20-rc3.bz2 -patch-2.6.20-rc3-git4.bz2 +patch-2.6.20-rc4.bz2 --- patch-2.6.20-rc3-git4.bz2.sign DELETED --- --- patch-2.6.20-rc3.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 02:00:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 21:00:18 -0500 Subject: rpms/kernel/FC-6 linux-2.6-sata-promise-pata-ports.patch, 1.4, 1.5 kernel-2.6.spec, 1.2889, 1.2890 Message-ID: <200701080200.l0820Ikh005330@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5287 Modified Files: kernel-2.6.spec Added Files: linux-2.6-sata-promise-pata-ports.patch Log Message: re-add PATA on Promise SATA linux-2.6-sata-promise-pata-ports.patch: drivers/ata/libata-core.c | 4 +-- drivers/ata/sata_promise.c | 48 +++++++++++++++++++++++++++++++++++++++------ include/linux/libata.h | 2 - 3 files changed, 45 insertions(+), 9 deletions(-) Index: linux-2.6-sata-promise-pata-ports.patch =================================================================== RCS file: linux-2.6-sata-promise-pata-ports.patch diff -N linux-2.6-sata-promise-pata-ports.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-sata-promise-pata-ports.patch 8 Jan 2007 02:00:11 -0000 1.5 @@ -0,0 +1,159 @@ +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index 915a55a..d0ab733 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -5298,13 +5298,13 @@ void ata_port_init(struct ata_port *ap, + ap->pio_mask = ent->pinfo2->pio_mask; + ap->mwdma_mask = ent->pinfo2->mwdma_mask; + ap->udma_mask = ent->pinfo2->udma_mask; +- ap->flags |= ent->pinfo2->flags; ++ ap->flags |= ent->pinfo2->flags | ent->_port_flags[port_no]; + ap->ops = ent->pinfo2->port_ops; + } else { + ap->pio_mask = ent->pio_mask; + ap->mwdma_mask = ent->mwdma_mask; + ap->udma_mask = ent->udma_mask; +- ap->flags |= ent->port_flags; ++ ap->flags |= ent->port_flags | ent->_port_flags[port_no]; + ap->ops = ent->port_ops; + } + ap->hw_sata_spd_limit = UINT_MAX; +diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c +index 72eda51..543e6a4 100644 +--- a/drivers/ata/sata_promise.c ++++ b/drivers/ata/sata_promise.c +@@ -175,7 +175,7 @@ static const struct ata_port_info pdc_po + /* board_2037x */ + { + .sht = &pdc_ata_sht, +- .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, ++ .flags = PDC_COMMON_FLAGS, + .pio_mask = 0x1f, /* pio0-4 */ + .mwdma_mask = 0x07, /* mwdma0-2 */ + .udma_mask = 0x7f, /* udma0-6 ; FIXME */ +@@ -355,23 +355,27 @@ static void pdc_reset_port(struct ata_po + static void pdc_sata_phy_reset(struct ata_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); + } + + static void pdc_pata_cbl_detect(struct ata_port *ap) + { + u8 tmp; +- void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; ++ void __iomem *mmio = ++ (void __iomem *) 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) + { + pdc_pata_cbl_detect(ap); +@@ -384,6 +388,20 @@ static u32 pdc_sata_scr_read (struct ata + { + if (sc_reg > SCR_CONTROL) + return 0xffffffffU; ++ if (ap->flags & ATA_FLAG_SLAVE_POSS) ++ { ++ switch (sc_reg) { ++ case SCR_STATUS: ++ return 0x113; ++ case SCR_CONTROL: ++ return 0x300; ++ case SCR_ERROR: ++ case SCR_ACTIVE: ++ default: ++ return 0xffffffffU; ++ } ++ } ++ + return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); + } + +@@ -391,7 +409,7 @@ static u32 pdc_sata_scr_read (struct ata + static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, + u32 val) + { +- if (sc_reg > SCR_CONTROL) ++ if ((sc_reg > SCR_CONTROL) || (ap->flags & ATA_FLAG_SLAVE_POSS)) + return; + writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); + } +@@ -679,6 +697,7 @@ static int pdc_ata_init_one (struct pci_ + unsigned int board_idx = (unsigned int) ent->driver_data; + int pci_dev_busy = 0; + int rc; ++ u8 tmp; + + if (!printed_version++) + dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); +@@ -743,6 +762,9 @@ static int pdc_ata_init_one (struct pci_ + 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; ++ + /* notice 4-port boards */ + switch (board_idx) { + case board_40518: +@@ -757,13 +779,27 @@ static int pdc_ata_init_one (struct pci_ + + 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; + break; + case board_2057x: + /* Override hotplug offset for SATAII150 */ + hp->hotplug_offset = PDC2_SATA_PLUG_CSR; + /* Fall through */ + case board_2037x: ++ /* Some boards have also PATA port */ + probe_ent->n_ports = 2; ++ probe_ent->_port_flags[0] = ATA_FLAG_SATA; ++ probe_ent->_port_flags[1] = ATA_FLAG_SATA; ++ 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->_port_flags[2] = ATA_FLAG_SLAVE_POSS; ++ printk(KERN_INFO DRV_NAME " PATA port found\n"); ++ } + break; + case board_20771: + probe_ent->n_ports = 2; +diff --git a/include/linux/libata.h b/include/linux/libata.h +index abd2deb..aa8c822 100644 +--- a/include/linux/libata.h ++++ b/include/linux/libata.h +@@ -377,6 +377,7 @@ struct ata_probe_ent { + unsigned int irq_flags; + unsigned long port_flags; + unsigned long _host_flags; ++ unsigned long _port_flags[ATA_MAX_PORTS]; + void __iomem *mmio_base; + void *private_data; + +- +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/FC-6/kernel-2.6.spec,v retrieving revision 1.2889 retrieving revision 1.2890 diff -u -r1.2889 -r1.2890 --- kernel-2.6.spec 7 Jan 2007 21:26:22 -0000 1.2889 +++ kernel-2.6.spec 8 Jan 2007 02:00:08 -0000 1.2890 @@ -466,6 +466,7 @@ Patch2105: linux-2.6-defaults-nonmi.patch # SATA Bits +Patch2200: linux-2.6-sata-promise-pata-ports.patch # ACPI bits @@ -1039,6 +1040,9 @@ # ACPI patches +# SATA +# PATA ports on Promise. +%patch2200 -p1 # Network driver fixes. # suspend/resume for forcedeth From fedora-cvs-commits at redhat.com Mon Jan 8 02:01:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 21:01:21 -0500 Subject: rpms/kernel/FC-6 linux-2.6-defaults-nonmi.patch,NONE,1.1 Message-ID: <200701080201.l0821L0A005422@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5382 Added Files: linux-2.6-defaults-nonmi.patch Log Message: add patch linux-2.6-defaults-nonmi.patch: i386/kernel/nmi.c | 2 +- x86_64/kernel/nmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-defaults-nonmi.patch --- From: Arjan van de Ven --- linux-2.6.19/arch/i386/kernel/nmi.c.org 2007-01-07 10:40:52.000000000 -0800 +++ linux-2.6.19/arch/i386/kernel/nmi.c 2007-01-07 10:42:41.000000000 -0800 @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned long, evn */ atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ -unsigned int nmi_watchdog = NMI_DEFAULT; +unsigned int nmi_watchdog = NMI_NONE; static unsigned int nmi_hz = HZ; struct nmi_watchdog_ctlblk { --- linux-2.6.19/arch/x86_64/kernel/nmi.c.org 2007-01-07 10:42:55.000000000 -0800 +++ linux-2.6.19/arch/x86_64/kernel/nmi.c 2007-01-07 10:42:58.000000000 -0800 @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned, evntsel_ atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ int panic_on_timeout; -unsigned int nmi_watchdog = NMI_DEFAULT; +unsigned int nmi_watchdog = NMI_NONE; static unsigned int nmi_hz = HZ; struct nmi_watchdog_ctlblk { From fedora-cvs-commits at redhat.com Mon Jan 8 02:32:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 7 Jan 2007 21:32:51 -0500 Subject: rpms/gnome-python2-desktop/devel gnome-python-desktop.spec, 1.25, 1.26 Message-ID: <200701080232.l082Wp5D007959@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7800 Modified Files: gnome-python-desktop.spec Log Message: - Forgot to BR bug-buddy. Index: gnome-python-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnome-python-desktop.spec 7 Jan 2007 23:55:07 -0000 1.25 +++ gnome-python-desktop.spec 8 Jan 2007 02:32:48 -0000 1.26 @@ -34,6 +34,7 @@ ### Build Dependencies ### +BuildRequires: bug-buddy >= %{bug_buddy_version} BuildRequires: glib2-devel >= %{glib_version} BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version} From fedora-cvs-commits at redhat.com Mon Jan 8 05:06:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 00:06:31 -0500 Subject: rpms/kernel/FC-6/configs config-i586,1.21,1.22 Message-ID: <200701080506.l0856Vf1026861@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv26651/configs Modified Files: config-i586 Log Message: Enable pktcdvd for 586. (#221673) Index: config-i586 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-i586,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-i586 21 Dec 2006 21:45:14 -0000 1.21 +++ config-i586 8 Jan 2007 05:06:28 -0000 1.22 @@ -24,7 +24,6 @@ # CONFIG_HOTPLUG_PCI_PCIE is not set # CONFIG_HOTPLUG_PCI is not set # CONFIG_NET_PKTGEN is not set -# CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_DTLK is not set From fedora-cvs-commits at redhat.com Mon Jan 8 05:06:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 00:06:31 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2890,1.2891 Message-ID: <200701080506.l0856VgW026854@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26651 Modified Files: kernel-2.6.spec Log Message: Enable pktcdvd for 586. (#221673) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2890 retrieving revision 1.2891 diff -u -r1.2890 -r1.2891 --- kernel-2.6.spec 8 Jan 2007 02:00:08 -0000 1.2890 +++ kernel-2.6.spec 8 Jan 2007 05:06:25 -0000 1.2891 @@ -2016,6 +2016,9 @@ %endif %changelog +* Mon Jan 8 2007 Dave Jones +- Enable pktcdvd for 586. (#221673) + * Sun Jan 7 2007 Dave Jones - Disable NMI watchdog by default. From fedora-cvs-commits at redhat.com Mon Jan 8 05:06:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 00:06:42 -0500 Subject: rpms/kernel/devel/configs config-i586,1.21,1.22 Message-ID: <200701080506.l0856g99026936@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv26798/configs Modified Files: config-i586 Log Message: Enable pktcdvd for 586. Index: config-i586 =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-i586 5 Dec 2006 18:12:20 -0000 1.21 +++ config-i586 8 Jan 2007 05:06:39 -0000 1.22 @@ -24,7 +24,6 @@ # CONFIG_HOTPLUG_PCI_PCIE is not set # CONFIG_HOTPLUG_PCI is not set # CONFIG_NET_PKTGEN is not set -# CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_DTLK is not set From fedora-cvs-commits at redhat.com Mon Jan 8 08:15:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 03:15:53 -0500 Subject: rpms/gcc/FC-5 gcc41.spec,1.50,1.51 Message-ID: <200701080815.l088FrVm029214@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29199 Modified Files: gcc41.spec Log Message: 4.1.1-51.fc5 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gcc41.spec 7 Jan 2007 22:43:14 -0000 1.50 +++ gcc41.spec 8 Jan 2007 08:15:51 -0000 1.51 @@ -442,7 +442,7 @@ %patch26 -p0 -b .pr29272~ %patch27 -p0 -b .pr29059~ %patch28 -p0 -b .strncat-chk~ -%patch29 -p0 -b .pr29703~ +#%patch29 -p0 -b .pr29703~ %patch30 -p0 -b .pr29299~ #%patch31 -p0 -b .libjava-anonverscript~ %patch32 -p0 -b .ppc64-libffi-unwind~ From fedora-cvs-commits at redhat.com Mon Jan 8 08:58:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 03:58:59 -0500 Subject: rpms/alsa-lib/FC-6 .cvsignore, 1.23, 1.24 alsa-lib.spec, 1.49, 1.50 sources, 1.26, 1.27 Message-ID: <200701080858.l088wxox006991@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-lib/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6943 Modified Files: .cvsignore alsa-lib.spec sources Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/FC-6/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 25 Aug 2006 10:45:31 -0000 1.23 +++ .cvsignore 8 Jan 2007 08:58:57 -0000 1.24 @@ -10,3 +10,4 @@ alsa-lib-1.0.12rc1.tar.bz2 alsa-lib-1.0.12rc2.tar.bz2 alsa-lib-1.0.12.tar.bz2 +alsa-lib-1.0.13.tar.bz2 Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/FC-6/alsa-lib.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- alsa-lib.spec 25 Aug 2006 10:45:31 -0000 1.49 +++ alsa-lib.spec 8 Jan 2007 08:58:57 -0000 1.50 @@ -1,9 +1,9 @@ -%define version_main 1.0.12 +%define version_main 1.0.13 Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: %{version_main} -Release: 2%{?prever_dot}%{?dist} +Release: 1%{?prever_dot}%{?dist} License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2 @@ -88,6 +88,9 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Mon Jan 8 2007 Martin Stransky 1.0.13-1 +- new upstream + * Fri Aug 25 2006 Martin Stransky 1.0.12-2 - new upstream Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/FC-6/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 25 Aug 2006 10:45:31 -0000 1.26 +++ sources 8 Jan 2007 08:58:57 -0000 1.27 @@ -1 +1 @@ -d351d46c5e415d4c8448487737939c72 alsa-lib-1.0.12.tar.bz2 +d55a9d7d2a79d738a1b7a511cffda4b6 alsa-lib-1.0.13.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 8 09:05:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 04:05:12 -0500 Subject: rpms/bzip2/devel bzip2-1.0.4-cflags.patch, NONE, 1.1 bzip2-1.0.4-saneso.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bzip2.spec, 1.20, 1.21 sources, 1.4, 1.5 bzip2-1.0.2-NULL-ptr-check.patch, 1.1, NONE bzip2-1.0.2-bzgrep.patch, 1.1, NONE bzip2-1.0.2-chmod.patch, 1.1, NONE bzip2-1.0.2-tempfile.patch, 1.1, NONE bzip2-1.0.3-cflags.patch, 1.1, NONE bzip2-1.0.3-saneso.patch, 1.1, NONE Message-ID: <200701080905.l0895C57011941@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/bzip2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11311 Modified Files: .cvsignore bzip2.spec sources Added Files: bzip2-1.0.4-cflags.patch bzip2-1.0.4-saneso.patch Removed Files: bzip2-1.0.2-NULL-ptr-check.patch bzip2-1.0.2-bzgrep.patch bzip2-1.0.2-chmod.patch bzip2-1.0.2-tempfile.patch bzip2-1.0.3-cflags.patch bzip2-1.0.3-saneso.patch Log Message: - update to 1.0.4 - spec file cleanup bzip2-1.0.4-cflags.patch: Makefile-libbz2_so | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bzip2-1.0.4-cflags.patch --- --- bzip2-1.0.4/Makefile-libbz2_so.cflags 2007-01-08 09:47:27.000000000 +0100 +++ bzip2-1.0.4/Makefile-libbz2_so 2007-01-08 09:48:47.000000000 +0100 @@ -35,7 +35,7 @@ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) + $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 rm -f libbz2.so.1.0 ln -s libbz2.so.1.0.4 libbz2.so.1.0 bzip2-1.0.4-saneso.patch: Makefile-libbz2_so | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bzip2-1.0.4-saneso.patch --- --- bzip2-1.0.4/Makefile-libbz2_so.senaso 2007-01-03 03:00:55.000000000 +0100 +++ bzip2-1.0.4/Makefile-libbz2_so 2007-01-08 09:12:42.000000000 +0100 @@ -35,7 +35,7 @@ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 rm -f libbz2.so.1.0 ln -s libbz2.so.1.0.4 libbz2.so.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bzip2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Aug 2005 13:48:08 -0000 1.4 +++ .cvsignore 8 Jan 2007 09:05:10 -0000 1.5 @@ -1 +1 @@ -bzip2-1.0.3.tar.gz +bzip2-1.0.4.tar.gz Index: bzip2.spec =================================================================== RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bzip2.spec 17 Jul 2006 08:11:20 -0000 1.20 +++ bzip2.spec 8 Jan 2007 09:05:10 -0000 1.21 @@ -1,17 +1,13 @@ -Summary: A file compression utility. +Summary: A file compression utility Name: bzip2 -Version: 1.0.3 -Release: 3 +Version: 1.0.4 +Release: 1%{?dist} License: BSD Group: Applications/File URL: http://sources.redhat.com/bzip2/ Source: ftp://sources.redhat.com/pub/bzip2/v102/bzip2-%{version}.tar.gz -Patch0: bzip2-1.0.3-saneso.patch -Patch1: bzip2-1.0.2-tempfile.patch -Patch2: bzip2-1.0.2-chmod.patch -Patch3: bzip2-1.0.2-NULL-ptr-check.patch -Patch4: bzip2-1.0.2-bzgrep.patch -Patch5: bzip2-1.0.3-cflags.patch +Patch0: bzip2-1.0.4-saneso.patch +Patch5: bzip2-1.0.4-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: bzip2-libs = %{version} @@ -47,10 +43,6 @@ %prep %setup -q %patch0 -p1 -b .saneso -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .nullptr -%patch4 -p1 -b .sed %patch5 -p1 -b .cflags %build @@ -69,7 +61,7 @@ mkdir -p $RPM_BUILD_ROOT/{%{_bindir},%{_mandir}/man1,%{_libdir},%{_includedir}} install -m 755 bzlib.h $RPM_BUILD_ROOT/%{_includedir} -install -m 755 libbz2.so.1.0.3 $RPM_BUILD_ROOT/%{_libdir} +install -m 755 libbz2.so.%{version} $RPM_BUILD_ROOT/%{_libdir} install -m 755 libbz2.a $RPM_BUILD_ROOT/%{_libdir} install -m 755 bzip2-shared $RPM_BUILD_ROOT/%{_bindir}/bzip2 install -m 755 bzip2recover bzgrep bzdiff bzmore $RPM_BUILD_ROOT/%{_bindir}/ @@ -78,7 +70,7 @@ ln -s bzip2 $RPM_BUILD_ROOT/%{_bindir}/bzcat ln -s bzdiff $RPM_BUILD_ROOT/%{_bindir}/bzcmp ln -s bzmore $RPM_BUILD_ROOT/%{_bindir}/bzless -ln -s libbz2.so.1.0.3 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1 +ln -s libbz2.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libbz2.so.1 ln -s libbz2.so.1 $RPM_BUILD_ROOT/%{_libdir}/libbz2.so ln -s bzip2.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bzip2recover.1 ln -s bzip2.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bunzip2.1 @@ -96,7 +88,7 @@ %files %defattr(-,root,root) -%doc LICENSE CHANGES README README.COMPILATION.PROBLEMS Y2K_INFO +%doc LICENSE CHANGES README README.COMPILATION.PROBLEMS %{_bindir}/* %{_mandir}/*/* @@ -111,6 +103,10 @@ %{_libdir}/*so %changelog +* Mon Jan 8 2006 Ivana Varekova 1.0.4-1 +- update to 1.0.4 +- spec file cleanup + * Mon Jul 17 2006 Ivana Varekova 1.0.3-3 - add cflags (#198926) @@ -126,7 +122,6 @@ * Fri Dec 09 2005 Jesse Keating - rebuilt - * Fri Nov 25 2005 Ivana Varekova 1.0.3-2 - fix bug 174172 - CAN-2005-0758 bzgrep has security issue in sed usage @@ -180,13 +175,13 @@ * Thu May 23 2002 Tim Powers - automated rebuild -* Thu Apr 25 2002 Trond Eivind Glomsr?d 1.0.2-3 +* Thu Apr 25 2002 Trond Eivind Glomsr??d 1.0.2-3 - Rebuild in new environment -* Thu Feb 21 2002 Trond Eivind Glomsr?d 1.0.2-2 +* Thu Feb 21 2002 Trond Eivind Glomsr??d 1.0.2-2 - Rebuild -* Wed Jan 30 2002 Trond Eivind Glomsr?d 1.0.2-1 +* Wed Jan 30 2002 Trond Eivind Glomsr??d 1.0.2-1 - 1.0.2 - Total overhaul of build precedure - Add many small helper programs added to 1.0.2 @@ -195,21 +190,21 @@ * Wed Jan 09 2002 Tim Powers - automated rebuild -* Mon Nov 26 2001 Trond Eivind Glomsr?d 1.0.1-5 +* Mon Nov 26 2001 Trond Eivind Glomsr??d 1.0.1-5 - Don't segfault when infile is a directory and "-f" is used (#56623) - Automake is evil. Add workaround -* Fri Mar 30 2001 Trond Eivind Glomsr?d +* Fri Mar 30 2001 Trond Eivind Glomsr??d - use "License" instead of "Copyright" - split out libs -* Fri Jul 21 2000 Trond Eivind Glomsr?d +* Fri Jul 21 2000 Trond Eivind Glomsr??d - new URL and source location * Wed Jul 12 2000 Prospector - automatic rebuild -* Sat Jul 01 2000 Trond Eivind Glomsr?d +* Sat Jul 01 2000 Trond Eivind Glomsr??d - 1.0.1 - ported my patch @@ -218,33 +213,33 @@ - remove config.cache from autoconf patch. - sparc: use %%configure, but not the m4 macros. -* Tue Jun 06 2000 Trond Eivind Glomsr?d +* Tue Jun 06 2000 Trond Eivind Glomsr??d - Use %%configure, %%makeinstall, %%{_manpath} and %%{_tmpdir} -* Wed May 17 2000 Trond Eivind Glomsr?d +* Wed May 17 2000 Trond Eivind Glomsr??d - 1.0.0 - ported my 1.0pre8 libtoolizedautoconf patch -* Tue May 16 2000 Trond Eivind Glomsr?d +* Tue May 16 2000 Trond Eivind Glomsr??d - use soft links, not hardlinks, for binaries - mv .so to devel -* Mon May 15 2000 Trond Eivind Glomsr?d +* Mon May 15 2000 Trond Eivind Glomsr??d - autoconfed and libtoolized package - fixed Copyright (it's BSD, not GPL) - dumped bzless (less works fine with bz2-files) - rewrote build and install parts - separated main package and devel package -* Mon May 8 2000 Bernhard Rosenkr?nzer +* Mon May 8 2000 Bernhard Rosenkr??nzer - 1.0pre8 -* Fri Apr 14 2000 Bernhard Rosenkr?nzer +* Fri Apr 14 2000 Bernhard Rosenkr??nzer - Add bzgrep (a version of zgrep hacked to do bzip2) * Mon Feb 7 2000 Bill Nottingham - handle compressed manpages -* Fri Dec 31 1999 Bernhard Rosenkr?nzer +* Fri Dec 31 1999 Bernhard Rosenkr??nzer - 0.9.5d - Update download URL, add URL: tag in header Index: sources =================================================================== RCS file: /cvs/dist/rpms/bzip2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Aug 2005 13:48:08 -0000 1.4 +++ sources 8 Jan 2007 09:05:10 -0000 1.5 @@ -1 +1 @@ -8a716bebecb6e647d2e8a29ea5d8447f bzip2-1.0.3.tar.gz +fc310b254f6ba5fbb5da018f04533688 bzip2-1.0.4.tar.gz --- bzip2-1.0.2-NULL-ptr-check.patch DELETED --- --- bzip2-1.0.2-bzgrep.patch DELETED --- --- bzip2-1.0.2-chmod.patch DELETED --- --- bzip2-1.0.2-tempfile.patch DELETED --- --- bzip2-1.0.3-cflags.patch DELETED --- --- bzip2-1.0.3-saneso.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 09:05:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 04:05:15 -0500 Subject: rpms/alsa-utils/FC-6 .cvsignore, 1.18, 1.19 alsa-utils.spec, 1.46, 1.47 sources, 1.21, 1.22 Message-ID: <200701080905.l0895FYu011998@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11920 Modified Files: .cvsignore alsa-utils.spec sources Log Message: New upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/FC-6/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 25 Aug 2006 10:47:56 -0000 1.18 +++ .cvsignore 8 Jan 2007 09:05:12 -0000 1.19 @@ -11,3 +11,4 @@ alsa-utils-1.0.11.tar.bz2 alsa-utils-1.0.12rc2.tar.bz2 alsa-utils-1.0.12.tar.bz2 +alsa-utils-1.0.13.tar.bz2 Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/FC-6/alsa-utils.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- alsa-utils.spec 2 Oct 2006 08:15:39 -0000 1.46 +++ alsa-utils.spec 8 Jan 2007 09:05:12 -0000 1.47 @@ -1,7 +1,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.12 -Release: 3%{?prever_dot}%{?dist} +Version: 1.0.13 +Release: 1%{?prever_dot}%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -65,6 +65,9 @@ /usr/share/locale/* %changelog +* Mon Jan 8 2006 Martin Stransky 1.0.13-1 +- New upstream + * Mon Oct 2 2006 Martin Stransky 1.0.12-3 - fix for #207384 - Audio test fails during firstboot Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/FC-6/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 25 Aug 2006 10:47:56 -0000 1.21 +++ sources 8 Jan 2007 09:05:12 -0000 1.22 @@ -1 +1 @@ -a3b904040418f18d4276687388429907 alsa-utils-1.0.12.tar.bz2 +dfe4bb5d3217f3ec662b172ce8397cf0 alsa-utils-1.0.13.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 8 09:06:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 04:06:18 -0500 Subject: rpms/alsa-utils/FC-6 alsa-utils.spec,1.47,1.48 Message-ID: <200701080906.l0896IjH012805@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12760 Modified Files: alsa-utils.spec Log Message: New upstream Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/FC-6/alsa-utils.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- alsa-utils.spec 8 Jan 2007 09:05:12 -0000 1.47 +++ alsa-utils.spec 8 Jan 2007 09:06:16 -0000 1.48 @@ -65,7 +65,7 @@ /usr/share/locale/* %changelog -* Mon Jan 8 2006 Martin Stransky 1.0.13-1 +* Mon Jan 8 2007 Martin Stransky 1.0.13-1 - New upstream * Mon Oct 2 2006 Martin Stransky 1.0.12-3 From fedora-cvs-commits at redhat.com Mon Jan 8 09:07:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 04:07:57 -0500 Subject: rpms/bzip2/devel bzip2.spec,1.21,1.22 Message-ID: <200701080907.l0897vqX014193@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/bzip2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13696 Modified Files: bzip2.spec Log Message: fix date Index: bzip2.spec =================================================================== RCS file: /cvs/dist/rpms/bzip2/devel/bzip2.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bzip2.spec 8 Jan 2007 09:05:10 -0000 1.21 +++ bzip2.spec 8 Jan 2007 09:07:55 -0000 1.22 @@ -103,7 +103,7 @@ %{_libdir}/*so %changelog -* Mon Jan 8 2006 Ivana Varekova 1.0.4-1 +* Mon Jan 8 2007 Ivana Varekova 1.0.4-1 - update to 1.0.4 - spec file cleanup From fedora-cvs-commits at redhat.com Mon Jan 8 10:38:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 05:38:57 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch, 1.1, 1.2 openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.8, 1.9 Message-ID: <200701081038.l08AcvBn011658@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11584 Modified Files: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch Log Message: try again openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch: source/core/layout/ssfrm.cxx | 0 sw/source/core/layout/ssfrm.cxx | 9 +++++++++ 2 files changed, 9 insertions(+) Index: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch 6 Jan 2007 15:06:11 -0000 1.1 +++ openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch 8 Jan 2007 10:38:54 -0000 1.2 @@ -13,8 +13,8 @@ + + //cmc: flush any accessible events that might be related to + //this object -+ if ((ViewShell *pSh = GetShell())) -+ if ((SwViewImp *pImp = pSh ? pSh->Imp() : 0)) ++ if (ViewShell *pSh = GetShell()) ++ if (SwViewImp *pImp = pSh ? pSh->Imp() : 0) + pImp->FireAccessibleEvents(); + delete pAnchoredObj; openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch: ./inc/comphelper/propertycontainerhelper.hxx | 0 comphelper/inc/comphelper/implbase_var.hxx | 2 comphelper/inc/comphelper/propertycontainerhelper.hxx | 2 cppu/inc/com/sun/star/uno/Any.h | 2 cppu/inc/com/sun/star/uno/Sequence.hxx | 2 cppu/inc/com/sun/star/uno/Type.h | 2 cppu/inc/cppu/unotype.hxx | 2 cppuhelper/inc/cppuhelper/implbase1.hxx | 4 - cppuhelper/inc/cppuhelper/implbase10.hxx | 4 - cppuhelper/inc/cppuhelper/implbase11.hxx | 4 - cppuhelper/inc/cppuhelper/implbase12.hxx | 4 - cppuhelper/inc/cppuhelper/implbase2.hxx | 4 - cppuhelper/inc/cppuhelper/implbase3.hxx | 4 - cppuhelper/inc/cppuhelper/implbase4.hxx | 4 - cppuhelper/inc/cppuhelper/implbase5.hxx | 4 - cppuhelper/inc/cppuhelper/implbase6.hxx | 4 - cppuhelper/inc/cppuhelper/implbase7.hxx | 4 - cppuhelper/inc/cppuhelper/implbase8.hxx | 4 - cppuhelper/inc/cppuhelper/implbase9.hxx | 4 - cppuhelper/inc/cppuhelper/implbase_ex.hxx | 16 +++++ inc/com/sun/star/uno/Any.h | 0 inc/com/sun/star/uno/Sequence.hxx | 0 inc/com/sun/star/uno/Type.h | 0 inc/comphelper/implbase_var.hxx | 0 inc/cppu/unotype.hxx | 0 inc/cppuhelper/implbase1.hxx | 0 inc/cppuhelper/implbase10.hxx | 0 inc/cppuhelper/implbase11.hxx | 0 inc/cppuhelper/implbase12.hxx | 0 inc/cppuhelper/implbase2.hxx | 0 inc/cppuhelper/implbase3.hxx | 0 inc/cppuhelper/implbase4.hxx | 0 inc/cppuhelper/implbase5.hxx | 0 inc/cppuhelper/implbase6.hxx | 0 inc/cppuhelper/implbase7.hxx | 0 inc/cppuhelper/implbase8.hxx | 0 inc/cppuhelper/implbase9.hxx | 0 inc/cppuhelper/implbase_ex.hxx | 0 inc/iface.hxx | 0 inc/salhelper/singletonref.hxx | 0 inc/sdasitm.hxx | 0 inc/so2dll.hxx | 0 salhelper/inc/salhelper/singletonref.hxx | 2 so3/inc/iface.hxx | 55 ------------------ so3/inc/insdlg.hxx | 2 so3/inc/so2dll.hxx | 2 so3/source/inplace/ipenv.cxx | 48 --------------- source/inplace/ipenv.cxx | 0 source/xforms/xformsexport.cxx | 0 svx/inc/sdasitm.hxx | 6 - xmloff/source/xforms/xformsexport.cxx | 4 - 51 files changed, 57 insertions(+), 138 deletions(-) Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 19 Dec 2006 14:23:33 -0000 1.8 +++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 8 Jan 2007 10:38:54 -0000 1.9 @@ -10,7 +10,7 @@ template< typename Ifc1, typename Impl > struct ImplClassData1 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data1 s_cd = { @@ -35,7 +35,7 @@ struct ImplClassData10 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data10 s_cd = { @@ -60,7 +60,7 @@ struct ImplClassData11 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data11 s_cd = { @@ -85,7 +85,7 @@ struct ImplClassData12 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data12 s_cd = { @@ -110,7 +110,7 @@ template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data2 s_cd = { @@ -135,7 +135,7 @@ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data3 s_cd = { @@ -160,7 +160,7 @@ struct ImplClassData4 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data4 s_cd = { @@ -185,7 +185,7 @@ struct ImplClassData5 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data5 s_cd = { @@ -210,7 +210,7 @@ struct ImplClassData6 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data6 s_cd = { @@ -235,7 +235,7 @@ struct ImplClassData7 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data7 s_cd = { @@ -260,7 +260,7 @@ struct ImplClassData8 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data8 s_cd = { @@ -285,7 +285,7 @@ struct ImplClassData9 { - class_data* operator ()() -+ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()() ++ class_data* operator ()() { static class_data9 s_cd = { From fedora-cvs-commits at redhat.com Mon Jan 8 12:00:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 07:00:54 -0500 Subject: rpms/vnc/devel vnc-render.patch,1.16,1.17 vnc.spec,1.162,1.163 Message-ID: <200701081200.l08C0sHS011720@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11688/vnc/devel Modified Files: vnc-render.patch vnc.spec Log Message: fixed black screen problem on zSeries vnc-render.patch: Imakefile | 2 - Xvnc/xvnc.cc | 50 +++++++++++++++++++++++++++++++++++++++++++++++- module/Imakefile | 2 - vncHooks.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 3 deletions(-) Index: vnc-render.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vnc-render.patch 13 Dec 2006 11:36:17 -0000 1.16 +++ vnc-render.patch 8 Jan 2007 12:00:48 -0000 1.17 @@ -5,7 +5,7 @@ static char needswap = 0; static int lastScreen = -1; +#ifdef RENDER -+#if (defined(__ppc__) || defined(__powerpc__)) ++#if (defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)) +static Bool Render = TRUE; +#else +static Bool Render = FALSE; @@ -19,7 +19,7 @@ ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); +#ifdef RENDER -+#if (defined(__ppc__) || defined(__powerpc__)) ++#if (defined(__ppc__) || defined(__powerpc__)) || defined(__s390__) || defined(__s390x__)) + ErrorF("+/-render turn on/off RENDER extension support" + "(default on)\n"); +#else Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- vnc.spec 13 Dec 2006 11:36:17 -0000 1.162 +++ vnc.spec 8 Jan 2007 12:00:48 -0000 1.163 @@ -5,7 +5,7 @@ Summary: A remote display system. Name: vnc Version: 4.1.2 -Release: 8.1%{?dist} +Release: 9%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz @@ -295,6 +295,9 @@ %{_libdir}/xorg/modules/extensions/libvnc.so %changelog +* Mon Jan 08 2007 Adam Tkac 4.1.2-9.fc7 +- enable render extensions by default on s390 & s390x + * Wed Dec 13 2006 Adam Tkac 4.1.2-8.1.fc7 - changed __ppc64__ to __ppc__ in vnc-render.patch all powerpc has render enabled by default, other archs no From fedora-cvs-commits at redhat.com Mon Jan 8 12:50:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 07:50:12 -0500 Subject: rpms/ntp/devel ntp-4.2.4-allowbind.patch, NONE, 1.1 ntp-4.2.4-droproot.patch, NONE, 1.1 ntp-4.2.4-groups.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, NONE, 1.1 ntp-4.2.4-htmldoc.patch, NONE, 1.1 ntp-4.2.4-intresflags.patch, NONE, 1.1 ntp-4.2.4-linkfastmath.patch, NONE, 1.1 ntp-4.2.4-revert452.patch, NONE, 1.1 ntp-4.2.4-sprintf.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 ntp.conf, 1.12, 1.13 ntp.spec, 1.60, 1.61 sources, 1.23, 1.24 ntp-4.2.0-sbinpath.patch, 1.1, NONE ntp-4.2.2-droproot.patch, 1.2, NONE ntp-4.2.2-linkfastmath.patch, 1.1, NONE ntp-4.2.2-loopfilter.patch, 1.1, NONE ntp-4.2.2-manycast.patch, 1.1, NONE ntp-4.2.2-mlockall.patch, 1.1, NONE ntp-4.2.2-sprintf.patch, 1.1, NONE ntp-stable-4.2.0a-20040616-groups.patch, 1.1, NONE ntp-stable-4.2.0a-20050816-loopback.patch, 1.1, NONE Message-ID: <200701081250.l08CoCOk016297@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13770 Modified Files: .cvsignore ntp.conf ntp.spec sources Added Files: ntp-4.2.4-allowbind.patch ntp-4.2.4-droproot.patch ntp-4.2.4-groups.patch ntp-4.2.4-html2man.patch ntp-4.2.4-htmldoc.patch ntp-4.2.4-intresflags.patch ntp-4.2.4-linkfastmath.patch ntp-4.2.4-revert452.patch ntp-4.2.4-sprintf.patch Removed Files: ntp-4.2.0-sbinpath.patch ntp-4.2.2-droproot.patch ntp-4.2.2-linkfastmath.patch ntp-4.2.2-loopfilter.patch ntp-4.2.2-manycast.patch ntp-4.2.2-mlockall.patch ntp-4.2.2-sprintf.patch ntp-stable-4.2.0a-20040616-groups.patch ntp-stable-4.2.0a-20050816-loopback.patch Log Message: - update to 4.2.4 (#146884) - don't use local clock in default config - autogenerate man pages from HTML - clean up spec a bit Resolves: #146884 ntp-4.2.4-allowbind.patch: ntpd.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE ntp-4.2.4-allowbind.patch --- --- ntp-4.2.4/ntpd/ntpd.c.allowbind 2007-01-04 09:23:16.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd.c 2007-01-04 09:28:00.000000000 +0100 @@ -945,12 +945,14 @@ exit (-1); } +#ifndef HAVE_LINUX_CAPABILITIES /* * for now assume that the privilege to bind to privileged ports * is associated with running with uid 0 - should be refined on * ports that allow binding to NTP_PORT with uid != 0 */ disable_dynamic_updates |= (sw_uid != 0); /* also notifies routing message listener */ +#endif if (disable_dynamic_updates && interface_interval) { interface_interval = 0; @@ -963,7 +965,10 @@ * We drop all of them, except for the crucial one: cap_sys_time: */ cap_t caps; - if( ! ( caps = cap_from_text( "cap_sys_time=ipe" ) ) ) { + char *captext = interface_interval ? + "cap_sys_time,cap_net_bind_service=ipe" : + "cap_sys_time=ipe"; + if( ! ( caps = cap_from_text( captext ) ) ) { msyslog( LOG_ERR, "cap_from_text() failed: %m" ); exit(-1); } ntp-4.2.4-droproot.patch: html/ntpdate.html | 7 ++- ntpdate/ntpdate.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 128 insertions(+), 4 deletions(-) --- NEW FILE ntp-4.2.4-droproot.patch --- --- ntp-4.2.4/ntpdate/ntpdate.c.droproot 2006-12-28 13:03:51.000000000 +0100 +++ ntp-4.2.4/ntpdate/ntpdate.c 2007-01-02 16:20:35.000000000 +0100 @@ -53,6 +53,12 @@ #include +/* Linux capabilities */ +#include +#include +#include +#include + #ifdef SYS_VXWORKS # include "ioLib.h" # include "sockLib.h" @@ -164,6 +170,11 @@ int rate = 0; /* + * Use capabilities to drop privileges and switch uids + */ +char *server_user; + +/* * Program name. */ char *progname; @@ -310,6 +321,88 @@ static ni_namelist *getnetinfoservers P((void)); #endif +/* This patch is adapted (copied) from Chris Wings drop root patch + * for xntpd. + */ +void drop_root(uid_t server_uid, gid_t server_gid) +{ + cap_t caps; + + if (prctl(PR_SET_KEEPCAPS, 1)) { + if (syslogit) { + msyslog(LOG_ERR, "prctl(PR_SET_KEEPCAPS, 1) failed"); + } + else { + fprintf(stderr, "prctl(PR_SET_KEEPCAPS, 1) failed.\n"); + } + exit(1); + } + + if ( setgroups(0, NULL) == -1 ) { + if (syslogit) { + msyslog(LOG_ERR, "setgroups failed."); + } + else { + fprintf(stderr, "setgroups failed.\n"); + } + exit(1); + } + + if ( setegid(server_gid) == -1 || seteuid(server_uid) == -1 ) { + if (syslogit) { + msyslog(LOG_ERR, "setegid/seteuid to uid=%d/gid=%d failed.", server_uid, + server_gid); + } + else { + fprintf(stderr, "setegid/seteuid to uid=%d/gid=%d failed.\n", server_uid, + server_gid); + } + exit(1); + } + + caps = cap_from_text("cap_sys_time=epi"); + if (caps == NULL) { + if (syslogit) { + msyslog(LOG_ERR, "cap_from_text failed."); + } + else { + fprintf(stderr, "cap_from_text failed.\n"); + } + exit(1); + } + + if (cap_set_proc(caps) == -1) { + if (syslogit) { + msyslog(LOG_ERR, "cap_set_proc failed."); + } + else { + fprintf(stderr, "cap_set_proc failed.\n"); + } + exit(1); + } + + /* Try to free the memory from cap_from_text */ + cap_free( caps ); + + if ( setregid(server_gid, server_gid) == -1 || + setreuid(server_uid, server_uid) == -1 ) { + if (syslogit) { + msyslog(LOG_ERR, "setregid/setreuid to uid=%d/gid=%d failed.", + server_uid, server_gid); + } + else { + fprintf(stderr, "setregid/setreuid to uid=%d/gid=%d failed.\n", + server_uid, server_gid); + } + exit(1); + } + + if (syslogit) { + msyslog(LOG_DEBUG, "running as uid(%d)/gid(%d) euid(%d)/egid(%d).", + getuid(), getgid(), geteuid(), getegid()); + } +} + /* * Main program. Initialize us and loop waiting for I/O and/or * timer expiries. @@ -363,7 +456,7 @@ clear_globals(); #endif - + server_user = NULL; /* Check to see if we have IPv6. Otherwise force the -4 flag */ if (isc_net_probeipv6() != ISC_R_SUCCESS) { ai_fam_templ = AF_INET; @@ -376,7 +469,7 @@ /* * Decode argument list */ - while ((c = ntp_getopt(argc, argv, "46a:bBde:k:o:p:qr:st:uv")) != EOF) + while ((c = ntp_getopt(argc, argv, "46a:bBde:k:o:p:qr:st:uvU:")) != EOF) switch (c) { case '4': @@ -468,13 +561,21 @@ case '?': ++errflg; break; + case 'U': + if (ntp_optarg) { + server_user = strdup(ntp_optarg); + } + else { + ++errflg; + } + break; default: break; } if (errflg) { (void) fprintf(stderr, - "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n", + "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] [-U username] server ...\n", progname); exit(2); } @@ -594,6 +695,24 @@ initializing = 0; was_alarmed = 0; + if (server_user) { + struct passwd *pwd = NULL; + + /* Lookup server_user uid/gid before chroot/chdir */ + pwd = getpwnam( server_user ); + if ( pwd == NULL ) { + if (syslogit) { + msyslog(LOG_ERR, "Failed to lookup user '%s'.", server_user); + } + else { + fprintf(stderr, "Failed to lookup user '%s'.\n", server_user); + } + exit(1); + } + drop_root(pwd->pw_uid, pwd->pw_gid); + } + + while (complete_servers < sys_numservers) { #ifdef HAVE_POLL_H struct pollfd* rdfdes; --- ntp-4.2.4/html/ntpdate.html.droproot 2006-12-28 13:02:58.000000000 +0100 +++ ntp-4.2.4/html/ntpdate.html 2007-01-02 16:20:35.000000000 +0100 @@ -18,7 +18,7 @@

Disclaimer: The functionality of this program is now available in the ntpd program. See the -q command line option in the ntpd - Network Time Protocol (NTP) daemon page. After a suitable period of mourning, the ntpdate program is to be retired from this distribution

Synopsis

- ntpdate [ -bBdoqsuv ] [ -a key ] [ -e authdelay ] [ -k keyfile ] [ -o version ] [ -p samples ] [ -t timeout ] server [ ... ] + ntpdate [ -bBdoqsuv ] [ -a key ] [ -e authdelay ] [ -k keyfile ] [ -o version ] [ -p samples ] [ -t timeout ] [ -U user_name ] server [ ... ]

Description

ntpdate sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the server arguments to determine the correct time. It must be run as root on the local host. A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of ntpdate depends on the number of servers, the number of polls each time it is run and the interval between runs.

ntpdate can be run manually as necessary to set the host clock, or it can be run from the host startup script to set the clock at boot time. This is useful in some cases to set the clock initially before starting the NTP daemon ntpd. It is also possible to run ntpdate from a cron script. However, it is important to note that ntpdate with contrived cron scripts is no substitute for the NTP daemon, which uses sophisticated algorithms to maximize accuracy and reliability while minimizing resource use. Finally, since ntpdate does not discipline the host clock frequency as does ntpd, the accuracy using ntpdate is limited.

@@ -58,6 +58,11 @@
Direct ntpdate to use an unprivileged port or outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronise with hosts beyond the firewall. Note that the -d option always uses unprivileged ports.
-v
Be verbose. This option will cause ntpdate's version identification string to be logged. + +
-U user_name
+
ntpdate process drops root privileges and changes user ID to + user_name and group ID to the primary group of + server_user.

Diagnostics

ntpdate's exit status is zero if it finds a server and updates the clock, and nonzero otherwise. ntp-4.2.4-groups.patch: ntpd.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+) --- NEW FILE ntp-4.2.4-groups.patch --- --- ntp-4.2.4/ntpd/ntpd.c.groups 2006-12-29 00:02:02.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd.c 2007-01-02 16:24:21.000000000 +0100 @@ -874,10 +874,18 @@ sw_uid = (uid_t)strtoul(user, &endp, 0); if (*endp != '\0') goto getuser; + + if ((pw = getpwuid(sw_uid)) != NULL) { + user = strdup(pw->pw_name); + } else { + user = (char *)-1; + } + } else { getuser: if ((pw = getpwnam(user)) != NULL) { sw_uid = pw->pw_uid; + sw_gid = pw->pw_gid; } else { errno = 0; msyslog(LOG_ERR, "Cannot find user `%s'", user); @@ -913,6 +921,13 @@ exit (-1); } } + + if (user && (user != (char *)-1) && initgroups(user, sw_gid)) { + msyslog(LOG_ERR, "Cannot initgroups() to user `%s': %m", user); + exit (-1); + } + + if (group && setgid(sw_gid)) { msyslog(LOG_ERR, "Cannot setgid() to group `%s': %m", group); exit (-1); ntp-4.2.4-html2man.patch: html2man.in | 97 +++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 33 deletions(-) --- NEW FILE ntp-4.2.4-html2man.patch --- --- ntp-4.2.4/scripts/html2man.in.html2man 2006-06-06 22:17:10.000000000 +0200 +++ ntp-4.2.4/scripts/html2man.in 2007-01-08 12:47:31.000000000 +0100 @@ -23,7 +23,7 @@ 'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'], 'ntpdate' => ['ntpdate', 8, 'ntpd(8)'], 'ntpdc' => ['ntpdc', 8, 'ntpd(8)'], - 'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'], + 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'], 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'], 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'], 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], @@ -34,17 +34,8 @@ 'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']); # Disclaimer to go in SEE ALSO section of the man page -$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' . - 'documentation pages, which are maintained in HTML format. These files are ' . - 'included in the NTP source distribution. If you installed NTP from a binary ' . - 'package, or it came pre-installed on your system, chances are the documentation ' . - 'was also included in the usual place for your system. The HTML files are more ' . - 'correct and complete than these man pages, which are provided for your reference ' . - 'only.'; - -# Disclaimer to go right at the top -$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' . - 'incorrect. See the SEE ALSO section at the end of this file for more info'; +$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" . + "This file was automatically generated from HTML source.\n"; mkdir $MANDIR, 0777; mkdir "$MANDIR/man8", 0777; @@ -64,7 +55,8 @@ $fileinfo = $manfiles{$filename}; $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!"; - open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]") + $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]"; + open(MANOUT, ">$fileout") || die "Can't open: $!"; $p->get_tag("title"); @@ -73,7 +65,6 @@ # Setup man header print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] . "\n"; - print MANOUT ".UC 4\n"; print MANOUT ".SH NAME\n"; $pat = $fileinfo->[0]; if ($name =~ /$pat/) { @@ -83,8 +74,10 @@ } print MANOUT "$name\n\n"; - print MANOUT "$top_disclaimer\n"; - + @fontstack = (); + $deflevel = 0; + $pre = 0; + $ignore = 0; # Now start scanning. We basically print everything after translating some tags. # $token->[0] has "T", "S", "E" for Text, Start, End # $token->[1] has the tag name, or text (for "T" case) @@ -92,19 +85,37 @@ while (my $token = $p->get_token) { if($token->[0] eq "T") { my $text = $token->[1]; - if($tag) { - $text =~ s/^[\n ]*//; - $text =~ s/[\n ]*$/ /; + if (!$pre) { + if($tag) { + $text =~ s/^[\n\t ]*//; + } + $text =~ s/^[\n\t ][\n\t ]+$//; + $text =~ s/[\n\t ]+/ /g; + $text =~ s/ \;/ /g; + $text =~ s/>\;/>/g; + $text =~ s/<\;/[0] eq "S") { if($token->[1] eq "h4") { my $text = uc($p->get_trimmed_text("/h4")); - print MANOUT ".SH $text\n"; + # ignore these two sections in ntpd.html + if ($filename eq "ntpd" && + ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) { + $ignore = 1; + close(MANOUT); + open(MANOUT, ">/dev/null"); + } elsif ($ignore) { + $ignore = 0; + close(MANOUT); + open(MANOUT, ">>$fileout"); + } + print MANOUT "\n\n.SH $text\n"; } if($token->[1] eq "tt") { push @fontstack, "tt"; @@ -118,22 +129,30 @@ my $text = $p->get_trimmed_text("/address"); print MANOUT "\n.SH AUTHOR\n$text\n"; } - if($token->[1] eq "dt") { - $tmp = $deflevel-4; - print MANOUT "\n.RS $tmp\n"; + if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) { + print MANOUT "\n.TP 8\n"; $tag = 1; } if($token->[1] eq "dd") { - print MANOUT "\n.RS $deflevel\n"; + print MANOUT "\n"; $tag = 1; } if($token->[1] eq "dl") { - $deflevel+=4; + $deflevel+=1; + if ($deflevel > 0) { + print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0; + } + } + if($token->[1] eq "p") { + print MANOUT "\n"; + } + if($token->[1] eq "pre") { + print MANOUT "\n.nf"; + $pre = 1; } } elsif($token->[0] eq "E") { - if($token->[1] eq "dd") { - print MANOUT "\n.RE\n"; + if($token->[1] eq "h4") { $tag = 1; } if($token->[1] eq "tt") { @@ -157,15 +176,27 @@ print MANOUT "$fontswitch"; } if($token->[1] eq "dl") { - $deflevel-=4; + if ($deflevel > 0) { + print MANOUT "\n.RE"; + } + print MANOUT "\n"; + $deflevel-=1; } - if($token->[1] eq "dt") { - print MANOUT "\n.RE"; + if($token->[1] eq "p") { + print MANOUT "\n"; $tag = 1; } + if($token->[1] eq "pre") { + print MANOUT "\n.fi"; + $pre = 0; + } } } - print MANOUT ".SH SEE ALSO\n\n"; + if ($ignore) { + close(MANOUT); + open(MANOUT, ">>$fileout"); + } + print MANOUT "\n.SH SEE ALSO\n\n"; print MANOUT "$fileinfo->[2]\n\n"; print MANOUT "$seealso_disclaimer\n"; close(MANOUT); ntp-4.2.4-htmldoc.patch: confopt.html | 4 ++-- keygen.html | 6 ++++-- monopt.html | 16 ++++------------ ntpd.html | 10 +++++++--- ntpdate.html | 14 +++++++------- ntpdc.html | 20 +++++++++++--------- ntpq.html | 12 ++++++------ ntptrace.html | 10 +--------- 8 files changed, 42 insertions(+), 50 deletions(-) --- NEW FILE ntp-4.2.4-htmldoc.patch --- --- ntp-4.2.4/html/ntpd.html.htmldoc 2006-12-28 13:02:57.000000000 +0100 +++ ntp-4.2.4/html/ntpd.html 2007-01-05 15:40:59.000000000 +0100 @@ -34,7 +34,7 @@

Synopsis

- ntpd [ -46aAbdDgLmnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ] + ntpd [ -46aAbdDgLnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ]

Description

The ntpd program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. ntpd does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.

How NTP Operates

@@ -65,6 +65,10 @@

When ntpd starts it looks at the value of umask, and if zero ntpd will set the umask to 022.

Command Line Options

+
-4 +
Force DNS resolution of host names to the IPv4 namespace. +
-6 +
Force DNS resolution of host names to the IPv6 namespace.
-a
Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is the default.
-A @@ -78,13 +82,13 @@
-D level
Specify debugging level directly.
-f driftfile -
Specify the name and path of the frequency file, default /etc/ntp.drift. This is the same operation as the driftfile driftfile configuration command. +
Specify the name and path of the frequency file. This is the same operation as the driftfile driftfile configuration command.
-g
Normally, ntpd exits with a message to the system log if the offset exceeds the panic threshold, which is 1000 s by default. This option allows the time to be set to any value without restriction; however, this can happen only once. If the threshold is exceeded after that, ntpd will exit with a message to the system log. This option can be used with the -q and -x options. See the tinker command for other options.
-i jaildir
Chroot the server to the directory jaildir. This option also implies that the server attempts to drop root privileges at startup (otherwise, chroot gives very little additional security), and it is only available if the OS supports to run the server without full root privileges. You may need to also specify a -u option.
-k keyfile -
Specify the name and path of the symmetric key file, default /etc/ntp.keys. This is the same operation as the keys keyfile configuration command. +
Specify the name and path of the symmetric key file, default /etc/ntp/keys. This is the same operation as the keys keyfile configuration command.
-l logfile
Specify the name and path of the log file. The default is the system log file. This is the same operation as the logfile logfile configuration command.
-L --- ntp-4.2.4/html/ntpdate.html.htmldoc 2007-01-05 15:40:59.000000000 +0100 +++ ntp-4.2.4/html/ntpdate.html 2007-01-05 15:40:59.000000000 +0100 @@ -18,9 +18,9 @@

Disclaimer: The functionality of this program is now available in the ntpd program. See the -q command line option in the ntpd - Network Time Protocol (NTP) daemon page. After a suitable period of mourning, the ntpdate program is to be retired from this distribution

Synopsis

- ntpdate [ -bBdoqsuv ] [ -a key ] [ -e authdelay ] [ -k keyfile ] [ -o version ] [ -p samples ] [ -t timeout ] [ -U user_name ] server [ ... ] + ntpdate [ -46bBdqsuv ] [ -a key ] [ -e authdelay ] [ -k keyfile ] [ -o version ] [ -p samples ] [ -t timeout ] [ -U user_name ] server [ ... ]

Description

- ntpdate sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the server arguments to determine the correct time. It must be run as root on the local host. A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of ntpdate depends on the number of servers, the number of polls each time it is run and the interval between runs. +

ntpdate sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the server arguments to determine the correct time. It must be run as root on the local host. A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of ntpdate depends on the number of servers, the number of polls each time it is run and the interval between runs.

ntpdate can be run manually as necessary to set the host clock, or it can be run from the host startup script to set the clock at boot time. This is useful in some cases to set the clock initially before starting the NTP daemon ntpd. It is also possible to run ntpdate from a cron script. However, it is important to note that ntpdate with contrived cron scripts is no substitute for the NTP daemon, which uses sophisticated algorithms to maximize accuracy and reliability while minimizing resource use. Finally, since ntpdate does not discipline the host clock frequency as does ntpd, the accuracy using ntpdate is limited.

Time adjustments are made by ntpdate in one of two ways. If ntpdate determines the clock is in error more than 0.5 second it will simply step the time by calling the system settimeofday() routine. If the error is less than 0.5 seconds, it will slew the time by calling the system adjtime() routine. The latter technique is less disruptive and more accurate when the error is small, and works quite well when ntpdate is run by cron every hour or two.

ntpdate will decline to set the date if an NTP server daemon (e.g., ntpd) is running on the same host. When running ntpdate on a regular basis from cron as an alternative to running a daemon, doing so once every hour or two will result in precise enough timekeeping to avoid stepping the clock.

@@ -33,9 +33,9 @@
-6
Force DNS resolution of following host names on the command line to the IPv6 namespace.
-a key -
Enable the authentication function and specify the key identifier to be used for authentication as the argument keyntpdate. The keys and key identifiers must match in both the client and server key files. The default is to disable the authentication function. +
Enable the authentication function and specify the key identifier to be used for authentication as the argument key. The keys and key identifiers must match in both the client and server key files. The default is to disable the authentication function.
-B -
Force the time to always be slewed using the adjtime() system call, even if the measured offset is greater than +-128 ms. The default is to step the time using settimeofday() if the offset is greater than +-128 ms. Note that, if the offset is much greater than +-128 ms in this case, that it can take a long time (hours) to slew the clock to the correct value. During this time. the host should not be used to synchronize clients. +
Force the time to always be slewed using the adjtime() system call, even if the measured offset is greater than +-500 ms. The default is to step the time using settimeofday() if the offset is greater than +-500 ms. Note that, if the offset is much greater than +-500 ms in this case, that it can take a long time (hours) to slew the clock to the correct value. During this time. the host should not be used to synchronize clients.
-b
Force the time to be stepped using the settimeofday() system call, rather than slewed (default) using the adjtime() system call. This option should be used when called from a startup file at boot time.
-d @@ -43,7 +43,7 @@
-e authdelay
Specify the processing delay to perform an authentication function as the value authdelay, in seconds and fraction (see ntpd for details). This number is usually small enough to be negligible for most purposes, though specifying a value may improve timekeeping on very slow CPU's.
-k keyfile -
Specify the path for the authentication key file as the string keyfile. The default is /etc/ntp.keys. This file should be in the format described in ntpd. +
Specify the path for the authentication key file as the string keyfile. The default is /etc/ntp/keys. This file should be in the format described in ntpd.
-o version
Specify the NTP version for outgoing packets as the integer version, which can be 1 or 2. The default is 3. This allows ntpdate to be used with older NTP versions.
-p samples @@ -55,7 +55,7 @@
-t timeout
Specify the maximum time waiting for a server response as the value timeout, in seconds and fraction. The value is is rounded to a multiple of 0.2 seconds. The default is 1 second, a value suitable for polling across a LAN.
-u -
Direct ntpdate to use an unprivileged port or outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronise with hosts beyond the firewall. Note that the -d option always uses unprivileged ports. +
Direct ntpdate to use an unprivileged port for outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronize with hosts beyond the firewall. Note that the -d option always uses unprivileged ports.
-v
Be verbose. This option will cause ntpdate's version identification string to be logged. @@ -67,7 +67,7 @@

Diagnostics

ntpdate's exit status is zero if it finds a server and updates the clock, and nonzero otherwise.

Files

- /etc/ntp.keys - encryption keys used by ntpdate. + /etc/ntp/keys - encryption keys used by ntpdate.

Bugs

The slew adjustment is actually 50% larger than the measured offset, since this (it is argued) will tend to keep a badly drifting clock more accurate. This is probably not a good idea and may cause a troubling hunt for some values of the kernel variables tick and tickadj. 
--- ntp-4.2.4/html/ntptrace.html.htmldoc 2006-06-06 22:16:06.000000000 +0200 +++ ntp-4.2.4/html/ntptrace.html 2007-01-05 15:40:59.000000000 +0100 @@ -17,7 +17,7 @@

Synopsis

- ntptrace [ -vdn ] [ -r retries ] [ -t timeout ] [ server ] + ntptrace [ -n ] [ -m maxhosts ] [ server ]

Description

ntptrace determines where a given Network Time Protocol (NTP) server gets its time from, and follows the chain of NTP servers back to their master time source. If given no arguments, it starts with localhost. Here is an example of the output from ntptrace:

@@ -29,16 +29,8 @@
 		
On each line, the fields are (left to right): the host name, the host stratum, the time offset between that host and the local host (as measured by ntptrace; this is why it is not always zero for "localhost"), the host synchronization distance, and (only for stratum-1 servers) the reference clock ID. All times are given in seconds. Note that the stratum is the server hop count to the primary source, while the synchronization distance is the estimated error relative to the primary source. These terms are precisely defined in RFC-1305.

 		
Options

 		

-			
-d
-			
Turns on some debugging output.
 			
-n
 			
Turns off the printing of host names; instead, host IP addresses are given. This may be useful if a nameserver is down.
-			
-r retries
-			
Sets the number of retransmission attempts for each host (default = 5).
-			
-t timeout
-			
Sets the retransmission timeout (in seconds) (default = 2).
-			
-v
-			
Prints verbose information about the NTP servers.
 		

 		
Bugs

 		
This program makes no attempt to improve accuracy by doing multiple samples.

--- ntp-4.2.4/html/keygen.html.htmldoc	2006-06-06 22:16:00.000000000 +0200
+++ ntp-4.2.4/html/keygen.html	2007-01-05 15:40:59.000000000 +0100
@@ -32,7 +32,7 @@
 		
 		

 		
Synopsis

-		
ntp-keygen [ -deGgHIMnPT ] [ -c [RSA-MD2 | RSA-MD5 | RSA-SHA | RSA-SHA1 | RSA-MDC2 | RSA-RIPEMD160 | DSA-SHA | DSA-SHA1 ] ] [ -i name ] [ -p password ] [ -S [ RSA | DSA ] ] [ -s name ] [ -v nkeys ]

+		
ntp-keygen [ -deGgHIMPT ] [ -c [RSA-MD2 | RSA-MD5 | RSA-SHA | RSA-SHA1 | RSA-MDC2 | RSA-RIPEMD160 | DSA-SHA | DSA-SHA1 ] ] [ -i name ] [ -p password ] [ -q password ] [ -S [ RSA | DSA ] ] [ -s name ] [ -v nkeys ] [ -V params ]

 		
Description

 		
This program generates cryptographic data files used by the NTPv4 authentication and identification schemes. It generates MD5 key files used in symmetric key cryptography. In addition, if the OpenSSL software library has been installed, it generates keys, certificate and identity files used in public key cryptography. These files are used for cookie encryption, digital signature and challenge/response identification algorithms compatible with the Internet standard security infrastructure.

 		
By default, files are not encrypted by ntp-keygen. The -p password option specifies the write password and -q password option the read password for previously encrypted files. The ntp-keygen program prompts for the password if it reads an encrypted file and the password is missing or incorrect. If an encrypted file is read successfully and no write password is specified, the read password is used as the write password by default.

@@ -81,11 +81,13 @@
 			
Set the suject name to name. This is used as the subject field in certificates and in the file name for host and sign keys.
 			
-M
 			
Generate MD5 keys, obsoleting any that may exist.
+			
-m modulus
+			
Set prime modulus size in bits (256 - 2048). Default size is 512.
 			
-P
 			
Generate a private certificate. By default, the program generates public certificates.
 			
-p password
 			
Encrypt generated files containing private data with password and the DES-CBC algorithm.
-			
-q
+			
-q password
 			
Set the password for reading files to password.
 			
-S [ RSA | DSA ]
 			
Generate a new sign key of the designated type, obsoleting any that may exist. By default, the program uses the host key as the sign key.
--- ntp-4.2.4/html/ntpdc.html.htmldoc	2006-12-28 13:02:59.000000000 +0100
+++ ntp-4.2.4/html/ntpdc.html	2007-01-05 15:40:59.000000000 +0100
@@ -19,9 +19,9 @@
 		
 		

 		
Synopsis

-		ntpdc [ -ilnps ] [ -c command ] [ host ] [ ... ]
+		ntpdc [ -46dilnps ] [ -c command ] [ host ] [ ... ]
 		
Description

-		ntpdc is used to query the ntpd daemon about its current state and to request changes in that state. The program may be run either in interactive mode or controlled using command line arguments. Extensive state and statistics information is available through the ntpdc interface. In addition, nearly all the configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using ntpdc.
+		
ntpdc is used to query the ntpd daemon about its current state and to request changes in that state. The program may be run either in interactive mode or controlled using command line arguments. Extensive state and statistics information is available through the ntpdc interface. In addition, nearly all the configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using ntpdc.

 		
If one or more request options are included on the command line when ntpdc is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpdc will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpdc will prompt for commands if the standard input is a terminal device.

 		
ntpdc uses NTP mode 7 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. Note that since NTP is a UDP protocol this communication will be somewhat unreliable, especially over large distances in terms of network topology. ntpdc makes no attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout time.

 		
The operation of ntpdc are specific to the particular implementation of the ntpd daemon and can be expected to work only with this and maybe some previous versions of the daemon. Requests from a remote ntpdc program which affect the state of the local server must be authenticated, which requires both the remote program and local server share a common key and key identifier.

@@ -35,6 +35,8 @@
 			
Force DNS resolution of following host names on the command line to the IPv6 namespace.
 			
-c command
 			
The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). Multiple -c options may be given.
+			
-d
+			
Turn on debugging mode.
 			
-i
 			
Force ntpdc to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input.
 			
-l
@@ -134,11 +136,11 @@
 		
addpeer peer_address [
 		keyid ] [ version ] [
 		minpoll# | prefer | iburst  | burst | minpoll
-		N | maxpoll N [ dynamic ] [...] ]
+		N | maxpoll N [ dynamic ] [...] ]
 		
addpeer peer_address [
 		prefer | iburst | burst | minpoll
 		N | maxpoll N | keyid
-			N | version N [...] ]
+			N | version N [...]  ]
 			
Add a configured peer association at the
 			given address and operating in symmetric
 			active mode. Note that an existing association
@@ -162,16 +164,16 @@
 			peer configuration file command of
 			ntpd.  See the Server Options page for further information.
 			Each flag (or its absence) replaces the
-			previous setting. The prefer keyword indicates a preferred peer (and thus will be used primarily for clock synchronisation if possible). The preferred peer also determines the validity of the PPS signal - if the preferred peer is suitable for synchronisation so is the PPS signal.
+			previous setting. The prefer keyword indicates a preferred peer (and thus will be used primarily for clock synchronization if possible). The preferred peer also determines the validity of the PPS signal - if the preferred peer is suitable for synchronization so is the PPS signal.
 			The dynamic keyword allows association configuration even when no suitable network interface is found at configuration time. The dynamic interface update mechanism may complete the configuration when new interfaces appear (e.g. WLAN/PPP interfaces) at a later time and thus render the association operable.
 			
addserver peer_address [
 		keyid ] [ version ] [
 		minpoll# | prefer | iburst  | burst | minpoll
-		N | maxpoll N [...] ]
+		N | maxpoll N [...] ]
 		
addserver peer_address [
 		prefer | iburst | burst | minpoll
 		N | maxpoll N | keyid
-			N | version N [...] [ dynamic ] ]
+			N | version N [...] [ dynamic ] ]
 			
Identical to the addpeer command, except that the operating mode is client.
 			
broadcast peer_address [
 			keyid ] [ version ] [ prefer ]
@@ -200,9 +202,9 @@
 			
Returns information concerning the authentication module, including known keys and counts of encryptions and decryptions which have been done.
 			
traps
 			
Display the traps set in the server. See the source listing for further information.
-			
addtrap [ address [ port ] [ interface ]
+			
addtrap [ address ] [ port ] [ interface ]
 			
Set a trap for asynchronous messages. See the source listing for further information.
-			
clrtrap [ address [ port ] [ interface]
+			
clrtrap [ address ] [ port ] [ interface]
 			
Clear a trap for asynchronous messages. See the source listing for further information.
 			
reset
 			
Clear the statistics counters in various modules of the server. See the source listing for further information.
--- ntp-4.2.4/html/ntpq.html.htmldoc	2006-06-06 22:16:06.000000000 +0200
+++ ntp-4.2.4/html/ntpq.html	2007-01-05 15:40:59.000000000 +0100
@@ -19,11 +19,11 @@
 		
 		

 		
Synopsis

-		ntpq [-inp] [-c command] [host] [...]
+		ntpq [-46dinp] [-c command] [host] [...]
 		
Description

 		
The ntpq utility program is used to monitor NTP daemon ntpd operations and determine performance. It uses the standard NTP mode 6 control message formats defined in Appendix B of the NTPv3 specification RFC1305. The same formats are used in NTPv4, although some of the variables have changed and new ones added. The description on this page is for the NTPv4 variables.

 		
The program can be run either in interactive mode or controlled using command line arguments. Requests to read and write arbitrary variables can be assembled, with raw and pretty-printed output options being available. The ntpq can also obtain and print a list of peers in a common format by sending multiple queries to the server.

-		
If one or more request options is included on the command line when ntpq is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpq will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpqwill prompt for commands if the standard input is a terminal device.

+		
If one or more request options is included on the command line when ntpq is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpq will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpq will prompt for commands if the standard input is a terminal device.

 		
ntpq uses NTP mode 6 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. Note that since NTP is a UDP protocol this communication will be somewhat unreliable, especially over large distances in terms of network topology. ntpq makes one attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout time.

 		
Note that in contexts where a host name is expected, a -4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a -6 qualifier forces DNS resolution to the IPv6 namespace.

 		
For examples and usage, see the NTP Debugging Techniques page.

@@ -73,7 +73,7 @@
 			
quit
 			
Exit ntpq.
 			
raw
-			
Causes all output from query commands is printed as received from the remote server. The only formating/interpretation done on the data is to transform nonascii data into a printable (but barely understandable) form.
+			
Causes all output from query commands is printed as received from the remote server. The only formatting/interpretation done on the data is to transform non-ASCII data into a printable (but barely understandable) form.
 			
timeout millseconds
 			
Specify a timeout period for responses to server queries. The default is about 5000 milliseconds. Note that since ntpq retries each query once after a timeout, the total waiting time for a timeout will be twice the timeout value set.
@@ -135,7 +135,7 @@
*  sys.peer
The peer has been declared the system peer and lends its variables to the system variables.
o  pps.peer -
The peer has been declared the system peer and lends its variables to thesystem variables. However, the actual system synchronization is derived from a pulse-per-second (PPS) signal, either indirectly via the PPS reference clock driver or directly via kernel interface. +
The peer has been declared the system peer and lends its variables to the system variables. However, the actual system synchronization is derived from a pulse-per-second (PPS) signal, either indirectly via the PPS reference clock driver or directly via kernel interface.

System Variables

The status, leap, stratum, precision, rootdelay, rootdispersion, refid, reftime, poll, offset, and frequency variables are described in RFC-1305 specification. Additional NTPv4 system variables include the following.

@@ -240,14 +240,14 @@
Access is denied. See the Access Control Options page.
0x010 TEST5
Cryptographic authentication fails. See the Authentication Options page. -
0x020TEST6 +
0x020 TEST6
The server is unsynchronized. Wind up its clock first.
0x040 TEST7
The server stratum is at the maximum than 15. It is probably unsynchronized and its clock needs to be wound up.
0x080 TEST8
Either the root delay or dispersion is greater than one second, which is highly unlikely unless the peer is unsynchronized to Mars.
0x100 TEST9 -
Either the peer delay or dispersion is greater than one second, which is higly unlikely unless the peer is on Mars. +
Either the peer delay or dispersion is greater than one second, which is highly unlikely unless the peer is on Mars.
0x200 TEST10
The autokey protocol has detected an authentication failure. See the Authentication Options page.
0x400 TEST11 --- ntp-4.2.4/html/monopt.html.htmldoc 2006-12-28 13:02:56.000000000 +0100 +++ ntp-4.2.4/html/monopt.html 2007-01-05 15:42:20.000000000 +0100 @@ -82,9 +82,7 @@
name
This is the type of the statistics records, as shown in the statistics command. -
-
file filename -
+
file filename
This is the file name for the statistics records. Filenames of set members are built from three concatenated elements prefix, filename and suffix:
prefix @@ -94,9 +92,7 @@
suffix
This part is reflects individual elements of a file set. It is generated according to the type of a file set.
-
-
type typename -
+
type typename
A file generation set is characterized by its type. The following types are supported:
none @@ -114,13 +110,9 @@
age
This type of file generation sets changes to a new element of the file set every 24 hours of server operation. The filename suffix consists of a dot, the letter a, and an 8-digit number. This number is taken to be the number of seconds the server is running at the start of the corresponding 24-hour period. Information is only written to a file generation by specifying enable; output is prevented by specifying disable.
-
-
link | nolink -
+
link | nolink
It is convenient to be able to access the current element of a file generation set by a fixed name. This feature is enabled by specifying link and disabled using nolink. If link is specified, a hard link from the current file set element to a file without suffix is created. When there is already a file with this name and the number of links of this file is one, it is renamed appending a dot, the letter C, and the pid of the ntpd server process. When the number of links is greater than one, the file is unlinked. This allows the current file to be accessed by a constant name. -
-
enable | disable -
+
enable | disable
Enables or disables the recording function.
--- ntp-4.2.4/html/confopt.html.htmldoc 2006-12-28 13:02:55.000000000 +0100 +++ ntp-4.2.4/html/confopt.html 2007-01-05 15:40:59.000000000 +0100 @@ -32,8 +32,8 @@

There are three types of associations: persistent, preemptable and ephemeral. Persistent associations are mobilized by a configuration command and never demobilized. Preemptable associations, which are new to NTPv4, are mobilized by a configuration command which includes the prempt flag and are demobilized by timeout or error. Ephemeral associations are mobilized upon arrival of designated messages and demobilized by timeout or error.

server address [options ...]
- peer address [options ...]
- broadcast address [options ...]
+ peer address [options ...]
+ broadcast address [options ...]
manycastclient address [options ...]
These four commands specify the time server name or address to be used and the mode in which to operate. The address can be either a DNS name or a IP address in dotted-quad notation. Additional information on association behavior can be found in the Association Management page.
ntp-4.2.4-intresflags.patch: ntp_intres.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE ntp-4.2.4-intresflags.patch --- --- ntp-4.2.4/ntpd/ntp_intres.c.intresflags 2006-12-28 13:03:28.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_intres.c 2007-01-03 16:09:44.000000000 +0100 @@ -1059,6 +1059,7 @@ } if ((intval[TOK_FLAGS] & ~(FLAG_AUTHENABLE | FLAG_PREFER | + FLAG_DYNAMIC | FLAG_NOSELECT | FLAG_BURST | FLAG_IBURST | FLAG_SKEY)) != 0) { msyslog(LOG_ERR, "invalid flags (%ld) in file %s", @@ -1079,6 +1080,8 @@ flags |= CONF_FLAG_IBURST; if (intval[TOK_FLAGS] & FLAG_SKEY) flags |= CONF_FLAG_SKEY; + if (intval[TOK_FLAGS] & FLAG_DYNAMIC) + flags |= CONF_FLAG_DYNAMIC; /* * This is as good as we can check it. Add it in. ntp-4.2.4-linkfastmath.patch: Makefile.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ntp-4.2.4-linkfastmath.patch --- --- ntp-4.2.4/ntpd/Makefile.in.linkfastmath 2006-12-29 00:58:57.000000000 +0100 +++ ntp-4.2.4/ntpd/Makefile.in 2007-01-02 17:56:48.000000000 +0100 @@ -281,7 +281,7 @@ # sqrt ntp_control.o # floor refclock_wwv.o # which are (usually) provided by -lm. -ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ $(LIBOPTS_LDADD) ../libntp/libntp.a +ntpd_LDADD = $(LDADD) -lm -ffast-math @LCRYPTO@ $(LIBOPTS_LDADD) ../libntp/libntp.a ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ $(LIBOPTS_LDADD) ntpdsim_CFLAGS = $(CFLAGS) -DSIM check_y2k_LDADD = $(LDADD) ../libntp/libntp.a ntp-4.2.4-revert452.patch: ntp_loopfilter.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) --- NEW FILE ntp-4.2.4-revert452.patch --- --- ntp-4.2.4/ntpd/ntp_loopfilter.c.revert452 2006-12-28 13:03:30.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_loopfilter.c 2007-01-08 12:47:31.000000000 +0100 @@ -650,15 +650,17 @@ * frequency and pretend we did it here. */ if (ntp_adjtime(&ntv) == TIME_ERROR) { - NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) - msyslog(LOG_NOTICE, - "kernel time sync error %04x", ntv.status); + if (ntv.status != pll_status) + NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) + msyslog(LOG_NOTICE, + "kernel time sync disabled %04x", + ntv.status); ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME); } else { - if ((ntv.status ^ pll_status) & ~STA_FLL) + if (ntv.status != pll_status) NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) msyslog(LOG_NOTICE, - "kernel time sync status change %04x", + "kernel time sync enabled %04x", ntv.status); } pll_status = ntv.status; ntp-4.2.4-sprintf.patch: refclock_wwv.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) --- NEW FILE ntp-4.2.4-sprintf.patch --- --- ntp-4.2.4/ntpd/refclock_wwv.c.sprintf 2006-12-28 13:03:49.000000000 +0100 +++ ntp-4.2.4/ntpd/refclock_wwv.c 2007-01-02 17:52:10.000000000 +0100 @@ -1364,7 +1364,7 @@ else sp->metric = wwv_metric(sp); if (pp->sloppyclockflag & CLK_FLAG4) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv8 %04x %3d %s %04x %.0f %.0f/%.1f %4ld %4ld", up->status, up->gain, sp->refid, sp->reach & 0xffff, sp->metric, sp->synmax, @@ -1491,7 +1491,7 @@ } if ((pp->sloppyclockflag & CLK_FLAG4) && !(up->status & MSYNC)) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv1 %04x %3d %4d %5.0f %5.1f %5d %4d %4d %4d", up->status, up->gain, tepoch, up->epomax, up->eposnr, tmp2, avgcnt, syncnt, @@ -1582,7 +1582,7 @@ } } if (pp->sloppyclockflag & CLK_FLAG4) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv2 %04x %5.0f %5.1f %5d %4d %4d %4d %4.0f %7.2f", up->status, up->epomax, up->eposnr, mepoch, up->avgint, maxrun, mcount - zcount, dtemp, @@ -1768,7 +1768,7 @@ struct wwvunit *up; struct chan *cp; struct sync *sp, *rp; - char tbuf[80]; /* monitor buffer */ + char tbuf[128]; /* monitor buffer */ int sw, arg, nsec; pp = peer->procptr; @@ -1869,7 +1869,7 @@ } rp->metric = wwv_metric(rp); if (pp->sloppyclockflag & CLK_FLAG4) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv5 %04x %3d %4d %.0f/%.1f %.0f/%.1f %s %04x %.0f %.0f/%.1f %s %04x %.0f %.0f/%.1f", up->status, up->gain, up->yepoch, up->epomax, up->eposnr, up->datsig, @@ -2041,7 +2041,7 @@ } if ((pp->sloppyclockflag & CLK_FLAG4) && !(up->status & DSYNC)) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv3 %2d %04x %3d %4d %5.0f %5.1f %5.0f %5.1f %5.0f", nsec, up->status, up->gain, up->yepoch, up->epomax, up->eposnr, up->datsig, up->datsnr, bit); @@ -2212,7 +2212,7 @@ } if ((pp->sloppyclockflag & CLK_FLAG4) && !(up->status & INSYNC)) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv4 %2d %04x %3d %4d %5.0f %2d %d %d %d %5.0f %5.1f", up->rsec - 1, up->status, up->gain, up->yepoch, up->epomax, vp->radix, vp->digit, vp->mldigit, Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 21 Nov 2006 16:27:00 -0000 1.22 +++ .cvsignore 8 Jan 2007 12:50:10 -0000 1.23 @@ -1,3 +1,2 @@ ntpstat-0.2.tgz -ntp-4.2.2-manpages-2.tar.gz -ntp-4.2.2p4.tar.gz +ntp-4.2.4.tar.gz Index: ntp.conf =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp.conf,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ntp.conf 20 Jul 2006 15:33:58 -0000 1.12 +++ ntp.conf 8 Jan 2007 12:50:10 -0000 1.13 @@ -14,9 +14,9 @@ # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -server 0.fedora.pool.ntp.org -server 1.fedora.pool.ntp.org -server 2.fedora.pool.ntp.org +server 0.fedora.pool.ntp.org dynamic +server 1.fedora.pool.ntp.org dynamic +server 2.fedora.pool.ntp.org dynamic #broadcast 192.168.1.255 key 42 # broadcast server #broadcastclient # broadcast client @@ -27,8 +27,8 @@ # Undisciplined Local Clock. This is a fake driver intended for backup # and when no outside source of synchronized time is available. -server 127.127.1.0 # local clock -fudge 127.127.1.0 stratum 10 +#server 127.127.1.0 # local clock +#fudge 127.127.1.0 stratum 10 # Drift file. Put this in a directory which the daemon can write to. # No symbolic links allowed, either, since the daemon updates the file Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ntp.spec 22 Nov 2006 14:44:56 -0000 1.60 +++ ntp.spec 8 Jan 2007 12:50:10 -0000 1.61 @@ -2,8 +2,8 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp -Version: 4.2.2p4 -Release: 2%{?dist} +Version: 4.2.4 +Release: 1%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -12,32 +12,31 @@ Source3: ntpd.init Source4: ntpd.sysconfig Source5: ntpstat-0.2.tgz -Source6: ntp-4.2.2-manpages-2.tar.gz # new find-requires Source7: filter-requires-ntp.sh %define __find_requires %{SOURCE7} -Patch2: ntp-4.2.2-droproot.patch -Patch3: ntp-stable-4.2.0a-20040616-groups.patch +Patch2: ntp-4.2.4-droproot.patch +Patch3: ntp-4.2.4-groups.patch Patch4: ntp-4.1.1c-rc3-authkey.patch -Patch5: ntp-4.2.2-linkfastmath.patch -Patch6: ntp-4.2.2-loopfilter.patch -Patch7: ntp-4.2.0-sbinpath.patch -Patch8: ntp-4.2.2-manycast.patch -Patch9: ntp-4.2.2-mlockall.patch -Patch10: ntp-stable-4.2.0a-20050816-loopback.patch +Patch5: ntp-4.2.4-linkfastmath.patch +Patch6: ntp-4.2.4-allowbind.patch +Patch7: ntp-4.2.4-revert452.patch +Patch8: ntp-4.2.4-intresflags.patch +Patch9: ntp-4.2.4-html2man.patch +Patch10: ntp-4.2.4-htmldoc.patch Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch -Patch12: ntp-4.2.2-sprintf.patch +Patch12: ntp-4.2.4-sprintf.patch URL: http://www.ntp.org -PreReq: /sbin/chkconfig -Prereq: /usr/sbin/groupadd /usr/sbin/useradd -PreReq: /bin/awk sed grep -Requires: libcap -BuildRequires: libcap-devel openssl-devel readline-devel +Requires(pre): shadow-utils +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig /sbin/service +Requires(postun): /sbin/service +BuildRequires: libcap-devel openssl-devel readline-devel perl-HTML-Parser Obsoletes: xntp3 ntpstat -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The Network Time Protocol (NTP) is used to synchronize a computer's @@ -52,16 +51,16 @@ time synchronized via the NTP protocol. %prep -%setup -q -a 5 -a 6 +%setup -q -a 5 -%patch2 -p1 +%patch2 -p1 -b .droproot %patch3 -p1 -b .groups %patch4 -p1 -b .authkey -%patch6 -p1 -b .loopfilter -%patch7 -p1 -b .sbinpath -%patch8 -p1 -b .manycast -%patch9 -p1 -b .mlockall -%patch10 -p1 -b .loopback +%patch6 -p1 -b .allowbind +%patch7 -p1 -b .revert452 +%patch8 -p1 -b .intresflags +%patch9 -p1 -b .html2man +%patch10 -p1 -b .htmldoc %patch11 -p1 -b .keyfile %patch12 -p1 -b .sprintf @@ -79,45 +78,51 @@ --sysconfdir=%{_sysconfdir}/ntp \ --enable-all-clocks --enable-parse-clocks \ --enable-linuxcaps +make -perl -pi -e "s|-lelf||" */Makefile +sed -i 's|$ntpq = "ntpq"|$ntpq = "%{_sbindir}/ntpq"|' scripts/ntptrace -make +pushd html +../scripts/html2man +# remove adjacent blank lines +sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] +popd make -C ntpstat-0.2 CFLAGS="$CFLAGS" %install rm -rf $RPM_BUILD_ROOT -%makeinstall bindir=${RPM_BUILD_ROOT}%{_sbindir} +make DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} install -pushd ntpstat-0.2 -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1 -mkdir -p ${RPM_BUILD_ROOT}/%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{5,8} +mv $RPM_BUILD_ROOT%{_mandir}/man1/sntp.1 $RPM_BUILD_ROOT%{_mandir}/man8/sntp.8 +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 755 ntpstat ${RPM_BUILD_ROOT}/%{_bindir}/ -install -m 644 ntpstat.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/ +pushd ntpstat-0.2 +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -m 755 ntpstat $RPM_BUILD_ROOT%{_bindir} +install -m 644 ntpstat.1 $RPM_BUILD_ROOT%{_mandir}/man8/ntpstat.8 popd -pushd man -for i in *.1; do - install -m 644 $i ${RPM_BUILD_ROOT}/%{_mandir}/man1/ -done - -{ cd $RPM_BUILD_ROOT - - mkdir -p .%{_sysconfdir}/ntp - mkdir -p .%{_initrddir} - install -m644 $RPM_SOURCE_DIR/ntp.conf .%{_sysconfdir}/ntp.conf - mkdir -p .%{_var}/lib/ntp - touch .%{_var}/lib/ntp/drift - install -m600 $RPM_SOURCE_DIR/ntp.keys .%{_sysconfdir}/ntp/keys - touch .%{_sysconfdir}/ntp/step-tickers - install -m755 $RPM_SOURCE_DIR/ntpd.init .%{_initrddir}/ntpd - - mkdir -p .%{_sysconfdir}/sysconfig - install -m644 %{SOURCE4} .%{_sysconfdir}/sysconfig/ntpd -} +# fix section numbers +sed -i 's/\(\.TH[a-zA-Z ]*\)[1-9]\(.*\)/\18\2/' $RPM_BUILD_ROOT%{_mandir}/man8/*.8 +cp -r html/man/man[58] $RPM_BUILD_ROOT%{_mandir} + +# prepare html documentation +find html | egrep '\.(html|css|txt|jpg|gif)$' | grep -v '/build/' | cpio -pmd htmldoc +find htmldoc -type f | xargs chmod 644 +find htmldoc -type d | xargs chmod 755 + +pushd $RPM_BUILD_ROOT +mkdir -p .%{_sysconfdir}/{ntp,sysconfig} .%{_initrddir} +mkdir -p .%{_localstatedir}/lib/ntp +touch .%{_localstatedir}/lib/ntp/drift .%{_sysconfdir}/ntp/step-tickers +install -m644 %{SOURCE1} .%{_sysconfdir} +install -m600 %{SOURCE2} .%{_sysconfdir}/ntp/keys +install -m755 %{SOURCE3} .%{_initrddir}/ntpd +install -m644 %{SOURCE4} .%{_sysconfdir}/sysconfig/ntpd +popd %clean rm -rf $RPM_BUILD_ROOT @@ -128,21 +133,24 @@ %post /sbin/chkconfig --add ntpd +: %preun -if [ $1 = 0 ]; then - service ntpd stop > /dev/null 2>&1 - /sbin/chkconfig --del ntpd +if [ "$1" -eq 0 ]; then + /sbin/service ntpd stop &> /dev/null + /sbin/chkconfig --del ntpd fi +: %postun -if [ "$1" -ge "1" ]; then - service ntpd condrestart > /dev/null 2>&1 +if [ "$1" -ge 1 ]; then + /sbin/service ntpd condrestart &> /dev/null fi +: %files %defattr(-,root,root) -%doc html/* NEWS TODO +%doc htmldoc/html/* NEWS TODO %{_sbindir}/ntp-wait %{_sbindir}/ntptrace %{_sbindir}/ntp-keygen @@ -159,13 +167,19 @@ %dir %{_sysconfdir}/ntp %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers %config(noreplace) %{_sysconfdir}/ntp/keys -%dir %attr(-,ntp,ntp) %{_var}/lib/ntp -%ghost %attr(644,ntp,ntp) %{_var}/lib/ntp/drift -%{_mandir}/man1/* +%dir %attr(-,ntp,ntp) %{_localstatedir}/lib/ntp +%ghost %attr(644,ntp,ntp) %{_localstatedir}/lib/ntp/drift +%{_mandir}/man[58]/*.[58]* %{_bindir}/ntpstat %changelog +* Mon Jan 08 2007 Miroslav Lichvar 4.2.4-1 +- update to 4.2.4 (#146884) +- don't use local clock in default config +- autogenerate man pages from HTML +- clean up spec a bit + * Wed Nov 22 2006 Miroslav Lichvar 4.2.2p4-2 - pass additional options to ntpdate (#202204) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 21 Nov 2006 16:27:00 -0000 1.23 +++ sources 8 Jan 2007 12:50:10 -0000 1.24 @@ -1,3 +1,2 @@ 6b2bedefe2e7c63ea52609b222022121 ntpstat-0.2.tgz -28d26352b918a1d77674534a8a6079d3 ntp-4.2.2-manpages-2.tar.gz -916fe57525f8327f340b203f129088fa ntp-4.2.2p4.tar.gz +eb9147d26cbe18bd8fbec07f1df55aef ntp-4.2.4.tar.gz --- ntp-4.2.0-sbinpath.patch DELETED --- --- ntp-4.2.2-droproot.patch DELETED --- --- ntp-4.2.2-linkfastmath.patch DELETED --- --- ntp-4.2.2-loopfilter.patch DELETED --- --- ntp-4.2.2-manycast.patch DELETED --- --- ntp-4.2.2-mlockall.patch DELETED --- --- ntp-4.2.2-sprintf.patch DELETED --- --- ntp-stable-4.2.0a-20040616-groups.patch DELETED --- --- ntp-stable-4.2.0a-20050816-loopback.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 12:51:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 07:51:04 -0500 Subject: rpms/vnc/devel vnc-render.patch,1.17,1.18 Message-ID: <200701081251.l08Cp4FB017060@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16686/vnc/devel Modified Files: vnc-render.patch Log Message: fixed building vnc-render.patch: Imakefile | 2 - Xvnc/xvnc.cc | 50 +++++++++++++++++++++++++++++++++++++++++++++++- module/Imakefile | 2 - vncHooks.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 3 deletions(-) Index: vnc-render.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-render.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vnc-render.patch 8 Jan 2007 12:00:48 -0000 1.17 +++ vnc-render.patch 8 Jan 2007 12:51:02 -0000 1.18 @@ -19,7 +19,7 @@ ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); +#ifdef RENDER -+#if (defined(__ppc__) || defined(__powerpc__)) || defined(__s390__) || defined(__s390x__)) ++#if (defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)) + ErrorF("+/-render turn on/off RENDER extension support" + "(default on)\n"); +#else From fedora-cvs-commits at redhat.com Mon Jan 8 13:04:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 08:04:22 -0500 Subject: rpms/m17n-db/devel si-wijesekera-keymap-rename_key-summary.patch, NONE, 1.1 .cvsignore, 1.54, 1.55 m17n-db.spec, 1.64, 1.65 sources, 1.56, 1.57 Message-ID: <200701081304.l08D4MSA026981@cvs.devel.redhat.com> Author: majain Update of /cvs/dist/rpms/m17n-db/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26856 Modified Files: .cvsignore m17n-db.spec sources Added Files: si-wijesekera-keymap-rename_key-summary.patch Log Message: - Resolves: Bug 221794 - Rebased to new release m17n-db-1.3.4 - Removed patch: si-wijesekera_surrounding_to_preedit.patch - Added directive to delete si-wijesekera from the upstream tarball as it used surrounding text - Commented directive to copy bopo-kbd.mim - Commented directive using variable.mim and command.mim - added global.mim in place of them - Added sections for new Uyghur. - Added copy directive for Mizuochi (grc-*) keymap for classical greek - Added directives to install translations for japanese translations. - Added patch to rename si-wijesekera-preedit to si-wijesekera and add key summary as Patch2 si-wijesekera-keymap-rename_key-summary.patch: si-wijesekera-preedit.mim | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE si-wijesekera-keymap-rename_key-summary.patch --- --- si-wijesekera-preedit.mim 2006-12-05 16:28:57.000000000 +0530 +++ si-wijesekera-preedit.mim.new 2007-01-08 18:26:08.000000000 +0530 @@ -21,11 +21,21 @@ ;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ;; 02111-1307, USA. -(input-method si wijesekera-preedit) +(input-method si wijesekera) (description "Sinhala input method based on SLS 1134 Rev. 2:2004. This input method uses preedit rather than surrounding text. + +Key Summary : +??? --> alt-gr+o +??? --> alt-gr+. +??? --> alt-gr+v +??? --> alt-gr+c +??? --> alt-gr+x +??? --> alt-gr+' + +Key summary: Tyronne Wickramarathne ") (title "??????") Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 2 Jan 2007 09:35:40 -0000 1.54 +++ .cvsignore 8 Jan 2007 13:04:19 -0000 1.55 @@ -13,3 +13,4 @@ m17n-db-indic-0.4.39.tar.gz m17n-db-indic-0.4.40.tar.gz m17n-db-indic-0.4.41.tar.gz +m17n-db-1.3.4.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- m17n-db.spec 2 Jan 2007 09:35:40 -0000 1.64 +++ m17n-db.spec 8 Jan 2007 13:04:19 -0000 1.65 @@ -2,8 +2,8 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.3.3 -Release: 44%{?dist} +Version: 1.3.4 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html @@ -12,7 +12,7 @@ BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: bn-itrans-t-182227.patch -Patch2: si-wijesekera_surrounding_to_preedit.patch +Patch2: si-wijesekera-keymap-rename_key-summary.patch %description @@ -350,6 +350,15 @@ %description vietnamese m17n-db Vietnamese input map. + +%package Uyghur +Summary: m17n-db input table for Uyghur +Group: System Environment/Libraries + +%description Uyghur +m17n-db Uyghur input map. + + %package urdu Summary: m17n-db input table for Urdu Group: System Environment/Libraries @@ -361,7 +370,8 @@ %prep %setup -q -a1 %patch1 -p1 -b .1 -%patch2 -p1 -b .2 +%patch2 -p0 -b .2 + %build %configure @@ -382,9 +392,15 @@ # don't ship unijoy map for now rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png} +# dont install si-wijesekera.mim as si-wijesekera-predit.mim works for us, see RH bug 208104 +rm $RPM_BUILD_ROOT%{_datadir}/m17n/si-wijesekera.mim + # drop pkgconfig file for now rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc +# For installing the translation files +%find_lang %name + %clean rm -rf $RPM_BUILD_ROOT @@ -396,7 +412,8 @@ %dir %{_datadir}/m17n %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl -%{_datadir}/m17n/command.mim +#%{_datadir}/m17n/command.mim +%{_datadir}/m17n/global.mim %files datafiles %defattr(-,root,root) @@ -411,7 +428,8 @@ %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/cjk-*.mim -%{_datadir}/m17n/variable.mim +#%{_datadir}/m17n/variable.mim +%{_datadir}/m17n/global.mim %files amharic @@ -454,7 +472,7 @@ %dir %{_datadir}/m17n %{_datadir}/m17n/zh-*.mim %{_datadir}/m17n/icons/zh-*.png -%{_datadir}/m17n/bopo-*.mim +#%{_datadir}/m17n/bopo-*.mim %{_datadir}/m17n/icons/bopo-*.png @@ -499,6 +517,7 @@ %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/el-*.mim +%{_datadir}/m17n/grc-*.mim %{_datadir}/m17n/icons/el-*.png @@ -523,7 +542,7 @@ %{_datadir}/m17n/icons/hi-*.png -%files japanese +%files japanese -f %{name}.lang %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ja-*.mim @@ -691,6 +710,13 @@ %{_datadir}/m17n/icons/vi-*.png +%files Uyghur +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/ug-*.mim + + + %files urdu %defattr(-,root,root) %dir %{_datadir}/m17n @@ -699,6 +725,17 @@ %changelog +* Tue Jan 8 2007 Mayank Jain +- Resolves: Bug 221794 - Rebased to new release m17n-db-1.3.4 +- Removed patch: si-wijesekera_surrounding_to_preedit.patch +- Added directive to delete si-wijesekera from the upstream tarball as it used surrounding text +- Commented directive to copy bopo-kbd.mim +- Commented directive using variable.mim and command.mim - added global.mim in place of them +- Added sections for new Uyghur. +- Added copy directive for Mizuochi (grc-*) keymap for classical greek +- Added directives to install translations for japanese translations. +- Added patch to rename si-wijesekera-preedit to si-wijesekera and add key summary as Patch2 + * Tue Jan 2 2007 Mayank Jain - Resolves: Bug 221122: [hi_IN-remington] vowels in hi-remington are not typed correctly Index: sources =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 2 Jan 2007 09:35:40 -0000 1.56 +++ sources 8 Jan 2007 13:04:19 -0000 1.57 @@ -1,2 +1,2 @@ -a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz 0ca75078a8b01375d03b85a2749545ae m17n-db-indic-0.4.41.tar.gz +41dee6d06743b83a6950d5d0a500cef6 m17n-db-1.3.4.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 8 13:08:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 08:08:27 -0500 Subject: rpms/gawk/FC-6 gawk-3.1.5-freewstr.patch, NONE, 1.1 gawk.spec, 1.43, 1.44 Message-ID: <200701081308.l08D8RmZ030158@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gawk/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30093 Modified Files: gawk.spec Added Files: gawk-3.1.5-freewstr.patch Log Message: * Mon Jan 8 2007 Karel Zak 3.1.5-12 - fix #221827 - double free or corruption (patch from upstream) - Resolves: rhbz#221830 gawk-3.1.5-freewstr.patch: awk.h | 3 ++ builtin.c | 7 +++--- eval.c | 8 ------- node.c | 64 ++++++++++++++++++++++++++++++-------------------------------- 4 files changed, 39 insertions(+), 43 deletions(-) --- NEW FILE gawk-3.1.5-freewstr.patch --- --- gawk-3.1.5/builtin.c.freewstr 2005-07-26 20:07:43.000000000 +0200 +++ gawk-3.1.5/builtin.c 2007-01-08 13:29:45.000000000 +0100 @@ -2089,9 +2089,9 @@ } free(buf); - if (wc_indices != NULL) - free(wc_indices); } + if (wc_indices != NULL) + free(wc_indices); } else { /* match failed */ rstart = 0; rlength = -1; @@ -2462,6 +2462,8 @@ free(t->stptr); t->stptr = buf; t->stlen = textlen; + free_wstr(t); + t->flags &= ~(NUMCUR|NUMBER); free_temp(s); if (matches > 0 && lhs) { @@ -2471,7 +2473,6 @@ } if (after_assign != NULL) (*after_assign)(); - t->flags &= ~(NUMCUR|NUMBER); } if (mb_indices != NULL) free(mb_indices); --- gawk-3.1.5/awk.h.freewstr 2005-07-26 20:07:43.000000000 +0200 +++ gawk-3.1.5/awk.h 2007-01-08 12:31:26.000000000 +0100 @@ -1166,6 +1166,9 @@ #define force_wstring(n) str2wstr(n, NULL) extern const wchar_t *wstrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len)); extern const wchar_t *wcasestrstr P((const wchar_t *haystack, size_t hs_len, const wchar_t *needle, size_t needle_len)); +extern void free_wstr P((NODE *n)); +#else +#define free_wstr(NODE) /* empty */ #endif /* re.c */ extern Regexp *make_regexp P((const char *s, size_t len, int ignorecase, int dfa)); --- gawk-3.1.5/node.c.freewstr 2007-01-08 12:31:26.000000000 +0100 +++ gawk-3.1.5/node.c 2007-01-08 12:41:48.000000000 +0100 @@ -218,15 +218,7 @@ no_malloc: s->stref = 1; s->flags |= STRCUR; -#if defined MBS_SUPPORT - if ((s->flags & WSTRCUR) != 0) { - assert(s->wstptr != NULL); - free(s->wstptr); - s->wstptr = NULL; - s->wstlen = 0; - s->flags &= ~WSTRCUR; - } -#endif + free_wstr(s); return s; } @@ -289,8 +281,14 @@ *r = *n; r->flags &= ~(PERM|TEMP|FIELD); r->flags |= MALLOC; -#if defined MBS_SUPPORT +#ifdef MBS_SUPPORT + /* + * DON'T call free_wstr(r) here! + * r->wstptr still points at n->wstptr's value, and we + * don't want to free it! + */ r->wstptr = NULL; + r->wstlen = 0; #endif /* defined MBS_SUPPORT */ if (n->type == Node_val && (n->flags & STRCUR) != 0) { r->stref = 1; @@ -346,11 +344,7 @@ r->stref = 1; r->stptr = NULL; r->stlen = 0; -#if defined MBS_SUPPORT - r->wstptr = NULL; - r->wstlen = 0; - r->flags &= ~WSTRCUR; -#endif /* MBS_SUPPORT */ + free_wstr(r); #endif /* GAWKDEBUG */ return r; } @@ -365,10 +359,11 @@ getnode(r); r->type = Node_val; r->flags = (STRING|STRCUR|MALLOC); -#if defined MBS_SUPPORT +#ifdef MBS_SUPPORT r->wstptr = NULL; r->wstlen = 0; -#endif +#endif /* defined MBS_SUPPORT */ + if (flags & ALREADY_MALLOCED) r->stptr = s; else { @@ -512,20 +507,13 @@ return; } free(tmp->stptr); -#if defined MBS_SUPPORT - if (tmp->wstptr != NULL) { - assert((tmp->flags & WSTRCUR) != 0); - free(tmp->wstptr); - } - tmp->flags &= ~WSTRCUR; - tmp->wstptr = NULL; - tmp->wstlen = 0; -#endif + free_wstr(tmp); } freenode(tmp); return; } if ((tmp->flags & FIELD) != 0) { + free_wstr(tmp); freenode(tmp); return; } @@ -708,11 +696,8 @@ fall through and recompute to fill in the array */ } - if (n->wstptr != NULL) { - free(n->wstptr); - n->wstptr = NULL; - n->wstlen = 0; - } + if (n->wstptr != NULL) + free_wstr(n); /* * After consideration and consultation, this @@ -777,6 +762,20 @@ return n; } +/* free_wstr --- release the wide string part of a node */ + +void +free_wstr(NODE *n) +{ + if ((n->flags & WSTRCUR) != 0) { + assert(n->wstptr != NULL); + free(n->wstptr); + n->wstptr = NULL; + n->wstlen = 0; + n->flags &= ~WSTRCUR; + } +} + #if 0 static void dump_wstr(FILE *fp, const wchar_t *str, size_t len) @@ -839,11 +838,10 @@ h = towlower(*start); n = towlower(needle[j]); if (h != n) - goto out; + continue; } return haystack + i; } -out: ; } return NULL; --- gawk-3.1.5/eval.c.freewstr 2007-01-08 12:31:26.000000000 +0100 +++ gawk-3.1.5/eval.c 2007-01-08 12:31:26.000000000 +0100 @@ -1176,13 +1176,7 @@ memcpy(l->stptr + l->stlen, r->stptr, r->stlen); l->stlen += r->stlen; l->stptr[l->stlen] = '\0'; -#if defined MBS_SUPPORT - if (r->wstptr != NULL) - free(r->wstptr); - r->wstptr = NULL; - r->wstlen = 0; - r->flags &= ~WSTRCUR; -#endif /* MBS_SUPPORT */ + free_wstr(l); } else { char *nval; size_t nlen = l->stlen + r->stlen + 2; Index: gawk.spec =================================================================== RCS file: /cvs/dist/rpms/gawk/FC-6/gawk.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- gawk.spec 19 Jul 2006 21:52:37 -0000 1.43 +++ gawk.spec 8 Jan 2007 13:08:25 -0000 1.44 @@ -1,7 +1,7 @@ Summary: The GNU version of the awk text processing utility. Name: gawk Version: 3.1.5 -Release: 11 +Release: 12%{dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/gawk/gawk-%{version}.tar.bz2 @@ -21,7 +21,7 @@ Patch4: gawk-3.1.5-binmode.patch Patch5: gawk-3.1.5-num2str.patch Patch6: gawk-3.1.5-wconcat.patch -# fix internal names like /dev/user, /dev/pid, as well as /dev/fd/N +# fix internal names like /dev/user, /dev/pid, as well as /dev/fd/N Patch7: gawk-3.1.5-internal.patch # 194214 - gawk coredumps on syntax error Patch8: gawk-3.1.5-syntaxerror.patch @@ -29,6 +29,8 @@ Patch9: gawk-3.1.5-numflags.patch # IPv6 support Patch10: gawk-3.1.5-ipv6.patch +# 221827 - double free or corruption +Patch11: gawk-3.1.5-freewstr.patch %description The gawk packages contains the GNU version of awk, a text processing @@ -50,6 +52,7 @@ %patch8 -p1 -b .syntaxerror %patch9 -p1 -b .numflag %patch10 -p1 -b .ipv6 +%patch11 -p1 -b .freewstr %build %configure @@ -98,6 +101,9 @@ %{_datadir}/awk %changelog +* Mon Jan 8 2007 Karel Zak 3.1.5-12 +- fix #221827 - double free or corruption (patch from upstream) + * Wed Jul 19 2006 Karel Zak 3.1.5-11 - spec file cleanup From fedora-cvs-commits at redhat.com Mon Jan 8 13:15:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 08:15:28 -0500 Subject: rpms/gcc/FC-5 .cvsignore, 1.143, 1.144 gcc41.spec, 1.51, 1.52 sources, 1.145, 1.146 Message-ID: <200701081315.l08DFSTE003115@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3075 Modified Files: .cvsignore gcc41.spec sources Log Message: 4.1.1-51.fc5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/.cvsignore,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- .cvsignore 7 Jan 2007 22:08:06 -0000 1.143 +++ .cvsignore 8 Jan 2007 13:15:25 -0000 1.144 @@ -1 +1 @@ -gcc-4.1.1-20070107.tar.bz2 +gcc-4.1.1-20070108.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gcc41.spec 8 Jan 2007 08:15:51 -0000 1.51 +++ gcc41.spec 8 Jan 2007 13:15:25 -0000 1.52 @@ -1,4 +1,4 @@ -%define DATE 20070107 +%define DATE 20070108 %define gcc_version 4.1.1 %define gcc_release 51 %define _unpackaged_files_terminate_build 0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/sources,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- sources 7 Jan 2007 22:08:06 -0000 1.145 +++ sources 8 Jan 2007 13:15:25 -0000 1.146 @@ -1 +1 @@ -7a420c5a8dc3fee9f99b4264e2add137 gcc-4.1.1-20070107.tar.bz2 +f6e569c2edd6cc7519e9b162ef5ac7e5 gcc-4.1.1-20070108.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 8 13:15:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 08:15:51 -0500 Subject: rpms/gcc/FC-5 gcc41.spec,1.52,1.53 Message-ID: <200701081315.l08DFpIw003424@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3384 Modified Files: gcc41.spec Log Message: 4.1.1-51.fc5 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-5/gcc41.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gcc41.spec 8 Jan 2007 13:15:25 -0000 1.52 +++ gcc41.spec 8 Jan 2007 13:15:48 -0000 1.53 @@ -1505,7 +1505,7 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog -* Fri Jan 5 2007 Jakub Jelinek 4.1.1-51.fc5 +* Mon Jan 8 2007 Jakub Jelinek 4.1.1-51.fc5 - update from gcc-4_1-branch (-r120325:120507) - PRs c++/30382, middle-end/27826, middle-end/28116, tree-optimization/30212 From fedora-cvs-commits at redhat.com Mon Jan 8 13:38:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 08:38:14 -0500 Subject: rpms/gtkhtml3/devel paragraph-style.c, NONE, 1.1 paragraph-style.h, NONE, 1.1 gtkhtml3.spec, 1.80, 1.81 gtkhtml-3.12.1-warn-incompatible-pointer-type.patch, 1.1, NONE gtkhtml-3.13.1-compiler-warnings.patch, 1.1, NONE Message-ID: <200701081338.l08DcEI9031342@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31328 Modified Files: gtkhtml3.spec Added Files: paragraph-style.c paragraph-style.h Removed Files: gtkhtml-3.12.1-warn-incompatible-pointer-type.patch gtkhtml-3.13.1-compiler-warnings.patch Log Message: * Mon Jan 08 2007 Matthew Barnes - 3.13.4-2.fc7 - Add patch for GNOME bug #394182 (code cleanup). - Remove patch for GNOME bug #363036 (superseded). --- NEW FILE paragraph-style.c --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* This file is part of the GtkHTML library. Copyright (C) 2007 Novell, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gtkhtml.h" #include "paragraph-style.h" static struct { GtkHTMLParagraphStyle style; const gchar *description; gboolean sensitive_html; gboolean sensitive_plain; } paragraph_style_data[] = { { GTK_HTML_PARAGRAPH_STYLE_NORMAL, N_("Normal"), TRUE, TRUE }, { GTK_HTML_PARAGRAPH_STYLE_PRE, N_("Preformat"), TRUE, TRUE }, { GTK_HTML_PARAGRAPH_STYLE_ITEMDOTTED, N_("Bulleted List"), TRUE, TRUE }, { GTK_HTML_PARAGRAPH_STYLE_ITEMDIGIT, N_("Numbered List"), TRUE, TRUE }, { GTK_HTML_PARAGRAPH_STYLE_ITEMROMAN, N_("Roman List"), TRUE, TRUE }, { GTK_HTML_PARAGRAPH_STYLE_ITEMALPHA, N_("Alphabetical List"), TRUE, TRUE }, { GTK_HTML_PARAGRAPH_STYLE_H1, N_("Header 1"), TRUE, FALSE }, { GTK_HTML_PARAGRAPH_STYLE_H2, N_("Header 2"), TRUE, FALSE }, { GTK_HTML_PARAGRAPH_STYLE_H3, N_("Header 3"), TRUE, FALSE }, { GTK_HTML_PARAGRAPH_STYLE_H4, N_("Header 4"), TRUE, FALSE }, { GTK_HTML_PARAGRAPH_STYLE_H5, N_("Header 5"), TRUE, FALSE }, { GTK_HTML_PARAGRAPH_STYLE_H6, N_("Header 6"), TRUE, FALSE }, { GTK_HTML_PARAGRAPH_STYLE_ADDRESS, N_("Address"), TRUE, FALSE } }; enum { PARAGRAPH_STYLE_COLUMN_TEXT, PARAGRAPH_STYLE_COLUMN_SENSITIVE }; static GtkListStore * paragraph_style_get_store (GtkHTMLControlData *cd) { GtkTreeIter iter; gint ii; if (cd->paragraph_style_store != NULL) goto exit; cd->paragraph_style_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN); for (ii = 0; ii < G_N_ELEMENTS (paragraph_style_data); ii++) { gtk_list_store_append (cd->paragraph_style_store, &iter); gtk_list_store_set ( cd->paragraph_style_store, &iter, PARAGRAPH_STYLE_COLUMN_TEXT, gettext (paragraph_style_data[ii].description), PARAGRAPH_STYLE_COLUMN_SENSITIVE, cd->format_html ? paragraph_style_data[ii].sensitive_html : paragraph_style_data[ii].sensitive_plain, -1); } exit: return cd->paragraph_style_store; } static gint paragraph_style_lookup (GtkHTMLParagraphStyle style) { gint ii; for (ii = 0; ii < G_N_ELEMENTS (paragraph_style_data); ii++) if (paragraph_style_data[ii].style == style) return ii; g_assert_not_reached (); } static void active_paragraph_style_changed_cb (GtkComboBox *combo_box, GtkHTMLControlData *cd) { GtkHTMLParagraphStyle style; gint index; index = gtk_combo_box_get_active (combo_box); style = paragraph_style_data[index].style; gtk_html_set_paragraph_style (cd->html, style); } static void current_paragraph_style_changed_cb (GtkHTML *html, GtkHTMLParagraphStyle style, GtkComboBox *combo_box) { gint index; index = paragraph_style_lookup (style); if (index != gtk_combo_box_get_active (combo_box)) gtk_combo_box_set_active (combo_box, index); } GtkWidget * paragraph_style_combo_box_new (GtkHTMLControlData *cd) { GtkListStore *store; GtkCellRenderer *renderer; GtkWidget *combo_box; g_return_val_if_fail (cd != NULL, NULL); store = paragraph_style_get_store (cd); renderer = gtk_cell_renderer_text_new (); combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)); gtk_cell_layout_pack_start ( GTK_CELL_LAYOUT (combo_box), renderer, TRUE); gtk_cell_layout_set_attributes ( GTK_CELL_LAYOUT (combo_box), renderer, "text", PARAGRAPH_STYLE_COLUMN_TEXT, "sensitive", PARAGRAPH_STYLE_COLUMN_SENSITIVE, NULL); /* activate the current paragraph style */ current_paragraph_style_changed_cb ( cd->html, gtk_html_get_paragraph_style (cd->html), GTK_COMBO_BOX (combo_box)); g_signal_connect ( combo_box, "changed", G_CALLBACK (active_paragraph_style_changed_cb), cd); g_signal_connect ( cd->html, "current_paragraph_style_changed", G_CALLBACK (current_paragraph_style_changed_cb), combo_box); gtk_widget_show (combo_box); return combo_box; } void paragraph_style_update_store (GtkHTMLControlData *cd) { GtkListStore *store; GtkTreeIter iter; gboolean iterating; gint ii = 0; g_return_if_fail (cd != NULL); store = paragraph_style_get_store (cd); iterating = gtk_tree_model_get_iter_first ( GTK_TREE_MODEL (store), &iter); while (iterating) { gtk_list_store_set ( store, &iter, PARAGRAPH_STYLE_COLUMN_SENSITIVE, cd->format_html ? paragraph_style_data[ii++].sensitive_html : paragraph_style_data[ii++].sensitive_plain, -1); iterating = gtk_tree_model_iter_next ( GTK_TREE_MODEL (store), &iter); } } --- NEW FILE paragraph-style.h --- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* This file is part of the GtkHTML library. Copyright (C) 2007 Novell, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef _PARAGRAPH_STYLE_H #define _PARAGRAPH_STYLE_H #include #include "control-data.h" GtkWidget * paragraph_style_combo_box_new (GtkHTMLControlData *cd); void paragraph_style_update_store (GtkHTMLControlData *cd); #endif /* _PARAGRAPH_STYLE_H */ Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- gtkhtml3.spec 19 Dec 2006 18:34:12 -0000 1.80 +++ gtkhtml3.spec 8 Jan 2007 13:38:12 -0000 1.81 @@ -9,11 +9,13 @@ Name: gtkhtml3 Version: 3.13.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/GPL Group: System Environment/Libraries Summary: gtkhtml library Source: gtkhtml-%{version}.tar.bz2 +Source1: paragraph-style.c +Source2: paragraph-style.h BuildRoot: %{_tmppath}/gtkhtml-%{version}-root ### Patches ### @@ -26,12 +28,12 @@ Patch3: gtkhtml-fix-indic-navigation-129212.patch Patch4: gtkhtml-3.10.0-im-too-late.patch -# GNOME bug #363036 -Patch5: gtkhtml-3.13.1-compiler-warnings.patch - # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch6: gtkhtml-3.13.1-no-gnome-common.patch +Patch5: gtkhtml-3.13.1-no-gnome-common.patch + +# GNOME bug #394182 +Patch6: gtkhtml-3.13.4-code-cleanup.patch ### Dependencies ### @@ -72,8 +74,31 @@ %patch1 -p1 -b .crash %patch3 -p1 -b .fix-129212 %patch4 -p1 -b .im-too-late -%patch5 -p1 -b .compiler-warnings -%patch6 -p1 -b .no-gnome-common +%patch5 -p1 -b .no-gnome-common +%patch6 -p1 -b .code-cleanup + +# GNOME bug #394182 +cp %{SOURCE1} %{SOURCE2} components/html-editor +cd art +rm ??_copy.png +rm ??_cut.png +rm ??_paste.png +rm font-tt-??.png +rm insert-image-??.png +rm insert-link-??.png +rm insert-object-??.png +rm insert-rule-??.png +rm insert-table-??.png +rm properties-??.png +rm redo-??.png +rm search-??.png +rm search-and-replace-??.png +rm smiley-*.png +rm table-column-??.png +rm table-row-??.png +rm table-table-??.png +rm undo-??.png +cd - %build @@ -112,7 +137,6 @@ for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done -rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.servere %find_lang gtkhtml-%{gtkhtml_major} @@ -139,6 +163,10 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jan 08 2007 Matthew Barnes - 3.13.4-2.fc7 +- Add patch for GNOME bug #394182 (code cleanup). +- Remove patch for GNOME bug #363036 (superseded). + * Tue Dec 19 2006 Matthew Barnes - 3.13.4-1.fc7 - Update to 3.13.4 --- gtkhtml-3.12.1-warn-incompatible-pointer-type.patch DELETED --- --- gtkhtml-3.13.1-compiler-warnings.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 13:41:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 08:41:31 -0500 Subject: rpms/gtkhtml3/devel gtkhtml-3.13.4-code-cleanup.patch,NONE,1.1 Message-ID: <200701081341.l08DfVVw031505@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31490 Added Files: gtkhtml-3.13.4-code-cleanup.patch Log Message: - Forgot to commit patch. gtkhtml-3.13.4-code-cleanup.patch: a11y/hyperlink.c | 20 a11y/hyperlink.h | 6 a11y/text.c | 2 art/Makefile.am | 41 components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in | 95 - components/html-editor/GNOME_GtkHTML_Editor.xml.in | 112 - components/html-editor/Makefile.am | 2 components/html-editor/body.c | 38 components/html-editor/cell.c | 73 - components/html-editor/cell.h | 2 components/html-editor/control-data.c | 8 components/html-editor/control-data.h | 3 components/html-editor/dialog.c | 26 components/html-editor/dialog.h | 4 components/html-editor/e-html-utils.c | 34 components/html-editor/editor-control-factory.c | 10 components/html-editor/gi-color-combo.c | 6 components/html-editor/gi-color-palette.c | 47 components/html-editor/gi-color-palette.h | 4 components/html-editor/gi-combo-box.c | 34 components/html-editor/gtkhtml-editor-properties.glade | 869 +++++---------- components/html-editor/html-stream-mem.c | 2 components/html-editor/htmlsourceview.c | 6 components/html-editor/image.c | 42 components/html-editor/image.h | 2 components/html-editor/link.c | 1 components/html-editor/link.h | 2 components/html-editor/menubar.c | 235 ++-- components/html-editor/paragraph.c | 60 - components/html-editor/persist-stream.c | 4 components/html-editor/popup.c | 25 components/html-editor/properties.c | 5 components/html-editor/properties.h | 4 components/html-editor/replace.c | 22 components/html-editor/replace.h | 2 components/html-editor/rule.c | 51 components/html-editor/rule.h | 2 components/html-editor/search.c | 7 components/html-editor/search.h | 1 components/html-editor/spellchecker.c | 2 components/html-editor/table.c | 56 components/html-editor/table.h | 2 components/html-editor/template.c | 4 components/html-editor/template.h | 2 components/html-editor/test-html-editor-control.c | 10 components/html-editor/text.c | 16 components/html-editor/toolbar.c | 253 +--- components/html-editor/utils.c | 2 components/html-editor/utils.h | 3 configure.in | 2 src/gtkhtml.c | 47 src/htmlclueflow.c | 44 src/htmlcursor.c | 8 src/htmlembedded.c | 2 src/htmlengine-edit-cursor.c | 8 src/htmlengine-edit-selection-updater.c | 10 src/htmlengine-edit-text.c | 2 src/htmlengine-save.c | 8 src/htmlengine.c | 16 src/htmlgdkpainter.c | 8 src/htmliframe.c | 4 src/htmlimage.c | 16 src/htmlinterval.c | 2 src/htmlobject.c | 2 src/htmlprinter.c | 2 src/htmltextslave.c | 9 src/test.c | 12 src/testgtkhtml.c | 81 - 68 files changed, 1024 insertions(+), 1518 deletions(-) --- NEW FILE gtkhtml-3.13.4-code-cleanup.patch --- --- gtkhtml-3.13.4/a11y/text.c.code-cleanup 2006-12-04 08:12:51.000000000 -0500 +++ gtkhtml-3.13.4/a11y/text.c 2007-01-07 10:20:40.000000000 -0500 @@ -946,7 +946,7 @@ x -= html_x; y -= html_y; - return_obj = html_engine_get_object_at (top_e, x, y, &offset, FALSE); + return_obj = html_engine_get_object_at (top_e, x, y, (guint *) &offset, FALSE); if (obj == return_obj) return offset; --- gtkhtml-3.13.4/a11y/hyperlink.c.code-cleanup 2005-04-05 05:27:32.000000000 -0400 +++ gtkhtml-3.13.4/a11y/hyperlink.c 2007-01-07 10:20:40.000000000 -0500 @@ -92,9 +92,9 @@ { HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (obj); - if (hl->a11y) - g_object_remove_weak_pointer (G_OBJECT (hl->a11y), - (gpointer *) &hl->a11y); + if (hl->a11y.object) + g_object_remove_weak_pointer (G_OBJECT (hl->a11y.object), + &hl->a11y.weakref); G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -104,7 +104,7 @@ html_a11y_hyper_link_get_start_index (AtkHyperlink *link) { HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (link); - HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y)); + HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y.object)); Link *a = (Link *) g_slist_nth_data (text->links, hl->num); return a ? a->start_offset : -1; } @@ -114,7 +114,7 @@ html_a11y_hyper_link_get_end_index (AtkHyperlink *link) { HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (link); - Link *a = (Link *) g_slist_nth_data (HTML_TEXT (HTML_A11Y_HTML (hl->a11y))->links, hl->num); + Link *a = (Link *) g_slist_nth_data (HTML_TEXT (HTML_A11Y_HTML (hl->a11y.object))->links, hl->num); return a ? a->end_offset : -1; } @@ -145,10 +145,10 @@ hl = HTML_A11Y_HYPER_LINK (g_object_new (G_TYPE_HTML_A11Y_HYPER_LINK, NULL)); - hl->a11y = a11y; + hl->a11y.object = a11y; hl->num = link_index; hl->offset = ((Link *) g_slist_nth_data (HTML_TEXT (HTML_A11Y_HTML (a11y))->links, link_index))->start_offset; - g_object_add_weak_pointer (G_OBJECT (hl->a11y), (gpointer *) &hl->a11y); + g_object_add_weak_pointer (G_OBJECT (hl->a11y.object), &hl->a11y.weakref); return ATK_HYPERLINK (hl); } @@ -165,13 +165,13 @@ hl = HTML_A11Y_HYPER_LINK (action); - if (i == 0 && hl->a11y) { - HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y)); + if (i == 0 && hl->a11y.object) { + HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hl->a11y.object)); gchar *url = html_object_get_complete_url (HTML_OBJECT (text), hl->offset); if (url && *url) { GObject *gtkhtml = GTK_HTML_A11Y_GTKHTML_POINTER - (html_a11y_get_gtkhtml_parent (HTML_A11Y (hl->a11y))); + (html_a11y_get_gtkhtml_parent (HTML_A11Y (hl->a11y.object))); g_signal_emit_by_name (gtkhtml, "link_clicked", url); result = TRUE; --- gtkhtml-3.13.4/a11y/hyperlink.h.code-cleanup 2005-04-05 05:27:32.000000000 -0400 +++ gtkhtml-3.13.4/a11y/hyperlink.h 2007-01-07 10:20:40.000000000 -0500 @@ -43,7 +43,11 @@ struct _HTMLA11YHyperLink { AtkHyperlink atk_hyper_link; - HTMLA11Y *a11y; + /* use the union for valid type-punning */ + union { + HTMLA11Y *object; + gpointer weakref; + } a11y; gint num; gint offset; gchar *description; --- gtkhtml-3.13.4/configure.in.code-cleanup 2007-01-07 10:19:52.000000000 -0500 +++ gtkhtml-3.13.4/configure.in 2007-01-07 10:20:40.000000000 -0500 @@ -22,7 +22,7 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) -I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\" -DBONOBO_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\"" +I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\"" AC_SUBST(I18N_LIB_CFLAGS) AM_INIT_AUTOMAKE($PACKAGE, 3.13.4) --- gtkhtml-3.13.4/components/html-editor/replace.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400 +++ gtkhtml-3.13.4/components/html-editor/replace.c 2007-01-07 10:20:40.000000000 -0500 @@ -26,8 +26,6 @@ #else #include #endif -#include -#include #include "replace.h" #include "dialog.h" #include "htmlengine.h" @@ -77,7 +75,6 @@ ask_dialog_new (HTMLEngine *e) { GtkHTMLReplaceAskDialog *d; - char *filename; d = g_new (GtkHTMLReplaceAskDialog, 1); /* we use CANCEL response for close, because we want Esc to close the dialog - see gtkdialog.c */ @@ -90,9 +87,7 @@ d->engine = e; d->finished = FALSE; - filename = g_build_filename (ICONDIR, "search-and-replace-24.png", NULL); - gnome_window_icon_set_from_file (GTK_WINDOW (d->dialog), filename); - g_free (filename); + gtk_window_set_icon_name (GTK_WINDOW (d->dialog), "gtk-find-and-replace"); g_signal_connect (d->dialog, "response", G_CALLBACK (ask_dialog_response), d); @@ -147,8 +142,11 @@ GTK_TOGGLE_BUTTON (d->backward)->active == 0, FALSE, ask, d); break; - case GTK_RESPONSE_CANCEL: + case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_CLOSE: + case GTK_RESPONSE_CANCEL: + d->cd->replace_dialog = NULL; + gtk_html_replace_dialog_destroy (d); gtk_widget_grab_focus (GTK_WIDGET (d->html)); break; } @@ -168,7 +166,6 @@ GtkWidget *hbox, *vbox; GtkWidget *table; GtkWidget *label; - gchar *filename; /* we use CANCEL response for close, because we want Esc to close the dialog - see gtkdialog.c */ dialog->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Replace"), NULL, 0, @@ -219,9 +216,7 @@ gtk_widget_show_all (table); gtk_widget_show_all (hbox); - filename = g_build_filename (ICONDIR, "search-and-replace-24.png", NULL); - gnome_window_icon_set_from_file (GTK_WINDOW (dialog->dialog), filename); - g_free (filename); + gtk_window_set_icon_name (GTK_WINDOW (dialog->dialog), "gtk-find-and-replace"); gtk_widget_grab_focus (dialog->entry_search); @@ -237,7 +232,6 @@ void replace (GtkHTMLControlData *cd) { - RUN_DIALOG (replace, _("Replace")); - gtk_html_replace_dialog_destroy (cd->replace_dialog); - cd->replace_dialog = NULL; + run_dialog (&cd->replace_dialog->dialog, cd->html, cd, + (DialogCtor) gtk_html_replace_dialog_new, _("Replace")); } --- gtkhtml-3.13.4/components/html-editor/utils.c.code-cleanup 2005-10-28 06:04:26.000000000 -0400 +++ gtkhtml-3.13.4/components/html-editor/utils.c 2007-01-07 10:20:40.000000000 -0500 @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "utils.h" #include "properties.h" --- gtkhtml-3.13.4/components/html-editor/e-html-utils.c.code-cleanup 2005-09-11 00:04:18.000000000 -0400 +++ gtkhtml-3.13.4/components/html-editor/e-html-utils.c 2007-01-07 10:20:40.000000000 -0500 @@ -80,7 +80,7 @@ return NULL; } - out = g_strndup (*text, end - *text); + out = g_strndup ((const gchar *) *text, end - *text); *text = end; return out; } @@ -111,7 +111,7 @@ if (dot > end) return NULL; - addr = g_strndup (start, end - start); [...4497 lines suppressed...] gdk_gc_get_values (p->gc, &values); - dash [0] = 1; - dash [1] = 1; gdk_gc_set_line_attributes (p->gc, 1, GDK_LINE_ON_OFF_DASH, values.cap_style, values.join_style); - gdk_gc_set_dashes (p->gc, 2, dash, 2); + gdk_gc_set_dashes (p->gc, 2, dash_list, 2); gdk_draw_rectangle (p->pixmap, p->gc, 0, box->x - p->x1, box->y - p->y1, box->width - 1, box->height - 1); gdk_gc_set_line_attributes (p->gc, 1, values.line_style, values.cap_style, values.join_style); } --- gtkhtml-3.13.4/src/htmlgdkpainter.c.code-cleanup 2006-11-06 00:41:00.000000000 -0500 +++ gtkhtml-3.13.4/src/htmlgdkpainter.c 2007-01-07 10:20:40.000000000 -0500 @@ -675,7 +675,7 @@ { HTMLGdkPainter *gdk_painter; GdkGCValues values; - gchar dash [2]; + gint8 dash_list[] = { 2, 2 }; gdk_painter = HTML_GDK_PAINTER (painter); @@ -684,12 +684,10 @@ gdk_gc_get_values (gdk_painter->gc, &values); gdk_gc_set_fill (gdk_painter->gc, GDK_OPAQUE_STIPPLED); - dash [0] = 2; - dash [1] = 2; gdk_gc_set_line_attributes (gdk_painter->gc, 1, GDK_LINE_ON_OFF_DASH, values.cap_style, values.join_style); - gdk_gc_set_dashes (gdk_painter->gc, 2, dash, 2); + gdk_gc_set_dashes (gdk_painter->gc, 2, dash_list, 2); gdk_draw_line (gdk_painter->pixmap, gdk_painter->gc, x, y, x + width, y); - gdk_gc_set_dashes (gdk_painter->gc, 0, dash, 2); + gdk_gc_set_dashes (gdk_painter->gc, 0, dash_list, 2); gdk_draw_line (gdk_painter->pixmap, gdk_painter->gc, x, y + 1, x + width, y + 1); gdk_gc_set_line_attributes (gdk_painter->gc, values.line_width, values.line_style, values.cap_style, values.join_style); --- gtkhtml-3.13.4/src/htmlclueflow.c.code-cleanup 2006-06-12 08:06:06.000000000 -0400 +++ gtkhtml-3.13.4/src/htmlclueflow.c 2007-01-07 10:20:40.000000000 -0500 @@ -1996,14 +1996,14 @@ g_string_append (out, "\n"); } else { PangoAttrList *attrs = pango_attr_list_new (); - gint bytes = html_engine_save_buffer_peek_text_bytes (buffer_state), slen = g_utf8_strlen (s, -1), i, clen, n_items; + gint bytes = html_engine_save_buffer_peek_text_bytes (buffer_state), slen = g_utf8_strlen ((gchar *) s, -1), i, clen, n_items; GList *items_list, *cur; PangoContext *pc = state->engine->painter->pango_context; PangoLogAttr *lattrs; PangoItem **items; gint len, width, skip; - items_list = pango_itemize (pc, s, 0, bytes, attrs, NULL); + items_list = pango_itemize (pc, (gchar *) s, 0, bytes, attrs, NULL); lattrs = g_new (PangoLogAttr, slen + 1); n_items = g_list_length (items_list); items = g_new (PangoItem *, n_items); @@ -2028,10 +2028,10 @@ break; } - pango_break (s + tmp_item.offset, tmp_item.length, &tmp_item.analysis, lattrs + start_offset, tmp_item.num_chars + 1); + pango_break ((gchar *) s + tmp_item.offset, tmp_item.length, &tmp_item.analysis, lattrs + start_offset, tmp_item.num_chars + 1); } - html_text_remove_unwanted_line_breaks (s, slen, lattrs); + html_text_remove_unwanted_line_breaks ((gchar *) s, slen, lattrs); g_list_free (items_list); for (i = 0; i < n_items; i ++) @@ -2041,9 +2041,9 @@ clen = 0; while (*s) { - len = strcspn (s, "\n"); - len = g_utf8_strlen (s, len); - width = utf8_width (s, len); + len = strcspn ((gchar *) s, "\n"); + len = g_utf8_strlen ((gchar *) s, len); + width = utf8_width ((gchar *) s, len); skip = 0; if ((flow->style != HTML_CLUEFLOW_STYLE_PRE) @@ -2053,7 +2053,7 @@ gint wmax; gint wi, wl; - wmax = clen + utf8_length_in_width (s, len, max_width); + wmax = clen + utf8_length_in_width ((gchar *) s, len, max_width); wl = wmax; if (lattrs [wl].is_white) { @@ -2080,7 +2080,7 @@ while (wi > clen && lattrs [wi - 1].is_white) wi --; len = wi - clen; - width = utf8_width (s, len); + width = utf8_width ((gchar *) s, len); skip = wl - wi; } } @@ -2114,10 +2114,10 @@ align_pad--; } - bytes = ((guchar *) g_utf8_offset_to_pointer (s, len)) - s; + bytes = ((guchar *) g_utf8_offset_to_pointer ((gchar *) s, len)) - s; html_engine_save_string_append_nonbsp (out, s, bytes); s += bytes; - s = g_utf8_offset_to_pointer (s, skip); + s = (guchar *) g_utf8_offset_to_pointer ((gchar *) s, skip); clen += len + skip; if (*s == '\n') { @@ -2201,15 +2201,15 @@ cur_bytes = HTML_TEXT (cur)->text_bytes; if (text_bytes + cur_bytes > index) { if (!info->found) { - info->start_pos = g_utf8_pointer_to_offset (text + text_bytes, - text + index); + info->start_pos = g_utf8_pointer_to_offset ((gchar *) text + text_bytes, + (gchar *) text + index); } info->found = g_list_append (info->found, cur); } text_bytes += cur_bytes; if (text_bytes >= index + info->found_bytes) { - info->stop_pos = info->start_pos + g_utf8_pointer_to_offset (text + index, - text + index + info->found_bytes); + info->stop_pos = info->start_pos + g_utf8_pointer_to_offset ((gchar *) text + index, + (gchar *) text + index + info->found_bytes); info->last = HTML_OBJECT (cur); return; } @@ -2250,7 +2250,7 @@ } if (text_bytes > 0) { - par = g_new (gchar, text_bytes + 1); + par = (guchar *) g_new (gchar, text_bytes + 1); par [text_bytes] = 0; pp = (info->forward) ? par : par + text_bytes; @@ -2263,7 +2263,7 @@ if (!info->forward) { pp -= HTML_TEXT (cur)->text_bytes; } - strncpy (pp, HTML_TEXT (cur)->text, HTML_TEXT (cur)->text_bytes); + strncpy ((gchar *) pp, HTML_TEXT (cur)->text, HTML_TEXT (cur)->text_bytes); if (info->forward) { pp += HTML_TEXT (cur)->text_bytes; } @@ -2277,9 +2277,9 @@ eq_bytes = 0; if (info->found) { if (info->start_pos > 0) - index = ((guchar *)g_utf8_offset_to_pointer (par, info->start_pos + ((info->forward) ? 1 : -1))) - par; + index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos + ((info->forward) ? 1 : -1))) - par; else - index = ((guchar *)g_utf8_offset_to_pointer (par, info->start_pos + ((info->forward) ? 1 : 0))) - par; + index = ((guchar *)g_utf8_offset_to_pointer ((gchar *) par, info->start_pos + ((info->forward) ? 1 : 0))) - par; } else { index = (info->forward) ? 0 : text_bytes - 1; } @@ -2309,7 +2309,7 @@ while ((info->forward && index < text_bytes) || (!info->forward && index >= 0)) { rv = regexec (info->reb, - par + index, + (gchar *) par + index, 1, &match, 0); if (rv == 0) { search_set_info (head, info, par, @@ -2319,7 +2319,7 @@ } index += (info->forward) ? (((guchar *) g_utf8_next_char (par + index)) - par - index) - : (((guchar *) g_utf8_prev_char (par + index)) - par - index); + : (((guchar *) g_utf8_prev_char ((gchar *) par + index)) - par - index); } #else rv = re_search (info->reb, par, text_bytes, index, @@ -2361,7 +2361,7 @@ } index += (info->forward) ? (((guchar *) g_utf8_next_char (par + index)) - par - index) - : (((guchar *) g_utf8_prev_char (par + index)) - par - index); + : (((guchar *) g_utf8_prev_char ((gchar *) par + index)) - par - index); } } } --- gtkhtml-3.13.4/src/htmlinterval.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 +++ gtkhtml-3.13.4/src/htmlinterval.c 2007-01-07 10:20:40.000000000 -0500 @@ -58,7 +58,7 @@ inline void html_point_next_cursor (HTMLPoint *p) { - p->object = html_object_next_cursor (p->object, &p->offset); + p->object = html_object_next_cursor (p->object, (gint *) &p->offset); } HTMLInterval * From fedora-cvs-commits at redhat.com Mon Jan 8 14:07:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 09:07:39 -0500 Subject: rpms/binutils/devel binutils-2.17.50.0.9-build-fixes.patch, NONE, 1.1 binutils-2.17.50.0.9-ia64-lib64.patch, NONE, 1.1 binutils-2.17.50.0.9-ltconfig-multilib.patch, NONE, 1.1 binutils-2.17.50.0.9-place-orphan.patch, NONE, 1.1 binutils-2.17.50.0.9-ppc64-pie.patch, NONE, 1.1 binutils-2.17.50.0.9-standards.patch, NONE, 1.1 binutils-2.17.50.0.9-tekhex.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 binutils.spec, 1.108, 1.109 sources, 1.31, 1.32 binutils-2.17.50.0.8-build-fixes.patch, 1.1, NONE binutils-2.17.50.0.8-bz3607.patch, 1.1, NONE binutils-2.17.50.0.8-elfvsb-test.patch, 1.1, NONE binutils-2.17.50.0.8-ia64-lib64.patch, 1.1, NONE binutils-2.17.50.0.8-ltconfig-multilib.patch, 1.1, NONE binutils-2.17.50.0.8-place-orphan.patch, 1.1, NONE binutils-2.17.50.0.8-ppc64-pie.patch, 1.1, NONE binutils-2.17.50.0.8-rh219629.patch, 1.1, NONE binutils-2.17.50.0.8-standards.patch, 1.1, NONE Message-ID: <200701081407.l08E7dO8020175@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20159 Modified Files: .cvsignore binutils.spec sources Added Files: binutils-2.17.50.0.9-build-fixes.patch binutils-2.17.50.0.9-ia64-lib64.patch binutils-2.17.50.0.9-ltconfig-multilib.patch binutils-2.17.50.0.9-place-orphan.patch binutils-2.17.50.0.9-ppc64-pie.patch binutils-2.17.50.0.9-standards.patch binutils-2.17.50.0.9-tekhex.patch Removed Files: binutils-2.17.50.0.8-build-fixes.patch binutils-2.17.50.0.8-bz3607.patch binutils-2.17.50.0.8-elfvsb-test.patch binutils-2.17.50.0.8-ia64-lib64.patch binutils-2.17.50.0.8-ltconfig-multilib.patch binutils-2.17.50.0.8-place-orphan.patch binutils-2.17.50.0.8-ppc64-pie.patch binutils-2.17.50.0.8-rh219629.patch binutils-2.17.50.0.8-standards.patch Log Message: 2.17.50.0.9-1 binutils-2.17.50.0.9-build-fixes.patch: ld-elfcomm/common1b.c | 6 +++++- ld-shared/main.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.17.50.0.9-build-fixes.patch --- 2006-02-14 Jakub Jelinek ld/testsuite/ * ld-shared/main.c (main): Prevent warnings about unused p. * ld-elfcomm/common1b.c (dummy1): Add __attribute__((__used__)) for GCC 3.3+. --- ld/testsuite/ld-shared/main.c.jj 2001-07-11 15:48:54.000000000 +0200 +++ ld/testsuite/ld-shared/main.c 2006-02-14 10:07:08.000000000 +0100 @@ -40,6 +40,8 @@ main () { int (*p) (); + p = (void *) 0; + (void) p; printf ("mainvar == %d\n", mainvar); printf ("overriddenvar == %d\n", overriddenvar); printf ("shlibvar1 == %d\n", shlibvar1); --- ld/testsuite/ld-elfcomm/common1b.c.jj 2003-04-15 11:38:10.000000000 +0200 +++ ld/testsuite/ld-elfcomm/common1b.c 2006-02-14 10:11:19.000000000 +0100 @@ -1,3 +1,7 @@ -static char dummy1 = 'X'; +static char dummy1 +#if defined __GNUC__ && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) + __attribute__((__used__)) +#endif + = 'X'; char foo1 [] = "Aligned at odd byte."; char foo2 [4]; binutils-2.17.50.0.9-ia64-lib64.patch: ld/emulparams/elf64_ia64.sh | 10 ++++++++++ ltconfig | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) --- NEW FILE binutils-2.17.50.0.9-ia64-lib64.patch --- 2004-05-14 Jakub Jelinek * emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on ia64-linux if /lib64 tree is present. --- ld/emulparams/elf64_ia64.sh.jj 2004-02-18 20:06:03.000000000 +0100 +++ ld/emulparams/elf64_ia64.sh 2004-05-14 10:11:22.992278608 +0200 @@ -37,3 +37,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL # .dtors. They have to be next to .sbss/.sbss2/.sdata/.sdata2. SMALL_DATA_CTOR=" " SMALL_DATA_DTOR=" " + +# Linux modify the default library search path to first include +# a 64-bit specific directory. +case "$target" in + ia64*-linux*) + case "$EMULATION_NAME" in + *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;; + esac + ;; +esac --- ltconfig 2003-02-03 16:56:49.000000000 +0900 +++ ltconfig 2003-02-03 16:56:49.000000000 +0900 @@ -1240,10 +1240,10 @@ # Find out which ABI we are using (multilib hack). case "$host_cpu" in - x86_64*|s390*|sparc*|ppc*|powerpc*) + x86_64*|s390*|sparc*|ppc*|powerpc*|ia64) echo "$progname:@lineno@: checking multilib ABI type" 1>&5 touch conftest.$ac_ext - if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + if test -d /lib64 && { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then case `/usr/bin/file conftest.o` in *64-bit*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" binutils-2.17.50.0.9-ltconfig-multilib.patch: ltconfig | 17 +++++++++++++++++ 1 files changed, 17 insertions(+) --- NEW FILE binutils-2.17.50.0.9-ltconfig-multilib.patch --- --- ltconfig.jj 2003-02-03 16:56:49.000000000 +0900 +++ ltconfig 2003-02-03 16:56:49.000000000 +0900 @@ -1237,6 +1237,23 @@ # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' + + # Find out which ABI we are using (multilib hack). + case "$host_cpu" in + x86_64*|s390*|sparc*|ppc*|powerpc*) + echo "$progname:@lineno@: checking multilib ABI type" 1>&5 + touch conftest.$ac_ext + if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + case `/usr/bin/file conftest.o` in + *64-bit*) + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" + sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64" + ;; + esac + fi + rm -rf conftest* + ;; + esac ;; netbsd*) binutils-2.17.50.0.9-place-orphan.patch: elf64ppc.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.17.50.0.9-place-orphan.patch --- 2003-08-05 Jakub Jelinek * emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd. --- ld/emulparams/elf64ppc.sh.jj 2003-07-28 10:24:45.000000000 -0400 +++ ld/emulparams/elf64ppc.sh 2003-08-05 08:35:58.000000000 -0400 @@ -28,7 +28,8 @@ else .toc 0 : { *(.toc) }" fi OTHER_GOT_RELOC_SECTIONS=" - .rela.toc ${RELOCATING-0} : { *(.rela.toc) }" + .rela.toc ${RELOCATING-0} : { *(.rela.toc) } + .rela.opd ${RELOCATING-0} : { *(.rela.opd) }" OTHER_READWRITE_SECTIONS=" .toc1 ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.toc1) } .opd ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { KEEP (*(.opd)) }" binutils-2.17.50.0.9-ppc64-pie.patch: elf64-ppc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.17.50.0.9-ppc64-pie.patch --- --- bfd/elf64-ppc.c.jj 2004-09-27 16:46:06.000000000 -0400 +++ bfd/elf64-ppc.c 2004-10-04 09:09:50.000000000 -0400 @@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_ else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf) && !is_opd && r_type != R_PPC64_TOC) - outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); + { + outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); + if (h->elf.dynindx == -1 + && h->elf.root.type == bfd_link_hash_undefweak) + memset (&outrel, 0, sizeof outrel); + } else { /* This symbol is local, or marked to become local, binutils-2.17.50.0.9-standards.patch: standards.texi | 493 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 322 insertions(+), 171 deletions(-) --- NEW FILE binutils-2.17.50.0.9-standards.patch --- --- etc/standards.texi.jj 2002-02-27 11:32:17.000000000 +0100 +++ etc/standards.texi 2005-08-18 19:05:42.000000000 +0200 @@ -3,16 +3,13 @@ @setfilename standards.info @settitle GNU Coding Standards @c This date is automagically updated when you save this file: - at set lastupdate February 14, 2002 + at set lastupdate June 8, 2005 @c %**end of header - at ifnottex - at format -START-INFO-DIR-ENTRY + at dircategory GNU organization + at direntry * Standards: (standards). GNU coding standards. -END-INFO-DIR-ENTRY - at end format - at end ifnottex + at end direntry @c @setchapternewpage odd @setchapternewpage off @@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY @set CHAPTER node @end ifnottex - at ifnottex -GNU Coding Standards -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + at copying +The GNU coding standards, last updated @value{lastupdate}. + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -43,32 +42,25 @@ with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. - at end ifnottex + at end copying @titlepage @title GNU Coding Standards @author Richard Stallman, et al. @author last updated @value{lastupdate} @page - @vskip 0pt plus 1filll -Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with no Invariant Sections, with no -Front-Cover Texts, and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. + at insertcopying @end titlepage - at ifnottex + at contents + + at ifnottex @node Top, Preface, (dir), (dir) @top Version -Last updated @value{lastupdate}. - at end ifnottex + at insertcopying + at end ifnottex @menu * Preface:: About the GNU Coding Standards @@ -101,15 +93,10 @@ This release of the GNU Coding Standards @cindex where to obtain @code{standards.texi} @cindex downloading this manual If you did not obtain this file directly from the GNU project and -recently, please check for a newer version. You can ftp the GNU -Coding Standards from any GNU FTP host in the directory - at file{/pub/gnu/standards/}. The GNU Coding Standards are available -there in several different formats: @file{standards.text}, - at file{standards.info}, and @file{standards.dvi}, as well as the -Texinfo ``source'' which is divided in two files: - at file{standards.texi} and @file{make-stds.texi}. The GNU Coding -Standards are also available on the GNU World Wide Web server: - at uref{http://www.gnu.org/prep/standards_toc.html}. +recently, please check for a newer version. You can get the GNU +Coding Standards from the GNU web server in many +different formats, including the Texinfo source, PDF, HTML, DVI, plain +text, and more, at: @uref{http://www.gnu.org/prep/standards/}. Corrections or suggestions for this document should be sent to @email{bug-standards@@gnu.org}. If you make a suggestion, please include a @@ -129,11 +116,15 @@ be self-consistent---try to stick to the to document them as much as possible. That way, your program will be more maintainable by others. +The GNU Hello program serves as an example of how to follow the GNU +coding standards for a trivial program which prints @samp{Hello, +world!}. @uref{http://www.gnu.org/software/hello/hello.html}. + @node Legal Issues @chapter Keeping Free Software Free @cindex legal aspects -This @value{CHAPTER} discusses how you can make sure that GNU software +This chapter discusses how you can make sure that GNU software avoids legal difficulties, and other related issues. @menu @@ -211,7 +202,7 @@ You might have to take that code out aga You don't need papers for changes of a few lines here or there, since they are not significant for copyright purposes. Also, you don't need papers if all you get from the suggestion is some ideas, not actual code -which you use. For example, if someone send you one implementation, but +which you use. For example, if someone sent you one implementation, but you write a different implementation of the same idea, you don't need to get papers. @@ -221,7 +212,8 @@ result. We have more detailed advice for maintainers of programs; if you have reached the stage of actually maintaining a program for GNU (whether -released or not), please ask us for a copy. +released or not), please ask us for a copy. It is also available +online for your perusal: @uref{http://www.gnu.org/prep/maintain/}. @node Trademarks @section Trademarks @@ -232,24 +224,33 @@ packages or documentation. Trademark acknowledgements are the statements that such-and-such is a trademark of so-and-so. The GNU Project has no objection to the basic -idea of trademarks, but these acknowledgements feel like kowtowing, so -we don't use them. There is no legal requirement for them. +idea of trademarks, but these acknowledgements feel like kowtowing, +and there is no legal requirement for them, so we don't use them. What is legally required, as regards other people's trademarks, is to -avoid using them in ways which a reader might read as naming or labeling -our own programs or activities. For example, since ``Objective C'' is -(or at least was) a trademark, we made sure to say that we provide a -``compiler for the Objective C language'' rather than an ``Objective C -compiler''. The latter is meant to be short for the former, but it does -not explicitly state the relationship, so it could be misinterpreted as -using ``Objective C'' as a label for the compiler rather than for the -language. +avoid using them in ways which a reader might reasonably understand as +naming or labeling our own programs or activities. For example, since +``Objective C'' is (or at least was) a trademark, we made sure to say +that we provide a ``compiler for the Objective C language'' rather +than an ``Objective C compiler''. The latter would have been meant as +a shorter way of saying the former, but it does not explicitly state +the relationship, so it could be misinterpreted as using ``Objective +C'' as a label for the compiler rather than for the language. + +Please don't use ``win'' as an abbreviation for Microsoft Windows in +GNU software or documentation. In hacker terminology, calling +something a ``win'' is a form of praise. If you wish to praise +Microsoft Windows when speaking on your own, by all means do so, but +not in GNU software. Usually we write the name ``Windows'' in full, +but when brevity is very important (as in file names and sometimes +symbol names), we abbreviate it to ``w''. For instance, the files and +functions in Emacs that deal with Windows start with @samp{w32}. @node Design Advice @chapter General Program Design @cindex program design -This @value{CHAPTER} discusses some of the issues you should take into +This chapter discusses some of the issues you should take into account when designing your program. @c Standard or ANSI C @@ -263,7 +264,7 @@ account when designing your program. @c A major revision of the C Standard appeared in 1999. @menu -* Source Language:: Which languges to use. +* Source Language:: Which languages to use. * Compatibility:: Compatibility with other implementations * Using Extensions:: Using non-standard features * Standard C:: Using Standard C features @@ -272,7 +273,7 @@ account when designing your program. @node Source Language @section Which Languages to Use - at cindex programming languges + at cindex programming languages When you want to use a language that gets compiled and runs at high speed, the best language to use is C. Using another language is like @@ -476,6 +477,7 @@ For example, please write ... @end smallexample + at noindent instead of: @smallexample @@ -488,11 +490,12 @@ instead of: A modern compiler such as GCC will generate exactly the same code in both cases, and we have been using similar techniques with good success -in several projects. +in several projects. Of course, the former method assumes that + at code{HAS_FOO} is defined as either 0 or 1. While this is not a silver bullet solving all portability problems, -following this policy would have saved the GCC project alone many person -hours if not days per year. +and is not always appropriate, following this policy would have saved +GCC developers many hours, or even days, per year. In the case of function-like macros like @code{REVERSIBLE_CC_MODE} in GCC which cannot be simply used in @code{if( ...)} statements, there is @@ -510,7 +513,7 @@ an easy workaround. Simply introduce an @node Program Behavior @chapter Program Behavior for All Programs -This @value{CHAPTER} describes conventions for writing robust +This chapter describes conventions for writing robust software. It also describes general standards for error messages, the command line interface, and how libraries should behave. @@ -679,10 +682,12 @@ Error messages from compilers should loo @end example @noindent -If you want to mention the column number, use this format: +If you want to mention the column number, use one of these formats: @example @var{source-file-name}:@var{lineno}:@var{column}: @var{message} + at var{source-file-name}:@var{lineno}. at var{column}: @var{message} + @end example @noindent @@ -692,6 +697,24 @@ of these conventions are chosen for comp numbers assuming that space and all ASCII printing characters have equal width, and assuming tab stops every 8 columns. +The error message can also give both the starting and ending positions +of the erroneous text. There are several formats so that you can +avoid redundant information such as a duplicate line number. +Here are the possible formats: + + at example + at var{source-file-name}:@var{lineno-1}. at var{column-1}- at var{lineno-2}. at var{column-2}: @var{message} + at var{source-file-name}:@var{lineno-1}. at var{column-1}- at var{column-2}: @var{message} + at var{source-file-name}:@var{lineno-1}- at var{lineno-2}: @var{message} + at end example + + at noindent +When an error is spread over several files, you can use this format: + + at example + at var{file-1}:@var{lineno-1}. at var{column-1}- at var{file-2}:@var{lineno-2}. at var{column-2}: @var{message} + at end example + Error messages from other noninteractive programs should look like this: @example @@ -722,8 +745,9 @@ input from a source other than a termina would do best to print error messages using the noninteractive style.) The string @var{message} should not begin with a capital letter when -it follows a program name and/or file name. Also, it should not end -with a period. +it follows a program name and/or file name, because that isn't the +beginning of a sentence. (The sentence conceptually starts at the +beginning of the line.) Also, it should not end with a period. Error messages from interactive programs, and other messages such as usage messages, should start with a capital letter. But they should not @@ -767,9 +791,9 @@ multi-column format. @section Standards for Graphical Interfaces @cindex graphical user interface - at cindex gtk + at cindex gtk+ When you write a program that provides a graphical user interface, -please make it work with X Windows and the GTK toolkit unless the +please make it work with X Windows and the GTK+ toolkit unless the functionality specifically requires some alternative (for example, ``displaying jpeg images while in console mode''). @@ -819,8 +843,15 @@ option as another way to specify it. Th among GNU utilities, and fewer idiosyncracies for users to remember. @cindex standard command-line options + at cindex options, standard command-line + at cindex CGI programs, standard options for + at cindex PATH_INFO, specifying standard options as All programs should support two standard options: @samp{--version} -and @samp{--help}. +and @samp{--help}. CGI programs should accept these as command-line +options, and also if given as the @env{PATH_INFO}; for instance, +visiting @url{http://example.org/p.cgi/--help} in a browser should +output the same information as invoking @samp{p.cgi --help} from the +command line. @table @code @cindex @samp{--version} option @@ -1461,9 +1492,7 @@ Used in @code{gawk}. Used in @code{su}. @item machine -No listing of which programs already use this; -someone should check to -see if any actually do, and tell @email{gnu@@gnu.org}. +Used in @code{uname}. @item macro-name @samp{-M} in @code{ptx}. @@ -1573,6 +1602,9 @@ Used in GDB. @item no-sort @samp{-p} in @code{nm}. + at item no-splash +Don't print a startup splash screen. + @item no-split Used in @code{makeinfo}. @@ -1740,7 +1772,7 @@ Specify an HTTP proxy. @samp{-q} in Make. @item quiet -Used in many programs to inhibit the usual output. @strong{Note:} every +Used in many programs to inhibit the usual output. Every program accepting @samp{--quiet} should accept @samp{--silent} as a synonym. @@ -1855,7 +1887,7 @@ Used by @code{recode} to chose files or @item silent Used in many programs to inhibit the usual output. - at strong{Note:} every program accepting +Every program accepting @samp{--silent} should accept @samp{--quiet} as a synonym. @item size @@ -2098,7 +2130,7 @@ directory. @node Writing C @chapter Making The Best Use of C -This @value{CHAPTER} provides advice on how best to use the C language +This chapter provides advice on how best to use the C language when writing GNU software. @menu @@ -2128,13 +2160,12 @@ These tools will not work on code not fo It is also important for function definitions to start the name of the function in column zero. This helps people to search for function definitions, and may also help certain tools recognize them. Thus, -the proper format is this: +using Standard C syntax, the format is this: @example static char * -concat (s1, s2) /* Name starts in column zero here */ - char *s1, *s2; -@{ /* Open brace in column zero here */ +concat (char *s1, char *s2) +@{ @dots{} @} @end example @@ -2145,8 +2176,9 @@ this: @example static char * -concat (char *s1, char *s2) -@{ +concat (s1, s2) /* Name starts in column zero here */ + char *s1, *s2; +@{ /* Open brace in column zero here */ @dots{} @} @end example @@ -2383,7 +2415,7 @@ functions. @cindex temporary variables It used to be common practice to use the same local variables (with names like @code{tem}) over and over for different values within one -function. Instead of doing this, it is better declare a separate local +function. Instead of doing this, it is better to declare a separate local variable for each distinct purpose, and give it a name which is meaningful. This not only makes programs easier to understand, it also facilitates optimization by good compilers. You can also move the @@ -2584,11 +2616,20 @@ Avoid using the format of semi-internal when there is a higher-level alternative (@code{readdir}). @cindex non- at sc{posix} systems, and portability -As for systems that are not like Unix, such as MSDOS, Windows, the -Macintosh, VMS, and MVS, supporting them is often a lot of work. When -that is the case, it is better to spend your time adding features that -will be useful on GNU and GNU/Linux, rather than on supporting other -incompatible systems. +As for systems that are not like Unix, such as MSDOS, Windows, VMS, +MVS, and older Macintosh systems, supporting them is often a lot of +work. When that is the case, it is better to spend your time adding +features that will be useful on GNU and GNU/Linux, rather than on +supporting other incompatible systems. + +If you do support Windows, please do not abbreviate it as ``win''. In +hacker terminology, calling something a ``win'' is a form of praise. +You're free to praise Microsoft Windows on your own if you want, but +please don't do this in GNU packages. Instead of abbreviating +``Windows'' to ``un'', you can write it in full or abbreviate it to +``woe'' or ``w''. In GNU Emacs, for instance, we use @samp{w32} in +file names of Windows-specific files, but the macro for Windows +conditionals is called @code{WINDOWSNT}. It is a good idea to define the ``feature test macro'' @code{_GNU_SOURCE} when compiling your C files. When you compile on GNU @@ -2644,37 +2685,50 @@ while ((c = getchar()) != EOF) write(file_descriptor, &c, 1); @end example -When calling functions, you need not worry about the difference between -pointers of various types, or between pointers and integers. On most -machines, there's no difference anyway. As for the few machines where -there is a difference, all of them support Standard C prototypes, so you can -use prototypes (perhaps conditionalized to be active only in Standard C) -to make the code work on those systems. - -In certain cases, it is ok to pass integer and pointer arguments -indiscriminately to the same function, and use no prototype on any -system. For example, many GNU programs have error-reporting functions -that pass their arguments along to @code{printf} and friends: - - at example -error (s, a1, a2, a3) - char *s; - char *a1, *a2, *a3; -@{ - fprintf (stderr, "error: "); - fprintf (stderr, s, a1, a2, a3); -@} +It used to be ok to not worry about the difference between pointers +and integers when passing arguments to functions. However, on most +modern 64-bit machines pointers are wider than @code{int}. +Conversely, integer types like @code{long long int} and @code{off_t} +are wider than pointers on most modern 32-bit machines. Hence it's +often better nowadays to use prototypes to define functions whose +argument types are not trivial. + +In particular, if functions accept varying argument counts or types +they should be declared using prototypes containing @samp{...} and +defined using @file{stdarg.h}. For an example of this, please see the + at uref{http://www.gnu.org/software/gnulib/, Gnulib} error module, which +declares and defines the following function: + + at example +/* Print a message with `fprintf (stderr, FORMAT, ...)'; + if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). + If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ + +void error (int status, int errnum, const char *format, ...); @end example - at noindent -In practice, this works on all machines, since a pointer is generally -the widest possible kind of argument; it is much simpler than any -``correct'' alternative. Be sure @emph{not} to use a prototype for such -functions. +A simple way to use the Gnulib error module is to obtain the two +source files @file{error.c} and @file{error.h} from the Gnulib library +source code repository at + at uref{http://savannah.gnu.org/cgi-bin/viewcvs/gnulib/gnulib/lib/}. +Here's a sample use: -If you have decided to use Standard C, then you can instead define - at code{error} using @file{stdarg.h}, and pass the arguments along to - at code{vfprintf}. + at example +#include "error.h" +#include +#include + +char *program_name = "myprogram"; + +FILE * +xfopen (char const *name) +@{ + FILE *fp = fopen (name, "r"); + if (! fp) + error (1, errno, "cannot read %s", name); + return fp; +@} + at end example @cindex casting pointers to integers Avoid casting pointers to integers if you can. Such casts greatly @@ -3000,10 +3054,13 @@ together, we can make the whole subject The manual which discusses a program should certainly document all of the program's command-line options and all of its commands. It should -give examples of their use. But don't organize the manual as a list of -features. Instead, organize it logically, by subtopics. Address the -questions that a user will ask when thinking about the job that the -program does. +give examples of their use. But don't organize the manual as a list +of features. Instead, organize it logically, by subtopics. Address +the questions that a user will ask when thinking about the job that +the program does. Don't just tell the reader what each feature can +do---say what jobs it is good for, and show how to use it for those +jobs. Explain what is recommended usage, and what kinds of usage +users should avoid. In general, a GNU manual should serve both as tutorial and reference. It should be set up for convenient access to each topic through Info, @@ -3030,9 +3087,9 @@ functions, variables, options, and impor the program. One combined Index should do for a short manual, but sometimes for a complex package it is better to use multiple indices. The Texinfo manual includes advice on preparing good index entries, see - at ref{Index Entries, , Making Index Entries, texinfo, The GNU Texinfo -Manual}, and see @ref{Indexing Commands, , Defining the Entries of an -Index, texinfo, The GNU Texinfo manual}. + at ref{Index Entries, , Making Index Entries, texinfo, GNU Texinfo}, and +see @ref{Indexing Commands, , Defining the Entries of an +Index, texinfo, GNU Texinfo}. Don't use Unix man pages as a model for how to write GNU documentation; most of them are terse, badly structured, and give inadequate @@ -3041,15 +3098,15 @@ exceptions.) Also, Unix man pages use a different from what we use in GNU manuals. Please include an email address in the manual for where to report -bugs @emph{in the manual}. +bugs @emph{in the text of the manual}. Please do not use the term ``pathname'' that is used in Unix documentation; use ``file name'' (two words) instead. We use the term ``path'' only for search paths, which are lists of directory names. -Please do not use the term ``illegal'' to refer to erroneous input to a -computer program. Please use ``invalid'' for this, and reserve the term -``illegal'' for activities punishable by law. +Please do not use the term ``illegal'' to refer to erroneous input to +a computer program. Please use ``invalid'' for this, and reserve the +term ``illegal'' for activities prohibited by law. @node Doc Strings and Manuals @section Doc Strings and Manuals @@ -3092,7 +3149,7 @@ Each program documented in the manual sh @samp{@var{program} Invocation} or @samp{Invoking @var{program}}. This node (together with its subnodes, if any) should describe the program's command line arguments and how to run it (the sort of information people -would look in a man page for). Start with an @samp{@@example} +would look for in a man page). Start with an @samp{@@example} containing a template for all the options and arguments that the program uses. @@ -3210,6 +3267,11 @@ code. For example, ``New function'' is you add a function, because there should be a comment before the function definition to explain what it does. +In the past, we recommended not mentioning changes in non-software +files (manuals, help files, etc.) in change logs. However, we've been +advised that it is a good idea to include them, for the sake of +copyright records. + However, sometimes it is useful to write one line to describe the overall purpose of a batch of changes. @@ -3224,9 +3286,9 @@ Then describe the changes you made to th @cindex change logs, style Here are some simple examples of change log entries, starting with the -header line that says who made the change and when, followed by -descriptions of specific changes. (These examples are drawn from Emacs -and GCC.) +header line that says who made the change and when it was installed, +followed by descriptions of specific changes. (These examples are +drawn from Emacs and GCC.) @example 1998-08-17 Richard Stallman @@ -3270,6 +3332,27 @@ Break long lists of function names by cl (Fexecute_extended_command): Deal with `keymap' property. @end example +When you install someone else's changes, put the contributor's name in +the change log entry rather than in the text of the entry. In other +words, write this: + + at example +2002-07-14 John Doe + + * sewing.c: Make it sew. + at end example + + at noindent +rather than this: + + at example +2002-07-14 Usual Maintainer + + * sewing.c: Make it sew. Patch by jdoe@@gnu.org. + at end example + +As for the date, that should be the date you applied the change. + @node Simple Changes @subsection Simple Changes @@ -3291,12 +3374,17 @@ When you change just comments or doc str entry for the file, without mentioning the functions. Just ``Doc fixes'' is enough for the change log. -There's no need to make change log entries for documentation files. -This is because documentation is not susceptible to bugs that are hard -to fix. Documentation does not consist of parts that must interact in a -precisely engineered fashion. To correct an error, you need not know -the history of the erroneous passage; it is enough to compare what the -documentation says with the way the program actually works. +There's no technical need to make change log entries for documentation +files. This is because documentation is not susceptible to bugs that +are hard to fix. Documentation does not consist of parts that must +interact in a precisely engineered fashion. To correct an error, you +need not know the history of the erroneous passage; it is enough to +compare what the documentation says with the way the program actually +works. + +However, you should keep change logs for documentation files when the +project gets copyright assignments from its contributors, so as to +make the records of authorship more accurate. @node Conditional Changes @subsection Conditional Changes @@ -3387,6 +3475,25 @@ page explaining that you don't maintain is more authoritative. The note should say how to access the Texinfo documentation. +Be sure that man pages include a copyright statement and free +license. The simple all-permissive license is appropriate for simple +man pages: + + at example +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. + at end example + +For long man pages, with enough explanation and documentation that +they can be considered true manuals, use the GFDL (@pxref{License for +Manuals}). + +Finally, the GNU help2man program +(@uref{http://www.gnu.org/software/help2man/}) is one way to automate +generation of a man page, in this case from @option{--help} output. +This is sufficient in many cases. + @node Reading other Manuals @section Reading other Manuals @@ -3486,19 +3593,26 @@ this: @var{cpu}- at var{company}- at var{system} @end example -For example, a Sun 3 might be @samp{m68k-sun-sunos4.1}. +For example, an Athlon-based GNU/Linux system might be + at samp{i686-pc-linux-gnu}. The @code{configure} script needs to be able to decode all plausible -alternatives for how to describe a machine. Thus, @samp{sun3-sunos4.1} -would be a valid alias. For many programs, @samp{vax-dec-ultrix} would -be an alias for @samp{vax-dec-bsd}, simply because the differences -between Ultrix and @sc{bsd} are rarely noticeable, but a few programs -might need to distinguish them. - at c Real 4.4BSD now runs on some Suns. - -There is a shell script called @file{config.sub} that you can use +alternatives for how to describe a machine. Thus, + at samp{athlon-pc-gnu/linux} would be a valid alias. +There is a shell script called + at uref{ftp://ftp.gnu.org/gnu/config/config.sub, @file{config.sub}} +that you can use as a subroutine to validate system types and canonicalize aliases. +The @code{configure} script should also take the option + at option{--build=@var{buildtype}}, which should be equivalent to a +plain @var{buildtype} argument. For example, @samp{configure +--build=i686-pc-linux-gnu} is equivalent to @samp{configure +i686-pc-linux-gnu}. When the build type is not specified by an option +or argument, the @code{configure} script should normally guess it +using the shell script + at uref{ftp://ftp.gnu.org/gnu/config/config.guess, @file{config.guess}}. + @cindex optional features, configure-time Other options are permitted to specify in more detail the software or hardware present on the machine, and include or exclude optional @@ -3558,6 +3672,11 @@ The @code{configure} script should norma system as both the host and the target, thus producing a program which works for the same type of machine that it runs on. +To compile a program to run on a host type that differs from the build +type, use the configure option @option{--host=@var{hosttype}}, where + at var{hosttype} uses the same syntax as @var{buildtype}. The host type +normally defaults to the build type. + To configure a cross-compiler, cross-assembler, or what have you, you should specify a target different from the host, using the configure option @samp{--target=@var{targettype}}. The syntax for @@ -3565,22 +3684,14 @@ option @samp{--target=@var{targettype}}. look like this: @example -./configure @var{hosttype} --target=@var{targettype} +./configure --host=@var{hosttype} --target=@var{targettype} @end example +The target type normally defaults to the host type. Programs for which cross-operation is not meaningful need not accept the @samp{--target} option, because configuring an entire operating system for cross-operation is not a meaningful operation. -Bootstrapping a cross-compiler requires compiling it on a machine other -than the host it will run on. Compilation packages accept a -configuration option @samp{--build=@var{buildtype}} for specifying the -configuration on which you will compile them, but the configure script -should normally guess the build machine type (using - at file{config.guess}), so this option is probably not necessary. The -host and target types normally default from the build type, so in -bootstrapping a cross-compiler you must specify them both explicitly. - Some programs have ways of configuring themselves automatically. If your program is set up to do this, your @code{configure} script can simply ignore most of its arguments. @@ -3596,6 +3707,10 @@ ignore most of its arguments. @section Making Releases @cindex packaging +You should identify each release with a pair of version numbers, a +major version and a minor. We have no objection to using more than +two numbers, but it is very unlikely that you really need them. + Package the distribution of @code{Foo version 69.96} up in a gzipped tar file with the name @file{foo-69.96.tar.gz}. It should unpack into a subdirectory named @file{foo-69.96}. @@ -3644,13 +3759,6 @@ able to extract all the files even if th Make sure that all the files in the distribution are world-readable. -Make sure that no file name in the distribution is more than 14 -characters long. Likewise, no file created by building the program -should have a name longer than 14 characters. The reason for this is -that some systems adhere to a foolish interpretation of the @sc{posix} -standard, and refuse to open a longer name, rather than truncating as -they did in the past. - Don't include any symbolic links in the distribution itself. If the tar file contains symbolic links, then people cannot even unpack it on systems that don't support symbolic links. Also, don't use multiple @@ -3682,16 +3790,27 @@ other files to get. A GNU program should not recommend use of any non-free program. We can't stop some people from writing proprietary programs, or stop -other people from using them, but we can and should avoid helping to +other people from using them, but we can and should refuse to advertise them to new potential customers. Proprietary software is a social and ethical problem, and the point of GNU is to solve that problem. +The GNU definition of free software is found on the GNU web site at + at url{http://www.gnu.org/philosophy/free-sw.html}. A list of +important licenses and whether they qualify as free is in + at url{http://www.gnu.org/licenses/license-list.html}. The terms +``free'' and ``non-free'', used in this document, refer to that +definition. If it is not clear whether a license qualifies as free +under this definition, please ask the GNU Project by writing to + at email{licensing@@gnu.org}. We will answer, and if the license is an +important one, we will add it to the list. + When a non-free program or system is well known, you can mention it in passing---that is harmless, since users who might want to use it probably already know about it. For instance, it is fine to explain -how to build your package on top of some non-free operating system, or -how to use it together with some widely used non-free program. +how to build your package on top of some widely used non-free +operating system, or how to use it together with some widely used +non-free program. However, you should give only the necessary information to help those who already use the non-free program to use your program with @@ -3700,8 +3819,8 @@ proprietary program, and don't imply tha enhances your program, or that its existence is in any way a good thing. The goal should be that people already using the proprietary program will get the advice they need about how to use your free -program, while people who don't already use the proprietary program -will not see anything to lead them to take an interest in it. +program with it, while people who don't already use the proprietary +program will not see anything to lead them to take an interest in it. If a non-free program or system is obscure in your program's domain, your program should not mention or support it at all, since doing so @@ -3709,13 +3828,46 @@ would tend to popularize the non-free pr your program. (You cannot hope to find many additional users among the users of Foobar if the users of Foobar are few.) +Sometimes a program is free software in itself but depends on a +non-free platform in order to run. For instance, many Java programs +depend on Sun's Java implementation, and won't run on the GNU Java +Compiler (which does not yet have all the features) or won't run with +the GNU Java libraries. To recommend that program is inherently to +recommend the non-free platform as well; if you should not do the +latter, then don't do the former. + A GNU package should not refer the user to any non-free documentation for free software. Free documentation that can be included in free -operating systems is essential for completing the GNU system, so it is -a major focus of the GNU Project; to recommend use of documentation -that we are not allowed to use in GNU would undermine the efforts to -get documentation that we can include. So GNU packages should never -recommend non-free documentation. +operating systems is essential for completing the GNU system, or any +free operating system, so it is a major focus of the GNU Project; to +recommend use of documentation that we are not allowed to use in GNU +would weaken the impetus for the community to produce documentation +that we can include. So GNU packages should never recommend non-free +documentation. + +By contrast, it is ok to refer to journal articles and textbooks in +the comments of a program for explanation of how it functions, even +though they be non-free. This is because we don't include such things +in the GNU system even if we are allowed to--they are outside the +scope of an operating system project. + +Referring to a web site that describes or recommends a non-free +program is in effect promoting that software, so please do not make +links (or mention by name) web sites that contain such material. This +policy is relevant particularly for the web pages for a GNU package. + +Following links from nearly any web site can lead to non-free +software; this is an inescapable aspect of the nature of the web, and +in itself is no objection to linking to a site. As long as the site +does not itself recommend a non-free program, there is no need be +concerned about the sites it links to for other reasons. + +Thus, for example, you should not make a link to AT&T's web site, +because that recommends AT&T's non-free software packages; you should +not make a link to a site that links to AT&T's site saying it is a +place to get a non-free program; but if a site you want to link to +refers to AT&T's web site in some other context (such as long-distance +telephone service), that is not a problem. @node Copying This Manual @appendix Copying This Manual @@ -3730,13 +3882,12 @@ recommend non-free documentation. @unnumbered Index @printindex cp - at contents - @bye - at c Local variables: - at c eval: (add-hook 'write-file-hooks 'time-stamp) - at c time-stamp-start: "@set lastupdate " - at c time-stamp-end: "$" - at c time-stamp-format: "%:b %:d, %:y" - at c compile-command: "make just-standards" - at c End: + +Local variables: +eval: (add-hook 'write-file-hooks 'time-stamp) +time-stamp-start: "@set lastupdate " +time-stamp-end: "$" +time-stamp-format: "%:b %:d, %:y" +compile-command: "make just-standards" +End: binutils-2.17.50.0.9-tekhex.patch: tekhex.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) --- NEW FILE binutils-2.17.50.0.9-tekhex.patch --- 2007-01-05 Jakub Jelinek * texhex.c (first_phase): Don't fall through into the default case. (pass_over): Replace abort () calls with return FALSE. Fix buffer overflow. --- binutils/bfd/tekhex.c.jj 2006-06-19 15:17:43.000000000 +0200 +++ binutils/bfd/tekhex.c 2007-01-05 11:08:25.000000000 +0100 @@ -436,6 +436,7 @@ first_phase (bfd *abfd, int type, char * if (!getvalue (&src, &val)) return FALSE; new->symbol.value = val - section->vma; + break; } default: return FALSE; @@ -457,11 +458,10 @@ pass_over (bfd *abfd, bfd_boolean (*func /* To the front of the file. */ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) - abort (); + return FALSE; while (! eof) { - char buffer[MAXCHUNK]; - char *src = buffer; + char src[MAXCHUNK]; char type; /* Find first '%'. */ @@ -471,22 +471,24 @@ pass_over (bfd *abfd, bfd_boolean (*func if (eof) break; - src++; /* Fetch the type and the length and the checksum. */ if (bfd_bread (src, (bfd_size_type) 5, abfd) != 5) - abort (); /* FIXME. */ + return FALSE; type = src[2]; if (!ISHEX (src[0]) || !ISHEX (src[1])) break; - /* Already read five char. */ + /* Already read five chars. */ chars_on_line = HEX (src) - 5; + if (chars_on_line >= MAXCHUNK) + return FALSE; + if (bfd_bread (src, (bfd_size_type) chars_on_line, abfd) != chars_on_line) - abort (); /* FIXME. */ + return FALSE; /* Put a null at the end. */ src[chars_on_line] = 0; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 3 Dec 2006 20:44:56 -0000 1.30 +++ .cvsignore 8 Jan 2007 14:07:37 -0000 1.31 @@ -1 +1 @@ -binutils-2.17.50.0.8.tar.bz2 +binutils-2.17.50.0.9.tar.bz2 Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- binutils.spec 23 Dec 2006 08:45:06 -0000 1.108 +++ binutils.spec 8 Jan 2007 14:07:37 -0000 1.109 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils -Version: 2.17.50.0.8 -Release: 2 +Version: 2.17.50.0.9 +Release: 1 License: GPL Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -10,11 +10,9 @@ Patch2: binutils-2.17.50.0.8-ppc64-pie.patch Patch3: binutils-2.17.50.0.8-place-orphan.patch Patch4: binutils-2.17.50.0.8-ia64-lib64.patch -Patch5: binutils-2.17.50.0.8-elfvsb-test.patch -Patch6: binutils-2.17.50.0.8-standards.patch -Patch7: binutils-2.17.50.0.8-build-fixes.patch -Patch8: binutils-2.17.50.0.8-bz3607.patch -Patch9: binutils-2.17.50.0.8-rh219629.patch +Patch5: binutils-2.17.50.0.8-standards.patch +Patch6: binutils-2.17.50.0.8-build-fixes.patch +Patch7: binutils-2.17.50.0.9-tekhex.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -60,11 +58,9 @@ %patch4 -p0 -b .ia64-lib64~ %endif %endif -%patch5 -p0 -b .elfvsb-test~ -%patch6 -p0 -b .standards~ -%patch7 -p0 -b .build-fixes~ -%patch8 -p0 -b .bz3607~ -%patch9 -p0 -b .rh219629~ +%patch5 -p0 -b .standards~ +%patch6 -p0 -b .build-fixes~ +%patch7 -p0 -b .tekhex~ # On ppc64 we might use 64K pages sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c @@ -207,6 +203,10 @@ %{_infodir}/bfd*info* %changelog +* Mon Jan 8 2007 Jakub Jelinek 2.17.50.0.9-1 +- update to 2.17.50.0.9 +- fix tekhex reader + * Sat Dec 23 2006 Jakub Jelinek 2.17.50.0.8-2 - fix --as-needed on ppc64 (#219629) Index: sources =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 3 Dec 2006 20:44:56 -0000 1.31 +++ sources 8 Jan 2007 14:07:37 -0000 1.32 @@ -1 +1 @@ -1441fe6fa44b344d0575cb66d3f89252 binutils-2.17.50.0.8.tar.bz2 +708a922277d9bfc98e584038e5dc5d92 binutils-2.17.50.0.9.tar.bz2 --- binutils-2.17.50.0.8-build-fixes.patch DELETED --- --- binutils-2.17.50.0.8-bz3607.patch DELETED --- --- binutils-2.17.50.0.8-elfvsb-test.patch DELETED --- --- binutils-2.17.50.0.8-ia64-lib64.patch DELETED --- --- binutils-2.17.50.0.8-ltconfig-multilib.patch DELETED --- --- binutils-2.17.50.0.8-place-orphan.patch DELETED --- --- binutils-2.17.50.0.8-ppc64-pie.patch DELETED --- --- binutils-2.17.50.0.8-rh219629.patch DELETED --- --- binutils-2.17.50.0.8-standards.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 14:11:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 09:11:24 -0500 Subject: rpms/binutils/devel binutils.spec,1.109,1.110 Message-ID: <200701081411.l08EBOi5020317@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20303 Modified Files: binutils.spec Log Message: 2.17.50.0.9-1 Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- binutils.spec 8 Jan 2007 14:07:37 -0000 1.109 +++ binutils.spec 8 Jan 2007 14:11:22 -0000 1.110 @@ -6,12 +6,12 @@ Group: Development/Tools URL: http://sources.redhat.com/binutils Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 -Patch1: binutils-2.17.50.0.8-ltconfig-multilib.patch -Patch2: binutils-2.17.50.0.8-ppc64-pie.patch -Patch3: binutils-2.17.50.0.8-place-orphan.patch -Patch4: binutils-2.17.50.0.8-ia64-lib64.patch -Patch5: binutils-2.17.50.0.8-standards.patch -Patch6: binutils-2.17.50.0.8-build-fixes.patch +Patch1: binutils-2.17.50.0.9-ltconfig-multilib.patch +Patch2: binutils-2.17.50.0.9-ppc64-pie.patch +Patch3: binutils-2.17.50.0.9-place-orphan.patch +Patch4: binutils-2.17.50.0.9-ia64-lib64.patch +Patch5: binutils-2.17.50.0.9-standards.patch +Patch6: binutils-2.17.50.0.9-build-fixes.patch Patch7: binutils-2.17.50.0.9-tekhex.patch Buildroot: %{_tmppath}/binutils-root From fedora-cvs-commits at redhat.com Mon Jan 8 14:16:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 09:16:17 -0500 Subject: rpms/binutils/devel binutils-2.17.50.0.9-tekhex.patch,1.1,1.2 Message-ID: <200701081416.l08EGHlB020864@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20429 Modified Files: binutils-2.17.50.0.9-tekhex.patch Log Message: 2.17.50.0.9-1 binutils-2.17.50.0.9-tekhex.patch: tekhex.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) Index: binutils-2.17.50.0.9-tekhex.patch =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils-2.17.50.0.9-tekhex.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- binutils-2.17.50.0.9-tekhex.patch 8 Jan 2007 14:07:37 -0000 1.1 +++ binutils-2.17.50.0.9-tekhex.patch 8 Jan 2007 14:16:14 -0000 1.2 @@ -5,8 +5,8 @@ (pass_over): Replace abort () calls with return FALSE. Fix buffer overflow. ---- binutils/bfd/tekhex.c.jj 2006-06-19 15:17:43.000000000 +0200 -+++ binutils/bfd/tekhex.c 2007-01-05 11:08:25.000000000 +0100 +--- bfd/tekhex.c.jj 2006-06-19 15:17:43.000000000 +0200 ++++ bfd/tekhex.c 2007-01-05 11:08:25.000000000 +0100 @@ -436,6 +436,7 @@ first_phase (bfd *abfd, int type, char * if (!getvalue (&src, &val)) return FALSE; From fedora-cvs-commits at redhat.com Mon Jan 8 14:48:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 09:48:10 -0500 Subject: rpms/dovecot/devel dovecot.spec,1.64,1.65 Message-ID: <200701081448.l08EmAYS022380@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/dovecot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22335 Modified Files: dovecot.spec Log Message: * Thu Dec 21 2006 Tomas Janousek - 1.0-1.1.rc15 - reenabled GSSAPI (#220377) Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- dovecot.spec 11 Dec 2006 11:22:54 -0000 1.64 +++ dovecot.spec 8 Jan 2007 14:48:02 -0000 1.65 @@ -1,7 +1,7 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 1.0 -Release: 1.rc15%{?dist} +Release: 1.1.rc15%{?dist} License: LGPL Group: System Environment/Daemons @@ -39,6 +39,7 @@ BuildRequires: libtool BuildRequires: autoconf BuildRequires: automake +BuildRequires: krb5-devel # gettext-devel is needed for running autoconf because of the # presence of AM_ICONV BuildRequires: gettext-devel @@ -91,7 +92,8 @@ --with-ssl=openssl \ --with-ssldir=%{ssldir} \ --with-ldap \ - --with-inotify + --with-inotify \ + --with-gssapi make @@ -214,6 +216,9 @@ %changelog +* Thu Dec 21 2006 Tomas Janousek - 1.0-1.1.rc15 +- reenabled GSSAPI (#220377) + * Tue Dec 05 2006 Tomas Janousek - 1.0-1.rc15 - update to latest upstream, fixes a few bugs, plus a security vulnerability (#216508, CVE-2006-5973) From fedora-cvs-commits at redhat.com Mon Jan 8 14:59:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 09:59:24 -0500 Subject: rpms/vnc/FC-6 vnc-render.patch,1.14,1.15 vnc.spec,1.153,1.154 Message-ID: <200701081459.l08ExOr8031161@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/vnc/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30691/vnc/FC-6 Modified Files: vnc-render.patch vnc.spec Log Message: Resolves: #203304 Fixed black screen problems on zSeries vnc-render.patch: Imakefile | 2 - Xvnc/xvnc.cc | 50 +++++++++++++++++++++++++++++++++++++++++++++++- module/Imakefile | 2 - vncHooks.cc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+), 3 deletions(-) Index: vnc-render.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/FC-6/vnc-render.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- vnc-render.patch 13 Dec 2006 11:40:21 -0000 1.14 +++ vnc-render.patch 8 Jan 2007 14:59:22 -0000 1.15 @@ -5,7 +5,7 @@ static char needswap = 0; static int lastScreen = -1; +#ifdef RENDER -+#if (defined(__ppc__) || defined(__powerpc__)) ++#if (defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)) +static Bool Render = TRUE; +#else +static Bool Render = FALSE; @@ -19,7 +19,7 @@ ErrorF("-screen scrn WxHxD set screen's width, height, depth\n"); ErrorF("-pixdepths list-of-int support given pixmap depths\n"); +#ifdef RENDER -+#if (defined(__ppc__) || defined(__powerpc__)) ++#if (defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__s390x__)) + ErrorF("+/-render turn on/off RENDER extension support" + "(default on)\n"); +#else Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/FC-6/vnc.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- vnc.spec 13 Dec 2006 11:40:21 -0000 1.153 +++ vnc.spec 8 Jan 2007 14:59:22 -0000 1.154 @@ -5,7 +5,7 @@ Summary: A remote display system. Name: vnc Version: 4.1.2 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://www.realvnc.com Source0: http://www.realvnc.com/dist/vnc-%{vnc_version}-unixsrc.tar.gz Source1: http://www.realvnc.com/dist/vnc-%{java_vnc_version}-javasrc.tar.gz @@ -283,6 +283,9 @@ %{_libdir}/xorg/modules/extensions/libvnc.so %changelog +* Mon Jan 08 2007 Adam Tkac 4.1.2-9 +- fixed black screen problem on zSeries (#203304) + * Wed Dec 13 2006 Adam Tkac 4.1.2-8 - fixed vnc-102434.patch - potential buffer overflow error - only powerpc+powerpc64 architecture has enabled render extensions by From fedora-cvs-commits at redhat.com Mon Jan 8 15:40:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 10:40:13 -0500 Subject: rpms/cpuspeed/devel cpuspeed.init,1.22,1.23 Message-ID: <200701081540.l08FeDhl007759@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7389 Modified Files: cpuspeed.init Log Message: - Fix reversed cpuspeed option tweaking section (#221829) - Let drivers other than centrino/powernow-k8 (i.e., p4-clockmod) also use the governor of their own choosing (#219926) Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- cpuspeed.init 5 Jan 2007 17:25:24 -0000 1.22 +++ cpuspeed.init 8 Jan 2007 15:40:06 -0000 1.23 @@ -70,14 +70,14 @@ # cpuspeed as it does for the cpufreq governors, but close # enough, and if not specified, we use the daemon defaults. if [ -n "$UP_THRESHOLD" ]; then - UP_THRESHOLD=10 - else let UP_THRESHOLD=100-$UP_THRESHOLD + else + UP_THRESHOLD=10 fi if [ -n "$DOWN_THRESHOLD" ]; then - DOWN_THRESHOLD=25 - else let DOWN_THRESHOLD=100-$DOWN_THRESHOLD + else + DOWN_THRESHOLD=25 fi OPTS="$OPTS -p $UP_THRESHOLD $DOWN_THRESHOLD" if [ -n "$MIN_SPEED" ]; then @@ -108,7 +108,6 @@ } start() { - governor=${GOVERNOR:-ondemand} if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then if ! some_file_exist $testpat ; then # Attempt to load scaling_driver if not loaded @@ -141,49 +140,50 @@ case "$drv" in centrino|powernow-k8) - if [ `grep -c -w ${governor} ${cpu0freqd}/scaling_available_governors` -ge 1 ] ; then - $logger "Enabling ${governor} cpu frequency scaling governor" - else - $logger "Invalid governor \"${governor}\" specified, falling back to ondemand" - governor="ondemand" - fi - governor_is_module && is_module=true - if [ $is_module == true ]; then - /sbin/modprobe cpufreq-${governor} - fi - adjust_cpufreq scaling_governor ${governor} - if [ -n "$MIN_SPEED" ]; then - adjust_cpufreq scaling_min_freq $MIN_SPEED - fi - if [ -n "$MAX_SPEED" ]; then - adjust_cpufreq scaling_max_freq $MAX_SPEED - fi - if [ -n "$UP_THRESHOLD" -a ${governor} == "ondemand" ]; then - adjust_cpufreq ondemand/up_threshold $UP_THRESHOLD - fi - if [ -n "$DOWN_THRESHOLD" -a ${governor} == "conservative" ]; then - adjust_cpufreq conservative/down_threshold $DOWN_THRESHOLD - fi - if [ "$IGNORE_NICE" -eq 1 -a ${governor} == "ondemand" -o ${governor} == "conservative" ]; then - adjust_cpufreq ${governor}/ignore_nice_load $IGNORE_NICE - fi - if [ "${governor}" != "userspace" ]; then - echo -n "Enabling ${governor} cpu frequency scaling: " - daemon : - RETVAL=0 - else - start_cpuspeed - RETVAL=$? - fi + governor=${GOVERNOR:-governor} ;; *) - start_cpuspeed - RETVAL=$? + governor=${GOVERNOR:-userspace} ;; esac + if [ `grep -c -w ${governor} ${cpu0freqd}/scaling_available_governors` -ge 1 ] ; then + $logger "Enabling ${governor} cpu frequency scaling governor" + else + $logger "Invalid governor \"${governor}\" specified, falling back to ondemand" + governor="ondemand" + fi + governor_is_module && is_module=true + if [ $is_module == true ]; then + /sbin/modprobe cpufreq-${governor} + fi + adjust_cpufreq scaling_governor ${governor} + # cpuspeed daemon only runs w/userspace governor + if [ "${governor}" == "userspace" ]; then + start_cpuspeed + RETVAL=$? + else + if [ -n "$MIN_SPEED" ]; then + adjust_cpufreq scaling_min_freq $MIN_SPEED + fi + if [ -n "$MAX_SPEED" ]; then + adjust_cpufreq scaling_max_freq $MAX_SPEED + fi + if [ -n "$UP_THRESHOLD" -a ${governor} == "ondemand" ]; then + adjust_cpufreq ondemand/up_threshold $UP_THRESHOLD + fi + if [ -n "$DOWN_THRESHOLD" -a ${governor} == "conservative" ]; then + adjust_cpufreq conservative/down_threshold $DOWN_THRESHOLD + fi + if [ "$IGNORE_NICE" -eq 1 -a ${governor} == "ondemand" -o ${governor} == "conservative" ]; then + adjust_cpufreq ${governor}/ignore_nice_load $IGNORE_NICE + fi + echo -n "Enabling ${governor} cpu frequency scaling: " + daemon : + RETVAL=0 + fi echo - # Technically, not quite right in centrino/powernow-k8 - # case, but close enough to indicaate that we're + # Technically, not quite right in non-cpuspeed daemon + # cases, but close enough to indicate that we're # doing some sort of cpu frequency scaling. [ $RETVAL = 0 ] && touch $lockfile else @@ -195,35 +195,26 @@ stop() { [ ! -f ${cpu0freqd}/scaling_driver ] && return 0 drv=`cat ${cpu0freqd}/scaling_driver` + governor_module_loaded && module_loaded=true - case "$drv" in - centrino|powernow-k8) - $logger "Disabling ${governor} cpu frequency scaling governor" - governor_module_loaded && module_loaded=true - for cpu in ${cpus} - do - echo userspace > $cpu/cpufreq/scaling_governor - cat $cpu/cpufreq/cpuinfo_max_freq > $cpu/cpufreq/scaling_setspeed - done - if [ $module_loaded == true ]; then - /sbin/modprobe -r cpufreq-${governor} - fi - if [ "${governor}" != "userspace" ]; then - echo -n "Disabling ${governor} cpu frequency scaling: " - daemon : - RETVAL=0 - else - stop_cpuspeed - RETVAL=$? - fi - ;; - *) - stop_cpuspeed - RETVAL=$? - ;; - esac + if [ "${governor}" != "userspace" ]; then + echo -n "Disabling ${governor} cpu frequency scaling: " + $logger "Disabling ${governor} cpu frequency scaling governor" + for cpu in ${cpus} + do + echo userspace > $cpu/cpufreq/scaling_governor + cat $cpu/cpufreq/cpuinfo_max_freq > $cpu/cpufreq/scaling_setspeed + done + if [ $module_loaded == true ]; then + /sbin/modprobe -r cpufreq-${governor} + fi + daemon : + RETVAL=0 + else + stop_cpuspeed + RETVAL=$? + fi echo - [ -n "$DRIVER" ] && /sbin/modprobe -r $DRIVER [ $RETVAL = 0 ] && RETVAL=$? [ $RETVAL = 0 ] && rm -f $lockfile From fedora-cvs-commits at redhat.com Mon Jan 8 15:49:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 10:49:26 -0500 Subject: rpms/vim/devel vim.spec,1.155,1.156 Message-ID: <200701081549.l08FnQk2028559@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28545 Modified Files: vim.spec Log Message: - enable filetype plugin Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- vim.spec 14 Dec 2006 13:13:08 -0000 1.155 +++ vim.spec 8 Jan 2007 15:49:23 -0000 1.156 @@ -21,7 +21,7 @@ Summary: The VIM editor. Name: vim Version: %{baseversion}.%{beta}%{patchlevel} -Release: 2 +Release: 3 License: freeware Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2 @@ -970,6 +970,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Jan 08 2007 Karsten Hopp 7.0.178-3 +- enable filetype plugin + * Thu Dec 14 2006 Karsten Hopp 7.0.178-2 - build vim-minimal with features=small instead of tiny (#219605) From fedora-cvs-commits at redhat.com Mon Jan 8 15:49:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 10:49:51 -0500 Subject: rpms/cpuspeed/devel cpuspeed.conf,1.1,1.2 cpuspeed.spec,1.47,1.48 Message-ID: <200701081549.l08Fnpa6028624@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28599 Modified Files: cpuspeed.conf cpuspeed.spec Log Message: - Let non-centrino/powernow-k8 systems also use other validated governors (#219926) - Fix cpuspeed daemon options settings (#221829) Index: cpuspeed.conf =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpuspeed.conf 5 Jan 2007 17:25:24 -0000 1.1 +++ cpuspeed.conf 8 Jan 2007 15:49:49 -0000 1.2 @@ -6,7 +6,8 @@ ### DRIVER ### # Your CPUFreq driver module # Note that many drivers are now built-in, rather than built as modules, -# so its usually best not to specify one. +# so its usually best not to specify one. The most commonly-needed driver +# module these days is 'p4-clockmod'. # default value: empty (auto-detect/use built-in) DRIVER= Index: cpuspeed.spec =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- cpuspeed.spec 5 Jan 2007 17:25:24 -0000 1.47 +++ cpuspeed.spec 8 Jan 2007 15:49:49 -0000 1.48 @@ -78,6 +78,11 @@ exit 0 %changelog +* Mon Jan 08 2007 Jarod Wilson +- Let non-centrino/powernow-k8 systems also use other + validated governors (#219926) +- Fix cpuspeed daemon options settings (#221829) + * Fri Jan 05 2007 Jarod Wilson - Fix status and condrestart for centrino/powernow-k8 (#219926) - Give feedback when loading/unloading a cpufreq governor From fedora-cvs-commits at redhat.com Mon Jan 8 15:49:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 10:49:52 -0500 Subject: rpms/vim/devel vimrc,1.14,1.15 Message-ID: <200701081549.l08FnqvM028634@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28600 Modified Files: vimrc Log Message: - enable filetype plugin Index: vimrc =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vimrc,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- vimrc 9 Aug 2006 09:15:40 -0000 1.14 +++ vimrc 8 Jan 2007 15:49:50 -0000 1.15 @@ -44,6 +44,8 @@ set hlsearch endif +filetype plugin on + if &term=="xterm" set t_Co=8 set t_Sb=[4%dm From fedora-cvs-commits at redhat.com Mon Jan 8 16:13:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 11:13:29 -0500 Subject: rpms/dovecot/devel .cvsignore, 1.16, 1.17 dovecot.spec, 1.65, 1.66 sources, 1.17, 1.18 Message-ID: <200701081613.l08GDT6C029232@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/dovecot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29216 Modified Files: .cvsignore dovecot.spec sources Log Message: * Mon Jan 08 2007 Tomas Janousek - 1.0-2.rc17 - update to latest upstream, fixes a few bugs Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 11 Dec 2006 08:51:58 -0000 1.16 +++ .cvsignore 8 Jan 2007 16:13:27 -0000 1.17 @@ -1 +1 @@ -dovecot-1.0.rc15.tar.gz +dovecot-1.0.rc17.tar.gz Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- dovecot.spec 8 Jan 2007 14:48:02 -0000 1.65 +++ dovecot.spec 8 Jan 2007 16:13:27 -0000 1.66 @@ -1,13 +1,13 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 1.0 -Release: 1.1.rc15%{?dist} +Release: 2.rc17%{?dist} License: LGPL Group: System Environment/Daemons %define build_postgres 1 %define build_mysql 1 -%define upstream 1.0.rc15 +%define upstream 1.0.rc17 Source: %{name}-%{upstream}.tar.gz Source1: dovecot.init @@ -78,7 +78,6 @@ %build rm -f ./configure libtoolize -f -cp /usr/share/gettext/config.rpath . autoreconf %configure \ INSTALL_DATA="install -c -p -m644" \ @@ -216,6 +215,9 @@ %changelog +* Mon Jan 08 2007 Tomas Janousek - 1.0-2.rc17 +- update to latest upstream, fixes a few bugs + * Thu Dec 21 2006 Tomas Janousek - 1.0-1.1.rc15 - reenabled GSSAPI (#220377) Index: sources =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 11 Dec 2006 08:51:58 -0000 1.17 +++ sources 8 Jan 2007 16:13:27 -0000 1.18 @@ -1 +1 @@ -26f3d2b075856b1b1d180146363819e6 dovecot-1.0.rc15.tar.gz +881bcc7d2c8fba6d337f3e616a602bf7 dovecot-1.0.rc17.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 8 16:43:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 11:43:10 -0500 Subject: rpms/system-config-printer/FC-6 .cvsignore, 1.110, 1.111 sources, 1.113, 1.114 system-config-printer.spec, 1.82, 1.83 Message-ID: <200701081643.l08GhATr007627@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7561 Modified Files: .cvsignore sources system-config-printer.spec Log Message: * Mon Jan 8 2007 Tim Waugh 0.7.46-1 - 0.7.46: - Fixed page size problem (bug #221702). - Added 'ro' to ALL_LINGUAS. - Resolves: rhbz#221702 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-6/.cvsignore,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- .cvsignore 3 Jan 2007 11:47:27 -0000 1.110 +++ .cvsignore 8 Jan 2007 16:43:08 -0000 1.111 @@ -90,3 +90,4 @@ system-config-printer-0.7.44.tar.bz2 pycups-1.9.17.tar.bz2 system-config-printer-0.7.45.tar.bz2 +system-config-printer-0.7.46.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-6/sources,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- sources 3 Jan 2007 11:47:27 -0000 1.113 +++ sources 8 Jan 2007 16:43:08 -0000 1.114 @@ -1,2 +1,2 @@ fb4400a1c8de5b35566d6fd6c56ae619 pycups-1.9.17.tar.bz2 -2d50989585155aff5a8dedb4ac20257e system-config-printer-0.7.45.tar.bz2 +80fb5a9f05a8bd4e20eca6a0f7372876 system-config-printer-0.7.46.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-6/system-config-printer.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- system-config-printer.spec 3 Jan 2007 11:47:27 -0000 1.82 +++ system-config-printer.spec 8 Jan 2007 16:43:08 -0000 1.83 @@ -2,7 +2,7 @@ Summary: A printer administration tool Name: system-config-printer -Version: 0.7.45 +Version: 0.7.46 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -114,6 +114,11 @@ fi %changelog +* Mon Jan 8 2007 Tim Waugh 0.7.46-1 +- 0.7.46: + - Fixed page size problem (bug #221702). + - Added 'ro' to ALL_LINGUAS. + * Wed Jan 3 2007 Tim Waugh 0.7.45-1 - Updated to pycups-1.9.17. - 0.7.45: From fedora-cvs-commits at redhat.com Mon Jan 8 16:43:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 11:43:54 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.107, 1.108 sources, 1.111, 1.112 system-config-printer.spec, 1.79, 1.80 Message-ID: <200701081643.l08GhsT6008271@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8215 Modified Files: .cvsignore sources system-config-printer.spec Log Message: * Mon Jan 8 2007 Tim Waugh 0.7.46-1 - 0.7.46: - Fixed page size problem (bug #221702). - Added 'ro' to ALL_LINGUAS. - Resolves: rhbz#221702 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- .cvsignore 3 Jan 2007 11:48:26 -0000 1.107 +++ .cvsignore 8 Jan 2007 16:43:52 -0000 1.108 @@ -87,3 +87,4 @@ system-config-printer-0.7.43.tar.bz2 system-config-printer-0.7.44.tar.bz2 system-config-printer-0.7.45.tar.bz2 +system-config-printer-0.7.46.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- sources 3 Jan 2007 11:48:26 -0000 1.111 +++ sources 8 Jan 2007 16:43:52 -0000 1.112 @@ -1,2 +1,2 @@ fb4400a1c8de5b35566d6fd6c56ae619 pycups-1.9.17.tar.bz2 -2d50989585155aff5a8dedb4ac20257e system-config-printer-0.7.45.tar.bz2 +80fb5a9f05a8bd4e20eca6a0f7372876 system-config-printer-0.7.46.tar.bz2 Index: system-config-printer.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/system-config-printer.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- system-config-printer.spec 3 Jan 2007 11:48:26 -0000 1.79 +++ system-config-printer.spec 8 Jan 2007 16:43:52 -0000 1.80 @@ -2,7 +2,7 @@ Summary: A printer administration tool Name: system-config-printer -Version: 0.7.45 +Version: 0.7.46 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -112,6 +112,11 @@ fi %changelog +* Mon Jan 8 2007 Tim Waugh 0.7.46-1 +- 0.7.46: + - Fixed page size problem (bug #221702). + - Added 'ro' to ALL_LINGUAS. + * Wed Jan 3 2007 Tim Waugh 0.7.45-1 - Updated to pycups-1.9.17. - 0.7.45: From fedora-cvs-commits at redhat.com Mon Jan 8 16:47:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 11:47:50 -0500 Subject: rpms/kernel/FC-6/configs config-generic,1.263,1.264 Message-ID: <200701081647.l08GloX7031636@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv31182/configs Modified Files: config-generic Log Message: readd signed modules Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- config-generic 2 Jan 2007 18:08:08 -0000 1.263 +++ config-generic 8 Jan 2007 16:47:48 -0000 1.264 @@ -55,6 +55,7 @@ CONFIG_KMOD=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set +CONFIG_MODULE_VERIFY_ELF=y # # Bus options (PCI, PCMCIA, EISA, MCA, ISA) From fedora-cvs-commits at redhat.com Mon Jan 8 16:47:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 11:47:50 -0500 Subject: rpms/kernel/FC-6 linux-2.6-modsign-verify.patch, NONE, 1.1 kernel-2.6.spec, 1.2891, 1.2892 linux-2.6-modsign-core.patch, 1.6, 1.7 linux-2.6-modsign-crypto.patch, 1.3, 1.4 linux-2.6-modsign-include.patch, 1.2, 1.3 linux-2.6-modsign-ksign.patch, 1.4, 1.5 linux-2.6-modsign-mpilib.patch, 1.2, 1.3 linux-2.6-modsign-script.patch, 1.1, 1.2 Message-ID: <200701081647.l08GloYA031621@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31182 Modified Files: kernel-2.6.spec linux-2.6-modsign-core.patch linux-2.6-modsign-crypto.patch linux-2.6-modsign-include.patch linux-2.6-modsign-ksign.patch linux-2.6-modsign-mpilib.patch linux-2.6-modsign-script.patch Added Files: linux-2.6-modsign-verify.patch Log Message: readd signed modules linux-2.6-modsign-verify.patch: init/Kconfig | 11 + kernel/Makefile | 2 kernel/module-verify-elf.c | 304 +++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 41 ++++++ kernel/module-verify.h | 53 +++++++ kernel/module.c | 7 - 6 files changed, 416 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-modsign-verify.patch --- MODSIGN: Module ELF verifier From: David Howells Do preliminary verification of the ELF structure of a module. This is used to make sure that the ELF structure can then be used to check the module signature and access the module data without breaking the module loader. Signed-Off-By: David Howells --- init/Kconfig | 11 ++ kernel/Makefile | 2 kernel/module-verify-elf.c | 304 ++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 41 ++++++ kernel/module-verify.h | 53 ++++++++ kernel/module.c | 7 + 6 files changed, 416 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index a3f83e2..d1ca69b 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -549,6 +549,17 @@ config MODULE_SRCVERSION_ALL the version). With this option, such a "srcversion" field will be created for all modules. If unsure, say N. +config MODULE_VERIFY_ELF + bool "Module ELF structure verification" + depends on MODULES + help + Check ELF structure of modules upon load + +config MODULE_VERIFY + bool + depends on MODULES + default y if MODULE_VERIFY_ELF + config KMOD bool "Automatic kernel module loading" depends on MODULES diff --git a/kernel/Makefile b/kernel/Makefile index 14f4d45..5ed0824 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -30,6 +30,8 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock obj-$(CONFIG_PROVE_LOCKING) += spinlock.o obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_MODULE_VERIFY) += module-verify.o +obj-$(CONFIG_MODULE_VERIFY_ELF) += module-verify-elf.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o diff --git a/kernel/module-verify-elf.c b/kernel/module-verify-elf.c new file mode 100644 index 0000000..6c4f1b1 --- /dev/null +++ b/kernel/module-verify-elf.c @@ -0,0 +1,304 @@ +/* module-verify-elf.c: module ELF verifier + * + * Written by David Howells (dhowells at redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include +#include +#include +#include +#include "module-verify.h" + +#if 0 +#define _debug(FMT, ...) printk(FMT, ##__VA_ARGS__) +#else +#define _debug(FMT, ...) do {} while (0) +#endif + +/* + * verify the ELF structure of a module + */ +int module_verify_elf(struct module_verify_data *mvdata) +{ + const Elf_Ehdr *hdr = mvdata->hdr; + const Elf_Shdr *section, *section2, *secstop; + const Elf_Rela *relas, *rela, *relastop; + const Elf_Rel *rels, *rel, *relstop; + const Elf_Sym *symbol, *symstop; + size_t size, sssize, *secsize, tmp, tmp2; + long last; + int line; + + size = mvdata->size; + mvdata->nsects = hdr->e_shnum; + +#define elfcheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto elfcheck_error; } } while(0) + +#define seccheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto seccheck_error; } } while(0) + +#define symcheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto symcheck_error; } } while(0) + +#define relcheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto relcheck_error; } } while(0) + +#define relacheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto relacheck_error; } } while(0) + + /* validate the ELF header */ + elfcheck(hdr->e_ehsize < size); + elfcheck(hdr->e_entry == 0); + elfcheck(hdr->e_phoff == 0); + elfcheck(hdr->e_phnum == 0); + + elfcheck(hdr->e_shnum < SHN_LORESERVE); + elfcheck(hdr->e_shoff < size); + elfcheck(hdr->e_shoff >= hdr->e_ehsize); + elfcheck((hdr->e_shoff & (sizeof(long) - 1)) == 0); + elfcheck(hdr->e_shstrndx > 0); + elfcheck(hdr->e_shstrndx < hdr->e_shnum); + elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr)); + + tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum; + elfcheck(tmp <= size - hdr->e_shoff); + + /* allocate a table to hold in-file section sizes */ + mvdata->secsizes = kcalloc(hdr->e_shnum, sizeof(size_t), GFP_KERNEL); + if (!mvdata->secsizes) + return -ENOMEM; + + /* validate the ELF section headers */ + mvdata->sections = mvdata->buffer + hdr->e_shoff; + secstop = mvdata->sections + mvdata->nsects; + + sssize = mvdata->sections[hdr->e_shstrndx].sh_size; + elfcheck(sssize > 0); + + section = mvdata->sections; + seccheck(section->sh_type == SHT_NULL); + seccheck(section->sh_size == 0); + seccheck(section->sh_offset == 0); + + secsize = mvdata->secsizes + 1; + for (section++; section < secstop; secsize++, section++) { + seccheck(section->sh_name < sssize); + seccheck(section->sh_link < hdr->e_shnum); + + if (section->sh_entsize > 0) + seccheck(section->sh_size % section->sh_entsize == 0); + + seccheck(section->sh_offset >= hdr->e_ehsize); + seccheck(section->sh_offset < size); + + /* determine the section's in-file size */ + tmp = size - section->sh_offset; + if (section->sh_offset < hdr->e_shoff) + tmp = hdr->e_shoff - section->sh_offset; + + for (section2 = mvdata->sections + 1; + section2 < secstop; + section2++) { + if (section->sh_offset < section2->sh_offset) { + tmp2 = section2->sh_offset - + section->sh_offset; + if (tmp2 < tmp) + tmp = tmp2; + } + } + *secsize = tmp; + + _debug("Section %ld: %zx bytes at %lx\n", + section - mvdata->sections, + *secsize, + (unsigned long) section->sh_offset); + + /* perform section type specific checks */ + switch (section->sh_type) { + case SHT_NOBITS: + break; + + case SHT_REL: + seccheck(section->sh_entsize == sizeof(Elf_Rel)); + goto more_rel_checks; + + case SHT_RELA: + seccheck(section->sh_entsize == sizeof(Elf_Rela)); + more_rel_checks: + seccheck(section->sh_info > 0); + seccheck(section->sh_info < hdr->e_shnum); + goto more_sec_checks; + + case SHT_SYMTAB: + seccheck(section->sh_entsize == sizeof(Elf_Sym)); + goto more_sec_checks; + + default: + more_sec_checks: + /* most types of section must be contained entirely + * within the file */ + seccheck(section->sh_size <= *secsize); + break; + } + } + + /* validate the ELF section names */ + section = &mvdata->sections[hdr->e_shstrndx]; + + seccheck(section->sh_offset != hdr->e_shoff); + + mvdata->secstrings = mvdata->buffer + section->sh_offset; + + last = -1; + for (section = mvdata->sections + 1; section < secstop; section++) { + const char *secname; + tmp = sssize - section->sh_name; + secname = mvdata->secstrings + section->sh_name; + seccheck(secname[0] != 0); + if (section->sh_name > last) + last = section->sh_name; + } + + if (last > -1) { + tmp = sssize - last; + elfcheck(memchr(mvdata->secstrings + last, 0, tmp) != NULL); + } + + /* look for various sections in the module */ + for (section = mvdata->sections + 1; section < secstop; section++) { + switch (section->sh_type) { + case SHT_SYMTAB: + if (strcmp(mvdata->secstrings + section->sh_name, + ".symtab") == 0 + ) { + seccheck(mvdata->symbols == NULL); + mvdata->symbols = + mvdata->buffer + section->sh_offset; + mvdata->nsyms = + section->sh_size / sizeof(Elf_Sym); + seccheck(section->sh_size > 0); + } + break; + + case SHT_STRTAB: + if (strcmp(mvdata->secstrings + section->sh_name, + ".strtab") == 0 + ) { + seccheck(mvdata->strings == NULL); + mvdata->strings = + mvdata->buffer + section->sh_offset; + sssize = mvdata->nstrings = section->sh_size; + seccheck(section->sh_size > 0); + } + break; + } + } + + if (!mvdata->symbols) { + printk("Couldn't locate module symbol table\n"); + goto format_error; + } + + if (!mvdata->strings) { + printk("Couldn't locate module strings table\n"); + goto format_error; + } + + /* validate the symbol table */ + symstop = mvdata->symbols + mvdata->nsyms; + + symbol = mvdata->symbols; + symcheck(ELF_ST_TYPE(symbol[0].st_info) == STT_NOTYPE); + symcheck(symbol[0].st_shndx == SHN_UNDEF); + symcheck(symbol[0].st_value == 0); + symcheck(symbol[0].st_size == 0); + + last = -1; + for (symbol++; symbol < symstop; symbol++) { + symcheck(symbol->st_name < sssize); + if (symbol->st_name > last) + last = symbol->st_name; + symcheck(symbol->st_shndx < mvdata->nsects || + symbol->st_shndx >= SHN_LORESERVE); + } + + if (last > -1) { + tmp = sssize - last; + elfcheck(memchr(mvdata->strings + last, 0, tmp) != NULL); + } + + /* validate each relocation table as best we can */ + for (section = mvdata->sections + 1; section < secstop; section++) { + section2 = mvdata->sections + section->sh_info; + + switch (section->sh_type) { + case SHT_REL: + rels = mvdata->buffer + section->sh_offset; + relstop = mvdata->buffer + + section->sh_offset + section->sh_size; + + for (rel = rels; rel < relstop; rel++) { + relcheck(rel->r_offset < section2->sh_size); + relcheck(ELF_R_SYM(rel->r_info) < + mvdata->nsyms); + } + + break; + + case SHT_RELA: + relas = mvdata->buffer + section->sh_offset; + relastop = mvdata->buffer + + section->sh_offset + section->sh_size; + + for (rela = relas; rela < relastop; rela++) { + relacheck(rela->r_offset < section2->sh_size); + relacheck(ELF_R_SYM(rela->r_info) < + mvdata->nsyms); + } + + break; + + default: + break; + } + } + + + _debug("ELF okay\n"); + return 0; + +elfcheck_error: + printk("Verify ELF error (assertion %d)\n", line); + goto format_error; + +seccheck_error: + printk("Verify ELF error [sec %ld] (assertion %d)\n", + (long)(section - mvdata->sections), line); + goto format_error; + +symcheck_error: + printk("Verify ELF error [sym %ld] (assertion %d)\n", + (long)(symbol - mvdata->symbols), line); + goto format_error; + +relcheck_error: + printk("Verify ELF error [sec %ld rel %ld] (assertion %d)\n", + (long)(section - mvdata->sections), + (long)(rel - rels), line); + goto format_error; + +relacheck_error: + printk("Verify ELF error [sec %ld rela %ld] (assertion %d)\n", + (long)(section - mvdata->sections), + (long)(rela - relas), line); + goto format_error; + +format_error: + return -ELIBBAD; +} diff --git a/kernel/module-verify.c b/kernel/module-verify.c new file mode 100644 index 0000000..875279f --- /dev/null +++ b/kernel/module-verify.c @@ -0,0 +1,41 @@ +/* module-verify.c: module verifier + * + * Written by David Howells (dhowells at redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include +#include +#include +#include "module-verify.h" + +/* + * verify a module's integrity + * - check the ELF is viable + */ +int module_verify(const Elf_Ehdr *hdr, size_t size) +{ + struct module_verify_data mvdata; + int ret; + + memset(&mvdata, 0, sizeof(mvdata)); + mvdata.buffer = hdr; + mvdata.hdr = hdr; + mvdata.size = size; + + ret = module_verify_elf(&mvdata); + if (ret < 0) { + if (ret == -ELIBBAD) + printk("Module failed ELF checks\n"); + goto error; + } + +error: + kfree(mvdata.secsizes); + kfree(mvdata.canonlist); + return ret; +} diff --git a/kernel/module-verify.h b/kernel/module-verify.h new file mode 100644 index 0000000..63f5e08 --- /dev/null +++ b/kernel/module-verify.h @@ -0,0 +1,53 @@ +/* module-verify.h: module verification definitions + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. + * Written by David Howells (dhowells at redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include +#include + +#ifdef CONFIG_MODULE_VERIFY +struct module_verify_data { + struct crypto_tfm *digest; /* module signature digest */ + const void *buffer; /* module buffer */ + const Elf_Ehdr *hdr; /* ELF header */ + const Elf_Shdr *sections; /* ELF section table */ + const Elf_Sym *symbols; /* ELF symbol table */ + const char *secstrings; /* ELF section string table */ + const char *strings; /* ELF string table */ + size_t *secsizes; /* section size list */ + size_t size; /* module object size */ + size_t nsects; /* number of sections */ + size_t nsyms; /* number of symbols */ + size_t nstrings; /* size of strings section */ + size_t signed_size; /* count of bytes contributed to digest */ + int *canonlist; /* list of canonicalised sections */ + int *canonmap; /* section canonicalisation map */ + int sig_index; /* module signature section index */ + uint8_t xcsum; /* checksum of bytes contributed to digest */ + uint8_t csum; /* checksum of bytes representing a section */ +}; + +/* + * module-verify.c + */ +extern int module_verify(const Elf_Ehdr *hdr, size_t size); + +/* + * module-verify-elf.c + */ +#ifdef CONFIG_MODULE_VERIFY_ELF +extern int module_verify_elf(struct module_verify_data *mvdata); +#else +#define module_verify_elf(m) (0) +#endif + +#else +#define module_verify(h, s) (0) +#endif diff --git a/kernel/module.c b/kernel/module.c index dbce132..9d5787d 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -44,6 +44,7 @@ #include #include #include #include +#include "module-verify.h" #if 0 #define DEBUGP printk @@ -1591,8 +1592,10 @@ static struct module *load_module(void _ goto free_hdr; } - if (len < hdr->e_shoff + hdr->e_shnum * sizeof(Elf_Shdr)) - goto truncated; + /* Verify the module's contents */ + err = module_verify(hdr, len); + if (err < 0) + goto free_hdr; /* Convenience variables */ sechdrs = (void *)hdr + hdr->e_shoff; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2891 retrieving revision 1.2892 diff -u -r1.2891 -r1.2892 --- kernel-2.6.spec 8 Jan 2007 05:06:25 -0000 1.2891 +++ kernel-2.6.spec 8 Jan 2007 16:47:47 -0000 1.2892 @@ -190,10 +190,6 @@ %define _enable_debug_packages 0 %endif -# Signed modules are currently busted, so ignore the above -%define signmodules 0 - - # # Three sets of minimum package version requirements in the form of Conflicts: @@ -357,12 +353,13 @@ Patch811: linux-2.6-warn-c-p-a.patch # Module signing infrastructure. -Patch900: linux-2.6-modsign-core.patch +Patch900: linux-2.6-modsign-mpilib.patch Patch901: linux-2.6-modsign-crypto.patch -Patch902: linux-2.6-modsign-ksign.patch -Patch903: linux-2.6-modsign-mpilib.patch -Patch904: linux-2.6-modsign-script.patch -Patch905: linux-2.6-modsign-include.patch +Patch902: linux-2.6-modsign-include.patch +Patch903: linux-2.6-modsign-verify.patch +Patch904: linux-2.6-modsign-ksign.patch +Patch905: linux-2.6-modsign-core.patch +Patch906: linux-2.6-modsign-script.patch # Tux http accelerator. Patch910: linux-2.6-tux.patch @@ -862,12 +859,13 @@ # # GPG signed kernel modules # -#%patch900 -p1 -#%patch901 -p1 -#%patch902 -p1 -#%patch903 -p1 -#%patch904 -p1 -#%patch905 -p1 +%patch900 -p1 +%patch901 -p1 +%patch902 -p1 +%patch903 -p1 +%patch904 -p1 +%patch905 -p1 +%patch906 -p1 # Tux #%patch910 -p1 @@ -2018,6 +2016,7 @@ %changelog * Mon Jan 8 2007 Dave Jones - Enable pktcdvd for 586. (#221673) +- Reenable signed modules. * Sun Jan 7 2007 Dave Jones - Disable NMI watchdog by default. linux-2.6-modsign-core.patch: include/linux/module.h | 3 init/Kconfig | 18 + kernel/Makefile | 1 kernel/module-verify-sig.c | 450 +++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 5 kernel/module-verify.h | 12 + kernel/module.c | 12 + 7 files changed, 498 insertions(+), 3 deletions(-) Index: linux-2.6-modsign-core.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-modsign-core.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-modsign-core.patch 21 Dec 2006 21:45:14 -0000 1.6 +++ linux-2.6-modsign-core.patch 8 Jan 2007 16:47:48 -0000 1.7 @@ -1,21 +1,43 @@ ---- linux-2.6.18.noarch/include/linux/module.h~ 2006-10-14 18:37:27.000000000 -0400 -+++ linux-2.6.18.noarch/include/linux/module.h 2006-10-14 18:38:27.000000000 -0400 -@@ -319,6 +319,9 @@ struct module - - unsigned int taints; /* same bits as kernel:tainted */ +MODSIGN: Apply signature checking to modules on module load + +From: David Howells + +Apply signature checking to modules on module load, checking the signature +against the ring of public keys compiled into the kernel. + +Signed-Off-By: David Howells +--- + + include/linux/module.h | 3 + init/Kconfig | 18 ++ + kernel/Makefile | 1 + kernel/module-verify-sig.c | 450 ++++++++++++++++++++++++++++++++++++++++++++ + kernel/module-verify.c | 5 + kernel/module-verify.h | 12 + + kernel/module.c | 12 + + 7 files changed, 498 insertions(+), 3 deletions(-) + +diff --git a/include/linux/module.h b/include/linux/module.h +index 10f771a..159560d 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -326,6 +326,9 @@ #ifdef CONFIG_GENERIC_BUG + unsigned num_bugs; + #endif -+ /* Am I gpg signed */ ++ /* Is this module GPG signed */ + int gpgsig_ok; + #ifdef CONFIG_MODULE_UNLOAD /* Reference counts */ struct module_ref ref[NR_CPUS]; -diff -urNp --exclude-from=/home/davej/.exclude linux-811/init/Kconfig linux-900/init/Kconfig ---- linux-811/init/Kconfig -+++ linux-900/init/Kconfig -@@ -434,6 +434,22 @@ config MODULE_SRCVERSION_ALL - the version). With this option, such a "srcversion" field - will be created for all modules. If unsure, say N. +diff --git a/init/Kconfig b/init/Kconfig +index d1ca69b..b03e9f3 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -555,10 +555,26 @@ config MODULE_VERIFY_ELF + help + Check ELF structure of modules upon load +config MODULE_SIG + bool "Module signature verification (EXPERIMENTAL)" @@ -33,469 +55,32 @@ + Reject unsigned modules or signed modules for which we don't have a + key. + + config MODULE_VERIFY + bool + depends on MODULES +- default y if MODULE_VERIFY_ELF ++ default y if MODULE_VERIFY_ELF || MODULE_SIG + config KMOD bool "Automatic kernel module loading" - depends on MODULES ---- linux-2.6.17.noarch/kernel/Makefile~ 2006-06-21 23:47:11.000000000 -0400 -+++ linux-2.6.17.noarch/kernel/Makefile 2006-06-21 23:47:19.000000000 -0400 -@@ -19,7 +19,8 @@ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o - obj-$(CONFIG_SMP) += cpu.o spinlock.o - obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o - obj-$(CONFIG_UID16) += uid16.o --obj-$(CONFIG_MODULES) += module.o -+obj-$(CONFIG_MODULES) += module.o module-verify.o +diff --git a/kernel/Makefile b/kernel/Makefile +index 5ed0824..715da89 100644 +--- a/kernel/Makefile ++++ b/kernel/Makefile +@@ -32,6 +32,7 @@ obj-$(CONFIG_UID16) += uid16.o + obj-$(CONFIG_MODULES) += module.o + obj-$(CONFIG_MODULE_VERIFY) += module-verify.o + obj-$(CONFIG_MODULE_VERIFY_ELF) += module-verify-elf.o +obj-$(CONFIG_MODULE_SIG) += module-verify-sig.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 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include "module-verify.h" - - #if 0 - #define DEBUGP printk -@@ -1413,6 +1414,7 @@ static struct module *load_module(void _ - long err = 0; - void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ - struct exception_table_entry *extable; - mm_segment_t old_fs; -+ int gpgsig_ok; - - DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n", -@@ -1438,8 +1440,13 @@ static struct module *load_module(void _ - goto free_hdr; - } - -- if (len < hdr->e_shoff + hdr->e_shnum * sizeof(Elf_Shdr)) -- goto truncated; -+ /* verify the module (validates ELF and checks signature) */ -+ gpgsig_ok = 0; -+ err = module_verify(hdr, len); -+ if (err < 0) -+ goto free_hdr; -+ if (err == 1) -+ gpgsig_ok = 1; - - /* Convenience variables */ - sechdrs = (void *)hdr + hdr->e_shoff; -@@ -1476,6 +1483,7 @@ static struct module *load_module(void _ - goto free_hdr; - } - mod = (void *)sechdrs[modindex].sh_addr; -+ mod->gpgsig_ok = gpgsig_ok; - - if (symindex == 0) { - printk(KERN_WARNING "%s: module has no symbols (stripped?)\n", ---- linux-2.6.18.noarch/kernel/module.c~ 2006-10-14 18:39:12.000000000 -0400 -+++ linux-2.6.18.noarch/kernel/module.c 2006-10-14 18:39:43.000000000 -0400 -@@ -2276,8 +2276,13 @@ void print_modules(void) - char buf[8]; - - printk("Modules linked in:"); -- list_for_each_entry(mod, &modules, list) -+ list_for_each_entry(mod, &modules, list) { - printk(" %s%s", mod->name, taint_flags(mod->taints, buf)); -+#if CONFIG_MODULE_SIG -+ if (!mod->gpgsig_ok) -+ printk("(U)"); -+#endif -+ } - printk("\n"); - } - -diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.c linux-900/kernel/module-verify.c ---- linux-811/kernel/module-verify.c -+++ linux-900/kernel/module-verify.c -@@ -0,0 +1,339 @@ -+/* module-verify.c: module verifier -+ * -+ * Written by David Howells (dhowells at redhat.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include "module-verify.h" -+ -+#if 0 -+#define _debug(FMT, ...) printk(FMT, ##__VA_ARGS__) -+#else -+#define _debug(FMT, ...) do {} while (0) -+#endif -+ -+static int module_verify_elf(struct module_verify_data *mvdata); -+ -+/*****************************************************************************/ -+/* -+ * verify a module's integrity -+ * - check the ELF is viable -+ * - check the module's signature if it has one -+ */ -+int module_verify(const Elf_Ehdr *hdr, size_t size) -+{ -+ struct module_verify_data mvdata; -+ int ret; -+ -+ memset(&mvdata, 0, sizeof(mvdata)); -+ mvdata.buffer = hdr; -+ mvdata.hdr = hdr; -+ mvdata.size = size; -+ -+ ret = module_verify_elf(&mvdata); -+ if (ret < 0) { -+ if (ret == -ELIBBAD) -+ printk("Module failed ELF checks\n"); -+ goto error; -+ } -+ -+#ifdef CONFIG_MODULE_SIG -+ ret = module_verify_signature(&mvdata); -+#endif -+ -+ error: -+ kfree(mvdata.secsizes); -+ kfree(mvdata.canonlist); -+ return ret; -+ -+} /* end module_verify() */ -+ -+/*****************************************************************************/ -+/* -+ * verify the ELF structure of a module -+ */ -+static int module_verify_elf(struct module_verify_data *mvdata) -+{ -+ const Elf_Ehdr *hdr = mvdata->hdr; -+ const Elf_Shdr *section, *section2, *secstop; -+ const Elf_Rela *relas, *rela, *relastop; -+ const Elf_Rel *rels, *rel, *relstop; -+ const Elf_Sym *symbol, *symstop; -+ size_t size, sssize, *secsize, tmp, tmp2; -+ long last; -+ int line; -+ -+ size = mvdata->size; -+ mvdata->nsects = hdr->e_shnum; -+ -+#define elfcheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto elfcheck_error; } } while(0) -+ -+#define seccheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto seccheck_error; } } while(0) -+ -+#define symcheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto symcheck_error; } } while(0) -+ -+#define relcheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto relcheck_error; } } while(0) -+ -+#define relacheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto relacheck_error; } } while(0) -+ -+ /* validate the ELF header */ -+ elfcheck(hdr->e_ehsize < size); -+ elfcheck(hdr->e_entry == 0); -+ elfcheck(hdr->e_phoff == 0); -+ elfcheck(hdr->e_phnum == 0); -+ -+ elfcheck(hdr->e_shnum < SHN_LORESERVE); -+ elfcheck(hdr->e_shoff < size); -+ elfcheck(hdr->e_shoff >= hdr->e_ehsize); -+ elfcheck((hdr->e_shoff & (sizeof(long) - 1)) == 0); -+ elfcheck(hdr->e_shstrndx > 0); -+ elfcheck(hdr->e_shstrndx < hdr->e_shnum); -+ elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr)); -+ -+ tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum; -+ elfcheck(tmp < size - hdr->e_shoff); -+ -+ /* allocate a table to hold in-file section sizes */ -+ mvdata->secsizes = kmalloc(hdr->e_shnum * sizeof(size_t), GFP_KERNEL); -+ if (!mvdata->secsizes) -+ return -ENOMEM; -+ -+ memset(mvdata->secsizes, 0, hdr->e_shnum * sizeof(size_t)); -+ -+ /* validate the ELF section headers */ -+ mvdata->sections = mvdata->buffer + hdr->e_shoff; -+ secstop = mvdata->sections + mvdata->nsects; -+ -+ sssize = mvdata->sections[hdr->e_shstrndx].sh_size; -+ elfcheck(sssize > 0); -+ -+ section = mvdata->sections; -+ seccheck(section->sh_type == SHT_NULL); -+ seccheck(section->sh_size == 0); -+ seccheck(section->sh_offset == 0); -+ -+ secsize = mvdata->secsizes + 1; -+ for (section++; section < secstop; secsize++, section++) { -+ seccheck(section->sh_name < sssize); -+ seccheck(section->sh_link < hdr->e_shnum); -+ -+ if (section->sh_entsize > 0) -+ seccheck(section->sh_size % section->sh_entsize == 0); -+ -+ seccheck(section->sh_offset >= hdr->e_ehsize); -+ seccheck(section->sh_offset < size); -+ -+ /* determine the section's in-file size */ -+ tmp = size - section->sh_offset; -+ if (section->sh_offset < hdr->e_shoff) -+ tmp = hdr->e_shoff - section->sh_offset; -+ -+ for (section2 = mvdata->sections + 1; section2 < secstop; section2++) { -+ if (section->sh_offset < section2->sh_offset) { -+ tmp2 = section2->sh_offset - section->sh_offset; -+ if (tmp2 < tmp) -+ tmp = tmp2; -+ } -+ } -+ *secsize = tmp; -+ -+ _debug("Section %ld: %zx bytes at %lx\n", -+ section - mvdata->sections, -+ *secsize, -+ section->sh_offset); -+ -+ /* perform section type specific checks */ -+ switch (section->sh_type) { -+ case SHT_NOBITS: -+ break; -+ -+ case SHT_REL: -+ seccheck(section->sh_entsize == sizeof(Elf_Rel)); -+ goto more_rel_checks; -+ -+ case SHT_RELA: -+ seccheck(section->sh_entsize == sizeof(Elf_Rela)); -+ more_rel_checks: -+ seccheck(section->sh_info > 0); -+ seccheck(section->sh_info < hdr->e_shnum); -+ goto more_sec_checks; -+ -+ case SHT_SYMTAB: -+ seccheck(section->sh_entsize == sizeof(Elf_Sym)); -+ goto more_sec_checks; -+ -+ default: -+ more_sec_checks: -+ /* most types of section must be contained entirely -+ * within the file */ -+ seccheck(section->sh_size <= *secsize); -+ break; -+ } -+ } -+ -+ /* validate the ELF section names */ -+ section = &mvdata->sections[hdr->e_shstrndx]; -+ -+ seccheck(section->sh_offset != hdr->e_shoff); -+ -+ mvdata->secstrings = mvdata->buffer + section->sh_offset; -+ -+ last = -1; -+ for (section = mvdata->sections + 1; section < secstop; section++) { -+ const char *secname; -+ tmp = sssize - section->sh_name; -+ secname = mvdata->secstrings + section->sh_name; -+ seccheck(secname[0] != 0); -+ if (section->sh_name > last) -+ last = section->sh_name; -+ } -+ -+ if (last > -1) { -+ tmp = sssize - last; -+ elfcheck(memchr(mvdata->secstrings + last, 0, tmp) != NULL); -+ } -+ -+ /* look for various sections in the module */ -+ for (section = mvdata->sections + 1; section < secstop; section++) { -+ switch (section->sh_type) { -+ case SHT_SYMTAB: -+ if (strcmp(mvdata->secstrings + section->sh_name, -+ ".symtab") == 0 -+ ) { -+ seccheck(mvdata->symbols == NULL); -+ mvdata->symbols = -+ mvdata->buffer + section->sh_offset; -+ mvdata->nsyms = -+ section->sh_size / sizeof(Elf_Sym); -+ seccheck(section->sh_size > 0); -+ } -+ break; -+ -+ case SHT_STRTAB: -+ if (strcmp(mvdata->secstrings + section->sh_name, -+ ".strtab") == 0 -+ ) { -+ seccheck(mvdata->strings == NULL); -+ mvdata->strings = -+ mvdata->buffer + section->sh_offset; -+ sssize = mvdata->nstrings = section->sh_size; -+ seccheck(section->sh_size > 0); -+ } -+ break; -+ } -+ } -+ -+ if (!mvdata->symbols) { -+ printk("Couldn't locate module symbol table\n"); -+ goto format_error; -+ } -+ -+ if (!mvdata->strings) { -+ printk("Couldn't locate module strings table\n"); -+ goto format_error; -+ } -+ -+ /* validate the symbol table */ -+ symstop = mvdata->symbols + mvdata->nsyms; -+ -+ symbol = mvdata->symbols; -+ symcheck(ELF_ST_TYPE(symbol[0].st_info) == STT_NOTYPE); -+ symcheck(symbol[0].st_shndx == SHN_UNDEF); -+ symcheck(symbol[0].st_value == 0); -+ symcheck(symbol[0].st_size == 0); -+ -+ last = -1; -+ for (symbol++; symbol < symstop; symbol++) { -+ symcheck(symbol->st_name < sssize); -+ if (symbol->st_name > last) -+ last = symbol->st_name; -+ symcheck(symbol->st_shndx < mvdata->nsects || -+ symbol->st_shndx >= SHN_LORESERVE); -+ } -+ -+ if (last > -1) { -+ tmp = sssize - last; -+ elfcheck(memchr(mvdata->strings + last, 0, tmp) != NULL); -+ } -+ -+ /* validate each relocation table as best we can */ -+ for (section = mvdata->sections + 1; section < secstop; section++) { -+ section2 = mvdata->sections + section->sh_info; -+ -+ switch (section->sh_type) { -+ case SHT_REL: -+ rels = mvdata->buffer + section->sh_offset; -+ relstop = mvdata->buffer + section->sh_offset + section->sh_size; -+ -+ for (rel = rels; rel < relstop; rel++) { -+ relcheck(rel->r_offset < section2->sh_size); -+ relcheck(ELF_R_SYM(rel->r_info) < mvdata->nsyms); -+ } -+ -+ break; -+ -+ case SHT_RELA: -+ relas = mvdata->buffer + section->sh_offset; -+ relastop = mvdata->buffer + section->sh_offset + section->sh_size; -+ -+ for (rela = relas; rela < relastop; rela++) { -+ relacheck(rela->r_offset < section2->sh_size); -+ relacheck(ELF_R_SYM(rela->r_info) < mvdata->nsyms); -+ } -+ -+ break; -+ -+ default: -+ break; -+ } -+ } -+ -+ -+ _debug("ELF okay\n"); -+ return 0; -+ -+ elfcheck_error: -+ printk("Verify ELF error (assertion %d)\n", line); -+ goto format_error; -+ -+ seccheck_error: -+ printk("Verify ELF error [sec %ld] (assertion %d)\n", -+ (long)(section - mvdata->sections), line); -+ goto format_error; -+ -+ symcheck_error: -+ printk("Verify ELF error [sym %ld] (assertion %d)\n", -+ (long)(symbol - mvdata->symbols), line); -+ goto format_error; -+ -+ relcheck_error: -+ printk("Verify ELF error [sec %ld rel %ld] (assertion %d)\n", -+ (long)(section - mvdata->sections), -+ (long)(rel - rels), line); -+ goto format_error; -+ -+ relacheck_error: -+ printk("Verify ELF error [sec %ld rela %ld] (assertion %d)\n", -+ (long)(section - mvdata->sections), -+ (long)(rela - relas), line); -+ goto format_error; -+ -+ format_error: -+ return -ELIBBAD; -+ -+} /* end module_verify_elf() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.h linux-900/kernel/module-verify.h ---- linux-811/kernel/module-verify.h -+++ linux-900/kernel/module-verify.h -@@ -0,0 +1,37 @@ -+/* module-verify.h: module verification definitions -+ * -+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. -+ * Written by David Howells (dhowells at redhat.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+ -+struct module_verify_data { -+ struct crypto_tfm *digest; /* module signature digest */ -+ const void *buffer; /* module buffer */ -+ const Elf_Ehdr *hdr; /* ELF header */ -+ const Elf_Shdr *sections; /* ELF section table */ -+ const Elf_Sym *symbols; /* ELF symbol table */ -+ const char *secstrings; /* ELF section string table */ -+ const char *strings; /* ELF string table */ -+ size_t *secsizes; /* section size list */ -+ size_t size; /* module object size */ -+ size_t nsects; /* number of sections */ -+ size_t nsyms; /* number of symbols */ -+ size_t nstrings; /* size of strings section */ -+ size_t signed_size; /* count of bytes contributed to digest */ -+ int *canonlist; /* list of canonicalised sections */ -+ int *canonmap; /* section canonicalisation map */ -+ int sig_index; /* module signature section index */ -+ uint8_t xcsum; /* checksum of bytes contributed to digest */ -+ uint8_t csum; /* checksum of bytes representing a section */ -+}; -+ -+extern int module_verify(const Elf_Ehdr *hdr, size_t size); -+extern int module_verify_signature(struct module_verify_data *mvdata); -diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify-sig.c linux-900/kernel/module-verify-sig.c ---- linux-811/kernel/module-verify-sig.c -+++ linux-900/kernel/module-verify-sig.c -@@ -0,0 +1,441 @@ +diff --git a/kernel/module-verify-sig.c b/kernel/module-verify-sig.c +new file mode 100644 +index 0000000..45cb967 +--- /dev/null ++++ b/kernel/module-verify-sig.c +@@ -0,0 +1,450 @@ +/* module-verify-sig.c: module signature checker + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. @@ -546,7 +131,7 @@ + size_t __n = (N); \ + uint8_t *__p = (uint8_t *)(PTR); \ + count_and_csum((C), __p, __n); \ -+ crypto_digest_update_kernel((C)->digest, __p, __n); \ ++ crypto_hash_update_kernel(&(C)->hash, __p, __n); \ +} while(0) + +#define crypto_digest_update_val(C,VAL) \ @@ -554,7 +139,7 @@ + size_t __n = sizeof(VAL); \ + uint8_t *__p = (uint8_t *)&(VAL); \ + count_and_csum((C), __p, __n); \ -+ crypto_digest_update_kernel((C)->digest, __p, __n); \ ++ crypto_hash_update_kernel(&(C)->hash, __p, __n); \ +} while(0) + +static int module_verify_canonicalise(struct module_verify_data *mvdata); @@ -571,7 +156,13 @@ + +static int signedonly; + -+/*****************************************************************************/ ++static int __init sign_setup(char *str) ++{ ++ signedonly = 1; ++ return 0; ++} ++__setup("enforcemodulesig", sign_setup); ++ +/* + * verify a module's signature + */ @@ -611,13 +202,13 @@ + /* grab an SHA1 transformation context + * - !!! if this tries to load the sha1.ko module, we will deadlock!!! + */ -+ mvdata->digest = crypto_alloc_tfm2("sha1", 0, 1); -+ if (!mvdata->digest) { ++ mvdata->hash.tfm = crypto_hash_cast(crypto_alloc_tfm2("sha1", 0, 1)); ++ if (!mvdata->hash.tfm) { + printk("Couldn't load module - SHA1 transform unavailable\n"); + return -EPERM; + } + -+ crypto_digest_init(mvdata->digest); ++ crypto_hash_init(&mvdata->hash); + +#ifdef MODSIGN_DEBUG + mvdata->xcsum = 0; @@ -698,28 +289,39 @@ + mvdata->signed_size, mvdata->xcsum); + + /* do the actual signature verification */ -+ i = ksign_verify_signature(sig, sig_size, mvdata->digest); ++ ret = ksign_verify_signature(sig, sig_size, mvdata->hash.tfm); + -+ _debug("verify-sig : %d\n", i); ++ _debug("verify-sig : %d\n", ret); + -+ if (i == 0) -+ i = 1; -+ return i; ++ switch (ret) { ++ case 0: /* good signature */ ++ ret = 1; ++ break; ++ case -EKEYREJECTED: /* signature mismatch or number format error */ ++ printk(KERN_ERR "Module signature verification failed\n"); ++ break; ++ case -ENOKEY: /* signed, but we don't have the public key */ ++ printk(KERN_ERR "Module signed with unknown public key\n"); ++ break; ++ default: /* other error (probably ENOMEM) */ ++ break; ++ } + -+ format_error: -+ crypto_free_tfm(mvdata->digest); ++ return ret; ++ ++format_error: ++ crypto_free_hash(mvdata->hash.tfm); ++ printk(KERN_ERR "Module format error encountered\n"); + return -ELIBBAD; + + /* deal with the case of an unsigned module */ -+ no_signature: ++no_signature: + if (!signedonly) + return 0; -+ printk("An attempt to load unsigned module was rejected\n"); -+ return -EPERM; -+ -+} /* end module_verify_signature() */ ++ printk(KERN_ERR "An attempt to load unsigned module was rejected\n"); ++ return -EKEYREJECTED; ++} + -+/*****************************************************************************/ +/* + * canonicalise the section table index numbers + */ @@ -775,12 +377,10 @@ + mvdata->canonmap[mvdata->canonlist[loop]] = loop + 1; + + return 0; ++} + -+} /* end module_verify_canonicalise() */ -+ -+/*****************************************************************************/ +/* -+ * extract a RELA table ++ * extract an ELF RELA table + * - need to canonicalise the entries in case section addition/removal has + * rearranged the symbol table and the section table + */ @@ -855,11 +455,12 @@ + mvdata->signed_size, mvdata->csum, sh_name, nrels); + + return 0; -+} /* end extract_elf_rela() */ ++} + -+/*****************************************************************************/ +/* -+ * ++ * extract an ELF REL table ++ * - need to canonicalise the entries in case section addition/removal has ++ * rearranged the symbol table and the section table + */ +static int extract_elf_rel(struct module_verify_data *mvdata, + int secix, @@ -929,23 +530,109 @@ + mvdata->signed_size, mvdata->csum, sh_name, nrels); + + return 0; -+} /* end extract_elf_rel() */ -+ -+static int __init sign_setup(char *str) -+{ -+ signedonly = 1; -+ return 0; +} -+__setup("enforcemodulesig", sign_setup); ---- linux-2.6.12/kernel/module-verify.c.~1~ 2005-08-07 17:39:38.000000000 -0700 -+++ linux-2.6.12/kernel/module-verify.c 2005-08-10 00:48:43.000000000 -0700 -@@ -107,7 +107,7 @@ do { if (unlikely(!(X))) { line = __LINE - elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr)); - - tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum; -- elfcheck(tmp < size - hdr->e_shoff); -+ elfcheck(tmp <= size - hdr->e_shoff); +diff --git a/kernel/module-verify.c b/kernel/module-verify.c +index 875279f..04920b2 100644 +--- a/kernel/module-verify.c ++++ b/kernel/module-verify.c +@@ -16,6 +16,9 @@ #include "module-verify.h" + /* + * verify a module's integrity + * - check the ELF is viable ++ * - return 1 if the module has a correct signature ++ * - return 0 if the module has no signature or one we don't have a key for ++ * - return -ve on error + */ + int module_verify(const Elf_Ehdr *hdr, size_t size) + { +@@ -34,6 +37,8 @@ int module_verify(const Elf_Ehdr *hdr, s + goto error; + } + ++ ret = module_verify_signature(&mvdata); ++ + error: + kfree(mvdata.secsizes); + kfree(mvdata.canonlist); +diff --git a/kernel/module-verify.h b/kernel/module-verify.h +index 63f5e08..f4e3dc7 100644 +--- a/kernel/module-verify.h ++++ b/kernel/module-verify.h +@@ -10,11 +10,12 @@ + */ + + #include ++#include + #include + + #ifdef CONFIG_MODULE_VERIFY + struct module_verify_data { +- struct crypto_tfm *digest; /* module signature digest */ ++ struct hash_desc hash; /* module signature digest */ + const void *buffer; /* module buffer */ + const Elf_Ehdr *hdr; /* ELF header */ + const Elf_Shdr *sections; /* ELF section table */ +@@ -48,6 +49,15 @@ #else + #define module_verify_elf(m) (0) + #endif + ++/* ++ * module-verify-sig.c ++ */ ++#ifdef CONFIG_MODULE_SIG ++extern int module_verify_signature(struct module_verify_data *mvdata); ++#else ++#define module_verify_signature(m) (0) ++#endif ++ + #else + #define module_verify(h, s) (0) + #endif +diff --git a/kernel/module.c b/kernel/module.c +index 9d5787d..6825888 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -1567,6 +1567,7 @@ static struct module *load_module(void _ + void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ + struct exception_table_entry *extable; + mm_segment_t old_fs; ++ int gpgsig_ok; + + DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n", + umod, len, uargs); +@@ -1593,9 +1594,12 @@ static struct module *load_module(void _ + } + + /* Verify the module's contents */ ++ gpgsig_ok = 0; + err = module_verify(hdr, len); + if (err < 0) + goto free_hdr; ++ if (err == 1) ++ gpgsig_ok = 1; + + /* Convenience variables */ + sechdrs = (void *)hdr + hdr->e_shoff; +@@ -1632,6 +1636,7 @@ #endif + goto free_hdr; + } + mod = (void *)sechdrs[modindex].sh_addr; ++ mod->gpgsig_ok = gpgsig_ok; + + if (symindex == 0) { + printk(KERN_WARNING "%s: module has no symbols (stripped?)\n", +@@ -2325,8 +2330,13 @@ void print_modules(void) + char buf[8]; + + printk("Modules linked in:"); +- list_for_each_entry(mod, &modules, list) ++ list_for_each_entry(mod, &modules, list) { + printk(" %s%s", mod->name, taint_flags(mod->taints, buf)); ++#if CONFIG_MODULE_SIG ++ if (!mod->gpgsig_ok) ++ printk("(U)"); ++#endif ++ } + printk("\n"); + } - /* allocate a table to hold in-file section sizes */ - mvdata->secsizes = kmalloc(hdr->e_shnum * sizeof(size_t), GFP_KERNEL); - linux-2.6-modsign-crypto.patch: crypto/api.c | 25 ++++++++++++++++++++++--- crypto/digest.c | 9 +++++++++ include/linux/crypto.h | 11 +++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) Index: linux-2.6-modsign-crypto.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-modsign-crypto.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-modsign-crypto.patch 21 Dec 2006 21:45:14 -0000 1.3 +++ linux-2.6-modsign-crypto.patch 8 Jan 2007 16:47:48 -0000 1.4 @@ -1,17 +1,50 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/api.c linux-901/crypto/api.c ---- linux-900/crypto/api.c -+++ linux-901/crypto/api.c -@@ -361,7 +361,8 @@ out: +MODSIGN: In-kernel crypto extensions + +From: David Howells + +Two extensions are added: + + (1) Support for SHA1 digestion of in-kernel buffers directly without the use + of scatter-gather lists. + + (2) Allocation of crypto algorithm instances without resort to fallback module + loading. + +SHA1 is used by module signature checking, and so must not itself require +loading as a module when the module signature checking is enabled. + +Signed-Off-By: David Howells +--- + + crypto/api.c | 25 ++++++++++++++++++++++--- + crypto/digest.c | 9 +++++++++ + include/linux/crypto.h | 11 +++++++++++ + 3 files changed, 42 insertions(+), 3 deletions(-) + +diff --git a/crypto/api.c b/crypto/api.c +index 8c44687..5109d28 100644 +--- a/crypto/api.c ++++ b/crypto/api.c +@@ -362,7 +362,17 @@ out: } EXPORT_SYMBOL_GPL(__crypto_alloc_tfm); -struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) ++/* ++ * crypto_alloc_tfm2 - Find or load crypto module ++ * @name: Name of algorithm ++ * @flags: Flags to control algorithm instance ++ * @nomodload: True to suppress resort to module loading ++ * ++ * Attempt to find or load a crypto algorithm module and create an ++ * instance of it. ++ */ +struct crypto_tfm *crypto_alloc_tfm2(const char *name, u32 flags, -+ int nomodload) ++ int nomodload) { struct crypto_tfm *tfm = NULL; int err; -@@ -369,7 +370,11 @@ struct crypto_tfm *crypto_alloc_tfm(cons +@@ -370,7 +380,11 @@ struct crypto_tfm *crypto_alloc_tfm(cons do { struct crypto_alg *alg; @@ -24,8 +57,8 @@ err = PTR_ERR(alg); if (IS_ERR(alg)) continue; -@@ -443,7 +443,12 @@ err: - return tfm; +@@ -439,7 +453,12 @@ err: + return ERR_PTR(err); } EXPORT_SYMBOL_GPL(crypto_alloc_base); - @@ -38,48 +71,47 @@ /* * crypto_free_tfm - Free crypto transform * @tfm: Transform to free -diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Kconfig linux-901/crypto/Kconfig ---- linux-900/crypto/Kconfig -+++ linux-901/crypto/Kconfig -@@ -287,6 +287,25 @@ config CRYPTO_TEST - help - Quick & dirty crypto test module. - -+config CRYPTO_SIGNATURE -+ bool "In-kernel signature checker (EXPERIMENTAL)" -+ depends on CRYPTO -+ help -+ Signature checker (used for module sig checking). -+ -+config CRYPTO_SIGNATURE_DSA -+ bool "Handle DSA signatures (EXPERIMENTAL)" -+ depends on CRYPTO_SIGNATURE -+ select CRYPTO_MPILIB -+ help -+ DSA Signature checker. -+ -+config CRYPTO_MPILIB -+ bool "Multiprecision maths library (EXPERIMENTAL)" -+ depends on CRYPTO -+ help -+ Multiprecision maths library from GnuPG -+ - source "drivers/crypto/Kconfig" - endmenu - -diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Makefile linux-901/crypto/Makefile ---- linux-900/crypto/Makefile -+++ linux-901/crypto/Makefile -@@ -32,3 +32,6 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich - obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o +diff --git a/crypto/digest.c b/crypto/digest.c +index 8f45932..c5e6d92 100644 +--- a/crypto/digest.c ++++ b/crypto/digest.c +@@ -81,6 +81,14 @@ static int update(struct hash_desc *desc + return 0; + } - obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o ++static void update_kernel(struct hash_desc *desc, ++ const void *data, size_t count) ++{ ++ struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm); ++ tfm->__crt_alg->cra_digest.dia_update(tfm, data, count); ++ crypto_yield(desc->flags); ++} + -+obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ -+obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ ---- linux-2.6.18.noarch/include/linux/crypto.h~ 2006-10-14 18:46:26.000000000 -0400 -+++ linux-2.6.18.noarch/include/linux/crypto.h 2006-10-14 18:47:17.000000000 -0400 -@@ -368,6 +368,8 @@ struct crypto_attr_alg { + static int final(struct hash_desc *desc, u8 *out) + { + struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm); +@@ -138,6 +146,7 @@ int crypto_init_digest_ops(struct crypto + + ops->init = init; + ops->update = update; ++ ops->update_kernel = update_kernel; + ops->final = final; + ops->digest = digest; + ops->setkey = dalg->dia_setkey ? setkey : nosetkey; +diff --git a/include/linux/crypto.h b/include/linux/crypto.h +index 4aa9046..9cc4a4c 100644 +--- a/include/linux/crypto.h ++++ b/include/linux/crypto.h +@@ -301,6 +301,8 @@ struct hash_tfm { + int (*init)(struct hash_desc *desc); + int (*update)(struct hash_desc *desc, + struct scatterlist *sg, unsigned int nsg); ++ void (*update_kernel)(struct hash_desc *desc, ++ const void *data, size_t count); + int (*final)(struct hash_desc *desc, u8 *out); + int (*digest)(struct hash_desc *desc, struct scatterlist *sg, + unsigned int nsg, u8 *out); +@@ -364,6 +366,8 @@ struct crypto_attr_alg { */ struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags); @@ -88,3 +120,17 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask); void crypto_free_tfm(struct crypto_tfm *tfm); +@@ -791,6 +795,13 @@ static inline int crypto_hash_update(str + return crypto_hash_crt(desc->tfm)->update(desc, sg, nbytes); + } + ++static inline void crypto_hash_update_kernel(struct hash_desc *desc, ++ const void *data, ++ size_t count) ++{ ++ return crypto_hash_crt(desc->tfm)->update_kernel(desc, data, count); ++} ++ + static inline int crypto_hash_final(struct hash_desc *desc, u8 *out) + { + return crypto_hash_crt(desc->tfm)->final(desc, out); linux-2.6-modsign-include.patch: asm-alpha/module.h | 3 +++ asm-arm/module.h | 5 +++++ asm-cris/module.h | 5 +++++ asm-h8300/module.h | 5 +++++ asm-i386/module.h | 5 +++++ asm-ia64/module.h | 5 +++++ asm-m32r/module.h | 5 +++++ asm-m68k/module.h | 5 +++++ asm-mips/module.h | 12 ++++++++++-- asm-parisc/module.h | 8 ++++++++ asm-powerpc/module.h | 10 ++++++++++ asm-s390/module.h | 3 +++ asm-sh/module.h | 5 +++++ asm-sparc/module.h | 5 +++++ asm-sparc64/module.h | 5 +++++ asm-um/module-i386.h | 4 ++++ asm-v850/module.h | 5 +++++ asm-x86_64/module.h | 5 +++++ 18 files changed, 98 insertions(+), 2 deletions(-) Index: linux-2.6-modsign-include.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-modsign-include.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-modsign-include.patch 31 Oct 2005 03:03:28 -0000 1.2 +++ linux-2.6-modsign-include.patch 8 Jan 2007 16:47:48 -0000 1.3 @@ -1,6 +1,36 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-alpha/module.h linux-905/include/asm-alpha/module.h ---- linux-904/include/asm-alpha/module.h -+++ linux-905/include/asm-alpha/module.h +MODSIGN: Add indications of module ELF types + +From: David Howells + +Add per-arch indications of module ELF types and relocation table entry types. + +Signed-Off-By: David Howells +--- + + include/asm-alpha/module.h | 3 +++ + include/asm-arm/module.h | 5 +++++ + include/asm-cris/module.h | 5 +++++ + include/asm-h8300/module.h | 5 +++++ + include/asm-i386/module.h | 5 +++++ + include/asm-ia64/module.h | 5 +++++ + include/asm-m32r/module.h | 5 +++++ + include/asm-m68k/module.h | 5 +++++ + include/asm-mips/module.h | 12 ++++++++++-- + include/asm-parisc/module.h | 8 ++++++++ + include/asm-powerpc/module.h | 10 ++++++++++ + include/asm-s390/module.h | 3 +++ + include/asm-sh/module.h | 5 +++++ + include/asm-sparc/module.h | 5 +++++ + include/asm-sparc64/module.h | 5 +++++ + include/asm-um/module-i386.h | 4 ++++ + include/asm-v850/module.h | 5 +++++ + include/asm-x86_64/module.h | 5 +++++ + 18 files changed, 98 insertions(+), 2 deletions(-) + +diff --git a/include/asm-alpha/module.h b/include/asm-alpha/module.h +index 7b63743..3d5a3ea 100644 +--- a/include/asm-alpha/module.h ++++ b/include/asm-alpha/module.h @@ -6,6 +6,7 @@ struct mod_arch_specific unsigned int gotsecindex; }; @@ -9,7 +39,7 @@ #define Elf_Sym Elf64_Sym #define Elf_Shdr Elf64_Shdr #define Elf_Ehdr Elf64_Ehdr -@@ -13,6 +14,8 @@ struct mod_arch_specific +@@ -13,6 +14,8 @@ #define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Rel Elf64_Rel #define Elf_Rela Elf64_Rela @@ -18,9 +48,10 @@ #define ARCH_SHF_SMALL SHF_ALPHA_GPREL -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-arm/module.h linux-905/include/asm-arm/module.h ---- linux-904/include/asm-arm/module.h -+++ linux-905/include/asm-arm/module.h +diff --git a/include/asm-arm/module.h b/include/asm-arm/module.h +index 24b168d..f1558f3 100644 +--- a/include/asm-arm/module.h ++++ b/include/asm-arm/module.h @@ -6,9 +6,14 @@ struct mod_arch_specific int foo; }; @@ -36,10 +67,11 @@ /* * Include the ARM architecture version. -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-cris/module.h linux-905/include/asm-cris/module.h ---- linux-904/include/asm-cris/module.h -+++ linux-905/include/asm-cris/module.h -@@ -3,7 +3,12 @@ +diff --git a/include/asm-cris/module.h b/include/asm-cris/module.h +index 7ee7231..03f7b2e 100644 +--- a/include/asm-cris/module.h ++++ b/include/asm-cris/module.h +@@ -3,7 +3,12 @@ #define _ASM_CRIS_MODULE_H /* cris is simple */ struct mod_arch_specific { }; @@ -52,10 +84,11 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_CRIS_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-h8300/module.h linux-905/include/asm-h8300/module.h ---- linux-904/include/asm-h8300/module.h -+++ linux-905/include/asm-h8300/module.h -@@ -4,9 +4,14 @@ +diff --git a/include/asm-h8300/module.h b/include/asm-h8300/module.h +index de23231..b1c08e2 100644 +--- a/include/asm-h8300/module.h ++++ b/include/asm-h8300/module.h +@@ -4,9 +4,14 @@ #define _ASM_H8300_MODULE_H * This file contains the H8/300 architecture specific module code. */ struct mod_arch_specific { }; @@ -70,9 +103,10 @@ #define MODULE_SYMBOL_PREFIX "_" -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-i386/module.h linux-905/include/asm-i386/module.h ---- linux-904/include/asm-i386/module.h -+++ linux-905/include/asm-i386/module.h +diff --git a/include/asm-i386/module.h b/include/asm-i386/module.h +index 02f8f54..42ab093 100644 +--- a/include/asm-i386/module.h ++++ b/include/asm-i386/module.h @@ -6,9 +6,14 @@ struct mod_arch_specific { }; @@ -88,9 +122,10 @@ #ifdef CONFIG_M386 #define MODULE_PROC_FAMILY "386 " -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ia64/module.h linux-905/include/asm-ia64/module.h ---- linux-904/include/asm-ia64/module.h -+++ linux-905/include/asm-ia64/module.h +diff --git a/include/asm-ia64/module.h b/include/asm-ia64/module.h +index d2da61e..191355a 100644 +--- a/include/asm-ia64/module.h ++++ b/include/asm-ia64/module.h @@ -23,9 +23,14 @@ struct mod_arch_specific { unsigned int next_got_entry; /* index of next available got entry */ }; @@ -105,11 +140,12 @@ +#define ELF_R_SYM(X) ELF64_R_SYM(X) #define MODULE_PROC_FAMILY "ia64" - #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m32r/module.h linux-905/include/asm-m32r/module.h ---- linux-904/include/asm-m32r/module.h -+++ linux-905/include/asm-m32r/module.h -@@ -5,9 +5,14 @@ + #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY \ +diff --git a/include/asm-m32r/module.h b/include/asm-m32r/module.h +index 3f2541c..6ca963a 100644 +--- a/include/asm-m32r/module.h ++++ b/include/asm-m32r/module.h +@@ -5,9 +5,14 @@ #define _ASM_M32R_MODULE_H struct mod_arch_specific { }; @@ -124,9 +160,10 @@ #endif /* _ASM_M32R_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m68k/module.h linux-905/include/asm-m68k/module.h ---- linux-904/include/asm-m68k/module.h -+++ linux-905/include/asm-m68k/module.h +diff --git a/include/asm-m68k/module.h b/include/asm-m68k/module.h +index c6d75af..ee98908 100644 +--- a/include/asm-m68k/module.h ++++ b/include/asm-m68k/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_M68K_MODULE_H #define _ASM_M68K_MODULE_H @@ -140,10 +177,11 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_M68K_MODULE_H */ - ---- linux-2.6.14/include/asm-mips/module.h~ 2005-10-30 21:31:42.000000000 -0500 -+++ linux-2.6.14/include/asm-mips/module.h 2005-10-30 21:33:30.000000000 -0500 -@@ -34,11 +34,15 @@ typedef struct { +diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h +index 399d03f..694f979 100644 +--- a/include/asm-mips/module.h ++++ b/include/asm-mips/module.h +@@ -33,11 +33,15 @@ typedef struct { } Elf64_Mips_Rela; #ifdef CONFIG_32BIT @@ -160,7 +198,7 @@ #define Elf_Mips_Rel Elf32_Rel #define Elf_Mips_Rela Elf32_Rela -@@ -49,11 +53,15 @@ typedef struct { +@@ -48,11 +52,15 @@ #define ELF_MIPS_R_TYPE(rel) ELF32_R_TYP #endif #ifdef CONFIG_64BIT @@ -177,10 +215,11 @@ #define Elf_Mips_Rel Elf64_Mips_Rel #define Elf_Mips_Rela Elf64_Mips_Rela -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-parisc/module.h linux-905/include/asm-parisc/module.h ---- linux-904/include/asm-parisc/module.h -+++ linux-905/include/asm-parisc/module.h -@@ -4,17 +4,25 @@ +diff --git a/include/asm-parisc/module.h b/include/asm-parisc/module.h +index 00f0688..ebd9a5e 100644 +--- a/include/asm-parisc/module.h ++++ b/include/asm-parisc/module.h +@@ -4,17 +4,25 @@ #define _ASM_PARISC_MODULE_H * This file contains the parisc architecture specific module code. */ #ifdef __LP64__ @@ -206,9 +245,11 @@ #endif struct unwind_table; ---- linux-2.6.13/include/asm-powerpc/module.h~ 2005-09-08 01:05:31.000000000 -0400 -+++ linux-2.6.13/include/asm-powerpc/module.h 2005-09-08 01:11:30.000000000 -0400 -@@ -53,16 +53,26 @@ extern struct bug_entry *module_find_bug +diff --git a/include/asm-powerpc/module.h b/include/asm-powerpc/module.h +index e5f14b1..f9baae1 100644 +--- a/include/asm-powerpc/module.h ++++ b/include/asm-powerpc/module.h +@@ -52,16 +52,26 @@ #endif */ #ifdef __powerpc64__ @@ -235,9 +276,10 @@ # ifdef MODULE asm(".section .plt,\"ax\", at nobits; .align 3; .previous"); asm(".section .init.plt,\"ax\", at nobits; .align 3; .previous"); -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-s390/module.h linux-905/include/asm-s390/module.h ---- linux-904/include/asm-s390/module.h -+++ linux-905/include/asm-s390/module.h +diff --git a/include/asm-s390/module.h b/include/asm-s390/module.h +index 1cc1c5a..b64dab0 100644 +--- a/include/asm-s390/module.h ++++ b/include/asm-s390/module.h @@ -29,14 +29,17 @@ struct mod_arch_specific }; @@ -256,9 +298,10 @@ #define Elf_Rela ElfW(Rela) #define Elf_Shdr ElfW(Shdr) #define Elf_Sym ElfW(Sym) -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sh/module.h linux-905/include/asm-sh/module.h ---- linux-904/include/asm-sh/module.h -+++ linux-905/include/asm-sh/module.h +diff --git a/include/asm-sh/module.h b/include/asm-sh/module.h +index 118d5a2..c3cf495 100644 +--- a/include/asm-sh/module.h ++++ b/include/asm-sh/module.h @@ -9,9 +9,14 @@ struct mod_arch_specific { /* Nothing to see here .. */ }; @@ -274,9 +317,10 @@ #ifdef CONFIG_CPU_LITTLE_ENDIAN # ifdef CONFIG_CPU_SH2 -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc/module.h linux-905/include/asm-sparc/module.h ---- linux-904/include/asm-sparc/module.h -+++ linux-905/include/asm-sparc/module.h +diff --git a/include/asm-sparc/module.h b/include/asm-sparc/module.h +index cbd9e67..e2921e2 100644 +--- a/include/asm-sparc/module.h ++++ b/include/asm-sparc/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_SPARC_MODULE_H #define _ASM_SPARC_MODULE_H @@ -290,9 +334,10 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_SPARC_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc64/module.h linux-905/include/asm-sparc64/module.h ---- linux-904/include/asm-sparc64/module.h -+++ linux-905/include/asm-sparc64/module.h +diff --git a/include/asm-sparc64/module.h b/include/asm-sparc64/module.h +index 3d77ba4..2e7ca17 100644 +--- a/include/asm-sparc64/module.h ++++ b/include/asm-sparc64/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_SPARC64_MODULE_H #define _ASM_SPARC64_MODULE_H @@ -306,9 +351,10 @@ +#define ELF_R_TYPE(X) ELF64_R_TYPE(X) +#define ELF_R_SYM(X) ELF64_R_SYM(X) #endif /* _ASM_SPARC64_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-um/module-i386.h linux-905/include/asm-um/module-i386.h ---- linux-904/include/asm-um/module-i386.h -+++ linux-905/include/asm-um/module-i386.h +diff --git a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h +index 5ead4a0..b441057 100644 +--- a/include/asm-um/module-i386.h ++++ b/include/asm-um/module-i386.h @@ -9,5 +9,9 @@ struct mod_arch_specific #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym @@ -319,9 +365,10 @@ +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-v850/module.h linux-905/include/asm-v850/module.h ---- linux-904/include/asm-v850/module.h -+++ linux-905/include/asm-v850/module.h +diff --git a/include/asm-v850/module.h b/include/asm-v850/module.h +index 2c2f494..48752f3 100644 +--- a/include/asm-v850/module.h ++++ b/include/asm-v850/module.h @@ -31,9 +31,14 @@ struct mod_arch_specific unsigned int core_plt_section, init_plt_section; }; @@ -337,10 +384,11 @@ /* Make empty sections for module_frob_arch_sections to expand. */ #ifdef MODULE -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-x86_64/module.h linux-905/include/asm-x86_64/module.h ---- linux-904/include/asm-x86_64/module.h -+++ linux-905/include/asm-x86_64/module.h -@@ -3,8 +3,13 @@ +diff --git a/include/asm-x86_64/module.h b/include/asm-x86_64/module.h +index 67f8f69..3a7373a 100644 +--- a/include/asm-x86_64/module.h ++++ b/include/asm-x86_64/module.h +@@ -3,8 +3,13 @@ #define _ASM_X8664_MODULE_H struct mod_arch_specific {}; linux-2.6-modsign-ksign.patch: crypto/Kconfig | 13 crypto/Makefile | 1 crypto/signature/Makefile | 10 crypto/signature/dsa.c | 96 +++++ crypto/signature/key.h | 7 crypto/signature/ksign-keyring.c | 116 +++++++ crypto/signature/ksign-parse.c | 603 +++++++++++++++++++++++++++++++++++++ crypto/signature/ksign-publickey.c | 18 + crypto/signature/ksign.c | 180 +++++++++++ crypto/signature/local.h | 160 +++++++++ include/linux/crypto/ksign.h | 22 + 11 files changed, 1226 insertions(+) Index: linux-2.6-modsign-ksign.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-modsign-ksign.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-modsign-ksign.patch 21 Dec 2006 21:45:14 -0000 1.4 +++ linux-2.6-modsign-ksign.patch 8 Jan 2007 16:47:48 -0000 1.5 @@ -1,31 +1,81 @@ ---- linux-2.6.18.noarch/crypto/digest.c~ 2006-10-14 18:53:16.000000000 -0400 -+++ linux-2.6.18.noarch/crypto/digest.c 2006-10-14 18:54:08.000000000 -0400 -@@ -45,6 +45,13 @@ void crypto_digest_update(struct crypto_ - } - EXPORT_SYMBOL_GPL(crypto_digest_update); +MODSIGN: Module signature checker and key manager + +From: David Howells + +Add a facility to retain public keys and to verify signatures made with those +public keys, given a signature and crypto_hash of the data that was signed. + +Signed-Off-By: David Howells +--- + + crypto/Kconfig | 13 + + crypto/Makefile | 1 + crypto/signature/Makefile | 10 + + crypto/signature/dsa.c | 96 ++++++ + crypto/signature/key.h | 7 + crypto/signature/ksign-keyring.c | 116 +++++++ + crypto/signature/ksign-parse.c | 603 ++++++++++++++++++++++++++++++++++++ + crypto/signature/ksign-publickey.c | 18 + + crypto/signature/ksign.c | 180 +++++++++++ + crypto/signature/local.h | 160 ++++++++++ + include/linux/crypto/ksign.h | 22 + + 11 files changed, 1226 insertions(+), 0 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index d768c46..205cbdf 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -471,6 +471,19 @@ config CRYPTO_MPILIB + help + Multiprecision maths library from GnuPG -+static void crypto_update_kernel(struct crypto_tfm *tfm, -+ const void *data, size_t count) -+{ -+ tfm->__crt_alg->cra_digest.dia_update(tfm, data, count); -+ crypto_yield(tfm); -+} ++config CRYPTO_SIGNATURE ++ bool "In-kernel signature checker (EXPERIMENTAL)" ++ depends on CRYPTO ++ help ++ Signature checker (used for module sig checking). ++ ++config CRYPTO_SIGNATURE_DSA ++ bool "Handle DSA signatures (EXPERIMENTAL)" ++ depends on CRYPTO_SIGNATURE ++ select CRYPTO_MPILIB ++ help ++ DSA Signature checker. ++ + source "drivers/crypto/Kconfig" + + endif # if CRYPTO +diff --git a/crypto/Makefile b/crypto/Makefile +index 36a6211..309a806 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -47,3 +47,4 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o + obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o + + obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ ++obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ +diff --git a/crypto/signature/Makefile b/crypto/signature/Makefile +new file mode 100644 +index 0000000..4d1042e +--- /dev/null ++++ b/crypto/signature/Makefile +@@ -0,0 +1,10 @@ ++# ++# Makefile for the signature checker ++# + - void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) - { - struct crypto_hash *hash = crypto_hash_cast(tfm); -@@ -186,6 +193,7 @@ int crypto_init_digest_ops(struct crypto - - ops->init = init; - ops->update = update; -+ ops->dit_update_kernel = crypto_update_kernel; - ops->final = final; - ops->digest = digest; - ops->setkey = dalg->dia_setkey ? setkey : nosetkey; -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/dsa.c linux-902/crypto/signature/dsa.c ---- linux-901/crypto/signature/dsa.c -+++ linux-902/crypto/signature/dsa.c -@@ -0,0 +1,98 @@ ++obj-y := \ ++ ksign.o \ ++ ksign-parse.o \ ++ ksign-keyring.o \ ++ ksign-publickey.o \ ++ dsa.o +diff --git a/crypto/signature/dsa.c b/crypto/signature/dsa.c +new file mode 100644 +index 0000000..469539c +--- /dev/null ++++ b/crypto/signature/dsa.c +@@ -0,0 +1,96 @@ +/* dsa.c - DSA signature algorithm + * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + * @@ -51,7 +101,6 @@ +#include +#include "local.h" + -+/*****************************************************************************/ +/* + * perform DSA algorithm signature verification + */ @@ -65,8 +114,7 @@ + + if (!datahash || + !sig[0] || !sig[1] || -+ !pkey[0] || !pkey[1] || !pkey[2] || !pkey[3] -+ ) ++ !pkey[0] || !pkey[1] || !pkey[2] || !pkey[3]) + return -EINVAL; + + p = pkey[0]; /* prime */ @@ -78,12 +126,12 @@ + + if (!(mpi_cmp_ui(r, 0) > 0 && mpi_cmp(r, q) < 0)) { + printk("DSA_verify assertion failed [0 < r < q]\n"); -+ return -EPERM; ++ return -EKEYREJECTED; + } + + if (!(mpi_cmp_ui(s, 0) > 0 && mpi_cmp(s, q) < 0)) { + printk("DSA_verify assertion failed [0 < s < q]\n"); -+ return -EPERM; ++ return -EKEYREJECTED; + } + + rc = -ENOMEM; @@ -115,18 +163,20 @@ + if (mpi_fdiv_r(v, v, q) < 0) + goto cleanup; + -+ rc = mpi_cmp(v, r) == 0 ? 0 : -EPERM; ++ rc = (mpi_cmp(v, r) == 0) ? 0 : -EKEYREJECTED; + -+ cleanup: ++cleanup: + mpi_free(w); + mpi_free(u1); + mpi_free(u2); + mpi_free(v); + return rc; -+} /* end DSA_verify() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/key.h linux-902/crypto/signature/key.h ---- linux-901/crypto/signature/key.h -+++ linux-902/crypto/signature/key.h ++} +diff --git a/crypto/signature/key.h b/crypto/signature/key.h +new file mode 100644 +index 0000000..7297968 +--- /dev/null ++++ b/crypto/signature/key.h @@ -0,0 +1,7 @@ +const int ksign_def_public_key_size = 0; +/* automatically generated by bin2hex */ @@ -135,193 +185,12 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign.c linux-902/crypto/signature/ksign.c ---- linux-901/crypto/signature/ksign.c -+++ linux-902/crypto/signature/ksign.c -@@ -0,0 +1,179 @@ -+/* ksign.c: signature checker -+ * -+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. -+ * Written by David Howells (dhowells at redhat.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include "local.h" -+ -+#if 0 -+#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__) -+#else -+#define _debug(FMT, ...) do { ; } while (0) -+#endif -+ -+/*****************************************************************************/ -+/* -+ * check the signature which is contained in SIG. -+ */ -+static int ksign_signature_check(const struct ksign_signature *sig, -+ struct crypto_tfm *sha1_tfm) -+{ -+ struct ksign_public_key *pk; -+ uint8_t sha1[SHA1_DIGEST_SIZE]; -+ MPI result = NULL; -+ int rc = 0; -+ -+ pk = ksign_get_public_key(sig->keyid); -+ if (!pk) { -+ printk("ksign: module signed with unknown public key\n"); -+ printk("- signature keyid: %08x%08x ver=%u\n", -+ sig->keyid[0], sig->keyid[1], sig->version); -+ return -EPERM; -+ } -+ -+ if (pk->timestamp > sig->timestamp) -+ printk("ksign:" -+ " public key is %lu seconds newer than the signature\n", -+ pk->timestamp - sig->timestamp); -+ -+ /* complete the digest */ -+ if (sig->version >= 4) -+ SHA1_putc(sha1_tfm, sig->version); -+ SHA1_putc(sha1_tfm, sig->sig_class); -+ -+ if (sig->version < 4) { -+ u32 a = sig->timestamp; -+ SHA1_putc(sha1_tfm, (a >> 24) & 0xff); -+ SHA1_putc(sha1_tfm, (a >> 16) & 0xff); -+ SHA1_putc(sha1_tfm, (a >> 8) & 0xff); -+ SHA1_putc(sha1_tfm, (a >> 0) & 0xff); -+ } -+ else { -+ uint8_t buf[6]; -+ size_t n; -+ SHA1_putc(sha1_tfm, PUBKEY_ALGO_DSA); -+ SHA1_putc(sha1_tfm, DIGEST_ALGO_SHA1); -+ if (sig->hashed_data) { -+ n = (sig->hashed_data[0] << 8) | sig->hashed_data[1]; -+ SHA1_write(sha1_tfm, sig->hashed_data, n + 2); -+ n += 6; -+ } -+ else { -+ n = 6; -+ } -+ -+ /* add some magic */ -+ buf[0] = sig->version; -+ buf[1] = 0xff; -+ buf[2] = n >> 24; -+ buf[3] = n >> 16; -+ buf[4] = n >> 8; -+ buf[5] = n; -+ SHA1_write(sha1_tfm, buf, 6); -+ } -+ -+ crypto_digest_final(sha1_tfm, sha1); -+ crypto_free_tfm(sha1_tfm); -+ -+ -+ -+ -+ -+ -+ rc = -ENOMEM; -+ result = mpi_alloc((SHA1_DIGEST_SIZE + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB); -+ if (!result) -+ goto cleanup; -+ -+ rc = mpi_set_buffer(result, sha1, SHA1_DIGEST_SIZE, 0); -+ if (rc < 0) -+ goto cleanup; -+ -+ rc = DSA_verify(result, sig->data, pk->pkey); -+ -+ cleanup: -+ mpi_free(result); -+ ksign_put_public_key(pk); -+ -+ return rc; -+} /* end ksign_signature_check() */ -+ -+/*****************************************************************************/ -+/* -+ * examine the signatures that are parsed out of the signature data - we keep -+ * the first one that's appropriate and ignore the rest -+ * - return 0 if signature of interest (sig not freed by caller) -+ * - return 1 if no interest (caller frees) -+ */ -+static int ksign_grab_signature(struct ksign_signature *sig, void *fnxdata) -+{ -+ struct ksign_signature **_sig = fnxdata; -+ -+ if (sig->sig_class != 0x00) { -+ _debug("ksign: standalone signature of class 0x%02x\n", -+ sig->sig_class); -+ return 1; -+ } -+ -+ if (*_sig) -+ return 1; -+ -+ *_sig = sig; -+ return 0; -+} /* end ksign_grab_signature() */ -+ -+/*****************************************************************************/ -+/* -+ * verify the signature of some data with one of the kernel's known public keys -+ * - the SHA1 context should be currently open with the signed data digested -+ * into it so that more data can be appended -+ * - the SHA1 context is finalised and freed before returning -+ */ -+int ksign_verify_signature(const char *sigdata, unsigned sig_size, -+ struct crypto_tfm *sha1) -+{ -+ struct ksign_signature *sig = NULL; -+ int retval; -+ -+ /* parse the signature data to get the actual signature */ -+ retval = ksign_parse_packets(sigdata, sig_size, -+ &ksign_grab_signature, NULL, NULL, -+ &sig); -+ if (retval < 0) -+ goto cleanup; -+ -+ if (!sig) { -+ printk("Couldn't find valid DSA signature in module\n"); -+ return -ENOENT; -+ } -+ -+ _debug("signature keyid: %08x%08x ver=%u\n", -+ sig->keyid[0], sig->keyid[1], sig->version); -+ -+ /* check the data SHA1 transformation against the public key */ -+ retval = ksign_signature_check(sig, sha1); -+ if (retval == 0) { -+ _debug("ksign: Signature check succeeded\n"); -+ } -+ else if (retval != -ENOMEM) { -+ _debug("ksign: Signature check failed\n"); -+ retval = -EPERM; -+ } -+ else { -+ _debug("ksign: Signature check ENOMEM\n"); -+ } -+ -+ cleanup: -+ if (sig) -+ ksign_free_signature(sig); -+ -+ return retval; -+} /* end ksign_verify_signature() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-keyring.c linux-902/crypto/signature/ksign-keyring.c ---- linux-901/crypto/signature/ksign-keyring.c -+++ linux-902/crypto/signature/ksign-keyring.c -@@ -0,0 +1,112 @@ +diff --git a/crypto/signature/ksign-keyring.c b/crypto/signature/ksign-keyring.c +new file mode 100644 +index 0000000..a839261 +--- /dev/null ++++ b/crypto/signature/ksign-keyring.c +@@ -0,0 +1,116 @@ +/* ksign-keyring.c: public key cache + * + * Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. @@ -350,6 +219,9 @@ +static LIST_HEAD(keyring); +static DECLARE_RWSEM(keyring_sem); + ++/* ++ * handle a public key element parsed from the keyring blob ++ */ +static int add_keyblock_key(struct ksign_public_key *pk, void *data) +{ + printk("- Added public key %X%X\n", pk->keyid[0], pk->keyid[1]); @@ -370,15 +242,17 @@ + return 0; +} + ++/* ++ * handle a user ID element parsed from the keyring blob ++ */ +static int add_keyblock_uid(struct ksign_user_id *uid, void *data) +{ + printk("- User ID: %s\n", uid->name); + return 1; +} + -+/*****************************************************************************/ +/* -+ * ++ * add the keys from a ASN.1 encoded blob into the keyring + */ +int ksign_load_keyring_from_buffer(const void *buffer, size_t size) +{ @@ -390,11 +264,10 @@ + add_keyblock_key, + add_keyblock_uid, + NULL); -+} /* end ksign_load_keyring_from_buffer() */ ++} + -+/*****************************************************************************/ +/* -+ * ++ * find a public key by ID + */ +struct ksign_public_key *ksign_get_public_key(const uint32_t *keyid) +{ @@ -409,15 +282,15 @@ + } + } + -+ found: -+ up_read(&keyring_sem); ++ pk = NULL; + ++found: ++ up_read(&keyring_sem); + return pk; -+} /* end ksign_get_public_key() */ ++} + -+/*****************************************************************************/ +/* -+ * clear the public key keyring ++ * clear the public-key keyring + */ +void ksign_clear_keyring(void) +{ @@ -433,12 +306,14 @@ + } + + up_write(&keyring_sem); -+} /* end ksign_clear_keyring() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-parse.c linux-902/crypto/signature/ksign-parse.c ---- linux-901/crypto/signature/ksign-parse.c -+++ linux-902/crypto/signature/ksign-parse.c -@@ -0,0 +1,609 @@ -+/* parse-packet.c - read packets ++} +diff --git a/crypto/signature/ksign-parse.c b/crypto/signature/ksign-parse.c +new file mode 100644 +index 0000000..96e2ff5 +--- /dev/null ++++ b/crypto/signature/ksign-parse.c +@@ -0,0 +1,603 @@ ++/* parse packet data + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. @@ -495,14 +370,13 @@ +{ + int i; + -+ if (!sig) -+ return; -+ -+ for (i = 0; i < DSA_NSIG; i++) -+ mpi_free(sig->data[i]); -+ kfree(sig->hashed_data); -+ kfree(sig->unhashed_data); -+ kfree(sig); ++ if (sig) { ++ for (i = 0; i < DSA_NSIG; i++) ++ mpi_free(sig->data[i]); ++ kfree(sig->hashed_data); ++ kfree(sig->unhashed_data); ++ kfree(sig); ++ } +} + +void ksign_free_public_key(struct ksign_public_key *pk) @@ -518,15 +392,13 @@ + +void ksign_free_user_id(struct ksign_user_id *uid) +{ -+ if (uid) -+ kfree(uid); ++ kfree(uid); +} + -+/*****************************************************************************/ +/* + * + */ -+static void ksign_calc_pk_keyid(struct crypto_tfm *sha1, ++static void ksign_calc_pk_keyid(struct hash_desc *sha1, + struct ksign_public_key *pk) +{ + unsigned n; @@ -537,7 +409,7 @@ + int i; + int npkey = DSA_NPKEY; + -+ crypto_digest_init(sha1); ++ crypto_hash_init(sha1); + + n = pk->version < 4 ? 8 : 6; + for (i = 0; i < npkey; i++) { @@ -550,7 +422,7 @@ + SHA1_putc(sha1, n >> 8); /* 2 uint8_t length header */ + SHA1_putc(sha1, n); + -+ if( pk->version < 4) ++ if (pk->version < 4) + SHA1_putc(sha1, 3); + else + SHA1_putc(sha1, 4); @@ -565,7 +437,8 @@ + uint16_t a16; + + if( pk->expiredate ) -+ a16 = (uint16_t) ((pk->expiredate - pk->timestamp) / 86400L); ++ a16 = (uint16_t) ++ ((pk->expiredate - pk->timestamp) / 86400L); + else + a16 = 0; + SHA1_putc(sha1, a16 >> 8); @@ -580,10 +453,8 @@ + SHA1_write(sha1, pp[i], nn[i]); + kfree(pp[i]); + } ++} + -+} /* end ksign_calc_pk_keyid() */ -+ -+/*****************************************************************************/ +/* + * parse a user ID embedded in a signature + */ @@ -614,9 +485,8 @@ + + ksign_free_user_id(uid); + return rc; -+} /* end ksign_parse_user_id() */ ++} + -+/*****************************************************************************/ +/* + * extract a public key embedded in a signature + */ @@ -625,9 +495,9 @@ + ksign_public_key_actor_t pkfnx, void *fnxdata) +{ + struct ksign_public_key *pk; -+ struct crypto_tfm *sha1_tfm; ++ struct hash_desc sha1; + unsigned long timestamp, expiredate; -+ uint8_t sha1[SHA1_DIGEST_SIZE]; ++ uint8_t hash[SHA1_DIGEST_SIZE]; + int i, version; + int is_v4 = 0; + int rc = 0; @@ -651,9 +521,9 @@ + } + + timestamp = read_32(&datap); -+ if (is_v4) ++ if (is_v4) { + expiredate = 0; /* have to get it from the selfsignature */ -+ else { ++ } else { + unsigned short ndays; + ndays = read_16(&datap); + if (ndays) @@ -669,11 +539,10 @@ + } + + /* extract the stuff from the DSA public key */ -+ pk = kmalloc(sizeof(struct ksign_public_key), GFP_KERNEL); ++ pk = kzalloc(sizeof(struct ksign_public_key), GFP_KERNEL); + if (!pk) + return -ENOMEM; + -+ memset(pk, 0, sizeof(struct ksign_public_key)); + atomic_set(&pk->count, 1); + pk->timestamp = timestamp; + pk->expiredate = expiredate; @@ -688,29 +557,29 @@ + + rc = -ENOMEM; + -+ sha1_tfm = crypto_alloc_tfm2("sha1", 0, 1); -+ if (!sha1_tfm) ++ sha1.tfm = crypto_hash_cast(crypto_alloc_tfm2("sha1", 0, 1)); ++ if (!sha1.tfm) + goto cleanup; ++ sha1.flags = 0; + -+ ksign_calc_pk_keyid(sha1_tfm, pk); -+ crypto_digest_final(sha1_tfm, sha1); -+ crypto_free_tfm(sha1_tfm); ++ ksign_calc_pk_keyid(&sha1, pk); ++ crypto_hash_final(&sha1, hash); ++ crypto_free_hash(sha1.tfm); + -+ pk->keyid[0] = sha1[12] << 24 | sha1[13] << 16 | sha1[14] << 8 | sha1[15]; -+ pk->keyid[1] = sha1[16] << 24 | sha1[17] << 16 | sha1[18] << 8 | sha1[19]; ++ pk->keyid[0] = hash[12] << 24 | hash[13] << 16 | hash[14] << 8 | hash[15]; ++ pk->keyid[1] = hash[16] << 24 | hash[17] << 16 | hash[18] << 8 | hash[19]; + + rc = 0; + if (pkfnx) + rc = pkfnx(pk, fnxdata); + -+ cleanup: ++cleanup: + ksign_put_public_key(pk); + return rc; -+} /* end ksign_parse_key() */ ++} + -+/*****************************************************************************/ +/* -+ * ++ * find an element representing the issuer + */ +static const uint8_t *ksign_find_sig_issuer(const uint8_t *buffer) +{ @@ -730,8 +599,7 @@ + goto too_short; + n = read_32(&buffer); + buflen -= 4; -+ } -+ else if (n >= 192) { ++ } else if (n >= 192) { + if(buflen < 2) + goto too_short; + n = ((n - 192) << 8) + *buffer + 192; @@ -743,9 +611,10 @@ + goto too_short; + + type = *buffer & 0x7f; -+ if (!(++seq > 0)) ++ if (!(++seq > 0)) { + ; -+ else if (type == SIGSUBPKT_ISSUER) { /* found */ ++ } else if (type == SIGSUBPKT_ISSUER) { ++ /* found */ + buffer++; + n--; + if (n > buflen || n < 8) @@ -757,11 +626,10 @@ + buflen -= n; + } + -+ too_short: ++too_short: + return NULL; /* end of subpackets; not found */ -+} /* end ksign_find_sig_issuer() */ ++} + -+/*****************************************************************************/ +/* + * extract signature data embedded in a signature + */ @@ -787,16 +655,16 @@ + case 2: + break; + default: -+ printk("ksign: signature packet with unknown version %d\n", version); ++ printk("ksign: signature packet with unknown version %d\n", ++ version); + return 0; + } + + /* store information */ -+ sig = kmalloc(sizeof(*sig), GFP_KERNEL); ++ sig = kzalloc(sizeof(*sig), GFP_KERNEL); + if (!sig) + return -ENOMEM; + -+ memset(sig, 0, sizeof(*sig)); + sig->version = version; + + if (!is_v4) @@ -820,15 +688,18 @@ + } + + rc = -EBADMSG; -+ if (is_v4) { /* read subpackets */ ++ if (is_v4) { ++ /* read subpackets */ + n = read_16(&datap); /* length of hashed data */ + if (n > 10000) { -+ printk("ksign: signature packet: hashed data too long\n"); ++ printk("ksign: signature packet:" ++ " hashed data too long\n"); + goto leave; + } + if (n) { + if ((size_t)(endp - datap) < n) { -+ printk("ksign: signature packet: available data too short\n"); ++ printk("ksign: signature packet:" ++ " available data too short\n"); + goto leave; + } + sig->hashed_data = kmalloc(n + 2, GFP_KERNEL); @@ -844,12 +715,14 @@ + + n = read_16(&datap); /* length of unhashed data */ + if (n > 10000) { -+ printk("ksign: signature packet: unhashed data too long\n"); ++ printk("ksign: signature packet:" ++ " unhashed data too long\n"); + goto leave; + } + if (n) { + if ((size_t) (endp - datap) < n) { -+ printk("ksign: signature packet: available data too short\n"); ++ printk("ksign: signature packet:" ++ " available data too short\n"); + goto leave; + } + sig->unhashed_data = kmalloc(n + 2, GFP_KERNEL); @@ -878,9 +751,9 @@ + p = ksign_find_sig_issuer(sig->hashed_data); + if (!p) + p = ksign_find_sig_issuer(sig->unhashed_data); -+ if (!p) ++ if (!p) { + printk("ksign: signature packet without issuer\n"); -+ else { ++ } else { + sig->keyid[0] = buffer_to_u32(p); + sig->keyid[1] = buffer_to_u32(p + 4); + } @@ -901,12 +774,11 @@ + rc = 0; + } + -+ leave: ++leave: + ksign_free_signature(sig); + return rc; -+} /* end ksign_parse_signature() */ ++} + -+/*****************************************************************************/ +/* + * parse the next packet and call appropriate handler function for known types + * - returns: @@ -954,8 +826,7 @@ + + if (c < 192) { + pktlen = c; -+ } -+ else if (c < 224) { ++ } else if (c < 224) { + pktlen = (c - 192) * 256; + if (*datap >= endp) { + printk("ksign: 2nd length uint8_t missing\n"); @@ -964,28 +835,24 @@ + c = *(*datap)++; + hdr[hdrlen++] = c; + pktlen += c + 192; -+ } -+ else if (c == 255) { ++ } else if (c == 255) { + if (*datap + 3 >= endp) { + printk("ksign: 4 uint8_t length invalid\n"); + goto leave; + } -+ pktlen = (hdr[hdrlen++] = *(*datap)++ << 24 ); -+ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 16 ); -+ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 8 ); -+ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 0 ); -+ } -+ else { ++ pktlen = (hdr[hdrlen++] = *(*datap)++ << 24); ++ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 16); ++ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 8); ++ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 0); ++ } else { + pktlen = 0;/* to indicate partial length */ + } -+ } -+ else { ++ } else { + pkttype = (ctb >> 2) & 0xf; + lenuint8_ts = ((ctb & 3) == 3) ? 0 : (1 << (ctb & 3)); + if( !lenuint8_ts ) { + pktlen = 0; /* don't know the value */ -+ } -+ else { ++ } else { + if (*datap + lenuint8_ts > endp) { + printk("ksign: length uint8_ts missing\n"); + goto leave; @@ -1005,13 +872,16 @@ + /* deal with the next packet appropriately */ + switch (pkttype) { + case PKT_PUBLIC_KEY: -+ rc = ksign_parse_key(*datap, *datap + pktlen, hdr, hdrlen, pkfnx, data); ++ rc = ksign_parse_key(*datap, *datap + pktlen, hdr, hdrlen, ++ pkfnx, data); + break; + case PKT_SIGNATURE: -+ rc = ksign_parse_signature(*datap, *datap + pktlen, sigfnx, data); ++ rc = ksign_parse_signature(*datap, *datap + pktlen, ++ sigfnx, data); + break; + case PKT_USER_ID: -+ rc = ksign_parse_user_id(*datap, *datap + pktlen, uidfnx, data); ++ rc = ksign_parse_user_id(*datap, *datap + pktlen, ++ uidfnx, data); + break; + default: + rc = 0; /* unknown packet */ @@ -1019,11 +889,10 @@ + } + + *datap += pktlen; -+ leave: ++leave: + return rc; -+} /* end ksign_parse_one_packet() */ ++} + -+/*****************************************************************************/ +/* + * parse the contents of a packet buffer, passing the signature, public key and + * user ID to the caller's callback functions @@ -1046,13 +915,14 @@ + } while (rc == 0 && datap < endp); + + return rc; -+} /* end ksign_parse_packets() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-publickey.c linux-902/crypto/signature/ksign-publickey.c ---- linux-901/crypto/signature/ksign-publickey.c -+++ linux-902/crypto/signature/ksign-publickey.c -@@ -0,0 +1,19 @@ ++} +diff --git a/crypto/signature/ksign-publickey.c b/crypto/signature/ksign-publickey.c +new file mode 100644 +index 0000000..832a419 +--- /dev/null ++++ b/crypto/signature/ksign-publickey.c +@@ -0,0 +1,18 @@ +#include "local.h" -+ +#include "key.h" + +static int __init ksign_init(void) @@ -1070,10 +940,198 @@ +} + +module_init(ksign_init) -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/local.h linux-902/crypto/signature/local.h ---- linux-901/crypto/signature/local.h -+++ linux-902/crypto/signature/local.h -@@ -0,0 +1,163 @@ +diff --git a/crypto/signature/ksign.c b/crypto/signature/ksign.c +new file mode 100644 +index 0000000..b62eb38 +--- /dev/null ++++ b/crypto/signature/ksign.c +@@ -0,0 +1,180 @@ ++/* ksign.c: signature checker ++ * ++ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. ++ * Written by David Howells (dhowells at redhat.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#include ++#include ++#include "local.h" ++ ++#if 0 ++#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__) ++#else ++#define _debug(FMT, ...) do { ; } while (0) ++#endif ++ ++/* ++ * check the signature which is contained in SIG. ++ */ ++static int ksign_signature_check(const struct ksign_signature *sig, ++ struct crypto_hash *sha1_tfm) ++{ ++ struct ksign_public_key *pk; ++ struct hash_desc sha1_d; ++ uint8_t sha1[SHA1_DIGEST_SIZE]; ++ MPI result = NULL; ++ int rc = 0; ++ ++ pk = ksign_get_public_key(sig->keyid); ++ if (!pk) { ++ printk("ksign: module signed with unknown public key\n"); ++ printk("- signature keyid: %08x%08x ver=%u\n", ++ sig->keyid[0], sig->keyid[1], sig->version); ++ return -ENOKEY; ++ } ++ ++ if (pk->timestamp > sig->timestamp) ++ printk("ksign:" ++ " public key is %lu seconds newer than the signature\n", ++ pk->timestamp - sig->timestamp); ++ ++ sha1_d.tfm = sha1_tfm; ++ sha1_d.flags = 0; ++ ++ /* complete the digest */ ++ if (sig->version >= 4) ++ SHA1_putc(&sha1_d, sig->version); ++ SHA1_putc(&sha1_d, sig->sig_class); ++ ++ if (sig->version < 4) { ++ u32 a = sig->timestamp; ++ SHA1_putc(&sha1_d, (a >> 24) & 0xff); ++ SHA1_putc(&sha1_d, (a >> 16) & 0xff); ++ SHA1_putc(&sha1_d, (a >> 8) & 0xff); ++ SHA1_putc(&sha1_d, (a >> 0) & 0xff); ++ } ++ else { ++ uint8_t buf[6]; ++ size_t n; ++ SHA1_putc(&sha1_d, PUBKEY_ALGO_DSA); ++ SHA1_putc(&sha1_d, DIGEST_ALGO_SHA1); ++ if (sig->hashed_data) { ++ n = (sig->hashed_data[0] << 8) | sig->hashed_data[1]; ++ SHA1_write(&sha1_d, sig->hashed_data, n + 2); ++ n += 6; ++ } ++ else { ++ n = 6; ++ } ++ ++ /* add some magic */ ++ buf[0] = sig->version; ++ buf[1] = 0xff; ++ buf[2] = n >> 24; ++ buf[3] = n >> 16; ++ buf[4] = n >> 8; ++ buf[5] = n; ++ SHA1_write(&sha1_d, buf, 6); ++ } ++ ++ crypto_hash_final(&sha1_d, sha1); ++ crypto_free_hash(sha1_tfm); ++ ++ rc = -ENOMEM; ++ result = mpi_alloc((SHA1_DIGEST_SIZE + BYTES_PER_MPI_LIMB - 1) / ++ BYTES_PER_MPI_LIMB); ++ if (!result) ++ goto cleanup; ++ ++ rc = mpi_set_buffer(result, sha1, SHA1_DIGEST_SIZE, 0); ++ if (rc < 0) ++ goto cleanup; ++ ++ rc = DSA_verify(result, sig->data, pk->pkey); ++ ++ cleanup: ++ mpi_free(result); ++ ksign_put_public_key(pk); ++ ++ return rc; ++} ++ ++/* ++ * examine the signatures that are parsed out of the signature data - we keep ++ * the first one that's appropriate and ignore the rest ++ * - return 0 if signature of interest (sig not freed by caller) ++ * - return 1 if no interest (caller frees) ++ */ ++static int ksign_grab_signature(struct ksign_signature *sig, void *fnxdata) ++{ ++ struct ksign_signature **_sig = fnxdata; ++ ++ if (sig->sig_class != 0x00) { ++ _debug("ksign: standalone signature of class 0x%02x\n", ++ sig->sig_class); ++ return 1; ++ } ++ ++ if (*_sig) ++ return 1; ++ ++ *_sig = sig; ++ return 0; ++} ++ ++/* ++ * verify the signature of some data with one of the kernel's known public keys ++ * - the SHA1 context should be currently open with the signed data digested ++ * into it so that more data can be appended ++ * - the SHA1 context is finalised and freed before returning ++ */ ++int ksign_verify_signature(const char *sigdata, unsigned sig_size, ++ struct crypto_hash *sha1) ++{ ++ struct ksign_signature *sig = NULL; ++ int retval; ++ ++ /* parse the signature data to get the actual signature */ ++ retval = ksign_parse_packets(sigdata, sig_size, ++ &ksign_grab_signature, NULL, NULL, ++ &sig); ++ if (retval < 0) ++ goto cleanup; ++ ++ if (!sig) { ++ printk(KERN_NOTICE ++ "Couldn't find valid DSA signature in module\n"); ++ return -ENOENT; ++ } ++ ++ _debug("signature keyid: %08x%08x ver=%u\n", ++ sig->keyid[0], sig->keyid[1], sig->version); ++ ++ /* check the data SHA1 transformation against the public key */ ++ retval = ksign_signature_check(sig, sha1); ++ switch (retval) { ++ case 0: ++ _debug("ksign: Signature check succeeded\n"); ++ break; ++ case -ENOMEM: ++ _debug("ksign: Signature check ENOMEM\n"); ++ break; ++ default: ++ _debug("ksign: Signature check failed\n"); ++ if (retval != -ENOKEY) ++ retval = -EKEYREJECTED; ++ break; ++ } ++ ++ cleanup: ++ if (sig) ++ ksign_free_signature(sig); ++ ++ return retval; ++} +diff --git a/crypto/signature/local.h b/crypto/signature/local.h +new file mode 100644 +index 0000000..aa18cc4 +--- /dev/null ++++ b/crypto/signature/local.h +@@ -0,0 +1,160 @@ +/* local.h: kernel signature checker internal defs + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. @@ -1152,8 +1210,7 @@ +/* + * signature record + */ -+struct ksign_signature -+{ ++struct ksign_signature { + uint32_t keyid[2]; /* 64 bit keyid */ + time_t timestamp; /* signature made */ + uint8_t version; @@ -1169,8 +1226,7 @@ +/* + * public key record + */ -+struct ksign_public_key -+{ ++struct ksign_public_key { + struct list_head link; + atomic_t count; /* ref count */ + time_t timestamp; /* key made */ @@ -1199,8 +1255,7 @@ +/* + * user ID record + */ -+struct ksign_user_id -+{ ++struct ksign_user_id { + int len; /* length of the name */ + char name[0]; +}; @@ -1228,32 +1283,20 @@ + * - we _know_ the data is locked into kernel memory, so we don't want to have + * to kmap() it + */ -+static inline void SHA1_putc(struct crypto_tfm *sha1, uint8_t ch) ++static inline void SHA1_putc(struct hash_desc *sha1, uint8_t ch) +{ -+ crypto_digest_update_kernel(sha1, &ch, 1); ++ crypto_hash_update_kernel(sha1, &ch, 1); +} + -+static inline void SHA1_write(struct crypto_tfm *sha1, const void *s, size_t n) ++static inline void SHA1_write(struct hash_desc *sha1, const void *s, size_t n) +{ -+ crypto_digest_update_kernel(sha1, s, n); ++ crypto_hash_update_kernel(sha1, s, n); +} -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/Makefile linux-902/crypto/signature/Makefile ---- linux-901/crypto/signature/Makefile -+++ linux-902/crypto/signature/Makefile -@@ -0,0 +1,10 @@ -+# -+# Makefile for the signature checker -+# -+ -+obj-y := \ -+ ksign.o \ -+ ksign-parse.o \ -+ ksign-keyring.o \ -+ ksign-publickey.o \ -+ dsa.o -diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto/ksign.h linux-902/include/linux/crypto/ksign.h ---- linux-901/include/linux/crypto/ksign.h -+++ linux-902/include/linux/crypto/ksign.h +diff --git a/include/linux/crypto/ksign.h b/include/linux/crypto/ksign.h +new file mode 100644 +index 0000000..27c9e4a +--- /dev/null ++++ b/include/linux/crypto/ksign.h @@ -0,0 +1,22 @@ +/* ksign.h: in-kernel signature checker + * @@ -1273,43 +1316,7 @@ + +#ifdef CONFIG_CRYPTO_SIGNATURE +extern int ksign_verify_signature(const char *sig, unsigned sig_size, -+ struct crypto_tfm *sha1); ++ struct crypto_hash *sha1); +#endif + +#endif /* _LINUX_CRYPTO_KSIGN_H */ ---- linux-2.6.18.noarch/include/linux/crypto.h~ 2006-10-14 18:55:16.000000000 -0400 -+++ linux-2.6.18.noarch/include/linux/crypto.h 2006-10-14 18:56:59.000000000 -0400 -@@ -305,6 +305,8 @@ struct hash_tfm { - int (*init)(struct hash_desc *desc); - int (*update)(struct hash_desc *desc, - struct scatterlist *sg, unsigned int nsg); -+ void (*dit_update_kernel)(struct crypto_tfm *tfm, -+ const void *data, size_t count); - int (*final)(struct hash_desc *desc, u8 *out); - int (*digest)(struct hash_desc *desc, struct scatterlist *sg, - unsigned int nsg, u8 *out); -@@ -713,6 +715,13 @@ void crypto_digest_init(struct crypto_tf - void crypto_digest_update(struct crypto_tfm *tfm, - struct scatterlist *sg, unsigned int nsg) - __deprecated_for_modules; -+static inline void crypto_digest_update_kernel(struct crypto_tfm *tfm, -+ const void *data, -+ size_t count) -+{ -+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); -+ tfm->crt_digest.dit_update_kernel(tfm, data, count); -+} - void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) - __deprecated_for_modules; - void crypto_digest_digest(struct crypto_tfm *tfm, ---- linux-2.6.14/crypto/signature/ksign-keyring.c~ 2005-11-22 14:11:25.000000000 -0500 -+++ linux-2.6.14/crypto/signature/ksign-keyring.c 2005-11-22 14:11:38.000000000 -0500 -@@ -85,6 +85,8 @@ struct ksign_public_key *ksign_get_publi - } - } - -+ pk = NULL; -+ - found: - up_read(&keyring_sem); - linux-2.6-modsign-mpilib.patch: crypto/Kconfig | 6 crypto/Makefile | 2 crypto/mpi/Makefile | 30 crypto/mpi/generic_mpi-asm-defs.h | 10 crypto/mpi/generic_mpih-add1.c | 62 + crypto/mpi/generic_mpih-lshift.c | 66 + crypto/mpi/generic_mpih-mul1.c | 58 + crypto/mpi/generic_mpih-mul2.c | 63 + crypto/mpi/generic_mpih-mul3.c | 64 + crypto/mpi/generic_mpih-rshift.c | 65 + crypto/mpi/generic_mpih-sub1.c | 62 + crypto/mpi/generic_udiv-w-sdiv.c | 130 +++ crypto/mpi/longlong.h | 1502 ++++++++++++++++++++++++++++++++++++++ crypto/mpi/mpi-add.c | 258 ++++++ crypto/mpi/mpi-bit.c | 245 ++++++ crypto/mpi/mpi-cmp.c | 71 + crypto/mpi/mpi-div.c | 345 ++++++++ crypto/mpi/mpi-gcd.c | 60 + crypto/mpi/mpi-inline.c | 33 crypto/mpi/mpi-inline.h | 128 +++ crypto/mpi/mpi-internal.h | 265 ++++++ crypto/mpi/mpi-inv.c | 148 +++ crypto/mpi/mpi-mpow.c | 113 ++ crypto/mpi/mpi-mul.c | 202 +++++ crypto/mpi/mpi-pow.c | 312 +++++++ crypto/mpi/mpi-scan.c | 129 +++ crypto/mpi/mpicoder.c | 359 +++++++++ crypto/mpi/mpih-cmp.c | 58 + crypto/mpi/mpih-div.c | 534 +++++++++++++ crypto/mpi/mpih-mul.c | 546 +++++++++++++ crypto/mpi/mpiutil.c | 213 +++++ include/linux/crypto/mpi.h | 147 +++ 32 files changed, 6286 insertions(+) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-modsign-mpilib.patch Index: linux-2.6-modsign-mpilib.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-modsign-mpilib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-modsign-mpilib.patch 22 Nov 2005 16:15:15 -0000 1.2 +++ linux-2.6-modsign-mpilib.patch 8 Jan 2007 16:47:48 -0000 1.3 @@ -1,6 +1,119 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpi-asm-defs.h linux-903/crypto/mpi/generic_mpi-asm-defs.h ---- linux-902/crypto/mpi/generic_mpi-asm-defs.h -+++ linux-903/crypto/mpi/generic_mpi-asm-defs.h +MODSIGN: Multiprecision maths library + +From: David Howells + +Add a multiprecision maths library (MPILIB) required for doing cryptographic +operations based on very large prime numbers. + +This is derived from GPG, reduced to the minimum necessary bits for doing DSA +signature verification with error handling added. This is used to do kernel +module signing. + +Signed-Off-By: David Howells +--- + + crypto/Kconfig | 6 + crypto/Makefile | 2 + crypto/mpi/Makefile | 30 + + crypto/mpi/generic_mpi-asm-defs.h | 10 + crypto/mpi/generic_mpih-add1.c | 62 ++ + crypto/mpi/generic_mpih-lshift.c | 66 ++ + crypto/mpi/generic_mpih-mul1.c | 58 + + crypto/mpi/generic_mpih-mul2.c | 63 ++ + crypto/mpi/generic_mpih-mul3.c | 64 ++ + crypto/mpi/generic_mpih-rshift.c | 65 ++ + crypto/mpi/generic_mpih-sub1.c | 62 ++ + crypto/mpi/generic_udiv-w-sdiv.c | 130 +++ + crypto/mpi/longlong.h | 1502 +++++++++++++++++++++++++++++++++++++ + crypto/mpi/mpi-add.c | 258 ++++++ + crypto/mpi/mpi-bit.c | 245 ++++++ + crypto/mpi/mpi-cmp.c | 71 ++ + crypto/mpi/mpi-div.c | 345 ++++++++ + crypto/mpi/mpi-gcd.c | 60 + + crypto/mpi/mpi-inline.c | 33 + + crypto/mpi/mpi-inline.h | 128 +++ + crypto/mpi/mpi-internal.h | 265 +++++++ + crypto/mpi/mpi-inv.c | 148 ++++ + crypto/mpi/mpi-mpow.c | 113 +++ + crypto/mpi/mpi-mul.c | 202 +++++ + crypto/mpi/mpi-pow.c | 312 ++++++++ + crypto/mpi/mpi-scan.c | 129 +++ + crypto/mpi/mpicoder.c | 359 +++++++++ + crypto/mpi/mpih-cmp.c | 58 + + crypto/mpi/mpih-div.c | 534 +++++++++++++ + crypto/mpi/mpih-mul.c | 546 +++++++++++++ + crypto/mpi/mpiutil.c | 213 +++++ + include/linux/crypto/mpi.h | 147 ++++ + 32 files changed, 6286 insertions(+), 0 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index 92ba249..d768c46 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -465,6 +465,12 @@ config CRYPTO_TEST + help + Quick & dirty crypto test module. + ++config CRYPTO_MPILIB ++ bool "Multiprecision maths library (EXPERIMENTAL)" ++ depends on CRYPTO ++ help ++ Multiprecision maths library from GnuPG ++ + source "drivers/crypto/Kconfig" + + endif # if CRYPTO +diff --git a/crypto/Makefile b/crypto/Makefile +index 60e3d24..36a6211 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -45,3 +45,5 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich + obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o + + obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o ++ ++obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ +diff --git a/crypto/mpi/Makefile b/crypto/mpi/Makefile +new file mode 100644 +index 0000000..e96597d +--- /dev/null ++++ b/crypto/mpi/Makefile +@@ -0,0 +1,30 @@ ++# ++# MPI multiprecision maths library (from gpg) ++# ++ ++obj-$(CONFIG_CRYPTO_MPILIB) = \ ++ generic_mpih-lshift.o \ ++ generic_mpih-mul1.o \ ++ generic_mpih-mul2.o \ ++ generic_mpih-mul3.o \ ++ generic_mpih-rshift.o \ ++ generic_mpih-sub1.o \ ++ generic_mpih-add1.o \ ++ generic_udiv-w-sdiv.o \ ++ mpicoder.o \ ++ mpi-add.o \ ++ mpi-bit.o \ ++ mpi-div.o \ ++ mpi-cmp.o \ ++ mpi-gcd.o \ ++ mpih-cmp.o \ ++ mpih-div.o \ ++ mpih-mul.o \ ++ mpi-inline.o \ ++ mpi-inv.o \ ++ mpi-mpow.o \ ++ mpi-mul.o \ ++ mpi-pow.o \ ++ mpi-scan.o \ ++ mpiutil.o ++ +diff --git a/crypto/mpi/generic_mpi-asm-defs.h b/crypto/mpi/generic_mpi-asm-defs.h +new file mode 100644 +index 0000000..13424e2 +--- /dev/null ++++ b/crypto/mpi/generic_mpi-asm-defs.h @@ -0,0 +1,10 @@ +/* This file defines some basic constants for the MPI machinery. We + * need to define the types on a per-CPU basis, so it is done with @@ -12,9 +125,11 @@ + + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-add1.c linux-903/crypto/mpi/generic_mpih-add1.c ---- linux-902/crypto/mpi/generic_mpih-add1.c -+++ linux-903/crypto/mpi/generic_mpih-add1.c +diff --git a/crypto/mpi/generic_mpih-add1.c b/crypto/mpi/generic_mpih-add1.c +new file mode 100644 +index 0000000..891fef0 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-add1.c @@ -0,0 +1,62 @@ +/* mpihelp-add_1.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, @@ -78,9 +193,11 @@ + return cy; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-lshift.c linux-903/crypto/mpi/generic_mpih-lshift.c ---- linux-902/crypto/mpi/generic_mpih-lshift.c -+++ linux-903/crypto/mpi/generic_mpih-lshift.c +diff --git a/crypto/mpi/generic_mpih-lshift.c b/crypto/mpi/generic_mpih-lshift.c +new file mode 100644 +index 0000000..9e159b5 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-lshift.c @@ -0,0 +1,66 @@ +/* mpihelp-lshift.c - MPI helper functions + * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc. @@ -148,9 +265,11 @@ +} + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul1.c linux-903/crypto/mpi/generic_mpih-mul1.c ---- linux-902/crypto/mpi/generic_mpih-mul1.c -+++ linux-903/crypto/mpi/generic_mpih-mul1.c +diff --git a/crypto/mpi/generic_mpih-mul1.c b/crypto/mpi/generic_mpih-mul1.c +new file mode 100644 +index 0000000..4e34d46 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-mul1.c @@ -0,0 +1,58 @@ +/* mpihelp-mul_1.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -210,9 +329,11 @@ + return cy_limb; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul2.c linux-903/crypto/mpi/generic_mpih-mul2.c ---- linux-902/crypto/mpi/generic_mpih-mul2.c -+++ linux-903/crypto/mpi/generic_mpih-mul2.c +diff --git a/crypto/mpi/generic_mpih-mul2.c b/crypto/mpi/generic_mpih-mul2.c +new file mode 100644 +index 0000000..c1f41f3 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-mul2.c @@ -0,0 +1,63 @@ +/* mpihelp-mul_2.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -277,9 +398,11 @@ +} + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul3.c linux-903/crypto/mpi/generic_mpih-mul3.c ---- linux-902/crypto/mpi/generic_mpih-mul3.c -+++ linux-903/crypto/mpi/generic_mpih-mul3.c +diff --git a/crypto/mpi/generic_mpih-mul3.c b/crypto/mpi/generic_mpih-mul3.c +new file mode 100644 [...5398 lines suppressed...] + */ + -+#include "mpi-internal.h" -+#include "longlong.h" -+ -+/**************** -+ * Scan through an mpi and return byte for byte. a -1 is returned to indicate -+ * the end of the mpi. Scanning is done from the lsb to the msb, returned -+ * values are in the range of 0 .. 255. -+ * -+ * FIXME: This code is VERY ugly! -+ */ +int -+mpi_getbyte( const MPI a, unsigned idx ) ++mpihelp_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize, ++ mpi_ptr_t vp, mpi_size_t vsize, ++ mpi_limb_t *_result) +{ -+ int i, j; -+ unsigned n; -+ mpi_ptr_t ap; -+ mpi_limb_t limb; -+ -+ ap = a->d; -+ for(n=0,i=0; i < a->nlimbs; i++ ) { -+ limb = ap[i]; -+ for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ ) -+ if( n == idx ) -+ return (limb >> j*8) & 0xff; -+ } -+ return -1; -+} -+ ++ mpi_ptr_t prod_endp = prodp + usize + vsize - 1; ++ mpi_limb_t cy; ++ struct karatsuba_ctx ctx; + -+/**************** -+ * Put a value at position IDX into A. idx counts from lsb to msb -+ */ -+void -+mpi_putbyte( MPI a, unsigned idx, int xc ) -+{ -+ int i, j; -+ unsigned n; -+ mpi_ptr_t ap; -+ mpi_limb_t limb, c; ++ if( vsize < KARATSUBA_THRESHOLD ) { ++ mpi_size_t i; ++ mpi_limb_t v_limb; + -+ c = xc & 0xff; -+ ap = a->d; -+ for(n=0,i=0; i < a->alloced; i++ ) { -+ limb = ap[i]; -+ for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ ) -+ if( n == idx ) { -+ #if BYTES_PER_MPI_LIMB == 4 -+ if( j == 0 ) -+ limb = (limb & 0xffffff00) | c; -+ else if( j == 1 ) -+ limb = (limb & 0xffff00ff) | (c<<8); -+ else if( j == 2 ) -+ limb = (limb & 0xff00ffff) | (c<<16); -+ else -+ limb = (limb & 0x00ffffff) | (c<<24); -+ #elif BYTES_PER_MPI_LIMB == 8 -+ if( j == 0 ) -+ limb = (limb & 0xffffffffffffff00) | c; -+ else if( j == 1 ) -+ limb = (limb & 0xffffffffffff00ff) | (c<<8); -+ else if( j == 2 ) -+ limb = (limb & 0xffffffffff00ffff) | (c<<16); -+ else if( j == 3 ) -+ limb = (limb & 0xffffffff00ffffff) | (c<<24); -+ else if( j == 4 ) -+ limb = (limb & 0xffffff00ffffffff) | (c<<32); -+ else if( j == 5 ) -+ limb = (limb & 0xffff00ffffffffff) | (c<<40); -+ else if( j == 6 ) -+ limb = (limb & 0xff00ffffffffffff) | (c<<48); -+ else -+ limb = (limb & 0x00ffffffffffffff) | (c<<56); -+ #else -+ #error please enhance this function, its ugly - i know. -+ #endif -+ if( a->nlimbs <= i ) -+ a->nlimbs = i+1; -+ ap[i] = limb; -+ return; -+ } -+ } -+ log_bug("index out of range\n"); -+} ++ if( !vsize ) { ++ *_result = 0; ++ return 0; ++ } + ++ /* Multiply by the first limb in V separately, as the result can be ++ * stored (not added) to PROD. We also avoid a loop for zeroing. */ ++ v_limb = vp[0]; ++ if( v_limb <= 1 ) { ++ if( v_limb == 1 ) ++ MPN_COPY( prodp, up, usize ); ++ else ++ MPN_ZERO( prodp, usize ); ++ cy = 0; ++ } ++ else ++ cy = mpihelp_mul_1( prodp, up, usize, v_limb ); + -+/**************** -+ * Count the number of zerobits at the low end of A -+ */ -+unsigned -+mpi_trailing_zeros( const MPI a ) -+{ -+ unsigned n, count = 0; ++ prodp[usize] = cy; ++ prodp++; + -+ for(n=0; n < a->nlimbs; n++ ) { -+ if( a->d[n] ) { -+ unsigned nn; -+ mpi_limb_t alimb = a->d[n]; ++ /* For each iteration in the outer loop, multiply one limb from ++ * U with one limb from V, and add it to PROD. */ ++ for( i = 1; i < vsize; i++ ) { ++ v_limb = vp[i]; ++ if( v_limb <= 1 ) { ++ cy = 0; ++ if( v_limb == 1 ) ++ cy = mpihelp_add_n(prodp, prodp, up, usize); ++ } ++ else ++ cy = mpihelp_addmul_1(prodp, up, usize, v_limb); + -+ count_trailing_zeros( nn, alimb ); -+ count += nn; -+ break; ++ prodp[usize] = cy; ++ prodp++; + } -+ count += BITS_PER_MPI_LIMB; ++ ++ *_result = cy; ++ return 0; + } -+ return count; + ++ memset( &ctx, 0, sizeof ctx ); ++ if (mpihelp_mul_karatsuba_case( prodp, up, usize, vp, vsize, &ctx ) < 0) ++ return -ENOMEM; ++ mpihelp_release_karatsuba_ctx( &ctx ); ++ *_result = *prod_endp; ++ return 0; +} + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpiutil.c linux-903/crypto/mpi/mpiutil.c ---- linux-902/crypto/mpi/mpiutil.c -+++ linux-903/crypto/mpi/mpiutil.c -@@ -0,0 +1,214 @@ +diff --git a/crypto/mpi/mpiutil.c b/crypto/mpi/mpiutil.c +new file mode 100644 +index 0000000..26157e9 +--- /dev/null ++++ b/crypto/mpi/mpiutil.c +@@ -0,0 +1,213 @@ +/* mpiutil.ac - Utility functions for MPI + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. + * @@ -6132,10 +6264,9 @@ + kfree(a->d); + a->d = p; + } else { -+ a->d = kmalloc( nlimbs * sizeof(mpi_limb_t), GFP_KERNEL); ++ a->d = kzalloc( nlimbs * sizeof(mpi_limb_t), GFP_KERNEL); + if (!a->d) + return -ENOMEM; -+ memset(a->d, 0, nlimbs * sizeof(mpi_limb_t) ); + } + a->alloced = nlimbs; + return 0; @@ -6247,9 +6378,11 @@ + tmp = *a; *a = *b; *b = tmp; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/include/linux/crypto/mpi.h linux-903/include/linux/crypto/mpi.h ---- linux-902/include/linux/crypto/mpi.h -+++ linux-903/include/linux/crypto/mpi.h +diff --git a/include/linux/crypto/mpi.h b/include/linux/crypto/mpi.h +new file mode 100644 +index 0000000..4de3ba0 +--- /dev/null ++++ b/include/linux/crypto/mpi.h @@ -0,0 +1,147 @@ +/* mpi.h - Multi Precision Integers + * Copyright (C) 1994, 1996, 1998, 1999, linux-2.6-modsign-script.patch: Makefile | 27 + mod-extract.c | 890 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ modsign.sh | 58 +++ 3 files changed, 975 insertions(+) Index: linux-2.6-modsign-script.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-modsign-script.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-modsign-script.patch 16 Oct 2005 22:23:45 -0000 1.1 +++ linux-2.6-modsign-script.patch 8 Jan 2007 16:47:48 -0000 1.2 @@ -1,6 +1,36 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/Makefile linux-904/scripts/modsign/Makefile ---- linux-903/scripts/modsign/Makefile -+++ linux-904/scripts/modsign/Makefile +MODSIGN: Stuff for signing modules + +From: David Howells + +Add scripts and programs for signing module files (.ko files). + +With the kernel key files (kernel.sec and kernel.pub) in the parent directory +of the kernel source file, any particular module can be signed by doing: + + sh scripts/modsign/modsign.sh + +For example, the RxRPC module can be signed: + + sh scripts/modsign/modsign.sh net/rxrpc/rxrpc.ko + +This will leave a file called .signed (eg: net/rxrpc/rxrpc.ko.signed) +that is the signed module binary. This file can then be stripped if desired to +remove debugging information without invalidating the signature. It would be +loaded with insmod as normal. + +Signed-Off-By: David Howells +--- + + scripts/modsign/Makefile | 27 + + scripts/modsign/mod-extract.c | 890 +++++++++++++++++++++++++++++++++++++++++ + scripts/modsign/modsign.sh | 58 +++ + 3 files changed, 975 insertions(+), 0 deletions(-) + +diff --git a/scripts/modsign/Makefile b/scripts/modsign/Makefile +new file mode 100644 +index 0000000..9cf4fd9 +--- /dev/null ++++ b/scripts/modsign/Makefile @@ -0,0 +1,27 @@ +# Set the following to `true' to make a debuggable build. +# Leave this set to `false' for production use. @@ -14,7 +44,7 @@ + +CC = gcc + -+INCLUDES = ++INCLUDES = +CFLAGS = -g -O -Wall + +OBJS = mod-extract.o @@ -29,10 +59,12 @@ + +clean: + -rm $(OBJS) $(ROOT) -diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/mod-extract.c linux-904/scripts/modsign/mod-extract.c ---- linux-903/scripts/modsign/mod-extract.c -+++ linux-904/scripts/modsign/mod-extract.c -@@ -0,0 +1,900 @@ +diff --git a/scripts/modsign/mod-extract.c b/scripts/modsign/mod-extract.c +new file mode 100644 +index 0000000..b7b5dd1 +--- /dev/null ++++ b/scripts/modsign/mod-extract.c +@@ -0,0 +1,890 @@ +/* mod-extract.c: module extractor for signing + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. @@ -141,7 +173,6 @@ + exit(2); +} + -+/*****************************************************************************/ +/* + * + */ @@ -230,10 +261,8 @@ + } + + return 0; ++} + -+} /* end main() */ -+ -+/*****************************************************************************/ +/* + * extract a RELA table + * - need to canonicalise the entries in case section addition/removal has @@ -301,10 +330,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf64_rela() */ -+ -+/*****************************************************************************/ +/* + * extract a REL table + * - need to canonicalise the entries in case section addition/removal has @@ -370,10 +397,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf64_rel() */ -+ -+/*****************************************************************************/ +/* + * extract the data from a 64-bit module + */ @@ -403,6 +428,8 @@ + + symbols = NULL; + strings = NULL; ++ nstrings = 0; ++ nsyms = 0; + + for (loop = 1; loop < shnum; loop++) { + const char *sh_name = secstrings + get32(§ions[loop].sh_name); @@ -578,10 +605,8 @@ + + verbose("%08lx (%lu bytes csum 0x%02x)\n", + ftell(outfd), ftell(outfd), xcsum); ++} + -+} /* end extract_elf64() */ -+ -+/*****************************************************************************/ +/* + * extract a RELA table + * - need to canonicalise the entries in case section addition/removal has @@ -649,10 +674,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf32_rela() */ -+ -+/*****************************************************************************/ +/* + * extract a REL table + * - need to canonicalise the entries in case section addition/removal has @@ -707,7 +730,7 @@ + /* canonicalise the section used by the symbol */ + if (st_shndx > SHN_UNDEF && st_shndx < nsects) + set16(&relocation.st_shndx, canonmap[st_shndx]); -+ ++ + write_out_val(relocation); + + /* undefined symbols must be named if referenced */ @@ -718,10 +741,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf32_rel() */ -+ -+/*****************************************************************************/ +/* + * extract the data from a 32-bit module + */ @@ -751,6 +772,8 @@ + + symbols = NULL; + strings = NULL; ++ nstrings = 0; ++ nsyms = 0; + + for (loop = 1; loop < shnum; loop++) { + const char *sh_name = secstrings + get32(§ions[loop].sh_name); @@ -931,12 +954,13 @@ + + verbose("%08lx (%lu bytes csum 0x%02x)\n", + ftell(outfd), ftell(outfd), xcsum); -+ -+} /* end extract_elf32() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/modsign.sh linux-904/scripts/modsign/modsign.sh ---- linux-903/scripts/modsign/modsign.sh -+++ linux-904/scripts/modsign/modsign.sh -@@ -0,0 +1,57 @@ ++} +diff --git a/scripts/modsign/modsign.sh b/scripts/modsign/modsign.sh +new file mode 100644 +index 0000000..5615f92 +--- /dev/null ++++ b/scripts/modsign/modsign.sh +@@ -0,0 +1,58 @@ +#!/bin/bash +############################################################################### +# @@ -980,6 +1004,7 @@ + +# strip out only the sections that we care about +scripts/modsign/mod-extract $verbose $module $module.out || exit $? ++# dd if=/dev/zero of=$module.out bs=1 count=1 # inject fault + +# sign the sections +gpg --no-greeting $KEYFLAGS -b $module.out || exit $? From fedora-cvs-commits at redhat.com Mon Jan 8 17:03:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 12:03:57 -0500 Subject: rpms/hal-cups-utils/FC-6 .cvsignore, 1.13, 1.14 hal-cups-utils.spec, 1.47, 1.48 sources, 1.13, 1.14 Message-ID: <200701081703.l08H3vIq011289@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hal-cups-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11242 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Mon Jan 8 2007 Tim Waugh 0.6.5-1 - Requires system-config-printer >= 0.7.46. - 0.6.5: - Set PPD page size before adding printer (bug #221841). - Resolves: rhbz#221841 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 4 Jan 2007 12:21:00 -0000 1.13 +++ .cvsignore 8 Jan 2007 17:03:55 -0000 1.14 @@ -1,3 +1,4 @@ hal-cups-utils-0.6.2.tar.gz hal-cups-utils-0.6.3.tar.gz hal-cups-utils-0.6.4.tar.gz +hal-cups-utils-0.6.5.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/hal-cups-utils.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- hal-cups-utils.spec 4 Jan 2007 12:21:00 -0000 1.47 +++ hal-cups-utils.spec 8 Jan 2007 17:03:55 -0000 1.48 @@ -1,6 +1,6 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} License: GPL Group: Applications/System @@ -17,7 +17,7 @@ Requires: hal >= 0.5.0 Requires: dbus >= 0.90 Requires: cups -Requires: system-config-printer-libs +Requires: system-config-printer-libs >= 0.7.46 %description Halified utilities for CUPS: @@ -59,6 +59,11 @@ %{_initrddir}/cups-config-daemon %changelog +* Mon Jan 8 2007 Tim Waugh 0.6.5-1 +- Requires system-config-printer >= 0.7.46. +- 0.6.5: + - Set PPD page size before adding printer (bug #221841). + * Thu Jan 4 2007 Tim Waugh 0.6.4-1 - 0.6.4: - Don't enable/disable existing printers. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-6/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 4 Jan 2007 12:21:00 -0000 1.13 +++ sources 8 Jan 2007 17:03:55 -0000 1.14 @@ -1 +1 @@ -23dc6ab715ea02b961a995a50a2f2655 hal-cups-utils-0.6.4.tar.gz +c6c136608761159f9d2cc682ee2b1e8d hal-cups-utils-0.6.5.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 8 17:09:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 12:09:01 -0500 Subject: rpms/hal-cups-utils/devel .cvsignore, 1.13, 1.14 hal-cups-utils.spec, 1.50, 1.51 sources, 1.13, 1.14 Message-ID: <200701081709.l08H91E1015368@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hal-cups-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15314 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Mon Jan 8 2007 Tim Waugh 0.6.5-1 - Requires system-config-printer >= 0.7.46. - 0.6.5: - Set PPD page size before adding printer (bug #221841). - Resolves: rhbz#221841 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 4 Jan 2007 12:22:12 -0000 1.13 +++ .cvsignore 8 Jan 2007 17:08:58 -0000 1.14 @@ -1,3 +1,4 @@ hal-cups-utils-0.6.2.tar.gz hal-cups-utils-0.6.3.tar.gz hal-cups-utils-0.6.4.tar.gz +hal-cups-utils-0.6.5.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- hal-cups-utils.spec 4 Jan 2007 12:22:12 -0000 1.50 +++ hal-cups-utils.spec 8 Jan 2007 17:08:58 -0000 1.51 @@ -1,6 +1,6 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.6.4 +Version: 0.6.5 Release: 1%{?dist} License: GPL Group: Applications/System @@ -17,7 +17,7 @@ Requires: hal >= 0.5.0 Requires: dbus >= 0.90 Requires: cups -Requires: system-config-printer-libs +Requires: system-config-printer-libs >= 0.7.46 %description Halified utilities for CUPS: @@ -59,6 +59,11 @@ %{_initrddir}/cups-config-daemon %changelog +* Mon Jan 8 2007 Tim Waugh 0.6.5-1 +- Requires system-config-printer >= 0.7.46. +- 0.6.5: + - Set PPD page size before adding printer (bug #221841). + * Thu Jan 4 2007 Tim Waugh 0.6.4-1 - 0.6.4: - Don't enable/disable existing printers. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 4 Jan 2007 12:22:12 -0000 1.13 +++ sources 8 Jan 2007 17:08:58 -0000 1.14 @@ -1 +1 @@ -23dc6ab715ea02b961a995a50a2f2655 hal-cups-utils-0.6.4.tar.gz +c6c136608761159f9d2cc682ee2b1e8d hal-cups-utils-0.6.5.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 8 17:18:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 12:18:55 -0500 Subject: rpms/udev/FC-6 modprobe, NONE, 1.1 udev-095-dbgwait.patch, NONE, 1.1 udev-095-libvolume.patch, NONE, 1.1 start_udev, 1.56, 1.57 udev-rules.patch, 1.26, 1.27 udev.spec, 1.192, 1.193 Message-ID: <200701081718.l08HItZD010986@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10911 Modified Files: start_udev udev-rules.patch udev.spec Added Files: modprobe udev-095-dbgwait.patch udev-095-libvolume.patch Log Message: update from RHEL --- NEW FILE modprobe --- #!/bin/sh if [ -f /dev/.modprobe_debug ]; then /sbin/modprobe -v -s $@ &>/dev/console else /sbin/modprobe $@ fi udev-095-dbgwait.patch: udev_utils_run.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) --- NEW FILE udev-095-dbgwait.patch --- --- udev-095/udev_utils_run.c.dbgwait 2006-07-04 12:34:55.000000000 +0200 +++ udev-095/udev_utils_run.c 2006-12-18 11:06:04.000000000 +0100 @@ -33,6 +33,8 @@ #include "udev.h" +#define WAIT_TIME 100 + extern char **environ; int pass_env_to_socket(const char *sockname, const char *devpath, const char *action) @@ -83,6 +85,8 @@ char *argv[(sizeof(arg) / 2) + 1]; int devnull; int i; + int waited = 0; + struct timeval timeout; /* build argv from comand */ strlcpy(arg, command, sizeof(arg)); @@ -175,6 +179,7 @@ if (errpipe[WRITE_END] > 0) close(errpipe[WRITE_END]); + waited = 0; /* read child output */ while (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) { int fdcount; @@ -185,7 +190,18 @@ FD_SET(outpipe[READ_END], &readfds); if (errpipe[READ_END] > 0) FD_SET(errpipe[READ_END], &readfds); - fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL); + + timeout.tv_sec = 0; + timeout.tv_usec = WAIT_TIME * 1000; + fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, &timeout); + + if (fdcount == 0) { + waited += WAIT_TIME; + if (waited % 1000 == 0) + info("Waiting %d seconds for output of '%s(%d)'", waited/1000, command, pid); + continue; + } + if (fdcount < 0) { if (errno == EINTR) continue; @@ -261,14 +277,24 @@ *reslen = respos; } } - waitpid(pid, &status, 0); - if (WIFEXITED(status)) { - info("'%s' returned with status %i", argv[0], WEXITSTATUS(status)); - if (WEXITSTATUS(status) != 0) + while(1) { + if (waitpid(pid, &status, WNOHANG) == 0) { + usleep(WAIT_TIME * 1000); + waited += WAIT_TIME; + if (waited % 1000 == 0) + info("Waiting %d seconds for '%s(%d)'", waited/1000, command, pid); + continue; + } + + if (WIFEXITED(status)) { + info("'%s' returned with status %i", argv[0], WEXITSTATUS(status)); + if (WEXITSTATUS(status) != 0) + retval = -1; + } else { + err("'%s' abnormal exit", argv[0]); retval = -1; - } else { - err("'%s' abnormal exit", argv[0]); - retval = -1; + } + break; } } udev-095-libvolume.patch: via_raid.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletion(-) --- NEW FILE udev-095-libvolume.patch --- From: Kay Sievers Date: Fri, 13 Oct 2006 11:17:13 +0000 (+0200) Subject: volume_id: add checksum check to via_raid X-Git-Tag: 103~4 X-Git-Url: http://www.kernel.org/git/?p=linux%2Fhotplug%2Fudev.git;a=commitdiff_plain;h=2658afdcf147afd384e27f0ac9019e27de7ba397 volume_id: add checksum check to via_raid --- diff --git a/extras/volume_id/lib/via_raid.c b/extras/volume_id/lib/via_raid.c index 42cb098..62c165e 100644 --- a/extras/volume_id/lib/via_raid.c +++ b/extras/volume_id/lib/via_raid.c @@ -3,6 +3,9 @@ * * Copyright (C) 2005 Kay Sievers * + * Based on information taken from dmraid: + * Copyright (C) 2004-2006 Heinz Mauelshagen, Red Hat GmbH + * * 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 version 2 of the License. @@ -30,7 +33,7 @@ struct via_meta { uint16_t signature; uint8_t version_number; struct via_array { - uint16_t disk_bits; + uint16_t disk_bit_mask; uint8_t disk_array_ex; uint32_t capacity_low; uint32_t capacity_high; @@ -42,6 +45,18 @@ struct via_meta { #define VIA_SIGNATURE 0xAA55 +/* 8 bit checksum on first 50 bytes of metadata. */ +static uint8_t meta_checksum(struct via_meta *via) +{ + uint8_t i = 50, sum = 0; + + while (i--) + sum += ((uint8_t*) via)[i]; + + return sum == via->checksum; +} + + int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size) { const uint8_t *buf; @@ -67,6 +82,9 @@ int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size) if (via->version_number > 1) return -1; + if (!meta_checksum(via)) + return -1; + volume_id_set_usage(id, VOLUME_ID_RAID); snprintf(id->type_version, sizeof(id->type_version)-1, "%u", via->version_number); id->type = "via_raid_member"; Index: start_udev =================================================================== RCS file: /cvs/dist/rpms/udev/FC-6/start_udev,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- start_udev 16 Aug 2006 15:27:55 -0000 1.56 +++ start_udev 8 Jan 2007 17:18:49 -0000 1.57 @@ -180,6 +180,11 @@ if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + if strstr "$cmdline" modprobedebug; then + touch /dev/.modprobe_debug + else + rm -f /dev/.modprobe_debug + fi /sbin/udevd -d ret=$[$ret + $?] if strstr "$cmdline" udevdebug; then udev-rules.patch: 05-udev-early.rules | 1 + 50-udev.rules | 44 +++++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 21 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/FC-6/udev-rules.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- udev-rules.patch 30 Nov 2006 07:43:56 -0000 1.26 +++ udev-rules.patch 8 Jan 2007 17:18:49 -0000 1.27 @@ -1,5 +1,15 @@ +--- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules 2006-07-04 12:34:55.000000000 +0200 ++++ udev-095/etc/udev/redhat/05-udev-early.rules 2006-12-18 10:46:05.000000000 +0100 +@@ -1,6 +1,7 @@ + # sysfs is populated after the event is sent + ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" + ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" ++ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" + + # ignore these events until someone needs them + SUBSYSTEM=="drivers", OPTIONS="ignore_device" --- udev-095/etc/udev/redhat/50-udev.rules.rhrules 2006-07-04 12:34:55.000000000 +0200 -+++ udev-095/etc/udev/redhat/50-udev.rules 2006-11-27 11:17:54.000000000 +0100 ++++ udev-095/etc/udev/redhat/50-udev.rules 2006-12-18 10:46:53.000000000 +0100 @@ -28,7 +28,8 @@ KERNEL=="ippp*", NAME="%k", MODE="0660" KERNEL=="isdn*", NAME="%k", MODE="0660" @@ -15,12 +25,21 @@ KERNEL=="rtc", MODE="0644" +# pnp devices -+ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id ; done < /sys/$devpath/id'" ++ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'" + # floppy devices KERNEL=="fd[01]*", GROUP="floppy", MODE="0660" # fix floppy devices -@@ -149,16 +153,14 @@ +@@ -99,6 +103,8 @@ + KERNEL=="usb/lp*", GROUP="lp", MODE="0660" + + # tape devices ++SUBSYSTEM=="ide", SYSFS{media}=="tape", ACTION=="add", \ ++ RUN+="modprobe $env{UDEV_MODPROBE_DBG} ide-scsi idescsi_nocd=1" + KERNEL=="ht*", GROUP="disk", MODE="0660" + KERNEL=="nht*", GROUP="disk", MODE="0660" + KERNEL=="pt[0-9]*", GROUP="disk", MODE="0660" +@@ -149,16 +155,14 @@ # s390 devices KERNEL=="z90crypt", MODE="0666" @@ -39,7 +58,7 @@ # alsa devices KERNEL=="controlC[0-9]*", NAME="snd/%k" -@@ -213,12 +215,9 @@ +@@ -213,12 +217,9 @@ KERNEL=="sr[0-9]*", SYMLINK+="cdrom cdrom-%k" KERNEL=="scd[0-9]*", SYMLINK+="cdrom cdrom-%k" KERNEL=="pcd[0-9]*", SYMLINK+="cdrom cdrom-%k" @@ -55,7 +74,7 @@ # Section for zaptel device KERNEL=="zapctl", NAME="zap/ctl" -@@ -229,8 +228,6 @@ +@@ -229,8 +230,6 @@ KERNEL=="pktcdvd", NAME="%k/control" @@ -64,7 +83,7 @@ KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \ SYSFS{device/media}=="floppy", \ SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions" -@@ -262,7 +259,7 @@ +@@ -262,7 +261,7 @@ SUBSYSTEM!="block", GOTO="persistent_end" # skip rules for inappropriate block devices @@ -73,22 +92,45 @@ # never access removable ide devices, the drivers are causing event loops on open() BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1", GOTO="persistent_end" -@@ -345,5 +342,8 @@ +@@ -312,7 +311,7 @@ + PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \ + NAME="%c", MODE="0644" + +-ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" ++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{UDEV_MODPROBE_DBG} $env{MODALIAS}" + + ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'" + +@@ -326,11 +325,11 @@ + RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'" + + +-ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="/sbin/modprobe sg" ++ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="modprobe sg" + ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \ +- RUN+="/sbin/modprobe sd_mod" ++ RUN+="modprobe sd_mod" + ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \ +- RUN+="/sbin/modprobe sr_mod" ++ RUN+="modprobe sr_mod" + + ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \ + SYMLINK+="scanner scanner-%k", MODE="0660" +@@ -339,11 +338,14 @@ + 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" ++ SYSFS{model}!="ADR*", RUN+="modprobe osst" + ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \ +- SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st" ++ SYSFS{model}=="ADR*", RUN+="modprobe st" ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \ - RUN+="/sbin/modprobe st" - -+# mmc block devices -+ACTION=="add", SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block" +- RUN+="/sbin/modprobe st" ++ RUN+="modprobe st" + - RUN+="socket:/org/kernel/udev/monitor" ++# mmc block devices ++ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block" ---- udev-095/etc/udev/redhat/05-udev-early.rules.rhrules 2006-07-04 12:34:55.000000000 +0200 -+++ udev-095/etc/udev/redhat/05-udev-early.rules 2006-11-20 11:22:57.000000000 +0100 -@@ -1,6 +1,7 @@ - # sysfs is populated after the event is sent - ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" - ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" -+ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" + RUN+="socket:/org/kernel/udev/monitor" - # ignore these events until someone needs them - SUBSYSTEM=="drivers", OPTIONS="ignore_device" Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/FC-6/udev.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- udev.spec 30 Nov 2006 07:43:56 -0000 1.192 +++ udev.spec 8 Jan 2007 17:18:49 -0000 1.193 @@ -3,7 +3,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 095 -Release: 15 +Release: 16%{dist} License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -12,6 +12,7 @@ Source1: start_udev Source2: udev.nodes +Source3: modprobe Source10: firmware_helper.c @@ -27,6 +28,8 @@ Patch11: udev-095-selinux.patch Patch12: udev-095-path_id.patch Patch13: udev-095-path_id2.patch +Patch14: udev-095-dbgwait.patch +Patch15: udev-095-libvolume.patch ExclusiveOS: Linux URL: http://kernel.org/pub/linux/utils/kernel/hotplug/ @@ -75,6 +78,8 @@ %patch11 -p1 -b .selinux %patch12 -p1 -b .pathid %patch13 -p1 -b .pathid2 +%patch14 -p1 -b .dbgwait +%patch15 -p1 -b .lv %build @@ -182,7 +187,6 @@ install -m 0755 udevd.static $RPM_BUILD_ROOT/sbin/udevd.static - %define udev_scriptdir /lib/udev mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices} @@ -191,14 +195,18 @@ install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir} done -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes - mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes +install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{udev_scriptdir}/modprobe + install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin #install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev +%ifarch s390 s390x +ln -s %{udev_scriptdir}/dasd_id $RPM_BUILD_ROOT/sbin/dasd_id +%endif mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware @@ -206,7 +214,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules </dev/null 2>&1 done EOF @@ -270,7 +278,9 @@ %attr(755,root,root) %{udev_scriptdir}/usb_id %attr(755,root,root) %{udev_scriptdir}/vol_id %attr(755,root,root) %{udev_scriptdir}/path_id +%attr(755,root,root) %{udev_scriptdir}/modprobe %ifarch s390 s390x +%attr(755,root,root) /sbin/dasd_id %attr(755,root,root) %{udev_scriptdir}/dasd_id %attr(0644,root,root) %{_mandir}/man8/dasd_id*.8* %endif @@ -330,10 +340,27 @@ %{_libdir}/pkgconfig/libvolume_id.pc %changelog -* Thu Nov 30 2006 Harald Hoyer - 095-15%{dist} +* Mon Dec 18 2006 Harald Hoyer - 095-14.5%{dist} +- added symlink to /sbin/dasd_id (#219181) +- added more debugging possibilities (#219621) +- Resolves: rhbz#219181, rhbz#219621 + +* Thu Dec 14 2006 Harald Hoyer - 095-14.4%{dist} +- fixed typo +- Resolves: rhbz#219113 + +* Fri Dec 8 2006 Harald Hoyer - 095-14.3%{dist} +- load ide-scsi module for tape devices (#207248,#219113) +- Resolves: rhbz#219113 + +* Mon Nov 27 2006 Harald Hoyer - 095-14.2%{dist} - PnP rule added (rhbz#216515) +- Resolves: rhbz#216515 + +* Mon Nov 20 2006 Harald Hoyer - 095-14.1%{dist} - Do not ignore dm devices completly (rhbz#204157, rhbz#214639) - Remove tty devices from udev.nodes (rhbz#209204) +- Resolves: rhbz#204157, rhbz#214639, rhbz#209204 * Wed Oct 11 2006 Harald Hoyer - 095-14 - skip persistent block for gnbd devices (bug #210227) From fedora-cvs-commits at redhat.com Mon Jan 8 17:50:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 12:50:47 -0500 Subject: rpms/xterm/FC-6 xterm-222-can-2003-0063.patch, NONE, 1.1 xterm-222-man-page_paths.patch, NONE, 1.1 xterm-223-redhat-resources.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xterm.spec, 1.48, 1.49 xterm-179-ppc-fix-bug-101472.patch, 1.1, NONE xterm-206-appsdir.patch, 1.1, NONE xterm-207-eightBitInput_false.patch, 1.2, NONE xterm-207-freetype.patch, 1.3, NONE xterm-208-redhat-resources.patch, 1.1, NONE xterm-208-root-grab-console.patch, 1.1, NONE xterm-209-bz182382.patch, 1.1, NONE xterm-209-bz183993.patch, 1.1, NONE xterm-209-redhat-resources.patch, 1.1, NONE xterm-211-bz186094.patch, 1.1, NONE xterm-211-bz186935.patch, 1.2, NONE xterm-212-bz186935.patch, 1.1, NONE xterm-212-man-page_paths.patch, 1.1, NONE xterm-212-redhat-resources.patch, 1.1, NONE xterm-213-bz189161.patch, 1.1, NONE xterm-215-tcsegfault.patch, 1.1, NONE xterm-can-2003-0063.patch, 1.1, NONE xterm-resources-redhat.patch, 1.7, NONE xterm-tty-group-name.patch, 1.1, NONE Message-ID: <200701081750.l08HolAJ005182@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/xterm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5083 Modified Files: .cvsignore sources xterm.spec Added Files: xterm-222-can-2003-0063.patch xterm-222-man-page_paths.patch xterm-223-redhat-resources.patch Removed Files: xterm-179-ppc-fix-bug-101472.patch xterm-206-appsdir.patch xterm-207-eightBitInput_false.patch xterm-207-freetype.patch xterm-208-redhat-resources.patch xterm-208-root-grab-console.patch xterm-209-bz182382.patch xterm-209-bz183993.patch xterm-209-redhat-resources.patch xterm-211-bz186094.patch xterm-211-bz186935.patch xterm-212-bz186935.patch xterm-212-man-page_paths.patch xterm-212-redhat-resources.patch xterm-213-bz189161.patch xterm-215-tcsegfault.patch xterm-can-2003-0063.patch xterm-resources-redhat.patch xterm-tty-group-name.patch Log Message: - update to 223 - use correct tty group (#219048) - spec cleanup Resolves: #219048 xterm-222-can-2003-0063.patch: charproc.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE xterm-222-can-2003-0063.patch --- --- xterm-222/charproc.c.can-2003-0063 2006-09-28 02:06:28.000000000 +0200 +++ xterm-222/charproc.c 2006-11-22 18:38:28.000000000 +0100 @@ -4587,8 +4587,13 @@ break; case 21: /* Report the window's title */ +/* This code block is disabled to fix a security issue reported + * in CAN-2003-0063 + */ +#if 0 report_win_label(xw, 'l', &text, XGetWMName(screen->display, VShellWindow, &text)); +#endif break; default: /* DECSLPP (24, 25, 36, 48, 72, 144) */ xterm-222-man-page_paths.patch: minstall.sh | 6 ++++++ xterm.man | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) --- NEW FILE xterm-222-man-page_paths.patch --- --- xterm-222/xterm.man.man-page_paths 2006-08-11 03:01:11.000000000 +0200 +++ xterm-222/xterm.man 2006-11-23 10:22:28.000000000 +0100 @@ -677,7 +677,7 @@ .RE .IP Finally, \fB-ls\fP is not completely ignored, -because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry +because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry (if configured to do so), whereas \fIxterm\ -e\fP does not. .TP 8 @@ -1458,17 +1458,17 @@ The font server claims to provide the bold font that \fIxterm\fP requests, but the result is not always readable. XFree86 provides a feature which can be used to suppress the scaling. -In the X server's configuration file (e.g., "/etc/X11/XFree86"), you +In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you can add ":unscaled" to the end of the directory specification for the "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP. For example .RS - FontPath "/usr/lib/X11/fonts/misc/" + FontPath "__fontpath__" .RE .IP would become .RS - FontPath "/usr/lib/X11/fonts/misc/:unscaled" + FontPath "__fontpath__/misc/:unscaled" .RE .IP Depending on your configuration, the font server may have its own configuration @@ -4368,10 +4368,10 @@ .SH FILES The actual pathnames given may differ on your system. .TP 5 -\fI/etc/utmp\fP +\fI/var/run/utmp\fP the system logfile, which records user logins. .TP 5 -\fI/etc/wtmp\fP +\fI/var/log/wtmp\fP the system logfile, which records user logins and logouts. .TP 5 .I __apploaddir__/XTerm --- xterm-222/minstall.sh.man-page_paths 2006-04-10 02:34:37.000000000 +0200 +++ xterm-222/minstall.sh 2006-11-23 10:23:39.000000000 +0100 @@ -16,6 +16,9 @@ END_FILE="$3" APPS_DIR="$4" +fontpath=/usr/share/X11/fonts +xorgcfgdir=/etc/X11 +xorgcfgfil=xorg.conf suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'` NEW_FILE=temp$$ @@ -23,6 +26,9 @@ -e s%__apploaddir__%$APPS_DIR% \ -e s%__mansuffix__%$suffix%g \ -e s%__miscmansuffix__%$suffix%g \ + -e s%__fontpath__%$fontpath%g \ + -e s%__xorgcfgdir__%$xorgcfgdir%g \ + -e s%__xorgcfgfil__%$xorgcfgfil%g \ $OLD_FILE >$NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" xterm-223-redhat-resources.patch: XTerm.ad | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE xterm-223-redhat-resources.patch --- --- xterm-223/XTerm.ad.redhat-resources 2006-06-24 16:34:45.000000000 +0200 +++ xterm-223/XTerm.ad 2007-01-08 18:13:38.000000000 +0100 @@ -186,3 +186,10 @@ ! ! Alternatively, !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ + +! Red Hat Defaults: +*VT100*eightBitInput: 0 +*VT100*backarrowKey: 0 +*VT100*scrollBar: 1 +*VT100*utf8Title: 1 +*VT100*modifyFunctionKeys: 0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-6/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 17 Jul 2006 22:19:56 -0000 1.15 +++ .cvsignore 8 Jan 2007 17:50:45 -0000 1.16 @@ -1,15 +1,2 @@ -xterm-192.tgz -xterm-200.tgz -xterm-205.tgz -xterm-205.tgz.asc -xterm-206.tgz -xterm-207.tgz -ctlseqs.txt.gz -UnicodeData-Latest.txt.gz 16colors.txt -xterm-208.tgz -xterm-209.tgz -xterm-211.tgz -xterm-212.tgz -xterm-213.tgz -xterm-215.tgz +xterm-223.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 17 Jul 2006 22:19:56 -0000 1.15 +++ sources 8 Jan 2007 17:50:45 -0000 1.16 @@ -1,3 +1,2 @@ -92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt -8c2a45d4ca754b2cb019242e26f657eb xterm-215.tgz +bf5bb77496ddf95df32b8e752a6cabb0 xterm-223.tgz Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-6/xterm.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- xterm.spec 4 Sep 2006 12:26:16 -0000 1.48 +++ xterm.spec 8 Jan 2007 17:50:45 -0000 1.49 @@ -1,66 +1,25 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 215 -Release: 3%{?dist} +Version: 223 +Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: imake pkgconfig libtermcap-devel libutempter-devel +BuildRequires: libXft-devel libXaw-devel libXext-devel Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz -#Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz -# ^- now shipped in upstream source tarball -Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz -Source3: ftp://invisible-island.net/xterm/16colors.txt - -Patch0: xterm-can-2003-0063.patch -Patch1: xterm-resources-redhat.patch -Patch2: xterm-179-ppc-fix-bug-101472.patch -Patch3: xterm-tty-group-name.patch -Patch4: xterm-206-appsdir.patch -Patch5: xterm-207-freetype.patch -Patch6: xterm-207-eightBitInput_false.patch -Patch7: xterm-209-redhat-resources.patch -Patch8: xterm-208-root-grab-console.patch -Patch9: xterm-209-bz182382.patch -Patch10: xterm-209-bz183993.patch -Patch11: xterm-211-bz186094.patch -Patch12: xterm-212-bz186935.patch -Patch13: xterm-212-redhat-resources.patch -Patch14: xterm-212-man-page_paths.patch -Patch15: xterm-213-bz189161.patch -Patch16: xterm-215-tcsegfault.patch - -BuildRequires: pkgconfig -BuildRequires: libXft-devel -BuildRequires: freetype-devel -BuildRequires: libXrender-devel -BuildRequires: libXaw-devel -BuildRequires: libXmu-devel -BuildRequires: libXext-devel -BuildRequires: libXt-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libX11-devel -BuildRequires: libXpm-devel -BuildRequires: libtermcap-devel -BuildRequires: fontconfig-devel -BuildRequires: expat-devel -BuildRequires: zlib-devel -BuildRequires: libtermcap-devel -BuildRequires: libutempter-devel +Source1: ftp://invisible-island.net/xterm/16colors.txt + +Patch1: xterm-223-redhat-resources.patch +Patch2: xterm-222-can-2003-0063.patch +Patch3: xterm-222-man-page_paths.patch -%{?!DEBUGINFO: %define DEBUGINFO 1} %{?!enable_trace: %define enable_trace 0} -%if !%{DEBUGINFO} -%define debug_package %{nil} -%endif %define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt) -%{?!_with_256_color: %define _with_256_color 1} -%{?!_with_tek4014: %define _with_tek4014 1} - %description The xterm program is a terminal emulator for the X Window System. It provides DEC VT102 and Tektronix 4014 compatible terminals for @@ -68,78 +27,38 @@ %prep %setup -q -# The xterm source code used to decompress with all of the files read-only, -# but appears to be fixed now -#chmod -R u+w . -%patch0 -p0 -b .can-2003-0063 -#%patch1 -p1 -b .resources-redhat -%patch3 -p1 -b .tty-group-name -%patch4 -p1 -b .appsdir -#%patch5 -p1 -b .freetype -#^- now fixed upstream in 208 -#%patch6 -p1 -b .eightBitInput_false -#%patch7 -p1 -b .redhat-resources -# ^- patch now in patch13 -%patch8 -p1 -b .root-grab-console -#%patch9 -p1 -b .bz182382 -# ^- patch now upstream -#%patch10 -p1 -b .bz183993 -# ^- patch now upstream -#%patch11 -p1 -b .bz186094 -# ^- patch now in redhat-resources -#%patch12 -p1 -b .bz186935 -# ^- patch now upstream -%patch13 -p1 -b .redhat-resources -%patch14 -p1 -b .man-page_paths -%patch15 -p1 -b .bz189161 -%patch16 -p1 -b .tcsegfault + +%patch1 -p1 -b .redhat-resources +%patch2 -p1 -b .can-2003-0063 +%patch3 -p1 -b .man-page_paths %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 \ - --with-utempter \ - --enable-narrowproto \ - --with-app-defaults=%{x11_app_defaults_dir} \ -%if !%{_with_tek4014} - --disable-tek4014 \ -%endif -%if %{_with_256_color} - --enable-256-color \ -%endif +%configure \ + --enable-256-color \ + --enable-luit \ %if %{enable_trace} - --enable-trace \ + --enable-trace \ %endif -; -export XTERM_TTY_GROUP_NAME=tty; -make + --enable-warnings \ + --enable-wide-chars \ + --with-app-defaults=%{x11_app_defaults_dir} \ + --with-utempter \ + --with-tty-group=tty + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ -#gunzip < %SOURCE1 > ctlseqs.txt -# ^- now shipped in upstream tarball -gunzip < %SOURCE2 > UnicodeData.txt -cp -fp %SOURCE3 16colors.txt -%if !%{DEBUGINFO} -/usr/lib/rpm/brp-compress -exit 0 -%endif +make DESTDIR=$RPM_BUILD_ROOT install + +cp -fp %{SOURCE1} 16colors.txt %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n +%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n %{_bindir}/resize %{_bindir}/uxterm %{_bindir}/xterm @@ -150,6 +69,11 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Mon Jan 08 2007 Miroslav Lichvar 223-1.fc6 +- update to 223 +- use correct tty group (#219048) +- spec cleanup + * Mon Sep 04 2006 Miroslav Lichvar 215-3.fc6 - fix segfault when /etc/termcap is missing (#201246) --- xterm-179-ppc-fix-bug-101472.patch DELETED --- --- xterm-206-appsdir.patch DELETED --- --- xterm-207-eightBitInput_false.patch DELETED --- --- xterm-207-freetype.patch DELETED --- --- xterm-208-redhat-resources.patch DELETED --- --- xterm-208-root-grab-console.patch DELETED --- --- xterm-209-bz182382.patch DELETED --- --- xterm-209-bz183993.patch DELETED --- --- xterm-209-redhat-resources.patch DELETED --- --- xterm-211-bz186094.patch DELETED --- --- xterm-211-bz186935.patch DELETED --- --- xterm-212-bz186935.patch DELETED --- --- xterm-212-man-page_paths.patch DELETED --- --- xterm-212-redhat-resources.patch DELETED --- --- xterm-213-bz189161.patch DELETED --- --- xterm-215-tcsegfault.patch DELETED --- --- xterm-can-2003-0063.patch DELETED --- --- xterm-resources-redhat.patch DELETED --- --- xterm-tty-group-name.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 17:55:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 12:55:55 -0500 Subject: rpms/xterm/FC-5 xterm-222-can-2003-0063.patch, NONE, 1.1 xterm-222-man-page_paths.patch, NONE, 1.1 xterm-223-redhat-resources.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xterm.spec, 1.44, 1.45 xterm-179-ppc-fix-bug-101472.patch, 1.1, NONE xterm-206-appsdir.patch, 1.1, NONE xterm-207-eightBitInput_false.patch, 1.2, NONE xterm-207-freetype.patch, 1.3, NONE xterm-208-redhat-resources.patch, 1.1, NONE xterm-208-root-grab-console.patch, 1.1, NONE xterm-209-bz182382.patch, 1.1, NONE xterm-209-bz183993.patch, 1.1, NONE xterm-209-redhat-resources.patch, 1.1, NONE xterm-211-bz186094.patch, 1.1, NONE xterm-211-bz186935.patch, 1.1, NONE xterm-212-bz186935.patch, 1.1, NONE xterm-212-man-page_paths.patch, 1.1, NONE xterm-212-redhat-resources.patch, 1.1, NONE xterm-213-bz189161.patch, 1.1, NONE xterm-213-tcsegfault.patch, 1.1, NONE xterm-can-2003-0063.patch, 1.1, NONE xterm-resources-redhat.patch, 1.7, NONE xterm-tty-group-name.patch, 1.1, NONE Message-ID: <200701081755.l08Httq7005445@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/xterm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5408 Modified Files: .cvsignore sources xterm.spec Added Files: xterm-222-can-2003-0063.patch xterm-222-man-page_paths.patch xterm-223-redhat-resources.patch Removed Files: xterm-179-ppc-fix-bug-101472.patch xterm-206-appsdir.patch xterm-207-eightBitInput_false.patch xterm-207-freetype.patch xterm-208-redhat-resources.patch xterm-208-root-grab-console.patch xterm-209-bz182382.patch xterm-209-bz183993.patch xterm-209-redhat-resources.patch xterm-211-bz186094.patch xterm-211-bz186935.patch xterm-212-bz186935.patch xterm-212-man-page_paths.patch xterm-212-redhat-resources.patch xterm-213-bz189161.patch xterm-213-tcsegfault.patch xterm-can-2003-0063.patch xterm-resources-redhat.patch xterm-tty-group-name.patch Log Message: - update to 223 - use correct tty group (#219048) - spec cleanup Resolves: #219048 xterm-222-can-2003-0063.patch: charproc.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE xterm-222-can-2003-0063.patch --- --- xterm-222/charproc.c.can-2003-0063 2006-09-28 02:06:28.000000000 +0200 +++ xterm-222/charproc.c 2006-11-22 18:38:28.000000000 +0100 @@ -4587,8 +4587,13 @@ break; case 21: /* Report the window's title */ +/* This code block is disabled to fix a security issue reported + * in CAN-2003-0063 + */ +#if 0 report_win_label(xw, 'l', &text, XGetWMName(screen->display, VShellWindow, &text)); +#endif break; default: /* DECSLPP (24, 25, 36, 48, 72, 144) */ xterm-222-man-page_paths.patch: minstall.sh | 6 ++++++ xterm.man | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) --- NEW FILE xterm-222-man-page_paths.patch --- --- xterm-222/xterm.man.man-page_paths 2006-08-11 03:01:11.000000000 +0200 +++ xterm-222/xterm.man 2006-11-23 10:22:28.000000000 +0100 @@ -677,7 +677,7 @@ .RE .IP Finally, \fB-ls\fP is not completely ignored, -because \fIxterm\ -ls\ -e\fP does write a \fI/etc/wtmp\fP entry +because \fIxterm\ -ls\ -e\fP does write a \fI/var/log/wtmp\fP entry (if configured to do so), whereas \fIxterm\ -e\fP does not. .TP 8 @@ -1458,17 +1458,17 @@ The font server claims to provide the bold font that \fIxterm\fP requests, but the result is not always readable. XFree86 provides a feature which can be used to suppress the scaling. -In the X server's configuration file (e.g., "/etc/X11/XFree86"), you +In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you can add ":unscaled" to the end of the directory specification for the "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP. For example .RS - FontPath "/usr/lib/X11/fonts/misc/" + FontPath "__fontpath__" .RE .IP would become .RS - FontPath "/usr/lib/X11/fonts/misc/:unscaled" + FontPath "__fontpath__/misc/:unscaled" .RE .IP Depending on your configuration, the font server may have its own configuration @@ -4368,10 +4368,10 @@ .SH FILES The actual pathnames given may differ on your system. .TP 5 -\fI/etc/utmp\fP +\fI/var/run/utmp\fP the system logfile, which records user logins. .TP 5 -\fI/etc/wtmp\fP +\fI/var/log/wtmp\fP the system logfile, which records user logins and logouts. .TP 5 .I __apploaddir__/XTerm --- xterm-222/minstall.sh.man-page_paths 2006-04-10 02:34:37.000000000 +0200 +++ xterm-222/minstall.sh 2006-11-23 10:23:39.000000000 +0100 @@ -16,6 +16,9 @@ END_FILE="$3" APPS_DIR="$4" +fontpath=/usr/share/X11/fonts +xorgcfgdir=/etc/X11 +xorgcfgfil=xorg.conf suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'` NEW_FILE=temp$$ @@ -23,6 +26,9 @@ -e s%__apploaddir__%$APPS_DIR% \ -e s%__mansuffix__%$suffix%g \ -e s%__miscmansuffix__%$suffix%g \ + -e s%__fontpath__%$fontpath%g \ + -e s%__xorgcfgdir__%$xorgcfgdir%g \ + -e s%__xorgcfgfil__%$xorgcfgfil%g \ $OLD_FILE >$NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" xterm-223-redhat-resources.patch: XTerm.ad | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE xterm-223-redhat-resources.patch --- --- xterm-223/XTerm.ad.redhat-resources 2006-06-24 16:34:45.000000000 +0200 +++ xterm-223/XTerm.ad 2007-01-08 18:13:38.000000000 +0100 @@ -186,3 +186,10 @@ ! ! Alternatively, !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ + +! Red Hat Defaults: +*VT100*eightBitInput: 0 +*VT100*backarrowKey: 0 +*VT100*scrollBar: 1 +*VT100*utf8Title: 1 +*VT100*modifyFunctionKeys: 0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 31 May 2006 22:20:19 -0000 1.14 +++ .cvsignore 8 Jan 2007 17:55:48 -0000 1.15 @@ -1,14 +1,2 @@ -xterm-192.tgz -xterm-200.tgz -xterm-205.tgz -xterm-205.tgz.asc -xterm-206.tgz -xterm-207.tgz -ctlseqs.txt.gz -UnicodeData-Latest.txt.gz 16colors.txt -xterm-208.tgz -xterm-209.tgz -xterm-211.tgz -xterm-212.tgz -xterm-213.tgz +xterm-223.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 31 May 2006 22:20:19 -0000 1.14 +++ sources 8 Jan 2007 17:55:48 -0000 1.15 @@ -1,4 +1,2 @@ -0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz -92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt -20827d968ed7406d01b2125a84b7a2cd xterm-213.tgz +bf5bb77496ddf95df32b8e752a6cabb0 xterm-223.tgz Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/xterm.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- xterm.spec 23 Nov 2006 13:36:20 -0000 1.44 +++ xterm.spec 8 Jan 2007 17:55:48 -0000 1.45 @@ -1,59 +1,24 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 213 -Release: 2%{?dist} +Version: 223 +Release: 1%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: imake libtermcap-devel utempter +BuildRequires: libXft-devel libXaw-devel libXext-devel libXt-devel + Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz -Source1: ftp://invisible-island.net/xterm/ctlseqs.txt.gz -Source2: ftp://invisible-island.net/xterm/UnicodeData-Latest.txt.gz -Source3: ftp://invisible-island.net/xterm/16colors.txt -Patch0: xterm-can-2003-0063.patch -Patch1: xterm-resources-redhat.patch -Patch2: xterm-179-ppc-fix-bug-101472.patch -Patch3: xterm-tty-group-name.patch -Patch4: xterm-206-appsdir.patch -Patch5: xterm-207-freetype.patch -Patch6: xterm-207-eightBitInput_false.patch -Patch7: xterm-209-redhat-resources.patch -Patch8: xterm-208-root-grab-console.patch -Patch9: xterm-209-bz182382.patch -Patch10: xterm-209-bz183993.patch -Patch11: xterm-211-bz186094.patch -Patch12: xterm-212-bz186935.patch -Patch13: xterm-212-redhat-resources.patch -Patch14: xterm-212-man-page_paths.patch -Patch15: xterm-213-bz189161.patch -Patch16: xterm-213-tcsegfault.patch -BuildRequires: libXft-devel -BuildRequires: freetype-devel -BuildRequires: libXrender-devel -BuildRequires: libXaw-devel -BuildRequires: libXmu-devel -BuildRequires: libXext-devel -BuildRequires: libXt-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libX11-devel -BuildRequires: libXpm-devel -BuildRequires: libtermcap-devel -BuildRequires: fontconfig-devel -BuildRequires: expat-devel -BuildRequires: zlib-devel -BuildRequires: libtermcap-devel -BuildRequires: utempter +Source1: ftp://invisible-island.net/xterm/16colors.txt + +Patch1: xterm-223-redhat-resources.patch +Patch2: xterm-222-can-2003-0063.patch +Patch3: xterm-222-man-page_paths.patch -%{?!DEBUGINFO: %define DEBUGINFO 1} %{?!enable_trace: %define enable_trace 0} -%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} %description The xterm program is a terminal emulator for the X Window System. It @@ -62,75 +27,38 @@ %prep %setup -q -# The xterm source code used to decompress with all of the files read-only, -# but appears to be fixed now -#chmod -R u+w . -%patch0 -p0 -b .can-2003-0063 -#%patch1 -p1 -b .resources-redhat -%patch3 -p1 -b .tty-group-name -%patch4 -p1 -b .appsdir -#%patch5 -p1 -b .freetype -#^- now fixed upstream in 208 -#%patch6 -p1 -b .eightBitInput_false -#%patch7 -p1 -b .redhat-resources -# ^- patch now in patch13 -%patch8 -p1 -b .root-grab-console -#%patch9 -p1 -b .bz182382 -# ^- patch now upstream -#%patch10 -p1 -b .bz183993 -# ^- patch now upstream -#%patch11 -p1 -b .bz186094 -# ^- patch now in redhat-resources -%patch12 -p1 -b .bz186935 -%patch13 -p1 -b .redhat-resources -%patch14 -p1 -b .man-page_paths -%patch15 -p1 -b .bz189161 -%patch16 -p1 -b .tcsegfault + +%patch1 -p1 -b .redhat-resources +%patch2 -p1 -b .can-2003-0063 +%patch3 -p1 -b .man-page_paths %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 \ - --with-utempter \ - --enable-narrowproto \ - --with-app-defaults=%{x11_app_defaults_dir} \ -%if !%{_with_tek4014} - --disable-tek4014 \ -%endif -%if %{_with_256_color} - --enable-256-color \ -%endif +%configure \ + --enable-256-color \ + --enable-luit \ %if %{enable_trace} - --enable-trace \ + --enable-trace \ %endif -; -export XTERM_TTY_GROUP_NAME=tty; -make + --enable-warnings \ + --enable-wide-chars \ + --with-app-defaults=%{x11_app_defaults_dir} \ + --with-utempter \ + --with-tty-group=tty + +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall appsdir=$RPM_BUILD_ROOT/%{x11_app_defaults_dir} apploaddir=%{x11_app_defaults_dir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -mv $RPM_BUILD_ROOT/%{_mandir}/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ -gunzip < %SOURCE1 > ctlseqs.txt -gunzip < %SOURCE2 > UnicodeData.txt -cp -fp %SOURCE3 16colors.txt -%if !%{DEBUGINFO} -/usr/lib/rpm/brp-compress -exit 0 -%endif +make DESTDIR=$RPM_BUILD_ROOT install + +cp -fp %{SOURCE1} 16colors.txt %clean -#rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n %{_bindir}/resize %{_bindir}/uxterm %{_bindir}/xterm @@ -139,9 +67,13 @@ %{x11_app_defaults_dir}/UXTerm %{x11_app_defaults_dir}/XTerm %{x11_app_defaults_dir}/XTerm-color -%doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Mon Jan 08 2007 Miroslav Lichvar - 223-1.fc5 +- update to 223 +- use correct tty group (#219048) +- spec cleanup + * Thu Nov 23 2006 Miroslav Lichvar - 213-2.fc5 - fix segfault when /etc/termcap is missing (#201246) --- xterm-179-ppc-fix-bug-101472.patch DELETED --- --- xterm-206-appsdir.patch DELETED --- --- xterm-207-eightBitInput_false.patch DELETED --- --- xterm-207-freetype.patch DELETED --- --- xterm-208-redhat-resources.patch DELETED --- --- xterm-208-root-grab-console.patch DELETED --- --- xterm-209-bz182382.patch DELETED --- --- xterm-209-bz183993.patch DELETED --- --- xterm-209-redhat-resources.patch DELETED --- --- xterm-211-bz186094.patch DELETED --- --- xterm-211-bz186935.patch DELETED --- --- xterm-212-bz186935.patch DELETED --- --- xterm-212-man-page_paths.patch DELETED --- --- xterm-212-redhat-resources.patch DELETED --- --- xterm-213-bz189161.patch DELETED --- --- xterm-213-tcsegfault.patch DELETED --- --- xterm-can-2003-0063.patch DELETED --- --- xterm-resources-redhat.patch DELETED --- --- xterm-tty-group-name.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 18:26:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 13:26:35 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2906,1.2907 Message-ID: <200701081826.l08IQZGn026334@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26320 Modified Files: kernel-2.6.spec Log Message: maybe this works Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2906 retrieving revision 1.2907 diff -u -r1.2906 -r1.2907 --- kernel-2.6.spec 8 Jan 2007 01:41:21 -0000 1.2906 +++ kernel-2.6.spec 8 Jan 2007 18:26:33 -0000 1.2907 @@ -1072,7 +1072,8 @@ rm -f kernel-%{kversion}-*kdump*.config %endif -%if ! 0%{?debugbuildsenabled} +%if 0%{?debugbuildsenabled} +%else rm -f kernel-%kversion}-*-debug.config %endif From fedora-cvs-commits at redhat.com Mon Jan 8 18:33:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 13:33:46 -0500 Subject: rpms/yum/FC-6 .cvsignore, 1.47, 1.48 sources, 1.49, 1.50 yum.spec, 1.138, 1.139 Message-ID: <200701081833.l08IXk5v009359@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/yum/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9319 Modified Files: .cvsignore sources yum.spec Log Message: * Mon Jan 8 2007 Jeremy Katz - 3.0.3-1 - update to 3.0.3 (#221622, #221470, #220953) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/yum/FC-6/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 3 Jan 2007 19:19:31 -0000 1.47 +++ .cvsignore 8 Jan 2007 18:33:44 -0000 1.48 @@ -1 +1 @@ -yum-3.0.2.tar.gz +yum-3.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/yum/FC-6/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 3 Jan 2007 19:19:31 -0000 1.49 +++ sources 8 Jan 2007 18:33:44 -0000 1.50 @@ -1 +1 @@ -0c8c9491f3eee587efbd6151c3f8ac1e yum-3.0.2.tar.gz +d641d9289b812fc21a4197cb3f53aa85 yum-3.0.3.tar.gz Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/FC-6/yum.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- yum.spec 3 Jan 2007 19:19:31 -0000 1.138 +++ yum.spec 8 Jan 2007 18:33:44 -0000 1.139 @@ -2,7 +2,7 @@ Summary: RPM installer/updater Name: yum -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -114,6 +114,9 @@ %changelog +* Mon Jan 8 2007 Jeremy Katz - 3.0.3-1 +- update to 3.0.3 (#221622, #221470, #220953) + * Wed Jan 3 2007 Jeremy Katz - 3.0.2-1 - update to 3.0.2 with lots of fixes From fedora-cvs-commits at redhat.com Mon Jan 8 18:38:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 13:38:22 -0500 Subject: rpms/yum-metadata-parser/devel yum-metadata-parser.spec, 1.7, 1.8 yum-metadata-parser-1.0-files.patch, 1.1, NONE yum-metadata-parser-1.0-locationbase.patch, 1.1, NONE yum-metadata-parser-1.0-sqlite3.patch, 1.1, NONE Message-ID: <200701081838.l08IcMgf012824@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/yum-metadata-parser/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12782 Modified Files: yum-metadata-parser.spec Removed Files: yum-metadata-parser-1.0-files.patch yum-metadata-parser-1.0-locationbase.patch yum-metadata-parser-1.0-sqlite3.patch Log Message: * Mon Jan 8 2007 Jeremy Katz - 1.0.3-1 - update to 1.0.3 Index: yum-metadata-parser.spec =================================================================== RCS file: /cvs/dist/rpms/yum-metadata-parser/devel/yum-metadata-parser.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- yum-metadata-parser.spec 6 Dec 2006 21:54:54 -0000 1.7 +++ yum-metadata-parser.spec 8 Jan 2007 18:38:20 -0000 1.8 @@ -2,13 +2,10 @@ Summary: A fast metadata parser for yum Name: yum-metadata-parser -Version: 1.0 -Release: 9%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz Patch0: yum-metadata-parser-1.0-quiet.patch -Patch1: yum-metadata-parser-1.0-files.patch -Patch2: yum-metadata-parser-1.0-locationbase.patch -Patch3: yum-metadata-parser-1.0-sqlite3.patch License: GPL Group: Development/Libraries URL: http://linux.duke.edu/projects/yum/ @@ -26,9 +23,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__python} setup.py build @@ -48,6 +42,9 @@ %{python_sitelib_platform}/sqlitecachec.pyo %changelog +* Mon Jan 8 2007 Jeremy Katz - 1.0.3-1 +- update to 1.0.3 + * Wed Dec 6 2006 Jeremy Katz - 1.0-9 - rebuild for python 2.5, support new sqlite --- yum-metadata-parser-1.0-files.patch DELETED --- --- yum-metadata-parser-1.0-locationbase.patch DELETED --- --- yum-metadata-parser-1.0-sqlite3.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 18:39:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 13:39:38 -0500 Subject: rpms/yum-metadata-parser/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200701081839.l08Idcjb013881@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/yum-metadata-parser/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13837 Modified Files: .cvsignore sources Log Message: actually commit the new tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/yum-metadata-parser/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Jun 2006 22:14:05 -0000 1.2 +++ .cvsignore 8 Jan 2007 18:39:36 -0000 1.3 @@ -1 +1 @@ -yum-metadata-parser-1.0.tar.gz +yum-metadata-parser-1.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/yum-metadata-parser/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2006 22:14:05 -0000 1.2 +++ sources 8 Jan 2007 18:39:36 -0000 1.3 @@ -1 +1 @@ -a89bde1d52f9d97427ae4b05c0426d12 yum-metadata-parser-1.0.tar.gz +8cc782b0a6fbca137b133fe6294ce000 yum-metadata-parser-1.0.3.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 8 18:40:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 13:40:40 -0500 Subject: rpms/yum-metadata-parser/FC-6 sources, 1.2, 1.3 yum-metadata-parser.spec, 1.6, 1.7 yum-metadata-parser-1.0-files.patch, 1.1, NONE yum-metadata-parser-1.0-locationbase.patch, 1.1, NONE Message-ID: <200701081840.l08Ieend014767@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/yum-metadata-parser/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14712 Modified Files: sources yum-metadata-parser.spec Removed Files: yum-metadata-parser-1.0-files.patch yum-metadata-parser-1.0-locationbase.patch Log Message: * Mon Jan 8 2007 Jeremy Katz - 1.0.3-1 - update to 1.0.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/yum-metadata-parser/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Jun 2006 22:14:05 -0000 1.2 +++ sources 8 Jan 2007 18:40:38 -0000 1.3 @@ -1 +1 @@ -a89bde1d52f9d97427ae4b05c0426d12 yum-metadata-parser-1.0.tar.gz +8cc782b0a6fbca137b133fe6294ce000 yum-metadata-parser-1.0.3.tar.gz Index: yum-metadata-parser.spec =================================================================== RCS file: /cvs/dist/rpms/yum-metadata-parser/FC-6/yum-metadata-parser.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yum-metadata-parser.spec 27 Sep 2006 17:22:14 -0000 1.6 +++ yum-metadata-parser.spec 8 Jan 2007 18:40:38 -0000 1.7 @@ -2,12 +2,10 @@ Summary: A fast metadata parser for yum Name: yum-metadata-parser -Version: 1.0 -Release: 8%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Source0: http://linux.duke.edu/projects/yum/download/%{name}/%{name}-%{version}.tar.gz Patch0: yum-metadata-parser-1.0-quiet.patch -Patch1: yum-metadata-parser-1.0-files.patch -Patch2: yum-metadata-parser-1.0-locationbase.patch License: GPL Group: Development/Libraries URL: http://linux.duke.edu/projects/yum/ @@ -25,8 +23,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %{__python} setup.py build @@ -46,6 +42,9 @@ %{python_sitelib_platform}/sqlitecachec.pyo %changelog +* Mon Jan 8 2007 Jeremy Katz - 1.0.3-1 +- update to 1.0.3 + * Wed Sep 27 2006 Jeremy Katz - 1.0-8 - fix dep loop --- yum-metadata-parser-1.0-files.patch DELETED --- --- yum-metadata-parser-1.0-locationbase.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 8 19:07:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 14:07:45 -0500 Subject: rpms/kernel/FC-6 linux-2.6-lockdep-fixes.patch, 1.42, 1.43 kernel-2.6.spec, 1.2892, 1.2893 Message-ID: <200701081907.l08J7j1S023215@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22892 Modified Files: kernel-2.6.spec Added Files: linux-2.6-lockdep-fixes.patch Log Message: lockdep fixes linux-2.6-lockdep-fixes.patch: services.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Index: linux-2.6-lockdep-fixes.patch =================================================================== RCS file: linux-2.6-lockdep-fixes.patch diff -N linux-2.6-lockdep-fixes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-lockdep-fixes.patch 8 Jan 2007 19:07:42 -0000 1.43 @@ -0,0 +1,29 @@ +Subject: netlabel locking problems +From: Eric Paris +To: davej at redhat.com + +do not call a sleeping lock API in an RCU read section. +lock_sock_nested can sleep, its BH counterpart doesn't. +selinux_netlbl_inode_permission() needs to use the BH counterpart +unconditionally. + +added BH disabling, because this function can be called from non-atomic +contexts too, so a naked bh_lock_sock() would be deadlock-prone. + + +--- linux-2.6.19.noarch/security/selinux/ss/services.c~ 2007-01-08 13:55:02.000000000 -0500 ++++ linux-2.6.19.noarch/security/selinux/ss/services.c 2007-01-08 14:05:06.000000000 -0500 +@@ -2585,9 +2585,11 @@ int selinux_netlbl_inode_permission(stru + mutex_lock(&isec->lock); + if (unlikely(sksec->nlbl_state == NLBL_REQUIRE && + (mask & (MAY_WRITE | MAY_APPEND)))) { +- lock_sock(sock->sk); ++ local_bh_disable(); ++ bh_lock_sock_nested(sock->sk); + rc = selinux_netlbl_socket_setsid(sock, sksec->sid); +- release_sock(sock->sk); ++ bh_unlock_sock(sock->sk); ++ local_bh_enable(); + } else + rc = 0; + mutex_unlock(&isec->lock); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2892 retrieving revision 1.2893 diff -u -r1.2892 -r1.2893 --- kernel-2.6.spec 8 Jan 2007 16:47:47 -0000 1.2892 +++ kernel-2.6.spec 8 Jan 2007 19:07:42 -0000 1.2893 @@ -465,6 +465,8 @@ # SATA Bits Patch2200: linux-2.6-sata-promise-pata-ports.patch +Patch2300: linux-2.6-lockdep-fixes.patch + # ACPI bits # Net driver fixes. @@ -1042,6 +1044,8 @@ # PATA ports on Promise. %patch2200 -p1 +%patch2300 -p1 + # Network driver fixes. # suspend/resume for forcedeth %patch2500 -p1 @@ -2017,6 +2021,7 @@ * Mon Jan 8 2007 Dave Jones - Enable pktcdvd for 586. (#221673) - Reenable signed modules. +- networking labelling lockdep fixes. * Sun Jan 7 2007 Dave Jones - Disable NMI watchdog by default. From fedora-cvs-commits at redhat.com Mon Jan 8 19:26:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 14:26:29 -0500 Subject: rpms/gnome-python2/devel .cvsignore, 1.22, 1.23 gnome-python.spec, 1.55, 1.56 sources, 1.22, 1.23 Message-ID: <200701081926.l08JQTuw025756@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25625 Modified Files: .cvsignore gnome-python.spec sources Log Message: * Mon Jan 08 2007 Matthew Barnes - 2.17.2-1 - Update to 2.17.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 7 Jan 2007 23:07:12 -0000 1.22 +++ .cvsignore 8 Jan 2007 19:26:27 -0000 1.23 @@ -1 +1 @@ -gnome-python-2.17.1.tar.bz2 +gnome-python-2.17.2.tar.bz2 Index: gnome-python.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/gnome-python.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gnome-python.spec 7 Jan 2007 23:07:12 -0000 1.55 +++ gnome-python.spec 8 Jan 2007 19:26:27 -0000 1.56 @@ -6,7 +6,7 @@ ### Abstract ### Name: gnome-python2 -Version: 2.17.1 +Version: 2.17.2 Release: 1%{?dist} License: LGPL Group: Development/Languages @@ -198,6 +198,9 @@ rm -f /usr/lib/python2.2/site-packages/bonobo/__init__.{pyc,pyo} %changelog +* Mon Jan 08 2007 Matthew Barnes - 2.17.2-1 +- Update to 2.17.2 + * Sun Jan 07 2007 Matthew Barnes - 2.17.1-1 - Update to 2.17.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-python2/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 7 Jan 2007 23:07:12 -0000 1.22 +++ sources 8 Jan 2007 19:26:27 -0000 1.23 @@ -1 +1 @@ -a11fa983a7d6d2b6adc5efec7ba3aaa8 gnome-python-2.17.1.tar.bz2 +2c795a9bdf17fc68dd06966420872fe9 gnome-python-2.17.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 8 19:27:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 14:27:05 -0500 Subject: rpms/gnome-python2-desktop/devel .cvsignore, 1.10, 1.11 gnome-python-desktop.spec, 1.26, 1.27 sources, 1.10, 1.11 Message-ID: <200701081927.l08JR53i026278@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26019 Modified Files: .cvsignore gnome-python-desktop.spec sources Log Message: * Mon Jan 08 2007 Matthew Barnes - 2.17.3-1 - Update to 2.17.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 7 Jan 2007 23:55:07 -0000 1.10 +++ .cvsignore 8 Jan 2007 19:27:02 -0000 1.11 @@ -1 +1 @@ -gnome-python-desktop-2.17.2.tar.bz2 +gnome-python-desktop-2.17.3.tar.bz2 Index: gnome-python-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/gnome-python-desktop.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gnome-python-desktop.spec 8 Jan 2007 02:32:48 -0000 1.26 +++ gnome-python-desktop.spec 8 Jan 2007 19:27:03 -0000 1.27 @@ -20,7 +20,7 @@ ### Abstract ### Name: gnome-python2-desktop -Version: 2.17.2 +Version: 2.17.3 Release: 1%{?dist} License: GPL/LGPL Group: Development/Languages @@ -267,6 +267,9 @@ %{python_sitearch}/gtk-2.0/gnomekeyring.so %changelog +* Mon Jan 08 2007 Matthew Barnes - 2.17.3-1 +- Update to 2.17.3 + * Sun Jan 07 2007 Matthew Barnes - 2.17.2-1 - Update to 2.17.2 - New gnome-python2-bugbuddy subpackage. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-desktop/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 7 Jan 2007 23:55:07 -0000 1.10 +++ sources 8 Jan 2007 19:27:03 -0000 1.11 @@ -1 +1 @@ -3c6fa24860ae4604b118f59cd48adccf gnome-python-desktop-2.17.2.tar.bz2 +79d65dc99025a2d8640d19975ea455a6 gnome-python-desktop-2.17.3.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 8 19:47:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 14:47:30 -0500 Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.16,1.17 Message-ID: <200701081947.l08JlUpK013673@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13659 Modified Files: xorg-x11-xkb-utils.spec Log Message: * Mon Jan 08 2007 Adam Jackson 1.0.2-3 - From OLPC: jam -DHAVE_STRCASECMP into CFLAGS to make xkbcomp (and therefore X server startup) slightly less painfully slow. 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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-xkb-utils.spec 12 Jul 2006 09:22:46 -0000 1.16 +++ xorg-x11-xkb-utils.spec 8 Jan 2007 19:47:28 -0000 1.17 @@ -10,7 +10,7 @@ Version: 1.0.2 # NOTE: Bump the release field when updating xkbcomp/xkbevd/xkbprint/setxkbmap, # as the package version is supposed to be the xkbutils version. -Release: 2.1 +Release: 3%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -58,6 +58,7 @@ %build # Build everything +export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP" { for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do pushd $pkg-* @@ -110,6 +111,10 @@ %{_mandir}/man1/xkbprint.1x* %changelog +* Mon Jan 08 2007 Adam Jackson 1.0.2-3 +- From OLPC: jam -DHAVE_STRCASECMP into CFLAGS to make xkbcomp (and therefore + X server startup) slightly less painfully slow. + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Mon Jan 8 23:50:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 18:50:00 -0500 Subject: rpms/gcc/devel gcc41-libgomp-scanrtl.patch, NONE, 1.1 gcc41-pr25514.patch, NONE, 1.1 gcc41.spec, 1.138, 1.139 Message-ID: <200701082350.l08No0qM030766@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30748 Modified Files: gcc41.spec Added Files: gcc41-libgomp-scanrtl.patch gcc41-pr25514.patch Log Message: 4.1.1-53 gcc41-libgomp-scanrtl.patch: 0 files changed --- NEW FILE gcc41-libgomp-scanrtl.patch --- 2006-02-08 Ulrich Weigand * testsuite/lib/libgomp-dg.exp: Load scanrtl.exp library. --- libgomp/testsuite/lib/libgomp-dg.exp (revision 110772) +++ libgomp/testsuite/lib/libgomp-dg.exp (revision 110773) @@ -14,6 +14,7 @@ load_gcc_lib target-supports.exp load_gcc_lib target-supports-dg.exp load_gcc_lib scanasm.exp load_gcc_lib scandump.exp +load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp load_gcc_lib scanipa.exp load_gcc_lib prune.exp gcc41-pr25514.patch: 0 files changed --- NEW FILE gcc41-pr25514.patch --- 2007-01-06 Richard Sandiford Backport: 2006-05-23 Richard Sandiford PR rtl-optimization/27736 * combine.c (replaced_rhs_value): New variable. (combine_instructions): Set it. (distribute_notes): When distributing a note in replaced_rhs_insn, check whether the value was used in replaced_rhs_value. 2006-05-22 Richard Sandiford PR rtl-optimization/25514 * combine.c (replaced_rhs_insn): New variable. (combine_instructions): Set replaced_rhs_insn when trying to replace a SET_SRC with a REG_EQUAL note. (distribute_notes): Use replaced_rhs_insn when determining the live range of a REG_DEAD register. 2006-05-22 Richard Sandiford PR rtl-optimization/25514 * gcc.c-torture/compile/pr25514.c: New test. --- gcc/testsuite/gcc.c-torture/compile/pr25514.c (revision 0) +++ gcc/testsuite/gcc.c-torture/compile/pr25514.c (revision 120526) @@ -0,0 +1,24 @@ +struct node { + struct node *next; + int value; +}; + +struct node *current_node, global_list; + +void +bar (void) +{ + struct node *node, *next; + + node = current_node; + next = node->next; + if (node != &global_list) + current_node = next; + else + { + node = global_list.next; + global_list.value = node->value; + global_list.next = node->next; + } + foo (node); +} --- gcc/combine.c (revision 120525) +++ gcc/combine.c (revision 120526) @@ -123,6 +123,16 @@ static int combine_successes; static int total_attempts, total_merges, total_extras, total_successes; +/* Sometimes combine tries to replace the right hand side of an insn + with the value of a REG_EQUAL note. This is the insn that has been + so modified, or null if none. */ + +static rtx replaced_rhs_insn; + +/* When REPLACED_RHS_INSN is nonnull, this is a copy of the new right + hand side. */ + +static rtx replaced_rhs_value; /* Vector mapping INSN_UIDs to cuids. The cuids are like uids but increase monotonically always. @@ -877,8 +887,11 @@ combine_instructions (rtx f, unsigned in be deleted or recognized by try_combine. */ rtx orig = SET_SRC (set); SET_SRC (set) = note; + replaced_rhs_insn = temp; + replaced_rhs_value = copy_rtx (note); next = try_combine (insn, temp, NULL_RTX, &new_direct_jump_p); + replaced_rhs_insn = NULL; if (next) goto retry; SET_SRC (set) = orig; @@ -12224,7 +12237,15 @@ distribute_notes (rtx notes, rtx from_in break; case REG_DEAD: - /* If the register is used as an input in I3, it dies there. + /* If we replaced the right hand side of FROM_INSN with a + REG_EQUAL note, the original use of the dying register + will not have been combined into I3 and I2. In such cases, + FROM_INSN is guaranteed to be the first of the combined + instructions, so we simply need to search back before + FROM_INSN for the previous use or set of this register, + then alter the notes there appropriately. + + If the register is used as an input in I3, it dies there. Similarly for I2, if it is nonzero and adjacent to I3. If the register is not used as an input in either I3 or I2 @@ -12239,29 +12260,31 @@ distribute_notes (rtx notes, rtx from_in use of A and put the death note there. */ if (from_insn - && CALL_P (from_insn) - && find_reg_fusage (from_insn, USE, XEXP (note, 0))) - place = from_insn; - else if (reg_referenced_p (XEXP (note, 0), PATTERN (i3))) - place = i3; - else if (i2 != 0 && next_nonnote_insn (i2) == i3 - && reg_referenced_p (XEXP (note, 0), PATTERN (i2))) - place = i2; - - if (place == 0 - && (rtx_equal_p (XEXP (note, 0), elim_i2) - || rtx_equal_p (XEXP (note, 0), elim_i1))) - break; + && from_insn == replaced_rhs_insn + && !reg_overlap_mentioned_p (XEXP (note, 0), replaced_rhs_value)) + tem = from_insn; + else + { + if (from_insn + && CALL_P (from_insn) + && find_reg_fusage (from_insn, USE, XEXP (note, 0))) + place = from_insn; + else if (reg_referenced_p (XEXP (note, 0), PATTERN (i3))) + place = i3; + else if (i2 != 0 && next_nonnote_insn (i2) == i3 + && reg_referenced_p (XEXP (note, 0), PATTERN (i2))) + place = i2; + else if (rtx_equal_p (XEXP (note, 0), elim_i2) + || rtx_equal_p (XEXP (note, 0), elim_i1)) + break; + tem = i3; + } if (place == 0) { basic_block bb = this_basic_block; - /* You might think you could search back from FROM_INSN - rather than from I3, but combine tries to split invalid - combined instructions. This can result in the old I2 - or I1 moving later in the insn sequence. */ - for (tem = PREV_INSN (i3); place == 0; tem = PREV_INSN (tem)) + for (tem = PREV_INSN (tem); place == 0; tem = PREV_INSN (tem)) { if (! INSN_P (tem)) { @@ -12363,22 +12386,6 @@ distribute_notes (rtx notes, rtx from_in || (CALL_P (tem) && find_reg_fusage (tem, USE, XEXP (note, 0)))) { - /* This may not be the correct place for the death - note if FROM_INSN is before TEM, and the reg is - set between FROM_INSN and TEM. The reg might - die two or more times. An existing death note - means we are looking at the wrong live range. */ - if (from_insn - && INSN_CUID (from_insn) < INSN_CUID (tem) - && find_regno_note (tem, REG_DEAD, - REGNO (XEXP (note, 0)))) - { - tem = from_insn; - if (tem == BB_HEAD (bb)) - break; - continue; - } - place = tem; /* If we are doing a 3->2 combination, and we have a Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- gcc41.spec 5 Jan 2007 23:27:48 -0000 1.138 +++ gcc41.spec 8 Jan 2007 23:49:58 -0000 1.139 @@ -1,6 +1,6 @@ %define DATE 20070105 %define gcc_version 4.1.1 -%define gcc_release 52 +%define gcc_release 53 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -143,6 +143,8 @@ Patch34: gcc41-pr30110.patch Patch35: gcc41-pr30143.patch Patch36: gcc41-pr30045.patch +Patch37: gcc41-pr25514.patch +Patch38: gcc41-libgomp-scanrtl.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -454,6 +456,8 @@ %patch34 -p0 -b .pr30110~ %patch35 -p0 -b .pr30143~ %patch36 -p0 -b .pr30045~ +%patch37 -p0 -b .pr25514~ +%patch38 -p0 -b .libgomp-scanrtl~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1525,6 +1529,11 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Tue Jan 9 2007 Jakub Jelinek 4.1.1-53 +- fix libgomp testsuite driver (Ulrich Weigand) +- combiner fixes (Richard Sandiford, PR rtl-optimization/25514, + PR rtl-optimization/27736) + * Fri Jan 5 2007 Jakub Jelinek 4.1.1-52 - update from gcc-4_1-branch (-r120325:120507) - PRs c++/30382, middle-end/27826, middle-end/28116, From fedora-cvs-commits at redhat.com Tue Jan 9 01:43:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 20:43:01 -0500 Subject: rpms/libsoup/devel .cvsignore, 1.22, 1.23 libsoup.spec, 1.47, 1.48 sources, 1.22, 1.23 Message-ID: <200701090143.l091h159018519@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/libsoup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18503 Modified Files: .cvsignore libsoup.spec sources Log Message: * Mon Jan 08 2007 Matthew Barnes - 2.2.99-1 - Update to 2.2.99 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 21 Nov 2006 12:10:03 -0000 1.22 +++ .cvsignore 9 Jan 2007 01:42:59 -0000 1.23 @@ -1 +1 @@ -libsoup-2.2.98.tar.bz2 +libsoup-2.2.99.tar.bz2 Index: libsoup.spec =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- libsoup.spec 21 Nov 2006 12:16:15 -0000 1.47 +++ libsoup.spec 9 Jan 2007 01:42:59 -0000 1.48 @@ -1,7 +1,7 @@ ### Abstract ### Name: libsoup -Version: 2.2.98 +Version: 2.2.99 Release: 1%{?dist} License: LGPL Group: Development/Libraries @@ -81,6 +81,9 @@ %{_datadir}/gtk-doc/html/libsoup %changelog +* Mon Jan 08 2007 Matthew Barnes - 2.2.99-1 +- Update to 2.2.99 + * Mon Nov 21 2006 Matthew Barnes - 2.2.98-1 - Update to 2.2.98 - Remove patch for RH bug #215919 (fixed upstream). Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 21 Nov 2006 12:10:03 -0000 1.22 +++ sources 9 Jan 2007 01:42:59 -0000 1.23 @@ -1 +1 @@ -c779f84c4add124e704e6ea3ccc4039c libsoup-2.2.98.tar.bz2 +b2f5df25de4a5c00653d1667eb1b5687 libsoup-2.2.99.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 01:46:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 20:46:04 -0500 Subject: rpms/evolution-data-server/devel .cvsignore, 1.57, 1.58 evolution-data-server.spec, 1.141, 1.142 sources, 1.57, 1.58 evolution-data-server-1.8.1-kill-ethread.patch, 1.1, NONE evolution-data-server-1.9.4-implicit-function-declaration.patch, 1.1, NONE Message-ID: <200701090146.l091k4M5018738@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18718 Modified Files: .cvsignore evolution-data-server.spec sources Removed Files: evolution-data-server-1.8.1-kill-ethread.patch evolution-data-server-1.9.4-implicit-function-declaration.patch Log Message: * Mon Jan 08 2007 Matthew Barnes - 1.9.5-1.fc7 - Update to 1.9.5 - Remove patch for GNOME bug #362638 (fixed upstream). - Remove patch for GNOME bug #387638 (fixed upstream). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 19 Dec 2006 20:52:48 -0000 1.57 +++ .cvsignore 9 Jan 2007 01:46:01 -0000 1.58 @@ -1 +1 @@ -evolution-data-server-1.9.4.tar.bz2 +evolution-data-server-1.9.5.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- evolution-data-server.spec 19 Dec 2006 20:52:48 -0000 1.141 +++ evolution-data-server.spec 9 Jan 2007 01:46:01 -0000 1.142 @@ -24,7 +24,7 @@ ### Abstract ### Name: evolution-data-server -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -59,23 +59,17 @@ # GNOME bug #360619 Patch20: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch -# GNOME bug #362638 -Patch21: evolution-data-server-1.8.1-kill-ethread.patch - # GNOME bug #363965 -Patch22: evolution-data-server-1.9.1-kill-ememory.patch +Patch21: evolution-data-server-1.9.1-kill-ememory.patch # RH bug #203058 -Patch23: evolution-data-server-1.9.2-fix-name-selector-dialog.patch +Patch22: evolution-data-server-1.9.2-fix-name-selector-dialog.patch # RH bug #210142 -Patch24: evolution-data-server-1.9.2-strftime.patch +Patch23: evolution-data-server-1.9.2-strftime.patch # GNOME bug #373117 -Patch25: evolution-data-server-1.9.3-e-source-color.patch - -# GNOME bug #387638 -Patch26: evolution-data-server-1.9.4-implicit-function-declaration.patch +Patch24: evolution-data-server-1.9.3-e-source-color.patch ### Dependencies ### @@ -164,12 +158,10 @@ %patch18 -p1 -b .kill-emutex %patch19 -p1 -b .warn-unused-variable %patch20 -p1 -b .warn-incompatible-pointer-type -%patch21 -p1 -b .kill-ethread -%patch22 -p1 -b .kill-ememory -%patch23 -p1 -b .fix-name-selector-dialog -%patch24 -p1 -b .strftime -%patch25 -p1 -b .e-source-color -%patch26 -p1 -b .implicit-function-declaration +%patch21 -p1 -b .kill-ememory +%patch22 -p1 -b .fix-name-selector-dialog +%patch23 -p1 -b .strftime +%patch24 -p1 -b .e-source-color mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -387,6 +379,11 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Mon Jan 08 2007 Matthew Barnes - 1.9.5-1.fc7 +- Update to 1.9.5 +- Remove patch for GNOME bug #362638 (fixed upstream). +- Remove patch for GNOME bug #387638 (fixed upstream). + * Tue Dec 19 2006 Matthew Barnes - 1.9.4-1.fc7 - Update to 1.9.4 - Add patch for GNOME bug #373117 (storing color settings). Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 19 Dec 2006 20:52:48 -0000 1.57 +++ sources 9 Jan 2007 01:46:01 -0000 1.58 @@ -1 +1 @@ -b1a214fc8c169deec8d74acb0d0c4398 evolution-data-server-1.9.4.tar.bz2 +94993e32e53663558e1eecea3f432bd5 evolution-data-server-1.9.5.tar.bz2 --- evolution-data-server-1.8.1-kill-ethread.patch DELETED --- --- evolution-data-server-1.9.4-implicit-function-declaration.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 02:38:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 21:38:55 -0500 Subject: rpms/gtkhtml3/devel .cvsignore, 1.46, 1.47 gtkhtml-3.13.4-code-cleanup.patch, 1.1, 1.2 gtkhtml3.spec, 1.81, 1.82 sources, 1.46, 1.47 Message-ID: <200701090238.l092ctQB014297@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14118 Modified Files: .cvsignore gtkhtml-3.13.4-code-cleanup.patch gtkhtml3.spec sources Log Message: * Mon Jan 08 2007 Matthew Barnes - 3.13.5-1.fc7 - Update to 3.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 19 Dec 2006 18:34:12 -0000 1.46 +++ .cvsignore 9 Jan 2007 02:38:52 -0000 1.47 @@ -1 +1 @@ -gtkhtml-3.13.4.tar.bz2 +gtkhtml-3.13.5.tar.bz2 gtkhtml-3.13.4-code-cleanup.patch: a11y/hyperlink.c | 20 a11y/hyperlink.h | 6 a11y/text.c | 2 art/Makefile.am | 41 components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in | 95 - components/html-editor/GNOME_GtkHTML_Editor.xml.in | 112 - components/html-editor/Makefile.am | 2 components/html-editor/body.c | 38 components/html-editor/cell.c | 75 - components/html-editor/cell.h | 2 components/html-editor/control-data.c | 8 components/html-editor/control-data.h | 3 components/html-editor/dialog.c | 26 components/html-editor/dialog.h | 4 components/html-editor/e-html-utils.c | 34 components/html-editor/editor-control-factory.c | 13 components/html-editor/gi-color-combo.c | 6 components/html-editor/gi-color-palette.c | 47 components/html-editor/gi-color-palette.h | 4 components/html-editor/gi-combo-box.c | 34 components/html-editor/gtkhtml-editor-properties.glade | 869 +++++---------- components/html-editor/html-stream-mem.c | 2 components/html-editor/htmlsourceview.c | 6 components/html-editor/image.c | 42 components/html-editor/image.h | 2 components/html-editor/link.c | 1 components/html-editor/link.h | 2 components/html-editor/menubar.c | 247 ++-- components/html-editor/paragraph.c | 63 - components/html-editor/persist-stream.c | 4 components/html-editor/popup.c | 28 components/html-editor/properties.c | 5 components/html-editor/properties.h | 4 components/html-editor/replace.c | 22 components/html-editor/replace.h | 2 components/html-editor/rule.c | 51 components/html-editor/rule.h | 2 components/html-editor/search.c | 11 components/html-editor/search.h | 1 components/html-editor/spellchecker.c | 2 components/html-editor/table.c | 56 components/html-editor/table.h | 2 components/html-editor/template.c | 4 components/html-editor/template.h | 2 components/html-editor/test-html-editor-control.c | 10 components/html-editor/text.c | 16 components/html-editor/toolbar.c | 253 +--- components/html-editor/utils.c | 2 components/html-editor/utils.h | 3 configure.in | 2 src/gtkhtml.c | 47 src/htmlclueflow.c | 44 src/htmlcursor.c | 8 src/htmlembedded.c | 2 src/htmlengine-edit-cursor.c | 8 src/htmlengine-edit-selection-updater.c | 10 src/htmlengine-edit-text.c | 2 src/htmlengine-save.c | 8 src/htmlengine.c | 16 src/htmlgdkpainter.c | 8 src/htmliframe.c | 4 src/htmlimage.c | 16 src/htmlinterval.c | 2 src/htmlobject.c | 2 src/htmlprinter.c | 2 src/htmltextslave.c | 9 src/test.c | 12 src/testgtkhtml.c | 81 - 68 files changed, 1025 insertions(+), 1544 deletions(-) Index: gtkhtml-3.13.4-code-cleanup.patch =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml-3.13.4-code-cleanup.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkhtml-3.13.4-code-cleanup.patch 8 Jan 2007 13:41:29 -0000 1.1 +++ gtkhtml-3.13.4-code-cleanup.patch 9 Jan 2007 02:38:52 -0000 1.2 @@ -1,5 +1,5 @@ ---- gtkhtml-3.13.4/a11y/text.c.code-cleanup 2006-12-04 08:12:51.000000000 -0500 -+++ gtkhtml-3.13.4/a11y/text.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/a11y/text.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/a11y/text.c 2007-01-08 21:19:43.000000000 -0500 @@ -946,7 +946,7 @@ x -= html_x; y -= html_y; @@ -9,8 +9,8 @@ if (obj == return_obj) return offset; ---- gtkhtml-3.13.4/a11y/hyperlink.c.code-cleanup 2005-04-05 05:27:32.000000000 -0400 -+++ gtkhtml-3.13.4/a11y/hyperlink.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/a11y/hyperlink.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/a11y/hyperlink.c 2007-01-08 21:19:43.000000000 -0500 @@ -92,9 +92,9 @@ { HTMLA11YHyperLink *hl = HTML_A11Y_HYPER_LINK (obj); @@ -72,8 +72,8 @@ g_signal_emit_by_name (gtkhtml, "link_clicked", url); result = TRUE; ---- gtkhtml-3.13.4/a11y/hyperlink.h.code-cleanup 2005-04-05 05:27:32.000000000 -0400 -+++ gtkhtml-3.13.4/a11y/hyperlink.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/a11y/hyperlink.h.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/a11y/hyperlink.h 2007-01-08 21:19:43.000000000 -0500 @@ -43,7 +43,11 @@ struct _HTMLA11YHyperLink { AtkHyperlink atk_hyper_link; @@ -87,8 +87,8 @@ gint num; gint offset; gchar *description; ---- gtkhtml-3.13.4/configure.in.code-cleanup 2007-01-07 10:19:52.000000000 -0500 -+++ gtkhtml-3.13.4/configure.in 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/configure.in.code-cleanup 2007-01-08 21:18:19.000000000 -0500 ++++ gtkhtml-3.13.5/configure.in 2007-01-08 21:19:43.000000000 -0500 @@ -22,7 +22,7 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) @@ -97,9 +97,9 @@ +I18N_LIB_CFLAGS="-DGNOME_EXPLICIT_TRANSLATION_DOMAIN=\\\"${GTKHTML_RELEASE_STRING}\\\"" AC_SUBST(I18N_LIB_CFLAGS) - AM_INIT_AUTOMAKE($PACKAGE, 3.13.4) ---- gtkhtml-3.13.4/components/html-editor/replace.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/replace.c 2007-01-07 10:20:40.000000000 -0500 + AM_INIT_AUTOMAKE($PACKAGE, 3.13.5) +--- gtkhtml-3.13.5/components/html-editor/replace.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/replace.c 2007-01-08 21:19:43.000000000 -0500 @@ -26,8 +26,6 @@ #else #include @@ -170,8 +170,8 @@ + run_dialog (&cd->replace_dialog->dialog, cd->html, cd, + (DialogCtor) gtk_html_replace_dialog_new, _("Replace")); } ---- gtkhtml-3.13.4/components/html-editor/utils.c.code-cleanup 2005-10-28 06:04:26.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/utils.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/utils.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/utils.c 2007-01-08 21:19:42.000000000 -0500 @@ -38,7 +38,7 @@ #include #include @@ -181,8 +181,8 @@ #include "utils.h" #include "properties.h" ---- gtkhtml-3.13.4/components/html-editor/e-html-utils.c.code-cleanup 2005-09-11 00:04:18.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/e-html-utils.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/e-html-utils.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/e-html-utils.c 2007-01-08 21:19:42.000000000 -0500 @@ -80,7 +80,7 @@ return NULL; } @@ -289,8 +289,8 @@ out = check_size (&buffer, &buffer_size, out, 10); ---- gtkhtml-3.13.4/components/html-editor/image.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/image.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/image.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/image.h 2007-01-08 21:19:43.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_EDIT_IMAGE_H_ #define _GTK_HTML_EDIT_IMAGE_H_ @@ -300,8 +300,8 @@ #include "control-data.h" GtkWidget * image_properties (GtkHTMLControlData *cd, gpointer *set_data); ---- gtkhtml-3.13.4/components/html-editor/gtkhtml-editor-properties.glade.code-cleanup 2006-04-29 23:14:17.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/gtkhtml-editor-properties.glade 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/gtkhtml-editor-properties.glade.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/gtkhtml-editor-properties.glade 2007-01-08 21:19:43.000000000 -0500 @@ -142,6 +142,23 @@ GTK_PACK_END @@ -1335,8 +1335,8 @@ 0 ---- gtkhtml-3.13.4/components/html-editor/spellchecker.c.code-cleanup 2006-02-27 08:53:33.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/spellchecker.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/spellchecker.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/spellchecker.c 2007-01-08 21:19:42.000000000 -0500 @@ -268,7 +268,7 @@ rv = control != NULL; @@ -1346,8 +1346,8 @@ } return rv; } ---- gtkhtml-3.13.4/components/html-editor/link.c.code-cleanup 2005-09-11 00:04:18.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/link.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/link.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/link.c 2007-01-08 21:19:43.000000000 -0500 @@ -28,6 +28,7 @@ #include #endif @@ -1356,8 +1356,8 @@ #include "htmlcolor.h" #include "htmlcolorset.h" ---- gtkhtml-3.13.4/components/html-editor/gi-color-palette.h.code-cleanup 2004-01-07 13:34:25.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/gi-color-palette.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/gi-color-palette.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/gi-color-palette.h 2007-01-08 21:19:43.000000000 -0500 @@ -30,11 +30,11 @@ #ifndef GI_COLOR_PALETTE_H #define GI_COLOR_PALETTE_H @@ -1380,8 +1380,8 @@ /* * Array of colors */ ---- gtkhtml-3.13.4/components/html-editor/template.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/template.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/template.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/template.c 2007-01-08 21:19:43.000000000 -0500 @@ -219,8 +219,8 @@ gtk_tree_selection_select_iter (gtk_tree_view_get_selection (GTK_TREE_VIEW (d->tview_template)), &iter); @@ -1393,8 +1393,8 @@ d->disable_change = FALSE; ---- gtkhtml-3.13.4/components/html-editor/table.c.code-cleanup 2006-04-29 23:14:17.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/table.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/table.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/table.c 2007-01-08 21:19:43.000000000 -0500 @@ -138,33 +138,35 @@ } @@ -1507,8 +1507,8 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (d->spin_cols), d->table->totalCols); gtk_spin_button_set_value (GTK_SPIN_BUTTON (d->spin_rows), d->table->totalRows); ---- gtkhtml-3.13.4/components/html-editor/text.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/text.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/text.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/text.c 2007-01-08 21:19:42.000000000 -0500 @@ -85,14 +85,13 @@ } @@ -1549,8 +1549,8 @@ gtk_widget_show_all (text_page); ---- gtkhtml-3.13.4/components/html-editor/menubar.c.code-cleanup 2006-04-24 01:39:26.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/menubar.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/menubar.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/menubar.c 2007-01-08 21:19:43.000000000 -0500 @@ -33,7 +33,6 @@ #include #include @@ -1559,7 +1559,7 @@ #ifdef USE_GTKFILECHOOSER #include #include -@@ -132,14 +131,10 @@ +@@ -133,14 +132,10 @@ static void insert_link_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname) { @@ -1575,7 +1575,7 @@ gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_LINK, _("Link"), -@@ -153,16 +148,12 @@ +@@ -154,16 +149,12 @@ static void insert_rule_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname) { @@ -1593,7 +1593,7 @@ gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_RULE, _("Rule"), -@@ -175,8 +166,6 @@ +@@ -176,8 +167,6 @@ void insert_table (GtkHTMLControlData *cd) { @@ -1602,7 +1602,7 @@ if (cd->properties_dialog) gtk_html_edit_properties_dialog_close (cd->properties_dialog); -@@ -188,9 +177,7 @@ +@@ -189,9 +178,7 @@ html_engine_table_set_cols (cd->html->engine, 3); html_engine_table_set_rows (cd->html->engine, 3); } @@ -1613,7 +1613,7 @@ gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_TABLE, _("Table"), -@@ -209,14 +196,10 @@ +@@ -210,14 +197,10 @@ static void insert_template_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname) { @@ -1629,37 +1629,58 @@ gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_TABLE, _("Template"), -@@ -375,8 +358,7 @@ +@@ -373,15 +356,10 @@ + static void + format_page_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname) + { +- char *filename; +- if (cd->properties_dialog) gtk_html_edit_properties_dialog_close (cd->properties_dialog); +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL); - cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), -- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL)); +- filename); +- g_free(filename); + cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), "gtk-properties"); gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_BODY, _("Page"), -@@ -393,8 +375,7 @@ +@@ -395,15 +373,10 @@ + static void + format_text_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname) + { +- char *filename; +- if (cd->properties_dialog) gtk_html_edit_properties_dialog_close (cd->properties_dialog); +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL); - cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), -- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL)); +- filename); +- g_free(filename); + cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), "gtk-properties"); gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_BODY, _("Text"), -@@ -411,8 +392,7 @@ +@@ -417,15 +390,10 @@ + static void + format_paragraph_cb (BonoboUIComponent *uic, GtkHTMLControlData *cd, const char *cname) + { +- char *filename; +- if (cd->properties_dialog) gtk_html_edit_properties_dialog_close (cd->properties_dialog); +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL); - cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), -- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL)); +- filename); +- g_free(filename); + cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Format"), "gtk-properties"); gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_BODY, _("Paragraph"), -@@ -455,7 +435,7 @@ +@@ -468,7 +436,7 @@ BONOBO_UI_UNSAFE_VERB ("InsertSmiley9", smiley_cb), BONOBO_UI_UNSAFE_VERB ("InsertSmiley10", smiley_cb), BONOBO_UI_UNSAFE_VERB ("InsertSmiley11", smiley_cb), @@ -1668,7 +1689,7 @@ BONOBO_UI_UNSAFE_VERB ("IndentMore", command_cb), BONOBO_UI_UNSAFE_VERB ("IndentLess", command_cb), -@@ -690,45 +670,71 @@ +@@ -703,45 +671,71 @@ cd->block_language_changes = FALSE; } @@ -1776,7 +1797,7 @@ } static void -@@ -740,6 +746,7 @@ +@@ -753,6 +747,7 @@ typedef enum { @@ -1784,7 +1805,7 @@ EDITOR_ICON_MENU = 16, EDITOR_ICON_TOOLBAR = 24, } EditorIconSize; -@@ -753,33 +760,56 @@ +@@ -766,33 +761,56 @@ static EditorUIPixmap pixmaps_map [] = { @@ -1859,7 +1880,7 @@ }; void -@@ -810,18 +840,35 @@ +@@ -823,18 +841,35 @@ bonobo_ui_util_set_ui (uic, GTKHTML_DATADIR, "GNOME_GtkHTML_Editor.xml", "GNOME_GtkHTML_Editor", NULL); } @@ -1907,8 +1928,8 @@ } spell_create_language_menu (cd); ---- gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in.code-cleanup 2006-03-21 20:43:21.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in 2007-01-08 21:19:43.000000000 -0500 @@ -11,8 +11,7 @@ @@ -2070,8 +2091,8 @@ ---- gtkhtml-3.13.4/components/html-editor/replace.h.code-cleanup 2002-11-11 12:09:32.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/replace.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/replace.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/replace.h 2007-01-08 21:19:43.000000000 -0500 @@ -25,7 +25,7 @@ typedef struct _GtkHTMLReplaceDialog GtkHTMLReplaceDialog; @@ -2081,8 +2102,8 @@ #include "control-data.h" GtkHTMLReplaceDialog * gtk_html_replace_dialog_new (GtkHTML *html, GtkHTMLControlData *cd); ---- gtkhtml-3.13.4/components/html-editor/dialog.c.code-cleanup 2005-10-28 05:27:35.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/dialog.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/dialog.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/dialog.c 2007-01-08 21:19:42.000000000 -0500 @@ -28,25 +28,17 @@ #endif #include "dialog.h" @@ -2118,8 +2139,8 @@ - gtk_dialog_run (**dialog); + gtk_dialog_run (*dialog); } ---- gtkhtml-3.13.4/components/html-editor/dialog.h.code-cleanup 2005-10-28 05:27:35.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/dialog.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/dialog.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/dialog.h 2007-01-08 21:19:42.000000000 -0500 @@ -27,9 +27,7 @@ typedef GtkDialog ** (*DialogCtor)(GtkHTML *html, GtkHTMLControlData *cd); @@ -2131,8 +2152,8 @@ GtkHTML *html, GtkHTMLControlData *cd, DialogCtor ctor, ---- gtkhtml-3.13.4/components/html-editor/test-html-editor-control.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/test-html-editor-control.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/test-html-editor-control.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/test-html-editor-control.c 2007-01-08 21:19:43.000000000 -0500 @@ -28,11 +28,13 @@ #include #endif @@ -2169,8 +2190,8 @@ bonobo_activate (); bonobo_main (); ---- gtkhtml-3.13.4/components/html-editor/cell.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/cell.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/cell.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/cell.h 2007-01-08 21:19:43.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_CELL_H_ #define _GTK_HTML_CELL_H_ @@ -2180,8 +2201,8 @@ #include "control-data.h" GtkWidget * cell_properties (GtkHTMLControlData *cd, gpointer *set_data); ---- gtkhtml-3.13.4/components/html-editor/cell.c.code-cleanup 2006-04-29 23:14:17.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/cell.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/cell.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/cell.c 2007-01-08 21:19:43.000000000 -0500 @@ -186,9 +186,10 @@ static void set_halign (HTMLTableCell *cell, GtkHTMLEditCellProperties *d) @@ -2231,13 +2252,15 @@ } else html_engine_table_cell_set_width (d->cd->html->engine, cell, 0, FALSE); } -@@ -341,25 +343,6 @@ +@@ -341,27 +343,6 @@ cell_page = glade_xml_get_widget (xml, "cell_page"); +- filename = gnome_icon_theme_lookup_icon (d->cd->icon_theme, "stock_select-cell", 16, NULL, NULL); - gtk_table_attach (GTK_TABLE (glade_xml_get_widget (xml, "cell_scope_table1")), -- gtk_image_new_from_file (gnome_icon_theme_lookup_icon (d->cd->icon_theme, "stock_select-cell", 16, NULL, NULL)), +- gtk_image_new_from_file (filename), - 0, 1, 0, 1, 0, 0, 0, 0); +- g_free (filename); - filename = g_build_filename (ICONDIR, "table-table-16.png", NULL); - gtk_table_attach (GTK_TABLE (glade_xml_get_widget (xml, "cell_scope_table1")), - gtk_image_new_from_file (filename), @@ -2257,7 +2280,7 @@ d->combo_bg_color = gi_color_combo_new (NULL, _("Transparent"), NULL, color_group_fetch ("cell_bg_color", d->cd)); gi_color_combo_box_set_preview_relief (GI_COLOR_COMBO (d->combo_bg_color), GTK_RELIEF_NORMAL); \ -@@ -371,11 +354,9 @@ +@@ -373,11 +354,9 @@ "selection-changed", G_CALLBACK (changed_bg_pixmap), d); d->option_halign = glade_xml_get_widget (xml, "option_cell_halign"); @@ -2271,7 +2294,7 @@ d->spin_width = glade_xml_get_widget (xml, "spin_cell_width"); UPPER_FIX (width); -@@ -383,8 +364,8 @@ +@@ -385,8 +364,8 @@ d->check_width = glade_xml_get_widget (xml, "check_cell_width"); g_signal_connect (d->check_width, "toggled", G_CALLBACK (set_has_width), d); d->option_width = glade_xml_get_widget (xml, "option_cell_width"); @@ -2282,7 +2305,7 @@ d->check_wrap = glade_xml_get_widget (xml, "check_cell_wrap"); d->check_header = glade_xml_get_widget (xml, "check_cell_header"); -@@ -427,19 +408,25 @@ +@@ -429,19 +408,25 @@ } if (HTML_CLUE (d->cell)->halign == HTML_HALIGN_NONE) @@ -2313,8 +2336,8 @@ } else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (d->check_width), FALSE); ---- gtkhtml-3.13.4/components/html-editor/paragraph.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/paragraph.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/paragraph.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/paragraph.c 2007-01-08 21:19:42.000000000 -0500 @@ -30,6 +30,7 @@ #include "htmlengine-save.h" #include "htmlselection.h" @@ -2339,18 +2362,19 @@ set_align (GtkWidget *w, GtkHTMLEditParagraphProperties *data) { GtkHTMLParagraphAlignment align = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (w), "align")); -@@ -61,9 +53,8 @@ +@@ -61,10 +53,8 @@ paragraph_properties (GtkHTMLControlData *cd, gpointer *set_data) { GtkHTMLEditParagraphProperties *data = g_new0 (GtkHTMLEditParagraphProperties, 1); - GtkWidget *hbox, *menu, *menuitem, *vbox, *radio, *table, *icon; + GtkWidget *hbox, *vbox, *radio, *table, *icon; GSList *group; +- char *filename; - gint h=0, i=0; *set_data = data; data->cd = cd; -@@ -72,42 +63,7 @@ +@@ -73,42 +63,7 @@ gtk_table_set_col_spacings (GTK_TABLE (table), 18); gtk_table_set_row_spacings (GTK_TABLE (table), 18); @@ -2394,7 +2418,7 @@ hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new_with_mnemonic (_("_Style:")), FALSE, FALSE, 0); -@@ -117,10 +73,10 @@ +@@ -118,12 +73,10 @@ hbox = gtk_hbox_new (FALSE, 12); @@ -2402,12 +2426,14 @@ +#define ADD_RADIO(x,a,stock_id) \ radio = gtk_radio_button_new_with_label (group, x); \ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio)); \ -- icon = gtk_image_new_from_file (gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_text_" icon_name, 16, NULL, NULL)); \ +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_text_" icon_name, 16, NULL, NULL); \ +- icon = gtk_image_new_from_file (filename); \ +- g_free(filename); \ + icon = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); \ gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); \ gtk_box_pack_start (GTK_BOX (hbox), radio, FALSE, FALSE, 0); \ if (a == gtk_html_get_paragraph_alignment (data->cd->html)) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); \ -@@ -128,9 +84,9 @@ +@@ -131,9 +84,9 @@ g_object_set_data (G_OBJECT (radio), "align", GINT_TO_POINTER (a)); group = NULL; @@ -2420,8 +2446,8 @@ gtk_table_attach (GTK_TABLE (table), editor_hig_vbox (_("Alignment"), hbox), 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0); ---- gtkhtml-3.13.4/components/html-editor/control-data.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/control-data.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/control-data.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/control-data.c 2007-01-08 21:19:43.000000000 -0500 @@ -53,7 +53,7 @@ ncd->replace_text_replace = NULL; ncd->has_spell_control_set = FALSE; @@ -2431,9 +2457,9 @@ spell_init (html, ncd); -@@ -86,10 +86,8 @@ - if (cd->languages) +@@ -90,10 +90,8 @@ CORBA_free (cd->languages); + g_free (cd->language); - if (cd->icon_theme) { - g_object_unref (cd->icon_theme); @@ -2444,8 +2470,8 @@ g_free (cd); } ---- gtkhtml-3.13.4/components/html-editor/toolbar.c.code-cleanup 2006-04-25 07:09:17.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/toolbar.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/toolbar.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/toolbar.c 2007-01-08 21:19:42.000000000 -0500 @@ -29,10 +29,11 @@ #else #include @@ -2803,8 +2829,8 @@ } ---- gtkhtml-3.13.4/components/html-editor/properties.c.code-cleanup 2005-10-28 05:27:35.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/properties.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/properties.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/properties.c 2007-01-08 21:19:43.000000000 -0500 @@ -27,7 +27,6 @@ #else #include @@ -2831,8 +2857,8 @@ gtk_dialog_set_response_sensitive (GTK_DIALOG (d->dialog), 0, FALSE); gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (d->dialog)->vbox), 6); ---- gtkhtml-3.13.4/components/html-editor/control-data.h.code-cleanup 2004-05-21 09:32:49.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/control-data.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/control-data.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/control-data.h 2007-01-08 21:19:43.000000000 -0500 @@ -30,7 +30,6 @@ #include @@ -2850,8 +2876,8 @@ }; GtkHTMLControlData * gtk_html_control_data_new (GtkHTML *html, GtkWidget *vbox); ---- gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor.xml.in.code-cleanup 2006-05-15 10:42:09.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/GNOME_GtkHTML_Editor.xml.in 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor.xml.in.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/GNOME_GtkHTML_Editor.xml.in 2007-01-08 21:19:43.000000000 -0500 @@ -1,41 +1,41 @@ @@ -3044,8 +3070,8 @@ ---- gtkhtml-3.13.4/components/html-editor/body.c.code-cleanup 2006-05-15 05:49:55.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/body.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/body.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/body.c 2007-01-08 21:19:43.000000000 -0500 @@ -50,7 +50,6 @@ }; typedef struct _GtkHTMLEditBodyProperties GtkHTMLEditBodyProperties; @@ -3137,8 +3163,8 @@ g_signal_connect (data->combo [0], "color_changed", G_CALLBACK (color_changed), data); g_signal_connect (data->combo [1], "color_changed", G_CALLBACK (color_changed), data); g_signal_connect (data->combo [2], "color_changed", G_CALLBACK (color_changed), data); ---- gtkhtml-3.13.4/components/html-editor/utils.h.code-cleanup 2004-06-04 11:10:56.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/utils.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/utils.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/utils.h 2007-01-08 21:19:42.000000000 -0500 @@ -24,7 +24,6 @@ #define _UTILS_H_ @@ -3156,8 +3182,8 @@ GtkWidget *editor_hig_inner_hbox (gchar *text, GtkWidget *control); ---- gtkhtml-3.13.4/components/html-editor/Makefile.am.code-cleanup 2006-01-03 23:03:39.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/Makefile.am 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/Makefile.am.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/Makefile.am 2007-01-08 21:19:43.000000000 -0500 @@ -92,6 +92,8 @@ menubar.h \ paragraph.c \ @@ -3167,8 +3193,8 @@ persist-file.c \ persist-file.h \ persist-stream.c \ ---- gtkhtml-3.13.4/components/html-editor/gi-combo-box.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/gi-combo-box.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/gi-combo-box.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/gi-combo-box.c 2007-01-08 21:19:43.000000000 -0500 @@ -434,10 +434,8 @@ */ @@ -3249,8 +3275,8 @@ } /** ---- gtkhtml-3.13.4/components/html-editor/editor-control-factory.c.code-cleanup 2006-08-22 13:51:47.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/editor-control-factory.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/editor-control-factory.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/editor-control-factory.c 2007-01-08 21:19:43.000000000 -0500 @@ -33,7 +33,7 @@ #include #endif @@ -3276,17 +3302,27 @@ #include "body.h" #include "spellchecker.h" #include "html-stream-mem.h" -@@ -185,8 +187,7 @@ +@@ -172,7 +174,6 @@ + HTMLEngine *e = cd->html->engine; + GtkHTMLEditPropertyType start = GTK_HTML_EDIT_PROPERTY_BODY; + gboolean run_dialog = FALSE; +- char *filename; + + if (cd->obj) { + switch (HTML_OBJECT_TYPE (cd->obj)) { +@@ -186,10 +187,7 @@ ; } if (run_dialog) { +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL); - cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"), -- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL)); +- filename); +- g_free(filename); + cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"), "gtk-properties"); html_cursor_jump_to (e->cursor, e, cd->obj, 0); html_engine_disable_selection (e); html_engine_set_mark (e); -@@ -260,7 +261,7 @@ +@@ -263,7 +261,7 @@ } while ((len = read (fd, buffer, 4096)) > 0) { @@ -3295,7 +3331,7 @@ } if (len < 0) { -@@ -418,6 +419,7 @@ +@@ -421,6 +419,7 @@ toolbar_update_format (cd); menubar_update_format (cd); @@ -3303,8 +3339,8 @@ if (html->engine->painter != (HTMLPainter *)p) { html_gdk_painter_unrealize (old_p); ---- gtkhtml-3.13.4/components/html-editor/popup.c.code-cleanup 2006-06-06 01:37:34.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/popup.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/popup.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/popup.c 2007-01-08 21:19:43.000000000 -0500 @@ -102,14 +102,10 @@ static void insert_link (GtkWidget *mi, GtkHTMLControlData *cd) @@ -3321,17 +3357,23 @@ gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_LINK, _("Link"), -@@ -192,8 +188,7 @@ +@@ -189,14 +185,10 @@ + { + GtkHTMLEditPropertyType t; + GList *cur; +- char *filename; if (cd->properties_dialog) gtk_html_edit_properties_dialog_close (cd->properties_dialog); +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL); - cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"), -- gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_properties", 16, NULL, NULL)); +- filename); +- g_free(filename); + cd->properties_dialog = gtk_html_edit_properties_dialog_new (cd, _("Properties"), "gtk-properties"); cur = cd->properties_types; while (cur) { -@@ -267,14 +262,10 @@ +@@ -270,14 +262,10 @@ static void link_prop_dialog (GtkWidget *mi, GtkHTMLControlData *cd) { @@ -3347,7 +3389,7 @@ gtk_html_edit_properties_dialog_add_entry (cd->properties_dialog, GTK_HTML_EDIT_PROPERTY_LINK, _("Link"), -@@ -286,12 +277,6 @@ +@@ -289,12 +277,6 @@ } static void @@ -3360,7 +3402,7 @@ replace_suggestion_cb (GtkWidget *mi, GtkHTMLControlData *cd) { html_engine_replace_spell_word_with (cd->html->engine, g_object_get_data (G_OBJECT (mi), "rep_word")); -@@ -597,7 +582,7 @@ +@@ -600,7 +582,7 @@ END_SUBMENU; if (*items == 0) { @@ -3369,7 +3411,7 @@ menu = NULL; } else gtk_widget_show (menu); -@@ -654,7 +639,7 @@ +@@ -657,7 +639,7 @@ guint items, props; menu = prepare_properties_and_menu (cd, &items, &props); @@ -3378,8 +3420,8 @@ if (props) show_prop_dialog (cd, GTK_HTML_EDIT_PROPERTY_NONE); } ---- gtkhtml-3.13.4/components/html-editor/template.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/template.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/template.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/template.h 2007-01-08 21:19:43.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_TEMPLATE_H_ #define _GTK_HTML_TEMPLATE_H_ @@ -3389,8 +3431,8 @@ #include "control-data.h" GtkWidget * template_insert (GtkHTMLControlData *cd, gpointer *set_data); ---- gtkhtml-3.13.4/components/html-editor/search.h.code-cleanup 2004-05-25 14:39:27.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/search.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/search.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/search.h 2007-01-08 21:19:43.000000000 -0500 @@ -25,7 +25,6 @@ typedef struct _GtkHTMLSearchDialog GtkHTMLSearchDialog; @@ -3399,8 +3441,8 @@ #include "gtkhtml.h" #include "control-data.h" ---- gtkhtml-3.13.4/components/html-editor/gi-color-palette.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/gi-color-palette.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/gi-color-palette.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/gi-color-palette.c 2007-01-08 21:19:43.000000000 -0500 @@ -152,7 +152,7 @@ * Add the new custom color as the first custom color in the custom color rows * and shift all of the others 'one step down' @@ -3527,8 +3569,8 @@ } ---- gtkhtml-3.13.4/components/html-editor/persist-stream.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/persist-stream.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/persist-stream.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/persist-stream.c 2007-01-08 21:19:43.000000000 -0500 @@ -146,7 +146,7 @@ break; } @@ -3547,8 +3589,8 @@ Bonobo_Stream_write (state->stream, &buffer, state->ev); ---- gtkhtml-3.13.4/components/html-editor/table.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/table.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/table.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/table.h 2007-01-08 21:19:43.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_TABLE_H_ #define _GTK_HTML_TABLE_H_ @@ -3558,8 +3600,8 @@ #include "control-data.h" GtkWidget * table_properties (GtkHTMLControlData *cd, gpointer *set_data); ---- gtkhtml-3.13.4/components/html-editor/rule.h.code-cleanup 2003-01-09 10:31:05.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/rule.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/rule.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/rule.h 2007-01-08 21:19:42.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_RULE_H_ #define _GTK_HTML_RULE_H_ @@ -3569,8 +3611,8 @@ #include "control-data.h" GtkWidget * rule_properties (GtkHTMLControlData *cd, gpointer *set_data); ---- gtkhtml-3.13.4/components/html-editor/search.c.code-cleanup 2006-01-27 04:11:48.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/search.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/search.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/search.c 2007-01-08 21:19:43.000000000 -0500 @@ -26,8 +26,6 @@ #else #include @@ -3580,16 +3622,27 @@ #include "search.h" #include "dialog.h" #include "htmlengine-search.h" -@@ -142,7 +140,7 @@ +@@ -107,7 +105,7 @@ + { + GtkHTMLSearchDialog *dialog = g_new (GtkHTMLSearchDialog, 1); + GtkWidget *hbox, *vbox; +- char *filename; ++ + /* we use CANCEL response for close, because we want Esc to close the dialog - see gtkdialog.c */ + dialog->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Find"), NULL, 0, + GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL, +@@ -143,9 +141,7 @@ gtk_widget_show (dialog->entry); gtk_widget_show_all (hbox); -- gnome_window_icon_set_from_file (GTK_WINDOW (dialog->dialog), gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_search", 16, NULL, NULL)); +- filename = gnome_icon_theme_lookup_icon (cd->icon_theme, "stock_search", 16, NULL, NULL); +- gnome_window_icon_set_from_file (GTK_WINDOW (dialog->dialog), filename); +- g_free(filename); + gtk_window_set_icon_name (GTK_WINDOW (dialog->dialog), "gtk-find"); gtk_widget_grab_focus (dialog->entry); -@@ -168,7 +166,8 @@ +@@ -171,7 +167,8 @@ void search (GtkHTMLControlData *cd) { @@ -3599,8 +3652,8 @@ } void ---- gtkhtml-3.13.4/components/html-editor/image.c.code-cleanup 2006-08-21 11:06:10.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/image.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/image.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/image.c 2007-01-08 21:19:42.000000000 -0500 @@ -29,6 +29,7 @@ #include #include @@ -3708,8 +3761,8 @@ d->spin_border = glade_xml_get_widget (xml, "spin_image_border"); UPPER_FIX (border); ---- gtkhtml-3.13.4/components/html-editor/properties.h.code-cleanup 2004-05-21 09:32:49.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/properties.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/properties.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/properties.h 2007-01-08 21:19:42.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_EDIT_PROPERTIES_H_ #define _GTK_HTML_EDIT_PROPERTIES_H_ @@ -3728,8 +3781,8 @@ void gtk_html_edit_properties_dialog_destroy (GtkHTMLEditPropertiesDialog *d); void gtk_html_edit_properties_dialog_add_entry (GtkHTMLEditPropertiesDialog *d, ---- gtkhtml-3.13.4/components/html-editor/link.h.code-cleanup 2004-06-04 11:10:55.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/link.h 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/link.h.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/link.h 2007-01-08 21:19:42.000000000 -0500 @@ -23,7 +23,7 @@ #ifndef _GTK_HTML_LINK_H_ #define _GTK_HTML_LINK_H_ @@ -3739,8 +3792,8 @@ #include "control-data.h" GtkWidget * link_properties (GtkHTMLControlData *cd, gpointer *set_data); ---- gtkhtml-3.13.4/components/html-editor/rule.c.code-cleanup 2005-09-11 00:04:19.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/rule.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/rule.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/rule.c 2007-01-08 21:19:42.000000000 -0500 @@ -62,17 +62,21 @@ static void set_length (GtkHTMLEditRuleProperties *d) @@ -3838,8 +3891,8 @@ d->check_shaded = glade_xml_get_widget (xml, "check_rule_shaded"); g_signal_connect (d->check_shaded, "toggled", G_CALLBACK (shaded_toggled), d); ---- gtkhtml-3.13.4/components/html-editor/gi-color-combo.c.code-cleanup 2005-07-13 06:19:31.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/gi-color-combo.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/gi-color-combo.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/gi-color-combo.c 2007-01-08 21:19:43.000000000 -0500 @@ -150,8 +150,8 @@ color_group)); @@ -3860,8 +3913,8 @@ g_signal_connect (cc->preview_button, "clicked", G_CALLBACK (preview_clicked), cc); ---- gtkhtml-3.13.4/components/html-editor/html-stream-mem.c.code-cleanup 2005-05-17 10:48:59.000000000 -0400 -+++ gtkhtml-3.13.4/components/html-editor/html-stream-mem.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/html-stream-mem.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/html-stream-mem.c 2007-01-08 21:19:43.000000000 -0500 @@ -34,7 +34,7 @@ if (bhtml->html_stream) { @@ -3871,8 +3924,8 @@ } else { gtk_html_stream_close (bhtml->html_stream, GTK_HTML_STREAM_OK); bhtml->html_stream = NULL; ---- gtkhtml-3.13.4/components/html-editor/htmlsourceview.c.code-cleanup 2006-02-28 15:53:33.000000000 -0500 -+++ gtkhtml-3.13.4/components/html-editor/htmlsourceview.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/components/html-editor/htmlsourceview.c.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/components/html-editor/htmlsourceview.c 2007-01-08 21:19:43.000000000 -0500 @@ -120,10 +120,10 @@ html_source_view_set_timeout (HTMLSourceView *view, guint timeout) { @@ -3895,8 +3948,8 @@ priv->timer_id = 0; if (priv->pstream != CORBA_OBJECT_NIL) { ---- gtkhtml-3.13.4/art/Makefile.am.code-cleanup 2004-07-22 13:58:55.000000000 -0400 -+++ gtkhtml-3.13.4/art/Makefile.am 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/art/Makefile.am.code-cleanup 2007-01-03 10:28:47.000000000 -0500 ++++ gtkhtml-3.13.5/art/Makefile.am 2007-01-08 21:19:43.000000000 -0500 @@ -1,58 +1,17 @@ iconsdir = $(datadir)/gtkhtml- at GTKHTML_API_VERSION@/icons icons_DATA = \ @@ -3956,8 +4009,8 @@ paper.png \ ribbon.jpg \ midnight-stars.jpg \ ---- gtkhtml-3.13.4/src/testgtkhtml.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/testgtkhtml.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/testgtkhtml.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/testgtkhtml.c 2007-01-08 21:19:43.000000000 -0500 @@ -196,6 +196,7 @@ GtkWidget *hbox; GtkWidget *frame; @@ -4095,8 +4148,8 @@ redirect_timerId = 0; } ---- gtkhtml-3.13.4/src/htmlprinter.c.code-cleanup 2006-03-25 12:47:41.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlprinter.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlprinter.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlprinter.c 2007-01-08 21:19:43.000000000 -0500 @@ -207,7 +207,7 @@ pc = printer->context; g_return_if_fail (pc); @@ -4106,8 +4159,8 @@ gnome_print_gsave (pc); html_printer_coordinates_to_gnome_print (printer, x1, y1, &printer_x1, &printer_y1); ---- gtkhtml-3.13.4/src/htmlcursor.c.code-cleanup 2007-01-07 10:19:52.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlcursor.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlcursor.c.code-cleanup 2007-01-08 21:18:19.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlcursor.c 2007-01-08 21:19:43.000000000 -0500 @@ -211,7 +211,7 @@ if (!html_object_cursor_forward (cursor->object, cursor, engine)) { HTMLObject *next; @@ -4144,8 +4197,8 @@ if (prev && prev->parent) { cursor->object = prev; cursor->position --; ---- gtkhtml-3.13.4/src/htmlengine-edit-text.c.code-cleanup 2005-01-28 10:39:16.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlengine-edit-text.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlengine-edit-text.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlengine-edit-text.c 2007-01-08 21:19:43.000000000 -0500 @@ -54,7 +54,7 @@ { if (html_object_is_text (obj)) { @@ -4155,8 +4208,8 @@ old_text = HTML_TEXT (obj)->text; HTML_TEXT (obj)->text = up ? g_utf8_strup (old_text, -1) : g_utf8_strdown (old_text, -1); ---- gtkhtml-3.13.4/src/htmlobject.c.code-cleanup 2007-01-07 10:19:52.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlobject.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlobject.c.code-cleanup 2007-01-08 21:18:19.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlobject.c 2007-01-08 21:19:43.000000000 -0500 @@ -1693,7 +1693,7 @@ if (html_object_accepts_cursor (obj)) break; @@ -4166,8 +4219,8 @@ break; obj = last_obj; } ---- gtkhtml-3.13.4/src/htmliframe.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmliframe.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmliframe.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmliframe.c 2007-01-08 21:19:43.000000000 -0500 @@ -463,7 +463,7 @@ if (state->error || @@ -4186,8 +4239,8 @@ html_engine_save_buffer_peek_text_bytes (buffer))) { html_engine_save_buffer_free (buffer, TRUE); return FALSE; ---- gtkhtml-3.13.4/src/htmlimage.c.code-cleanup 2005-07-13 06:19:32.000000000 -0400 -+++ gtkhtml-3.13.4/src/htmlimage.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlimage.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlimage.c 2007-01-08 21:19:43.000000000 -0500 @@ -384,7 +384,7 @@ { HTMLGdkPainter *p; @@ -4240,8 +4293,8 @@ ip->stall_timeout = 0; } } ---- gtkhtml-3.13.4/src/htmlengine-save.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlengine-save.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlengine-save.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlengine-save.c 2007-01-08 21:19:43.000000000 -0500 @@ -123,7 +123,7 @@ if (encoded_len_return) *encoded_len_return = out - buffer; @@ -4278,8 +4331,8 @@ } int ---- gtkhtml-3.13.4/src/test.c.code-cleanup 2004-11-19 05:19:52.000000000 -0500 -+++ gtkhtml-3.13.4/src/test.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/test.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/test.c 2007-01-08 21:19:43.000000000 -0500 @@ -169,10 +169,10 @@ gpc = gnome_print_job_get_context (job); config = gnome_print_job_get_config (job); @@ -4315,8 +4368,8 @@ result = g_utf8_collate (p_str, q_str); g_free (p_str); ---- gtkhtml-3.13.4/src/htmlengine-edit-selection-updater.c.code-cleanup 2001-08-24 15:24:08.000000000 -0400 -+++ gtkhtml-3.13.4/src/htmlengine-edit-selection-updater.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlengine-edit-selection-updater.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlengine-edit-selection-updater.c 2007-01-08 21:19:43.000000000 -0500 @@ -72,7 +72,7 @@ g_return_if_fail (updater != NULL); @@ -4362,8 +4415,8 @@ updater->idle_id = 0; /* run it now */ ---- gtkhtml-3.13.4/src/htmlengine-edit-cursor.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlengine-edit-cursor.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlengine-edit-cursor.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlengine-edit-cursor.c 2007-01-08 21:19:43.000000000 -0500 @@ -364,7 +364,7 @@ engine->blinking_status = FALSE; @@ -4391,8 +4444,8 @@ + g_source_remove (engine->blinking_timer_id); + engine->blinking_timer_id = g_timeout_add (BLINK_TIMEOUT, blink_timeout_cb, engine); } ---- gtkhtml-3.13.4/src/htmlembedded.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlembedded.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlembedded.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlembedded.c 2007-01-08 21:19:43.000000000 -0500 @@ -119,7 +119,7 @@ g_assert (element->widget->parent == element->parent); gtk_container_remove (GTK_CONTAINER (element->parent), element->widget); @@ -4402,8 +4455,8 @@ } } ---- gtkhtml-3.13.4/src/gtkhtml.c.code-cleanup 2007-01-07 10:19:52.000000000 -0500 -+++ gtkhtml-3.13.4/src/gtkhtml.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/gtkhtml.c.code-cleanup 2007-01-08 21:18:19.000000000 -0500 ++++ gtkhtml-3.13.5/src/gtkhtml.c 2007-01-08 21:19:43.000000000 -0500 @@ -169,7 +169,7 @@ static gboolean command (GtkHTML *html, GtkHTMLCommandType com_type); static gint mouse_change_pos (GtkWidget *widget, GdkWindow *window, gint x, gint y, gint state); @@ -4597,8 +4650,8 @@ if (obj) return gtk_html_get_url_object_relative (html, obj, html_object_get_url (obj, offset)); ---- gtkhtml-3.13.4/src/htmlengine.c.code-cleanup 2006-04-24 02:23:17.000000000 -0400 -+++ gtkhtml-3.13.4/src/htmlengine.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlengine.c.code-cleanup 2007-01-07 23:53:56.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlengine.c 2007-01-08 21:19:43.000000000 -0500 @@ -1403,7 +1403,7 @@ if (!(isspace (*str) || IS_UTF8_NBSP (str))) return FALSE; @@ -4617,7 +4670,7 @@ str = html_tokenizer_next_token (p->ht); /* printf ("\"%s\": was the string\n", str); */ continue; -@@ -4480,7 +4480,7 @@ +@@ -4481,7 +4481,7 @@ html_tokenizer_write (e->ht, buffer, size == -1 ? strlen (buffer) : size); if (e->parsing && e->timerId == 0) { @@ -4626,7 +4679,7 @@ } } -@@ -4586,7 +4586,7 @@ +@@ -4587,7 +4587,7 @@ return; DI (printf ("html_engine_schedule_update - timer %d\n", e->updateTimer)); if (e->updateTimer == 0) @@ -4635,7 +4688,7 @@ } -@@ -4856,7 +4856,7 @@ +@@ -4857,7 +4857,7 @@ else if (e->redraw_idle_id == 0) { clear_pending_expose (e); html_draw_queue_clear (e->draw_queue); @@ -4644,7 +4697,7 @@ } } -@@ -5043,7 +5043,7 @@ +@@ -5044,7 +5044,7 @@ e->avoid_para = FALSE; @@ -4653,7 +4706,7 @@ } -@@ -5110,7 +5110,7 @@ +@@ -5111,7 +5111,7 @@ if (e->clue == NULL) return NULL; @@ -4662,7 +4715,7 @@ if (obj != NULL) return html_object_get_url (obj, offset); -@@ -5617,7 +5617,7 @@ +@@ -5618,7 +5618,7 @@ if (engine->freeze_count == 1) { if (engine->thaw_idle_id == 0) { DF (printf ("queueing thaw_idle %d\n", engine->freeze_count);) @@ -4671,8 +4724,8 @@ } } else { engine->freeze_count--; ---- gtkhtml-3.13.4/src/htmltextslave.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmltextslave.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmltextslave.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmltextslave.c 2007-01-08 21:19:43.000000000 -0500 @@ -740,7 +740,8 @@ HTMLText *text = self->owner; GSList *cur; @@ -4704,8 +4757,8 @@ gdk_draw_rectangle (p->pixmap, p->gc, 0, box->x - p->x1, box->y - p->y1, box->width - 1, box->height - 1); gdk_gc_set_line_attributes (p->gc, 1, values.line_style, values.cap_style, values.join_style); } ---- gtkhtml-3.13.4/src/htmlgdkpainter.c.code-cleanup 2006-11-06 00:41:00.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlgdkpainter.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlgdkpainter.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlgdkpainter.c 2007-01-08 21:19:43.000000000 -0500 @@ -675,7 +675,7 @@ { HTMLGdkPainter *gdk_painter; @@ -4730,8 +4783,8 @@ gdk_draw_line (gdk_painter->pixmap, gdk_painter->gc, x, y + 1, x + width, y + 1); gdk_gc_set_line_attributes (gdk_painter->gc, values.line_width, values.line_style, values.cap_style, values.join_style); ---- gtkhtml-3.13.4/src/htmlclueflow.c.code-cleanup 2006-06-12 08:06:06.000000000 -0400 -+++ gtkhtml-3.13.4/src/htmlclueflow.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlclueflow.c.code-cleanup 2007-01-03 10:28:54.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlclueflow.c 2007-01-08 21:19:43.000000000 -0500 @@ -1996,14 +1996,14 @@ g_string_append (out, "\n"); } else { @@ -4883,8 +4936,8 @@ } } } ---- gtkhtml-3.13.4/src/htmlinterval.c.code-cleanup 2006-02-28 15:51:54.000000000 -0500 -+++ gtkhtml-3.13.4/src/htmlinterval.c 2007-01-07 10:20:40.000000000 -0500 +--- gtkhtml-3.13.5/src/htmlinterval.c.code-cleanup 2007-01-03 10:28:53.000000000 -0500 ++++ gtkhtml-3.13.5/src/htmlinterval.c 2007-01-08 21:19:43.000000000 -0500 @@ -58,7 +58,7 @@ inline void html_point_next_cursor (HTMLPoint *p) Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- gtkhtml3.spec 8 Jan 2007 13:38:12 -0000 1.81 +++ gtkhtml3.spec 9 Jan 2007 02:38:52 -0000 1.82 @@ -8,8 +8,8 @@ ### Abstract ### Name: gtkhtml3 -Version: 3.13.4 -Release: 2%{?dist} +Version: 3.13.5 +Release: 1%{?dist} License: LGPL/GPL Group: System Environment/Libraries Summary: gtkhtml library @@ -163,6 +163,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jan 08 2007 Matthew Barnes - 3.13.5-1.fc7 +- Update to 3.13.5 + * Mon Jan 08 2007 Matthew Barnes - 3.13.4-2.fc7 - Add patch for GNOME bug #394182 (code cleanup). - Remove patch for GNOME bug #363036 (superseded). Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 19 Dec 2006 18:34:12 -0000 1.46 +++ sources 9 Jan 2007 02:38:52 -0000 1.47 @@ -1 +1 @@ -db962b814de57d902b269dd793594508 gtkhtml-3.13.4.tar.bz2 +e12a6e11c4ef463c047ffab2152a1ff7 gtkhtml-3.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 02:52:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 21:52:29 -0500 Subject: rpms/evolution-connector/devel .cvsignore, 1.42, 1.43 evolution-connector.spec, 1.84, 1.85 sources, 1.42, 1.43 evolution-exchange-2.8.0-deprecated-glib.patch, 1.1, NONE Message-ID: <200701090252.l092qTCu012741@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12626 Modified Files: .cvsignore evolution-connector.spec sources Removed Files: evolution-exchange-2.8.0-deprecated-glib.patch Log Message: * Mon Jan 08 2007 Matthew Barnes - 2.9.5-1.fc7 - Update to 2.9.5 - Remove patch for GNOME bug #357660 (fixed upstream). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 19 Dec 2006 21:07:04 -0000 1.42 +++ .cvsignore 9 Jan 2007 02:52:27 -0000 1.43 @@ -1 +1 @@ -evolution-exchange-2.9.4.tar.bz2 +evolution-exchange-2.9.5.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- evolution-connector.spec 19 Dec 2006 21:07:04 -0000 1.84 +++ evolution-connector.spec 9 Jan 2007 02:52:27 -0000 1.85 @@ -21,7 +21,7 @@ ### Abstract ### Name: evolution-connector -Version: 2.9.4 +Version: 2.9.5 Release: 1%{?dist} License: GPL Group: Applications/Productivity @@ -39,11 +39,8 @@ # We do not ship gnome-common (or at least we're not supposed to). Patch13: evolution-exchange-2.7.2-no_gnome_common.patch -# Gnome.org bug #357660 -Patch14: evolution-exchange-2.8.0-deprecated-glib.patch - -# Gnome.org bug #360240 -Patch15: evolution-exchange-2.8.1-warn-unused-variable.patch +# GNOME bug #360240 +Patch14: evolution-exchange-2.8.1-warn-unused-variable.patch ### Dependencies ### @@ -78,8 +75,7 @@ %patch11 -p1 -b .64bit-fix-acinclude.m4 %patch12 -p1 -b .fix-marshaller %patch13 -p1 -b .no_gnome_common -%patch14 -p1 -b .deprecated-glib -%patch15 -p1 -b .warn-unused-variable +%patch14 -p1 -b .warn-unused-variable %build export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" @@ -149,6 +145,10 @@ %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas %changelog +* Mon Jan 08 2007 Matthew Barnes - 2.9.5-1.fc7 +- Update to 2.9.5 +- Remove patch for GNOME bug #357660 (fixed upstream). + * Tue Dec 19 2006 Matthew Barnes - 2.9.4-1.fc7 - Update to 2.9.4 - Require evolution-data-server-1.9.4. Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 19 Dec 2006 21:07:04 -0000 1.42 +++ sources 9 Jan 2007 02:52:27 -0000 1.43 @@ -1 +1 @@ -ddd38622a05f26683af18c8914ac9fa2 evolution-exchange-2.9.4.tar.bz2 +75dbcc3b797bd867e4fdf96d01b5d7e2 evolution-exchange-2.9.5.tar.bz2 --- evolution-exchange-2.8.0-deprecated-glib.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 02:54:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 21:54:01 -0500 Subject: rpms/evolution/devel .cvsignore, 1.63, 1.64 evolution.spec, 1.222, 1.223 sources, 1.63, 1.64 evolution-2.9.2-optional-participant.patch, 1.2, NONE evolution-2.9.2-pilot-link-0.12.patch, 1.1, NONE evolution-2.9.3-dont-assume-default-account.patch, 1.1, NONE Message-ID: <200701090254.l092s1w6014028@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13853 Modified Files: .cvsignore evolution.spec sources Removed Files: evolution-2.9.2-optional-participant.patch evolution-2.9.2-pilot-link-0.12.patch evolution-2.9.3-dont-assume-default-account.patch Log Message: * Mon Jan 08 2008 Matthew Barnes - 2.9.5-1.fc7 - Update to 2.9.5 - Remove pilot-link-0.12 patch (fixed upstream). - Remove patch for RH bug #215466 and #218589 (fixed upstream). - Remove patch for RH bug #215695 (fixed upstream). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 19 Dec 2006 22:24:50 -0000 1.63 +++ .cvsignore 9 Jan 2007 02:53:59 -0000 1.64 @@ -1,6 +1 @@ -evolution-2.9.4.tar.bz2 -evolution16.png -evolution22.png -evolution24.png -evolution32.png -evolution.svg +evolution-2.9.5.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- evolution.spec 30 Dec 2006 15:48:36 -0000 1.222 +++ evolution.spec 9 Jan 2007 02:53:59 -0000 1.223 @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 2.9.4 -Release: 4%{?dist} +Version: 2.9.5 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -139,36 +139,26 @@ # GNOME bug #373837 Patch35: evolution-2.9.2-gtk-font-button.patch -# Port evolution conduits to pilot-link 0.12 -# http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html -Patch36: evolution-2.9.2-pilot-link-0.12.patch - -# RH bug #215466 / RH bug #218589 / GNOME bug #377511 -Patch37: evolution-2.9.2-optional-participant.patch - -# RH bug #215695 / GNOME bug #383027 -Patch39: evolution-2.9.3-dont-assume-default-account.patch - # RH bug #216537 / GNOME bug #383047 -#Patch40: evolution-2.9.3-view-attachment-uri.patch +#Patch36: evolution-2.9.3-view-attachment-uri.patch # GNOME bug #350253 -Patch41: evolution-2.9.3-adopt-icons.patch +Patch37: evolution-2.9.3-adopt-icons.patch # RH bug #215478 / GNOME bug #383842 -Patch42: evolution-2.9.3-source-path-entry.patch +Patch38: evolution-2.9.3-source-path-entry.patch # RH bug #218801 / GNOME bug #383953 -Patch43: evolution-2.9.3-unread-messages.patch +Patch39: evolution-2.9.3-unread-messages.patch # RH bug #215467 / GNOME bug #380644 -Patch44: evolution-2.9.3-meeting-list-view.patch +Patch40: evolution-2.9.3-meeting-list-view.patch # GNOME bug #373116 -Patch45: evolution-2.9.3-gtk-color-button.patch +Patch41: evolution-2.9.3-gtk-color-button.patch # GNOME bug #218898 -Patch46: evolution-2.9.4-view-message-source.patch +Patch42: evolution-2.9.4-view-message-source.patch ## Dependencies ### @@ -309,16 +299,13 @@ %patch33 -p1 -b .im-context-reset %patch34 -p1 -b .first-ascii %patch35 -p1 -b .gtk-font-button -%patch36 -p1 -b .pilot-link-0.12 -%patch37 -p1 -b .optional-participant -%patch39 -p1 -b .dont-assume-default-account -#%patch40 -p1 -b .view-attachment-uri -%patch41 -p1 -b .adopt-icons -%patch42 -p1 -b .source-path-entry -%patch43 -p1 -b .unread-messages -%patch44 -p1 -b .meeting-list-view -%patch45 -p1 -b .gtk-color-button -%patch46 -p1 -b .view-message-source +#%patch36 -p1 -b .view-attachment-uri +%patch37 -p1 -b .adopt-icons +%patch38 -p1 -b .source-path-entry +%patch39 -p1 -b .unread-messages +%patch40 -p1 -b .meeting-list-view +%patch41 -p1 -b .gtk-color-button +%patch42 -p1 -b .view-message-source mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -734,6 +721,12 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jan 08 2008 Matthew Barnes - 2.9.5-1.fc7 +- Update to 2.9.5 +- Remove pilot-link-0.12 patch (fixed upstream). +- Remove patch for RH bug #215466 and #218589 (fixed upstream). +- Remove patch for RH bug #215695 (fixed upstream). + * Sat Dec 30 2006 Matthew Barnes - 2.9.4-4.fc7 - Add Requires evolution-data-server-devel to devel subpackage (RH bug #218889). Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 19 Dec 2006 22:24:50 -0000 1.63 +++ sources 9 Jan 2007 02:53:59 -0000 1.64 @@ -1,4 +1,4 @@ -8915ed5f5b4c0351f05a428111b46216 evolution-2.9.4.tar.bz2 +ef0c0eaff9fc7c3372bcac947d0cb0b8 evolution-2.9.5.tar.bz2 4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png de663fa442d61f53dc058dd20c77da8e evolution22.png d33896d33b5db2201e051664e96b1100 evolution24.png --- evolution-2.9.2-optional-participant.patch DELETED --- --- evolution-2.9.2-pilot-link-0.12.patch DELETED --- --- evolution-2.9.3-dont-assume-default-account.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 03:42:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 22:42:27 -0500 Subject: rpms/gnucash/FC-6 .cvsignore, 1.24, 1.25 gnucash.spec, 1.59, 1.60 sources, 1.25, 1.26 Message-ID: <200701090342.l093gRCN026619@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26603 Modified Files: .cvsignore gnucash.spec sources Log Message: update to 2.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnucash/FC-6/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 11 Oct 2006 19:15:21 -0000 1.24 +++ .cvsignore 9 Jan 2007 03:42:25 -0000 1.25 @@ -1,2 +1,3 @@ gnucash-2.0.2.tar.bz2 gnucash-docs-2.0.1.tar.bz2 +gnucash-2.0.4.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/FC-6/gnucash.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- gnucash.spec 11 Oct 2006 19:17:16 -0000 1.59 +++ gnucash.spec 9 Jan 2007 03:42:25 -0000 1.60 @@ -5,7 +5,7 @@ Name: gnucash Summary: GnuCash is an application to keep track of your finances. -Version: 2.0.2 +Version: 2.0.4 %if %{buildsvn} Release: 1%{?dist}.%{svnrev}svn.1 %else @@ -151,6 +151,9 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Mon Jan 8 2006 Bill Nottingham - 2.0.4-1 +- update to 2.0.4 + * Wed Oct 11 2006 Bill Nottingham - 2.0.2-1 - update to 2.0.2 - update docs to 2.0.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnucash/FC-6/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 11 Oct 2006 19:15:21 -0000 1.25 +++ sources 9 Jan 2007 03:42:25 -0000 1.26 @@ -1,2 +1,2 @@ -35da0a03d52a5913b75f6e7d717b58f0 gnucash-2.0.2.tar.bz2 ffc058efd0283a4b43ca31980c40db49 gnucash-docs-2.0.1.tar.bz2 +5755b05a3eaebab392fe9ad49073beb2 gnucash-2.0.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 03:44:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 22:44:22 -0500 Subject: rpms/gnucash/FC-6 gnucash.spec,1.60,1.61 Message-ID: <200701090344.l093iMgp026680@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26666 Modified Files: gnucash.spec Log Message: duh. Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/FC-6/gnucash.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gnucash.spec 9 Jan 2007 03:42:25 -0000 1.60 +++ gnucash.spec 9 Jan 2007 03:44:20 -0000 1.61 @@ -151,7 +151,7 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog -* Mon Jan 8 2006 Bill Nottingham - 2.0.4-1 +* Mon Jan 8 2007 Bill Nottingham - 2.0.4-1 - update to 2.0.4 * Wed Oct 11 2006 Bill Nottingham - 2.0.2-1 From fedora-cvs-commits at redhat.com Tue Jan 9 03:46:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 22:46:06 -0500 Subject: rpms/autofs/devel autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 autofs.spec, 1.171, 1.172 sources, 1.14, 1.15 autofs-5.0.1-rc2-add-export-syntax-checks.patch, 1.1, NONE autofs-5.0.1-rc2-admit-slashify-colons.patch, 1.1, NONE autofs-5.0.1-rc2-afs-buffer-overflow-check.patch, 1.1, NONE autofs-5.0.1-rc2-allow-underscore-in-hostname.patch, 1.1, NONE autofs-5.0.1-rc2-cancelled-check.patch, 1.1, NONE autofs-5.0.1-rc2-change-mount-device-to-map-name.patch, 1.1, NONE autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch, 1.1, NONE autofs-5.0.1-rc2-close-on-exec.patch, 1.1, NONE autofs-5.0.1-rc2-default-master-uses-hosts.patch, 1.1, NONE autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch, 1.1, NONE autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch, 1.1, NONE autofs-5.0.1-rc2-dont-create-remote-dirs.patch, 1.2, NONE autofs-5.0.1-rc2-fix-catch-global-options.patch, 1.1, NONE autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch, 1.1, NONE autofs-5.0.1-rc2-fix! -manual-umount-regression.patch, 1.1, NONE autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch, 1.1, NONE autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch, 1.1, NONE autofs-5.0.1-rc2-fix-null-map-semantics.patch, 1.1, NONE autofs-5.0.1-rc2-fix-use-after-free.patch, 1.2, NONE autofs-5.0.1-rc2-get_query_dn-subtree-2.patch, 1.1, NONE autofs-5.0.1-rc2-get_query_dn-subtree.patch, 1.1, NONE autofs-5.0.1-rc2-handle-autofs-options.patch, 1.1, NONE autofs-5.0.1-rc2-hosts-check-exports-update.patch, 1.1, NONE autofs-5.0.1-rc2-include-check-full-path.patch, 1.2, NONE autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch, 1.1, NONE autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch, 1.1, NONE autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch, 1.1, NONE autofs-5.0.1-rc2-ldap-noexist-rmdir.patch, 1.1, NONE autofs-5.0.1-rc2-long-timout-option-use-space.patch, 1.1, NONE autofs-5.0.1-rc2-macro-table-locking.patch, 1.1, NONE autofs-5.0.1-rc2-masked_match-hostname-independent.patch, 1.1, NONE autofs-5.0.1-rc2-master-map-relo! ad-options-update.patch,1.1,NONE autofs-5.0.1-rc2-misc-memory-! leaks.pa Message-ID: <200701090346.l093k61r026765@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26735 Modified Files: .cvsignore autofs.spec sources Added Files: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch Removed Files: autofs-5.0.1-rc2-add-export-syntax-checks.patch autofs-5.0.1-rc2-admit-slashify-colons.patch autofs-5.0.1-rc2-afs-buffer-overflow-check.patch autofs-5.0.1-rc2-allow-underscore-in-hostname.patch autofs-5.0.1-rc2-cancelled-check.patch autofs-5.0.1-rc2-change-mount-device-to-map-name.patch autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch autofs-5.0.1-rc2-close-on-exec.patch autofs-5.0.1-rc2-default-master-uses-hosts.patch autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch autofs-5.0.1-rc2-dont-create-remote-dirs.patch autofs-5.0.1-rc2-fix-catch-global-options.patch autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch autofs-5.0.1-rc2-fix-manual-umount-regression.patch autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch autofs-5.0.1-rc2-fix-null-map-semantics.patch autofs-5.0.1-rc2-fix-use-after-free.patch autofs-5.0.1-rc2-get_query_dn-subtree-2.patch autofs-5.0.1-rc2-get_query_dn-subtree.patch autofs-5.0.1-rc2-handle-autofs-options.patch autofs-5.0.1-rc2-hosts-check-exports-update.patch autofs-5.0.1-rc2-include-check-full-path.patch autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch autofs-5.0.1-rc2-ldap-noexist-rmdir.patch autofs-5.0.1-rc2-long-timout-option-use-space.patch autofs-5.0.1-rc2-macro-table-locking.patch autofs-5.0.1-rc2-masked_match-hostname-independent.patch autofs-5.0.1-rc2-master-map-reload-options-update.patch autofs-5.0.1-rc2-misc-memory-leaks.patch autofs-5.0.1-rc2-mount_nfs-use-fstype.patch autofs-5.0.1-rc2-nfs4-get-port.patch autofs-5.0.1-rc2-nfs4-only-server.patch autofs-5.0.1-rc2-nss-parse-fd-leak.patch autofs-5.0.1-rc2-nsswitch-parser-locking.patch autofs-5.0.1-rc2-numeric-ldap-host-name.patch autofs-5.0.1-rc2-one-master-map-read-only.patch autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch autofs-5.0.1-rc2-recursive-bind-mount.patch autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch autofs-5.0.1-rc2-replace-tempnam.patch autofs-5.0.1-rc2-replicated-close-sock.patch autofs-5.0.1-rc2-request-memory-leak.patch autofs-5.0.1-rc2-require-kproto-v5.patch autofs-5.0.1-rc2-rpc_subs-fd-leak.patch autofs-5.0.1-rc2-set-socket-close-on-exec.patch autofs-5.0.1-rc2-submount-cache-clean.patch autofs-5.0.1-rc2-use-task-done.patch Log Message: * Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.1 - consolidate to rc3. - fix typo in Fix typo in var when removing temp directory (bz 221847). - Resolves: rhbz#221847 autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch: CHANGELOG | 4 ++++ modules/mount_bind.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch --- diff --git a/CHANGELOG b/CHANGELOG index f74203a..596d29a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +?/?/2007 autofs-5.0.1 +--------------------- +- fix typo in Fix typo in var when removing temp directory. + 4/1/2007 autofs-5.0.1 rc3 ------------------------- - fix handling of autofs specific mount options. diff --git a/modules/mount_bind.c b/modules/mount_bind.c index 16ae758..cb17ce4 100644 --- a/modules/mount_bind.c +++ b/modules/mount_bind.c @@ -64,7 +64,7 @@ int mount_init(void **context) spawn_umount(log_debug, "-n", t2_dir, NULL); out: - rmdir(t2_dir); + rmdir(t1_dir); rmdir(t2_dir); return 0; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 1 Sep 2006 06:11:58 -0000 1.14 +++ .cvsignore 9 Jan 2007 03:46:04 -0000 1.15 @@ -1 +1 @@ -autofs-5.0.1-rc2.tar.bz2 +autofs-5.0.1-rc3.tar.gz Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- autofs.spec 27 Dec 2006 04:33:41 -0000 1.171 +++ autofs.spec 9 Jan 2007 03:46:04 -0000 1.172 @@ -4,65 +4,14 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 5.0.1 -%define release 0.rc2.41 +%define release 0.rc3.1 Version: %{version} Release: %{release} Epoch: 1 License: GPL Group: System Environment/Daemons -Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc2.tar.bz2 -Patch0: autofs-5.0.1-rc2-handle-autofs-options.patch -Patch1: autofs-5.0.1-rc2-include-check-full-path.patch -Patch2: autofs-5.0.1-rc2-submount-cache-clean.patch -Patch3: autofs-5.0.1-rc2-ldap-noexist-rmdir.patch -Patch4: autofs-5.0.1-rc2-replicated-close-sock.patch -Patch5: autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch -Patch6: autofs-5.0.1-rc2-default-master-uses-hosts.patch -Patch7: autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch -Patch8: autofs-5.0.1-rc2-master-map-reload-options-update.patch -Patch9: autofs-5.0.1-rc2-mount_nfs-use-fstype.patch -Patch10: autofs-5.0.1-rc2-get_query_dn-subtree.patch -Patch11: autofs-5.0.1-rc2-long-timout-option-use-space.patch -Patch12: autofs-5.0.1-rc2-masked_match-hostname-independent.patch -Patch13: autofs-5.0.1-rc2-nss-parse-fd-leak.patch -Patch14: autofs-5.0.1-rc2-request-memory-leak.patch -Patch15: autofs-5.0.1-rc2-cancelled-check.patch -Patch16: autofs-5.0.1-rc2-rpc_subs-fd-leak.patch -Patch17: autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch -Patch18: autofs-5.0.1-rc2-nfs4-only-server.patch -Patch19: autofs-5.0.1-rc2-close-on-exec.patch -Patch20: autofs-5.0.1-rc2-numeric-ldap-host-name.patch -Patch21: autofs-5.0.1-rc2-get_query_dn-subtree-2.patch -Patch22: autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch -Patch23: autofs-5.0.1-rc2-dont-create-remote-dirs.patch -Patch24: autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch -Patch25: autofs-5.0.1-rc2-macro-table-locking.patch -Patch26: autofs-5.0.1-rc2-nsswitch-parser-locking.patch -Patch27: autofs-5.0.1-rc2-one-master-map-read-only.patch -Patch28: autofs-5.0.1-rc2-misc-memory-leaks.patch -Patch29: autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch -Patch30: autofs-5.0.1-rc2-recursive-bind-mount.patch -Patch31: autofs-5.0.1-rc2-require-kproto-v5.patch -Patch32: autofs-5.0.1-rc2-fix-manual-umount-regression.patch -Patch33: autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch -Patch34: autofs-5.0.1-rc2-fix-catch-global-options.patch -Patch35: autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch -Patch36: autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch -Patch37: autofs-5.0.1-rc2-fix-use-after-free.patch -Patch38: autofs-5.0.1-rc2-use-task-done.patch -Patch39: autofs-5.0.1-rc2-nfs4-get-port.patch -Patch40: autofs-5.0.1-rc2-fix-null-map-semantics.patch -Patch41: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch -Patch42: autofs-5.0.1-rc2-add-export-syntax-checks.patch -Patch43: autofs-5.0.1-rc2-hosts-check-exports-update.patch -Patch44: autofs-5.0.1-rc2-change-mount-device-to-map-name.patch -Patch45: autofs-5.0.1-rc2-afs-buffer-overflow-check.patch -Patch46: autofs-5.0.1-rc2-replace-tempnam.patch -Patch47: autofs-5.0.1-rc2-admit-slashify-colons.patch -Patch48: autofs-5.0.1-rc2-allow-underscore-in-hostname.patch -Patch49: autofs-5.0.1-rc2-set-socket-close-on-exec.patch -Patch50: autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch -Patch51: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch +Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc3.tar.bz2 +Patch1: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch Buildroot: /var/tmp/autofs-tmp BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Prereq: chkconfig @@ -102,58 +51,7 @@ %prep %setup -q echo %{version}-%{release} > .version -%patch0 -p1 %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 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -210,6 +108,10 @@ %{_libdir}/autofs/* %changelog +* Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.1 +- consolidate to rc3. +- fix typo in Fix typo in var when removing temp directory (bz 221847). + * Wed Dec 27 2006 Ian Kent - 5.0.1-0.rc2.41 - fix nonstrict multi-mount handling (bz 219383). - correct detection of duplicate indirect mount entries (bz 220799). Index: sources =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 1 Sep 2006 06:12:06 -0000 1.14 +++ sources 9 Jan 2007 03:46:04 -0000 1.15 @@ -1 +1 @@ -4ff63b6833cc1eac8d75bff0c10f6d76 autofs-5.0.1-rc2.tar.bz2 +b8d1ab68cc340b424eb857c7eaa9d5d3 autofs-5.0.1-rc3.tar.gz --- autofs-5.0.1-rc2-add-export-syntax-checks.patch DELETED --- --- autofs-5.0.1-rc2-admit-slashify-colons.patch DELETED --- --- autofs-5.0.1-rc2-afs-buffer-overflow-check.patch DELETED --- --- autofs-5.0.1-rc2-allow-underscore-in-hostname.patch DELETED --- --- autofs-5.0.1-rc2-cancelled-check.patch DELETED --- --- autofs-5.0.1-rc2-change-mount-device-to-map-name.patch DELETED --- --- autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch DELETED --- --- autofs-5.0.1-rc2-close-on-exec.patch DELETED --- --- autofs-5.0.1-rc2-default-master-uses-hosts.patch DELETED --- --- autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch DELETED --- --- autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch DELETED --- --- autofs-5.0.1-rc2-dont-create-remote-dirs.patch DELETED --- --- autofs-5.0.1-rc2-fix-catch-global-options.patch DELETED --- --- autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch DELETED --- --- autofs-5.0.1-rc2-fix-manual-umount-regression.patch DELETED --- --- autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch DELETED --- --- autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch DELETED --- --- autofs-5.0.1-rc2-fix-null-map-semantics.patch DELETED --- --- autofs-5.0.1-rc2-fix-use-after-free.patch DELETED --- --- autofs-5.0.1-rc2-get_query_dn-subtree-2.patch DELETED --- --- autofs-5.0.1-rc2-get_query_dn-subtree.patch DELETED --- --- autofs-5.0.1-rc2-handle-autofs-options.patch DELETED --- --- autofs-5.0.1-rc2-hosts-check-exports-update.patch DELETED --- --- autofs-5.0.1-rc2-include-check-full-path.patch DELETED --- --- autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch DELETED --- --- autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch DELETED --- --- autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch DELETED --- --- autofs-5.0.1-rc2-ldap-noexist-rmdir.patch DELETED --- --- autofs-5.0.1-rc2-long-timout-option-use-space.patch DELETED --- --- autofs-5.0.1-rc2-macro-table-locking.patch DELETED --- --- autofs-5.0.1-rc2-masked_match-hostname-independent.patch DELETED --- --- autofs-5.0.1-rc2-master-map-reload-options-update.patch DELETED --- --- autofs-5.0.1-rc2-misc-memory-leaks.patch DELETED --- --- autofs-5.0.1-rc2-mount_nfs-use-fstype.patch DELETED --- --- autofs-5.0.1-rc2-nfs4-get-port.patch DELETED --- --- autofs-5.0.1-rc2-nfs4-only-server.patch DELETED --- --- autofs-5.0.1-rc2-nss-parse-fd-leak.patch DELETED --- --- autofs-5.0.1-rc2-nsswitch-parser-locking.patch DELETED --- --- autofs-5.0.1-rc2-numeric-ldap-host-name.patch DELETED --- --- autofs-5.0.1-rc2-one-master-map-read-only.patch DELETED --- --- autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch DELETED --- --- autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch DELETED --- --- autofs-5.0.1-rc2-recursive-bind-mount.patch DELETED --- --- autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch DELETED --- --- autofs-5.0.1-rc2-replace-tempnam.patch DELETED --- --- autofs-5.0.1-rc2-replicated-close-sock.patch DELETED --- --- autofs-5.0.1-rc2-request-memory-leak.patch DELETED --- --- autofs-5.0.1-rc2-require-kproto-v5.patch DELETED --- --- autofs-5.0.1-rc2-rpc_subs-fd-leak.patch DELETED --- --- autofs-5.0.1-rc2-set-socket-close-on-exec.patch DELETED --- --- autofs-5.0.1-rc2-submount-cache-clean.patch DELETED --- --- autofs-5.0.1-rc2-use-task-done.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 03:49:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 22:49:30 -0500 Subject: rpms/autofs/devel .cvsignore,1.15,1.16 sources,1.15,1.16 Message-ID: <200701090349.l093nUTP014770@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14755 Modified Files: .cvsignore sources Log Message: - upload correct source file (bz2 not gz), oops. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Jan 2007 03:46:04 -0000 1.15 +++ .cvsignore 9 Jan 2007 03:49:25 -0000 1.16 @@ -1 +1 @@ -autofs-5.0.1-rc3.tar.gz +autofs-5.0.1-rc3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 9 Jan 2007 03:46:04 -0000 1.15 +++ sources 9 Jan 2007 03:49:25 -0000 1.16 @@ -1 +1 @@ -b8d1ab68cc340b424eb857c7eaa9d5d3 autofs-5.0.1-rc3.tar.gz +7cf64434fd19a56506fcd1f64034740c autofs-5.0.1-rc3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 04:02:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 23:02:13 -0500 Subject: rpms/libofx/devel libofx.spec,1.19,1.20 Message-ID: <200701090402.l0942DSC015111@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15097 Modified Files: libofx.spec Log Message: spec tweaks Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libofx.spec 28 Aug 2006 20:42:27 -0000 1.19 +++ libofx.spec 9 Jan 2007 04:02:11 -0000 1.20 @@ -1,15 +1,17 @@ Summary: A library for supporting Open Financial Exchange (OFX) Name: libofx Version: 0.8.2 -Release: 1 -Source: http://download.sourceforge.net/libofx/%{name}-%{version}.tar.gz +Release: 2 +Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz +URL: http://libofx.sourceforge.net/ Requires: openjade >= 1.3.1 Group: System Environment/Libraries License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: opensp-devel BuildRequires: curl-devel -Prereq: /sbin/ldconfig +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig %description This is the LibOFX library. It is a API designed to allow applications to @@ -63,6 +65,9 @@ %{_libdir}/*.so %changelog +* Mon Jan 8 2007 Bill Nottingham - 0.8.2-2 +- spec tweaks + * Mon Aug 28 2006 Bill Nottingham - 0.8.2-1 - update to 0.8.2 @@ -70,7 +75,7 @@ - rebuild * Tue Jul 11 2006 Bill Nottingham - 0.8.0-3 -- own %{_datadir}/libofx (#169336) +- own %%{_datadir}/libofx (#169336) * Mon May 15 2006 Brian Pepple - 0.8.0-2.3 - Add BR for curl-devel. From fedora-cvs-commits at redhat.com Tue Jan 9 04:14:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 23:14:20 -0500 Subject: rpms/libofx/devel libofx.spec,1.20,1.21 Message-ID: <200701090414.l094EKf1015411@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15393 Modified Files: libofx.spec Log Message: remove CVS dir Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libofx.spec 9 Jan 2007 04:02:11 -0000 1.20 +++ libofx.spec 9 Jan 2007 04:14:18 -0000 1.21 @@ -20,7 +20,7 @@ specification. %package devel -Summary: Development files needed for accessing OFX data. +Summary: Development files needed for accessing OFX data Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -31,6 +31,7 @@ %prep %setup -q +rm -rf ./doc/ofx_sample_files/CVS %build %configure --with-opensp-libs=%{_libdir} From fedora-cvs-commits at redhat.com Tue Jan 9 04:14:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 23:14:55 -0500 Subject: rpms/libofx/devel libofx.spec,1.21,1.22 Message-ID: <200701090414.l094EtAX015437@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15423 Modified Files: libofx.spec Log Message: more cleanups Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libofx.spec 9 Jan 2007 04:14:18 -0000 1.21 +++ libofx.spec 9 Jan 2007 04:14:53 -0000 1.22 @@ -32,6 +32,7 @@ %prep %setup -q rm -rf ./doc/ofx_sample_files/CVS +chmod 644 ./doc/ofx_sample_files/* %build %configure --with-opensp-libs=%{_libdir} From fedora-cvs-commits at redhat.com Tue Jan 9 04:35:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 23:35:54 -0500 Subject: rpms/fonts-arabic/devel .cvsignore, 1.7, 1.8 fonts-arabic.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200701090435.l094ZsaQ020680@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-arabic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20438 Modified Files: .cvsignore fonts-arabic.spec sources Log Message: -Resolves: RH#221385 PakTypeTehreer.ttf contains a space in PS name (Parag Nemade) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 5 Dec 2006 05:56:55 -0000 1.7 +++ .cvsignore 9 Jan 2007 04:35:52 -0000 1.8 @@ -2,3 +2,4 @@ paktype-20060712.tar.bz2 paktype-20060712.tar.gz paktype-20061205.tar.gz +paktype-20061222.tar.gz Index: fonts-arabic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/devel/fonts-arabic.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fonts-arabic.spec 5 Dec 2006 06:06:02 -0000 1.15 +++ fonts-arabic.spec 9 Jan 2007 04:35:52 -0000 1.16 @@ -1,9 +1,9 @@ %define kacst KacstArabicFonts-1.5 -%define paktype paktype-20061205 +%define paktype paktype-20061222 Name: fonts-arabic Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Source0: %{kacst}.tar.gz Source1: %{paktype}.tar.gz @@ -52,6 +52,9 @@ %{_datadir}/fonts/arabic/*.ttf %changelog +* Tue Jan 09 2007 Parag Nemade - 2.0-4 +- Resolved:bug rh#221385 PakTypeTehreer.ttf contains a space in PS name (Parag Nemade) + * Tue Dec 05 2006 Parag Nemade - 2.0-3 - Fixed bug 218411 PakTypeNaqsh.ttf contains a space in PS name Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 Dec 2006 05:56:55 -0000 1.7 +++ sources 9 Jan 2007 04:35:52 -0000 1.8 @@ -1,2 +1,2 @@ d27ec36204feb4e8e6c50eebffd76f55 KacstArabicFonts-1.5.tar.gz -6f98186ce64c30539bc426d3e0f3becd paktype-20061205.tar.gz +cd75bd7fa714f307d25407a61f8bc43c paktype-20061222.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 9 04:42:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 8 Jan 2007 23:42:45 -0500 Subject: rpms/fonts-arabic/FC-6 .cvsignore, 1.6, 1.7 fonts-arabic.spec, 1.14, 1.15 sources, 1.6, 1.7 Message-ID: <200701090442.l094gjth026053@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-arabic/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25896 Modified Files: .cvsignore fonts-arabic.spec sources Log Message: -Resolves: RH#221385 PakTypeTehreer.ttf contains a space in PS name (Parag Nemade) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 4 Jan 2007 11:32:59 -0000 1.6 +++ .cvsignore 9 Jan 2007 04:42:43 -0000 1.7 @@ -1,3 +1,4 @@ KacstArabicFonts-1.5.tar.gz paktype-20060712.tar.bz2 paktype-20061205.tar.gz +paktype-20061222.tar.gz Index: fonts-arabic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/fonts-arabic.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fonts-arabic.spec 5 Jan 2007 04:24:27 -0000 1.14 +++ fonts-arabic.spec 9 Jan 2007 04:42:43 -0000 1.15 @@ -1,9 +1,9 @@ %define kacst KacstArabicFonts-1.5 -%define paktype paktype-20061205 +%define paktype paktype-20061222 Name: fonts-arabic Version: 2.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Source0: %{kacst}.tar.gz Source1: %{paktype}.tar.gz @@ -52,6 +52,9 @@ %{_datadir}/fonts/arabic/*.ttf %changelog +* Tue Jan 09 2007 Parag Nemade - 2.0-4 +- Resolved:bug rh#221385 PakTypeTehreer.ttf contains a space in PS name (Parag Nemade) + * Tue Dec 05 2006 Parag Nemade - 2.0-3 - Fixed bug 218411 PakTypeNaqsh.ttf contains a space in PS name Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-arabic/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Jan 2007 11:32:59 -0000 1.6 +++ sources 9 Jan 2007 04:42:43 -0000 1.7 @@ -1,2 +1,3 @@ d27ec36204feb4e8e6c50eebffd76f55 KacstArabicFonts-1.5.tar.gz 6f98186ce64c30539bc426d3e0f3becd paktype-20061205.tar.gz +cd75bd7fa714f307d25407a61f8bc43c paktype-20061222.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 9 05:44:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 00:44:10 -0500 Subject: rpms/libofx/devel libofx.spec,1.22,1.23 Message-ID: <200701090544.l095iA0L011722@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11569 Modified Files: libofx.spec Log Message: more tweaks Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libofx.spec 9 Jan 2007 04:14:53 -0000 1.22 +++ libofx.spec 9 Jan 2007 05:44:08 -0000 1.23 @@ -1,13 +1,12 @@ Summary: A library for supporting Open Financial Exchange (OFX) Name: libofx Version: 0.8.2 -Release: 2 +Release: 3 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz URL: http://libofx.sourceforge.net/ -Requires: openjade >= 1.3.1 Group: System Environment/Libraries License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: opensp-devel BuildRequires: curl-devel Requires(post): /sbin/ldconfig @@ -35,15 +34,15 @@ chmod 644 ./doc/ofx_sample_files/* %build -%configure --with-opensp-libs=%{_libdir} +%configure --with-opensp-libs=%{_libdir} --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*a $RPM_BUILD_ROOT/%{_datadir}/doc +rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_datadir}/doc %clean rm -rf $RPM_BUILD_ROOT @@ -67,7 +66,7 @@ %{_libdir}/*.so %changelog -* Mon Jan 8 2007 Bill Nottingham - 0.8.2-2 +* Mon Jan 8 2007 Bill Nottingham - 0.8.2-3 - spec tweaks * Mon Aug 28 2006 Bill Nottingham - 0.8.2-1 From fedora-cvs-commits at redhat.com Tue Jan 9 06:19:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 01:19:07 -0500 Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.14,1.15 Message-ID: <200701090619.l096J7kV023739@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gwenhywfar/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23617 Modified Files: gwenhywfar.spec Log Message: spec tweaks Index: gwenhywfar.spec =================================================================== RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gwenhywfar.spec 7 Sep 2006 14:19:16 -0000 1.14 +++ gwenhywfar.spec 9 Jan 2007 06:19:05 -0000 1.15 @@ -1,21 +1,21 @@ Summary: A multi-platform helper library for other libraries Name: gwenhywfar Version: 2.3.0 -Release: 4 +Release: 5 Source: http://download.sourceforge.net/gwenhywfar/%{name}-%{version}.tar.gz Group: System Environment/Libraries License: LGPL Patch: gwenhywfar-2.3.0-pkgconfig.patch URL: http://sourceforge.net/projects/gwenhywfar -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel gettext -Prereq: /sbin/ldconfig +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig %description This is Gwenhywfar, a multi-platform helper library for networking and security applications and libraries. It is heavily used by libchipcard -www.libchipcard.de and AqBanking/AqHBCI, the German online banking -libraries. +and AqBanking/AqHBCI, the German online banking libraries. %package devel Summary: Gwenhywfar development kit @@ -63,17 +63,22 @@ /etc/* %{_libdir}/*.so.* %{_libdir}/%{name} +%exclude %{_libdir}/%{name}/include %{_datadir}/locale/*/LC_MESSAGES/gwenhywfar.mo %files devel %defattr(-,root,root) %{_bindir}/* %{_includedir}/gwenhywfar +%{_libdir}/%{name}/include %{_libdir}/*.so %{_libdir}/pkgconfig/* %{_datadir}/aclocal/gwenhywfar.m4 %changelog +* Tue Jan 9 2006 Bill Nottingham - 2.3.0-5 +- spec tweaks + * Thu Sep 7 2006 Bill Nottingham - 2.3.0-4 - rebuild for fixed debuginfo (#205501) From fedora-cvs-commits at redhat.com Tue Jan 9 06:20:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 01:20:18 -0500 Subject: rpms/gwenhywfar/devel gwenhywfar.spec,1.15,1.16 Message-ID: <200701090620.l096KIix025289@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gwenhywfar/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25194 Modified Files: gwenhywfar.spec Log Message: update Index: gwenhywfar.spec =================================================================== RCS file: /cvs/dist/rpms/gwenhywfar/devel/gwenhywfar.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gwenhywfar.spec 9 Jan 2007 06:19:05 -0000 1.15 +++ gwenhywfar.spec 9 Jan 2007 06:20:16 -0000 1.16 @@ -76,7 +76,7 @@ %{_datadir}/aclocal/gwenhywfar.m4 %changelog -* Tue Jan 9 2006 Bill Nottingham - 2.3.0-5 +* Tue Jan 9 2007 Bill Nottingham - 2.3.0-5 - spec tweaks * Thu Sep 7 2006 Bill Nottingham - 2.3.0-4 From fedora-cvs-commits at redhat.com Tue Jan 9 08:04:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 03:04:01 -0500 Subject: rpms/autofs/devel autofs-5.0.1-rc3-remove-rpath-link-option.patch, NONE, 1.1 autofs.spec, 1.172, 1.173 Message-ID: <200701090804.l09841P0004615@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4598 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-remove-rpath-link-option.patch Log Message: * Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.3 - remove redundant rpath link option (prep for move to Extras). autofs-5.0.1-rc3-remove-rpath-link-option.patch: CHANGELOG | 1 + Makefile.rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-remove-rpath-link-option.patch --- diff --git a/CHANGELOG b/CHANGELOG index 596d29a..b043e7e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ ?/?/2007 autofs-5.0.1 --------------------- - fix typo in Fix typo in var when removing temp directory. +- remove redundant rpath link option. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/Makefile.rules b/Makefile.rules index 072f0d6..5179ea4 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -44,7 +44,7 @@ CC = gcc CXX = g++ CXXFLAGS = $(CFLAGS) LD = ld -SOLDFLAGS = -shared -Xlinker -rpath -Xlinker $(autofslibdir) +SOLDFLAGS = -shared CFLAGS += -D_REENTRANT LDFLAGS += -lpthread Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- autofs.spec 9 Jan 2007 03:46:04 -0000 1.172 +++ autofs.spec 9 Jan 2007 08:03:59 -0000 1.173 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 5.0.1 -%define release 0.rc3.1 +%define release 0.rc3.3 Version: %{version} Release: %{release} Epoch: 1 @@ -12,6 +12,7 @@ Group: System Environment/Daemons Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc3.tar.bz2 Patch1: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch +Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch Buildroot: /var/tmp/autofs-tmp BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Prereq: chkconfig @@ -52,6 +53,7 @@ %setup -q echo %{version}-%{release} > .version %patch1 -p1 +%patch2 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -108,6 +110,9 @@ %{_libdir}/autofs/* %changelog +* Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.3 +- remove redundant rpath link option (prep for move to Extras). + * Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.1 - consolidate to rc3. - fix typo in Fix typo in var when removing temp directory (bz 221847). From fedora-cvs-commits at redhat.com Tue Jan 9 08:15:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 03:15:31 -0500 Subject: rpms/autofs/FC-6 autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch, NONE, 1.1 autofs-5.0.1-rc3-remove-rpath-link-option.patch, NONE, 1.1 autofs.spec, 1.163, 1.164 sources, 1.14, 1.15 autofs-5.0.1-rc2-add-export-syntax-checks.patch, 1.1, NONE autofs-5.0.1-rc2-admit-slashify-colons.patch, 1.1, NONE autofs-5.0.1-rc2-afs-buffer-overflow-check.patch, 1.1, NONE autofs-5.0.1-rc2-allow-underscore-in-hostname.patch, 1.1, NONE autofs-5.0.1-rc2-cancelled-check.patch, 1.1, NONE autofs-5.0.1-rc2-change-mount-device-to-map-name.patch, 1.1, NONE autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch, 1.1, NONE autofs-5.0.1-rc2-close-on-exec.patch, 1.1, NONE autofs-5.0.1-rc2-default-master-uses-hosts.patch, 1.1, NONE autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch, 1.1, NONE autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch, 1.1, NONE autofs-5.0.1-rc2-dont-create-remote-dirs.patch, 1.1, NONE autofs-5.0.1-rc2-fix-catch-global-options.patch, 1.2, NONE autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.! patch, 1.2, NONE autofs-5.0.1-rc2-fix-manual-umount-regression.patch, 1.1, NONE autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch, 1.1, NONE autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch, 1.1, NONE autofs-5.0.1-rc2-fix-null-map-semantics.patch, 1.1, NONE autofs-5.0.1-rc2-fix-use-after-free.patch, 1.1, NONE autofs-5.0.1-rc2-get_query_dn-subtree-2.patch, 1.1, NONE autofs-5.0.1-rc2-get_query_dn-subtree.patch, 1.1, NONE autofs-5.0.1-rc2-handle-autofs-options.patch, 1.1, NONE autofs-5.0.1-rc2-hosts-check-exports-update.patch, 1.1, NONE autofs-5.0.1-rc2-include-check-full-path.patch, 1.2, NONE autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch, 1.1, NONE autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch, 1.1, NONE autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch, 1.1, NONE autofs-5.0.1-rc2-ldap-noexist-rmdir.patch, 1.1, NONE autofs-5.0.1-rc2-long-timout-option-use-space.patch, 1.1, NONE autofs-5.0.1-rc2-macro-table-locking.patch, 1.1, NONE autofs-5.0.1-rc2-masked_match-hostname-independent.patch, 1.1, NO! NE autofs-5.0.1-rc2-master-map-reload-options-update.patch,1.1! ,NONE au Message-ID: <200701090815.l098FVW4004872@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4854 Modified Files: autofs.spec sources Added Files: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch autofs-5.0.1-rc3-remove-rpath-link-option.patch Removed Files: autofs-5.0.1-rc2-add-export-syntax-checks.patch autofs-5.0.1-rc2-admit-slashify-colons.patch autofs-5.0.1-rc2-afs-buffer-overflow-check.patch autofs-5.0.1-rc2-allow-underscore-in-hostname.patch autofs-5.0.1-rc2-cancelled-check.patch autofs-5.0.1-rc2-change-mount-device-to-map-name.patch autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch autofs-5.0.1-rc2-close-on-exec.patch autofs-5.0.1-rc2-default-master-uses-hosts.patch autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch autofs-5.0.1-rc2-dont-create-remote-dirs.patch autofs-5.0.1-rc2-fix-catch-global-options.patch autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch autofs-5.0.1-rc2-fix-manual-umount-regression.patch autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch autofs-5.0.1-rc2-fix-null-map-semantics.patch autofs-5.0.1-rc2-fix-use-after-free.patch autofs-5.0.1-rc2-get_query_dn-subtree-2.patch autofs-5.0.1-rc2-get_query_dn-subtree.patch autofs-5.0.1-rc2-handle-autofs-options.patch autofs-5.0.1-rc2-hosts-check-exports-update.patch autofs-5.0.1-rc2-include-check-full-path.patch autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch autofs-5.0.1-rc2-ldap-noexist-rmdir.patch autofs-5.0.1-rc2-long-timout-option-use-space.patch autofs-5.0.1-rc2-macro-table-locking.patch autofs-5.0.1-rc2-masked_match-hostname-independent.patch autofs-5.0.1-rc2-master-map-reload-options-update.patch autofs-5.0.1-rc2-misc-memory-leaks.patch autofs-5.0.1-rc2-mount_nfs-use-fstype.patch autofs-5.0.1-rc2-nfs4-get-port.patch autofs-5.0.1-rc2-nfs4-only-server.patch autofs-5.0.1-rc2-nss-parse-fd-leak.patch autofs-5.0.1-rc2-nsswitch-parser-locking.patch autofs-5.0.1-rc2-numeric-ldap-host-name.patch autofs-5.0.1-rc2-one-master-map-read-only.patch autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch autofs-5.0.1-rc2-recursive-bind-mount.patch autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch autofs-5.0.1-rc2-replace-tempnam.patch autofs-5.0.1-rc2-replicated-close-sock.patch autofs-5.0.1-rc2-request-memory-leak.patch autofs-5.0.1-rc2-require-kproto-v5.patch autofs-5.0.1-rc2-rpc_subs-fd-leak.patch autofs-5.0.1-rc2-set-socket-close-on-exec.patch autofs-5.0.1-rc2-submount-cache-clean.patch autofs-5.0.1-rc2-use-task-done.patch Log Message: * Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.2 - consolidate to rc3. - fix typo in Fix typo in var when removing temp directory (bz 221847). - remove redundant rpath link option. - Resolves: rhbz#221847 autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch: CHANGELOG | 4 ++++ modules/mount_bind.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch --- diff --git a/CHANGELOG b/CHANGELOG index f74203a..596d29a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +?/?/2007 autofs-5.0.1 +--------------------- +- fix typo in Fix typo in var when removing temp directory. + 4/1/2007 autofs-5.0.1 rc3 ------------------------- - fix handling of autofs specific mount options. diff --git a/modules/mount_bind.c b/modules/mount_bind.c index 16ae758..cb17ce4 100644 --- a/modules/mount_bind.c +++ b/modules/mount_bind.c @@ -64,7 +64,7 @@ int mount_init(void **context) spawn_umount(log_debug, "-n", t2_dir, NULL); out: - rmdir(t2_dir); + rmdir(t1_dir); rmdir(t2_dir); return 0; autofs-5.0.1-rc3-remove-rpath-link-option.patch: CHANGELOG | 1 + Makefile.rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-remove-rpath-link-option.patch --- diff --git a/CHANGELOG b/CHANGELOG index 596d29a..b043e7e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ ?/?/2007 autofs-5.0.1 --------------------- - fix typo in Fix typo in var when removing temp directory. +- remove redundant rpath link option. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/Makefile.rules b/Makefile.rules index 072f0d6..5179ea4 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -44,7 +44,7 @@ CC = gcc CXX = g++ CXXFLAGS = $(CFLAGS) LD = ld -SOLDFLAGS = -shared -Xlinker -rpath -Xlinker $(autofslibdir) +SOLDFLAGS = -shared CFLAGS += -D_REENTRANT LDFLAGS += -lpthread Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- autofs.spec 27 Dec 2006 04:43:28 -0000 1.163 +++ autofs.spec 9 Jan 2007 08:15:29 -0000 1.164 @@ -4,65 +4,15 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 5.0.1 -%define release 0.rc2.40 +%define release 0.rc3.2 Version: %{version} Release: %{release} Epoch: 1 License: GPL Group: System Environment/Daemons -Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc2.tar.bz2 -Patch0: autofs-5.0.1-rc2-handle-autofs-options.patch -Patch1: autofs-5.0.1-rc2-include-check-full-path.patch -Patch2: autofs-5.0.1-rc2-submount-cache-clean.patch -Patch3: autofs-5.0.1-rc2-ldap-noexist-rmdir.patch -Patch4: autofs-5.0.1-rc2-replicated-close-sock.patch -Patch5: autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch -Patch6: autofs-5.0.1-rc2-default-master-uses-hosts.patch -Patch7: autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch -Patch8: autofs-5.0.1-rc2-master-map-reload-options-update.patch -Patch9: autofs-5.0.1-rc2-mount_nfs-use-fstype.patch -Patch10: autofs-5.0.1-rc2-get_query_dn-subtree.patch -Patch11: autofs-5.0.1-rc2-long-timout-option-use-space.patch -Patch12: autofs-5.0.1-rc2-masked_match-hostname-independent.patch -Patch13: autofs-5.0.1-rc2-nss-parse-fd-leak.patch -Patch14: autofs-5.0.1-rc2-request-memory-leak.patch -Patch15: autofs-5.0.1-rc2-cancelled-check.patch -Patch16: autofs-5.0.1-rc2-rpc_subs-fd-leak.patch -Patch17: autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch -Patch18: autofs-5.0.1-rc2-nfs4-only-server.patch -Patch19: autofs-5.0.1-rc2-close-on-exec.patch -Patch20: autofs-5.0.1-rc2-numeric-ldap-host-name.patch -Patch21: autofs-5.0.1-rc2-get_query_dn-subtree-2.patch -Patch22: autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch -Patch23: autofs-5.0.1-rc2-dont-create-remote-dirs.patch -Patch24: autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch -Patch25: autofs-5.0.1-rc2-macro-table-locking.patch -Patch26: autofs-5.0.1-rc2-nsswitch-parser-locking.patch -Patch27: autofs-5.0.1-rc2-one-master-map-read-only.patch -Patch28: autofs-5.0.1-rc2-misc-memory-leaks.patch -Patch29: autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch -Patch30: autofs-5.0.1-rc2-recursive-bind-mount.patch -Patch31: autofs-5.0.1-rc2-require-kproto-v5.patch -Patch32: autofs-5.0.1-rc2-fix-manual-umount-regression.patch -Patch33: autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch -Patch34: autofs-5.0.1-rc2-fix-catch-global-options.patch -Patch35: autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch -Patch36: autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch -Patch37: autofs-5.0.1-rc2-fix-use-after-free.patch -Patch38: autofs-5.0.1-rc2-use-task-done.patch -Patch39: autofs-5.0.1-rc2-nfs4-get-port.patch -Patch40: autofs-5.0.1-rc2-fix-null-map-semantics.patch -Patch41: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch -Patch42: autofs-5.0.1-rc2-add-export-syntax-checks.patch -Patch43: autofs-5.0.1-rc2-hosts-check-exports-update.patch -Patch44: autofs-5.0.1-rc2-change-mount-device-to-map-name.patch -Patch45: autofs-5.0.1-rc2-afs-buffer-overflow-check.patch -Patch46: autofs-5.0.1-rc2-replace-tempnam.patch -Patch47: autofs-5.0.1-rc2-admit-slashify-colons.patch -Patch48: autofs-5.0.1-rc2-allow-underscore-in-hostname.patch -Patch49: autofs-5.0.1-rc2-set-socket-close-on-exec.patch -Patch50: autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch -Patch51: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch +Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc3.tar.bz2 +Patch1: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch +Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch Buildroot: /var/tmp/autofs-tmp BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Prereq: chkconfig @@ -102,58 +52,8 @@ %prep %setup -q echo %{version}-%{release} > .version -%patch0 -p1 %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 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -210,6 +110,11 @@ %{_libdir}/autofs/* %changelog +* Tue Jan 9 2007 Ian Kent - 5.0.1-0.rc3.2 +- consolidate to rc3. +- fix typo in Fix typo in var when removing temp directory (bz 221847). +- remove redundant rpath link option. + * Wed Dec 27 2006 Ian Kent - 5.0.1-0.rc2.41 - fix nonstrict multi-mount handling (bz 219383). - correct detection of duplicate indirect mount entries (bz 220799). Index: sources =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 1 Sep 2006 06:12:06 -0000 1.14 +++ sources 9 Jan 2007 08:15:29 -0000 1.15 @@ -1 +1 @@ -4ff63b6833cc1eac8d75bff0c10f6d76 autofs-5.0.1-rc2.tar.bz2 +7cf64434fd19a56506fcd1f64034740c autofs-5.0.1-rc3.tar.bz2 --- autofs-5.0.1-rc2-add-export-syntax-checks.patch DELETED --- --- autofs-5.0.1-rc2-admit-slashify-colons.patch DELETED --- --- autofs-5.0.1-rc2-afs-buffer-overflow-check.patch DELETED --- --- autofs-5.0.1-rc2-allow-underscore-in-hostname.patch DELETED --- --- autofs-5.0.1-rc2-cancelled-check.patch DELETED --- --- autofs-5.0.1-rc2-change-mount-device-to-map-name.patch DELETED --- --- autofs-5.0.1-rc2-check-fh-on-direct-mount-and-expire.patch DELETED --- --- autofs-5.0.1-rc2-close-on-exec.patch DELETED --- --- autofs-5.0.1-rc2-default-master-uses-hosts.patch DELETED --- --- autofs-5.0.1-rc2-disallow-multiple-indirect-mounts-fix.patch DELETED --- --- autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch DELETED --- --- autofs-5.0.1-rc2-dont-create-remote-dirs.patch DELETED --- --- autofs-5.0.1-rc2-fix-catch-global-options.patch DELETED --- --- autofs-5.0.1-rc2-fix-incorrect-return-from-spawn.patch DELETED --- --- autofs-5.0.1-rc2-fix-manual-umount-regression.patch DELETED --- --- autofs-5.0.1-rc2-fix-master-parse-shift-reduce.patch DELETED --- --- autofs-5.0.1-rc2-fix-nonstrict-multi-mounts.patch DELETED --- --- autofs-5.0.1-rc2-fix-null-map-semantics.patch DELETED --- --- autofs-5.0.1-rc2-fix-use-after-free.patch DELETED --- --- autofs-5.0.1-rc2-get_query_dn-subtree-2.patch DELETED --- --- autofs-5.0.1-rc2-get_query_dn-subtree.patch DELETED --- --- autofs-5.0.1-rc2-handle-autofs-options.patch DELETED --- --- autofs-5.0.1-rc2-hosts-check-exports-update.patch DELETED --- --- autofs-5.0.1-rc2-include-check-full-path.patch DELETED --- --- autofs-5.0.1-rc2-included-map-lookup-fd-leak.patch DELETED --- --- autofs-5.0.1-rc2-included-map-recursive-key-lookup.patch DELETED --- --- autofs-5.0.1-rc2-ldap-allow-extra-attrs.patch DELETED --- --- autofs-5.0.1-rc2-ldap-noexist-rmdir.patch DELETED --- --- autofs-5.0.1-rc2-long-timout-option-use-space.patch DELETED --- --- autofs-5.0.1-rc2-macro-table-locking.patch DELETED --- --- autofs-5.0.1-rc2-masked_match-hostname-independent.patch DELETED --- --- autofs-5.0.1-rc2-master-map-reload-options-update.patch DELETED --- --- autofs-5.0.1-rc2-misc-memory-leaks.patch DELETED --- --- autofs-5.0.1-rc2-mount_nfs-use-fstype.patch DELETED --- --- autofs-5.0.1-rc2-nfs4-get-port.patch DELETED --- --- autofs-5.0.1-rc2-nfs4-only-server.patch DELETED --- --- autofs-5.0.1-rc2-nss-parse-fd-leak.patch DELETED --- --- autofs-5.0.1-rc2-nsswitch-parser-locking.patch DELETED --- --- autofs-5.0.1-rc2-numeric-ldap-host-name.patch DELETED --- --- autofs-5.0.1-rc2-one-master-map-read-only.patch DELETED --- --- autofs-5.0.1-rc2-parse-bad-master-map-mountpoint.patch DELETED --- --- autofs-5.0.1-rc2-recursive-bind-mount-use-access-not-opendir.patch DELETED --- --- autofs-5.0.1-rc2-recursive-bind-mount.patch DELETED --- --- autofs-5.0.1-rc2-remove-UNDERSCORETODOT.patch DELETED --- --- autofs-5.0.1-rc2-replace-tempnam.patch DELETED --- --- autofs-5.0.1-rc2-replicated-close-sock.patch DELETED --- --- autofs-5.0.1-rc2-request-memory-leak.patch DELETED --- --- autofs-5.0.1-rc2-require-kproto-v5.patch DELETED --- --- autofs-5.0.1-rc2-rpc_subs-fd-leak.patch DELETED --- --- autofs-5.0.1-rc2-set-socket-close-on-exec.patch DELETED --- --- autofs-5.0.1-rc2-submount-cache-clean.patch DELETED --- --- autofs-5.0.1-rc2-use-task-done.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 09:36:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 04:36:13 -0500 Subject: rpms/man/devel man-1.6b-i18n_nroff.patch, 1.2, 1.3 man.spec, 1.53, 1.54 Message-ID: <200701090936.l099aDEO023811@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23788 Modified Files: man-1.6b-i18n_nroff.patch man.spec Log Message: - Resolves: 221868 man use incorrect groff option - spec file cleanup man-1.6b-i18n_nroff.patch: configure | 19 +++------ src/man.c | 112 ++++++++++++++++++++++++++++++++++++++++---------------- src/man.conf.in | 4 -- src/paths.h.in | 2 - 4 files changed, 88 insertions(+), 49 deletions(-) Index: man-1.6b-i18n_nroff.patch =================================================================== RCS file: /cvs/dist/rpms/man/devel/man-1.6b-i18n_nroff.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- man-1.6b-i18n_nroff.patch 27 Feb 2006 13:46:03 -0000 1.2 +++ man-1.6b-i18n_nroff.patch 9 Jan 2007 09:36:11 -0000 1.3 @@ -16,10 +16,10 @@ if test $Fnroff = "missing" then - nroff="nroff -Tlatin1 -mandoc" -+ nroff="nroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null" ++ nroff="nroff -mandoc 2>/dev/null" else - nroff="$Fnroff -Tlatin1 -mandoc" -+ nroff="$Fnroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null" ++ nroff="$Fnroff -mandoc 2>/dev/null" fi troff="troff -mandoc" echo "Warning: could not find groff" @@ -30,7 +30,7 @@ + nroff="$Fgroff -Tutf8 -mandoc" else - nroff="$Fnroff -Tlatin1 -mandoc" -+ nroff="$Fnroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null" ++ nroff="$Fnroff -mandoc 2>/dev/null" fi troff="$Fgroff -Tps -mandoc" - jnroff="$Fgroff -Tnippon -mandocj" Index: man.spec =================================================================== RCS file: /cvs/dist/rpms/man/devel/man.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- man.spec 11 Dec 2006 14:21:19 -0000 1.53 +++ man.spec 9 Jan 2007 09:36:11 -0000 1.54 @@ -1,12 +1,14 @@ %define usecache 0 %define cache /var/cache/man -Summary: A set of documentation tools: man, apropos and whatis. +Summary: A set of documentation tools: man, apropos and whatis Name: man Version: 1.6e -Release: 1%{?dist} +Release: 2%{?dist} + License: GPL Group: System Environment/Base +URL: http://primates.ximian.com/~flucifredi/man/ Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz Source1: makewhatis.cronweekly Source2: makewhatis.crondaily @@ -27,7 +29,7 @@ Patch26: man-1.6d-updates.patch Buildroot: %{_tmppath}/%{name}-root -PreReq: coreutils +Requires: coreutils Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x Requires: bzip2, gzip, diffutils, rpm BuildRequires: less, groff, diffutils, bzip2, gzip, coreutils @@ -60,7 +62,7 @@ %patch25 -p1 -b .dash %patch26 -p1 -b .upd -cp -f %{SOURCE3} msgs # replace bad ru trans +cp -f %{SOURCE3} msgs # replace bad ru trans for src in $(find msgs -type f -name 'mess.[a-z][a-z]'); do lang=$(echo ${src} | sed -r 's;.*([a-z]{2})$;\1;') @@ -91,7 +93,7 @@ done %build -./configure -default -confdir /etc +fhs +lang all +./configure -default -confdir /etc +fhs +lang all find . -type f|xargs perl -pi -e 's,man\.conf \(5\),man.config (5),g' for i in $(find man -name man.conf.man); do @@ -101,7 +103,7 @@ # HACK: Make output default to using -c; otherwise it appears broken. perl -pi -e "s/nroff /nroff -c /" conf_script -touch Makefile # make sure Make thinks we ran configure +touch Makefile # make sure Make thinks we ran configure make CC="gcc $RPM_OPT_FLAGS" %if %{usecache} perl -pi -e "s,^NOCACHE,# NOCACHE,g" src/man.conf @@ -165,9 +167,9 @@ mkdir -p $RPM_BUILD_ROOT/%{cache}/local mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6 for i in 1 2 3 4 5 6 7 8 9 n; do - mkdir -p $RPM_BUILD_ROOT/%{cache}/cat$i - mkdir -p $RPM_BUILD_ROOT/%{cache}/local/cat$i - mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6/cat$i + mkdir -p $RPM_BUILD_ROOT/%{cache}/cat$i + mkdir -p $RPM_BUILD_ROOT/%{cache}/local/cat$i + mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6/cat$i done #strip $RPM_BUILD_ROOT/usr/bin/man @@ -217,7 +219,7 @@ %config /etc/cron.weekly/makewhatis.cron %config /etc/cron.daily/makewhatis.cron %if %{usecache} -%attr(2755,root,man) /usr/bin/man +%attr(2755,root,man) /usr/bin/man %else %attr(0755,root,root) /usr/bin/man %endif @@ -308,14 +310,19 @@ %lang(sl) /usr/share/man/sl/man? %lang(ru) %dir /usr/share/locale/ru %lang(ru) /usr/share/locale/ru/man -%attr(0755,root,root) %dir %{cache} -%attr(0775,root,man) %dir %{cache}/cat[123456789n] -%attr(0775,root,man) %dir %{cache}/local -%attr(0775,root,man) %dir %{cache}/local/cat[123456789n] -%attr(0775,root,man) %dir %{cache}/X11R6 -%attr(0775,root,man) %dir %{cache}/X11R6/cat[123456789n] +%attr(0755,root,root) %dir %{cache} +%attr(0775,root,man) %dir %{cache}/cat[123456789n] +%attr(0775,root,man) %dir %{cache}/local +%attr(0775,root,man) %dir %{cache}/local/cat[123456789n] +%attr(0775,root,man) %dir %{cache}/X11R6 +%attr(0775,root,man) %dir %{cache}/X11R6/cat[123456789n] %changelog +* Tue Jan 9 2007 Ivana Varekova - 1.6e-2 +- Resolves: 221868 + man use incorrect groff option +- spec file cleanup + * Mon Dec 11 2006 Ivana Varekova - 1.6e-1 - update to 1.6e @@ -543,7 +550,7 @@ * Thu Nov 22 2001 Bernhard Rosenkraenzer 1.5j-1 - Update to 1.5j -* Fri Aug 31 2001 Trond Eivind Glomsr?d 1.5i2-6 +* Fri Aug 31 2001 Trond Eivind Glomsr??d 1.5i2-6 - set LC_CTYPE, not just LC_MESSAGES. That way, the messages requested can also be displayed (#52978) From fedora-cvs-commits at redhat.com Tue Jan 9 09:47:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 04:47:06 -0500 Subject: rpms/logrotate/devel logrotate-widecharPath.patch, NONE, 1.1 logrotate.spec, 1.53, 1.54 Message-ID: <200701090947.l099l6dN011905@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11889 Modified Files: logrotate.spec Added Files: logrotate-widecharPath.patch Log Message: allow multibyte characters in readPath() (#122145) logrotate-widecharPath.patch: config.c | 19 +++++++++++++++++-- logrotate.c | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) --- NEW FILE logrotate-widecharPath.patch --- --- logrotate-3.7.4/config.c.widechar 2007-01-08 14:29:06.000000000 +0100 +++ logrotate-3.7.4/config.c 2007-01-08 14:33:41.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #include "basenames.h" #include "log.h" @@ -82,13 +83,24 @@ char *start = *startPtr; char *path; + wchar_t pwc; + size_t len; + if (!isolateValue(configFile, lineNum, key, &start, &endtag)) { oldchar = *endtag, *endtag = '\0'; chptr = start; - /* this is technically too restrictive -- let's see if anyone - complains */ + while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) { + if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) { + message(MESS_ERROR, "%s:%d bad %s path %s\n", + configFile, lineNum, key, start); + return NULL; + } + chptr += len; + } + +/* while (*chptr && isprint(*chptr) && *chptr != ' ') chptr++; if (*chptr) { @@ -96,8 +108,11 @@ configFile, lineNum, key, start); return NULL; } +*/ + path = strdup(start); + *endtag = oldchar, start = endtag; *startPtr = start; --- logrotate-3.7.4/logrotate.c.widechar 2007-01-08 14:36:09.000000000 +0100 +++ logrotate-3.7.4/logrotate.c 2007-01-08 14:38:01.000000000 +0100 @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef WITH_SELINUX #include @@ -1344,6 +1345,7 @@ }; logSetLevel(MESS_NORMAL); + setlocale (LC_ALL, ""); optCon = poptGetContext("logrotate", argc, argv, options, 0); poptReadDefaultConfig(optCon, 1); Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- logrotate.spec 5 Jan 2007 11:47:36 -0000 1.53 +++ logrotate.spec 9 Jan 2007 09:47:04 -0000 1.54 @@ -1,13 +1,14 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz Patch1: logrotate-selinux.patch Patch2: logrotate-fdLeak.patch Patch3: logrotate-sizeOption.patch +Patch4: logrotate-widecharPath.patch BuildRoot: %{_tmppath}/%{name}-%{version}.root BuildRequires: libselinux-devel @@ -28,6 +29,7 @@ %patch1 -p1 -b .rhat %patch2 -p1 -b .fdLeak %patch3 -p1 -b .sizeOption +%patch4 -p1 -b .widecharPath %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -58,6 +60,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Tue Jan 09 2007 Peter Vrabec 3.7.4-9 +- allow multibyte characters in readPath() (#122145) + * Fri Jan 05 2007 Peter Vrabec 3.7.4-8 - "size" option was ignored in config files (#221341) From fedora-cvs-commits at redhat.com Tue Jan 9 09:53:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 04:53:37 -0500 Subject: rpms/man/FC-6 man-1.6b-i18n_nroff.patch,1.2,1.3 man.spec,1.50,1.51 Message-ID: <200701090953.l099rbg9012032@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11998 Modified Files: man-1.6b-i18n_nroff.patch man.spec Log Message: - Resolves: 221868 man use incorrect groff option man-1.6b-i18n_nroff.patch: configure | 19 +++------ src/man.c | 112 ++++++++++++++++++++++++++++++++++++++++---------------- src/man.conf.in | 4 -- src/paths.h.in | 2 - 4 files changed, 88 insertions(+), 49 deletions(-) Index: man-1.6b-i18n_nroff.patch =================================================================== RCS file: /cvs/dist/rpms/man/FC-6/man-1.6b-i18n_nroff.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- man-1.6b-i18n_nroff.patch 27 Feb 2006 13:46:03 -0000 1.2 +++ man-1.6b-i18n_nroff.patch 9 Jan 2007 09:53:35 -0000 1.3 @@ -16,10 +16,10 @@ if test $Fnroff = "missing" then - nroff="nroff -Tlatin1 -mandoc" -+ nroff="nroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null" ++ nroff="nroff -mandoc 2>/dev/null" else - nroff="$Fnroff -Tlatin1 -mandoc" -+ nroff="$Fnroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null" ++ nroff="$Fnroff -mandoc 2>/dev/null" fi troff="troff -mandoc" echo "Warning: could not find groff" @@ -30,7 +30,7 @@ + nroff="$Fgroff -Tutf8 -mandoc" else - nroff="$Fnroff -Tlatin1 -mandoc" -+ nroff="$Fnroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null" ++ nroff="$Fnroff -mandoc 2>/dev/null" fi troff="$Fgroff -Tps -mandoc" - jnroff="$Fgroff -Tnippon -mandocj" Index: man.spec =================================================================== RCS file: /cvs/dist/rpms/man/FC-6/man.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- man.spec 12 Jul 2006 07:18:07 -0000 1.50 +++ man.spec 9 Jan 2007 09:53:35 -0000 1.51 @@ -4,7 +4,7 @@ Summary: A set of documentation tools: man, apropos and whatis. Name: man Version: 1.6d -Release: 1.1 +Release: 2%{?dist} License: GPL Group: System Environment/Base Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz @@ -312,6 +312,10 @@ %attr(0775,root,man) %dir %{cache}/X11R6/cat[123456789n] %changelog +* Tue Jan 9 2007 Ivana Varekova - 1.6d-2 +- Resolves: 221868 + man use incorrect groff option + * Wed Jul 12 2006 Jesse Keating - 1.6d-1.1 - rebuild From fedora-cvs-commits at redhat.com Tue Jan 9 09:56:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 04:56:50 -0500 Subject: rpms/logrotate/FC-6 logrotate-widecharPath.patch, NONE, 1.1 logrotate.spec, 1.53, 1.54 Message-ID: <200701090956.l099uoR1012125@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12108 Modified Files: logrotate.spec Added Files: logrotate-widecharPath.patch Log Message: allow multibyte characters in readPath() (#122145) logrotate-widecharPath.patch: config.c | 19 +++++++++++++++++-- logrotate.c | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) --- NEW FILE logrotate-widecharPath.patch --- --- logrotate-3.7.4/config.c.widechar 2007-01-08 14:29:06.000000000 +0100 +++ logrotate-3.7.4/config.c 2007-01-08 14:33:41.000000000 +0100 @@ -14,6 +14,7 @@ #include #include #include +#include #include "basenames.h" #include "log.h" @@ -82,13 +83,24 @@ char *start = *startPtr; char *path; + wchar_t pwc; + size_t len; + if (!isolateValue(configFile, lineNum, key, &start, &endtag)) { oldchar = *endtag, *endtag = '\0'; chptr = start; - /* this is technically too restrictive -- let's see if anyone - complains */ + while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) { + if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) { + message(MESS_ERROR, "%s:%d bad %s path %s\n", + configFile, lineNum, key, start); + return NULL; + } + chptr += len; + } + +/* while (*chptr && isprint(*chptr) && *chptr != ' ') chptr++; if (*chptr) { @@ -96,8 +108,11 @@ configFile, lineNum, key, start); return NULL; } +*/ + path = strdup(start); + *endtag = oldchar, start = endtag; *startPtr = start; --- logrotate-3.7.4/logrotate.c.widechar 2007-01-08 14:36:09.000000000 +0100 +++ logrotate-3.7.4/logrotate.c 2007-01-08 14:38:01.000000000 +0100 @@ -12,6 +12,7 @@ #include #include #include +#include #ifdef WITH_SELINUX #include @@ -1344,6 +1345,7 @@ }; logSetLevel(MESS_NORMAL); + setlocale (LC_ALL, ""); optCon = poptGetContext("logrotate", argc, argv, options, 0); poptReadDefaultConfig(optCon, 1); Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-6/logrotate.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- logrotate.spec 5 Jan 2007 12:00:50 -0000 1.53 +++ logrotate.spec 9 Jan 2007 09:56:48 -0000 1.54 @@ -1,13 +1,15 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz Patch1: logrotate-selinux.patch Patch2: logrotate-fdLeak.patch Patch3: logrotate-sizeOption.patch +Patch4: logrotate-widecharPath.patch + BuildRoot: %{_tmppath}/%{name}-%{version}.root BuildRequires: libselinux-devel @@ -27,6 +29,7 @@ %patch1 -p1 -b .rhat %patch2 -p1 -b .fdLeak %patch3 -p1 -b .sizeOption +%patch4 -p1 -b .widecharPath %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -57,6 +60,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Tue Jan 09 2007 Peter Vrabec 3.7.4-9 +- allow multibyte characters in readPath() (#122145) + * Fri Jan 05 2007 Peter Vrabec 3.7.4-8 - "size" option was ignored in config files (#221341) From fedora-cvs-commits at redhat.com Tue Jan 9 10:01:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 05:01:59 -0500 Subject: rpms/kbd/devel kbd.spec,1.38,1.39 Message-ID: <200701091001.l09A1xMN012329@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/kbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12315 Modified Files: kbd.spec Log Message: * Tue Jan 9 2007 Miloslav Trmac - 1.12-21 - Add a "ko" (Korean) keyboard layout, equivalent to the "us" layout Resolves: #220151 Index: kbd.spec =================================================================== RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- kbd.spec 7 Dec 2006 17:12:31 -0000 1.38 +++ kbd.spec 9 Jan 2007 10:01:57 -0000 1.39 @@ -1,7 +1,7 @@ Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Name: kbd Version: 1.12 -Release: 20 +Release: 21 License: GPL Group: System Environment/Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 @@ -87,6 +87,10 @@ # Basic install. make install DESTDIR=$RPM_BUILD_ROOT +# rhpl keyboard layout table is indexed by kbd layout names, so we need a +# Korean keyboard +ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz + # Move binaries which we use before /usr is mounted from %{_bindir} to /bin. for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin @@ -131,6 +135,10 @@ %config %{_sysconfdir}/pam.d/* %changelog +* Tue Jan 9 2007 Miloslav Trmac - 1.12-21 +- Add a "ko" (Korean) keyboard layout, equivalent to the "us" layout + Resolves: #220151 + * Thu Dec 7 2006 Miloslav Trmac - 1.12-20 - Document that setkeycodes doesn't affect USB keyboards and that the kernel doesn't provide the raw scan codes by default From fedora-cvs-commits at redhat.com Tue Jan 9 10:03:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 05:03:11 -0500 Subject: rpms/kbd/devel kbd.spec,1.39,1.40 Message-ID: <200701091003.l09A3B3F012385@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/kbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12370 Modified Files: kbd.spec Log Message: Pretend the language used is English Index: kbd.spec =================================================================== RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- kbd.spec 9 Jan 2007 10:01:57 -0000 1.39 +++ kbd.spec 9 Jan 2007 10:03:09 -0000 1.40 @@ -87,7 +87,7 @@ # Basic install. make install DESTDIR=$RPM_BUILD_ROOT -# rhpl keyboard layout table is indexed by kbd layout names, so we need a +# The rhpl keyboard layout table is indexed by kbd layout names, so we need a # Korean keyboard ln -s us.map.gz $RPM_BUILD_ROOT/lib/kbd/keymaps/i386/qwerty/ko.map.gz From fedora-cvs-commits at redhat.com Tue Jan 9 11:00:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 06:00:28 -0500 Subject: rpms/udev/FC-6 udev.spec,1.193,1.194 Message-ID: <200701091100.l09B0Snp023795@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23703 Modified Files: udev.spec Log Message: added changelog Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/FC-6/udev.spec,v retrieving revision 1.193 retrieving revision 1.194 diff -u -r1.193 -r1.194 --- udev.spec 8 Jan 2007 17:18:49 -0000 1.193 +++ udev.spec 9 Jan 2007 11:00:20 -0000 1.194 @@ -3,7 +3,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 095 -Release: 16%{dist} +Release: 17%{dist} License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -340,6 +340,10 @@ %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Tue Jan 9 2007 Harald Hoyer - 095-17%{dist} +- merge RHEL bugfixes +- Resolves: rhbz#220543 + * Mon Dec 18 2006 Harald Hoyer - 095-14.5%{dist} - added symlink to /sbin/dasd_id (#219181) - added more debugging possibilities (#219621) From fedora-cvs-commits at redhat.com Tue Jan 9 11:34:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 06:34:42 -0500 Subject: rpms/gdb/devel gdbcompare,1.2,1.3 Message-ID: <200701091134.l09BYghA030872@cvs.devel.redhat.com> Author: jkratoch Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30858 Modified Files: gdbcompare Log Message: Support a new "-r" (reverse) argument. Index: gdbcompare =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdbcompare,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdbcompare 7 Jan 2007 22:47:44 -0000 1.2 +++ gdbcompare 9 Jan 2007 11:34:40 -0000 1.3 @@ -6,6 +6,7 @@ use warnings; use Data::Dumper; +my $reverse=shift @ARGV if ($ARGV[0]||"") eq "-r"; my $suffix=shift @ARGV if ($ARGV[0]||"")=~/^(?:sum|log)$/; $suffix||="sum"; @@ -26,7 +27,7 @@ for my $arch (sort keys(%arch)) { sub trans { return {"."=>0,"-"=>1}->{($_[0]=~/([-.])[^-.]+[.]\w+$/)[0]}.$_[0]; }; - my @sorted=sort { my $a1=trans $a; my $b1=trans $b; $b1 cmp $a1; } @{$arch{$arch}}; + my @sorted=sort { my $a1=trans $a; my $b1=trans $b; ($b1 cmp $a1) * ($reverse ? -1 : 1); } @{$arch{$arch}}; do { system $_ and die $_; } for "diff -u tests/'".$sorted[1]."' tests/'".$sorted[0]."' >tests/gdbcompare-'$arch'.diff;true"; } From fedora-cvs-commits at redhat.com Tue Jan 9 11:35:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 06:35:46 -0500 Subject: rpms/gdb/devel gdb-6.5-bz109921-DW_AT_decl_file-fix.patch, NONE, 1.1 gdb-6.5-bz109921-DW_AT_decl_file-test.patch, NONE, 1.1 gdb.spec, 1.212, 1.213 gdb-orphanripper.c, 1.1, NONE Message-ID: <200701091135.l09BZkOW030904@cvs.devel.redhat.com> Author: jkratoch Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30887 Modified Files: gdb.spec Added Files: gdb-6.5-bz109921-DW_AT_decl_file-fix.patch gdb-6.5-bz109921-DW_AT_decl_file-test.patch Removed Files: gdb-orphanripper.c Log Message: * Tue Jan 9 2007 Jan Kratochvil - 6.5-23 - Find symbols properly at their original (included) file (BZ 109921). - Remove the stuck mock(1) builds disfunctional workaround (-> mock BZ 221351). - Resolves: rhbz#109921 - Related: rhbz#221351 gdb-6.5-bz109921-DW_AT_decl_file-fix.patch: buildsym.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- buildsym.h | 4 ++ dwarf2read.c | 23 ++++++++++++--- symtab.c | 8 ++++- symtab.h | 14 +++++++++ 5 files changed, 126 insertions(+), 9 deletions(-) --- NEW FILE gdb-6.5-bz109921-DW_AT_decl_file-fix.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=109921 2007-01-09 Jan Kratochvil * buildsym.c (start_subfile_index): Renamed `start_subfile' now supporting the FILE_INDEX parameter. (start_subfile): Backward compatible stub for `start_subfile_index'. (end_symtab): Resolve new SYMBOL.FILE.SYMTAB from SYMBOL.FILE.INDEX. Substitute possibly missing DIRNAME from the CU's main file DIRNAME. Clear `subfiles' variable as its data have been deallocated. * buildsym.h (struct subfile): New field `file_index'. (start_subfile_index): New prototype. * dwarf2read.c (add_file_name): Ensure subfile has been founded. (dwarf_decode_lines): Specify the new FILE_INDEX parameter. (dwarf2_start_subfile): New FILE_INDEX parameter. (new_symbol): Extract `DW_AT_decl_file' DWARF 2 information entry. * symtab.c (lookup_symbol): Override by the new SYMBOL.FILE.SYMTAB. (search_symbols): Likewise. * symtab.h (struct symbol): New fields FILE.INDEX and FILE.SYMTAB. (SYMBOL_FILE_INDEX, SYMBOL_FILE_SYMTAB): New macros. --- ./gdb/buildsym.c 2005-12-17 22:33:59.000000000 +0000 +++ ./gdb/buildsym.c 2007-01-09 08:30:38.000000000 +0000 @@ -535,7 +535,7 @@ make_blockvector (struct objfile *objfil the directory in which it resides (or NULL if not known). */ void -start_subfile (char *name, char *dirname) +start_subfile_index (char *name, char *dirname, unsigned file_index) { struct subfile *subfile; @@ -547,6 +547,17 @@ start_subfile (char *name, char *dirname if (FILENAME_CMP (subfile->name, name) == 0) { current_subfile = subfile; + + if (subfile->file_index != 0 && file_index != 0 + && subfile->file_index != file_index) + complaint (&symfile_complaints, _("Filenames indexing conflict: " + "name \"%s\" dir \"%s\" index %u vs. " + "name \"%s\" dir \"%s\" index %u"), + subfile->name, subfile->dirname, subfile->file_index, + name, dirname, file_index); + if (subfile->file_index == 0) + subfile->file_index = file_index; + return; } } @@ -562,6 +573,7 @@ start_subfile (char *name, char *dirname current_subfile = subfile; /* Save its name and compilation directory name */ + subfile->file_index = file_index; subfile->name = (name == NULL) ? NULL : savestring (name, strlen (name)); subfile->dirname = (dirname == NULL) ? NULL : savestring (dirname, strlen (dirname)); @@ -617,6 +629,13 @@ start_subfile (char *name, char *dirname } } +/* Backward compatibility. */ +void +start_subfile (char *name, char *dirname) +{ + start_subfile_index (name, dirname, 0); +} + /* For stabs readers, the first N_SO symbol is assumed to be the source file name, and the subfile struct is initialized using that assumption. If another N_SO symbol is later seen, immediately @@ -816,9 +835,12 @@ end_symtab (CORE_ADDR end_addr, struct o { struct symtab *symtab = NULL; struct blockvector *blockvector; - struct subfile *subfile; + struct subfile *subfile, *subfile_main; struct context_stack *cstk; struct subfile *nextsub; + int subfiles_count; + struct symtab **file_index_to_symtab; + size_t file_index_to_symtab_size; /* Finish the lexical context of the last function in the file; pop the context stack. */ @@ -916,6 +938,18 @@ end_symtab (CORE_ADDR end_addr, struct o #endif PROCESS_LINENUMBER_HOOK (); /* Needed for xcoff. */ + /* Get the last subfile s SUBFILE_MAIN which is the main file of CU. + Count SUBFILES_COUNT. + Start with 1 as we do not iterate past the last item. */ + subfiles_count = 1; + for (subfile_main = subfiles; subfile_main && subfile_main->next; + subfile_main = subfile_main->next) + subfiles_count++; + + file_index_to_symtab_size = sizeof (*file_index_to_symtab) * subfiles_count; + file_index_to_symtab = xmalloc (file_index_to_symtab_size); + memset ((char *) file_index_to_symtab, 0, file_index_to_symtab_size); + /* Now create the symtab objects proper, one for each subfile. */ /* (The main file is the last one on the chain.) */ @@ -976,6 +1010,16 @@ end_symtab (CORE_ADDR end_addr, struct o strlen (subfile->dirname) + 1); strcpy (symtab->dirname, subfile->dirname); } + /* Non-primary subfiles may miss COMP_DIR resulting in NULL + DIRNAME and so default it from the CU file - SUBFILE_MAIN. */ + else if (subfile_main->dirname) + { + /* Reallocate the dirname on the symbol obstack */ + symtab->dirname = (char *) + obstack_alloc (&objfile->objfile_obstack, + strlen (subfile_main->dirname) + 1); + strcpy (symtab->dirname, subfile_main->dirname); + } else { symtab->dirname = NULL; @@ -1004,6 +1048,13 @@ end_symtab (CORE_ADDR end_addr, struct o but the main file. */ symtab->primary = 0; + + /* It may be zero for files unlisted in File Table. */ + if (subfile->file_index) + { + gdb_assert (subfile->file_index <= subfiles_count); + file_index_to_symtab[subfile->file_index - 1] = symtab; + } } if (subfile->name != NULL) { @@ -1032,9 +1083,40 @@ end_symtab (CORE_ADDR end_addr, struct o symtab->primary = 1; } + /* Resolve `struct symbol.file.index' into `struct symbol.file.symtab'. */ + if (blockvector) + { + int block_i; + + for (block_i = 0; block_i < BLOCKVECTOR_NBLOCKS (blockvector); block_i++) + { + struct symbol *sym; + struct dict_iterator iter; + + for (sym = dict_iterator_first (BLOCK_DICT + (BLOCKVECTOR_BLOCK (blockvector, block_i)), &iter); + sym != NULL; + sym = dict_iterator_next (&iter)) + { + /* Beware the ordering as `sym->file' is a union. */ + if (SYMBOL_FILE_INDEX (sym) + && file_index_to_symtab[SYMBOL_FILE_INDEX (sym) - 1]) + SYMBOL_FILE_SYMTAB (sym) = file_index_to_symtab + [SYMBOL_FILE_INDEX (sym) - 1]; + else + { + /* Default to the primary symbol table, never use NULL. */ + SYMBOL_FILE_SYMTAB (sym) = symtab; + } + } + } + } + + xfree (file_index_to_symtab); last_source_file = NULL; current_subfile = NULL; pending_macros = NULL; + subfiles = NULL; return symtab; } --- ./gdb/buildsym.h 2005-12-17 22:33:59.000000000 +0000 +++ ./gdb/buildsym.h 2007-01-09 08:17:17.000000000 +0000 @@ -63,6 +63,7 @@ EXTERN CORE_ADDR last_source_start_addr; struct subfile { struct subfile *next; + unsigned file_index; char *name; char *dirname; struct linetable *line_vector; @@ -240,6 +241,9 @@ extern void finish_block (struct symbol extern void really_free_pendings (void *dummy); +extern void start_subfile_index (char *name, char *dirname, + unsigned file_index); + extern void start_subfile (char *name, char *dirname); extern void patch_subfile_names (struct subfile *subfile, char *name); --- ./gdb/dwarf2read.c 2007-01-08 22:28:24.000000000 +0000 +++ ./gdb/dwarf2read.c 2007-01-09 08:58:41.000000000 +0000 @@ -847,7 +847,7 @@ static struct line_header *(dwarf_decode static void dwarf_decode_lines (struct line_header *, char *, bfd *, struct dwarf2_cu *, struct partial_symtab *); -static void dwarf2_start_subfile (char *, char *, char *); +static void dwarf2_start_subfile (char *, char *, char *, unsigned); static struct symbol *new_symbol (struct die_info *, struct type *, struct dwarf2_cu *); @@ -6321,6 +6321,7 @@ add_file_name (struct line_header *lh, unsigned int length) { struct file_entry *fe; + char *dir = NULL; /* Grow the array if necessary. */ if (lh->file_names_size == 0) @@ -6343,6 +6344,10 @@ add_file_name (struct line_header *lh, fe->mod_time = mod_time; fe->length = length; fe->included_p = 0; + + if (dir_index) + dir = lh->include_dirs[dir_index - 1]; + dwarf2_start_subfile (name, dir, NULL, lh->num_file_names); } @@ -6560,7 +6565,7 @@ dwarf_decode_lines (struct line_header * if (fe->dir_index) dir = lh->include_dirs[fe->dir_index - 1]; - dwarf2_start_subfile (fe->name, dir, comp_dir); + dwarf2_start_subfile (fe->name, dir, comp_dir, file); } /* Decode the table. */ @@ -6661,7 +6666,7 @@ dwarf_decode_lines (struct line_header * dir = lh->include_dirs[fe->dir_index - 1]; if (!decode_for_pst_p) - dwarf2_start_subfile (fe->name, dir, comp_dir); + dwarf2_start_subfile (fe->name, dir, comp_dir, file); } break; case DW_LNS_set_column: @@ -6764,7 +6769,8 @@ dwarf_decode_lines (struct line_header * subfile's name. */ static void -dwarf2_start_subfile (char *filename, char *dirname, char *comp_dir) +dwarf2_start_subfile (char *filename, char *dirname, char *comp_dir, + unsigned file_index) { char *fullname; @@ -6783,7 +6789,7 @@ dwarf2_start_subfile (char *filename, ch else fullname = filename; - start_subfile (fullname, comp_dir); + start_subfile_index (fullname, comp_dir, file_index); if (fullname != filename) xfree (fullname); @@ -6892,6 +6898,13 @@ new_symbol (struct die_info *die, struct { SYMBOL_LINE (sym) = DW_UNSND (attr); } + attr = dwarf2_attr (die, DW_AT_decl_file, cu); + if (attr) + { + /* Do not yet search `objfile->symtabs' here as they still do not + have filled in their FILE.INDEX fields. */ + SYMBOL_FILE_INDEX (sym) = DW_UNSND (attr); + } switch (die->tag) { case DW_TAG_label: --- ./gdb/symtab.c 2007-01-08 22:28:25.000000000 +0000 +++ ./gdb/symtab.c 2007-01-09 08:19:05.000000000 +0000 @@ -1129,6 +1129,10 @@ lookup_symbol (const char *name, const s if (needtofreename) xfree (demangled_name); + /* Override the returned symtab with optional symbol's specific one. */ + if (returnval != NULL && symtab != NULL) + *symtab = SYMBOL_FILE_SYMTAB (returnval); + return returnval; } @@ -3235,7 +3239,7 @@ search_symbols (char *regexp, domain_enu ALL_BLOCK_SYMBOLS (b, iter, sym) { QUIT; - if (file_matches (s->filename, files, nfiles) + if (file_matches (SYMBOL_FILE_SYMTAB (sym)->filename, files, nfiles) && ((regexp == NULL || re_exec (SYMBOL_NATURAL_NAME (sym)) != 0) && ((kind == VARIABLES_DOMAIN && SYMBOL_CLASS (sym) != LOC_TYPEDEF @@ -3248,7 +3252,7 @@ search_symbols (char *regexp, domain_enu /* match */ psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search)); psr->block = i; - psr->symtab = s; + psr->symtab = SYMBOL_FILE_SYMTAB (sym); psr->symbol = sym; psr->msymbol = NULL; psr->next = NULL; --- ./gdb/symtab.h 2007-01-08 22:28:25.000000000 +0000 +++ ./gdb/symtab.h 2007-01-09 08:44:02.000000000 +0000 @@ -623,6 +623,18 @@ struct symbol ENUM_BITFIELD(address_class) aclass : 6; + /* File name it comes from. Use with `line' below. + FILE.INDEX is zero if the symbol's specific file is not known and in such + case we later default to the main file of the compilation unit. + FILE.SYMTAB gets resolved during end_symtab() and it is never NULL. */ + + union + { + unsigned index; + struct symtab *symtab; + } + file; + /* Line number of definition. FIXME: Should we really make the assumption that nobody will try to debug files longer than 64K lines? What about machine generated programs? */ @@ -663,6 +675,8 @@ struct symbol #define SYMBOL_DOMAIN(symbol) (symbol)->domain #define SYMBOL_CLASS(symbol) (symbol)->aclass #define SYMBOL_TYPE(symbol) (symbol)->type +#define SYMBOL_FILE_INDEX(symbol) (symbol)->file.index +#define SYMBOL_FILE_SYMTAB(symbol) (symbol)->file.symtab #define SYMBOL_LINE(symbol) (symbol)->line #define SYMBOL_BASEREG(symbol) (symbol)->aux_value.basereg #define SYMBOL_OBJFILE(symbol) (symbol)->aux_value.objfile gdb-6.5-bz109921-DW_AT_decl_file-test.patch: dw2-included.c | 26 ++++++++++++++++++++++++++ dw2-included.exp | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dw2-included.h | 20 ++++++++++++++++++++ 3 files changed, 93 insertions(+) --- NEW FILE gdb-6.5-bz109921-DW_AT_decl_file-test.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=109921 2007-01-09 Jan Kratochvil * gdb.dwarf2/dw2-included.exp, gdb.dwarf2/dw2-included.c, gdb.dwarf2/dw2-included.h: New files. --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.dwarf2/dw2-included.c 2 Jan 2007 00:20:27 -0000 @@ -0,0 +1,26 @@ +/* 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. */ + +#include "dw2-included.h" + +int +main() +{ + return 0; +} --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.dwarf2/dw2-included.exp 2 Jan 2007 00:20:27 -0000 @@ -0,0 +1,47 @@ +# 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. + +# Minimal DWARF-2 unit test + +# This test can only be run on targets which support DWARF-2. +# For now pick a sampling of likely targets. +if {![istarget *-*-linux*] + && ![istarget *-*-gnu*] + && ![istarget *-*-elf*] + && ![istarget *-*-openbsd*] + && ![istarget arm-*-eabi*] + && ![istarget powerpc-*-eabi*]} { + return 0 +} + +set testfile "dw2-included" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +gdb_test "set listsize 1" "" +gdb_test "list integer" "int integer;\r" +gdb_test "ptype integer" "type = int\r" +# Path varies depending on the build location. +gdb_test "info variables integer" "\r\nFile \[^\r\n\]*/gdb.dwarf2/dw2-included.h:\r\nint integer;\r" --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.dwarf2/dw2-included.h 2 Jan 2007 00:20:27 -0000 @@ -0,0 +1,20 @@ +/* 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. */ + +int integer; Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- gdb.spec 30 Dec 2006 20:59:07 -0000 1.212 +++ gdb.spec 9 Jan 2007 11:35:44 -0000 1.213 @@ -11,7 +11,7 @@ Version: 6.5 # The release always contains a leading reserved number, start it at 0. -Release: 22%{?dist} +Release: 23%{?dist} License: GPL Group: Development/Debuggers @@ -47,9 +47,6 @@ Patch3: gdb-6.3-rh-testlibunwind-20041202.patch Patch4: gdb-6.3-rh-testlibunwind1fix-20041202.patch -# Cleanup any leftover testsuite processes as it may stuck mock(1) builds. -Source2: gdb-orphanripper.c - # ------------------------------------------ @@ -321,6 +318,10 @@ Patch221: gdb-6.5-bz165025-DW_CFA_GNU_negative_offset_extended-fix.patch Patch222: gdb-6.5-bz165025-DW_CFA_GNU_negative_offset_extended-test.patch +# Find symbols properly at their original (included) file (BZ 109921). +Patch224: gdb-6.5-bz109921-DW_AT_decl_file-fix.patch +Patch225: gdb-6.5-bz109921-DW_AT_decl_file-test.patch + BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext BuildRequires: flex bison sharutils @@ -448,6 +449,8 @@ %patch219 -p1 %patch221 -p1 %patch222 -p1 +%patch224 -p1 +%patch225 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -523,11 +526,10 @@ %ifarch %{ix86} x86_64 s390x s390 ppc ia64 ppc64 echo ====================TESTING========================= cd gdb/testsuite -gcc -o ./orphanripper %{SOURCE2} -Wall # Need to use a single --ignore option, second use overrides first. # "chng-syms.exp" for possibly avoiding Linux kernel crash - Bug 207002. # "threadcrash.exp" is incompatible on ia64 with old kernels. -./orphanripper make -k check RUNTESTFLAGS='--ignore "bigcore.exp chng-syms.exp checkpoint.exp threadcrash.exp"' || : +make -k check RUNTESTFLAGS='--ignore "bigcore.exp chng-syms.exp checkpoint.exp threadcrash.exp"' || : for t in sum log; do ln gdb.$t gdb-%{_target_platform}.$t || : done @@ -611,6 +613,10 @@ # don't include the files in include, they are part of binutils %changelog +* Tue Jan 9 2007 Jan Kratochvil - 6.5-23 +- Find symbols properly at their original (included) file (BZ 109921). +- Remove the stuck mock(1) builds disfunctional workaround (-> mock BZ 221351). + * Sat Dec 30 2006 Jan Kratochvil - 6.5-22 - Fix unwinding crash on older gcj(1) code (extended CFI support) (BZ 165025). - Include testcase for the readline history of input mode commands (BZ 215816). --- gdb-orphanripper.c DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 11:49:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 06:49:32 -0500 Subject: rpms/gimp-print/FC-6 gimp-print.spec,1.44,1.45 Message-ID: <200701091149.l09BnWbB019038@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/gimp-print/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19024 Modified Files: gimp-print.spec Log Message: 4.2.7-23 Index: gimp-print.spec =================================================================== RCS file: /cvs/dist/rpms/gimp-print/FC-6/gimp-print.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gimp-print.spec 12 Dec 2006 14:16:42 -0000 1.44 +++ gimp-print.spec 9 Jan 2007 11:49:29 -0000 1.45 @@ -7,7 +7,7 @@ Summary: A collection of high-quality printer drivers. Name: gimp-print Version: 4.2.7 -Release: 22 +Release: 23%{?dist} License: GPL Group: System Environment/Libraries URL: http://gimp-print.sourceforge.net/ @@ -200,7 +200,7 @@ exit 0 %changelog -* Tue Dec 12 2006 Tim Waugh +* Tue Dec 12 2006 Tim Waugh 4.2.7-23 - Set POSIX locale when parsing lpstat output (bug #219017). * Thu Sep 28 2006 Tim Waugh 4.2.7-22 From fedora-cvs-commits at redhat.com Tue Jan 9 11:50:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 06:50:55 -0500 Subject: rpms/gimp-print/devel gimp-print-parse-lpstat.patch, NONE, 1.1 gimp-print.spec, 1.43, 1.44 Message-ID: <200701091150.l09Bot2J019115@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/gimp-print/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19099 Modified Files: gimp-print.spec Added Files: gimp-print-parse-lpstat.patch Log Message: * Tue Dec 12 2006 Tim Waugh 4.2.7-23 - Set POSIX locale when parsing lpstat output (bug #219017). - Resolves: rhbz#219017 gimp-print-parse-lpstat.patch: print.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gimp-print-parse-lpstat.patch --- --- gimp-print-4.2.7/src/gimp/print.c.parse-lpstat 2006-12-12 14:14:51.000000000 +0000 +++ gimp-print-4.2.7/src/gimp/print.c 2006-12-12 14:15:08.000000000 +0000 @@ -1194,7 +1194,7 @@ if (!access("/usr/bin/lpstat", X_OK)) { - strcpy(command, "/usr/bin/lpstat -d -p"); + strcpy(command, "LC_ALL=C /usr/bin/lpstat -d -p"); type = PRINTERS_LPSTAT; } else Index: gimp-print.spec =================================================================== RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- gimp-print.spec 28 Sep 2006 12:33:08 -0000 1.43 +++ gimp-print.spec 9 Jan 2007 11:50:52 -0000 1.44 @@ -7,7 +7,7 @@ Summary: A collection of high-quality printer drivers. Name: gimp-print Version: 4.2.7 -Release: 22 +Release: 23%{?dist} License: GPL Group: System Environment/Libraries URL: http://gimp-print.sourceforge.net/ @@ -24,6 +24,7 @@ Patch9: gimp-print-menu.patch Patch10: gimp-print-translate.patch Patch11: gimp-print-ipv6.patch +Patch12: gimp-print-parse-lpstat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot %if %{build_with_ijs_support} BuildRequires: ghostscript-devel @@ -87,6 +88,7 @@ %patch9 -p1 -b .menu %patch10 -p1 -b .translate %patch11 -p1 -b .ipv6 +%patch12 -p1 -b .parse-lpstat perl -pi -e 's,^(msgstr) "Ingl.s",$1 "Spanish",' po/es.po %build @@ -198,6 +200,9 @@ exit 0 %changelog +* Tue Dec 12 2006 Tim Waugh 4.2.7-23 +- Set POSIX locale when parsing lpstat output (bug #219017). + * Thu Sep 28 2006 Tim Waugh 4.2.7-22 - IPv6 support (bug #198368). From fedora-cvs-commits at redhat.com Tue Jan 9 12:23:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 07:23:13 -0500 Subject: rpms/foomatic/FC-6 foomatic.spec,1.148,1.149 Message-ID: <200701091223.l09CND0H007533@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7519 Modified Files: foomatic.spec Log Message: * Tue Jan 9 2007 Tim Waugh 3.0.2-39.4 - Removed m2300w files (bug #203381). Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-6/foomatic.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- foomatic.spec 5 Jan 2007 17:30:40 -0000 1.148 +++ foomatic.spec 9 Jan 2007 12:23:10 -0000 1.149 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 39.3%{?dist} +Release: 39.4%{?dist} License: GPL Group: System Environment/Libraries @@ -135,7 +135,10 @@ # Remove references to foo2zjs and foo2oak (bug #208851). find printer -name '*.xml' |xargs grep -l 'foo2'|xargs rm -f -rm -f driver/foo2zjs.xml driver/foo2oak.xml +rm -f driver/foo2zjs.xml driver/foo2oak.xml opt/foo2zjs-* opt/foo2oak-* +# Same for m2300w/m2400w +find printer -name '*.xml' |xargs grep -l 'm2[34]00w<'|xargs rm -f +rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-* popd @@ -279,6 +282,9 @@ %{_var}/cache/foomatic %changelog +* Tue Jan 9 2007 Tim Waugh 3.0.2-39.4 +- Removed m2300w files (bug #203381). + * Fri Jan 5 2007 Tim Waugh 3.0.2-39.3 - Updated db to 3.0-20070105 (bug #214037, bug #191661, bug #198999, bug #191504, bug #187387, bug #188762, bug #170373, bug #221121, From fedora-cvs-commits at redhat.com Tue Jan 9 12:24:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 07:24:54 -0500 Subject: rpms/foomatic/devel foomatic.spec,1.149,1.150 Message-ID: <200701091224.l09COsmp007671@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7653 Modified Files: foomatic.spec Log Message: * Tue Jan 9 2007 Tim Waugh 3.0.2-44 - Removed m2300w files (bug #203381). - Resolves: rhbz#203381 Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- foomatic.spec 5 Jan 2007 17:40:07 -0000 1.149 +++ foomatic.spec 9 Jan 2007 12:24:52 -0000 1.150 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 43%{?dist} +Release: 44%{?dist} License: GPL Group: System Environment/Libraries @@ -135,7 +135,10 @@ # Remove references to foo2zjs and foo2oak (bug #208851). find printer -name '*.xml' |xargs grep -l 'foo2'|xargs rm -f -rm -f driver/foo2zjs.xml driver/foo2oak.xml +rm -f driver/foo2zjs.xml driver/foo2oak.xml opt/foo2zjs-* opt/foo2oak-* +# Same for m2300w/m2400w +find printer -name '*.xml' |xargs grep -l 'm2[34]00w<'|xargs rm -f +rm -f driver/m2300w.xml driver/m2400w.xml opt/m2300w-* popd @@ -279,6 +282,9 @@ %{_var}/cache/foomatic %changelog +* Tue Jan 9 2007 Tim Waugh 3.0.2-44 +- Removed m2300w files (bug #203381). + * Fri Jan 5 2007 Tim Waugh 3.0.2-43 - Updated db to 3.0-20070105 (bug #214037, bug #191661, bug #198999, bug #191504, bug #187387, bug #188762, bug #170373, bug #221121, From fedora-cvs-commits at redhat.com Tue Jan 9 13:23:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 08:23:31 -0500 Subject: rpms/rhpl/devel .cvsignore, 1.70, 1.71 rhpl.spec, 1.87, 1.88 sources, 1.77, 1.78 Message-ID: <200701091323.l09DNVJb004471@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4413 Modified Files: .cvsignore rhpl.spec sources Log Message: * Tue Jan 09 2007 Paul Nasrat - 0.197-1 - Fix Korean keyboard (#212280) - Resolves: rhbz#212280 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- .cvsignore 7 Dec 2006 16:32:14 -0000 1.70 +++ .cvsignore 9 Jan 2007 13:23:29 -0000 1.71 @@ -1 +1,2 @@ rhpl-0.196.tar.gz +rhpl-0.197.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- rhpl.spec 7 Dec 2006 16:32:14 -0000 1.87 +++ rhpl.spec 9 Jan 2007 13:23:29 -0000 1.88 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.196 +Version: 0.197 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -12,6 +12,7 @@ %endif Conflicts: kudzu < 1.2.0, hwdata < 0.169 Conflicts: wireless-tools < 28-0.pre8.5 +Conflicts: kbd < 1.12.21 %description The rhpl package contains Python code used by programs in Red Hat Linux. @@ -37,6 +38,9 @@ %{_libdir}/python?.?/site-packages/rhpl %changelog +* Tue Jan 09 2007 Paul Nasrat - 0.197-1 +- Fix Korean keyboard (#212280) + * Thu Dec 7 2006 Jeremy Katz - 0.196-1 - fix build with new gettext - simplify russian keyboard choices (clumens, #218264) Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- sources 7 Dec 2006 16:32:14 -0000 1.77 +++ sources 9 Jan 2007 13:23:29 -0000 1.78 @@ -1 +1 @@ -6797fa266e6f631a117ef8f7f6116bd4 rhpl-0.196.tar.gz +901273639248835ad2ae34e491cdbd06 rhpl-0.197.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 9 14:22:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 09:22:11 -0500 Subject: rpms/gimp-print/devel gimp-print-4.2.6-mkinstalldirs.patch, 1.1, 1.2 gimp-print.spec, 1.44, 1.45 Message-ID: <200701091422.l09EMBEU014655@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/gimp-print/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14639 Modified Files: gimp-print-4.2.6-mkinstalldirs.patch gimp-print.spec Log Message: * Tue Dec 12 2006 Tim Waugh 4.2.7-23 - Fixed build (mkinstalldirs problem). gimp-print-4.2.6-mkinstalldirs.patch: Makefile.in.in | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: gimp-print-4.2.6-mkinstalldirs.patch =================================================================== RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print-4.2.6-mkinstalldirs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gimp-print-4.2.6-mkinstalldirs.patch 9 Sep 2004 05:12:54 -0000 1.1 +++ gimp-print-4.2.6-mkinstalldirs.patch 9 Jan 2007 14:22:09 -0000 1.2 @@ -1,11 +1,12 @@ ---- gimp-print-4.2.6/po/Makefile.in.in.mkinstalldirs 2004-01-11 13:55:30.000000000 +0100 -+++ gimp-print-4.2.6/po/Makefile.in.in 2004-01-23 23:04:51.000000000 +0100 -@@ -29,7 +29,7 @@ +--- gimp-print-4.2.7/po/Makefile.in.in.mkinstalldirs 2004-07-16 01:12:30.000000000 +0100 ++++ gimp-print-4.2.7/po/Makefile.in.in 2007-01-09 14:05:19.000000000 +0000 +@@ -28,8 +28,7 @@ + INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @MKINSTALLDIRS@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` -+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in .*|/*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` ++mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs CC = @CC@ GMSGFMT = @GMSGFMT@ Index: gimp-print.spec =================================================================== RCS file: /cvs/dist/rpms/gimp-print/devel/gimp-print.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gimp-print.spec 9 Jan 2007 11:50:52 -0000 1.44 +++ gimp-print.spec 9 Jan 2007 14:22:09 -0000 1.45 @@ -201,6 +201,7 @@ %changelog * Tue Dec 12 2006 Tim Waugh 4.2.7-23 +- Fixed build (mkinstalldirs problem). - Set POSIX locale when parsing lpstat output (bug #219017). * Thu Sep 28 2006 Tim Waugh 4.2.7-22 From fedora-cvs-commits at redhat.com Tue Jan 9 14:31:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 09:31:41 -0500 Subject: rpms/icu/devel icu.icuXXXX.safety.patch, NONE, 1.1 icu.spec, 1.41, 1.42 Message-ID: <200701091431.l09EVfZM028360@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28302 Modified Files: icu.spec Added Files: icu.icuXXXX.safety.patch Log Message: Related: rhbz#216089 add icu.icuXXXX.safety.patch icu.icuXXXX.safety.patch: CoverageTables.cpp | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE icu.icuXXXX.safety.patch --- --- icu.orig/source/layout/CoverageTables.cpp 2007-01-09 12:57:41.000000000 +0000 +++ icu/source/layout/CoverageTables.cpp 2007-01-09 12:59:09.000000000 +0000 @@ -44,6 +44,11 @@ le_uint16 count = SWAPW(glyphCount); le_uint8 bit = OpenTypeUtilities::highBit(count); le_uint16 power = 1 << bit; + + if (count == 0) { + return -1; + } + le_uint16 extra = count - power; le_uint16 probe = power; le_uint16 index = 0; Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- icu.spec 21 Dec 2006 09:30:55 -0000 1.41 +++ icu.spec 9 Jan 2007 14:31:39 -0000 1.42 @@ -1,6 +1,6 @@ Name: icu Version: 3.6 -Release: 13 +Release: 14 Summary: International Components for Unicode Group: System Environment/Libraries @@ -21,7 +21,8 @@ Patch9: icu.icu5488.assamese.patch Patch10: icu.icu5500.devicetablecrash.patch Patch11: icu.icu5501.sinhala.biggerexpand.patch -Patch12: icu.icu5506.multiplevowels.patch +Patch12: icu.icuXXXX.safety.patch +Patch13: icu.icu5506.multiplevowels.patch %description The International Components for Unicode (ICU) libraries provide @@ -71,7 +72,8 @@ %patch9 -p1 -b .icu5488.assamese.patch %patch10 -p1 -b .icu5500.devicetablecrash.patch %patch11 -p1 -b .icu5501.sinhala.biggerexpand.patch -%patch12 -p1 -b .icu5506.multiplevowels.patch +%patch12 -p1 -b .icuXXXX.safety.patch +%patch13 -p1 -b .icu5506.multiplevowels.patch %build cd source @@ -152,6 +154,9 @@ %changelog +* Thu Jan 09 2006 Caolan McNamara - 3.6-14 +- Related: rhbz#216089 add icu.icuXXXX.safety.patch + * Thu Dec 21 2006 Caolan McNamara - 3.6-13 - Resolves: rhbz#220433 modify icu.icu5431.malayam.patch From fedora-cvs-commits at redhat.com Tue Jan 9 14:32:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 09:32:00 -0500 Subject: rpms/icu/devel icu.spec,1.42,1.43 Message-ID: <200701091432.l09EW0D0028617@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28560 Modified Files: icu.spec Log Message: Related: rhbz#216089 add icu.icuXXXX.safety.patch Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- icu.spec 9 Jan 2007 14:31:39 -0000 1.42 +++ icu.spec 9 Jan 2007 14:31:58 -0000 1.43 @@ -154,7 +154,7 @@ %changelog -* Thu Jan 09 2006 Caolan McNamara - 3.6-14 +* Thu Jan 09 2007 Caolan McNamara - 3.6-14 - Related: rhbz#216089 add icu.icuXXXX.safety.patch * Thu Dec 21 2006 Caolan McNamara - 3.6-13 From fedora-cvs-commits at redhat.com Tue Jan 9 14:45:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 09:45:21 -0500 Subject: rpms/icu/devel icu.icu5557.safety.patch, NONE, 1.1 icu.spec, 1.43, 1.44 icu.icuXXXX.safety.patch, 1.1, NONE Message-ID: <200701091445.l09EjLmc006396@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6342 Modified Files: icu.spec Added Files: icu.icu5557.safety.patch Removed Files: icu.icuXXXX.safety.patch Log Message: rename patch as upstream name icu.icu5557.safety.patch: CoverageTables.cpp | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE icu.icu5557.safety.patch --- --- icu.orig/source/layout/CoverageTables.cpp 2007-01-09 12:57:41.000000000 +0000 +++ icu/source/layout/CoverageTables.cpp 2007-01-09 12:59:09.000000000 +0000 @@ -44,6 +44,11 @@ le_uint16 count = SWAPW(glyphCount); le_uint8 bit = OpenTypeUtilities::highBit(count); le_uint16 power = 1 << bit; + + if (count == 0) { + return -1; + } + le_uint16 extra = count - power; le_uint16 probe = power; le_uint16 index = 0; Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- icu.spec 9 Jan 2007 14:31:58 -0000 1.43 +++ icu.spec 9 Jan 2007 14:45:19 -0000 1.44 @@ -21,7 +21,7 @@ Patch9: icu.icu5488.assamese.patch Patch10: icu.icu5500.devicetablecrash.patch Patch11: icu.icu5501.sinhala.biggerexpand.patch -Patch12: icu.icuXXXX.safety.patch +Patch12: icu.icu5557.safety.patch Patch13: icu.icu5506.multiplevowels.patch %description @@ -72,7 +72,7 @@ %patch9 -p1 -b .icu5488.assamese.patch %patch10 -p1 -b .icu5500.devicetablecrash.patch %patch11 -p1 -b .icu5501.sinhala.biggerexpand.patch -%patch12 -p1 -b .icuXXXX.safety.patch +%patch12 -p1 -b .icu5557.safety.patch %patch13 -p1 -b .icu5506.multiplevowels.patch %build @@ -155,7 +155,7 @@ %changelog * Thu Jan 09 2007 Caolan McNamara - 3.6-14 -- Related: rhbz#216089 add icu.icuXXXX.safety.patch +- Related: rhbz#216089 add icu.icu5557.safety.patch * Thu Dec 21 2006 Caolan McNamara - 3.6-13 - Resolves: rhbz#220433 modify icu.icu5431.malayam.patch --- icu.icuXXXX.safety.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 15:02:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:02:49 -0500 Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.98, 1.99 libselinux.spec, 1.238, 1.239 Message-ID: <200701091502.l09F2nsw007670@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7598 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Fri Jan 5 2007 Dan Walsh - 1.33.3-3 - Cleanup patch libselinux-rhat.patch: include/selinux/selinux.h | 6 ++- man/man3/selinux_binary_policy_path.3 | 4 ++ man/man3/selinux_check_securetty_context.3 | 13 ++++++ man/man3/selinux_securetty_context_path.3 | 1 src/file_path_suffixes.h | 1 src/selinux_check_securetty_context.c | 54 +++++++++++++++++++++++++++++ src/selinux_config.c | 10 ++++- src/selinux_internal.h | 2 + utils/matchpathcon.c | 8 ++-- utils/selinux_check_securetty_context.c | 38 ++++++++++++++++++++ 10 files changed, 132 insertions(+), 5 deletions(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- libselinux-rhat.patch 5 Jan 2007 17:54:21 -0000 1.98 +++ libselinux-rhat.patch 9 Jan 2007 15:02:46 -0000 1.99 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.33.3/include/selinux/selinux.h --- nsalibselinux/include/selinux/selinux.h 2006-11-16 17:15:18.000000000 -0500 -+++ libselinux-1.33.3/include/selinux/selinux.h 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/include/selinux/selinux.h 2007-01-09 09:49:51.000000000 -0500 @@ -406,6 +406,7 @@ extern const char *selinux_homedir_context_path(void); extern const char *selinux_media_context_path(void); @@ -9,7 +9,7 @@ extern const char *selinux_booleans_path(void); extern const char *selinux_customizable_types_path(void); extern const char *selinux_users_path(void); -@@ -413,12 +414,14 @@ +@@ -413,12 +414,15 @@ extern const char *selinux_translations_path(void); extern const char *selinux_netfilter_context_path(void); extern const char *selinux_path(void); @@ -21,13 +21,14 @@ +/* Check if the tty_context is defined as a securetty + Return 1 if secure, 0 if not, or -1 if otherwise. */ -+ extern int selinux_check_securetty_context(security_context_t tty_context); ++ extern int selinux_check_securetty_context(security_context_t ++ tty_context); /* Set the path to the selinuxfs mount point explicitly. Normally, this is determined automatically during libselinux initialization, but this is not always possible, e.g. for /sbin/init diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 --- nsalibselinux/man/man3/selinux_binary_policy_path.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 2007-01-09 09:49:51.000000000 -0500 @@ -27,6 +27,8 @@ .br extern const char *selinux_media_context_path(void); @@ -48,7 +49,7 @@ .SH AUTHOR diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_check_securetty_context.3 libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 --- nsalibselinux/man/man3/selinux_check_securetty_context.3 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 2007-01-09 09:49:51.000000000 -0500 @@ -0,0 +1,13 @@ +.TH "selinux_check_securetty_context" "3" "1 January 2007" "dwalsh at redhat.com" "SE Linux API documentation" +.SH "NAME" @@ -65,12 +66,12 @@ +returns -1 on error. diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_securetty_context_path.3 libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 --- nsalibselinux/man/man3/selinux_securetty_context_path.3 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 2007-01-09 09:49:51.000000000 -0500 @@ -0,0 +1 @@ +.so man3/selinux_binary_policy_path.3 diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-1.33.3/src/file_path_suffixes.h --- nsalibselinux/src/file_path_suffixes.h 2006-11-16 17:15:25.000000000 -0500 -+++ libselinux-1.33.3/src/file_path_suffixes.h 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/src/file_path_suffixes.h 2007-01-09 09:49:51.000000000 -0500 @@ -7,6 +7,7 @@ S_(USER_CONTEXTS, "/contexts/users/") S_(FAILSAFE_CONTEXT, "/contexts/failsafe_context") @@ -81,8 +82,8 @@ S_(REMOVABLE_CONTEXT, "/contexts/removable_context") diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_check_securetty_context.c libselinux-1.33.3/src/selinux_check_securetty_context.c --- nsalibselinux/src/selinux_check_securetty_context.c 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-1.33.3/src/selinux_check_securetty_context.c 2007-01-05 11:57:44.000000000 -0500 -@@ -0,0 +1,49 @@ ++++ libselinux-1.33.3/src/selinux_check_securetty_context.c 2007-01-09 10:00:58.000000000 -0500 +@@ -0,0 +1,54 @@ +#include +#include +#include @@ -93,36 +94,41 @@ + +int selinux_check_securetty_context(security_context_t tty_context) +{ -+ char buf[250]; -+ char *ptr = "", *end; ++ char *line = NULL; ++ char *start, *end = NULL; ++ size_t line_len = 0; + size_t len; + int found = -1; + FILE *fp; + fp = fopen(selinux_securetty_context_path(), "r"); + if (fp) { -+ context_t con =context_new(tty_context); ++ context_t con = context_new(tty_context); + if (con) { -+ char *type=context_type_get(con); ++ const char *type = context_type_get(con); + found = 0; -+ len = strlen(type); -+ while (!feof_unlocked(fp)) { -+ if (!fgets_unlocked(buf, sizeof buf, fp)) -+ break; ++ while ((len = getline(&line, &line_len, fp)) != -1) { + -+ if (buf[strlen(buf) - 1]) -+ buf[strlen(buf) - 1] = 0; ++ if (line[len - 1] == '\n') ++ line[len - 1] = 0; + -+ ptr = buf; -+ while (*ptr && isspace(*ptr)) -+ ptr++; -+ if (!(*ptr)) ++ /* Skip leading whitespace. */ ++ start = line; ++ while (*start && isspace(*start)) ++ start++; ++ if (!(*start)) + continue; + -+ if (!strncmp(type, ptr, len)) { ++ end = start; ++ while (*end && !isspace(*end)) ++ end++; ++ if (*end) ++ *end++ = 0; ++ if (!strcmp(type, start)) { + found = 1; + break; + } + } ++ free(line); + context_free(con); + } + fclose(fp); @@ -134,7 +140,7 @@ +hidden_def(selinux_check_securetty_context) diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.33.3/src/selinux_config.c --- nsalibselinux/src/selinux_config.c 2006-11-16 17:15:25.000000000 -0500 -+++ libselinux-1.33.3/src/selinux_config.c 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_config.c 2007-01-09 09:49:51.000000000 -0500 @@ -38,7 +38,8 @@ #define NETFILTER_CONTEXTS 15 #define FILE_CONTEXTS_HOMEDIR 16 @@ -145,7 +151,7 @@ /* New layout is relative to SELINUXDIR/policytype. */ static char *file_paths[NEL]; -@@ -299,6 +300,12 @@ +@@ -299,6 +300,13 @@ hidden_def(selinux_default_context_path) @@ -153,6 +159,7 @@ +{ + return get_path(SECURETTY_CONTEXTS); +} ++ +hidden_def(selinux_securetty_context_path) + const char *selinux_failsafe_context_path() @@ -160,7 +167,7 @@ return get_path(FAILSAFE_CONTEXT); diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.33.3/src/selinux_internal.h --- nsalibselinux/src/selinux_internal.h 2006-11-16 17:15:25.000000000 -0500 -+++ libselinux-1.33.3/src/selinux_internal.h 2007-01-05 11:57:44.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_internal.h 2007-01-09 09:49:51.000000000 -0500 @@ -53,6 +53,7 @@ hidden_proto(security_setenforce) hidden_proto(selinux_binary_policy_path) @@ -177,10 +184,40 @@ hidden_proto(matchpathcon_init_prefix) hidden_proto(selinux_users_path) hidden_proto(selinux_usersconf_path); +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.33.3/utils/matchpathcon.c +--- nsalibselinux/utils/matchpathcon.c 2007-01-04 17:01:41.000000000 -0500 ++++ libselinux-1.33.3/utils/matchpathcon.c 2007-01-09 09:49:51.000000000 -0500 +@@ -95,7 +95,7 @@ + } + } + for (i = optind; i < argc; i++) { +- int mode=0; ++ int mode = 0; + struct stat buf; + if (lstat(argv[i], &buf) == 0) + mode = buf.st_mode; +@@ -114,13 +114,15 @@ + if (rc >= 0) { + printf("%s has context %s, should be ", + argv[i], con); +- error += printmatchpathcon(argv[i], 0, mode); ++ error += ++ printmatchpathcon(argv[i], 0, mode); + freecon(con); + } else { + printf + ("actual context unknown: %s, should be ", + strerror(errno)); +- error += printmatchpathcon(argv[i], 0,mode); ++ error += ++ printmatchpathcon(argv[i], 0, mode); + } + } + } else { diff --exclude-from=exclude -N -u -r nsalibselinux/utils/selinux_check_securetty_context.c libselinux-1.33.3/utils/selinux_check_securetty_context.c --- nsalibselinux/utils/selinux_check_securetty_context.c 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-1.33.3/utils/selinux_check_securetty_context.c 2007-01-05 11:57:44.000000000 -0500 -@@ -0,0 +1,40 @@ ++++ libselinux-1.33.3/utils/selinux_check_securetty_context.c 2007-01-09 09:49:51.000000000 -0500 +@@ -0,0 +1,38 @@ +#include +#include +#include @@ -194,9 +231,7 @@ + +void usage(const char *progname) +{ -+ fprintf(stderr, -+ "usage: %s tty_context...\n", -+ progname); ++ fprintf(stderr, "usage: %s tty_context...\n", progname); + exit(1); +} + Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- libselinux.spec 5 Jan 2007 17:54:21 -0000 1.238 +++ libselinux.spec 9 Jan 2007 15:02:46 -0000 1.239 @@ -2,7 +2,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 1.33.3 -Release: 2%{?dist} +Release: 3%{?dist} License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -120,6 +120,9 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Fri Jan 5 2007 Dan Walsh - 1.33.3-3 +- Cleanup patch + * Fri Jan 5 2007 Dan Walsh - 1.33.3-2 - Add securetty handling Resolves: #200110 From fedora-cvs-commits at redhat.com Tue Jan 9 15:19:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:19:25 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.130, 1.131 policycoreutils-rhat.patch, 1.270, 1.271 policycoreutils.spec, 1.357, 1.358 sources, 1.134, 1.135 Message-ID: <200701091519.l09FJPGd009652@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9599 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Tue Jan 9 2007 Dan Walsh 1.33.10-1 - Update to upstream * Merged patch to correctly handle a failure during semanage handle creation from Karl MacMillan. * Merged patch to fix seobject role modification from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- .cvsignore 4 Jan 2007 22:11:35 -0000 1.130 +++ .cvsignore 9 Jan 2007 15:19:22 -0000 1.131 @@ -122,3 +122,4 @@ policycoreutils-1.33.6.tgz policycoreutils-1.33.7.tgz policycoreutils-1.33.8.tgz +policycoreutils-1.33.10.tgz policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ newrole/newrole.c | 10 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/fixfiles | 3 semanage/seobject.py | 24 20 files changed, 4824 insertions(+), 15 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- policycoreutils-rhat.patch 5 Jan 2007 18:15:38 -0000 1.270 +++ policycoreutils-rhat.patch 9 Jan 2007 15:19:22 -0000 1.271 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.8/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.10/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/booleansPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/booleansPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -201,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.8/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.10/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/fcontextPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/fcontextPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -363,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.8/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.10/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/loginsPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/loginsPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -528,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.8/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.10/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/Makefile 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/Makefile 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -562,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.8/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.10/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/mappingsPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/mappingsPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -620,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.8/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.10/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/modulesPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/modulesPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -785,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.8/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.10/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/portsPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/portsPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1003,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.8/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.10/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/selinux.tbl 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/selinux.tbl 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1272,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.8/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.10/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/semanagePage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/semanagePage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1385,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.8/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.10/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/statusPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/statusPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1602,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.8/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.10/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/system-config-selinux.glade 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/system-config-selinux.glade 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4409,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.8/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.10/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/system-config-selinux.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/system-config-selinux.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4569,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.8/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.10/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/translationsPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/translationsPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4682,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.8/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.10/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/usersPage.py 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/gui/usersPage.py 2007-01-09 09:13:43.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4841,66 +4841,45 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.8/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.10/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.8/Makefile 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/Makefile 2007-01-09 09:13:43.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -Binary files nsapolicycoreutils/newrole/newrole and policycoreutils-1.33.8/newrole/newrole differ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.8/newrole/newrole.c +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.10/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2007-01-04 17:01:41.000000000 -0500 -+++ policycoreutils-1.33.8/newrole/newrole.c 2007-01-05 11:17:36.000000000 -0500 -@@ -67,6 +67,7 @@ - #include /* for SELINUX_DEFAULTUSER */ - #include - #include /* for getuid(), exit(), getopt() */ -+#include - #ifdef USE_AUDIT - #include - #endif -@@ -733,6 +734,7 @@ - security_context_t *new_context, - int *preserve_environment) - { -+ int i; /* index for open file descriptors */ - int flag_index; /* flag index in argv[] */ - int clflag; /* holds codes for command line flags */ - char *role_s = NULL; /* role spec'd by user in argv[] */ -@@ -741,6 +743,8 @@ ++++ policycoreutils-1.33.10/newrole/newrole.c 2007-01-09 09:13:43.000000000 -0500 +@@ -741,6 +741,7 @@ char *level_s = NULL; /* level spec'd by user in argv[] */ char *range_ptr = NULL; security_context_t new_con = NULL; + security_context_t tty_con = NULL; -+ int securetty=0; context_t context = NULL; /* manipulatable form of new_context */ const struct option long_options[] = { {"role", 1, 0, 'r'}, -@@ -793,6 +797,18 @@ +@@ -793,6 +794,15 @@ "specified\n")); return -1; } -+ for (i=0; i < 3; i++) { -+ securetty=0; -+ if (fgetfilecon(i,&tty_con) >= 0) { -+ securetty = (selinux_check_securetty_context(tty_con) == 1); -+ freecon(tty_con); -+ } -+ if (!securetty) { ++ if (fgetfilecon(0,&tty_con) >= 0) { ++ if (selinux_check_securetty_context(tty_con) != 1) { + fprintf(stderr, "Error: you are not allowed to change levels on a non secure terminal\n"); ++ freecon(tty_con); + return -1; + } ++ freecon(tty_con); + } + level_s = optarg; break; default: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.8/restorecond/restorecond.c +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.10/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.8/restorecond/restorecond.c 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/restorecond/restorecond.c 2007-01-09 09:13:43.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4927,18 +4906,18 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.8/restorecond/restorecond.conf +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.10/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.8/restorecond/restorecond.conf 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/restorecond/restorecond.conf 2007-01-09 09:13:43.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.8/scripts/fixfiles +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.10/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.33.8/scripts/fixfiles 2007-01-04 17:10:20.000000000 -0500 ++++ policycoreutils-1.33.10/scripts/fixfiles 2007-01-09 09:13:43.000000000 -0500 @@ -29,6 +29,9 @@ RPMILES="" OUTFILES="" @@ -4949,9 +4928,9 @@ SYSLOGFLAG="-l" LOGGER=/usr/sbin/logger SETFILES=/sbin/setfiles -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.8/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.8/semanage/seobject.py 2007-01-04 17:10:20.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.10/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2007-01-09 09:06:59.000000000 -0500 ++++ policycoreutils-1.33.10/semanage/seobject.py 2007-01-09 09:21:32.000000000 -0500 @@ -94,23 +94,25 @@ return re.search("^" + reg +"$",raw) @@ -4963,8 +4942,7 @@ + context = "%s%s" % (filler,raw) else: context = raw -- (rc, trans) = selinux.selinux_raw_to_trans_context(context) -+ (rc, trans) = selinux.selinux_raw_to_trans_context(context) + (rc, trans) = selinux.selinux_raw_to_trans_context(context) if rc != 0: return raw if prepend: @@ -5011,7 +4989,7 @@ class semanageRecords: def __init__(self): self.sh = semanage_handle_create() -@@ -456,7 +459,8 @@ +@@ -459,7 +462,8 @@ rc = semanage_user_set_mlslevel(self.sh, u, selevel) if rc < 0: raise ValueError(_("Could not set MLS level for %s") % name) @@ -5021,7 +4999,7 @@ rc = semanage_user_set_prefix(self.sh, u, prefix) if rc < 0: raise ValueError(_("Could not add prefix %s for %s") % (r, prefix)) -@@ -522,11 +526,17 @@ +@@ -525,7 +529,9 @@ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) if prefix != "": @@ -5031,14 +5009,4 @@ + semanage_user_set_prefix(self.sh, u, prefix) if len(roles) != 0: -- for r in roles: -- semanage_user_add_role(self.sh, u, r) -+ for r in rlist: -+ if r not in roles: -+ semanage_user_del_role(u, r) -+ for r in roles: -+ if r not in rlist: -+ semanage_user_add_role(self.sh, u, r) - - rc = semanage_begin_transaction(self.sh) - if rc < 0: + for r in rlist: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- policycoreutils.spec 5 Jan 2007 18:15:39 -0000 1.357 +++ policycoreutils.spec 9 Jan 2007 15:19:23 -0000 1.358 @@ -4,7 +4,7 @@ %define libselinuxver 1.33.3-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.8 +Version: 1.33.10 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -17,9 +17,9 @@ Patch1: policycoreutils-po.patch BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel gettext -Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff +Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >= %{libauditver} -Requires(post): /sbin/service /sbin/chkconfig +Requires(post): /sbin/service /sbin/chkconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -168,6 +168,12 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Tue Jan 9 2007 Dan Walsh 1.33.10-1 +- Update to upstream + * Merged patch to correctly handle a failure during semanage handle + creation from Karl MacMillan. + * Merged patch to fix seobject role modification from Dan Walsh. + * Fri Jan 5 2007 Dan Walsh 1.33.8-2 - Stop newrole -l from working on non secure ttys Resolves: #200110 Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- sources 4 Jan 2007 22:11:38 -0000 1.134 +++ sources 9 Jan 2007 15:19:23 -0000 1.135 @@ -1 +1 @@ -c4c3ebbaf1c11e122441da38fd11478c policycoreutils-1.33.8.tgz +131eadefb07d3e320d860136177578e4 policycoreutils-1.33.10.tgz From fedora-cvs-commits at redhat.com Tue Jan 9 15:22:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:22:12 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.69, 1.70 libsemanage.spec, 1.114, 1.115 sources, 1.71, 1.72 Message-ID: <200701091522.l09FMCwr012088@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12038 Modified Files: .cvsignore libsemanage.spec sources Log Message: * Fri Dec 22 2006 Dan Walsh - 1.9.2-1 - Upgrade to latest from NSA * Merged patch to optionally reduce disk usage by removing the backup module store and linked policy from Karl MacMillan * Merged patch to correctly propagate return values in libsemanage Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- .cvsignore 28 Nov 2006 19:02:17 -0000 1.69 +++ .cvsignore 9 Jan 2007 15:22:05 -0000 1.70 @@ -75,3 +75,4 @@ libsemanage-1.6.17.tgz libsemanage-1.8.tgz libsemanage-1.9.1.tgz +libsemanage-1.9.2.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- libsemanage.spec 22 Dec 2006 16:50:50 -0000 1.114 +++ libsemanage.spec 9 Jan 2007 15:22:05 -0000 1.115 @@ -2,12 +2,11 @@ %define libselinuxver 1.32-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.9.1 -Release: 3%{?dist} +Version: 1.9.2 +Release: 1%{?dist} 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} swig @@ -41,7 +40,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -77,6 +75,12 @@ %{_mandir}/man3/* %changelog +* Fri Dec 22 2006 Dan Walsh - 1.9.2-1 +- Upgrade to latest from NSA + * Merged patch to optionally reduce disk usage by removing + the backup module store and linked policy from Karl MacMillan + * Merged patch to correctly propagate return values in libsemanage + * Fri Dec 22 2006 Dan Walsh - 1.9.1-3 - Apply Karl MacMillan patch to get proper error codes. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- sources 28 Nov 2006 19:02:17 -0000 1.71 +++ sources 9 Jan 2007 15:22:05 -0000 1.72 @@ -1 +1 @@ -e2fd66d32b97b0814c0cd2db34c1ec2f libsemanage-1.9.1.tgz +c5bf4a31d5b39958587cec079c93cfee libsemanage-1.9.2.tgz From fedora-cvs-commits at redhat.com Tue Jan 9 15:23:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:23:43 -0500 Subject: rpms/setup/FC-6 .cvsignore, 1.37, 1.38 setup.spec, 1.42, 1.43 sources, 1.38, 1.39 Message-ID: <200701091523.l09FNhb3013799@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/setup/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13276 Modified Files: .cvsignore setup.spec sources Log Message: - Update package to include some devel fixes. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setup/FC-6/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 11 Oct 2006 15:59:14 -0000 1.37 +++ .cvsignore 9 Jan 2007 15:23:41 -0000 1.38 @@ -1 +1 @@ -setup-2.5.55.tar.bz2 +setup-2.6.1.1.tar.bz2 Index: setup.spec =================================================================== RCS file: /cvs/dist/rpms/setup/FC-6/setup.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- setup.spec 11 Oct 2006 15:58:34 -0000 1.42 +++ setup.spec 9 Jan 2007 15:23:41 -0000 1.43 @@ -1,11 +1,11 @@ Summary: A set of system configuration and setup files. Name: setup -Version: 2.5.55 -Release: 1 +Version: 2.6.1.1 +Release: 1%{?dist} License: public domain Group: System Environment/Base Source: setup-%{version}.tar.bz2 -Buildroot: %{_tmppath}/%{name}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch BuildRequires: bash tcsh Conflicts: initscripts < 4.26, bash <= 2.0.4-21 @@ -76,6 +76,18 @@ %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %changelog +* Tue Jan 09 2007 Phil Knirsch 2.6.1.1-1.fc6 +- Update package for FC-6 + +* Tue Nov 28 2006 Phil Knirsch 2.6.1-1.fc7 +- Update version and rebuilt + +* Tue Nov 28 2006 Phil Knirsch 2.5.57-1 +- Revert change for umask in /etc/bashrc (#217523) + +* Thu Nov 16 2006 Phil Knirsch 2.5.56-1 +- Added an entry for samba and winbind_auth + * Wed Oct 11 2006 Phil Knirsch 2.5.55-1 - Extended the protocols to include the missing hopopt (#209191) Index: sources =================================================================== RCS file: /cvs/dist/rpms/setup/FC-6/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 11 Oct 2006 15:59:14 -0000 1.38 +++ sources 9 Jan 2007 15:23:41 -0000 1.39 @@ -1 +1 @@ -e6f6264ad997d7604a248f6c322ebfa5 setup-2.5.55.tar.bz2 +60d507793553fe1e49c4f0c5147418d1 setup-2.6.1.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 15:24:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:24:44 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch, NONE, 1.1 booleans-strict.conf, 1.4, 1.5 booleans-targeted.conf, 1.23, 1.24 selinux-policy.spec, 1.377, 1.378 policy-20061106.patch, 1.55, NONE Message-ID: <200701091524.l09FOiUS014692@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14650 Modified Files: booleans-strict.conf booleans-targeted.conf selinux-policy.spec Added Files: policy-20070102.patch Removed Files: policy-20061106.patch Log Message: * Mon Jan 8 2007 Dan Walsh 2.5.1-1 - Allow prelink when run from rpm to create tmp files Resolves: #221865 - Remove file_context for exportfs Resolves: #221181 - Allow spamassassin to create ~/.spamassissin Resolves: #203290 - Allow ssh access to the krb tickets - Allow sshd to change passwd - Stop newrole -l from working on non securetty Resolves: #200110 policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 policy/flask/access_vectors | 2 policy/global_tunables | 39 ++ policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 1 policy/modules/admin/netutils.te | 1 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 +- policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/evolution.if | 135 ++++++++- policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++- policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 2 policy/modules/apps/mozilla.if | 252 +++++++++++++++--- policy/modules/apps/mplayer.if | 79 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 91 +++++- policy/modules/apps/userhelper.if | 19 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 57 ++++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 11 policy/modules/kernel/files.if | 162 +++++++++++ policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 4 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 1 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++--- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 +++ policy/modules/services/ftp.te | 12 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 7 policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/lpd.if | 52 ++- policy/modules/services/mta.te | 1 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 ++++ policy/modules/services/pcscd.te | 76 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.te | 7 policy/modules/services/ssh.if | 45 +++ policy/modules/services/ssh.te | 4 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 +++++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 72 +++++ policy/modules/system/authlogin.te | 2 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 4 policy/modules/system/getty.te | 14 - policy/modules/system/hostname.te | 14 - policy/modules/system/init.if | 3 policy/modules/system/init.te | 35 ++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 3 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 8 policy/modules/system/lvm.te | 5 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 - policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 110 ++++++++ policy/modules/system/selinuxutil.te | 95 +----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 34 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 16 + policy/modules/system/userdomain.if | 411 ++++++++++++++++++++++++++++-- policy/modules/system/userdomain.te | 42 +-- policy/modules/system/xen.te | 20 + policy/support/obj_perm_sets.spt | 2 138 files changed, 3001 insertions(+), 405 deletions(-) --- NEW FILE policy-20070102.patch --- diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.5.1/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-16 17:15:27.000000000 -0500 +++ serefpolicy-2.5.1/config/appconfig-strict/seusers 2007-01-05 12:59:57.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-16 17:15:27.000000000 -0500 +++ serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers 2007-01-05 12:59:57.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.5.1/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-16 17:15:27.000000000 -0500 +++ serefpolicy-2.5.1/config/appconfig-strict-mls/seusers 2007-01-05 12:59:57.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.1/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-16 17:15:00.000000000 -0500 +++ serefpolicy-2.5.1/policy/flask/access_vectors 2007-01-05 12:59:57.000000000 -0500 @@ -619,6 +619,8 @@ send recv relabelto + flow_in + flow_out } class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.1/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-01-02 12:57:51.000000000 -0500 +++ serefpolicy-2.5.1/policy/global_tunables 2007-01-05 12:59:57.000000000 -0500 @@ -82,6 +82,14 @@ ## ##

+## Allow ftp servers to login to local users and +## read/write all files on the system, governed by DAC. +##

+## +gen_tunable(allow_ftpd_full_access,false) + +## +##

## Allow gssd to read temp directory. ##

## @@ -572,8 +580,16 @@ ##

## gen_tunable(xdm_sysadm_login,false) + ') +## +##

+## Allow mount to mount any dir +##

+## +gen_tunable(allow_mounton_anydir,true) + ######################################## # # Targeted policy specific @@ -589,6 +605,13 @@ ## ##

+## Allow all daemons to write corefiles to / +##

+## +gen_tunable(allow_daemons_dump_core,false) + +## +##

## Allow mount to mount any file ##

## @@ -601,3 +624,19 @@ ## gen_tunable(spamd_enable_home_dirs,true) ') + +## +##

+## Allow unconfined to dyntrans to unconfined_execmem +##

+## +gen_tunable(allow_unconfined_execmem_dyntrans,false) + +## +##

+## Use lpd server instead of cups +##

+## +gen_tunable(use_lpd_server,false) + + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.1/policy/mls --- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 +++ serefpolicy-2.5.1/policy/mls 2007-01-05 12:59:57.000000000 -0500 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or - (( t2 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( h1 domby h2 )) or ( t1 == mlsfilewrite ) or + (( t2 == mlsrangedobject ) and ( l1 dom l2 ) and ( h1 domby h2 )) or ( t2 == mlstrustedobject )); +# Directory "write" ops mlsconstrain dir { add_name remove_name reparent rmdir } - ((( l1 dom l2 ) and ( l1 domby h2 )) or + (( l1 eq l2 ) or + (( t1 == mlsfilewriteinrange ) and ( l1 dom l2 ) and ( l1 domby h2 )) or (( t1 == mlsfilewritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or ( t1 == mlsfilewrite ) or ( t2 == mlstrustedobject )); @@ -165,8 +167,20 @@ mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } relabelto ( h1 dom h2 ); +# the socket "read+write" ops +# (Socket FDs are generally bidirectional, equivalent to open(..., O_RDWR), +# require equal levels for unprivileged subjects, or read *and* write overrides) +mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { accept connect } + (( l1 eq l2 ) or + (((( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or + ( t1 == mlsnetread )) and + ((( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or + (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or + ( t1 == mlsnetwrite )))); + + # the socket "read" ops (note the check is dominance of the low level) -mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen accept getopt recv_msg } +mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { read getattr listen getopt recv_msg } (( l1 dom l2 ) or (( t1 == mlsnetreadtoclr ) and ( h1 dom l2 )) or ( t1 == mlsnetread )); @@ -177,8 +191,9 @@ ( t1 == mlsnetread )); # the socket "write" ops -mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom connect setopt shutdown } - ((( l1 dom l2 ) and ( l1 domby h2 )) or +mlsconstrain { socket tcp_socket udp_socket rawip_socket netlink_socket packet_socket key_socket unix_stream_socket unix_dgram_socket netlink_route_socket netlink_firewall_socket netlink_tcpdiag_socket netlink_nflog_socket netlink_xfrm_socket netlink_selinux_socket netlink_audit_socket netlink_ip6fw_socket netlink_dnrt_socket } { write setattr relabelfrom setopt shutdown } + (( l1 eq l2 ) or + (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or (( t1 == mlsnetwritetoclr ) and ( h1 dom l2 ) and ( l1 domby l2 )) or ( t1 == mlsnetwrite )); @@ -274,7 +289,8 @@ # the netif/node "write" ops (implicit single level socket doing the write) mlsconstrain { netif node } { tcp_send udp_send rawip_send } - (( l1 dom l2 ) and ( l1 domby h2 )); + (( l1 eq l2 ) or + (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 ))); # these access vectors have no MLS restrictions # node enforce_dest @@ -581,7 +597,8 @@ ( t2 == unlabeled_t )); mlsconstrain association { sendto } - ((( l1 dom l2 ) and ( l1 domby h2 )) or + (( l1 eq l2 ) or + (( t1 == mlsnetwriteranged ) and ( l1 dom l2 ) and ( l1 domby h2 )) or ( t2 == unlabeled_t )); mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.1/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-01-02 12:57:51.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/admin/acct.te 2007-01-05 12:59:57.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; init_system_domain(acct_t,acct_exec_t) +userdom_executable_file(acct_exec_t) type acct_data_t; logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.5.1/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-16 17:15:26.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/admin/bootloader.fc 2007-01-05 12:59:57.000000000 -0500 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) -/etc/mkinitrd/scripts/.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) - -/usr/sbin/mkinitrd -- gen_context(system_u:object_r:bootloader_exec_t,s0) - /sbin/grub -- gen_context(system_u:object_r:bootloader_exec_t,s0) [...6064 lines suppressed...] +# +interface(`userdom_getattr_all_executables',` + gen_require(` + attribute user_exec_type; + ') + + allow $1 user_exec_type:file getattr; +') + +######################################## +## +## dontaudit getattr all user file type +## +## +## +## Domain allowed access. +## +## +## +# +interface(`userdom_dontaudit_list_user_files',` + gen_require(` + attribute $1_file_type; + ') + + dontaudit $2 $1_file_type:dir search_dir_perms; + dontaudit $2 $1_file_type:file getattr; +') + + + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-05 12:59:57.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; +# Executables to be run by user +attribute user_exec_type; + # The privhome attribute identifies every domain that can create files under # regular user home directories in the regular context (IE act on behalf of # a user in writing regular files) @@ -68,6 +71,7 @@ # only staff_r can change to sysadm_r userdom_role_change_template(staff, sysadm) + dontaudit staff_t admin_terminal:chr_file { read write }; ifdef(`enable_mls',` userdom_unpriv_user_template(secadm) @@ -187,6 +191,14 @@ ') optional_policy(` + tzdata_domtrans(sysadm_t) + ') + + optional_policy(` + raid_domtrans_mdadm(sysadm_t) + ') + + optional_policy(` # cjp: why is this not apm_run_client apm_domtrans_client(sysadm_t) ') @@ -235,7 +247,6 @@ consoletype_exec(sysadm_t) ifdef(`enable_mls',` - consoletype_exec(secadm_t) consoletype_exec(auditadm_t) ') ') @@ -254,7 +265,6 @@ dmesg_exec(sysadm_t) ifdef(`enable_mls',` - dmesg_exec(secadm_t) dmesg_exec(auditadm_t) ') ') @@ -389,27 +399,12 @@ seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal) ifdef(`enable_mls',` - selinux_set_enforce_mode(secadm_t) - selinux_set_boolean(secadm_t) - selinux_set_parameters(secadm_t) - - seutil_manage_bin_policy(secadm_t) - seutil_run_checkpolicy(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) - seutil_run_loadpolicy(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) - seutil_run_semanage(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) - seutil_run_setfiles(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) - seutil_run_restorecon(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) - logging_send_syslog_msg(secadm_t) + userdom_security_administrator(secadm_t,secadm_r,{ secadm_tty_device_t sysadm_devpts_t }) +# tunable_policy(`allow_sysadm_manage_security',` + userdom_security_administrator(sysadm_t,sysadm_r,admin_terminal) +# ') ', ` - selinux_set_enforce_mode(sysadm_t) - selinux_set_boolean(sysadm_t) - selinux_set_parameters(sysadm_t) - - seutil_manage_bin_policy(sysadm_t) - seutil_run_checkpolicy(sysadm_t,sysadm_r,admin_terminal) - seutil_run_loadpolicy(sysadm_t,sysadm_r,admin_terminal) - seutil_run_semanage(sysadm_t,sysadm_r,admin_terminal) - seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) + userdom_security_administrator(sysadm_t,sysadm_r,admin_terminal) ') ') @@ -434,6 +429,9 @@ ') optional_policy(` + nscd_role(sysadm_r) + ') + optional_policy(` usermanage_run_admin_passwd(sysadm_t,sysadm_r,admin_terminal) usermanage_run_groupadd(sysadm_t,sysadm_r,admin_terminal) usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.1/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/xen.te 2007-01-05 12:59:57.000000000 -0500 @@ -166,8 +166,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) files_read_usr_files(xend_t) +files_read_default_symlinks(xend_t) + +#tunable_policy(`xen_use_raw_disk',` + storage_raw_read_fixed_disk(xend_t) + storage_raw_write_fixed_disk(xend_t) +#') -storage_raw_read_fixed_disk(xend_t) storage_raw_read_removable_device(xend_t) term_getattr_all_user_ptys(xend_t) @@ -288,6 +293,12 @@ files_read_usr_files(xenstored_t) +#tunable_policy(`xen_use_raw_disk',` + storage_raw_read_fixed_disk(xenstored_t) + storage_raw_write_fixed_disk(xenstored_t) +#') +storage_raw_read_removable_device(xenstored_t) + term_use_generic_ptys(xenstored_t) term_use_console(xenconsoled_t) @@ -357,3 +368,10 @@ xen_append_log(xm_t) xen_stream_connect(xm_t) xen_stream_connect_xenstore(xm_t) + +#Should have a boolean wrapping these +fs_list_auto_mountpoints(xend_t) +files_search_mnt(xend_t) +fs_write_nfs_files(xend_t) +fs_read_nfs_files(xend_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 +++ serefpolicy-2.5.1/policy/support/obj_perm_sets.spt 2007-01-05 12:59:57.000000000 -0500 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') define(`read_file_perms',`{ getattr read lock ioctl }') -define(`mmap_file_perms',`{ getattr read execute }') +define(`mmap_file_perms',`{ getattr read execute ioctl }') define(`exec_file_perms',`{ getattr read execute execute_no_trans }') define(`append_file_perms',`{ getattr append lock ioctl }') define(`write_file_perms',`{ getattr write append lock ioctl }') diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.1/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-16 17:15:29.000000000 -0500 +++ serefpolicy-2.5.1/Rules.modular 2007-01-05 12:59:57.000000000 -0500 @@ -219,6 +219,16 @@ ######################################## # +# Validate File Contexts +# +validatefc: $(base_pkg) $(base_fc) + @echo "Validating file context." + $(verbose) $(SEMOD_EXP) $(base_pkg) $(tmpdir)/policy.tmp + $(verbose) $(SETFILES) -c $(tmpdir)/policy.tmp $(base_fc) + @echo "Success." + +######################################## +# # Clean the sources # clean: Index: booleans-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-strict.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- booleans-strict.conf 24 Dec 2006 07:31:09 -0000 1.4 +++ booleans-strict.conf 9 Jan 2007 15:24:41 -0000 1.5 @@ -218,3 +218,7 @@ ## Control users use of ping and traceroute user_ping = true + +# Allow unlabeled packets to flow +# +allow_unlabeled_packets = true Index: booleans-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/booleans-targeted.conf,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- booleans-targeted.conf 11 Dec 2006 12:35:44 -0000 1.23 +++ booleans-targeted.conf 9 Jan 2007 15:24:41 -0000 1.24 @@ -1,6 +1,6 @@ # Allow making anonymous memory executable, e.g.for runtime-code generation or executable stack. # -allow_execmem = false +allow_execmem = true # Allow making a modified private filemapping executable (text relocation). # @@ -8,7 +8,7 @@ # Allow making the stack executable via mprotect.Also requires allow_execmem. # -allow_execstack = false +allow_execstack = true # Allow ftpd to read cifs directories. # @@ -229,3 +229,7 @@ # Allow mount command to mounton any directory # allow_mounton_anydir = true + +# Allow unlabeled packets to flow +# +allow_unlabeled_packets = true Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- selinux-policy.spec 2 Jan 2007 16:40:08 -0000 1.377 +++ selinux-policy.spec 9 Jan 2007 15:24:41 -0000 1.378 @@ -16,12 +16,12 @@ %define CHECKPOLICYVER 1.30.11-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.4.6 -Release: 21%{?dist} +Version: 2.5.1 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz -patch: policy-20061106.patch +patch: policy-20070102.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -33,6 +33,9 @@ Source10: booleans-strict.conf Source12: setrans-strict.conf Source13: policygentool +Source14: securetty_contexts-targeted +Source15: securetty_contexts-mls +Source16: securetty_contexts-strict Url: http://serefpolicy.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -99,6 +102,7 @@ touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts \ touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/homedir_template \ touch %{buildroot}%{_sysconfdir}/selinux/%1/contexts/files/file_contexts.homedirs \ +install -m0644 ${RPM_SOURCE_DIR}/securetty_contexts-%1 %{buildroot}%{_sysconfdir}/selinux/%1/contexts/securetty_contexts \ install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf %{buildroot}%{_sysconfdir}/selinux/%1/setrans.conf \ ln -sf ../devel/include %{buildroot}%{_usr}/share/selinux/%1 \ %nil @@ -120,6 +124,7 @@ %ghost %{_sysconfdir}/selinux/%1/policy/policy.* \ %dir %{_sysconfdir}/selinux/%1/contexts \ %config %{_sysconfdir}/selinux/%1/contexts/customizable_types \ +%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/securetty_contexts \ %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/dbus_contexts \ %config %{_sysconfdir}/selinux/%1/contexts/default_contexts \ %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/default_type \ @@ -160,6 +165,7 @@ %description SELinux Reference Policy - modular. +Based off of reference policy: Checked out revision 2175. %prep %setup -q -n serefpolicy-%{version} @@ -351,6 +357,23 @@ %endif %changelog +* Mon Jan 8 2007 Dan Walsh 2.5.1-1 +- Allow prelink when run from rpm to create tmp files +Resolves: #221865 +- Remove file_context for exportfs +Resolves: #221181 +- Allow spamassassin to create ~/.spamassissin +Resolves: #203290 +- Allow ssh access to the krb tickets +- Allow sshd to change passwd +- Stop newrole -l from working on non securetty +Resolves: #200110 + + +* Wed Jan 3 2007 Dan Walsh 2.4.6-22 +- Fixes to run prelink in MLS machine +Resolves: #221233 + * Tue Jan 29 2007 Dan Walsh 2.4.6-21 - Allow spamassassin to read var_lib_t dir Resolves: #219234 --- policy-20061106.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 15:26:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:26:58 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.378,1.379 Message-ID: <200701091526.l09FQw47016496@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16452 Modified Files: selinux-policy.spec Log Message: * Mon Jan 8 2007 Dan Walsh 2.5.1-1 - Allow prelink when run from rpm to create tmp files Resolves: #221865 - Remove file_context for exportfs Resolves: #221181 - Allow spamassassin to create ~/.spamassissin Resolves: #203290 - Allow ssh access to the krb tickets - Allow sshd to change passwd - Stop newrole -l from working on non securetty Resolves: #200110 - Fixes to run prelink in MLS machine Resolves: #221233 - Allow spamassassin to read var_lib_t dir Resolves: #219234 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- selinux-policy.spec 9 Jan 2007 15:24:41 -0000 1.378 +++ selinux-policy.spec 9 Jan 2007 15:26:56 -0000 1.379 @@ -368,13 +368,8 @@ - Allow sshd to change passwd - Stop newrole -l from working on non securetty Resolves: #200110 - - -* Wed Jan 3 2007 Dan Walsh 2.4.6-22 - Fixes to run prelink in MLS machine Resolves: #221233 - -* Tue Jan 29 2007 Dan Walsh 2.4.6-21 - Allow spamassassin to read var_lib_t dir Resolves: #219234 From fedora-cvs-commits at redhat.com Tue Jan 9 15:30:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:30:48 -0500 Subject: rpms/selinux-policy/devel securetty_contexts-mls, NONE, 1.1 securetty_contexts-strict, NONE, 1.1 securetty_contexts-targeted, NONE, 1.1 Message-ID: <200701091530.l09FUm6R019895@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19851 Added Files: securetty_contexts-mls securetty_contexts-strict securetty_contexts-targeted Log Message: * Mon Jan 8 2007 Dan Walsh 2.5.1-1 - Allow prelink when run from rpm to create tmp files Resolves: #221865 - Remove file_context for exportfs Resolves: #221181 - Allow spamassassin to create ~/.spamassissin Resolves: #203290 - Allow ssh access to the krb tickets - Allow sshd to change passwd - Stop newrole -l from working on non securetty Resolves: #200110 - Fixes to run prelink in MLS machine Resolves: #221233 - Allow spamassassin to read var_lib_t dir Resolves: #219234 --- NEW FILE securetty_contexts-mls --- sysadm_tty_device_t user_tty_device_t staff_tty_device_t auditadm_tty_device_t secureadm_tty_device_t --- NEW FILE securetty_contexts-strict --- sysadm_tty_device_t user_tty_device_t staff_tty_device_t --- NEW FILE securetty_contexts-targeted --- From fedora-cvs-commits at redhat.com Tue Jan 9 15:35:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:35:26 -0500 Subject: rpms/evolution-webcal/devel .cvsignore, 1.13, 1.14 evolution-webcal.spec, 1.30, 1.31 sources, 1.13, 1.14 Message-ID: <200701091535.l09FZQSK017449@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-webcal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17427 Modified Files: .cvsignore evolution-webcal.spec sources Log Message: * Tue Jan 09 2007 Matthew Barnes - 2.9.5-1.fc7 - Update to 2.9.5 - Update version requirements to match configure.ac. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-webcal/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 28 Oct 2006 15:11:32 -0000 1.13 +++ .cvsignore 9 Jan 2007 15:35:24 -0000 1.14 @@ -1 +1 @@ -evolution-webcal-2.8.0.tar.bz2 +evolution-webcal-2.9.5.tar.bz2 Index: evolution-webcal.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- evolution-webcal.spec 28 Oct 2006 15:11:32 -0000 1.30 +++ evolution-webcal.spec 9 Jan 2007 15:35:24 -0000 1.31 @@ -1,4 +1,7 @@ %define eds_version 1.1.0 +%define glib_version 2.8 +%define gtk_version 2.4 +%define libgnome_version 2.14 %define libsoup_version 2.1.8 %define gettext_package evolution-webcal @@ -6,7 +9,7 @@ ### Abstract ### Name: evolution-webcal -Version: 2.8.0 +Version: 2.9.5 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -16,7 +19,10 @@ ### Dependencies ### -Requires: evolution-data-server >= %{eds_version} +Requires: evolution-data-server >= %{eds_version} +Requires: glib2 >= %{glib_version} +Requires: gtk2 >= %{gtk_version} +Requires: libgnome >= %{libgnome_version} Requires: libgnomeui Requires: libsoup >= %{libsoup_version} @@ -28,6 +34,9 @@ BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: gettext +BuildRequires: glib2-devel >= %{glib_version} +BuildRequires: gtk2-devel >= %{gtk_version} +BuildRequires: libgnome-devel >= %{libgnome_version} BuildRequires: libgnomeui-devel BuildRequires: libsoup-devel >= %{libsoup_version} BuildRequires: perl(XML::Parser) @@ -79,6 +88,10 @@ %changelog +* Tue Jan 09 2007 Matthew Barnes - 2.9.5-1.fc7 +- Update to 2.9.5 +- Update version requirements to match configure.ac. + * Sat Oct 28 2006 Matthias Clasen - 2.8.0-1 - Update to 2.8.0 - Fix up GConf-related scripts and requires Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-webcal/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 28 Oct 2006 15:11:32 -0000 1.13 +++ sources 9 Jan 2007 15:35:24 -0000 1.14 @@ -1 +1 @@ -6dd4821ce90e238acbd8a959fee1ee14 evolution-webcal-2.8.0.tar.bz2 +ac79b0e8487f79d921f190739da9a453 evolution-webcal-2.9.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 15:51:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:51:33 -0500 Subject: rpms/cpuspeed/devel cpuspeed.8, NONE, 1.1 cpuspeed.init, 1.23, 1.24 cpuspeed.spec, 1.48, 1.49 Message-ID: <200701091551.l09FpXRB007195@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7148 Modified Files: cpuspeed.init cpuspeed.spec Added Files: cpuspeed.8 Log Message: - Move config file to /etc/sysconfig/cpuspeed, more appropriate for initscript configs (#152305) - Manify 'cpuspeed --help' along with other details (#172655) - Tweak cpuspeed default thresholds (#147565) --- NEW FILE cpuspeed.8 --- .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. .TH CPUSPEED "8" "January 09, 2005" "cpuspeed v1.2.1" "Program Options" .SH NAME cpuspeed \- user-space cpu frequency scaling program, v1.2.1 .SH SYNOPSIS .B cpuspeed [\fIOptions\fR] .SH DESCRIPTION cpuspeed v1.2.1 .PP This program monitors the system's idle percentage and reduces or raises the CPUs' clock speeds and voltages accordingly to minimize power consumption when idle and maximize performance when needed. This is the default. .PP The program may also optionally be configured to reduce the CPUs' clock speeds if the temperature gets too high, NOT minimize their speeds if the computer's AC adapter is disconnected or maximize their speeds when the AC adapter is connected. .PP By default this program will manage every CPU found in the system. .IP Options: .HP \fB\-d\fR .IP Tells the process to daemonize itself (run in background). .HP \fB\-i\fR .IP Sets the interval between idle percentage tests and possible speed changes in tenths of a second (default is 20). .HP \fB\-p\fR .TP Sets the CPU idle percentage thresholds. is the idle .IP percentage below which a CPU will be set to the highest possible speed. is the idle percentage above which a CPU's speed will be decreased and below which a CPU's speed will be increased (defaults are 10 and 25). .HP \fB\-m\fR .IP Sets the minimum speed in KHz below which a CPU will not be set. .HP \fB\-M\fR .IP Sets the maximum speed in KHz above which a CPU will not be set. .HP \fB\-t\fR .IP Sets the ACPI temperature file and the temperature at which CPUs will be set to minimum speed. .HP \fB\-T\fR .IP Sets the interval at which the temperature will be polled in tenths of a second (default is 10). (Requires the '\-t' option above.) .HP \fB\-a\fR .IP Sets the ACPI AC adapter state file and tells the program to set the CPUs to minimum speed when the AC adapter is disconnected. (This is the default but is changeable by the '\-D' option below). .HP \fB\-A\fR .IP Sets the interval at which the AC adapter state will be polled in tenths of a second (default is 50). (Requires the '\-a' option above.) .HP \fB\-C\fR .IP Run at maximum speed when AC adapter is connected. (Requires the '\-a' option above.) .HP \fB\-D\fR .IP Do NOT force minimum speed when AC adapter is disconnected. (Requires the '\-a' option above.) .HP \fB\-r\fR .IP Restores previous speed on program exit. .HP \fB\-s\fR .TP Manage only a single CPU. specifies the number of the CPU .IP to manage and is in the range 0 to (n\-1) where 'n' is the number of CPUs in the system. Without this option the program creates copies of itself to manage every CPU in the system. .IP To have a CPU stay at the highest clock speed to maximize performance send the process controlling that CPU the SIGUSR1 signal. .IP To have a CPU stay at the lowest clock speed to maximize battery life send the process controlling that CPU the SIGUSR2 signal. .IP To resume having a CPU's clock speed dynamically scaled send the process controlling that CPU the SIGHUP signal. .SS "Notes:" Many modern Linux systems support in-kernel cpu frequency scaling. The cpuspeed daemon only works in conjunction with the 'userspace' frequency scaling governor. Other governors, such as 'ondemand' and 'conservative', rely on the Linux kernel to adjust cpu frequencies on the fly without the need of any user-space assistance, such as that provided by cpuspeed. .PP Red Hat and Fedora distributions employ a unified configuration file for both scenarios, as well as a cpuspeed init script that will configure either cpuspeed or in-kernel cpu frequency scaling, as appropriate. .SH "FILES" .na .nf /etc/sysconfig/cpuspeed, configuration file /etc/init.d/cpuspeed, initialzation script /usr/sbin/cpuspeed, cpuspeed program .SH "SEE ALSO" .PP The CPUSpeed web page: \fB http://carlthompson.net/Software/CPUSpeed\fR .SH "LICENSE" .PP CPUSpeed is released under the GNU General Public License version 2 (or if you wish any later version). This license allows you to use, copy, distribute and modify the software with very few restrictions. The full text of the license may be found here: \fBhttp://carlthompson.net/Software/CPUSpeed/License\fR .SH "AUTHOR(S):" .TP CPUSpeed daemon, original init script and configuration file: .na .nf Carl Thompson \- cet [at] carlthompson.net (copyright 2002 \- 2005) .TP Modernized init script, configuration file and man page: .na .nf Dave Jones \- davej [at] redhat.com Michal Jaegermann \- michal [at] harddata.com Jarod Wilson \- jwilson [at] redhat.com Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cpuspeed.init 8 Jan 2007 15:40:06 -0000 1.23 +++ cpuspeed.init 9 Jan 2007 15:51:31 -0000 1.24 @@ -13,8 +13,8 @@ prog="cpuspeed" # Get config. -if [ -f /etc/cpuspeed.conf ]; then - . /etc/cpuspeed.conf +if [ -f /etc/sysconfig/cpuspeed ]; then + . /etc/sysconfig/cpuspeed fi cpu0freqd=/sys/devices/system/cpu/cpu0/cpufreq @@ -68,16 +68,16 @@ # math here for use of unified config... # DOWN_THRESHOLD doesn't mean exactly the same thing for # cpuspeed as it does for the cpufreq governors, but close - # enough, and if not specified, we use the daemon defaults. + # enough, and if not specified, we use same defaults as governors. if [ -n "$UP_THRESHOLD" ]; then let UP_THRESHOLD=100-$UP_THRESHOLD else - UP_THRESHOLD=10 + UP_THRESHOLD=20 fi if [ -n "$DOWN_THRESHOLD" ]; then let DOWN_THRESHOLD=100-$DOWN_THRESHOLD else - DOWN_THRESHOLD=25 + DOWN_THRESHOLD=80 fi OPTS="$OPTS -p $UP_THRESHOLD $DOWN_THRESHOLD" if [ -n "$MIN_SPEED" ]; then Index: cpuspeed.spec =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- cpuspeed.spec 8 Jan 2007 15:49:49 -0000 1.48 +++ cpuspeed.spec 9 Jan 2007 15:51:31 -0000 1.49 @@ -10,6 +10,7 @@ Source1: cpuspeed.init Source2: http://carlthompson.net/dl/cpuspeed/license.txt Source3: cpuspeed.conf +Source4: cpuspeed.8 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -44,13 +45,15 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d mkdir -p %{buildroot}%{_sysconfdir}/sysconfig +mkdir -p %{buildroot}%{_mandir}/man8/ make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now" %install install cpuspeed %{buildroot}%{_sbindir} install %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/cpuspeed -install %{SOURCE3} %{buildroot}%{_sysconfdir} +install %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/cpuspeed +install %{SOURCE4} %{buildroot}%{_mandir}/man8/cpuspeed.8 chmod -R a-s %{buildroot} @@ -62,7 +65,8 @@ %doc license.txt CHANGES EXAMPLES FEATURES README USAGE %{_sbindir}/cpuspeed %{_sysconfdir}/rc.d/init.d/cpuspeed -%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cpuspeed.conf +%{_mandir}/man8/* +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/cpuspeed %preun if [ "$1" = "0" ] ; then @@ -78,6 +82,12 @@ exit 0 %changelog +* Tue Jan 09 2007 Jarod Wilson +- Move config file to /etc/sysconfig/cpuspeed, more + appropriate for initscript configs (#152305) +- Manify 'cpuspeed --help' along with other details (#172655) +- Tweak cpuspeed default thresholds (#147565) + * Mon Jan 08 2007 Jarod Wilson - Let non-centrino/powernow-k8 systems also use other validated governors (#219926) @@ -87,7 +97,7 @@ - Fix status and condrestart for centrino/powernow-k8 (#219926) - Give feedback when loading/unloading a cpufreq governor - Rework config file and initscript to make it much easier - for end-users to adjust frequency scaling setup + for end-users to adjust frequency scaling setup (#151761) - Log start/stop events with useful info - Don't start on xen kernels (freq scaling not supported) From fedora-cvs-commits at redhat.com Tue Jan 9 15:53:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 10:53:00 -0500 Subject: rpms/coreutils/devel upstream-key.gpg,NONE,1.1 Message-ID: <200701091553.l09Fr0jR007275@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7262 Added Files: upstream-key.gpg Log Message: Upstream GPG key. --- NEW FILE upstream-key.gpg --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.6 (GNU/Linux) mQGiBDftyYoRBACvICTt5AWe7kdbRtJ37IZ+ED5tBA/IbISfqUPO+HmL/J9JSfkV QHbdQR5dj5mrU6BY5YOY7L4KOS6lH3AgvsZ/NhkDBraBPgnMkpDqFb7z4keCIebb AmlcBL2VQNTo0Lczo319YoZ+UaNH53OddlBY944qBTa0AlcJuS1SgEp7pwCg+CUj 4SjVzqZh5lgPTS0bnYvF/n0D/iItZ7WAm37KW+9UjArWZD6NO+mVMNq4GWmhcSBD uyJOZFxFQWXdFRdM9sNO7lkWYVCxpXyFzmQcBzdrAt+zx/3QadEbduGAqEKAROQU gSDlMITWGK97/Cadn1YRSDcGKNlJX9jlJvt5Q/xh+CnJ8HTwO0PF9A5N/phFuMMB UH0pA/0e5eIBsr2Wvxy39+nGnNv5b+5tHkGXSSHKyI7+zOdIBTtRQO7lwTG9ioKg /yMqb9NCSf4GdyZiFJsQ+TWoSyk1bvFHt7YUOhTeii7Zgbk7Due2q+b9KzzyH/r2 kf+fLh0lgiy/LfBhvsfO8M9dji3XDyZpBLRO6gda9M9NqzEfgbQfSmltIE1leWVy aW5nIDxqaW1AbWV5ZXJpbmcubmV0PohGBBARAgAGBQI9TvsUAAoJENoowjp5/0R0 NTIAn2qpRF9QVupw/gz4UN5d5MKurlOMAKDNXKfXzWClHRq5ufCdwZead3WMMYhG BBARAgAGBQJCk1gpAAoJEIvYLm8wuUtcqlIAn0KbOC5YSkgqhfhM1uRlHnvHB74A AJ4qbzrkw7iitd1CH1eoMoFiP5CI14hGBBARAgAGBQJDYmg2AAoJELk/YMa1xM4T ct0AoJIkdqI6dhTUDOVwiZRxaCKVYaoNAJsG8I+OPhhRhe7ZgN5iN3xlRfkhTohG BBARAgAGBQJECHuEAAoJEFQUZr6xLcGbUyQAnRmg070gGrZ5E4ZPJRqL/DUoB7hN AKCj7uAIpcRdrBAQW8PKiOWcPRvxjohGBBIRAgAGBQI/bJ2IAAoJEA6nVrUUSEP1 QXoAoJ6dMlvbJUep2l5N8G0XFmRyxTrIAJ0bn5IYu7RMxqI0vv6DHn2VgEQLeohG BBIRAgAGBQI/vFVMAAoJENKUXDvBNlC2gtYAn1zlWvzZaC2lxRXuW7fMWpB/5uVJ AJ9RFEFFzl8BktsnskYJUIvrx5zVL4hGBBMRAgAGBQI/UFjyAAoJEDhZwDsuI25H z80An0G2Xm22lMc7ThGGgKeovGP0GzPIAKCHFH2aY2Dv6XOYomNB1yvW7MU0ZIhG BBMRAgAGBQI/cfsiAAoJEA3cqjJ41SZOmcoAoKulkHQ6TUVORoSN77UYtrdCKy0I AKC5qT7peM0Jd6I9wPLwc7Fc65xraIhGBBMRAgAGBQJAmOELAAoJEAu1FKXQbtaf ysgAoL7Zl3BSH+/F9ouPCXkduzIywdx9AJ9OevRoJwxpER+SwSiLnw9Q7fVmcYhX BBMRAgAXBQI66oJOBQsHCgMEAxUDAgMWAgECF4AACgkQ/dLerNMzy6HlawCg5UXJ LGWj9P0SuJKcGm+mqKb1J2MAn3YrgB3duqFNs/yS4mvxM74TzI5miFoEExECABoF CwcKAwQDFQMCAxYCAQIXgAIZAQUCOuqCTwAKCRD90t6s0zPLoaVVAJ0UZOyi+B+q cNTEDSDrc3Oc1MzZrQCg0UONeu4Dv4N5ZLI6lZBMZETaCmKIXwQTEQIAFwUCOuqC TgULBwoDBAMVAwIDFgIBAheAABIJEP3S3qzTM8uhB2VHUEcAAQHlawCg5UXJLGWj 9P0SuJKcGm+mqKb1J2MAn3YrgB3duqFNs/yS4mvxM74TzI5miGIEExECABoFCwcK AwQDFQMCAxYCAQIXgAIZAQUCOuqCTwASCRD90t6s0zPLoQdlR1BHAAEBpVUAnRRk 7KL4H6pw1MQNIOtzc5zUzNmtAKDRQ4167gO/g3lksjqVkExkRNoKYrQfSmltIE1l eWVyaW5nIDxtZXllcmluZ0BnbnUub3JnPohGBBARAgAGBQJCk1gsAAoJEIvYLm8w uUtcHS0AoIO9LsaLdn6aH3fskRVZ4qhpRBXbAJ0drV2s3abBKhkhUui7kpF87MTD +4hGBBARAgAGBQJDYmg8AAoJELk/YMa1xM4TdT4Ani/0ORxwCzqGT0+BG2thzbO7 aFkuAKCoKP+u6WhYYOBdEcaM6T5QLN56H4hGBBARAgAGBQJECHuHAAoJEFQUZr6x LcGbrKEAoLef0BqLLpNGhAFJKSAvWEWOiGcxAJ9w7F7MtsDoegKeQ44yYiPX5jEu 5ohGBBIRAgAGBQI/bJ2IAAoJEA6nVrUUSEP13sUAn3IWX1RWnH50v+DZKcqzCaSA oqHbAKCVvtirU/A3FJLnuyIBv+lguddi2IhGBBIRAgAGBQI/vFVRAAoJENKUXDvB NlC2D68AnAzm1iw0YSQ1GuPaU3lG8n72p5EBAJ4pNBP+RFWjvZSfcUYhZAFhq8CB QYhGBBMRAgAGBQI/cfslAAoJEA3cqjJ41SZO8asAnRsJcSER+vpIIzM/et8PakIC ZJxsAJ9LjdnHkb+Zr9YDXzKXu6OTiJvIh4hGBBMRAgAGBQJAmOEOAAoJEAu1FKXQ btafLL8AoJask7aB+OfOQgS/kMlKXAA25Hl3AKC/3XJeRRR0ze508VcIhx7EhYVV 84heBBMRAgAeBQI/UFjBAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEP3S3qzT M8uh8gwAoLfqQt7QgzavHlD44LxmAXovm5t0AJ4m8EQC+N9oJyODmpLbfQKNL6pq zohmBBMRAgAeBQI/UFjBAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAABIJEP3S3qzT M8uhB2VHUEcAAQHyDACgt+pC3tCDNq8eUPjgvGYBei+bm3QAnibwRAL432gnI4Oa ktt9Ao0vqmrOtCFKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQHBvYm94LmNvbT6IRgQQ EQIABgUCQpNYLAAKCRCL2C5vMLlLXP7FAKCodISH72q8e30TxLwdoOh7hDjehACf U97FCEOWICQaEI2BvOzGzn6yrO6IRgQQEQIABgUCQ2JoPAAKCRC5P2DGtcTOE0Gk AJ43felw+/nxzJ7DVJYZ0tbASZ3BcACeNf2nXMkqkwrBZZ9DDMUGQ6tIB3GIRgQQ EQIABgUCRAh7hwAKCRBUFGa+sS3Bm1nUAJ0foaMmGWqugETz37RZ2XpCfdQIlQCe N50WxYPBxrGGmhhGOVbji1uhVSmIRgQSEQIABgUCP2ydiAAKCRAOp1a1FEhD9T73 AJ4/51C6L0lHrX77DFXVJrB02yybsACgi/9TewF7HaF3x8fdMEZxsRK1HR+IRgQS EQIABgUCP7xVUQAKCRDSlFw7wTZQtvjnAJ9FM83LyrTs2Dk/T7kOcSFTfjXqegCe OlpOQ/sB4EtoHxrTSCy3OhToVsmIRgQTEQIABgUCP1BY+wAKCRA4WcA7LiNuR5yI AJ9F3RsjjwtYX2rSx+j5o4+y4Dyl9wCfVR9uTBDLDP3kOaDrTT/H9XHTf6uIRgQT EQIABgUCP3H7JQAKCRAN3KoyeNUmTv4eAJ9rCBUUXWYFUrjUayOenPULMW1BhACg ncwdeTN+SGy8lX3zoo1vdNv+vTKIRgQTEQIABgUCQJjhDgAKCRALtRSl0G7WnyNP AJ9Gn9yRup0zePUPMex36fX94o+i8wCggdDgtpKjzcaQ83o8VBiemFeiss+IXAQT EQIAHAUCPjpzhwIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQ/dLerNMzy6FG5gCg 99D5pDqSRuZP2QJAT8LNiCZlRGgAn25OTXbNlHkM+gYFj0fyo+Ikj+T5iGQEExEC ABwFAj46c4cCGwMECwcDAgMVAgMDFgIBAh4BAheAABIJEP3S3qzTM8uhB2VHUEcA AQFG5gCg99D5pDqSRuZP2QJAT8LNiCZlRGgAn25OTXbNlHkM+gYFj0fyo+Ikj+T5 tCJKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGFzY2VuZC5jb20+iEYEEBECAAYFAkKT WCwACgkQi9gubzC5S1zwAQCgnPUCCl1g6eJdI5ZViACDiaaULAAAn19sIyQmkiaU 45QVcDtYuQTNSh/QiEYEEBECAAYFAkNiaDwACgkQuT9gxrXEzhP+igCfc526l8n/ q8zVhIe9NonG+jVlrEoAnRXKebriKwmvVSdqbY8khlbJjB/ziEYEEBECAAYFAkQI e4cACgkQVBRmvrEtwZs2owCgwzEOLdyXa2JGA/xkpBluqa8/UyMAnjZyxESMAj/A 2rUg3IvgtBmaetE4iEYEEhECAAYFAj+8VVEACgkQ0pRcO8E2ULaqIQCfQlbRoDOL Hv+9YVxPgD8yhwFB850AnRTmAG4Z57YD92s4o1ne9sgaufmdiEYEExECAAYFAj9Q WPsACgkQOFnAOy4jbkfOoQCgwfC1mkANwR+vv9TVlYkmoZ6wNL8An0dql+uy5ic1 YpyKfV7g7MMuEMDwiEYEExECAAYFAj9x+yUACgkQDdyqMnjVJk6QCwCglS7PPvFR HoOZxl7XgpVbAK6vZQgAniVxncBgSu06lmsDNHiJpiDMIZkkiEYEExECAAYFAkCY 4Q4ACgkQC7UUpdBu1p+QqwCeNzsozeUjiCFQBBiR+gCBnvZhQqgAnj4ImXyp45hs fc3dZHP3qB1Ws5UjiFUEExECABUFAjftyYoDCwoDAxUDAgMWAgECF4AACgkQ/dLe rNMzy6HnugCePkbs7JcEo0837WNqdoGf2WXL3vIAoK0cStFCa4zj4FV/SoG9cDZP JOzfiF0EExECABUFAjftyYoDCwoDAxUDAgMWAgECF4AAEgkQ/dLerNMzy6EHZUdQ RwABAee6AJ4+RuzslwSjTzftY2p2gZ/ZZcve8gCgrRxK0UJrjOPgVX9Kgb1wNk8k 7N+0IkppbSBNZXllcmluZyA8bWV5ZXJpbmdAbHVjZW50LmNvbT6IRQQTEQIABgUC QJjhDgAKCRALtRSl0G7Wn/YLAJdAhf8twtaImmHzRT7eaUIf0b4+AJ9hRfAjWrRp UF5cW5AzZsVwEW7Vc4hGBBARAgAGBQJCk1gsAAoJEIvYLm8wuUtceyMAoJGYrqPm T+ThNBRLt5aIq/p3yBHmAJ0V0tEMjdIafWlY6IDZkst2VXBPFohGBBARAgAGBQJD Ymg8AAoJELk/YMa1xM4TTxEAnAtkRTdyDNdPn5kW3HMKcQp9S02vAJ9wiBJbBeaB jGcQ4zoafo0vw8ZMi4hGBBARAgAGBQJECHuHAAoJEFQUZr6xLcGbZi4AoK2Th3Pi pC+CWdYDCA9qNa+uUkHsAKCHUU/oOSEqvjEHoYs22RZzVGbbVohGBBIRAgAGBQI/ vFVRAAoJENKUXDvBNlC2qQ0An3hiEeuqRgzbuY6YLqiA9FH0GHEEAJ4j2O8AjZFq Vc8RL32KA6nuwfJ28ohGBBMRAgAGBQI/UFj7AAoJEDhZwDsuI25HPicAoJOlcGaT t5dvksbBg00BNCyZl8odAJ0UCIFlFzzB/x050scZKMrvquc2T4hGBBMRAgAGBQI/ cfslAAoJEA3cqjJ41SZO5mQAoLTvGtjJxspvgEg3z3T/q6iI/FdxAJ4wgnqQjRvm AHAWMibcDupPA10u+ohVBBMRAgAVBQI37e/HAwsKAwMVAwIDFgIBAheAAAoJEP3S 3qzTM8uh8vAAn23cUtWPdFr4wIwUNo9bsY1CUHMNAKCoHS3nayqM/WUfihcZJoOs kQA22ohdBBMRAgAVBQI37e/HAwsKAwMVAwIDFgIBAheAABIJEP3S3qzTM8uhB2VH UEcAAQHy8ACfbdxS1Y90WvjAjBQ2j1uxjUJQcw0AoKgdLedrKoz9ZR+KFxkmg6yR ADbatCdKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQG5hLW5ldC5vcm5sLmdvdj6IRgQQ EQIABgUCPU77FAAKCRDaKMI6ef9EdBjQAJ41hqQaE3W2dHgN9otb7fL0n6U1YACg kI9DvFQ1YmpLI8jdGwbDxDodAeOIRgQQEQIABgUCQpNYLAAKCRCL2C5vMLlLXMrg AJ90LwV+nd+U4GEvzYixFvksHvtFGgCggD3NDeGXlgUhPB+nqyBq2QKfZxKIRgQQ EQIABgUCQ2JoPAAKCRC5P2DGtcTOE4WfAJ4uxTyLyO4NCBk/IlTM0NAKLFHJgwCc DP0YQC0oDm5uJ8/ZIkl0MUrzKXGIRgQQEQIABgUCRAh7hwAKCRBUFGa+sS3BmyTW AJ4+X1CGNorq+Nme5tTIVskgYKH7wQCcD7UpPt2+r+NcGSYftkKk3O8R8TKIRgQS EQIABgUCP7xVUQAKCRDSlFw7wTZQtolWAJ98yLyyC6jzrF/YG5kqeGqHSNdKtQCd EdCDkGG09QJX8gFfZ/r8lWlflj+IRgQTEQIABgUCP1BY+wAKCRA4WcA7LiNuR4mz AKC/1XBB9cBCs8X/KvoLLQP75q0i2QCbBb0UoVSUYgsdETzujbTwg+0HLseIRgQT EQIABgUCP3H7JQAKCRAN3KoyeNUmTql1AJsEhcfoOC2U4JjHR6rWzqinaIxcNgCg lmdHMQ3L8zCfNzD7lehquPy2P0eIRgQTEQIABgUCQJjhDgAKCRALtRSl0G7Wn+1r AJ4nUVrAEtL+XBp2UU1QmVCxa7lcSwCfT8ds7xZ++aZomPK2Xvz230WnUsGIVQQT EQIAFQUCN+3v9gMLCgMDFQMCAxYCAQIXgAAKCRD90t6s0zPLocAwAKCJ4wBEND4W mzs6Sp47mWBsp96HRACfTH+SGkDfLqgkZ7JgEgzSDKGl4TyIXQQTEQIAFQUCN+3v 9gMLCgMDFQMCAxYCAQIXgAASCRD90t6s0zPLoQdlR1BHAAEBwDAAoInjAEQ0Phab OzpKnjuZYGyn3odEAJ9Mf5IaQN8uqCRnsmASDNIMoaXhPLkBDQQ37cmSEAQAx3xz BZlJikWJaiZGru3cEKYYnRFp8No2b4jhBwY9nKn8UIxuY5aQN4ka/k81wqjlC6cT wn5R7kg2ha8eGXpwYhKGwn5MGvIxqfoj2tsQ76uluTowHA4seoavi7RGEDzm4Vpt 8Nua8krrZ2QPtLA86gkzL1QG5Bbv/o2Ldx8HHNcAAwcEAKcK2tj2X8RPgUarczXv rdXMteeSFnI7fagbLpEfaTI2xa1ADLg5UO4M9Erz9m6k6xV6loxcBB9H5Ljm9GWf el4T4p1lwzi3Lu5hKzIiFs+5vsy+fyEai4e5f6v9Ww3Q3Ec6UZpPZGyN+PDPlZxe rf3ZIMogSGrrEBhprhLHReudiE4EGBECAAYFAjftyZIAEgkQ/dLerNMzy6EHZUdQ RwABAQXiAKCilmALgD6mhccl4ISaUB5LfW74BQCgqd7wIfbV2+NKqf1Yuj75sryW Ke4= =zRdO -----END PGP PUBLIC KEY BLOCK----- From fedora-cvs-commits at redhat.com Tue Jan 9 16:19:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 11:19:22 -0500 Subject: rpms/htdig/devel htdig-3.2.0b6-incremental.patch, NONE, 1.1 htdig-3.2.0b6-sigfault.patch, 1.1, 1.2 htdig.spec, 1.33, 1.34 Message-ID: <200701091619.l09GJMog030886@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/htdig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30825/htdig/devel Modified Files: htdig-3.2.0b6-sigfault.patch htdig.spec Added Files: htdig-3.2.0b6-incremental.patch Log Message: added +i option to rundig htdig-3.2.0b6-incremental.patch: rundig | 10 +++++++++- rundig.1.in | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE htdig-3.2.0b6-incremental.patch --- --- htdig-3.2.0b6/installdir/rundig.incremental 2007-01-09 16:49:35.000000000 +0100 +++ htdig-3.2.0b6/installdir/rundig 2007-01-09 16:49:35.000000000 +0100 @@ -14,6 +14,7 @@ # To help debug problems, try running rundig -vvv # This will add lots of debugging output to all of the programs +incremental=0 stats= opts= alt= while [ "$#" -gt 0 ] do @@ -24,6 +25,7 @@ conffile="$1" opts="$opts -c $conffile" ;; + +i) incremental=1;; *) opts="$opts $1" ;; # e.g. -v esac shift @@ -53,7 +55,13 @@ TMPDIR=$DBDIR export TMPDIR -$BINDIR/htdig -i $opts $stats $alt +if [ $incremental -ne 0 ] +then + $BINDIR/htdig $opts $stats $alt +else + $BINDIR/htdig -i $opts $stats $alt +fi + $BINDIR/htpurge $opts $alt case "$alt" in -a) --- htdig-3.2.0b6/installdir/rundig.1.in.incremental 2007-01-09 16:50:11.000000000 +0100 +++ htdig-3.2.0b6/installdir/rundig.1.in 2007-01-09 16:52:17.000000000 +0100 @@ -23,6 +23,9 @@ .TP .B \-c configfile Use alternate config file. +.TP +.B \+i +Use incremental digging instead non-incremental .SH "SEE ALSO" Please refer to the HTML pages (in the htdig-doc package) .B /usr/share/doc/htdig-doc/html/index.html htdig-3.2.0b6-sigfault.patch: Accents.cc | 5 ----- Fuzzy.cc | 2 +- Metaphone.cc | 5 ----- Soundex.cc | 5 ----- 4 files changed, 1 insertion(+), 16 deletions(-) Index: htdig-3.2.0b6-sigfault.patch =================================================================== RCS file: /cvs/dist/rpms/htdig/devel/htdig-3.2.0b6-sigfault.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- htdig-3.2.0b6-sigfault.patch 20 Dec 2006 14:39:14 -0000 1.1 +++ htdig-3.2.0b6-sigfault.patch 9 Jan 2007 16:19:20 -0000 1.2 @@ -1,11 +1,53 @@ ---- htdig-3.1.6/htfuzzy/Fuzzy.cc.sigfault 2006-12-20 14:43:17.000000000 +0100 -+++ htdig-3.1.6/htfuzzy/Fuzzy.cc 2006-12-20 14:44:42.000000000 +0100 -@@ -28,7 +28,7 @@ - // - Fuzzy::Fuzzy() +--- htdig-3.2.0b6/htfuzzy/Soundex.cc.sigfault 2007-01-08 15:02:29.000000000 +0100 ++++ htdig-3.2.0b6/htfuzzy/Soundex.cc 2007-01-08 15:05:00.000000000 +0100 +@@ -146,11 +146,6 @@ + void + Soundex::addWord(char *word) + { +- if (!dict) +- { +- dict = new Dictionary; +- } +- + String key; + generateKey(word, key); + +--- htdig-3.2.0b6/htfuzzy/Fuzzy.cc.sigfault 2004-05-28 15:15:20.000000000 +0200 ++++ htdig-3.2.0b6/htfuzzy/Fuzzy.cc 2007-01-08 15:02:15.000000000 +0100 +@@ -45,7 +45,7 @@ + Fuzzy::Fuzzy(const HtConfiguration& config_arg) : + config(config_arg) { - dict = 0; -+ //dict = 0; ++ dict = new Dictionary(); index = 0; } +--- htdig-3.2.0b6/htfuzzy/Metaphone.cc.sigfault 2007-01-08 15:05:19.000000000 +0100 ++++ htdig-3.2.0b6/htfuzzy/Metaphone.cc 2007-01-08 15:05:50.000000000 +0100 +@@ -307,11 +307,6 @@ + void + Metaphone::addWord(char *word) + { +- if (!dict) +- { +- dict = new Dictionary; +- } +- + String key; + generateKey(word, key); + +--- htdig-3.2.0b6/htfuzzy/Accents.cc.sigfault 2007-01-08 15:06:44.000000000 +0100 ++++ htdig-3.2.0b6/htfuzzy/Accents.cc 2007-01-08 15:06:53.000000000 +0100 +@@ -123,11 +123,6 @@ + void + Accents::addWord(char *word) + { +- if (!dict) +- { +- dict = new Dictionary; +- } +- + String key; + generateKey(word, key); + Index: htdig.spec =================================================================== RCS file: /cvs/dist/rpms/htdig/devel/htdig.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- htdig.spec 20 Dec 2006 14:39:14 -0000 1.33 +++ htdig.spec 9 Jan 2007 16:19:20 -0000 1.34 @@ -5,7 +5,7 @@ Summary: ht://Dig - Web search engine Name: htdig Version: 3.2.0b6 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 3 License: GPL Group: Applications/Internet @@ -24,6 +24,7 @@ Patch8: htdig-3.2.0b6-compile-fix.patch Patch9: htdig-3.2.0b6-opts.patch Patch10: htdig-3.2.0b6-sigfault.patch +Patch11: htdig-3.2.0b6-incremental.patch BuildRequires: flex >= 2.5.4a-13 BuildRequires: zlib-devel httpd openssl-devel BuildRoot: %{_tmppath}/%{name}-root @@ -77,6 +78,7 @@ %patch8 -p1 -b .compile-fix %patch9 -p1 -b .opts %patch10 -p1 -b .sigfault +%patch11 -p1 -b .incremental %build %configure \ @@ -147,6 +149,9 @@ %endif %changelog +* Tue Jan 09 2007 Adam Tkac 3:3.2.0b6-9.fc7 +- added +i option to rundig script. This option enables incremental digging + * Wed Dec 20 2006 Adam Tkac 3:3.2.0b6-8.fc7 - fixed htfuzzy's sigfaults (#130528) From fedora-cvs-commits at redhat.com Tue Jan 9 16:29:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 11:29:33 -0500 Subject: rpms/cpuspeed/devel cpuspeed.init, 1.24, 1.25 cpuspeed.spec, 1.49, 1.50 Message-ID: <200701091629.l09GTXMo032184@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/cpuspeed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32169 Modified Files: cpuspeed.init cpuspeed.spec Log Message: - Turn on ia64 builds (#216702) - Fix status on xen kernels Index: cpuspeed.init =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- cpuspeed.init 9 Jan 2007 15:51:31 -0000 1.24 +++ cpuspeed.init 9 Jan 2007 16:29:31 -0000 1.25 @@ -46,8 +46,10 @@ # the current cpufreq governor if [ -e ${cpu0freqd}/scaling_governor ]; then governor=`cat ${cpu0freqd}/scaling_governor` + else + governor="none" fi - if [ -n "${governor}" -a `/sbin/lsmod | grep -c -w "cpufreq.${governor}"` -ge 1 ] ; then + if [ "${governor}" != "none" -a `/sbin/lsmod | grep -c -w "cpufreq.${governor}"` -ge 1 ] ; then return 0 fi return 1 @@ -187,6 +189,9 @@ # doing some sort of cpu frequency scaling. [ $RETVAL = 0 ] && touch $lockfile else + if [ -d "$xendir" ]; then + $logger "CPU Frequency scaling is currently not supported on xen kernels" + fi return 0 fi return $RETVAL @@ -232,7 +237,9 @@ status) governor_module_loaded && module_loaded=true - if [ $module_loaded == true -o ${governor} == "performance" ] ; then + if [ -d "$xendir" ]; then + echo "Frequency scaling not support under xen kernels" + elif [ $module_loaded == true -o ${governor} == "performance" ]; then echo "Frequency scaling enabled using ${governor} governor" else status cpuspeed Index: cpuspeed.spec =================================================================== RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- cpuspeed.spec 9 Jan 2007 15:51:31 -0000 1.49 +++ cpuspeed.spec 9 Jan 2007 16:29:31 -0000 1.50 @@ -17,7 +17,7 @@ Requires(preun): /sbin/service BuildRequires: automake util-linux groff gettext -ExclusiveArch: i386 x86_64 ppc ppc64 +ExclusiveArch: i386 x86_64 ppc ppc64 ia64 Obsoletes: kernel-utils Patch1: warning.diff @@ -83,6 +83,10 @@ %changelog * Tue Jan 09 2007 Jarod Wilson +- Turn on ia64 builds (#216702) +- Fix status on xen kernels + +* Tue Jan 09 2007 Jarod Wilson - Move config file to /etc/sysconfig/cpuspeed, more appropriate for initscript configs (#152305) - Manify 'cpuspeed --help' along with other details (#172655) From fedora-cvs-commits at redhat.com Tue Jan 9 16:41:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 11:41:01 -0500 Subject: rpms/kernel/FC-6 linux-2.6-gfs2-update.patch, NONE, 1.1 kernel-2.6.spec, 1.2893, 1.2894 Message-ID: <200701091641.l09Gf1jo020754@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20418 Modified Files: kernel-2.6.spec Added Files: linux-2.6-gfs2-update.patch Log Message: GFS2 update linux-2.6-gfs2-update.patch: b/fs/gfs2/Kconfig | 2 b/fs/gfs2/acl.c | 2 b/fs/gfs2/acl.h | 1 b/fs/gfs2/bmap.c | 32 +- b/fs/gfs2/daemon.c | 7 b/fs/gfs2/dir.c | 8 b/fs/gfs2/dir.h | 8 b/fs/gfs2/eaops.c | 2 b/fs/gfs2/eattr.c | 27 +- b/fs/gfs2/eattr.h | 6 b/fs/gfs2/glock.c | 2 b/fs/gfs2/glock.h | 2 b/fs/gfs2/glops.c | 2 b/fs/gfs2/incore.h | 2 b/fs/gfs2/inode.c | 4 b/fs/gfs2/inode.h | 4 b/fs/gfs2/lm.c | 8 b/fs/gfs2/locking/dlm/plock.c | 2 b/fs/gfs2/log.c | 17 - b/fs/gfs2/log.h | 2 b/fs/gfs2/lops.c | 4 b/fs/gfs2/lops.h | 2 b/fs/gfs2/main.c | 4 b/fs/gfs2/meta_io.c | 3 b/fs/gfs2/meta_io.h | 2 b/fs/gfs2/ondisk.c | 6 b/fs/gfs2/ops_address.c | 1 b/fs/gfs2/ops_dentry.c | 2 b/fs/gfs2/ops_export.c | 8 b/fs/gfs2/ops_export.h | 2 b/fs/gfs2/ops_file.c | 2 b/fs/gfs2/ops_file.h | 3 b/fs/gfs2/ops_fstype.c | 4 b/fs/gfs2/ops_inode.c | 10 b/fs/gfs2/ops_super.c | 2 b/fs/gfs2/ops_vm.c | 2 b/fs/gfs2/quota.c | 2 b/fs/gfs2/recovery.c | 22 - b/fs/gfs2/recovery.h | 2 b/fs/gfs2/rgrp.c | 2 b/fs/gfs2/super.c | 2 b/fs/gfs2/super.h | 2 b/fs/gfs2/sys.c | 9 b/fs/gfs2/util.c | 6 b/fs/gfs2/util.h | 7 b/include/linux/gfs2_ondisk.h | 49 +++ fs/gfs2/Kconfig | 5 fs/gfs2/acl.c | 37 -- fs/gfs2/bmap.c | 148 +++++------ fs/gfs2/dir.c | 86 +++--- fs/gfs2/eattr.c | 39 +-- fs/gfs2/glock.c | 36 -- fs/gfs2/glock.h | 2 fs/gfs2/glops.c | 156 +++--------- fs/gfs2/incore.h | 41 +-- fs/gfs2/inode.c | 528 +++++++++++++++++------------------------- fs/gfs2/inode.h | 20 - fs/gfs2/log.c | 25 + fs/gfs2/lops.c | 37 +- fs/gfs2/meta_io.c | 44 +-- fs/gfs2/ondisk.c | 150 +++-------- fs/gfs2/ops_address.c | 158 +++++------- fs/gfs2/ops_dentry.c | 2 fs/gfs2/ops_export.c | 30 -- fs/gfs2/ops_file.c | 78 +++++- fs/gfs2/ops_inode.c | 186 +++++++------- fs/gfs2/ops_super.c | 21 + fs/gfs2/quota.c | 13 - fs/gfs2/recovery.c | 13 - fs/gfs2/rgrp.c | 11 fs/gfs2/super.c | 51 ++-- fs/gfs2/super.h | 4 fs/gfs2/util.h | 7 include/linux/gfs2_ondisk.h | 238 ++++++++++++------ 74 files changed, 1213 insertions(+), 1253 deletions(-) --- NEW FILE linux-2.6-gfs2-update.patch --- >From 3ca68df6ee61e1a2034f3307b9edb9b3d87e5ca1 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 13 Oct 2006 20:11:25 -0400 Subject: [PATCH] [GFS2] split gfs2_dinode into on-disk and host variants The latter is used as part of gfs2-private part of struct inode. It actually stores a lot of fields differently; for now the declaration is just cloned, inode field is swtiched and changes propagated. Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse --- fs/gfs2/inode.c | 4 ++-- fs/gfs2/ondisk.c | 6 +++-- include/linux/gfs2_ondisk.h | 48 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index d470e52..191a3df 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -48,7 +48,7 @@ #include "util.h" void gfs2_inode_attr_in(struct gfs2_inode *ip) { struct inode *inode = &ip->i_inode; - struct gfs2_dinode *di = &ip->i_di; + struct gfs2_dinode_host *di = &ip->i_di; inode->i_ino = ip->i_num.no_addr; @@ -98,7 +98,7 @@ void gfs2_inode_attr_in(struct gfs2_inod void gfs2_inode_attr_out(struct gfs2_inode *ip) { struct inode *inode = &ip->i_inode; - struct gfs2_dinode *di = &ip->i_di; + struct gfs2_dinode_host *di = &ip->i_di; gfs2_assert_withdraw(GFS2_SB(inode), (di->di_mode & S_IFMT) == (inode->i_mode & S_IFMT)); di->di_mode = inode->i_mode; diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c index 1025960..52cb9a2 100644 --- a/fs/gfs2/ondisk.c +++ b/fs/gfs2/ondisk.c @@ -153,7 +153,7 @@ void gfs2_quota_in(struct gfs2_quota *qu qu->qu_value = be64_to_cpu(str->qu_value); } -void gfs2_dinode_in(struct gfs2_dinode *di, const void *buf) +void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf) { const struct gfs2_dinode *str = buf; @@ -187,7 +187,7 @@ void gfs2_dinode_in(struct gfs2_dinode * } -void gfs2_dinode_out(const struct gfs2_dinode *di, void *buf) +void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf) { struct gfs2_dinode *str = buf; @@ -221,7 +221,7 @@ void gfs2_dinode_out(const struct gfs2_d } -void gfs2_dinode_print(const struct gfs2_dinode *di) +void gfs2_dinode_print(const struct gfs2_dinode_host *di) { gfs2_meta_header_print(&di->di_header); gfs2_inum_print(&di->di_num); diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index a7ae7c1..f334b4b 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h @@ -270,6 +270,48 @@ struct gfs2_dinode { __u8 di_reserved[56]; }; +struct gfs2_dinode_host { + struct gfs2_meta_header di_header; + + struct gfs2_inum di_num; + + __be32 di_mode; /* mode of file */ + __be32 di_uid; /* owner's user id */ + __be32 di_gid; /* owner's group id */ + __be32 di_nlink; /* number of links to this file */ + __be64 di_size; /* number of bytes in file */ + __be64 di_blocks; /* number of blocks in file */ + __be64 di_atime; /* time last accessed */ + __be64 di_mtime; /* time last modified */ + __be64 di_ctime; /* time last changed */ + __be32 di_major; /* device major number */ + __be32 di_minor; /* device minor number */ + + /* This section varies from gfs1. Padding added to align with + * remainder of dinode + */ + __be64 di_goal_meta; /* rgrp to alloc from next */ + __be64 di_goal_data; /* data block goal */ + __be64 di_generation; /* generation number for NFS */ + + __be32 di_flags; /* GFS2_DIF_... */ + __be32 di_payload_format; /* GFS2_FORMAT_... */ + __u16 __pad1; /* Was ditype in gfs1 */ + __be16 di_height; /* height of metadata */ + __u32 __pad2; /* Unused incarnation number from gfs1 */ + + /* These only apply to directories */ + __u16 __pad3; /* Padding */ + __be16 di_depth; /* Number of bits in the table */ + __be32 di_entries; /* The number of entries in the directory */ + + struct gfs2_inum __pad4; /* Unused even in current gfs1 */ + + __be64 di_eattr; /* extended attribute block number */ + + __u8 di_reserved[56]; +}; + /* * directory structure - many of these per directory file */ @@ -422,8 +464,8 @@ extern void gfs2_rgrp_in(struct gfs2_rgr extern void gfs2_rgrp_out(const struct gfs2_rgrp *rg, void *buf); extern void gfs2_quota_in(struct gfs2_quota *qu, const void *buf); extern void gfs2_quota_out(const struct gfs2_quota *qu, void *buf); -extern void gfs2_dinode_in(struct gfs2_dinode *di, const void *buf); -extern void gfs2_dinode_out(const struct gfs2_dinode *di, void *buf); +extern void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf); +extern void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf); extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf); extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf); extern void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf); @@ -436,7 +478,7 @@ extern void gfs2_quota_change_in(struct /* Printing functions */ extern void gfs2_rindex_print(const struct gfs2_rindex *ri); -extern void gfs2_dinode_print(const struct gfs2_dinode *di); +extern void gfs2_dinode_print(const struct gfs2_dinode_host *di); #endif /* __KERNEL__ */ -- 1.4.1 >From 5c6edb576f3800723bb65dbfaff82517089e32d0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 13 Oct 2006 20:33:01 -0400 Subject: [PATCH] [GFS2] gfs2_dinode_host fields are host-endian Annotated scalar fields, dropped unused ones. Note that it's not at all obvious that we want to convert all of them to host-endian... Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse --- fs/gfs2/incore.h | 2 +- include/linux/gfs2_ondisk.h | 47 ++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 118dc69..1c876e0 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -229,7 +229,7 @@ struct gfs2_inode { unsigned long i_flags; /* GIF_... */ u64 i_vn; - struct gfs2_dinode i_di; /* To be replaced by ref to block */ + struct gfs2_dinode_host i_di; /* To be replaced by ref to block */ struct gfs2_glock *i_gl; /* Move into i_gh? */ struct gfs2_holder i_iopen_gh; diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index f334b4b..0e67a89 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h @@ -275,41 +275,34 @@ struct gfs2_dinode_host { struct gfs2_inum di_num; - __be32 di_mode; /* mode of file */ - __be32 di_uid; /* owner's user id */ - __be32 di_gid; /* owner's group id */ - __be32 di_nlink; /* number of links to this file */ - __be64 di_size; /* number of bytes in file */ - __be64 di_blocks; /* number of blocks in file */ - __be64 di_atime; /* time last accessed */ - __be64 di_mtime; /* time last modified */ - __be64 di_ctime; /* time last changed */ - __be32 di_major; /* device major number */ - __be32 di_minor; /* device minor number */ + __u32 di_mode; /* mode of file */ + __u32 di_uid; /* owner's user id */ + __u32 di_gid; /* owner's group id */ + __u32 di_nlink; /* number of links to this file */ [...8365 lines suppressed...] This fixes Red Hat bugzilla #221237 Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse --- fs/gfs2/inode.c | 50 +++++++++++++++++++++++++++++++------------------- fs/gfs2/inode.h | 2 +- fs/gfs2/ops_inode.c | 25 +++---------------------- 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index bab338f..80787de 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -281,13 +281,13 @@ out: } /** - * gfs2_change_nlink_i - Change nlink count on inode + * gfs2_change_nlink - Change nlink count on inode * @ip: The GFS2 inode * @diff: The change in the nlink count required * * Returns: errno */ -int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff) +int gfs2_change_nlink(struct gfs2_inode *ip, int diff) { struct buffer_head *dibh; u32 nlink; @@ -320,40 +320,52 @@ int gfs2_change_nlink_i(struct gfs2_inod brelse(dibh); mark_inode_dirty(&ip->i_inode); + if (ip->i_di.di_nlink == 0) + error = gfs2_change_nlink_i(ip); + return error; } -int gfs2_change_nlink(struct gfs2_inode *ip, int diff) +int gfs2_change_nlink_i(struct gfs2_inode *ip) { struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info; - int error; - - /* update the nlink */ - error = gfs2_change_nlink_i(ip, diff); - if (error) - return error; - - /* return meta data block back to rg */ - if (ip->i_inode.i_nlink == 0) { - struct gfs2_rgrpd *rgd; - struct gfs2_holder ri_gh, rg_gh; + struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex); + struct gfs2_glock *ri_gl = rindex->i_gl; + struct gfs2_rgrpd *rgd; + struct gfs2_holder ri_gh, rg_gh; + int existing, error; + /* if we come from rename path, we could have the lock already */ + existing = gfs2_glock_is_locked_by_me(ri_gl); + if (!existing) { error = gfs2_rindex_hold(sdp, &ri_gh); if (error) goto out; - error = -EIO; - rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr); - if (!rgd) - goto out_norgrp; + } + + /* find the matching rgd */ + error = -EIO; + rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr); + if (!rgd) + goto out_norgrp; + + /* + * Eventually we may want to move rgd(s) to a linked list + * and piggyback the free logic into one of gfs2 daemons + * to gain some performance. + */ + if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) { error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh); if (error) goto out_norgrp; gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */ gfs2_glock_dq_uninit(&rg_gh); + } + out_norgrp: + if (!existing) gfs2_glock_dq_uninit(&ri_gh); - } out: return error; } diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 85c67cb..cee281b 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h @@ -40,7 +40,7 @@ int gfs2_inode_refresh(struct gfs2_inode int gfs2_dinode_dealloc(struct gfs2_inode *inode); int gfs2_change_nlink(struct gfs2_inode *ip, int diff); -int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff); +int gfs2_change_nlink_i(struct gfs2_inode *ip); struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, int is_root, struct nameidata *nd); struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 919e894..b2a12f4 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c @@ -553,7 +553,6 @@ static int gfs2_rename(struct inode *odi int alloc_required; unsigned int x; int error; - struct gfs2_rgrpd *rgd; if (ndentry->d_inode) { nip = GFS2_I(ndentry->d_inode); @@ -685,12 +684,12 @@ static int gfs2_rename(struct inode *odi error = gfs2_trans_begin(sdp, sdp->sd_max_dirres + al->al_rgd->rd_ri.ri_length + 4 * RES_DINODE + 4 * RES_LEAF + - RES_STATFS + RES_QUOTA + 1, 0); + RES_STATFS + RES_QUOTA + 4, 0); if (error) goto out_ipreserv; } else { error = gfs2_trans_begin(sdp, 4 * RES_DINODE + - 5 * RES_LEAF + 1, 0); + 5 * RES_LEAF + 4, 0); if (error) goto out_gunlock; } @@ -704,25 +703,7 @@ static int gfs2_rename(struct inode *odi error = gfs2_dir_del(ndip, &ndentry->d_name); if (error) goto out_end_trans; - error = gfs2_change_nlink_i(nip, -1); - if ((!error) && (nip->i_inode.i_nlink == 0)) { - error = -EIO; - rgd = gfs2_blk2rgrpd(sdp, nip->i_num.no_addr); - if (rgd) { - struct gfs2_holder nlink_rg_gh; - if (rgd != nip->i_alloc.al_rgd) - error = gfs2_glock_nq_init( - rgd->rd_gl, LM_ST_EXCLUSIVE, - 0, &nlink_rg_gh); - else - error = 0; - if (!error) { - gfs2_unlink_di(&nip->i_inode); - if (rgd != nip->i_alloc.al_rgd) - gfs2_glock_dq_uninit(&nlink_rg_gh); - } - } - } + error = gfs2_change_nlink(nip, -1); } if (error) goto out_end_trans; -- 1.4.1 >From f8fb3e9d4c0d4e7709803eab2e1b23d76e42009b Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 9 Jan 2007 12:00:31 -0500 Subject: [PATCH] [GFS2] Compile file for previous patch This is a quick fix to the previous patch to fix a typo which prevents it compiling. Signed-off-by: Steven Whitehouse Cc: Wendy Cheng --- fs/gfs2/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 80787de..58c2ce7 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -320,7 +320,7 @@ int gfs2_change_nlink(struct gfs2_inode brelse(dibh); mark_inode_dirty(&ip->i_inode); - if (ip->i_di.di_nlink == 0) + if (ip->i_inode.i_nlink == 0) error = gfs2_change_nlink_i(ip); return error; -- 1.4.1 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2893 retrieving revision 1.2894 diff -u -r1.2893 -r1.2894 --- kernel-2.6.spec 8 Jan 2007 19:07:42 -0000 1.2893 +++ kernel-2.6.spec 9 Jan 2007 16:40:54 -0000 1.2894 @@ -419,6 +419,7 @@ # GFS/DLM Patch1411: linux-2.6-gfs2-tux.patch Patch1412: linux-2.6-gfs2-locking-exports.patch +Patch1413: linux-2.6-gfs2-update.patch # NFS superblock sharing / CacheFS Patch1431: linux-2.6-cachefiles.patch @@ -973,6 +974,8 @@ # GFS2/DLM #%patch1411 -p1 %patch1412 -p1 +# GFS2 update +%patch1413 -p1 #nfs sharing / cachefs %patch1431 -p1 @@ -2018,6 +2021,9 @@ %endif %changelog +* Tue Jan 9 2007 Dave Jones +- GFS2 update. + * Mon Jan 8 2007 Dave Jones - Enable pktcdvd for 586. (#221673) - Reenable signed modules. From fedora-cvs-commits at redhat.com Tue Jan 9 17:04:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 12:04:45 -0500 Subject: rpms/policycoreutils/FC-6 policycoreutils-po.patch, 1.11, 1.12 policycoreutils-rhat.patch, 1.248, 1.249 policycoreutils.spec, 1.327, 1.328 sources, 1.131, 1.132 Message-ID: <200701091704.l09H4jtR026977@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26849 Modified Files: policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Fri Jan 5 2007 Dan Walsh 1.33.8-3 - Fix translation errors Resolves: #221977 policycoreutils-po.patch: POTFILES.in | 46 ++ af.po | 481 +++++++++++++++------------- am.po | 481 +++++++++++++++------------- ar.po | 481 +++++++++++++++------------- as.po | 481 +++++++++++++++------------- be.po | 481 +++++++++++++++------------- bg.po | 481 +++++++++++++++------------- bn.po | 481 +++++++++++++++------------- bn_IN.po | 545 +++++++++++++++++-------------- ca.po | 554 +++++++++++++++++--------------- cs.po | 481 +++++++++++++++------------- cy.po | 481 +++++++++++++++------------- da.po | 525 ++++++++++++++++-------------- de.po | 543 +++++++++++++++++-------------- el.po | 527 +++++++++++++++++------------- en_GB.po | 481 +++++++++++++++------------- es.po | 538 +++++++++++++++++-------------- et.po | 479 +++++++++++++++------------- eu_ES.po | 481 +++++++++++++++------------- fa.po | 481 +++++++++++++++------------- fi.po | 481 +++++++++++++++------------- fr.po | 799 +++++++++++++++++++++++++--------------------- gl.po | 479 +++++++++++++++------------- gu.po | 535 +++++++++++++++++-------------- he.po | 481 +++++++++++++++------------- hi.po | 538 +++++++++++++++++-------------- hr.po | 627 ++++++++++++++++++++++-------------- hu.po | 527 +++++++++++++++++------------- hy.po | 481 +++++++++++++++------------- id.po | 479 +++++++++++++++------------- is.po | 481 +++++++++++++++------------- it.po | 555 ++++++++++++++++++-------------- ja.po | 889 ++++++++++++++++++++++++++++------------------------ ka.po | 481 +++++++++++++++------------- kn.po | 481 +++++++++++++++------------- ko.po | 552 +++++++++++++++++--------------- ku.po | 481 +++++++++++++++------------- lo.po | 481 +++++++++++++++------------- lt.po | 481 +++++++++++++++------------- lv.po | 481 +++++++++++++++------------- mk.po | 481 +++++++++++++++------------- ml.po | 539 +++++++++++++++++-------------- mr.po | 497 ++++++++++++++++------------- ms.po | 537 +++++++++++++++++-------------- my.po | 481 +++++++++++++++------------- nb.po | 481 +++++++++++++++------------- nl.po | 546 +++++++++++++++++-------------- nn.po | 481 +++++++++++++++------------- no.po | 481 +++++++++++++++------------- nso.po | 481 +++++++++++++++------------- or.po | 561 ++++++++++++++++++-------------- pa.po | 516 ++++++++++++++++-------------- pl.po | 544 +++++++++++++++++-------------- policycoreutils.pot | 481 +++++++++++++++------------- pt.po | 543 +++++++++++++++++-------------- pt_BR.po | 576 +++++++++++++++++++-------------- ro.po | 481 +++++++++++++++------------- ru.po | 592 ++++++++++++++++++---------------- si.po | 481 +++++++++++++++------------- sk.po | 523 ++++++++++++++++-------------- sl.po | 481 +++++++++++++++------------- sq.po | 481 +++++++++++++++------------- sr.po | 625 ++++++++++++++++++++++-------------- sr at Latn.po | 625 ++++++++++++++++++++++-------------- sv.po | 525 ++++++++++++++++-------------- ta.po | 535 +++++++++++++++++-------------- te.po | 481 +++++++++++++++------------- th.po | 481 +++++++++++++++------------- tr.po | 481 +++++++++++++++------------- uk.po | 527 +++++++++++++++++------------- ur.po | 481 +++++++++++++++------------- vi.po | 481 +++++++++++++++------------- zh_CN.po | 538 +++++++++++++++++-------------- zh_TW.po | 841 ++++++++++++++++++++++++++----------------------- zu.po | 481 +++++++++++++++------------- 75 files changed, 21531 insertions(+), 17155 deletions(-) Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-po.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- policycoreutils-po.patch 6 Dec 2006 20:56:19 -0000 1.11 +++ policycoreutils-po.patch 9 Jan 2007 17:04:42 -0000 1.12 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.6/po/af.po --- nsapolicycoreutils/po/af.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/af.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/af.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -1110,7 +1110,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.6/po/am.po --- nsapolicycoreutils/po/am.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/am.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/am.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -2220,7 +2220,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.6/po/ar.po --- nsapolicycoreutils/po/ar.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ar.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/ar.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -3330,7 +3330,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.6/po/as.po --- nsapolicycoreutils/po/as.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/as.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/as.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: as\n" @@ -4440,7 +4440,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.6/po/be.po --- nsapolicycoreutils/po/be.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/be.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/be.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -5550,7 +5550,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.6/po/bg.po --- nsapolicycoreutils/po/bg.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/bg.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/bg.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -6660,7 +6660,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.6/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/bn_IN.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/bn_IN.po 2006-12-08 09:11:53.000000000 -0500 @@ -36,8 +36,8 @@ msgstr "" "Project-Id-Version: bn_IN\n" @@ -7822,7 +7822,7 @@ msgstr "?????????????????? ??????????????????????????? ??????????????????: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.33.6/po/bn.po --- nsapolicycoreutils/po/bn.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/bn.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/bn.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -8932,7 +8932,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.6/po/ca.po --- nsapolicycoreutils/po/ca.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ca.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/ca.po 2006-12-08 09:11:53.000000000 -0500 @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -10107,7 +10107,7 @@ msgstr "Error en les opcions: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.33.6/po/cs.po --- nsapolicycoreutils/po/cs.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/cs.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/cs.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -11217,7 +11217,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.33.6/po/cy.po --- nsapolicycoreutils/po/cy.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/cy.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/cy.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -12327,7 +12327,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.33.6/po/da.po --- nsapolicycoreutils/po/da.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/da.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/da.po 2006-12-08 09:11:53.000000000 -0500 @@ -3,13 +3,13 @@ # Christian Rose , 2006. # Keld Simonsen , 2006. @@ -13470,7 +13470,7 @@ msgstr "Flagfejl: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.33.6/po/de.po --- nsapolicycoreutils/po/de.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/de.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/de.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,4 +1,5 @@ # translation of de.po to +# translation of de.po to @@ -14643,7 +14643,7 @@ msgstr "Options Fehler: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.33.6/po/el.po --- nsapolicycoreutils/po/el.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/el.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/el.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: el\n" @@ -15808,7 +15808,7 @@ msgstr "???????????? ????????????????????????: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.33.6/po/en_GB.po --- nsapolicycoreutils/po/en_GB.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/en_GB.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/en_GB.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -16918,7 +16918,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.33.6/po/es.po --- nsapolicycoreutils/po/es.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/es.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/es.po 2006-12-08 09:11:53.000000000 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: \n" @@ -18068,7 +18068,7 @@ msgstr "Error Opciones:?%s?" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/et.po policycoreutils-1.33.6/po/et.po --- nsapolicycoreutils/po/et.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/et.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/et.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,226 +8,276 @@ msgid "%s: Can't load policy: %s\n" msgstr "" @@ -19169,7 +19169,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/eu_ES.po policycoreutils-1.33.6/po/eu_ES.po --- nsapolicycoreutils/po/eu_ES.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/eu_ES.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/eu_ES.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -20279,7 +20279,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fa.po policycoreutils-1.33.6/po/fa.po --- nsapolicycoreutils/po/fa.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/fa.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/fa.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -21389,7 +21389,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fi.po policycoreutils-1.33.6/po/fi.po --- nsapolicycoreutils/po/fi.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/fi.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/fi.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -22499,7 +22499,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.33.6/po/fr.po --- nsapolicycoreutils/po/fr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/fr.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/fr.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,21 +1,23 @@ +# translation of fr.po to Fran??ais # translation of Policy Core Utils. @@ -23879,7 +23879,7 @@ msgstr "Options invalides: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gl.po policycoreutils-1.33.6/po/gl.po --- nsapolicycoreutils/po/gl.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/gl.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/gl.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,226 +8,276 @@ msgid "%s: Can't load policy: %s\n" msgstr "" @@ -24980,7 +24980,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/gu.po policycoreutils-1.33.6/po/gu.po --- nsapolicycoreutils/po/gu.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/gu.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/gu.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gu\n" @@ -26128,7 +26128,7 @@ msgstr "????????????????????? ?????????: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/he.po policycoreutils-1.33.6/po/he.po --- nsapolicycoreutils/po/he.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/he.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/he.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -27238,7 +27238,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hi.po policycoreutils-1.33.6/po/hi.po --- nsapolicycoreutils/po/hi.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/hi.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/hi.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: hi\n" @@ -28388,7 +28388,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hr.po policycoreutils-1.33.6/po/hr.po --- nsapolicycoreutils/po/hr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/hr.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/hr.po 2006-12-08 09:11:53.000000000 -0500 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -29646,7 +29646,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hu.po policycoreutils-1.33.6/po/hu.po --- nsapolicycoreutils/po/hu.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/hu.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/hu.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu\n" @@ -30794,7 +30794,7 @@ msgstr "Hiba az opci??kban: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/hy.po policycoreutils-1.33.6/po/hy.po --- nsapolicycoreutils/po/hy.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/hy.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/hy.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -31904,7 +31904,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/id.po policycoreutils-1.33.6/po/id.po --- nsapolicycoreutils/po/id.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/id.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/id.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,226 +8,276 @@ msgid "%s: Can't load policy: %s\n" msgstr "" @@ -33005,7 +33005,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/is.po policycoreutils-1.33.6/po/is.po --- nsapolicycoreutils/po/is.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/is.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/is.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -34115,7 +34115,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/it.po policycoreutils-1.33.6/po/it.po --- nsapolicycoreutils/po/it.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/it.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/it.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,20 +1,27 @@ +# translation of it.po to +# translation of it.po to @@ -35287,7 +35287,7 @@ msgstr "Errore opzioni: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ja.po policycoreutils-1.33.6/po/ja.po --- nsapolicycoreutils/po/ja.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ja.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/ja.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,253 +1,306 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -36742,7 +36742,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ka.po policycoreutils-1.33.6/po/ka.po --- nsapolicycoreutils/po/ka.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ka.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/ka.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -37852,7 +37852,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/kn.po policycoreutils-1.33.6/po/kn.po --- nsapolicycoreutils/po/kn.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/kn.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/kn.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -38962,7 +38962,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ko.po policycoreutils-1.33.6/po/ko.po --- nsapolicycoreutils/po/ko.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ko.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/ko.po 2006-12-08 09:11:53.000000000 -0500 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: ko\n" @@ -40123,7 +40123,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ku.po policycoreutils-1.33.6/po/ku.po --- nsapolicycoreutils/po/ku.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ku.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/ku.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -41233,7 +41233,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lo.po policycoreutils-1.33.6/po/lo.po --- nsapolicycoreutils/po/lo.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/lo.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/lo.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -42343,7 +42343,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lt.po policycoreutils-1.33.6/po/lt.po --- nsapolicycoreutils/po/lt.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/lt.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/lt.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -43453,7 +43453,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/lv.po policycoreutils-1.33.6/po/lv.po --- nsapolicycoreutils/po/lv.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/lv.po 2006-12-06 15:50:35.000000000 -0500 ++++ policycoreutils-1.33.6/po/lv.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -44561,21 +44561,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-1.33.6/po/Makefile ---- nsapolicycoreutils/po/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.6/po/Makefile 2006-12-06 15:50:35.000000000 -0500 -@@ -64,8 +64,6 @@ - @rm -fv *mo *~ .depend - @rm -rf tmp - --indent: -- - install: $(MOFILES) - @for n in $(MOFILES); do \ - l=`basename $$n .mo`; \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mk.po policycoreutils-1.33.6/po/mk.po --- nsapolicycoreutils/po/mk.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/mk.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/mk.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -45685,7 +45673,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ml.po policycoreutils-1.33.6/po/ml.po --- nsapolicycoreutils/po/ml.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ml.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/ml.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ml\n" @@ -46835,7 +46823,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.33.6/po/mr.po --- nsapolicycoreutils/po/mr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/mr.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/mr.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: mr\n" @@ -47957,7 +47945,7 @@ msgstr "????????? " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.33.6/po/ms.po --- nsapolicycoreutils/po/ms.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ms.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/ms.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -49118,7 +49106,7 @@ msgstr "Ralat Pilihan: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/my.po policycoreutils-1.33.6/po/my.po --- nsapolicycoreutils/po/my.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/my.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/my.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -50228,7 +50216,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nb.po policycoreutils-1.33.6/po/nb.po --- nsapolicycoreutils/po/nb.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/nb.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/nb.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -51338,7 +51326,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nl.po policycoreutils-1.33.6/po/nl.po --- nsapolicycoreutils/po/nl.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/nl.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/nl.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -52499,7 +52487,7 @@ msgstr "Fout in opties: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nn.po policycoreutils-1.33.6/po/nn.po --- nsapolicycoreutils/po/nn.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/nn.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/nn.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -53609,7 +53597,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/no.po policycoreutils-1.33.6/po/no.po --- nsapolicycoreutils/po/no.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/no.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/no.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -54719,7 +54707,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/nso.po policycoreutils-1.33.6/po/nso.po --- nsapolicycoreutils/po/nso.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/nso.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/nso.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -55829,7 +55817,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/or.po policycoreutils-1.33.6/po/or.po --- nsapolicycoreutils/po/or.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/or.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/or.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,22 +1,23 @@ # translation of or.po to Oriya # This file is distributed under the same license as the PACKAGE package. @@ -57004,7 +56992,7 @@ +msgstr "??????????????? ?????????????????? ??? ????????????: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pa.po policycoreutils-1.33.6/po/pa.po --- nsapolicycoreutils/po/pa.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/pa.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/pa.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,21 +1,21 @@ -# translation of policycoreutils.po to Punjabi +# translation of pa.po to Punjabi @@ -58167,7 +58155,7 @@ msgstr "????????? ????????????:%s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pl.po policycoreutils-1.33.6/po/pl.po --- nsapolicycoreutils/po/pl.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/pl.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/pl.po 2006-12-08 09:11:53.000000000 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: pl\n" @@ -59327,7 +59315,7 @@ msgstr "B????d opcji: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/policycoreutils.pot policycoreutils-1.33.6/po/policycoreutils.pot --- nsapolicycoreutils/po/policycoreutils.pot 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/policycoreutils.pot 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/policycoreutils.pot 2006-12-06 15:51:32.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -60437,7 +60425,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-1.33.6/po/POTFILES.in --- nsapolicycoreutils/po/POTFILES.in 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.6/po/POTFILES.in 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/POTFILES.in 2006-12-06 15:51:32.000000000 -0500 @@ -1,11 +1,39 @@ -load_policy/load_policy.c -newrole/newrole.c @@ -60489,7 +60477,7 @@ +secon/secon.c diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt_BR.po policycoreutils-1.33.6/po/pt_BR.po --- nsapolicycoreutils/po/pt_BR.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/pt_BR.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/pt_BR.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,20 +1,42 @@ +# translation of pt_BR.po to Brazilian Portuguese # translation of pt_BR.po to Brazilian Portuguese @@ -61675,7 +61663,7 @@ msgstr "Erro de Op????es: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/pt.po policycoreutils-1.33.6/po/pt.po --- nsapolicycoreutils/po/pt.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/pt.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/pt.po 2006-12-08 09:11:53.000000000 -0500 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -62843,7 +62831,7 @@ msgstr "Erro nas Op????es: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ro.po policycoreutils-1.33.6/po/ro.po --- nsapolicycoreutils/po/ro.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ro.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/ro.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -63953,7 +63941,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ru.po policycoreutils-1.33.6/po/ru.po --- nsapolicycoreutils/po/ru.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ru.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/ru.po 2006-12-08 09:11:53.000000000 -0500 @@ -1,18 +1,19 @@ # translation of ru.po to Russian # @@ -65153,7 +65141,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.33.6/po/si.po --- nsapolicycoreutils/po/si.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/si.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/si.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -66263,7 +66251,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.33.6/po/sk.po --- nsapolicycoreutils/po/sk.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sk.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/sk.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -67399,7 +67387,7 @@ msgstr "Chyba volieb: %s" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.33.6/po/sl.po --- nsapolicycoreutils/po/sl.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sl.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/sl.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -68509,7 +68497,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.33.6/po/sq.po --- nsapolicycoreutils/po/sq.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sq.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/sq.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -69619,7 +69607,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.33.6/po/sr at Latn.po --- nsapolicycoreutils/po/sr at Latn.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sr at Latn.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/sr at Latn.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -70875,7 +70863,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.33.6/po/sr.po --- nsapolicycoreutils/po/sr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sr.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/sr.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -72131,7 +72119,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.33.6/po/sv.po --- nsapolicycoreutils/po/sv.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sv.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/sv.po 2006-12-08 09:11:53.000000000 -0500 @@ -2,13 +2,13 @@ # Copyright (C) 2006 Christian Rose. # Christian Rose , 2006. @@ -73274,7 +73262,7 @@ msgstr "Flaggfel: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.33.6/po/ta.po --- nsapolicycoreutils/po/ta.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ta.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/ta.po 2006-12-08 09:11:53.000000000 -0500 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: ta\n" @@ -74423,7 +74411,7 @@ msgstr "???????????????????????????????????? ????????????: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.33.6/po/te.po --- nsapolicycoreutils/po/te.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/te.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/te.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -75533,7 +75521,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.33.6/po/th.po --- nsapolicycoreutils/po/th.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/th.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/th.po 2006-12-08 09:11:53.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -76643,7 +76631,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.33.6/po/tr.po --- nsapolicycoreutils/po/tr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/tr.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/tr.po 2006-12-08 09:11:54.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -77753,7 +77741,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.33.6/po/uk.po --- nsapolicycoreutils/po/uk.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/uk.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/uk.po 2006-12-08 09:11:54.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -78894,7 +78882,7 @@ msgstr "?????????????? ?? ????????????????????: %s " diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.33.6/po/ur.po --- nsapolicycoreutils/po/ur.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ur.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/ur.po 2006-12-08 09:11:54.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -80004,7 +79992,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.33.6/po/vi.po --- nsapolicycoreutils/po/vi.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/vi.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/vi.po 2006-12-08 09:11:54.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -81114,7 +81102,7 @@ msgstr "" diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.33.6/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/zh_CN.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/zh_CN.po 2006-12-08 09:11:54.000000000 -0500 @@ -5,16 +5,18 @@ # translation of zh_CN.po to # translation of zh_CN.po to @@ -82254,7 +82242,7 @@ #, c-format msgid "" "In order to load this newly created policy package into the kernel,\n" -@@ -983,7 +1039,8 @@ +@@ -983,7 +1039,7 @@ "semodule -i %s.pp\n" "\n" @@ -82263,10 +82251,9 @@ #, c-format msgid "Options Error: %s " msgstr "??????????????? %s " -+ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.6/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/zh_TW.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/zh_TW.po 2006-12-08 09:11:54.000000000 -0500 @@ -1,15 +1,16 @@ # translation of zh_TW.po to Chinese, Traditional -# translation of policycoreutils.po to Chinese, Traditional @@ -83668,7 +83655,7 @@ #, c-format msgid "" "In order to load this newly created policy package into the kernel,\n" -@@ -968,8 +1028,14 @@ +@@ -968,8 +1028,13 @@ "semodule -i %s.pp\n" "\n" msgstr "" @@ -83684,10 +83671,9 @@ msgid "Options Error: %s " -msgstr "" +msgstr "???????????????%s" -+ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.6/po/zu.po --- nsapolicycoreutils/po/zu.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/zu.po 2006-12-06 15:50:36.000000000 -0500 ++++ policycoreutils-1.33.6/po/zu.po 2006-12-08 09:11:54.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ newrole/newrole.c | 16 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/fixfiles | 3 semanage/semanage | 15 semanage/seobject.py | 34 21 files changed, 4849 insertions(+), 21 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- policycoreutils-rhat.patch 6 Dec 2006 20:56:19 -0000 1.248 +++ policycoreutils-rhat.patch 9 Jan 2007 17:04:42 -0000 1.249 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.5/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.8/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/booleansPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/booleansPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -201,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.5/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.8/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/fcontextPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/fcontextPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -363,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.5/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.8/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/loginsPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/loginsPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -528,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.5/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.8/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/Makefile 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/Makefile 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -562,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.5/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.8/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/mappingsPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/mappingsPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -620,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.5/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.8/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/modulesPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/modulesPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -785,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.5/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.8/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/portsPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/portsPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1003,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.5/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.8/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/selinux.tbl 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/selinux.tbl 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1272,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.5/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.8/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/semanagePage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/semanagePage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1385,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.5/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.8/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/statusPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/statusPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1602,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.5/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.8/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/system-config-selinux.glade 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/system-config-selinux.glade 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4409,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.5/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.8/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/system-config-selinux.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/system-config-selinux.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4569,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.5/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.8/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/translationsPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/translationsPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4682,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.5/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.8/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.5/gui/usersPage.py 2006-11-28 10:44:03.000000000 -0500 ++++ policycoreutils-1.33.8/gui/usersPage.py 2007-01-09 11:57:00.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4841,39 +4841,65 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.33.5/load_policy/load_policy.c ---- nsapolicycoreutils/load_policy/load_policy.c 2006-11-16 17:14:31.000000000 -0500 -+++ policycoreutils-1.33.5/load_policy/load_policy.c 2006-11-28 10:44:25.000000000 -0500 -@@ -50,12 +50,12 @@ - nargs = argc - optind; - if (nargs > 2) - usage(argv[0]); -- if (nargs >= 1) { -- fprintf(stderr, -- "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", -- argv[0], argv[optind++]); -+ if (nargs >= 1 && !quiet) { -+ fprintf(stderr, -+ "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", -+ argv[0], argv[optind++]); - } -- if (nargs == 2) { -+ if (nargs == 2 && ! quiet) { - fprintf(stderr, - "%s: Warning! Boolean file argument (%s) is no longer supported, installed booleans file is always used. Continuing...\n", - argv[0], argv[optind++]); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.5/Makefile ---- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.5/Makefile 2006-11-28 10:44:03.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.8/Makefile +--- nsapolicycoreutils/Makefile 2007-01-04 17:01:46.000000000 -0500 ++++ policycoreutils-1.33.8/Makefile 2007-01-09 11:57:00.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.5/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.5/restorecond/restorecond.c 2006-11-29 12:44:06.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.8/newrole/newrole.c +--- nsapolicycoreutils/newrole/newrole.c 2007-01-04 17:01:47.000000000 -0500 ++++ policycoreutils-1.33.8/newrole/newrole.c 2007-01-09 11:57:00.000000000 -0500 +@@ -67,6 +67,7 @@ + #include /* for SELINUX_DEFAULTUSER */ + #include + #include /* for getuid(), exit(), getopt() */ ++#include + #ifdef USE_AUDIT + #include + #endif +@@ -733,6 +734,7 @@ + security_context_t *new_context, + int *preserve_environment) + { ++ int i; /* index for open file descriptors */ + int flag_index; /* flag index in argv[] */ + int clflag; /* holds codes for command line flags */ + char *role_s = NULL; /* role spec'd by user in argv[] */ +@@ -741,6 +743,8 @@ + char *level_s = NULL; /* level spec'd by user in argv[] */ + char *range_ptr = NULL; + security_context_t new_con = NULL; ++ security_context_t tty_con = NULL; ++ int securetty=0; + context_t context = NULL; /* manipulatable form of new_context */ + const struct option long_options[] = { + {"role", 1, 0, 'r'}, +@@ -793,6 +797,18 @@ + "specified\n")); + return -1; + } ++ for (i=0; i < 3; i++) { ++ securetty=0; ++ if (fgetfilecon(i,&tty_con) >= 0) { ++ securetty = (selinux_check_securetty_context(tty_con) == 1); ++ freecon(tty_con); ++ } ++ if (!securetty) { ++ fprintf(stderr, "Error: you are not allowed to change levels on a non secure terminal\n"); ++ return -1; ++ } ++ } ++ + level_s = optarg; + break; + default: +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.8/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2007-01-04 17:01:48.000000000 -0500 ++++ policycoreutils-1.33.8/restorecond/restorecond.c 2007-01-09 11:57:00.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4900,9 +4926,59 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.5/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.5/semanage/seobject.py 2006-11-28 10:44:03.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.8/restorecond/restorecond.conf +--- nsapolicycoreutils/restorecond/restorecond.conf 2007-01-04 17:01:48.000000000 -0500 ++++ policycoreutils-1.33.8/restorecond/restorecond.conf 2007-01-09 11:57:00.000000000 -0500 +@@ -1,4 +1,5 @@ + /etc/resolv.conf ++/etc/localtime + /etc/samba/secrets.tdb + /etc/mtab + /var/run/utmp +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.8/scripts/fixfiles +--- nsapolicycoreutils/scripts/fixfiles 2007-01-04 17:01:48.000000000 -0500 ++++ policycoreutils-1.33.8/scripts/fixfiles 2007-01-09 11:57:00.000000000 -0500 +@@ -29,6 +29,9 @@ + RPMILES="" + OUTFILES="" + LOGFILE=`tty` ++if [ $? != 0 ]; then ++ LOGFILE="/dev/null" ++fi + SYSLOGFLAG="-l" + LOGGER=/usr/sbin/logger + SETFILES=/sbin/setfiles +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.33.8/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2007-01-04 17:01:47.000000000 -0500 ++++ policycoreutils-1.33.8/semanage/semanage 2007-01-09 11:58:17.000000000 -0500 +@@ -23,12 +23,21 @@ + import os, sys, getopt + import seobject + import selinux ++PROGNAME="policycoreutils" ++ + import gettext ++gettext.bindtextdomain(PROGNAME, "/usr/share/locale") ++gettext.textdomain(PROGNAME) ++import codecs ++import locale ++sys.stderr = codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__, 'replace') ++sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace') + + try: +- gettext.install('policycoreutils') +-except: +- pass ++ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) ++except IOError: ++ import __builtin__ ++ __builtin__.__dict__['_'] = unicode + + is_mls_enabled=selinux.is_selinux_mls_enabled() + +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.8/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2007-01-04 17:01:47.000000000 -0500 ++++ policycoreutils-1.33.8/semanage/seobject.py 2007-01-09 11:57:00.000000000 -0500 @@ -94,23 +94,25 @@ return re.search("^" + reg +"$",raw) @@ -4972,7 +5048,7 @@ rc = semanage_user_set_prefix(self.sh, u, prefix) if rc < 0: raise ValueError(_("Could not add prefix %s for %s") % (r, prefix)) -@@ -522,7 +526,9 @@ +@@ -522,11 +526,17 @@ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) if prefix != "": @@ -4982,4 +5058,14 @@ + semanage_user_set_prefix(self.sh, u, prefix) if len(roles) != 0: - for r in roles: +- for r in roles: +- semanage_user_add_role(self.sh, u, r) ++ for r in rlist: ++ if r not in roles: ++ semanage_user_del_role(u, r) ++ for r in roles: ++ if r not in rlist: ++ semanage_user_add_role(self.sh, u, r) + + rc = semanage_begin_transaction(self.sh) + if rc < 0: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- policycoreutils.spec 6 Dec 2006 20:56:19 -0000 1.327 +++ policycoreutils.spec 9 Jan 2007 17:04:43 -0000 1.328 @@ -1,10 +1,10 @@ %define libauditver 1.1.4-3 %define libsepolver 1.12.27-1 %define libsemanagever 1.6.17-1 -%define libselinuxver 1.30.29-2 +%define libselinuxver 1.33.3-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.6 +Version: 1.33.8 Release: 3%{?dist} License: GPL Group: System Environment/Base @@ -151,8 +151,8 @@ %config %{_sysconfdir}/pam.d/newrole %config %{_sysconfdir}/pam.d/run_init %config(noreplace) %{_sysconfdir}/sestatus.conf -%{_libdir}/python2.4/site-packages/seobject.py* -%{_libdir}/python2.4/site-packages/avc.py* +%{_libdir}/python?.?/site-packages/seobject.py* +%{_libdir}/python?.?/site-packages/avc.py* %attr(755,root,root) /etc/rc.d/init.d/restorecond %config(noreplace) /etc/selinux/restorecond.conf @@ -165,9 +165,53 @@ %post /sbin/chkconfig --add restorecond -[ -x /sbin/service ] && /sbin/service restorecond condrestart +[ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Fri Jan 5 2007 Dan Walsh 1.33.8-3 +- Fix translation errors +Resolves: #221977 + +* Fri Jan 5 2007 Dan Walsh 1.33.8-2 +- Stop newrole -l from working on non secure ttys +Resolves: #200110 + +* Thu Jan 4 2007 Dan Walsh 1.33.8-1 +- Update to upstream + * Merged patches from Dan Walsh to: + - omit the optional name from audit2allow + - use the installed python version in the Makefiles + - re-open the tty with O_RDWR in newrole + +* Wed Jan 3 2007 Dan Walsh 1.33.7-1 +- Update to upstream + * Patch from Dan Walsh to correctly suppress warnings in load_policy. + +* Tue Jan 2 2007 Dan Walsh 1.33.6-9 +- Fix fixfiles script to use tty command correctly. If this command fails, it +should set the LOGFILE to /dev/null +Resolves: #220879 + +* Wed Dec 20 2006 Dan Walsh 1.33.6-8 +- Remove hard coding of python2.4 from Makefiles + +* Tue Dec 19 2006 Dan Walsh 1.33.6-7 +- add exists switch to semanage to tell it not to check for existance of Linux user +Resolves: #219421 + +* Mon Dec 18 2006 Dan Walsh 1.33.6-6 +- Fix audit2allow generating reference policy +- Fix semanage to manage user roles properly +Resolves: #220071 + +* Fri Dec 8 2006 Dan Walsh 1.33.6-5 +- Update po files +- Fix newrole to open stdout and stderr rdrw so more will work on MLS machines +Resolves: #216920 + +* Thu Dec 7 2006 Jeremy Katz - 1.33.6-4 +- rebuild for python 2.5 + * Wed Dec 6 2006 Dan Walsh 1.33.6-3 - Update po files Resolves: #216920 Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/sources,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- sources 6 Dec 2006 20:56:19 -0000 1.131 +++ sources 9 Jan 2007 17:04:43 -0000 1.132 @@ -1 +1 @@ -1608bac92b9b014500defff770ea1691 policycoreutils-1.33.6.tgz +c4c3ebbaf1c11e122441da38fd11478c policycoreutils-1.33.8.tgz From fedora-cvs-commits at redhat.com Tue Jan 9 17:20:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 12:20:49 -0500 Subject: rpms/libselinux/FC-6 libselinux-rhat.patch, 1.94, 1.95 libselinux.spec, 1.231, 1.232 sources, 1.123, 1.124 Message-ID: <200701091720.l09HKnhV027655@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27597 Modified Files: libselinux-rhat.patch libselinux.spec sources Log Message: * Fri Jan 5 2007 Dan Walsh - 1.33.3-2 - Add securetty handling Resolves: #200110 libselinux-rhat.patch: include/selinux/selinux.h | 5 ++ man/man3/selinux_binary_policy_path.3 | 4 ++ man/man3/selinux_check_securetty_context.3 | 13 +++++++ man/man3/selinux_securetty_context_path.3 | 1 src/file_path_suffixes.h | 1 src/selinux_check_securetty_context.c | 49 +++++++++++++++++++++++++++++ src/selinux_config.c | 9 ++++- src/selinux_internal.h | 2 + utils/selinux_check_securetty_context.c | 40 +++++++++++++++++++++++ 9 files changed, 122 insertions(+), 2 deletions(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-6/libselinux-rhat.patch,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- libselinux-rhat.patch 6 Dec 2006 19:38:55 -0000 1.94 +++ libselinux-rhat.patch 9 Jan 2007 17:20:47 -0000 1.95 @@ -1,64 +1,223 @@ -Binary files nsalibselinux/utils/matchpathcon and libselinux-1.33.2/utils/matchpathcon differ -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-1.33.2/utils/matchpathcon.c ---- nsalibselinux/utils/matchpathcon.c 2006-11-16 17:15:17.000000000 -0500 -+++ libselinux-1.33.2/utils/matchpathcon.c 2006-12-06 14:11:29.000000000 -0500 -@@ -4,20 +4,23 @@ - #include - #include - #include -+#include -+#include -+#include - #include +diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.33.3/include/selinux/selinux.h +--- nsalibselinux/include/selinux/selinux.h 2006-11-16 17:15:18.000000000 -0500 ++++ libselinux-1.33.3/include/selinux/selinux.h 2007-01-05 11:57:44.000000000 -0500 +@@ -406,6 +406,7 @@ + extern const char *selinux_homedir_context_path(void); + extern const char *selinux_media_context_path(void); + extern const char *selinux_contexts_path(void); ++ extern const char *selinux_securetty_context_path(void); + extern const char *selinux_booleans_path(void); + extern const char *selinux_customizable_types_path(void); + extern const char *selinux_users_path(void); +@@ -413,12 +414,14 @@ + extern const char *selinux_translations_path(void); + extern const char *selinux_netfilter_context_path(void); + extern const char *selinux_path(void); +- + /* Check a permission in the passwd class. + Return 0 if granted or -1 otherwise. */ + extern int selinux_check_passwd_access(access_vector_t requested); + extern int checkPasswdAccess(access_vector_t requested); - void usage(const char *progname) - { - fprintf(stderr, -- "usage: %s [-n] [-f file_contexts] [-p prefix] path...\n", -+ "usage: %s [-N] [-n] [-f file_contexts] [-p prefix] [-V] path...\n", - progname); - exit(1); - } ++/* Check if the tty_context is defined as a securetty ++ Return 1 if secure, 0 if not, or -1 if otherwise. */ ++ extern int selinux_check_securetty_context(security_context_t tty_context); + /* Set the path to the selinuxfs mount point explicitly. + Normally, this is determined automatically during libselinux + initialization, but this is not always possible, e.g. for /sbin/init +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 +--- nsalibselinux/man/man3/selinux_binary_policy_path.3 2006-11-16 17:15:30.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_binary_policy_path.3 2007-01-05 11:57:44.000000000 -0500 +@@ -27,6 +27,8 @@ + .br + extern const char *selinux_media_context_path(void); + .br ++extern const char *selinux_securetty_context_path(void); ++.br + extern const char *selinux_contexts_path(void); + .br + extern const char *selinux_booleans_path(void); +@@ -56,6 +58,8 @@ + .sp + selinux_contexts_path() - directory containing all of the context configuration files + .sp ++selinux_securetty_context_path() - defines terminal contexts for securetty ++.sp + selinux_booleans_path() - initial policy boolean settings --int printmatchpathcon(char *path, int header) -+int printmatchpathcon(char *path, int header, int mode) + .SH AUTHOR +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_check_securetty_context.3 libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 +--- nsalibselinux/man/man3/selinux_check_securetty_context.3 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_check_securetty_context.3 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1,13 @@ ++.TH "selinux_check_securetty_context" "3" "1 January 2007" "dwalsh at redhat.com" "SE Linux API documentation" ++.SH "NAME" ++selinux_check_securetty_context \- check whether a tty security context is defined as a securetty context ++.SH "SYNOPSIS" ++.B #include ++.sp ++.BI "int selinux_check_securetty_context(security_context_t "tty_context ); ++ ++.SH "DESCRIPTION" ++.B selinux_check_securetty_context ++returns 1 if tty_context is a securetty context ++returns 0 if tty_context is a not a securetty context ++returns -1 on error. +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_securetty_context_path.3 libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 +--- nsalibselinux/man/man3/selinux_securetty_context_path.3 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/man/man3/selinux_securetty_context_path.3 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1 @@ ++.so man3/selinux_binary_policy_path.3 +diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-1.33.3/src/file_path_suffixes.h +--- nsalibselinux/src/file_path_suffixes.h 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.33.3/src/file_path_suffixes.h 2007-01-05 11:57:44.000000000 -0500 +@@ -7,6 +7,7 @@ + S_(USER_CONTEXTS, "/contexts/users/") + S_(FAILSAFE_CONTEXT, "/contexts/failsafe_context") + S_(DEFAULT_TYPE, "/contexts/default_type") ++ S_(SECURETTY_CONTEXTS, "/contexts/securetty_contexts") + S_(BOOLEANS, "/booleans") + S_(MEDIA_CONTEXTS, "/contexts/files/media") + S_(REMOVABLE_CONTEXT, "/contexts/removable_context") +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_check_securetty_context.c libselinux-1.33.3/src/selinux_check_securetty_context.c +--- nsalibselinux/src/selinux_check_securetty_context.c 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_check_securetty_context.c 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1,49 @@ ++#include ++#include ++#include ++#include ++#include ++#include "selinux_internal.h" ++#include "context_internal.h" ++ ++int selinux_check_securetty_context(security_context_t tty_context) ++{ ++ char buf[250]; ++ char *ptr = "", *end; ++ size_t len; ++ int found = -1; ++ FILE *fp; ++ fp = fopen(selinux_securetty_context_path(), "r"); ++ if (fp) { ++ context_t con =context_new(tty_context); ++ if (con) { ++ char *type=context_type_get(con); ++ found = 0; ++ len = strlen(type); ++ while (!feof_unlocked(fp)) { ++ if (!fgets_unlocked(buf, sizeof buf, fp)) ++ break; ++ ++ if (buf[strlen(buf) - 1]) ++ buf[strlen(buf) - 1] = 0; ++ ++ ptr = buf; ++ while (*ptr && isspace(*ptr)) ++ ptr++; ++ if (!(*ptr)) ++ continue; ++ ++ if (!strncmp(type, ptr, len)) { ++ found = 1; ++ break; ++ } ++ } ++ context_free(con); ++ } ++ fclose(fp); ++ } ++ ++ return found; ++} ++ ++hidden_def(selinux_check_securetty_context) +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.33.3/src/selinux_config.c +--- nsalibselinux/src/selinux_config.c 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_config.c 2007-01-05 11:57:44.000000000 -0500 +@@ -38,7 +38,8 @@ + #define NETFILTER_CONTEXTS 15 + #define FILE_CONTEXTS_HOMEDIR 16 + #define FILE_CONTEXTS_LOCAL 17 +-#define NEL 18 ++#define SECURETTY_CONTEXTS 18 ++#define NEL 19 + + /* New layout is relative to SELINUXDIR/policytype. */ + static char *file_paths[NEL]; +@@ -299,6 +300,12 @@ + + hidden_def(selinux_default_context_path) + ++const char *selinux_securetty_context_path() ++{ ++ return get_path(SECURETTY_CONTEXTS); ++} ++hidden_def(selinux_securetty_context_path) ++ + const char *selinux_failsafe_context_path() { - char *buf; -- int rc = matchpathcon(path, 0, &buf); -+ int rc = matchpathcon(path, mode, &buf); - if (rc < 0) { - fprintf(stderr, "matchpathcon(%s) failed: %s\n", path, - strerror(errno)); -@@ -92,6 +95,11 @@ - } - } - for (i = optind; i < argc; i++) { -+ int mode=0; -+ struct stat buf; -+ if (lstat(argv[i], &buf) == 0) -+ mode = buf.st_mode; -+ - if (verify) { - if (selinux_file_context_verify(argv[i], 0)) { - printf("%s verified.\n", argv[i]); -@@ -106,17 +114,17 @@ - if (rc >= 0) { - printf("%s has context %s, should be ", - argv[i], con); -- error += printmatchpathcon(argv[i], 0); -+ error += printmatchpathcon(argv[i], 0, mode); - freecon(con); - } else { - printf - ("actual context unknown: %s, should be ", - strerror(errno)); -- error += printmatchpathcon(argv[i], 0); -+ error += printmatchpathcon(argv[i], 0,mode); - } - } - } else { -- error += printmatchpathcon(argv[i], header); -+ error += printmatchpathcon(argv[i], header, mode); - } - } - matchpathcon_fini(); + return get_path(FAILSAFE_CONTEXT); +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.33.3/src/selinux_internal.h +--- nsalibselinux/src/selinux_internal.h 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.33.3/src/selinux_internal.h 2007-01-05 11:57:44.000000000 -0500 +@@ -53,6 +53,7 @@ + hidden_proto(security_setenforce) + hidden_proto(selinux_binary_policy_path) + hidden_proto(selinux_default_context_path) ++ hidden_proto(selinux_securetty_context_path) + hidden_proto(selinux_failsafe_context_path) + hidden_proto(selinux_removable_context_path) + hidden_proto(selinux_file_context_path) +@@ -66,6 +67,7 @@ + hidden_proto(selinux_media_context_path) + hidden_proto(selinux_path) + hidden_proto(selinux_check_passwd_access) ++ hidden_proto(selinux_check_securetty_context) + hidden_proto(matchpathcon_init_prefix) + hidden_proto(selinux_users_path) + hidden_proto(selinux_usersconf_path); +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/selinux_check_securetty_context.c libselinux-1.33.3/utils/selinux_check_securetty_context.c +--- nsalibselinux/utils/selinux_check_securetty_context.c 1969-12-31 19:00:00.000000000 -0500 ++++ libselinux-1.33.3/utils/selinux_check_securetty_context.c 2007-01-05 11:57:44.000000000 -0500 +@@ -0,0 +1,40 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++void usage(const char *progname) ++{ ++ fprintf(stderr, ++ "usage: %s tty_context...\n", ++ progname); ++ exit(1); ++} ++ ++int main(int argc, char **argv) ++{ ++ int i; ++ if (argc < 2) ++ usage(argv[0]); ++ ++ for (i = 1; i < argc; i++) { ++ switch (selinux_check_securetty_context(argv[i])) { ++ case 1: ++ printf("%s securetty.\n", argv[i]); ++ break; ++ case 0: ++ printf("%s not securetty.\n", argv[i]); ++ break; ++ case -1: ++ perror("Failed on check if securetty"); ++ return -1; ++ } ++ } ++ return 0; ++} Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-6/libselinux.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- libselinux.spec 6 Dec 2006 19:38:55 -0000 1.231 +++ libselinux.spec 9 Jan 2007 17:20:47 -0000 1.232 @@ -1,8 +1,8 @@ %define libsepolver 1.15.2-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.33.2 -Release: 3%{?dist} +Version: 1.33.3 +Release: 2%{?dist} License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -80,6 +80,7 @@ rm -f %{buildroot}%{_sbindir}/selinuxconfig rm -f %{buildroot}%{_sbindir}/selinuxdisable rm -f %{buildroot}%{_sbindir}/getseuser +rm -f %{buildroot}%{_sbindir}/selinux_check_securetty_context %clean rm -rf %{buildroot} @@ -119,6 +120,18 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Fri Jan 5 2007 Dan Walsh - 1.33.3-2 +- Add securetty handling +Resolves: #200110 + +* Thu Jan 4 2007 Dan Walsh - 1.33.3-1 +- Upgrade to upstream + * Merged patch for matchpathcon utility to use file mode information + when available from Dan Walsh. + +* Thu Dec 7 2006 Jeremy Katz - 1.33.2-4 +- rebuild against python 2.5 + * Wed Dec 6 2006 Dan Walsh - 1.33.2-3 - Fix matchpathcon to lstat files @@ -164,7 +177,7 @@ - have -devel require libsepol-devel * Thu Aug 24 2006 Dan Walsh - 1.30.27-1 -- Upgrade to latest from NSA +- Upgrade to latest from NSA[ * Merged patch to not log avc stats upon a reset from Steve Grubb. * Applied patch to revert compat_net setting upon policy load. * Merged file context homedir and local path functions from Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-6/sources,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- sources 29 Nov 2006 21:01:29 -0000 1.123 +++ sources 9 Jan 2007 17:20:47 -0000 1.124 @@ -1 +1 @@ -443ffbc50604d5481010ce698ed1b742 libselinux-1.33.2.tgz +11ea5b86dcea249dfa5c48940c98b1b6 libselinux-1.33.3.tgz From fedora-cvs-commits at redhat.com Tue Jan 9 17:34:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 12:34:09 -0500 Subject: rpms/libofx/devel libofx-0.8.3-xml++.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libofx.spec, 1.23, 1.24 sources, 1.5, 1.6 Message-ID: <200701091734.l09HY94v003931@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16245 Modified Files: .cvsignore libofx.spec sources Added Files: libofx-0.8.3-xml++.patch Log Message: add libxml++ support libofx-0.8.3-xml++.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libofx-0.8.3-xml++.patch --- --- libofx-0.8.3/configure.in.foo 2007-01-09 12:25:11.000000000 -0500 +++ libofx-0.8.3/configure.in 2007-01-09 12:25:24.000000000 -0500 @@ -255,7 +255,7 @@ AC_MSG_WARN([libcurl is not available. ofxconnect (Direct connect samples) will NOT be built.]) fi -PKG_CHECK_MODULES(LIBXMLPP,libxml++-1.0 >= 1.0.1, +PKG_CHECK_MODULES(LIBXMLPP,libxml++-2.6 >= 1.0.1, [ AC_DEFINE(HAVE_LIBXMLPP, 1, [Defined if libxml++ is available]) have_libxmlpp=yes], Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Aug 2006 20:42:27 -0000 1.5 +++ .cvsignore 9 Jan 2007 17:34:07 -0000 1.6 @@ -1 +1,2 @@ libofx-0.8.2.tar.gz +libofx-0.8.3.tar.gz Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libofx.spec 9 Jan 2007 05:44:08 -0000 1.23 +++ libofx.spec 9 Jan 2007 17:34:07 -0000 1.24 @@ -1,14 +1,16 @@ Summary: A library for supporting Open Financial Exchange (OFX) Name: libofx -Version: 0.8.2 -Release: 3 +Version: 0.8.3 +Release: 1 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz URL: http://libofx.sourceforge.net/ Group: System Environment/Libraries License: GPL +Patch: libofx-0.8.3-xml++.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: opensp-devel -BuildRequires: curl-devel +BuildRequires: curl-devel +BuildRequires: libxml++-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -30,19 +32,21 @@ %prep %setup -q +%patch -p1 + rm -rf ./doc/ofx_sample_files/CVS chmod 644 ./doc/ofx_sample_files/* %build %configure --with-opensp-libs=%{_libdir} --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool -rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_datadir}/doc +rm -rf $RPM_BUILD_ROOT/%{_libdir}/*a $RPM_BUILD_ROOT/%{_datadir}/doc %clean rm -rf $RPM_BUILD_ROOT @@ -66,6 +70,10 @@ %{_libdir}/*.so %changelog +* Tue Jan 9 2007 Bill Nottingham - 0.8.3-1 +- update to 0.8.3 +- buildreq libxml++ for the ofxconnect debugger + * Mon Jan 8 2007 Bill Nottingham - 0.8.2-3 - spec tweaks Index: sources =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Aug 2006 20:42:27 -0000 1.5 +++ sources 9 Jan 2007 17:34:07 -0000 1.6 @@ -1 +1,2 @@ b860894c1e3da7f58ce5d92e064d0e85 libofx-0.8.2.tar.gz +26ef343ebf93dc6351c889a402e10d89 libofx-0.8.3.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 9 17:41:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 12:41:22 -0500 Subject: rpms/libofx/devel libofx.spec,1.24,1.25 Message-ID: <200701091741.l09HfM2k002047@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2023 Modified Files: libofx.spec Log Message: tweak Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libofx.spec 9 Jan 2007 17:34:07 -0000 1.24 +++ libofx.spec 9 Jan 2007 17:41:20 -0000 1.25 @@ -1,3 +1,6 @@ +# pending discussion with upstream +%define with_xml 0 + Summary: A library for supporting Open Financial Exchange (OFX) Name: libofx Version: 0.8.3 @@ -10,7 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: opensp-devel BuildRequires: curl-devel +%if %{with_xml} BuildRequires: libxml++-devel +BuildRequires: autoconf +%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -32,7 +38,10 @@ %prep %setup -q +%if %{with_xml} %patch -p1 +autoconf +%endif rm -rf ./doc/ofx_sample_files/CVS chmod 644 ./doc/ofx_sample_files/* @@ -72,7 +81,7 @@ %changelog * Tue Jan 9 2007 Bill Nottingham - 0.8.3-1 - update to 0.8.3 -- buildreq libxml++ for the ofxconnect debugger +- add in (not used) xml++ support pending upstream * Mon Jan 8 2007 Bill Nottingham - 0.8.2-3 - spec tweaks From fedora-cvs-commits at redhat.com Tue Jan 9 18:46:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 13:46:20 -0500 Subject: rpms/iptables/devel iptables-1.3.7-nolibnsl.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 iptables.spec, 1.43, 1.44 sources, 1.18, 1.19 iptables-1.2.8-nolibnsl.patch, 1.1, NONE Message-ID: <200701091846.l09IkKxu010326@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/iptables/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8287 Modified Files: .cvsignore iptables.spec sources Added Files: iptables-1.3.7-nolibnsl.patch Removed Files: iptables-1.2.8-nolibnsl.patch Log Message: [tw] - new verison 1.3.7 - iptc is not a public interface and therefore not installed anymore - dropped upstream secmark patch iptables-1.3.7-nolibnsl.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE iptables-1.3.7-nolibnsl.patch --- --- iptables-1.3.7/Makefile.nolibnsl 2006-12-04 12:16:01.000000000 +0100 +++ iptables-1.3.7/Makefile 2007-01-09 19:34:28.000000000 +0100 @@ -103,7 +103,7 @@ STATIC_LIBS = STATIC6_LIBS = LDFLAGS = -rdynamic -LDLIBS = -ldl -lnsl +LDLIBS = -ldl ifeq ($(DO_SELINUX), 1) LDLIBS += -lselinux endif Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/iptables/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 2 Feb 2006 13:24:00 -0000 1.18 +++ .cvsignore 9 Jan 2007 18:46:18 -0000 1.19 @@ -4,3 +4,4 @@ iptables-1.3.2.tar.bz2 iptables-1.3.4.tar.bz2 iptables-1.3.5.tar.bz2 +iptables-1.3.7.tar.bz2 Index: iptables.spec =================================================================== RCS file: /cvs/dist/rpms/iptables/devel/iptables.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- iptables.spec 19 Sep 2006 15:36:43 -0000 1.43 +++ iptables.spec 9 Jan 2007 18:46:18 -0000 1.44 @@ -2,19 +2,18 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities. -Version: 1.3.5 -Release: 2 +Version: 1.3.7 +Release: 1 Source: http://www.netfilter.org/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config -Patch2: iptables-1.2.8-nolibnsl.patch +Patch2: iptables-1.3.7-nolibnsl.patch Patch4: iptables-1.2.9-netlink.patch Patch5: iptables-1.3.0-selinux.patch Patch6: iptables-1.2.10-counters.patch Patch8: iptables-1.3.0-cleanup.patch Patch9: iptables-1.3.0-autoload.patch Patch10: iptables-1.3.0-no_root.patch -Patch11: iptables-1.3.5-secmark.patch Group: System Environment/Base URL: http://www.netfilter.org/ BuildRoot: %{_tmppath}/%{name}-buildroot @@ -69,7 +68,6 @@ %patch8 -p1 -b .cleanup %patch9 -p1 -b .autoload %patch10 -p1 -b .no_root -%patch11 -p1 -b .secmark # Put it to a reasonable place find . -type f -exec perl -pi -e "s,/usr/local,%{prefix},g" {} \; @@ -150,11 +148,15 @@ %{_includedir}/ip*.h %{_includedir}/libipq.h %{_libdir}/libipq.a -%{_libdir}/libiptc.a %{_mandir}/man3/* %endif %changelog +* Tue Jan 9 2007 Thomas Woerner 1.3.7-1 +- new verison 1.3.7 +- iptc is not a public interface and therefore not installed anymore +- dropped upstream secmark patch + * Thu Sep 19 2006 Thomas Woerner 1.3.5-2 - added secmark iptables patches (#201573) Index: sources =================================================================== RCS file: /cvs/dist/rpms/iptables/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 2 Feb 2006 13:24:00 -0000 1.18 +++ sources 9 Jan 2007 18:46:18 -0000 1.19 @@ -1 +1 @@ -00fb916fa8040ca992a5ace56d905ea5 iptables-1.3.5.tar.bz2 +dd965bdacbb86ce2a6498829fddda6b7 iptables-1.3.7.tar.bz2 --- iptables-1.2.8-nolibnsl.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 19:09:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 14:09:43 -0500 Subject: rpms/libsemanage/FC-6 libsemanage-rhat.patch, 1.17, 1.18 libsemanage.spec, 1.111, 1.112 sources, 1.70, 1.71 Message-ID: <200701091909.l09J9hhV014116@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14065 Modified Files: libsemanage-rhat.patch libsemanage.spec sources Log Message: * Fri Dec 22 2006 Dan Walsh - 1.9.2-1 - Upgrade to latest from NSA * Merged patch to optionally reduce disk usage by removing the backup module store and linked policy from Karl MacMillan * Merged patch to correctly propagate return values in libsemanage libsemanage-rhat.patch: direct_api.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-6/libsemanage-rhat.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libsemanage-rhat.patch 29 Sep 2006 14:43:48 -0000 1.17 +++ libsemanage-rhat.patch 9 Jan 2007 19:09:41 -0000 1.18 @@ -1,13 +1,70 @@ ---- libsemanage-1.6.16/src/semanage_store.c~ 2006-08-23 13:57:48.000000000 -0400 -+++ libsemanage-1.6.16/src/semanage_store.c 2006-09-29 10:41:08.000000000 -0400 -@@ -1106,6 +1106,10 @@ - goto skip_reload; - } +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-1.9.1/src/direct_api.c +--- nsalibsemanage/src/direct_api.c 2006-11-16 17:14:02.000000000 -0500 ++++ libsemanage-1.9.1/src/direct_api.c 2006-12-22 11:36:55.000000000 -0500 +@@ -603,7 +603,8 @@ + + /* Create new policy object, then attach to policy databases + * that work with a policydb */ +- if (semanage_expand_sandbox(sh, base, &out) < 0) ++ retval = semanage_expand_sandbox(sh, base, &out); ++ if (retval < 0) + goto cleanup; + + dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase, +@@ -615,13 +616,16 @@ + + /* ============= Apply changes, and verify =============== */ + +- if (semanage_base_merge_components(sh) < 0) ++ retval = semanage_base_merge_components(sh); ++ if (retval < 0) + goto cleanup; +- +- if (semanage_write_policydb(sh, out) < 0) ++ ++ retval = semanage_write_policydb(sh, out); ++ if (retval < 0) + goto cleanup; +- +- if (semanage_verify_kernel(sh) != 0) ++ ++ retval = semanage_verify_kernel(sh); ++ if (retval < 0) + goto cleanup; + } + +@@ -635,26 +639,30 @@ + * merged into the main file_contexts. We won't check the + * large file_contexts - checked at compile time */ + if (sh->do_rebuild || modified || fcontexts_modified) { +- if (semanage_fcontext_validate_local(sh, out) < 0) ++ retval = semanage_fcontext_validate_local(sh, out); ++ if (retval < 0) + goto cleanup; } -+ else -+ if (errno == ENOENT && -+ strcmp(really_active_store, storepath) != 0) -+ goto skip_reload; - if (semanage_reload_policy(sh)) { + /* Validate local seusers against policy */ + if (sh->do_rebuild || modified || seusers_modified) { +- if (semanage_seuser_validate_local(sh, out) < 0) ++ retval = semanage_seuser_validate_local(sh, out); ++ if (retval < 0) + goto cleanup; + } + + /* Validate local ports for overlap */ + if (sh->do_rebuild || ports_modified) { +- if (semanage_port_validate_local(sh) < 0) ++ retval = semanage_port_validate_local(sh); ++ if (retval < 0) + goto cleanup; + } + + /* ================== Write non-policydb components ========= */ + + /* Commit changes to components */ +- if (semanage_commit_components(sh) < 0) ++ retval = semanage_commit_components(sh); ++ if (retval < 0) goto cleanup; + + retval = semanage_install_sandbox(sh); Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-6/libsemanage.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- libsemanage.spec 29 Nov 2006 21:04:06 -0000 1.111 +++ libsemanage.spec 9 Jan 2007 19:09:41 -0000 1.112 @@ -2,7 +2,7 @@ %define libselinuxver 1.32-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.9.1 +Version: 1.9.2 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -75,6 +75,18 @@ %{_mandir}/man3/* %changelog +* Fri Dec 22 2006 Dan Walsh - 1.9.2-1 +- Upgrade to latest from NSA + * Merged patch to optionally reduce disk usage by removing + the backup module store and linked policy from Karl MacMillan + * Merged patch to correctly propagate return values in libsemanage + +* Fri Dec 22 2006 Dan Walsh - 1.9.1-3 +- Apply Karl MacMillan patch to get proper error codes. + +* Thu Dec 7 2006 Jeremy Katz - 1.9.1-2 +- rebuild against python 2.5 + * Tue Nov 28 2006 Dan Walsh - 1.9.1-1 - Upgrade to latest from NSA * Merged patch to compile wit -fPIC instead of -fpic from Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-6/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 29 Nov 2006 21:04:06 -0000 1.70 +++ sources 9 Jan 2007 19:09:41 -0000 1.71 @@ -1 +1 @@ -e2fd66d32b97b0814c0cd2db34c1ec2f libsemanage-1.9.1.tgz +c5bf4a31d5b39958587cec079c93cfee libsemanage-1.9.2.tgz From fedora-cvs-commits at redhat.com Tue Jan 9 19:11:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 14:11:54 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.142, 1.143 Message-ID: <200701091911.l09JBswC015961@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15766 Modified Files: evolution-data-server.spec Log Message: * Mon Jan 09 2007 Matthew Barnes - 1.9.5-2.fc7 - Require libsoup-devel in devel subpackage (RH bug #152482). Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- evolution-data-server.spec 9 Jan 2007 01:46:01 -0000 1.142 +++ evolution-data-server.spec 9 Jan 2007 19:11:52 -0000 1.143 @@ -140,6 +140,7 @@ Requires: %{name} = %{version}-%{release} Requires: libbonobo-devel Requires: libgnome-devel +Requires: libsoup-devel %description devel Development files needed for building things which link against @@ -379,6 +380,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Mon Jan 09 2007 Matthew Barnes - 1.9.5-2.fc7 +- Require libsoup-devel in devel subpackage (RH bug #152482). + * Mon Jan 08 2007 Matthew Barnes - 1.9.5-1.fc7 - Update to 1.9.5 - Remove patch for GNOME bug #362638 (fixed upstream). From fedora-cvs-commits at redhat.com Tue Jan 9 19:12:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 14:12:17 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.143, 1.144 Message-ID: <200701091912.l09JCHMM016270@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16156 Modified Files: evolution-data-server.spec Log Message: - Forgot to bump release. Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- evolution-data-server.spec 9 Jan 2007 19:11:52 -0000 1.143 +++ evolution-data-server.spec 9 Jan 2007 19:12:15 -0000 1.144 @@ -25,7 +25,7 @@ Name: evolution-data-server Version: 1.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution From fedora-cvs-commits at redhat.com Tue Jan 9 19:23:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 14:23:04 -0500 Subject: rpms/file/devel file-4.19-ELF.patch, NONE, 1.1 file-4.19-debian.patch, NONE, 1.1 file-4.19-magic.patch, NONE, 1.1 file-4.19-oracle.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 file.spec, 1.55, 1.56 sources, 1.16, 1.17 file-4.10-debian.patch, 1.2, NONE file-4.12-core64.patch, 1.1, NONE file-4.17-init-mem.patch, 1.1, NONE file-4.17-magic.patch, 1.1, NONE file-4.17-mp3_flac.patch, 1.1, NONE file-4.17-oracle.patch, 1.1, NONE file-4.17-wctype-header.patch, 1.1, NONE Message-ID: <200701091923.l09JN4OP012611@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12364 Modified Files: .cvsignore file.spec sources Added Files: file-4.19-ELF.patch file-4.19-debian.patch file-4.19-magic.patch file-4.19-oracle.patch Removed Files: file-4.10-debian.patch file-4.12-core64.patch file-4.17-init-mem.patch file-4.17-magic.patch file-4.17-mp3_flac.patch file-4.17-oracle.patch file-4.17-wctype-header.patch Log Message: * Tue Jan 9 2007 Martin Bacovsky - 4.19-1.fc7 - Resolves: #208880 - Pointless file(1) error message while detecting ELF 64-bit file thanks to for patch - Resolves: #214992 - file-devel should own %_includedir/* %_libdir/lib*.so - Resolves: #203548 - a -devel package should be split out for libmagic - upgrade to new upstream 4.19 - patch revision and cleaning - split package to file, file-devel and file-libs file-4.19-ELF.patch: readelf.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) --- NEW FILE file-4.19-ELF.patch --- --- file-4.19/src/readelf.c.ELF 2007-01-09 19:47:26.000000000 +0100 +++ file-4.19/src/readelf.c 2007-01-09 19:50:35.000000000 +0100 @@ -45,7 +45,7 @@ off_t, int *); #endif private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t, - off_t, int *); + off_t, int *, int); private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, int *); private size_t donote(struct magic_set *, unsigned char *, size_t, size_t, int, int, size_t, int *); @@ -785,7 +785,7 @@ */ private int dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off, - int num, size_t size, off_t fsize, int *flags) + int num, size_t size, off_t fsize, int *flags, int sh_num) { Elf32_Phdr ph32; Elf64_Phdr ph64; @@ -854,6 +854,19 @@ return -1; align = 4; } + /* If we have a section header table, handle note + sections just in doshn. Handling them also here + means that for executables we print the note content + twice and, more importantly, don't handle + strip -o created debuginfo files correctly. + They have PT_NOTE header, but the actual note + content is not present in the debuginfo file, + only in the original stripped executable or library. + The corresponding .note.* section is SHT_NOBITS + rather than SHT_NOTE, so doshn will not look + at it. */ + if (sh_num) + break; /* * This is a PT_NOTE section; loop through all the notes * in the section. @@ -960,7 +973,8 @@ fd, (off_t)getu32(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize), - fsize, &flags) + fsize, &flags, + getu16(swap, elfhdr.e_shnum)) == -1) return -1; } @@ -1001,7 +1015,8 @@ (off_t)elf_getu64(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize), - fsize, &flags) == -1) + fsize, &flags, + getu16(swap, elfhdr.e_shnum)) == -1) return -1; } if (doshn(ms, class, swap, fd, file-4.19-debian.patch: magic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE file-4.19-debian.patch --- --- file-4.19/src/magic.c.debian 2007-01-09 17:40:50.000000000 +0100 +++ file-4.19/src/magic.c 2007-01-09 17:42:29.000000000 +0100 @@ -238,7 +238,7 @@ int fd = 0; int rv = -1; unsigned char *buf; - struct stat sb; + struct stat sb, *st = &sb; ssize_t nbytes = 0; /* number of bytes read from a datafile */ int ispipe = 0; @@ -253,7 +253,7 @@ if (file_reset(ms) == -1) goto done; - switch (file_fsmagic(ms, inname, &sb)) { + switch (file_fsmagic(ms, inname, st)) { case -1: /* error */ goto done; case 0: /* nothing found */ file-4.19-magic.patch: magic/Magdir/apple | 17 +++++++++++++++++ magic/Magdir/images | 6 ++++++ magic/Magdir/revision | 6 ++++++ magic/magic.mime | 26 +++++++++++++++----------- src/fsmagic.c | 3 ++- 5 files changed, 46 insertions(+), 12 deletions(-) --- NEW FILE file-4.19-magic.patch --- --- file-4.19/magic/Magdir/revision.magic 2007-01-09 17:49:30.000000000 +0100 +++ file-4.19/magic/Magdir/revision 2007-01-09 17:59:01.000000000 +0100 @@ -3,3 +3,9 @@ # file(1) magic for revision control files # From Hendrik Scholz 0 string /1\ :pserver: cvs password text file + + +# Subversion (SVN) dumps +# Uwe Zeisberger +0 string SVN-fs-dump-format-version: Subversion dumpfile +>28 string >\0 (version: %s) --- file-4.19/magic/Magdir/images.magic 2007-01-09 17:49:12.000000000 +0100 +++ file-4.19/magic/Magdir/images 2007-01-09 17:57:07.000000000 +0100 @@ -524,6 +524,12 @@ 0 belong 0x0e031301 Hierarchical Data Format (version 4) data 0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data +# The boot loaders syslinux and isolinux use a RLE based image format +# called SLL16 to store splash screens. +0 lelong 0x1413f33d Syslinux SLL16 image data, +>4 leshort >0 %hd x +>6 leshort >0 %hd + # From: Tobias Burnus # Xara (for a while: Corel Xara) is a graphic package, see # http://www.xara.com/ for Windows and as GPL application for --- file-4.19/magic/Magdir/apple.magic 2007-01-09 17:48:49.000000000 +0100 +++ file-4.19/magic/Magdir/apple 2007-01-09 17:54:25.000000000 +0100 @@ -10,6 +10,23 @@ 0 belong 0x00051600 AppleSingle encoded Macintosh file 0 belong 0x00051607 AppleDouble encoded Macintosh file +# Apple Emulator 2IMG format +# +0 string 2IMG Apple ][ 2IMG Disk Image +>4 string XGS! \b, XGS +>4 string CTKG \b, Catakig +>4 string ShIm \b, Sheppy's ImageMaker +>4 string WOOF \b, Sweet 16 +>4 string B2TR \b, Bernie ][ the Rescue +>4 string !nfc \b, ASIMOV2 +>4 string x \b, Unknown Format +>0xc byte 00 \b, DOS 3.3 sector order +>>0x10 byte 00 \b, Volume 254 +>>0x10 byte&0x7f x \b, Volume %u +>0xc byte 01 \b, ProDOS sector order +>>0x14 short x \b, %u Blocks +>0xc byte 02 \b, NIB data + # magic for Newton PDA package formats # from Ruda Moura 0 string package0 Newton package, NOS 1.x, --- file-4.19/magic/magic.mime.magic 2007-01-09 17:49:55.000000000 +0100 +++ file-4.19/magic/magic.mime 2007-01-09 18:08:43.000000000 +0100 @@ -193,7 +193,7 @@ 0 beshort 0x4De1 audio/MP4A-LATM # MPEG Layer 3 sound files -0 beshort &0xffe0 audio/mpeg +0 beshort&0xfffe =0xfffa audio/mpeg #MP3 with ID3 tag 0 string ID3 audio/mpeg # Ogg/Vorbis @@ -397,16 +397,14 @@ # # from Daniel Quinlan # -0 string \14 byte 12 (OS/2 1.x format) #>14 byte 64 (OS/2 2.x format) #>14 byte 40 (Windows 3.x format) @@ -924,6 +922,12 @@ 0 string fLaC audio/x-flac 0 string CWS application/x-shockwave-flash + +# Gnumeric spreadsheet +# This entry is only semi-helpful, as Gnumeric compresses its files, so +# they will ordinarily reported as "compressed", but at least -z helps +39 string = --- file-4.19/src/fsmagic.c.magic 2007-01-09 17:47:35.000000000 +0100 +++ file-4.19/src/fsmagic.c 2007-01-09 17:51:23.000000000 +0100 @@ -92,7 +92,8 @@ if (file_printf(ms, "cannot open `%s' (%s)", fn, strerror(errno)) == -1) return -1; - return 1; + ms->haderr++; + return -1; } if ((ms->flags & MAGIC_MIME) != 0) { file-4.19-oracle.patch: filesystems | 13 +++++++++++++ 1 files changed, 13 insertions(+) --- NEW FILE file-4.19-oracle.patch --- --- file-4.19/magic/Magdir/filesystems.oracle 2007-01-09 18:14:04.000000000 +0100 +++ file-4.19/magic/Magdir/filesystems 2007-01-09 18:15:15.000000000 +0100 @@ -979,6 +979,19 @@ >>>>>>>>&0 bedate =0 full dump >>>>>>>>&0 bedate !0 incremental since: %s +# Oracle Clustered Filesystem - Aaron Botsis +8 string OracleCFS Oracle Clustered Filesystem, +>4 long x rev %d +>0 long x \b.%d, +>560 string x label: %.64s, +>136 string x mountpoint: %.128s + +# Oracle ASM tagged volume - Aaron Botsis +32 string ORCLDISK Oracle ASM Volume, +>40 string x Disk Name: %0.12s +32 string ORCLCLRD Oracle ASM Volume (cleared), +>40 string x Disk Name: %0.12s + # VMS backup savesets - gerardo.cacciari at gmail.com # had to comment out GEM Image and G3 raw data entries due to conflict #0 byte x Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Mar 2006 07:28:43 -0000 1.16 +++ .cvsignore 9 Jan 2007 19:23:01 -0000 1.17 @@ -1 +1 @@ -file-4.17.tar.gz +file-4.19.tar.gz Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/devel/file.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- file.spec 23 Aug 2006 16:14:07 -0000 1.55 +++ file.spec 9 Jan 2007 19:23:02 -0000 1.56 @@ -2,27 +2,28 @@ Summary: A utility for determining file types. Name: file -Version: 4.17 -Release: 8 +Version: 4.19 +Release: 1%{?dist} License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ -Patch1: file-4.10-debian.patch +Patch1: file-4.19-debian.patch Patch2: file-selinux.patch -Patch3: file-4.17-magic.patch +Patch3: file-4.19-magic.patch Patch5: file-4.13-fsdump.patch 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 -Patch16: file-4.17-oracle.patch +Patch16: file-4.19-oracle.patch Patch17: file-4.17-clamav.patch Patch18: file-4.17-powerpoint.patch -Patch19: file-4.17-empty.patch Patch20: file-4.17-bash.patch +Patch21: file-4.19-ELF.patch + +#Patch19: file-4.17-empty.patch + +Requires: file-libs = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -35,6 +36,23 @@ You should install the file package, since the file command is such a useful utility. +%package libs +Summary: Libraries for applications using libmagic +Group: Applications/File + +%description libs + +Libraries for applications using the bzip2 compression format. +%package devel +Summary: Libraries and header files for file development +Group: Applications/File +Requires: %{name} = %{version} + +%description devel +The file-devel package contains the header files and libmagic library +necessary for developing programs using libmagic. + + %prep %setup -q %patch1 -p1 -b .debian @@ -44,14 +62,12 @@ %patch6 -p1 -b .quick %patch8 -p1 -b .berkeley %patch12 -p1 -b .xen -%patch13 -p1 -b .mem -%patch14 -p1 -b .wctype -%patch15 -p1 -b .mp3 %patch16 -p1 -b .oracle %patch17 -p1 -b .clamav %patch18 -p1 -b .powerpoint -%patch19 -p1 -b .empty +#%patch19 -p1 -b .empty %patch20 -p1 -b .bash +%patch21 -p1 -b .ELF iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -92,11 +108,28 @@ %{_datadir}/misc/* %{_mandir}/man[15]/* -%{_includedir}/magic.h +%files libs +%defattr(-,root,root) +%{_libdir}/*so.* %{_mandir}/man3/* -%{_libdir}/libmagic.* + +%files devel +%defattr(0644, root, root, 0755) +%attr(755,root,root) %{_libdir}/*.a +%attr(755,root,root) %{_libdir}/*.so +%{_includedir}/magic.h + %changelog +* Tue Jan 9 2007 Martin Bacovsky - 4.19-1.fc7 +- Resolves: #208880 - Pointless file(1) error message while detecting ELF 64-bit file + thanks to for patch +- Resolves: #214992 - file-devel should own %_includedir/* %_libdir/lib*.so +- Resolves: #203548 - a -devel package should be split out for libmagic +- upgrade to new upstream 4.19 +- patch revision and cleaning +- split package to file, file-devel and file-libs + * Wed Aug 23 2006 Martin Bacovsky - 4.17-8 - fix recognition of perl script with embed awk (#203610) Index: sources =================================================================== RCS file: /cvs/dist/rpms/file/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Mar 2006 07:28:43 -0000 1.16 +++ sources 9 Jan 2007 19:23:02 -0000 1.17 @@ -1 +1 @@ -50919c65e0181423d66bb25d7fe7b0fd file-4.17.tar.gz +a61ef3aa8339d5987148089afde25f60 file-4.19.tar.gz --- file-4.10-debian.patch DELETED --- --- file-4.12-core64.patch DELETED --- --- file-4.17-init-mem.patch DELETED --- --- file-4.17-magic.patch DELETED --- --- file-4.17-mp3_flac.patch DELETED --- --- file-4.17-oracle.patch DELETED --- --- file-4.17-wctype-header.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 19:29:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 14:29:32 -0500 Subject: rpms/coreutils/devel coreutils-6.7.tar.bz2.sig, NONE, 1.1 .cvsignore, 1.10, 1.11 coreutils-5.2.1-runuser.patch, 1.14, 1.15 coreutils-getgrouplist.patch, 1.2, 1.3 coreutils-i18n.patch, 1.19, 1.20 coreutils-pam.patch, 1.9, 1.10 coreutils-selinux.patch, 1.29, 1.30 coreutils-setsid.patch, 1.2, 1.3 coreutils.spec, 1.153, 1.154 sources, 1.11, 1.12 coreutils-acl.patch, 1.3, NONE coreutils-afs.patch, 1.1, NONE coreutils-autoconf.patch, 1.1, NONE coreutils-df-cifs.patch, 1.1, NONE coreutils-newhashes.patch, 1.1, NONE coreutils-rename.patch, 1.1, NONE coreutils-sort-compatibility.patch, 1.1, NONE fileutils-4.1.10-timestyle.patch, 1.1, NONE Message-ID: <200701091929.l09JTWnI017655@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17454 Modified Files: .cvsignore coreutils-5.2.1-runuser.patch coreutils-getgrouplist.patch coreutils-i18n.patch coreutils-pam.patch coreutils-selinux.patch coreutils-setsid.patch coreutils.spec sources Added Files: coreutils-6.7.tar.bz2.sig Removed Files: coreutils-acl.patch coreutils-afs.patch coreutils-autoconf.patch coreutils-df-cifs.patch coreutils-newhashes.patch coreutils-rename.patch coreutils-sort-compatibility.patch fileutils-4.1.10-timestyle.patch Log Message: * Tue Jan 9 2007 Tim Waugh 6.7-1 - 6.7. No longer need sort-compatibility, rename, newhashes, timestyle, acl, df-cifs, afs or autoconf patches. --- NEW FILE coreutils-6.7.tar.bz2.sig --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBFeKRc/dLerNMzy6ERAiEJAJ435eWCOpfJkoCKoSpnh8Fwwb9XugCgnQ5H SYg6l7M/jyvUdsFM1yS4RKk= =GOOc -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 25 Jun 2006 23:15:00 -0000 1.10 +++ .cvsignore 9 Jan 2007 19:29:30 -0000 1.11 @@ -5,3 +5,4 @@ coreutils-5.95.tar.bz2 coreutils-5.96.tar.bz2 coreutils-5.97.tar.bz2 +coreutils-6.7.tar.bz2 coreutils-5.2.1-runuser.patch: AUTHORS | 1 README | 2 man/Makefile.am | 3 - man/runuser.1 | 68 +++++++++++++++++++++++++++++++ man/runuser.x | 4 + src/Makefile.am | 8 ++- src/su.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++----- tests/help-version | 1 8 files changed, 190 insertions(+), 13 deletions(-) Index: coreutils-5.2.1-runuser.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- coreutils-5.2.1-runuser.patch 2 Jan 2007 13:15:38 -0000 1.14 +++ coreutils-5.2.1-runuser.patch 9 Jan 2007 19:29:30 -0000 1.15 @@ -1,6 +1,27 @@ ---- coreutils-5.97/src/su.c.runuser 2006-07-21 14:32:13.000000000 +0100 -+++ coreutils-5.97/src/su.c 2006-07-21 15:40:16.000000000 +0100 -@@ -132,9 +132,15 @@ +--- coreutils-6.7/tests/help-version.runuser 2006-12-07 09:06:04.000000000 +0000 ++++ coreutils-6.7/tests/help-version 2007-01-09 17:31:44.000000000 +0000 +@@ -168,6 +168,7 @@ + seq_args=10 + sleep_args=0 + su_args=--version ++runuser_args=--version + + # I'd rather not run sync, since it spins up disks that I've + # deliberately caused to spin down (but not unmounted). +--- coreutils-6.7/README.runuser 2006-11-24 21:28:27.000000000 +0000 ++++ coreutils-6.7/README 2007-01-09 17:32:16.000000000 +0000 +@@ -11,7 +11,7 @@ + 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 seq sha1sum sha224sum sha256sum ++ printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum sha256sum + sha384sum sha512sum shred shuf 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-6.7/src/su.c.runuser 2007-01-09 17:27:56.000000000 +0000 ++++ coreutils-6.7/src/su.c 2007-01-09 17:30:12.000000000 +0000 +@@ -110,9 +110,15 @@ #include "error.h" /* The official name of this program (e.g., no `g' prefix). */ @@ -16,7 +37,7 @@ #if HAVE_PATHS_H # include -@@ -172,6 +178,10 @@ +@@ -150,6 +156,10 @@ #ifndef USE_PAM char *crypt (); #endif @@ -24,10 +45,10 @@ +#define CHECKPASSWD 1 +#endif + - char *getpass (); char *getusershell (); void endusershell (); -@@ -180,7 +190,11 @@ + void setusershell (); +@@ -157,7 +167,11 @@ extern char **environ; static void run_shell (char const *, char const *, char **, size_t, @@ -40,7 +61,7 @@ #ifdef USE_PAM ; #else -@@ -210,6 +224,10 @@ +@@ -187,6 +201,10 @@ {"login", no_argument, NULL, 'l'}, {"preserve-environment", no_argument, NULL, 'p'}, {"shell", required_argument, NULL, 's'}, @@ -51,7 +72,7 @@ {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} -@@ -307,10 +325,12 @@ +@@ -288,10 +306,12 @@ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); PAM_BAIL_P; @@ -64,7 +85,7 @@ caller = getpwuid(getuid()); if(caller != NULL && caller->pw_name != NULL) { -@@ -327,6 +347,11 @@ +@@ -308,6 +328,11 @@ retval = pam_set_item(pamh, PAM_TTY, tty_name); PAM_BAIL_P; } @@ -76,7 +97,7 @@ retval = pam_authenticate(pamh, 0); PAM_BAIL_P; retval = pam_acct_mgmt(pamh, 0); -@@ -336,6 +361,7 @@ +@@ -317,6 +342,7 @@ PAM_BAIL_P; } PAM_BAIL_P; @@ -84,7 +105,7 @@ /* must be authenticated if this point was reached */ return 1; #else /* !USE_PAM */ -@@ -417,11 +443,22 @@ +@@ -398,11 +424,22 @@ /* Become the user and group(s) specified by PW. */ static void @@ -109,7 +130,7 @@ #ifdef USE_PAM pam_close_session(pamh, 0); pam_end(pamh, PAM_ABORT); -@@ -468,7 +505,11 @@ +@@ -449,7 +486,11 @@ static void run_shell (char const *shell, char const *command, char **additional_args, @@ -122,7 +143,7 @@ { size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; char const **args = xnmalloc (n_args, sizeof *args); -@@ -499,7 +540,11 @@ +@@ -480,7 +521,11 @@ child = fork(); if (child == 0) { /* child shell */ @@ -135,7 +156,7 @@ pam_end(pamh, 0); if (!same_session) setsid (); -@@ -676,6 +721,12 @@ +@@ -657,6 +702,12 @@ char *shell = NULL; struct passwd *pw; struct passwd pw_copy; @@ -148,7 +169,7 @@ initialize_main (&argc, &argv); program_name = argv[0]; -@@ -690,7 +741,11 @@ +@@ -671,7 +722,11 @@ simulate_login = false; change_environment = true; @@ -161,7 +182,7 @@ { switch (optc) { -@@ -720,6 +775,28 @@ +@@ -701,6 +756,28 @@ shell = optarg; break; @@ -190,7 +211,7 @@ case_GETOPT_HELP_CHAR; case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); -@@ -758,7 +835,20 @@ +@@ -739,7 +816,20 @@ : DEFAULT_SHELL); endpwent (); @@ -212,7 +233,7 @@ { #ifdef SYSLOG_FAILURE log_su (pw, false); -@@ -790,8 +880,16 @@ +@@ -771,8 +861,16 @@ modify_environment (pw, shell); #ifndef USE_PAM @@ -231,8 +252,8 @@ +#endif + ); } ---- coreutils-5.97/src/Makefile.am.runuser 2006-07-21 14:32:13.000000000 +0100 -+++ coreutils-5.97/src/Makefile.am 2006-07-21 14:32:13.000000000 +0100 +--- coreutils-6.7/src/Makefile.am.runuser 2007-01-09 17:27:56.000000000 +0000 ++++ coreutils-6.7/src/Makefile.am 2007-01-09 17:27:56.000000000 +0000 @@ -17,7 +17,7 @@ ## along with this program; if not, write to the Free Software Foundation, ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -242,9 +263,9 @@ bin_SCRIPTS = groups bin_PROGRAMS = [ chgrp chown chmod cp dd dircolors du \ -@@ -94,6 +94,10 @@ - - su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@ +@@ -112,6 +112,10 @@ + mv_LDADD += $(LIB_ACL) + ginstall_LDADD += $(LIB_ACL) +runuser_SOURCES = su.c +runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\"" @@ -253,7 +274,7 @@ $(PROGRAMS): ../lib/libcoreutils.a SUFFIXES = .sh -@@ -108,7 +112,7 @@ +@@ -126,7 +130,7 @@ chmod +x $@-t mv $@-t $@ @@ -262,18 +283,8 @@ installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` ---- coreutils-5.97/tests/help-version.runuser 2006-06-01 08:26:09.000000000 +0100 -+++ coreutils-5.97/tests/help-version 2006-07-21 14:32:13.000000000 +0100 -@@ -137,6 +137,7 @@ - seq_args=10 - sleep_args=0 - su_args=--version -+runuser_args=--version - test_args=foo - - # This is necessary in the unusual event that there is ---- coreutils-5.97/AUTHORS.runuser 2006-07-21 14:32:13.000000000 +0100 -+++ coreutils-5.97/AUTHORS 2006-07-21 14:32:13.000000000 +0100 +--- coreutils-6.7/AUTHORS.runuser 2006-10-22 17:54:15.000000000 +0100 ++++ coreutils-6.7/AUTHORS 2007-01-09 17:27:56.000000000 +0000 @@ -60,6 +60,7 @@ readlink: Dmitry V. Levin rm: Paul Rubin, David MacKenzie, Richard Stallman, Jim Meyering @@ -282,26 +293,34 @@ seq: Ulrich Drepper sha1sum: Ulrich Drepper, Scott Miller, David Madore sha224sum: Ulrich Drepper, Scott Miller, David Madore ---- coreutils-5.97/README.runuser 2006-07-21 14:32:13.000000000 +0100 -+++ coreutils-5.97/README 2006-07-21 14:32:13.000000000 +0100 -@@ -12,7 +12,7 @@ - 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 seq sha1sum sha224sum -+ printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum sha224sum - sha256sum sha384sum sha512sum 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 ---- /dev/null 2006-07-21 09:48:40.571484750 +0100 -+++ coreutils-5.97/man/runuser.x 2006-07-21 14:32:13.000000000 +0100 +--- coreutils-6.7/man/Makefile.am.runuser 2006-11-16 08:49:56.000000000 +0000 ++++ coreutils-6.7/man/Makefile.am 2007-01-09 17:32:38.000000000 +0000 +@@ -26,7 +26,7 @@ + link.1 ln.1 logname.1 \ + ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nl.1 nohup.1 od.1 \ + paste.1 pathchk.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \ +- rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \ ++ rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \ + shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 \ + su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \ + tty.1 unexpand.1 uniq.1 unlink.1 vdir.1 wc.1 \ +@@ -105,6 +105,7 @@ + readlink.1: $(common_dep) $(srcdir)/readlink.x ../src/readlink.c + rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c + rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c ++runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/su.c + seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c + sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c + sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/man/runuser.x 2007-01-09 17:27:56.000000000 +0000 @@ -0,0 +1,4 @@ +[NAME] +runuser \- run a shell with substitute user and group IDs +[DESCRIPTION] +.\" Add any additional description here ---- /dev/null 2006-09-11 09:20:12.657562250 +0100 -+++ coreutils-5.97/man/runuser.1 2006-09-11 13:34:45.000000000 +0100 +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/man/runuser.1 2007-01-09 17:27:56.000000000 +0000 @@ -0,0 +1,68 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. +.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands" @@ -371,22 +390,3 @@ +.B info coreutils su +.PP +should give you access to the complete manual. ---- coreutils-5.97/man/Makefile.am.runuser 2006-07-21 14:32:13.000000000 +0100 -+++ coreutils-5.97/man/Makefile.am 2006-07-21 14:32:13.000000000 +0100 -@@ -7,7 +7,7 @@ - link.1 ln.1 logname.1 \ - ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \ - paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \ -- rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \ -+ rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \ - shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \ - su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \ - tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \ -@@ -83,6 +83,7 @@ - readlink.1: $(common_dep) $(srcdir)/readlink.x ../src/readlink.c - rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c - rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c -+runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/su.c - seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c - sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c - sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c coreutils-getgrouplist.patch: lib/getugroups.c | 4 ++++ m4/jm-macros.m4 | 1 + src/id.c | 26 ++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) Index: coreutils-getgrouplist.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-getgrouplist.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coreutils-getgrouplist.patch 27 Oct 2005 15:05:08 -0000 1.2 +++ coreutils-getgrouplist.patch 9 Jan 2007 19:29:30 -0000 1.3 @@ -1,18 +1,8 @@ ---- coreutils-5.92/m4/jm-macros.m4.getgrouplist 2005-09-25 06:57:46.000000000 +0100 -+++ coreutils-5.92/m4/jm-macros.m4 2005-10-25 14:28:45.000000000 +0100 -@@ -105,6 +105,7 @@ - fchmod \ - fchown \ - ftruncate \ -+ getgrouplist \ - hasmntopt \ - isascii \ - iswspace \ ---- coreutils-5.92/lib/getugroups.c.getgrouplist 2005-09-22 07:47:18.000000000 +0100 -+++ coreutils-5.92/lib/getugroups.c 2005-10-25 14:28:02.000000000 +0100 -@@ -23,6 +23,9 @@ - # include - #endif +--- coreutils-6.7/lib/getugroups.c.getgrouplist 2006-09-14 10:53:58.000000000 +0100 ++++ coreutils-6.7/lib/getugroups.c 2007-01-09 17:33:09.000000000 +0000 +@@ -21,6 +21,9 @@ + + #include +/* We do not need this code if getgrouplist(3) is available. */ +#ifndef HAVE_GETGROUPLIST @@ -20,13 +10,13 @@ #include #include /* grp.h on alpha OSF1 V2.0 uses "FILE *". */ #include -@@ -105,3 +108,4 @@ +@@ -102,3 +105,4 @@ return count; } +#endif /* have getgrouplist */ ---- coreutils-5.92/src/id.c.getgrouplist 2005-08-11 22:02:57.000000000 +0100 -+++ coreutils-5.92/src/id.c 2005-10-25 14:30:41.000000000 +0100 +--- coreutils-6.7/src/id.c.getgrouplist 2006-10-22 17:54:15.000000000 +0100 ++++ coreutils-6.7/src/id.c 2007-01-09 17:33:09.000000000 +0000 @@ -253,7 +253,14 @@ if (!username) max_n_groups = getgroups (0, NULL); @@ -67,3 +57,13 @@ } if (ng < 0) +--- coreutils-6.7/m4/jm-macros.m4.getgrouplist 2006-12-06 11:04:22.000000000 +0000 ++++ coreutils-6.7/m4/jm-macros.m4 2007-01-09 17:33:47.000000000 +0000 +@@ -64,6 +64,7 @@ + fchown \ + fchmod \ + ftruncate \ ++ getgrouplist \ + iswspace \ + mkfifo \ + mbrlen \ coreutils-i18n.patch: lib/linebuffer.h | 8 src/cut.c | 420 +++++++++++++++++++++++++++-- src/expand.c | 161 +++++++++++ src/fold.c | 312 ++++++++++++++++++++-- src/join.c | 348 +++++++++++++++++++++--- src/pr.c | 431 +++++++++++++++++++++++++++--- src/sort.c | 665 ++++++++++++++++++++++++++++++++++++++++++++--- src/unexpand.c | 226 +++++++++++++++ src/uniq.c | 259 +++++++++++++++++- tests/sort/Makefile.am | 8 tests/sort/mb1.I | 4 tests/sort/mb1.X | 4 tests/sort/mb2.I | 4 tests/sort/mb2.X | 4 tests/sort/sort-mb-tests | 58 ++++ 15 files changed, 2732 insertions(+), 180 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.19 -r 1.20 coreutils-i18n.patch Index: coreutils-i18n.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-i18n.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- coreutils-i18n.patch 24 Aug 2006 16:01:11 -0000 1.19 +++ coreutils-i18n.patch 9 Jan 2007 19:29:30 -0000 1.20 @@ -1,5 +1,140 @@ ---- coreutils-5.95/src/expand.c.i18n 2005-08-12 08:16:25.000000000 +0100 -+++ coreutils-5.95/src/expand.c 2006-05-15 15:08:57.000000000 +0100 +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/tests/sort/sort-mb-tests 2007-01-09 17:18:28.000000000 +0000 +@@ -0,0 +1,58 @@ ++#! /bin/sh ++case $# in ++ 0) xx='../../src/sort';; ++ *) xx="$1";; ++esac ++test "$VERBOSE" && echo=echo || echo=: ++$echo testing program: $xx ++errors=0 ++test "$srcdir" || srcdir=. ++test "$VERBOSE" && $xx --version 2> /dev/null ++ ++export LC_ALL=en_US.UTF-8 ++locale -k LC_CTYPE 2>&1 | grep -q charmap.*UTF-8 || exit 77 ++errors=0 ++ ++$xx -t ??? -k2 -n mb1.I > mb1.O ++code=$? ++if test $code != 0; then ++ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2 ++ errors=`expr $errors + 1` ++else ++ cmp mb1.O $srcdir/mb1.X > /dev/null 2>&1 ++ case $? in ++ 0) if test "$VERBOSE"; then $echo "passed mb1"; fi;; ++ 1) $echo "Test mb1 failed: files mb1.O and $srcdir/mb1.X differ" 1>&2 ++ (diff -c mb1.O $srcdir/mb1.X) 2> /dev/null ++ errors=`expr $errors + 1`;; ++ 2) $echo "Test mb1 may have failed." 1>&2 ++ $echo The command "cmp mb1.O $srcdir/mb1.X" failed. 1>&2 ++ errors=`expr $errors + 1`;; ++ esac ++fi ++ ++$xx -t ??? -k4 -n mb2.I > mb2.O ++code=$? ++if test $code != 0; then ++ $echo "Test mb2 failed: $xx return code $code differs from expected value 0" 1>&2 ++ errors=`expr $errors + 1` ++else ++ cmp mb2.O $srcdir/mb2.X > /dev/null 2>&1 ++ case $? in ++ 0) if test "$VERBOSE"; then $echo "passed mb2"; fi;; ++ 1) $echo "Test mb2 failed: files mb2.O and $srcdir/mb2.X differ" 1>&2 ++ (diff -c mb2.O $srcdir/mb2.X) 2> /dev/null ++ errors=`expr $errors + 1`;; ++ 2) $echo "Test mb2 may have failed." 1>&2 ++ $echo The command "cmp mb2.O $srcdir/mb2.X" failed. 1>&2 ++ errors=`expr $errors + 1`;; ++ esac ++fi ++ ++if test $errors = 0; then ++ $echo Passed all 113 tests. 1>&2 ++else ++ $echo Failed $errors tests. 1>&2 ++fi ++test $errors = 0 || errors=1 ++exit $errors +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/tests/sort/mb2.I 2007-01-09 17:18:28.000000000 +0000 +@@ -0,0 +1,4 @@ ++Apple?????????10??????20 ++Banana?????????5??????30 ++Citrus?????????20??????5 ++Cherry?????????30??????10 +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/tests/sort/mb2.X 2007-01-09 17:18:28.000000000 +0000 +@@ -0,0 +1,4 @@ ++Citrus?????????20??????5 ++Cherry?????????30??????10 ++Apple?????????10??????20 ++Banana?????????5??????30 +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/tests/sort/mb1.I 2007-01-09 17:18:28.000000000 +0000 +@@ -0,0 +1,4 @@ ++Apple???10 ++Banana???5 ++Citrus???20 ++Cherry???30 +--- /dev/null 2007-01-09 09:38:07.860075128 +0000 ++++ coreutils-6.7/tests/sort/mb1.X 2007-01-09 17:18:28.000000000 +0000 +@@ -0,0 +1,4 @@ ++Banana???5 ++Apple???10 ++Citrus???20 ++Cherry???30 +--- coreutils-6.7/tests/sort/Makefile.am.i18n 2006-10-22 17:54:15.000000000 +0100 ++++ coreutils-6.7/tests/sort/Makefile.am 2007-01-09 17:25:00.000000000 +0000 +@@ -64,14 +64,16 @@ + nul-tab.E + ##test-files-end + +-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) +-noinst_SCRIPTS = $x-tests ++run_gen += mb1.0 mb2.0 ++ ++EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) mb1.I mb1.X mb2.I mb2.X ++noinst_SCRIPTS = $x-tests # $x-mb-tests + TESTS_ENVIRONMENT = \ + PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" + + editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' + +-TESTS = $x-tests ++TESTS = $x-tests $x-mb-tests + + mk_script = $(srcdir)/../mk-script + $(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am +--- coreutils-6.7/lib/linebuffer.h.i18n 2005-05-14 07:44:24.000000000 +0100 ++++ coreutils-6.7/lib/linebuffer.h 2007-01-09 17:18:28.000000000 +0000 +@@ -22,6 +22,11 @@ + + # include + ++/* Get mbstate_t. */ ++# if HAVE_WCHAR_H ++# include ++# endif ++ + /* A `struct linebuffer' holds a line of text. */ + + struct linebuffer +@@ -29,6 +34,9 @@ + size_t size; /* Allocated. */ + size_t length; /* Used. */ + char *buffer; ++# if HAVE_WCHAR_H ++ mbstate_t state; ++# endif + }; + + /* Initialize linebuffer LINEBUFFER for use. */ +--- coreutils-6.7/src/expand.c.i18n 2006-10-22 17:54:15.000000000 +0100 ++++ coreutils-6.7/src/expand.c 2007-01-09 17:18:28.000000000 +0000 @@ -38,11 +38,28 @@ #include #include @@ -29,7 +164,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "expand" -@@ -182,6 +199,7 @@ +@@ -183,6 +200,7 @@ stops = num_start + len - 1; } } @@ -37,7 +172,7 @@ else { error (0, 0, _("tab size contains invalid character(s): %s"), -@@ -364,6 +382,142 @@ +@@ -365,6 +383,142 @@ } } @@ -180,7 +315,7 @@ int main (int argc, char **argv) { -@@ -428,7 +582,12 @@ +@@ -429,7 +583,12 @@ file_list = (optind < argc ? &argv[optind] : stdin_argv); @@ -194,43 +329,30 @@ if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); ---- coreutils-5.95/src/pr.c.i18n 2005-09-16 08:50:33.000000000 +0100 -+++ coreutils-5.95/src/pr.c 2006-05-15 15:09:08.000000000 +0100 -@@ -313,6 +313,32 @@ - - #include +--- coreutils-6.7/src/join.c.i18n 2006-10-22 17:54:15.000000000 +0100 ++++ coreutils-6.7/src/join.c 2007-01-09 17:18:28.000000000 +0000 +@@ -23,16 +23,30 @@ #include -+ -+/* Get MB_LEN_MAX. */ -+#include -+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC -+ installation; work around this configuration error. */ -+#if !defined MB_LEN_MAX || MB_LEN_MAX == 1 -+# define MB_LEN_MAX 16 -+#endif -+ [...6005 lines suppressed...] -+else -+ $echo Failed $errors tests. 1>&2 -+fi -+test $errors = 0 || errors=1 -+exit $errors ---- coreutils-5.95/tests/sort/Makefile.in.i18n 2006-05-04 13:52:51.000000000 +0100 -+++ coreutils-5.95/tests/sort/Makefile.in 2006-05-15 15:08:57.000000000 +0100 -@@ -107,25 +107,25 @@ - $(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/perl.m4 \ - $(top_srcdir)/m4/physmem.m4 $(top_srcdir)/m4/po.m4 \ -- $(top_srcdir)/m4/posixtm.m4 $(top_srcdir)/m4/posixver.m4 \ -- $(top_srcdir)/m4/prereq.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/m4/putenv.m4 $(top_srcdir)/m4/quote.m4 \ -- $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/readlink.m4 \ -- $(top_srcdir)/m4/readtokens.m4 $(top_srcdir)/m4/readutmp.m4 \ -- $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ -- $(top_srcdir)/m4/restrict.m4 $(top_srcdir)/m4/rmdir-errno.m4 \ -- $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/root-dev-ino.m4 \ -- $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/safe-read.m4 \ -- $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/same.m4 \ -- $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ -- $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/settime.m4 \ -- $(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/sig2str.m4 \ -- $(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/socklen.m4 \ -- $(top_srcdir)/m4/sockpfaf.m4 $(top_srcdir)/m4/ssize_t.m4 \ -- $(top_srcdir)/m4/st_dm_mode.m4 $(top_srcdir)/m4/stat-macros.m4 \ -- $(top_srcdir)/m4/stat-prog.m4 $(top_srcdir)/m4/stat-time.m4 \ -- $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint_h.m4 \ -- $(top_srcdir)/m4/stdio-safer.m4 \ -+ $(top_srcdir)/m4/posix_acl.m4 $(top_srcdir)/m4/posixtm.m4 \ -+ $(top_srcdir)/m4/posixver.m4 $(top_srcdir)/m4/prereq.m4 \ -+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/putenv.m4 \ -+ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ -+ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readtokens.m4 \ -+ $(top_srcdir)/m4/readutmp.m4 $(top_srcdir)/m4/regex.m4 \ -+ $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/restrict.m4 \ -+ $(top_srcdir)/m4/rmdir-errno.m4 $(top_srcdir)/m4/rmdir.m4 \ -+ $(top_srcdir)/m4/root-dev-ino.m4 $(top_srcdir)/m4/rpmatch.m4 \ -+ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ -+ $(top_srcdir)/m4/same.m4 $(top_srcdir)/m4/save-cwd.m4 \ -+ $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ -+ $(top_srcdir)/m4/settime.m4 $(top_srcdir)/m4/sha1.m4 \ -+ $(top_srcdir)/m4/sig2str.m4 $(top_srcdir)/m4/signed.m4 \ -+ $(top_srcdir)/m4/socklen.m4 $(top_srcdir)/m4/sockpfaf.m4 \ -+ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/st_dm_mode.m4 \ -+ $(top_srcdir)/m4/stat-macros.m4 $(top_srcdir)/m4/stat-prog.m4 \ -+ $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdbool.m4 \ -+ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio-safer.m4 \ - $(top_srcdir)/m4/stdlib-safer.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strcspn.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strftime.m4 \ -@@ -196,7 +196,6 @@ - GLIBC21 = @GLIBC21@ - GMSGFMT = @GMSGFMT@ - GNU_PACKAGE = @GNU_PACKAGE@ --GREP = @GREP@ - HAVE__BOOL = @HAVE__BOOL@ - HELP2MAN = @HELP2MAN@ - INSTALL_DATA = @INSTALL_DATA@ -@@ -207,6 +206,7 @@ - INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ - KMEM_GROUP = @KMEM_GROUP@ - LDFLAGS = @LDFLAGS@ -+LIBACL = @LIBACL@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -@@ -217,6 +217,8 @@ - LIB_FDATASYNC = @LIB_FDATASYNC@ - LIB_GETHRXTIME = @LIB_GETHRXTIME@ - LIB_NANOSLEEP = @LIB_NANOSLEEP@ -+LIB_PAM = @LIB_PAM@ -+LIB_SELINUX = @LIB_SELINUX@ - LN_S = @LN_S@ - LTLIBICONV = @LTLIBICONV@ - LTLIBINTL = @LTLIBINTL@ -@@ -266,30 +268,23 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ --datarootdir = @datarootdir@ --docdir = @docdir@ --dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ --htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ - libexecdir = @libexecdir@ --localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ --pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ --psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ -@@ -316,33 +311,37 @@ - neg-nls.I neg-nls.X nul-nls.I nul-nls.X use-nl.I use-nl.X o2.I o2.X nul-tab.I \ - nul-tab.X - --run_gen = n1.O n1.E n2.O n2.E n3.O n3.E n4.O n4.E n5.O n5.E n6.O n6.E n7.O \ --n7.E n8a.O n8a.E n8b.O n8b.E n9a.O n9a.E n9b.O n9b.E n10a.O n10a.E n10b.O \ --n10b.E n11a.O n11a.E n11b.O n11b.E 01a.O 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O \ --02c.E 02m.O 02m.E 02n.O 02n.E 02o.O 02o.E 02p.O 02p.E 03a.O 03a.E 03b.O 03b.E \ --03c.O 03c.E 03d.O 03d.E 03e.O 03e.E 03f.O 03f.E 03g.O 03g.E 03h.O 03h.E 03i.O \ --03i.E 04a.O 04a.E 04b.O 04b.E 04c.O 04c.E 04d.O 04d.E 04e.O 04e.E 05a.O 05a.E \ --05b.O 05b.E 05c.O 05c.E 05d.O 05d.E 05e.O 05e.E 05f.O 05f.E 06a.O 06a.E 06b.O \ --06b.E 06c.O 06c.E 06d.O 06d.E 06e.O 06e.E 06f.O 06f.E 07a.O 07a.E 07b.O 07b.E \ --07c.O 07c.E 07d.O 07d.E 08a.O 08a.E 08b.O 08b.E 09a.O 09a.E 09b.O 09b.E 09c.O \ --09c.E 09d.O 09d.E 10a.O 10a.E 10b.O 10b.E 10c.O 10c.E 10d.O 10d.E 10a0.O \ --10a0.E 10a1.O 10a1.E 10a2.O 10a2.E 10e.O 10e.E 10f.O 10f.E 10g.O 10g.E 11a.O \ --11a.E 11b.O 11b.E 11c.O 11c.E 11d.O 11d.E 12a.O 12a.E 12b.O 12b.E 12c.O 12c.E \ --12d.O 12d.E 13a.O 13a.E 13b.O 13b.E 14a.O 14a.E 14b.O 14b.E 15a.O 15a.E 15b.O \ --15b.E 15c.O 15c.E 15d.O 15d.E 15e.O 15e.E 16a.O 16a.E 17.O 17.E 18a.O 18a.E \ --18b.O 18b.E 18c.O 18c.E 18d.O 18d.E 18e.O 18e.E 19a.O 19a.E 19b.O 19b.E 20a.O \ --20a.E 21a.O 21a.E 21b.O 21b.E 21c.O 21c.E 21d.O 21d.E 21e.O 21e.E 21f.O 21f.E \ --21g.O 21g.E 22a.O 22a.E 22b.O 22b.E no-file1.O no-file1.E o-no-file1.O \ --o-no-file1.E create-empty.O create-empty.E neg-nls.O neg-nls.E nul-nls.O \ --nul-nls.E use-nl.O use-nl.E o2.O o2.E nul-tab.O nul-tab.E -- --EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) --noinst_SCRIPTS = $x-tests -+run_gen = n1.O n1.E n2.O n2.E n3.O n3.E n4.O n4.E n5.O n5.E n6.O n6.E \ -+ n7.O n7.E n8a.O n8a.E n8b.O n8b.E n9a.O n9a.E n9b.O n9b.E \ -+ n10a.O n10a.E n10b.O n10b.E n11a.O n11a.E n11b.O n11b.E 01a.O \ -+ 01a.E 02a.O 02a.E 02b.O 02b.E 02c.O 02c.E 02m.O 02m.E 02n.O \ -+ 02n.E 02o.O 02o.E 02p.O 02p.E 03a.O 03a.E 03b.O 03b.E 03c.O \ -+ 03c.E 03d.O 03d.E 03e.O 03e.E 03f.O 03f.E 03g.O 03g.E 03h.O \ -+ 03h.E 03i.O 03i.E 04a.O 04a.E 04b.O 04b.E 04c.O 04c.E 04d.O \ -+ 04d.E 04e.O 04e.E 05a.O 05a.E 05b.O 05b.E 05c.O 05c.E 05d.O \ -+ 05d.E 05e.O 05e.E 05f.O 05f.E 06a.O 06a.E 06b.O 06b.E 06c.O \ -+ 06c.E 06d.O 06d.E 06e.O 06e.E 06f.O 06f.E 07a.O 07a.E 07b.O \ -+ 07b.E 07c.O 07c.E 07d.O 07d.E 08a.O 08a.E 08b.O 08b.E 09a.O \ -+ 09a.E 09b.O 09b.E 09c.O 09c.E 09d.O 09d.E 10a.O 10a.E 10b.O \ -+ 10b.E 10c.O 10c.E 10d.O 10d.E 10a0.O 10a0.E 10a1.O 10a1.E \ -+ 10a2.O 10a2.E 10e.O 10e.E 10f.O 10f.E 10g.O 10g.E 11a.O 11a.E \ -+ 11b.O 11b.E 11c.O 11c.E 11d.O 11d.E 12a.O 12a.E 12b.O 12b.E \ -+ 12c.O 12c.E 12d.O 12d.E 13a.O 13a.E 13b.O 13b.E 14a.O 14a.E \ -+ 14b.O 14b.E 15a.O 15a.E 15b.O 15b.E 15c.O 15c.E 15d.O 15d.E \ -+ 15e.O 15e.E 16a.O 16a.E 17.O 17.E 18a.O 18a.E 18b.O 18b.E \ -+ 18c.O 18c.E 18d.O 18d.E 18e.O 18e.E 19a.O 19a.E 19b.O 19b.E \ -+ 20a.O 20a.E 21a.O 21a.E 21b.O 21b.E 21c.O 21c.E 21d.O 21d.E \ -+ 21e.O 21e.E 21f.O 21f.E 21g.O 21g.E 22a.O 22a.E 22b.O 22b.E \ -+ no-file1.O no-file1.E o-no-file1.O o-no-file1.E create-empty.O \ -+ create-empty.E neg-nls.O neg-nls.E nul-nls.O nul-nls.E \ -+ use-nl.O use-nl.E o2.O o2.E nul-tab.O nul-tab.E mb1.O mb2.O -+EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) mb1.I mb1.X mb2.I mb2.X -+noinst_SCRIPTS = $x-tests # $x-mb-tests - TESTS_ENVIRONMENT = \ - PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH" - - editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g' --TESTS = $x-tests -+TESTS = $x-tests $x-mb-tests - mk_script = $(srcdir)/../mk-script - MAINTAINERCLEANFILES = $x-tests $(maint_gen) - CLEANFILES = $(run_gen) ---- /dev/null 2006-05-15 09:11:19.652773000 +0100 -+++ coreutils-5.95/tests/sort/mb2.I 2006-05-15 15:08:57.000000000 +0100 -@@ -0,0 +1,4 @@ -+Apple?????????10??????20 -+Banana?????????5??????30 -+Citrus?????????20??????5 -+Cherry?????????30??????10 ---- coreutils-5.95/lib/linebuffer.h.i18n 2005-05-14 08:58:06.000000000 +0100 -+++ coreutils-5.95/lib/linebuffer.h 2006-05-15 15:08:57.000000000 +0100 -@@ -22,6 +22,11 @@ - - # include - -+/* Get mbstate_t. */ -+# if HAVE_WCHAR_H -+# include -+# endif -+ - /* A `struct linebuffer' holds a line of text. */ - - struct linebuffer -@@ -29,6 +34,9 @@ - size_t size; /* Allocated. */ - size_t length; /* Used. */ - char *buffer; -+# if HAVE_WCHAR_H -+ mbstate_t state; -+# endif - }; - - /* Initialize linebuffer LINEBUFFER for use. */ coreutils-pam.patch: configure.ac | 7 + doc/coreutils.texi | 34 +------- src/Makefile.am | 2 src/su.c | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 231 insertions(+), 36 deletions(-) Index: coreutils-pam.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-pam.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- coreutils-pam.patch 24 Aug 2006 16:05:51 -0000 1.9 +++ coreutils-pam.patch 9 Jan 2007 19:29:30 -0000 1.10 @@ -1,55 +1,16 @@ ---- coreutils-5.97/doc/coreutils.texi.pam 2006-02-07 08:31:28.000000000 +0000 -+++ coreutils-5.97/doc/coreutils.texi 2006-08-23 10:45:26.000000000 +0100 -@@ -12768,8 +12768,11 @@ - @findex syslog - @command{su} can optionally be compiled to use @code{syslog} to report - failed, and optionally successful, @command{su} attempts. (If the system --supports @code{syslog}.) However, GNU @command{su} does not check if the --user is a member of the @code{wheel} group; see below. -+supports @code{syslog}.) -+ -+This version of @command{su} has support for using PAM for -+authentication. You can edit @file{/etc/pam.d/su} to customize its -+behaviour. - - The program accepts the following options. Also see @ref{Common options}. +--- coreutils-6.7/src/Makefile.am.pam 2006-11-24 21:28:10.000000000 +0000 ++++ coreutils-6.7/src/Makefile.am 2007-01-09 17:00:01.000000000 +0000 +@@ -103,7 +103,7 @@ + # If necessary, add -lm to resolve use of pow in lib/strtod.c. + uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS) -@@ -12850,33 +12853,6 @@ - the exit status of the subshell otherwise - @end display - -- at cindex wheel group, not supported -- at cindex group wheel, not supported -- at cindex fascism -- at subsection Why GNU @command{su} does not support the @samp{wheel} group -- --(This section is by Richard Stallman.) -- -- at cindex Twenex -- at cindex MIT AI lab --Sometimes a few of the users try to hold total power over all the --rest. For example, in 1984, a few users at the MIT AI lab decided to --seize power by changing the operator password on the Twenex system and --keeping it secret from everyone else. (I was able to thwart this coup --and give power back to the users by patching the kernel, but I --wouldn't know how to do that in Unix.) -- --However, occasionally the rulers do tell someone. Under the usual -- at command{su} mechanism, once someone learns the root password who --sympathizes with the ordinary users, he or she can tell the rest. The --``wheel group'' feature would make this impossible, and thus cement the --power of the rulers. -- --I'm on the side of the masses, not that of the rulers. If you are --used to supporting the bosses and sysadmins in whatever they do, you --might find this idea strange at first. -- -- - @node Process control - @chapter Process control +-su_LDADD = $(LDADD) $(LIB_CRYPT) ++su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@ ---- coreutils-5.97/src/su.c 2006-08-23 10:45:33.000000000 +0100 -+++ coreutils-5.97/src/su.c 2006-08-24 17:04:48.000000000 +0100 + dir_LDADD += $(LIB_ACL) + ls_LDADD += $(LIB_ACL) +--- coreutils-6.7/src/su.c.pam 2007-01-09 17:00:01.000000000 +0000 ++++ coreutils-6.7/src/su.c 2007-01-09 17:16:43.000000000 +0000 @@ -38,6 +38,16 @@ restricts who can su to UID 0 accounts. RMS considers that to be fascist. @@ -64,10 +25,10 @@ + +#endif + - Options: - -, -l, --login Make the subshell a login shell. - Unset all environment variables except -@@ -81,6 +91,15 @@ + Compile-time options: + -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. + -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. +@@ -59,6 +69,15 @@ prototype (returning `int') in . */ #define getusershell _getusershell_sys_proto_ @@ -81,19 +42,18 @@ +#endif /* USE_PAM */ + #include "system.h" - #include "dirname.h" + #include "getpass.h" -@@ -150,7 +169,9 @@ +@@ -128,15 +147,22 @@ /* The user to become if none is specified. */ #define DEFAULT_USER "root" +#ifndef USE_PAM char *crypt (); +#endif - char *getpass (); char *getusershell (); void endusershell (); -@@ -158,8 +179,13 @@ + void setusershell (); extern char **environ; @@ -108,7 +68,7 @@ /* The name this program was run with. */ char *program_name; -@@ -248,7 +274,26 @@ +@@ -225,7 +251,26 @@ } #endif @@ -135,7 +95,7 @@ Return true if the user gives the correct password for entry PW, false if not. Return true without asking for a password if run by UID 0 or if PW has an empty password. */ -@@ -256,6 +301,44 @@ +@@ -233,6 +278,44 @@ static bool correct_password (const struct passwd *pw) { @@ -180,7 +140,7 @@ char *unencrypted, *encrypted, *correct; #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP /* Shadow passwd stuff for SVR3 and maybe other systems. */ -@@ -280,6 +363,7 @@ +@@ -257,6 +340,7 @@ encrypted = crypt (unencrypted, correct); memset (unencrypted, 0, strlen (unencrypted)); return STREQ (encrypted, correct); @@ -188,7 +148,7 @@ } /* Update `environ' for the new shell based on PW, with SHELL being -@@ -293,12 +377,18 @@ +@@ -270,12 +354,18 @@ /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. Unset all other environment variables. */ char const *term = getenv ("TERM"); @@ -207,7 +167,7 @@ xsetenv ("HOME", pw->pw_dir); xsetenv ("SHELL", shell); xsetenv ("USER", pw->pw_name); -@@ -331,8 +421,13 @@ +@@ -308,8 +398,13 @@ { #ifdef HAVE_INITGROUPS errno = 0; @@ -222,7 +182,7 @@ endgrent (); #endif if (setgid (pw->pw_gid)) -@@ -341,6 +436,31 @@ +@@ -318,6 +413,31 @@ error (EXIT_FAIL, errno, _("cannot set user id")); } @@ -254,7 +214,7 @@ /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. If COMMAND is nonzero, pass it to the shell with the -c option. Pass ADDITIONAL_ARGS to the shell as more arguments; there -@@ -348,17 +468,49 @@ +@@ -325,17 +445,49 @@ static void run_shell (char const *shell, char const *command, char **additional_args, @@ -302,10 +262,10 @@ + if(chdir(pw->pw_dir)) + error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); + - shell_basename = base_name (shell); + shell_basename = last_component (shell); arg0 = xmalloc (strlen (shell_basename) + 2); arg0[0] = '-'; -@@ -383,6 +535,66 @@ +@@ -360,6 +512,66 @@ error (0, errno, "%s", shell); exit (exit_status); } @@ -372,7 +332,9 @@ } /* Return true if SHELL is a restricted shell (one not returned by -@@ -552,7 +764,7 @@ +@@ -527,9 +739,9 @@ + shell = xstrdup (shell ? shell : pw->pw_shell); + modify_environment (pw, shell); +#ifndef USE_PAM change_identity (pw); @@ -383,22 +345,61 @@ - run_shell (shell, command, argv + optind, MAX (0, argc - optind)); + run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); } ---- coreutils-5.97/src/Makefile.am.pam 2006-08-23 10:45:26.000000000 +0100 -+++ coreutils-5.97/src/Makefile.am 2006-08-23 10:45:26.000000000 +0100 -@@ -92,7 +92,7 @@ +--- coreutils-6.7/doc/coreutils.texi.pam 2006-10-27 15:30:48.000000000 +0100 ++++ coreutils-6.7/doc/coreutils.texi 2007-01-09 17:00:01.000000000 +0000 +@@ -13395,8 +13395,11 @@ + @findex syslog + @command{su} can optionally be compiled to use @code{syslog} to report + failed, and optionally successful, @command{su} attempts. (If the system +-supports @code{syslog}.) However, GNU @command{su} does not check if the +-user is a member of the @code{wheel} group; see below. ++supports @code{syslog}.) ++ ++This version of @command{su} has support for using PAM for ++authentication. You can edit @file{/etc/pam.d/su} to customize its ++behaviour. - uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) + The program accepts the following options. Also see @ref{Common options}. --su_LDADD = $(LDADD) $(LIB_CRYPT) -+su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@ +@@ -13477,33 +13480,6 @@ + the exit status of the subshell otherwise + @end display - $(PROGRAMS): ../lib/libcoreutils.a +- at cindex wheel group, not supported +- at cindex group wheel, not supported +- at cindex fascism +- at subsection Why GNU @command{su} does not support the @samp{wheel} group +- +-(This section is by Richard Stallman.) +- +- at cindex Twenex +- at cindex MIT AI lab +-Sometimes a few of the users try to hold total power over all the +-rest. For example, in 1984, a few users at the MIT AI lab decided to +-seize power by changing the operator password on the Twenex system and +-keeping it secret from everyone else. (I was able to thwart this coup +-and give power back to the users by patching the kernel, but I +-wouldn't know how to do that in Unix.) +- +-However, occasionally the rulers do tell someone. Under the usual +- at command{su} mechanism, once someone learns the root password who +-sympathizes with the ordinary users, he or she can tell the rest. The +-``wheel group'' feature would make this impossible, and thus cement the +-power of the rulers. +- +-I'm on the side of the masses, not that of the rulers. If you are +-used to supporting the bosses and sysadmins in whatever they do, you +-might find this idea strange at first. +- +- + @node Process control + @chapter Process control ---- coreutils-5.97/configure.ac.pam 2006-08-23 10:45:26.000000000 +0100 -+++ coreutils-5.97/configure.ac 2006-08-23 10:45:26.000000000 +0100 -@@ -27,6 +27,13 @@ - AB_INIT() - AM_INIT_AUTOMAKE([1.8.3 gnits dist-bzip2]) +--- coreutils-6.7/configure.ac.pam 2006-12-07 21:30:24.000000000 +0000 ++++ coreutils-6.7/configure.ac 2007-01-09 17:18:04.000000000 +0000 +@@ -39,6 +39,13 @@ + gl_INIT + coreutils_MACROS +dnl Give the chance to enable PAM +AC_ARG_ENABLE(pam, dnl @@ -407,18 +408,6 @@ +LIB_PAM="-ldl -lpam -lpam_misc" +AC_SUBST(LIB_PAM)]) + - gl_DEFAULT_POSIX2_VERSION - gl_USE_SYSTEM_EXTENSIONS - gl_PERL ---- coreutils-5.97/config.hin.pam 2006-08-23 10:45:26.000000000 +0100 -+++ coreutils-5.97/config.hin 2006-08-23 10:45:26.000000000 +0100 -@@ -1537,6 +1537,9 @@ - /* Define if you want access control list support. */ - #undef USE_ACL - -+/* Define if you want to use PAM */ -+#undef USE_PAM -+ - /* Version number of package */ - #undef VERSION - + AC_CHECK_FUNCS(uname, + OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uname\$(EXEEXT)" + MAN="$MAN uname.1") coreutils-selinux.patch: README | 4 configure.ac | 7 man/Makefile.am | 4 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 | 45 +++++ man/runcon.x | 14 + man/stat.1 | 6 man/vdir.1 | 14 + src/Makefile.am | 23 +- src/chcon.c | 421 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/copy.c | 73 +++++++++ src/copy.h | 4 src/cp.c | 67 ++++++++ src/id.c | 68 ++++++++ src/install.c | 99 ++++++++++++ src/ls.c | 228 ++++++++++++++++++++++++++-- src/mkdir.c | 30 +++ src/mkfifo.c | 33 ++++ src/mknod.c | 30 +++ src/mv.c | 13 + src/runcon.c | 253 +++++++++++++++++++++++++++++++ src/stat.c | 146 ++++++++++++++---- tests/help-version | 4 32 files changed, 1640 insertions(+), 63 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.29 -r 1.30 coreutils-selinux.patch Index: coreutils-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- coreutils-selinux.patch 24 Nov 2006 18:35:25 -0000 1.29 +++ coreutils-selinux.patch 9 Jan 2007 19:29:30 -0000 1.30 @@ -1,564 +1,464 @@ ---- /dev/null 2006-11-23 08:31:37.745607750 +0000 -+++ coreutils-5.97/src/chcon.c 2006-11-17 13:56:55.000000000 +0000 -@@ -0,0 +1,421 @@ -+/* chcontext -- change security context of a pathname */ -+ -+#include -+#include -+#include -+#include -+#include +--- coreutils-6.7/tests/help-version.selinux 2007-01-09 18:24:56.000000000 +0000 ++++ coreutils-6.7/tests/help-version 2007-01-09 18:24:57.000000000 +0000 +@@ -72,6 +72,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 +@@ -198,7 +200,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-6.7/src/ls.c.selinux 2006-11-27 10:25:51.000000000 +0000 ++++ coreutils-6.7/src/ls.c 2007-01-09 18:36:36.000000000 +0000 +@@ -110,6 +110,18 @@ + + #define AUTHORS "Richard Stallman", "David MacKenzie" + ++#ifdef WITH_SELINUX +#include -+#include -+ -+#include "system.h" -+#include "error.h" -+#include "savedir.h" -+#include "group-member.h" -+ -+enum Change_status -+{ -+ CH_SUCCEEDED, -+ CH_FAILED, -+ CH_NO_CHANGE_REQUESTED -+}; -+ -+enum Verbosity -+{ -+ /* Print a message for each file that is processed. */ -+ V_high, -+ -+ /* Print a message for each file whose attributes we change. */ -+ V_changes_only, -+ -+ /* Do not be verbose. This is the default. */ -+ V_off -+}; + -+static int change_dir_context (const char *dir, const struct stat *statp); ++static int print_scontext = 0; + -+/* The name the program was run with. */ -+char *program_name; + -+/* If nonzero, and the systems has support for it, change the context -+ of symbolic links rather than any files they point to. */ -+static int change_symlinks; + -+/* If nonzero, change the context of directories recursively. */ -+static int recurse; + -+/* If nonzero, force silence (no error messages). */ -+static int force_silent; + -+/* Level of verbosity. */ -+static enum Verbosity verbosity = V_off; + -+/* The name of the context file is being given. */ -+static const char *specified_context; ++#endif + -+/* Specific components of the context */ -+static const char *specified_user; -+static const char *specified_role; -+static const char *specified_range; -+static const char *specified_type; + #define obstack_chunk_alloc malloc + #define obstack_chunk_free free + +@@ -132,7 +144,8 @@ + symbolic_link, + sock, + whiteout, +- arg_directory ++ arg_directory, ++ command_line + }; + + /* Display letters and indicators for each filetype. +@@ -175,6 +188,10 @@ + /* For long listings, true if the file has an access control list. */ + bool have_acl; + #endif + -+/* The argument to the --reference option. Use the context of this file. -+ This file must exist. */ -+static char *reference_file; ++#ifdef WITH_SELINUX ++ security_context_t scontext; ++#endif + }; + + #if USE_ACL +@@ -245,6 +262,9 @@ + static void sort_files (void); + static void parse_ls_color (void); + void usage (int status); ++#ifdef WITH_SELINUX ++static void print_scontext_format (const struct fileinfo *f); ++#endif + + /* The name this program was run with. */ + char *program_name; +@@ -353,7 +373,11 @@ + one_per_line, /* -1 */ + many_per_line, /* -C */ + horizontal, /* -x */ +- with_commas /* -m */ ++ with_commas, /* -m */ ++#ifdef WITH_SELINUX ++ security_format, /* -Z */ ++#endif ++ invalid_format + }; + + static enum format format; +@@ -734,6 +758,11 @@ + SHOW_CONTROL_CHARS_OPTION, + SI_OPTION, + SORT_OPTION, ++#ifdef WITH_SELINUX ++ CONTEXT_OPTION, ++ LCONTEXT_OPTION, ++ SCONTEXT_OPTION, ++#endif + TIME_OPTION, + TIME_STYLE_OPTION + }; +@@ -780,6 +809,11 @@ + {"time-style", required_argument, NULL, TIME_STYLE_OPTION}, + {"color", optional_argument, NULL, COLOR_OPTION}, + {"block-size", required_argument, NULL, BLOCK_SIZE_OPTION}, ++#ifdef WITH_SELINUX ++ {"context", no_argument, 0, CONTEXT_OPTION}, ++ {"lcontext", no_argument, 0, LCONTEXT_OPTION}, ++ {"scontext", no_argument, 0, SCONTEXT_OPTION}, ++#endif + {"author", no_argument, NULL, AUTHOR_OPTION}, + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, +@@ -789,12 +823,19 @@ + static char const *const format_args[] = + { + "verbose", "long", "commas", "horizontal", "across", +- "vertical", "single-column", NULL ++ "vertical", "single-column", ++#ifdef WITH_SELINUX ++ "context", ++#endif ++ NULL + }; + static enum format const format_types[] = + { + long_format, long_format, with_commas, horizontal, horizontal, + many_per_line, one_per_line ++#ifdef WITH_SELINUX ++ , security_format ++#endif + }; + ARGMATCH_VERIFY (format_args, format_types); + +@@ -1218,6 +1259,9 @@ + + format_needs_stat = sort_type == sort_time || sort_type == sort_size + || format == long_format [...3804 lines suppressed...] @@ -2773,45 +2551,22 @@ +set security context (quoted string) +.TP \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR - set permission mode (as in chmod), not a=rw \- umask + set file permission bits to MODE, not a=rw \- umask .TP ---- coreutils-5.97/man/mknod.1.selinux 2006-05-25 18:27:36.000000000 +0100 -+++ coreutils-5.97/man/mknod.1 2006-11-17 13:56:55.000000000 +0000 -@@ -12,6 +12,9 @@ - .PP - Mandatory arguments to long options are mandatory for short options too. - .TP -+\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR -+set security context (quoted string) -+.TP - \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR - set permission mode (as in chmod), not a=rw \- umask - .TP ---- coreutils-5.97/man/mkdir.1.selinux 2006-05-25 18:27:35.000000000 +0100 -+++ coreutils-5.97/man/mkdir.1 2006-11-17 13:56:55.000000000 +0000 -@@ -12,6 +12,8 @@ - .PP - Mandatory arguments to long options are mandatory for short options too. - .TP -+\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR (SELinux) set security context to CONTEXT -+.TP - \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR - set permission mode (as in chmod), not rwxrwxrwx \- umask - .TP ---- coreutils-5.97/man/dir.1.selinux 2006-06-01 08:33:14.000000000 +0100 -+++ coreutils-5.97/man/dir.1 2006-11-17 13:56:55.000000000 +0000 -@@ -201,6 +201,20 @@ +--- coreutils-6.7/man/ls.1.selinux 2006-12-07 22:45:42.000000000 +0000 ++++ coreutils-6.7/man/ls.1 2007-01-09 18:24:59.000000000 +0000 +@@ -204,6 +204,20 @@ .TP \fB\-1\fR list one file per line +.PP -+SELINUX options: ++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 ++\fB\-Z\fR, \fB\-\-context\fR +Display security context so it fits on most +displays. Displays only mode, user, group, +security context and file name. @@ -2821,26 +2576,20 @@ .TP \fB\-\-help\fR display this help and exit ---- /dev/null 2006-11-23 08:31:37.745607750 +0000 -+++ coreutils-5.97/man/runcon.x 2006-11-17 13:56:55.000000000 +0000 -@@ -0,0 +1,14 @@ -+[NAME] -+runcon \- run command with specified security context -+[DESCRIPTION] -+Run COMMAND with completely-specified CONTEXT, or with current or -+transitioned security context modified by one or more of LEVEL, -+ROLE, TYPE, and USER. -+.PP -+If none of \fI-c\fR, \fI-t\fR, \fI-u\fR, \fI-r\fR, or \fI-l\fR, is specified, -+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.97/man/vdir.1.selinux 2006-06-01 08:33:14.000000000 +0100 -+++ coreutils-5.97/man/vdir.1 2006-11-17 13:56:55.000000000 +0000 -@@ -201,6 +201,20 @@ +--- coreutils-6.7/man/mkdir.1.selinux 2006-12-07 22:45:43.000000000 +0000 ++++ coreutils-6.7/man/mkdir.1 2007-01-09 18:24:59.000000000 +0000 +@@ -12,6 +12,8 @@ + .PP + Mandatory arguments to long options are mandatory for short options too. + .TP ++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR (SELinux) set security context to CONTEXT ++.TP + \fB\-m\fR, \fB\-\-mode\fR=\fIMODE\fR + set file mode (as in chmod), not a=rwx \- umask + .TP +--- coreutils-6.7/man/vdir.1.selinux 2006-12-07 22:45:46.000000000 +0000 ++++ coreutils-6.7/man/vdir.1 2007-01-09 18:24:59.000000000 +0000 +@@ -204,6 +204,20 @@ .TP \fB\-1\fR list one file per line @@ -2861,77 +2610,33 @@ .TP \fB\-\-help\fR display this help and exit ---- /dev/null 2006-11-23 08:31:37.745607750 +0000 -+++ coreutils-5.97/man/chcon.x 2006-11-17 13:56:55.000000000 +0000 -@@ -0,0 +1,4 @@ -+[NAME] -+chcon \- change file security context -+[DESCRIPTION] -+.\" Add any additional description here ---- /dev/null 2006-11-23 08:31:37.745607750 +0000 -+++ coreutils-5.97/man/chcon.1 2006-11-17 13:56:55.000000000 +0000 -@@ -0,0 +1,64 @@ -+.TH CHCON 1 "July 2003" "chcon (coreutils) 5.0" "User Commands" -+.SH NAME -+chcon \- change security context -+.SH SYNOPSIS -+.B chcon -+[\fIOPTION\fR]...\fI CONTEXT FILE\fR... -+.br -+.B chcon -+[\fIOPTION\fR]...\fI --reference=RFILE FILE\fR... -+.SH DESCRIPTION -+.PP -+." Add any additional description here -+.PP -+Change the security context of each FILE to CONTEXT. -+.TP -+\fB\-c\fR, \fB\-\-changes\fR -+like verbose but report only when a change is made -+.TP -+\fB\-h\fR, \fB\-\-no\-dereference\fR -+affect symbolic links instead of any referenced file (available only on systems with lchown system call) -+.TP -+\fB\-f\fR, \fB\-\-silent\fR, \fB\-\-quiet\fR -+suppress most error messages -+.TP -+\fB\-l\fR, \fB\-\-range\fR -+set range RANGE in the target security context -+.TP -+\fB\-\-reference\fR=\fIRFILE\fR -+use RFILE's context instead of using a CONTEXT value -+.TP -+\fB\-R\fR, \fB\-\-recursive\fR -+change files and directories recursively -+.TP -+\fB\-r\fR, \fB\-\-role\fR -+set role ROLE in the target security context -+.TP -+\fB\-t\fR, \fB\-\-type\fR -+set type TYPE in the target security context -+.TP -+\fB\-u\fR, \fB\-\-user\fR -+set user USER in the target security context -+.TP -+\fB\-v\fR, \fB\-\-verbose\fR -+output a diagnostic for every file processed -+.TP -+\fB\-\-help\fR -+display this help and exit +--- coreutils-6.7/man/install.1.selinux 2006-12-07 22:45:42.000000000 +0000 ++++ coreutils-6.7/man/install.1 2007-01-09 18:24:59.000000000 +0000 +@@ -66,6 +66,11 @@ + .TP + \fB\-v\fR, \fB\-\-verbose\fR + print the name of each directory as it is created ++.HP ++\fB\-P\fR, \fB\-\-preserve_context\fR (SELinux) Preserve security context +.TP -+\fB\-\-version\fR -+output version information and exit -+.SH "REPORTING BUGS" -+Report bugs to . -+.SH "SEE ALSO" -+The full documentation for -+.B chcon -+is maintained as a Texinfo manual. If the -+.B info -+and -+.B chcon -+programs are properly installed at your site, the command -+.IP -+.B info chcon -+.PP -+should give you access to the complete manual. ++\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR ++(SELinux) Set security context of files and directories + .TP + \fB\-\-help\fR + display this help and exit +--- coreutils-6.7/README.selinux 2007-01-09 18:24:56.000000000 +0000 ++++ coreutils-6.7/README 2007-01-09 18:24:59.000000000 +0000 +@@ -7,11 +7,11 @@ + + The programs that can be built with this package are: + +- [ base64 basename cat chgrp chmod chown chroot cksum comm cp csplit cut date ++ [ base64 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 sha224sum sha256sum ++ printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum sha224sum sha256sum + sha384sum sha512sum shred shuf 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-setsid.patch: su.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) Index: coreutils-setsid.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-setsid.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coreutils-setsid.patch 21 Jul 2006 13:26:30 -0000 1.2 +++ coreutils-setsid.patch 9 Jan 2007 19:29:30 -0000 1.3 @@ -1,6 +1,6 @@ ---- coreutils-5.97/src/su.c.setsid 2006-07-21 14:09:29.000000000 +0100 -+++ coreutils-5.97/src/su.c 2006-07-21 14:20:28.000000000 +0100 -@@ -199,9 +199,13 @@ +--- coreutils-6.7/src/su.c.setsid 2007-01-09 17:26:26.000000000 +0000 ++++ coreutils-6.7/src/su.c 2007-01-09 17:26:57.000000000 +0000 +@@ -176,9 +176,13 @@ /* If true, change some environment vars to indicate the user su'd to. */ static bool change_environment; @@ -14,7 +14,7 @@ {"fast", no_argument, NULL, 'f'}, {"login", no_argument, NULL, 'l'}, {"preserve-environment", no_argument, NULL, 'p'}, -@@ -497,6 +501,8 @@ +@@ -478,6 +482,8 @@ if (child == 0) { /* child shell */ change_identity (pw); pam_end(pamh, 0); @@ -23,7 +23,7 @@ #endif if (simulate_login) -@@ -551,13 +557,27 @@ +@@ -532,13 +538,27 @@ sigemptyset(&action.sa_mask); action.sa_flags = 0; sigemptyset(&ourset); @@ -55,16 +55,16 @@ } if (!caught) { do { -@@ -628,6 +648,8 @@ +@@ -609,6 +629,8 @@ \n\ -, -l, --login make the shell a login shell\n\ - -c, --commmand=COMMAND pass a single COMMAND to the shell with -c\n\ + -c, --command=COMMAND pass a single COMMAND to the shell with -c\n\ + --session-command=COMMAND pass a single COMMAND to the shell with -c\n\ + and do not create a new session\n\ -f, --fast pass -f to the shell (for csh or tcsh)\n\ -m, --preserve-environment do not reset environment variables\n\ -p same as -m\n\ -@@ -650,6 +672,7 @@ +@@ -631,6 +653,7 @@ int optc; const char *new_user = DEFAULT_USER; char *command = NULL; @@ -72,7 +72,7 @@ char *shell = NULL; struct passwd *pw; struct passwd pw_copy; -@@ -675,6 +698,11 @@ +@@ -656,6 +679,11 @@ command = optarg; break; @@ -84,7 +84,7 @@ case 'f': fast_startup = true; break; -@@ -744,6 +772,9 @@ +@@ -725,6 +753,9 @@ } #endif Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- coreutils.spec 2 Jan 2007 13:15:38 -0000 1.153 +++ coreutils.spec 9 Jan 2007 19:29:30 -0000 1.154 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils -Version: 5.97 -Release: 16%{?dist} +Version: 6.7 +Release: 1%{?dist} License: GPL Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -20,15 +20,9 @@ Source203: runuser-l.pamd # From upstream -Patch1: coreutils-sort-compatibility.patch -Patch2: coreutils-rename.patch -Patch10: coreutils-newhashes.patch # Our patches Patch100: coreutils-chgrp.patch -Patch107: fileutils-4.1.10-timestyle.patch -Patch182: coreutils-acl.patch -Patch183: coreutils-df-cifs.patch # sh-utils Patch703: sh-utils-2.0.11-dateman.patch @@ -47,8 +41,6 @@ Patch907: coreutils-5.2.1-runuser.patch Patch908: coreutils-getgrouplist.patch Patch912: coreutils-overflow.patch -Patch913: coreutils-afs.patch -Patch914: coreutils-autoconf.patch Patch915: coreutils-split-pam.patch #SELINUX Patch @@ -80,15 +72,9 @@ %setup -q # From upstream -%patch1 -p1 -b .sort-compatibility -%patch2 -p1 -b .rename -%patch10 -p1 -b .newhashes # Our patches %patch100 -p1 -b .chgrp -%patch107 -p1 -b .timestyle -%patch182 -p1 -b .acl -%patch183 -p1 -b .df-cifs # sh-utils %patch703 -p1 -b .dateman @@ -105,8 +91,6 @@ %patch907 -p1 -b .runuser %patch908 -p1 -b .getgrouplist %patch912 -p1 -b .overflow -%patch913 -p1 -b .afs -%patch914 -p1 -b .autoconf %patch915 -p1 -b .splitl #SELinux @@ -285,6 +269,10 @@ /sbin/runuser %changelog +* Tue Jan 9 2007 Tim Waugh 6.7-1 +- 6.7. No longer need sort-compatibility, rename, newhashes, timestyle, + acl, df-cifs, afs or autoconf patches. + * Tue Jan 2 2007 Tim Waugh - Prevent 'su --help' showing runuser-only options such as --group. Index: sources =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 25 Jun 2006 23:15:00 -0000 1.11 +++ sources 9 Jan 2007 19:29:30 -0000 1.12 @@ -1 +1,2 @@ 1537379b6264a1def443713988a78020 coreutils-5.97.tar.bz2 +a16465d0856cd011a1acc1c21040b7f4 coreutils-6.7.tar.bz2 --- coreutils-acl.patch DELETED --- --- coreutils-afs.patch DELETED --- --- coreutils-autoconf.patch DELETED --- --- coreutils-df-cifs.patch DELETED --- --- coreutils-newhashes.patch DELETED --- --- coreutils-rename.patch DELETED --- --- coreutils-sort-compatibility.patch DELETED --- --- fileutils-4.1.10-timestyle.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 9 19:44:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 14:44:28 -0500 Subject: rpms/rhpl/devel .cvsignore, 1.71, 1.72 rhpl.spec, 1.88, 1.89 sources, 1.78, 1.79 Message-ID: <200701091944.l09JiSka016076@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16060 Modified Files: .cvsignore rhpl.spec sources Log Message: * Tue Jan 09 2007 David Cantrell - 0.198-1 - Conflicts with kbd < 1.12-21 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 9 Jan 2007 13:23:29 -0000 1.71 +++ .cvsignore 9 Jan 2007 19:44:26 -0000 1.72 @@ -1,2 +1 @@ -rhpl-0.196.tar.gz -rhpl-0.197.tar.gz +rhpl-0.198.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- rhpl.spec 9 Jan 2007 13:23:29 -0000 1.88 +++ rhpl.spec 9 Jan 2007 19:44:26 -0000 1.89 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.197 +Version: 0.198 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -12,7 +12,7 @@ %endif Conflicts: kudzu < 1.2.0, hwdata < 0.169 Conflicts: wireless-tools < 28-0.pre8.5 -Conflicts: kbd < 1.12.21 +Conflicts: kbd < 1.12-21 %description The rhpl package contains Python code used by programs in Red Hat Linux. @@ -38,6 +38,9 @@ %{_libdir}/python?.?/site-packages/rhpl %changelog +* Tue Jan 09 2007 David Cantrell - 0.198-1 +- Conflicts with kbd < 1.12-21 + * Tue Jan 09 2007 Paul Nasrat - 0.197-1 - Fix Korean keyboard (#212280) Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 9 Jan 2007 13:23:29 -0000 1.78 +++ sources 9 Jan 2007 19:44:26 -0000 1.79 @@ -1 +1 @@ -901273639248835ad2ae34e491cdbd06 rhpl-0.197.tar.gz +f51147630365806062f1c5a1409c1cc0 rhpl-0.198.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 9 20:14:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 15:14:03 -0500 Subject: rpms/libofx/devel libofx.spec,1.25,1.26 Message-ID: <200701092014.l09KE3FM004984@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4969 Modified Files: libofx.spec Log Message: buildreq libtool Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libofx.spec 9 Jan 2007 17:41:20 -0000 1.25 +++ libofx.spec 9 Jan 2007 20:14:01 -0000 1.26 @@ -4,7 +4,7 @@ Summary: A library for supporting Open Financial Exchange (OFX) Name: libofx Version: 0.8.3 -Release: 1 +Release: 2 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz URL: http://libofx.sourceforge.net/ Group: System Environment/Libraries @@ -17,6 +17,7 @@ BuildRequires: libxml++-devel BuildRequires: autoconf %endif +BuildRequires: libtool Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -79,9 +80,10 @@ %{_libdir}/*.so %changelog -* Tue Jan 9 2007 Bill Nottingham - 0.8.3-1 +* Tue Jan 9 2007 Bill Nottingham - 0.8.3-2 - update to 0.8.3 - add in (not used) xml++ support pending upstream +- buildreq libtool * Mon Jan 8 2007 Bill Nottingham - 0.8.2-3 - spec tweaks From fedora-cvs-commits at redhat.com Tue Jan 9 20:42:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 15:42:32 -0500 Subject: rpms/pango/devel pango.spec,1.94,1.95 Message-ID: <200701092042.l09KgW3o015240@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15043 Modified Files: pango.spec Log Message: * Tue Jan 09 2007 Behdad Esfahbod - 1.15.3-1 - Update to 1.15.3 - Pass --with-included-modules=basic-fc. Saves one page of memory per process. Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- pango.spec 21 Dec 2006 16:05:10 -0000 1.94 +++ pango.spec 9 Jan 2007 20:42:29 -0000 1.95 @@ -7,7 +7,7 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.15.2 +Version: 1.15.3 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -70,7 +70,7 @@ %build -%configure --disable-gtk-doc +%configure --disable-gtk-doc --with-included-modules=basic-fc make %install @@ -189,6 +189,10 @@ %changelog +* Tue Jan 09 2007 Behdad Esfahbod - 1.15.3-1 +- Update to 1.15.3 +- Pass --with-included-modules=basic-fc. Saves one page of memory per process. + * Tue Dec 21 2006 Matthias Clasen - 1.15.2-1 - Update to 1.15.2 From fedora-cvs-commits at redhat.com Tue Jan 9 20:55:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 15:55:33 -0500 Subject: rpms/pango/devel .cvsignore,1.47,1.48 sources,1.47,1.48 Message-ID: <200701092055.l09KtXdb013162@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13051 Modified Files: .cvsignore sources Log Message: Update sources this time. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 21 Dec 2006 15:45:58 -0000 1.47 +++ .cvsignore 9 Jan 2007 20:55:31 -0000 1.48 @@ -1 +1 @@ -pango-1.15.2.tar.bz2 +pango-1.15.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pango/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 21 Dec 2006 15:45:58 -0000 1.47 +++ sources 9 Jan 2007 20:55:31 -0000 1.48 @@ -1 +1 @@ -3a57ff08498a210892fe665bf4812011 pango-1.15.2.tar.bz2 +f77ff87808d8e54e15a23913a13be337 pango-1.15.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 20:56:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 15:56:08 -0500 Subject: rpms/pango/devel pango.spec,1.95,1.96 Message-ID: <200701092056.l09Ku8cX013704@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13605 Modified Files: pango.spec Log Message: * Tue Jan 09 2007 Behdad Esfahbod - 1.15.3-2 - Update sources Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- pango.spec 9 Jan 2007 20:42:29 -0000 1.95 +++ pango.spec 9 Jan 2007 20:56:05 -0000 1.96 @@ -8,7 +8,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.15.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -189,6 +189,9 @@ %changelog +* Tue Jan 09 2007 Behdad Esfahbod - 1.15.3-2 +- Update sources + * Tue Jan 09 2007 Behdad Esfahbod - 1.15.3-1 - Update to 1.15.3 - Pass --with-included-modules=basic-fc. Saves one page of memory per process. From fedora-cvs-commits at redhat.com Tue Jan 9 21:01:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 16:01:00 -0500 Subject: rpms/vte/devel .cvsignore, 1.49, 1.50 sources, 1.49, 1.50 vte.spec, 1.95, 1.96 Message-ID: <200701092101.l09L10dL017400@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/vte/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17305 Modified Files: .cvsignore sources vte.spec Log Message: * Tue Jan 09 2007 Behdad Esfahbod 0.15.1-1 - Update to 0.15.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 6 Dec 2006 02:31:14 -0000 1.49 +++ .cvsignore 9 Jan 2007 21:00:53 -0000 1.50 @@ -1 +1 @@ -vte-0.15.0.tar.bz2 +vte-0.15.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vte/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 6 Dec 2006 02:31:14 -0000 1.49 +++ sources 9 Jan 2007 21:00:53 -0000 1.50 @@ -1 +1 @@ -01a256beb2c4998198a9f62d6169456d vte-0.15.0.tar.bz2 +9f04d80da655ef4bc9eee9d64a75ee0b vte-0.15.1.tar.bz2 Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- vte.spec 7 Dec 2006 18:40:43 -0000 1.95 +++ vte.spec 9 Jan 2007 21:00:53 -0000 1.96 @@ -1,6 +1,6 @@ Name: vte -Version: 0.15.0 -Release: 2%{?dist} +Version: 0.15.1 +Release: 1%{?dist} Summary: A terminal emulator License: LGPL Group: User Interface/X @@ -101,6 +101,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 09 2007 Behdad Esfahbod 0.15.1-1 +- Update to 0.15.1 + * Thu Dec 7 2006 Jeremy Katz - 0.15.0-2 - rebuild for python 2.5 From fedora-cvs-commits at redhat.com Tue Jan 9 21:11:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 16:11:35 -0500 Subject: rpms/dejavu-lgc-fonts/devel .cvsignore, 1.5, 1.6 dejavu-lgc-fonts.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200701092111.l09LBZIW025841@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25740 Modified Files: .cvsignore dejavu-lgc-fonts.spec sources Log Message: * Tue Jan 09 2007 Behdad Esfahbod - 2.13-1 - Update to 2.13 - Use .bz2 tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Sep 2006 16:14:29 -0000 1.5 +++ .cvsignore 9 Jan 2007 21:11:33 -0000 1.6 @@ -1 +1 @@ -dejavu-lgc-ttf-2.10.tar.gz +dejavu-lgc-ttf-2.13.tar.bz2 Index: dejavu-lgc-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dejavu-lgc-fonts.spec 19 Sep 2006 16:14:29 -0000 1.8 +++ dejavu-lgc-fonts.spec 9 Jan 2007 21:11:33 -0000 1.9 @@ -3,13 +3,13 @@ %define fontconfdir %{_sysconfdir}/fonts/conf.d Name: dejavu-lgc-fonts -Version: 2.10 +Version: 2.13 Release: 1 Summary: DejaVu LGC Fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sourceforge.net -Source: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz +Source: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.bz2 Source1: %{name}.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -61,6 +61,10 @@ %changelog +* Tue Jan 09 2007 Behdad Esfahbod - 2.13-1 +- Update to 2.13 +- Use .bz2 tarball + * Tue Sep 19 2006 Behdad Esfahbod - 2.10-1 - Update to 2.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Sep 2006 16:14:29 -0000 1.5 +++ sources 9 Jan 2007 21:11:33 -0000 1.6 @@ -1 +1 @@ -c156d9a7d2c00fb2e907f80334161351 dejavu-lgc-ttf-2.10.tar.gz +16ea0af8f6f009b52f21ffefb9bc19a8 dejavu-lgc-ttf-2.13.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 9 21:12:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 16:12:10 -0500 Subject: rpms/eog/devel eog-2.16.0.1-handle-svgz.patch, NONE, 1.1 eog.spec, 1.65, 1.66 Message-ID: <200701092112.l09LCAOo026378@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26275 Modified Files: eog.spec Added Files: eog-2.16.0.1-handle-svgz.patch Log Message: * Tue Jan 09 2007 Behdad Esfahbod - 2.17.3-2 - Handle svgz images - Resolves: #219782 eog-2.16.0.1-handle-svgz.patch: eog-image.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) --- NEW FILE eog-2.16.0.1-handle-svgz.patch --- --- eog-2.16.0.1/libeog/eog-image.c.handle-svgz 2006-12-19 13:31:51.000000000 -0500 +++ eog-2.16.0.1/libeog/eog-image.c 2006-12-19 13:34:26.000000000 -0500 @@ -460,7 +460,7 @@ } static GnomeVFSFileSize -eog_image_determine_file_bytes (EogImage *img, GError **error) +eog_image_determine_file_bytes (EogImage *img, gchar **mime_type, GError **error) { GnomeVFSFileInfo *info; GnomeVFSFileSize bytes; @@ -471,15 +471,20 @@ result = gnome_vfs_get_file_info_uri (img->priv->uri, info, GNOME_VFS_FILE_INFO_DEFAULT | + GNOME_VFS_FILE_INFO_GET_MIME_TYPE | GNOME_VFS_FILE_INFO_FOLLOW_LINKS); if ((result != GNOME_VFS_OK) || (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) == 0) { bytes = 0; + if (mime_type) + *mime_type = NULL; g_set_error (error, EOG_IMAGE_ERROR, EOG_IMAGE_ERROR_VFS, gnome_vfs_result_to_string (result)); } else { bytes = info->size; + if (mime_type) + *mime_type = g_strdup (info->mime_type); } gnome_vfs_file_info_unref (info); @@ -511,7 +516,7 @@ g_assert (priv->image == NULL); - priv->bytes = eog_image_determine_file_bytes (img, error); + priv->bytes = eog_image_determine_file_bytes (img, NULL, error); if (priv->bytes == 0 && (error == NULL || *error != NULL)) { return FALSE; } @@ -749,6 +754,7 @@ gboolean first_run = TRUE; EogMetadataReader *md_reader = NULL; GdkPixbufFormat *format; + gchar *mime_type; g_assert (error == NULL || *error == NULL); @@ -765,20 +771,25 @@ priv->file_type = NULL; } - priv->bytes = eog_image_determine_file_bytes (img, error); + priv->bytes = eog_image_determine_file_bytes (img, &mime_type, error); if (priv->bytes == 0 && (error == NULL || *error != NULL)) { + g_free (mime_type); return FALSE; } result = gnome_vfs_open_uri (&handle, priv->uri, GNOME_VFS_OPEN_READ); if (result != GNOME_VFS_OK) { + g_free (mime_type); g_set_error (error, EOG_IMAGE_ERROR, EOG_IMAGE_ERROR_VFS, gnome_vfs_result_to_string (result)); return FALSE; } buffer = g_new0 (guchar, READ_BUFFER_SIZE); - loader = gdk_pixbuf_loader_new (); + loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL); + g_free (mime_type); + if (loader == NULL) + loader = gdk_pixbuf_loader_new (); failed = FALSE; bytes_read_total = 0; Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- eog.spec 19 Dec 2006 21:31:23 -0000 1.65 +++ eog.spec 9 Jan 2007 21:12:08 -0000 1.66 @@ -13,9 +13,10 @@ Summary: Eye of GNOME image viewer Name: eog Version: 2.17.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 +Patch0: eog-2.16.0.1-handle-svgz.patch License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +54,8 @@ %prep %setup -q +%patch0 -p1 -b .svgz + echo "NoDisplay=true" >> eog.desktop.in.in %build @@ -114,6 +117,10 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Tue Jan 09 2007 Behdad Esfahbod - 2.17.3-2 +- Handle svgz images +- Resolves: #219782 + * Tue Dec 19 2006 Matthias Clasen - 2.17.3-1 - Update to 2.17.3 From fedora-cvs-commits at redhat.com Tue Jan 9 21:32:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 16:32:19 -0500 Subject: rpms/freetype/devel freetype-2.2.1-fix-get-orientation.patch, NONE, 1.1 freetype-2.2.1-ttcmap.patch, NONE, 1.1 freetype-2.2.1-zero-item-size.patch, NONE, 1.1 freetype.spec, 1.45, 1.46 Message-ID: <200701092132.l09LWJ2X029722@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/freetype/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29604 Modified Files: freetype.spec Added Files: freetype-2.2.1-fix-get-orientation.patch freetype-2.2.1-ttcmap.patch freetype-2.2.1-zero-item-size.patch Log Message: * Tue Jan 09 2007 Behdad Esfahbod 2.2.1-16 - Backport binary-search fixes from HEAD - Add freetype-2.2.1-ttcmap.patch - Resolves: #208734 - Fix rendering issue with some Asian fonts. - Add freetype-2.2.1-fix-get-orientation.patch - Resolves: #207261 - Copy non-X demos even if not compiling with_xfree86. - Add freetype-2.2.1-zero-item-size.patch, to fix crasher. - Resolves #214048 - Add X11_PATH=/usr to "make"s, to find modern X. - Resolves #212199 freetype-2.2.1-fix-get-orientation.patch: ftoutln.c | 143 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 103 insertions(+), 40 deletions(-) --- NEW FILE freetype-2.2.1-fix-get-orientation.patch --- 2006-10-23 Zhe Su * src/base/ftoutln.c (FT_Outline_Get_Orientation): Re-implement to better deal with broken Asian fonts with strange glyphs, having self-intersections and other peculiarities. The used algorithm is based on the nonzero winding rule. Index: src/base/ftoutln.c =================================================================== RCS file: /sources/freetype/freetype2/src/base/ftoutln.c,v retrieving revision 1.68 retrieving revision 1.72 diff -u -r1.68 -r1.72 --- src/base/ftoutln.c 21 Mar 2006 21:36:33 -0000 1.68 +++ src/base/ftoutln.c 24 Oct 2006 05:28:45 -0000 1.72 @@ -934,7 +934,8 @@ FT_Outline_Get_Orientation( FT_Outline* outline ) { FT_Pos xmin = 32768L; - FT_Vector* xmin_point = NULL; + FT_Pos xmin_ymin = 32768L; + FT_Pos xmin_ymax = -32768L; FT_Vector* xmin_first = NULL; FT_Vector* xmin_last = NULL; @@ -943,22 +944,31 @@ FT_Vector* first; FT_Vector* last; FT_Vector* prev; - FT_Vector* next; + FT_Vector* point; + + int i; + FT_Pos ray_y[3]; + int result[3]; if ( !outline || outline->n_points <= 0 ) return FT_ORIENTATION_TRUETYPE; + /* We use the nonzero winding rule to find the orientation. */ + /* Since glyph outlines behave much more `regular' than arbitrary */ + /* cubic or quadratic curves, this test deals with the polygon */ + /* only which is spanned up by the control points. */ + first = outline->points; for ( contour = outline->contours; contour < outline->contours + outline->n_contours; contour++, first = last + 1 ) { - FT_Vector* point; - FT_Int on_curve; - FT_Int on_curve_count = 0; - FT_Pos tmp_xmin = 32768L; - FT_Vector* tmp_xmin_point = NULL; + FT_Pos contour_xmin = 32768L; + FT_Pos contour_xmax = -32768L; + FT_Pos contour_ymin = 32768L; + FT_Pos contour_ymax = -32768L; + last = outline->points + *contour; @@ -968,55 +978,108 @@ for ( point = first; point <= last; ++point ) { - /* Count on-curve points. If there are less than 3 on-curve */ - /* points, just bypass this contour. */ - on_curve = outline->tags[point - outline->points] & 1; - on_curve_count += on_curve; + if ( point->x < contour_xmin ) + contour_xmin = point->x; - if ( point->x < tmp_xmin && on_curve ) - { - tmp_xmin = point->x; - tmp_xmin_point = point; - } + if ( point->x > contour_xmax ) + contour_xmax = point->x; + + if ( point->y < contour_ymin ) + contour_ymin = point->y; + + if ( point->y > contour_ymax ) + contour_ymax = point->y; } - if ( on_curve_count > 2 && tmp_xmin < xmin ) + if ( contour_xmin < xmin && + contour_xmin != contour_xmax && + contour_ymin != contour_ymax ) { - xmin = tmp_xmin; - xmin_point = tmp_xmin_point; + xmin = contour_xmin; + xmin_ymin = contour_ymin; + xmin_ymax = contour_ymax; xmin_first = first; xmin_last = last; } } - if ( !xmin_point ) + if ( xmin == 32768 ) return FT_ORIENTATION_TRUETYPE; - prev = ( xmin_point == xmin_first ) ? xmin_last : xmin_point - 1; - next = ( xmin_point == xmin_last ) ? xmin_first : xmin_point + 1; + ray_y[0] = ( xmin_ymin * 3 + xmin_ymax ) >> 2; + ray_y[1] = ( xmin_ymin + xmin_ymax ) >> 1; + ray_y[2] = ( xmin_ymin + xmin_ymax * 3 ) >> 2; - /* Skip off-curve points */ - while ( ( outline->tags[prev - outline->points] & 1 ) == 0 ) + for ( i = 0; i < 3; i++ ) { - if ( prev == xmin_first ) - prev = xmin_last; - else - --prev; - } + FT_Pos left_x; + FT_Pos right_x; + FT_Vector* left1; + FT_Vector* left2; + FT_Vector* right1; + FT_Vector* right2; + + + RedoRay: + left_x = 32768L; + right_x = -32768L; - while ( ( outline->tags[next - outline->points] & 1 ) == 0 ) - { - if ( next == xmin_last ) - next = xmin_first; - else - ++next; + left1 = left2 = right1 = right2 = NULL; + + prev = xmin_last; + for ( point = xmin_first; point <= xmin_last; prev = point, ++point ) + { + FT_Pos tmp_x; + + + if ( point->y == ray_y[i] || prev->y == ray_y[i] ) + { + ray_y[i]++; + goto RedoRay; + } + + if ( ( point->y < ray_y[i] && prev->y < ray_y[i] ) || + ( point->y > ray_y[i] && prev->y > ray_y[i] ) ) + continue; + + tmp_x = FT_MulDiv( point->x - prev->x, + ray_y[i] - prev->y, + point->y - prev->y ) + prev->x; + + if ( tmp_x < left_x ) + { + left_x = tmp_x; + left1 = prev; + left2 = point; + } + + if ( tmp_x > right_x ) + { + right_x = tmp_x; + right1 = prev; + right2 = point; + } + } + + if ( left1 && right1 ) + { + if ( left1->y < left2->y && right1->y > right2->y ) + result[i] = FT_ORIENTATION_TRUETYPE; + else if ( left1->y > left2->y && right1->y < right2->y ) + result[i] = FT_ORIENTATION_POSTSCRIPT; + else + result[i] = FT_ORIENTATION_NONE; + } } - if ( FT_Atan2( prev->x - xmin_point->x, prev->y - xmin_point->y ) > - FT_Atan2( next->x - xmin_point->x, next->y - xmin_point->y ) ) - return FT_ORIENTATION_POSTSCRIPT; - else - return FT_ORIENTATION_TRUETYPE; + if ( result[0] != FT_ORIENTATION_NONE && + ( result[0] == result[1] || result[0] == result[2] ) ) + return result[0]; + + if ( result[1] != FT_ORIENTATION_NONE && result[1] == result[2] ) + return result[1]; + + return FT_ORIENTATION_TRUETYPE; } freetype-2.2.1-ttcmap.patch: ttcmap.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE freetype-2.2.1-ttcmap.patch --- --- freetype-2.2.1/src/sfnt/ttcmap.c.orig 2006-04-21 21:05:29.000000000 -0700 +++ freetype-2.2.1/src/sfnt/ttcmap.c 2006-09-30 22:30:24.000000000 -0700 @@ -1095,13 +1095,17 @@ for ( i = max ; i > 0; i-- ) { FT_UInt prev_end; + FT_Byte* old_p; - + old_p = p; p = cmap->data + 14 + ( i - 1 ) * 2; prev_end = TT_PEEK_USHORT( p ); if ( charcode > prev_end ) + { + p = old_p; break; + } end = prev_end; p += 2 + num_segs2; @@ -2273,7 +2277,7 @@ if ( offset && offset <= face->cmap_size - 2 ) { - FT_Byte* cmap = table + offset; + FT_Byte* volatile cmap = table + offset; volatile FT_UInt format = TT_PEEK_USHORT( cmap ); const TT_CMap_Class* volatile pclazz = tt_cmap_classes; TT_CMap_Class volatile clazz; freetype-2.2.1-zero-item-size.patch: ftutil.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE freetype-2.2.1-zero-item-size.patch --- --- freetype-2.2.1/src/base/ftutil.c.zero-size 2006-05-02 14:47:14.000000000 -0700 +++ freetype-2.2.1/src/base/ftutil.c 2006-11-04 19:44:36.000000000 -0800 @@ -120,12 +120,16 @@ FT_Error error = FT_Err_Ok; - if ( cur_count < 0 || new_count < 0 || item_size <= 0 ) + /* Note that we now accept `item_size == 0' as a valid parameter, in + * order to cover very weird cases where an ALLOC_MULT macro would be + * called. + */ + if ( cur_count < 0 || new_count < 0 || item_size < 0 ) { /* may help catch/prevent nasty security issues */ error = FT_Err_Invalid_Argument; } - else if ( new_count == 0 ) + else if ( new_count == 0 || item_size == 0 ) { ft_mem_free( memory, block ); block = NULL; Index: freetype.spec =================================================================== RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- freetype.spec 11 Sep 2006 18:32:02 -0000 1.45 +++ freetype.spec 9 Jan 2007 21:32:17 -0000 1.46 @@ -7,7 +7,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.2.1 -Release: 10%{?dist} +Release: 16%{?dist} License: BSD/GPL dual license Group: System Environment/Libraries URL: http://www.freetype.org @@ -31,8 +31,11 @@ # Upstream patches Patch100: freetype-composite.patch Patch101: freetype-more-composite.patch +Patch102: freetype-2.2.1-zero-item-size.patch +Patch103: freetype-2.2.1-fix-get-orientation.patch +Patch104: freetype-2.2.1-ttcmap.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root +Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: libX11-devel @@ -90,6 +93,9 @@ %patch100 -p1 -b .composite %patch101 -p1 -b .more-composite +%patch102 -p1 -b .zero-item-size +%patch103 -p0 -b .fix-get-orientation +%patch104 -p1 -b .ttcmap %build # Work around code generation problem with strict-aliasing @@ -101,14 +107,14 @@ # Build Freetype 2 { %configure --disable-static - make %{?_smp_mflags} + make X11_PATH=/usr %{?_smp_mflags} } %if %{with_xfree86} # Build freetype 2 demos { pushd ft2demos-%{version} - make TOP_DIR=".." + make X11_PATH=/usr TOP_DIR=".." popd } %endif @@ -120,10 +126,15 @@ # Install Freetype 2 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale +{ + for ftdemo in ftbench ftchkwd ftdump ftlint ftmemchk ftvalid ; do + builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} + done +} %if %{with_xfree86} # Install freetype 2 demos { - for ftdemo in ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview ; do + for ftdemo in ftgamma ftmulti ftstring fttimer ftview ; do builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} done } @@ -207,6 +218,23 @@ %{_libdir}/pkgconfig/ %changelog +* Tue Jan 09 2007 Behdad Esfahbod 2.2.1-16 +- Backport binary-search fixes from HEAD +- Add freetype-2.2.1-ttcmap.patch +- Resolves: #208734 + +- Fix rendering issue with some Asian fonts. +- Add freetype-2.2.1-fix-get-orientation.patch +- Resolves: #207261 + +- Copy non-X demos even if not compiling with_xfree86. + +- Add freetype-2.2.1-zero-item-size.patch, to fix crasher. +- Resolves #214048 + +- Add X11_PATH=/usr to "make"s, to find modern X. +- Resolves #212199 + * Mon Sep 11 2006 Behdad Esfahbod 2.2.1-10 - Fix crasher https://bugs.freedesktop.org/show_bug.cgi?id=6841 - Add freetype-2.2.1-memcpy-fix.patch From fedora-cvs-commits at redhat.com Tue Jan 9 21:42:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 16:42:12 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.204,1.205 Message-ID: <200701092142.l09LgCt1025583@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25566 Modified Files: gtk2.spec Log Message: * Tue Jan 09 2007 Behdad Esfahbod - 2.10.7-2 - Configure with --with-included-loaders=png. Saves a page per process Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- gtk2.spec 6 Jan 2007 00:43:51 -0000 1.204 +++ gtk2.spec 9 Jan 2007 21:42:10 -0000 1.205 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 @@ -151,7 +151,7 @@ exit 1 fi -%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds +%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed ## past gtk 2.1.2 @@ -297,7 +297,10 @@ %doc tmpdocs/examples %changelog -* Thu Dec 21 2006 Matthias Clasen - 2.10.4-9 +* Tue Jan 09 2007 Behdad Esfahbod - 2.10.7-2 +- Configure with --with-included-loaders=png. Saves a page per process + +* Thu Dec 21 2006 Matthias Clasen - 2.10.7-1 - Make gdk_pixbuf_loader_close() idempotent - Always emit the closed signal when the loader is closed From fedora-cvs-commits at redhat.com Tue Jan 9 21:59:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 16:59:59 -0500 Subject: rpms/libofx/devel libofx.spec,1.26,1.27 Message-ID: <200701092159.l09Lxx1r014368@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/libofx/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14348 Modified Files: libofx.spec Log Message: more tweakage Index: libofx.spec =================================================================== RCS file: /cvs/dist/rpms/libofx/devel/libofx.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libofx.spec 9 Jan 2007 20:14:01 -0000 1.26 +++ libofx.spec 9 Jan 2007 21:59:57 -0000 1.27 @@ -32,6 +32,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig +Requires: opensp-devel %description devel The libofx-devel contains the header files and libraries necessary @@ -67,7 +68,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README totest.txt +%doc AUTHORS COPYING ChangeLog NEWS README totest.txt %{_bindir}/* %{_libdir}/*.so.* %{_datadir}/libofx @@ -84,6 +85,7 @@ - update to 0.8.3 - add in (not used) xml++ support pending upstream - buildreq libtool +- add opensp-devel buildreq, remove INSTALL * Mon Jan 8 2007 Bill Nottingham - 0.8.2-3 - spec tweaks From fedora-cvs-commits at redhat.com Tue Jan 9 22:04:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 9 Jan 2007 17:04:53 -0500 Subject: rpms/xen/FC-6 xen-blktap-2tb.patch, NONE, 1.1 xen-blktap-error-reporting.patch, NONE, 1.1 xen-core-2gb.patch, NONE, 1.1 xen-dumpdir.patch, NONE, 1.1 xen-floppy-device.patch, NONE, 1.1 xen-http-dump.patch, NONE, 1.1 xen-hvm-rtc-hv.patch, NONE, 1.1 xen-ja-keyboard.patch, NONE, 1.1 xen-memory-map.patch, NONE, 1.1 xen-pci-config-overflow.patch, NONE, 1.1 xen-qemu-8139c-chaining.patch, NONE, 1.1 xen-qemu-cdrom-dma.patch, NONE, 1.1 xen-qemu-error-reporting.patch, NONE, 1.1 xen-qemu-floppy-overflow.patch, NONE, 1.1 xen-qemu-hdd-limit.patch, NONE, 1.1 xen-qemu-memory-check.patch, NONE, 1.1 xen-qemu-ne2000-buffer.patch, NONE, 1.1 xen-qemu-uppercase.patch, NONE, 1.1 xen-qemu-usb-buffer.patch, NONE, 1.1 xen-vnc-domid-vm.patch, NONE, 1.1 xen-xc-loglevel.patch, NONE, 1.1 xen-xenbus-force-option.patch, NONE, 1.1 xen-xendomains-clean-restore.patch, NONE, 1.1 xen-xm-list-memory.patch, NONE, 1.1 xen.spec, 1.158, 1.159 Message-ID: <200701092204.l09M4rxT014602@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14577 Modified Files: xen.spec Added Files: xen-blktap-2tb.patch xen-blktap-error-reporting.patch xen-core-2gb.patch xen-dumpdir.patch xen-floppy-device.patch xen-http-dump.patch xen-hvm-rtc-hv.patch xen-ja-keyboard.patch xen-memory-map.patch xen-pci-config-overflow.patch xen-qemu-8139c-chaining.patch xen-qemu-cdrom-dma.patch xen-qemu-error-reporting.patch xen-qemu-floppy-overflow.patch xen-qemu-hdd-limit.patch xen-qemu-memory-check.patch xen-qemu-ne2000-buffer.patch xen-qemu-uppercase.patch xen-qemu-usb-buffer.patch xen-vnc-domid-vm.patch xen-xc-loglevel.patch xen-xenbus-force-option.patch xen-xendomains-clean-restore.patch xen-xm-list-memory.patch Log Message: Pull in latest patches from RHEL-5 branch (except PVFB changes) xen-blktap-2tb.patch: drivers/blktapctrl.c | 2 +- drivers/blktapctrl.h | 6 +++--- drivers/tapdisk.h | 6 +++--- lib/blktaplib.h | 12 ++++++------ lib/xenbus.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) --- NEW FILE xen-blktap-2tb.patch --- changeset: 12588:4666710bfc559a92737c3998dc7790418be8ab63 user: kfraser at localhost.localdomain date: Tue Nov 28 13:50:32 2006 +0000 files: tools/blktap/drivers/blktapctrl.c tools/blktap/drivers/blktapctrl.h tools/blktap/drivers/tapdisk.h tools/blktap/lib/blktaplib.h tools/blktap/lib/xenbus.c description: [BLKTAP] Use lartge enough types to express parameters of large block devices. While the kernel side of blktap drivers is using 64-bit sector numbers correctly when reporting disk sizing, the userspace parts where this dat is actually generated is truncating at 32-bit. There are 3 variables related to disk sizing which are used in the kernel/userspace code 'size', 'sector size' & 'info'. In kernel space these are treated as being unsigned long long, unsigned long, and unsigned int, respectively. In the blktap userspace code this were all varyingly long, unsigned long. This mismatch caused 32-bit wraparound on large disks. The attached patch updates the blktap userspace to use the same data types as kernel space for all these params, thus both fixing the 32-bit bug & giving the code consistency. This patch has been tested both by comparing /proc/partitions in the guest, with the image size seen in the host, and by using Stephen Tweedie's 'verify-data' tool on a variety of multi-TB sized disks. Signed-off-by: Daniel P. Berrange diff -r 99878f3f74eec9981c48d0e5c76e6ba269ae470f -r 4666710bfc559a92737c3998dc7790418be8ab63 tools/blktap/drivers/blktapctrl.c --- a/tools/blktap/drivers/blktapctrl.c Tue Nov 28 13:48:47 2006 +0000 +++ b/tools/blktap/drivers/blktapctrl.c Tue Nov 28 13:50:32 2006 +0000 @@ -420,7 +420,7 @@ static int read_msg(int fd, int msgtype, image->secsize = img->secsize; image->info = img->info; - DPRINTF("Received CTLMSG_IMG: %lu, %lu, %lu\n", + DPRINTF("Received CTLMSG_IMG: %llu, %lu, %u\n", image->size, image->secsize, image->info); if(msgtype != CTLMSG_IMG) ret = 0; break; diff -r 99878f3f74eec9981c48d0e5c76e6ba269ae470f -r 4666710bfc559a92737c3998dc7790418be8ab63 tools/blktap/drivers/blktapctrl.h --- a/tools/blktap/drivers/blktapctrl.h Tue Nov 28 13:48:47 2006 +0000 +++ b/tools/blktap/drivers/blktapctrl.h Tue Nov 28 13:50:32 2006 +0000 @@ -30,19 +30,19 @@ */ -static inline long int tapdisk_get_size(blkif_t *blkif) +static inline unsigned long long tapdisk_get_size(blkif_t *blkif) { image_t *img = (image_t *)blkif->prv; return img->size; } -static inline long int tapdisk_get_secsize(blkif_t *blkif) +static inline unsigned long tapdisk_get_secsize(blkif_t *blkif) { image_t *img = (image_t *)blkif->prv; return img->secsize; } -static inline unsigned tapdisk_get_info(blkif_t *blkif) +static inline unsigned int tapdisk_get_info(blkif_t *blkif) { image_t *img = (image_t *)blkif->prv; return img->info; diff -r 99878f3f74eec9981c48d0e5c76e6ba269ae470f -r 4666710bfc559a92737c3998dc7790418be8ab63 tools/blktap/drivers/tapdisk.h --- a/tools/blktap/drivers/tapdisk.h Tue Nov 28 13:48:47 2006 +0000 +++ b/tools/blktap/drivers/tapdisk.h Tue Nov 28 13:50:32 2006 +0000 @@ -74,9 +74,9 @@ struct td_state { void *ring_info; void *fd_entry; char backing_file[1024]; /*Used by differencing disks, e.g. qcow*/ - long int sector_size; - uint64_t size; - long int info; + unsigned long sector_size; + unsigned long long size; + unsigned int info; }; /* Prototype of the callback to activate as requests complete. */ diff -r 99878f3f74eec9981c48d0e5c76e6ba269ae470f -r 4666710bfc559a92737c3998dc7790418be8ab63 tools/blktap/lib/blktaplib.h --- a/tools/blktap/lib/blktaplib.h Tue Nov 28 13:48:47 2006 +0000 +++ b/tools/blktap/lib/blktaplib.h Tue Nov 28 13:50:32 2006 +0000 @@ -97,9 +97,9 @@ typedef struct { } pending_req_t; struct blkif_ops { - long int (*get_size)(struct blkif *blkif); - long int (*get_secsize)(struct blkif *blkif); - unsigned (*get_info)(struct blkif *blkif); + unsigned long long (*get_size)(struct blkif *blkif); + unsigned long (*get_secsize)(struct blkif *blkif); + unsigned int (*get_info)(struct blkif *blkif); }; typedef struct blkif { @@ -156,9 +156,9 @@ typedef struct domid_translate { } domid_translate_t ; typedef struct image { - long int size; - long int secsize; - long int info; + unsigned long long size; + unsigned long secsize; + unsigned int info; } image_t; typedef struct msg_hdr { diff -r 99878f3f74eec9981c48d0e5c76e6ba269ae470f -r 4666710bfc559a92737c3998dc7790418be8ab63 tools/blktap/lib/xenbus.c --- a/tools/blktap/lib/xenbus.c Tue Nov 28 13:48:47 2006 +0000 +++ b/tools/blktap/lib/xenbus.c Tue Nov 28 13:50:32 2006 +0000 @@ -219,7 +219,7 @@ static void ueblktap_setup(struct xs_han } /* Supply the information about the device to xenstore */ - er = xs_printf(h, be->backpath, "sectors", "%lu", + er = xs_printf(h, be->backpath, "sectors", "%llu", be->blkif->ops->get_size(be->blkif)); if (er == 0) { xen-blktap-error-reporting.patch: block-aio.c | 8 ++------ block-qcow.c | 9 +-------- tapdisk.c | 3 +-- 3 files changed, 4 insertions(+), 16 deletions(-) --- NEW FILE xen-blktap-error-reporting.patch --- changeset: 12701:69efe6730fb1e2972f1413a877d88a6c09ca4451 user: Andrew Warfield date: Fri Dec 01 09:01:04 2006 -0800 files: tools/blktap/drivers/block-aio.c tools/blktap/drivers/block-qcow.c tools/blktap/drivers/tapdisk.c description: Fix a number of flaws in the blktap userspace daemon when dealing with I/O errors. There are a number of flaws in the blktap userspace daemon when dealing with I/O errors. - The backends which use AIO check the io_events.res member to determine if an I/O error occurred. Which is good. But when calling the callback to signal completion of the I/O, they pass the io_events.res2 member Now this seems fine at first glance[1] "res is the usual result of an I/O operation: the number of bytes transfered, or a negative error code. res2 is a second status value which will be returned to the user" Except that "currently (2.6.0-test9), callers of aio_complete() within the kernel always set res2 to zero." And this hasn't changed anytime since 2.6.0, so by passing through the status from 'res2', the callback thinks the I/O operation succeeded even when it failed :-( The fix is simple instead of passing 'res2', just pass ep->res == io->u.c.nbytes ? 0 : 1 This would solve the error reporting to the guest, except that there is a second flaw... - The tapdisk I/O completion callback checks the status parameter passed in, syslog's it and then returns. It never bothers to send the I/O completion response back to the blktap kernel driver when a failure occurrs. Fortunately the fix for this is also simple. Instead of returning from the callback when dealing with an error, we simply toggle the status field for the pending response to BLKIF_RSP_ERROR and then continue with the normal codepath. So the error eventually gets back to the guest. The scenario I used to discover the problem and test the patch is thus: - In dom0 create a filesystem with only 200 MB of free space - Create a 1 GB sparse file on this volume. - Configure the guest so this sparse file appears as /dev/xvdb - In the domU create a single partition on /dev/xvdb and format it with ext3. - In the DomU, mount /dev/xvdb1 on /mnt and then run dd if=/dev/zero of=/mnt/data.bin bs=1GB count=1 Without this patch, the 'dd' command would succeed in writing 1 GB of data even though the underlying disk in Dom0 was only 200 MB in size. More complex tests of copying a whole directory heirarchy across resulted in catastrophic data corruption of the filessytem itself. Manual fsck was needed to fixup the filesystem & there were many very bad errors needing fixing. With this patch applied the DomU sees the I/O failures and kernel logs messages Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 722127 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 730327 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 738527 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 746727 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 754927 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 763127 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 771327 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 779527 Dec 1 11:02:53 dhcp-5-203 kernel: end_request: I/O error, dev xvdc, sector 792399 It will retry the I/O operation until it runs out of sectors to try, and then fail the operation. The filesystem is not seriously damaged - ext3 journal recovery will trivially cleanup if the guest is rebooted after the disk in Dom0 is enlarged. Signed-off-by: Daniel P. Berrange [1] http://lwn.net/Articles/24366/ diff -r c4225c95dbcd8956ff88d088d04c30009c887cc8 -r 69efe6730fb1e2972f1413a877d88a6c09ca4451 tools/blktap/drivers/block-aio.c --- a/tools/blktap/drivers/block-aio.c Fri Dec 01 16:31:36 2006 +0000 +++ b/tools/blktap/drivers/block-aio.c Fri Dec 01 09:01:04 2006 -0800 @@ -311,12 +311,8 @@ int tdaio_do_callbacks(struct td_state * struct pending_aio *pio; pio = &prv->pending_aio[(long)io->data]; - - if (ep->res != io->u.c.nbytes) { - /* TODO: handle this case better. */ - DPRINTF("AIO did less than I asked it to. \n"); - } - rsp += pio->cb(s, ep->res2, pio->id, pio->private); + rsp += pio->cb(s, ep->res == io->u.c.nbytes ? 0 : 1, + pio->id, pio->private); prv->iocb_free[prv->iocb_free_count++] = io; } diff -r c4225c95dbcd8956ff88d088d04c30009c887cc8 -r 69efe6730fb1e2972f1413a877d88a6c09ca4451 tools/blktap/drivers/block-qcow.c --- a/tools/blktap/drivers/block-qcow.c Fri Dec 01 16:31:36 2006 +0000 +++ b/tools/blktap/drivers/block-qcow.c Fri Dec 01 09:01:04 2006 -0800 @@ -1145,13 +1145,6 @@ int tdqcow_do_callbacks(struct td_state pio = &prv->pending_aio[(long)io->data]; - if (ep->res != io->u.c.nbytes) { - /* TODO: handle this case better. */ - ptr = (int *)&ep->res; - DPRINTF("AIO did less than I asked it to " - "[%lu,%lu,%d]\n", - ep->res, io->u.c.nbytes, *ptr); - } aio_unlock(prv, pio->sector); if (pio->id >= 0) { if (prv->crypt_method) @@ -1162,7 +1155,7 @@ int tdqcow_do_callbacks(struct td_state &prv->aes_decrypt_key); prv->nr_reqs[pio->qcow_idx]--; if (prv->nr_reqs[pio->qcow_idx] == 0) - rsp += pio->cb(s, ep->res2, pio->id, + rsp += pio->cb(s, ep->res == io->u.c.nbytes ? 0 : 1, pio->id, pio->private); } else if (pio->id == -2) free(pio->buf); diff -r c4225c95dbcd8956ff88d088d04c30009c887cc8 -r 69efe6730fb1e2972f1413a877d88a6c09ca4451 tools/blktap/drivers/tapdisk.c --- a/tools/blktap/drivers/tapdisk.c Fri Dec 01 16:31:36 2006 +0000 +++ b/tools/blktap/drivers/tapdisk.c Fri Dec 01 09:01:04 2006 -0800 @@ -424,8 +424,7 @@ int send_responses(struct td_state *s, i } if (res != 0) { - DPRINTF("*** request error %d! \n", res); - return 0; + blkif->pending_list[idx].status = BLKIF_RSP_ERROR; } blkif->pending_list[idx].count--; xen-core-2gb.patch: Makefile | 4 ++++ xc_core.c | 3 +!! 2 files changed, 5 insertions(+), 2 modifications(!) --- NEW FILE xen-core-2gb.patch --- diff -rc xen-3.0.3_0-src/tools/libxc/Makefile xen-3.0.3_0-src.new/tools/libxc/Makefile *** xen-3.0.3_0-src/tools/libxc/Makefile 2006-10-15 08:22:03.000000000 -0400 --- xen-3.0.3_0-src.new/tools/libxc/Makefile 2006-11-15 16:08:47.000000000 -0500 *************** *** 39,44 **** --- 39,48 ---- CFLAGS += -fno-strict-aliasing CFLAGS += $(INCLUDES) -I. + # Enable large file support. + CFLAGS += $(shell getconf LFS64_CFLAGS) + LDFLAGS += $(shell getconf LFS64_LDFLAGS) $(shell getconf LFS64_LIBS) + # Define this to make it possible to run valgrind on code linked with these # libraries. #CFLAGS += -DVALGRIND -O0 -ggdb3 diff -rc xen-3.0.3_0-src/tools/libxc/xc_core.c xen-3.0.3_0-src.new/tools/libxc/xc_core.c *** xen-3.0.3_0-src/tools/libxc/xc_core.c 2006-10-15 08:22:03.000000000 -0400 --- xen-3.0.3_0-src.new/tools/libxc/xc_core.c 2006-11-15 16:07:02.000000000 -0500 *************** *** 1,6 **** --- 1,7 ---- #include "xg_private.h" #include #include + #include /* number of pages to write at a time */ #define DUMP_INCREMENT (4 * 1024) *************** *** 156,162 **** struct dump_args da; int sts; ! if ( (da.fd = open(corename, O_CREAT|O_RDWR, S_IWUSR|S_IRUSR)) < 0 ) { PERROR("Could not open corefile %s: %s", corename, strerror(errno)); return -errno; --- 157,163 ---- struct dump_args da; int sts; ! if ( (da.fd = open(corename, O_CREAT|O_RDWR|O_LARGEFILE, S_IWUSR|S_IRUSR)) < 0 ) { PERROR("Could not open corefile %s: %s", corename, strerror(errno)); return -errno; xen-dumpdir.patch: Makefile | 2 +- debugger/gdb/README | 2 +- python/xen/xend/XendDomainInfo.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE xen-dumpdir.patch --- diff -r a5a3f48e92c9 tools/Makefile --- a/tools/Makefile Wed Oct 04 19:00:11 2006 +0100 +++ b/tools/Makefile Thu Oct 26 11:48:20 2006 -0400 @@ -38,7 +38,7 @@ install: check $(MAKE) -C $$subdir $@; \ done $(MAKE) ioemuinstall - $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump + $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen/dump $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen .PHONY: clean diff -r a5a3f48e92c9 tools/debugger/gdb/README --- a/tools/debugger/gdb/README Wed Oct 04 19:00:11 2006 +0100 +++ b/tools/debugger/gdb/README Thu Oct 26 11:48:34 2006 -0400 @@ -33,6 +33,6 @@ To debug a crashed domU guest: 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before starting xend. 2. When the domain crashes, a core file is written to - '/var/xen/dump/..core'. + '/var/lib/xen/dump/..core'. 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. 4. Connect to the server as for a running guest. diff -r a5a3f48e92c9 tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Wed Oct 04 19:00:11 2006 +0100 +++ b/tools/python/xen/xend/XendDomainInfo.py Thu Oct 26 11:47:46 2006 -0400 @@ -986,7 +986,7 @@ class XendDomainInfo: try: if not corefile: this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) - corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time, + corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time, self.info['name'], self.domid) if os.path.isdir(corefile): xen-floppy-device.patch: image.py | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-floppy-device.patch --- --- a/tools/python/xen/xend/image.py.orig 2006-11-29 08:58:45.000000000 -0500 +++ b/tools/python/xen/xend/image.py 2006-11-29 08:59:01.000000000 -0500 @@ -397,7 +397,7 @@ class HVMImageHandler(ImageHandler): if a in ['fda', 'fdb' ]: if v: - if not os.path.isfile(v): + if not os.path.isabs(v): raise VmError("Floppy file %s does not exist." % v) log.debug("args: %s, val: %s" % (a,v)) xen-http-dump.patch: SrvDomain.py | 12 ++++++++++++ 1 files changed, 12 insertions(+) --- NEW FILE xen-http-dump.patch --- diff -r c677f4e75608 tools/python/xen/xend/server/SrvDomain.py --- a/tools/python/xen/xend/server/SrvDomain.py Thu Nov 16 11:11:17 2006 +0000 +++ b/tools/python/xen/xend/server/SrvDomain.py Tue Nov 21 17:49:17 2006 +0100 @@ -81,6 +81,18 @@ class SrvDomain(SrvDir): def do_save(self, _, req): return self.xd.domain_save(self.dom.domid, req.args['file'][0]) + + def op_dump(self, op, req): + self.acceptCommand(req) + return req.threadRequest(self.do_dump, op, req) + + def do_dump(self, _, req): + fn = FormFn(self.xd.domain_dump, + [['dom', 'int'], + ['file', 'str'], + ['live', 'int'], + ['crash', 'int']]) + return fn(req.args, {'dom': self.dom.domid}) def op_migrate(self, op, req): return req.threadRequest(self.do_migrate, op, req) xen-hvm-rtc-hv.patch: tools/firmware/acpi/acpi_fadt.h | 9 +-- tools/ioemu/Makefile.target | 8 ++ tools/ioemu/target-i386-dm/rtc-dm.c | 107 ++++++++++++++++++++++++++++++++++++ xen/include/public/hvm/ioreq.h | 4 + 4 files changed, 124 insertions(+), 4 deletions(-) --- NEW FILE xen-hvm-rtc-hv.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID 71e2a165aa7f81602c569430b18ba1ea705f0b70 # Parent da66691687dfd90c55420cfdf27f55d18cca7810 [HVM] Move RTC emulation into the hypervisor. Signed-off-by: Xiaowei Yang Index: xen-3.0.3_0-src/tools/ioemu/Makefile.target =================================================================== --- xen-3.0.3_0-src.orig/tools/ioemu/Makefile.target +++ xen-3.0.3_0-src/tools/ioemu/Makefile.target @@ -294,7 +294,11 @@ OBJS+=gdbstub.o endif # qemu-dm objects +ifeq ($(ARCH),ia64) LIBOBJS=helper2.o exec-dm.o i8259-dm.o +else +LIBOBJS=helper2.o exec-dm.o i8259-dm.o rtc-dm.o +endif all: $(PROGS) @@ -354,7 +358,11 @@ VL_OBJS+= ne2000.o rtl8139.o pcnet.o ifeq ($(TARGET_BASE_ARCH), i386) # Hardware support VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV) +ifeq ($(ARCH),ia64) VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o +else +VL_OBJS+= fdc.o serial.o pc.o +endif VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o VL_OBJS+= usb-uhci.o VL_OBJS+= piix4acpi.o Index: xen-3.0.3_0-src/tools/ioemu/target-i386-dm/rtc-dm.c =================================================================== --- /dev/null +++ xen-3.0.3_0-src/tools/ioemu/target-i386-dm/rtc-dm.c @@ -0,0 +1,107 @@ +/* + * QEMU MC146818 RTC emulation + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "vl.h" + +//#define DEBUG_CMOS + +struct RTCState { + uint8_t cmos_data[128]; + uint8_t cmos_index; +}; + +void rtc_set_memory(RTCState *s, int addr, int val) +{ + if (addr >= 0 && addr <= 127) + s->cmos_data[addr] = val; +} + +static void cmos_ioport_write(void *opaque, uint32_t addr, uint32_t data) +{ + RTCState *s = opaque; + + if ((addr & 1) == 0) { + s->cmos_index = data & 0x7f; + } else { +#ifdef DEBUG_CMOS + printf("cmos: write index=0x%02x val=0x%02x\n", + s->cmos_index, data); +#endif + s->cmos_data[s->cmos_index] = data; + } +} + +static uint32_t cmos_ioport_read(void *opaque, uint32_t addr) +{ + RTCState *s = opaque; + int ret; + if ((addr & 1) == 0) { + return 0xff; + } else { + ret = s->cmos_data[s->cmos_index]; +#ifdef DEBUG_CMOS + printf("cmos: read index=0x%02x val=0x%02x\n", + s->cmos_index, ret); +#endif + return ret; + } +} + +static void rtc_save(QEMUFile *f, void *opaque) +{ + RTCState *s = opaque; + + qemu_put_buffer(f, s->cmos_data, 128); + qemu_put_8s(f, &s->cmos_index); +} + +static int rtc_load(QEMUFile *f, void *opaque, int version_id) +{ + RTCState *s = opaque; + + if (version_id != 1) + return -EINVAL; + + qemu_get_buffer(f, s->cmos_data, 128); + qemu_get_8s(f, &s->cmos_index); + + return 0; +} + +RTCState *rtc_init(int base, int irq) +{ + RTCState *s; + + s = qemu_mallocz(sizeof(RTCState)); + if (!s) + return NULL; + + register_ioport_write(base, 2, 1, cmos_ioport_write, s); + register_ioport_read(base, 2, 1, cmos_ioport_read, s); + + register_savevm("mc146818rtc", base, 1, rtc_save, rtc_load, s); + return s; +} + +void rtc_set_date(RTCState *s, const struct tm *tm) {} Index: xen-3.0.3_0-src/tools/firmware/acpi/acpi_fadt.h =================================================================== --- xen-3.0.3_0-src.orig/tools/firmware/acpi/acpi_fadt.h +++ xen-3.0.3_0-src/tools/firmware/acpi/acpi_fadt.h @@ -18,6 +18,8 @@ #ifndef _FADT_H_ #define _FADT_H_ +#include + // // FADT Definitions, see ACPI 2.0 specification for details. // @@ -51,7 +53,9 @@ // // Fixed Feature Flags // -#define ACPI_FIXED_FEATURE_FLAGS (ACPI_PROC_C1|ACPI_SLP_BUTTON|ACPI_WBINVD|ACPI_PWR_BUTTON|ACPI_FIX_RTC) +#define ACPI_FIXED_FEATURE_FLAGS (ACPI_PROC_C1 | ACPI_SLP_BUTTON | \ + ACPI_WBINVD | ACPI_PWR_BUTTON | \ + ACPI_FIX_RTC | ACPI_TMR_VAL_EXT) // // PM1A Event Register Block Generic Address Information @@ -59,7 +63,6 @@ #define ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID ACPI_SYSTEM_IO #define ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20 #define ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00 -#define ACPI_PM1A_EVT_BLK_ADDRESS 0x000000000000c010 // // PM1B Event Register Block Generic Address Information @@ -75,7 +78,6 @@ #define ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID ACPI_SYSTEM_IO #define ACPI_PM1A_CNT_BLK_BIT_WIDTH 0x10 #define ACPI_PM1A_CNT_BLK_BIT_OFFSET 0x00 -#define ACPI_PM1A_CNT_BLK_ADDRESS (ACPI_PM1A_EVT_BLK_ADDRESS + 0x04) // // PM1B Control Register Block Generic Address Information @@ -100,7 +102,6 @@ #define ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID ACPI_SYSTEM_IO #define ACPI_PM_TMR_BLK_BIT_WIDTH 0x20 #define ACPI_PM_TMR_BLK_BIT_OFFSET 0x00 -#define ACPI_PM_TMR_BLK_ADDRESS (ACPI_PM1A_EVT_BLK_ADDRESS + 0x08) // // General Purpose Event 0 Register Block Generic Address Index: xen-3.0.3_0-src/xen/include/public/hvm/ioreq.h =================================================================== --- xen-3.0.3_0-src.orig/xen/include/public/hvm/ioreq.h +++ xen-3.0.3_0-src/xen/include/public/hvm/ioreq.h @@ -86,6 +86,10 @@ struct buffered_iopage { }; /* sizeof this structure must be in one page */ typedef struct buffered_iopage buffered_iopage_t; +#define ACPI_PM1A_EVT_BLK_ADDRESS 0x000000000000c010 +#define ACPI_PM1A_CNT_BLK_ADDRESS (ACPI_PM1A_EVT_BLK_ADDRESS + 0x04) +#define ACPI_PM_TMR_BLK_ADDRESS (ACPI_PM1A_EVT_BLK_ADDRESS + 0x08) + #endif /* _IOREQ_H_ */ /* xen-ja-keyboard.patch: examples/xmexample.hvm | 4 ++++ examples/xmexample.vti | 4 ++++ ioemu/keymaps/ja | 3 +++ ioemu/vnc_keysym.h | 10 ++++++++++ python/xen/xend/image.py | 4 ++-- python/xen/xm/create.py | 6 +++++- 6 files changed, 28 insertions(+), 3 deletions(-) --- NEW FILE xen-ja-keyboard.patch --- # HG changeset patch # User kasai.takanori at jp.fujitsu.com # Node ID ea1ffa51b4121d36cffdc90276378a6ed334c2cc # Parent edd592c823a520d4072a95ac39beb2012c05321e Add the Japanese keymap for VNC Server. Signed-off-by: Takanori Kasai < kasai.takanori at jp.fujitsu.com > diff -r edd592c823a5 -r ea1ffa51b412 tools/ioemu/keymaps/ja --- a/tools/ioemu/keymaps/ja Thu Nov 02 23:05:24 2006 +0000 +++ b/tools/ioemu/keymaps/ja Wed Nov 08 09:38:06 2006 +0000 @@ -102,3 +102,6 @@ Henkan_Mode 0x79 Henkan_Mode 0x79 Katakana 0x70 Muhenkan 0x7b +Henkan_Mode_Real 0x79 +Henkan_Mode_Ultra 0x79 +backslash_ja 0x73 diff -r edd592c823a5 -r ea1ffa51b412 tools/ioemu/vnc_keysym.h --- a/tools/ioemu/vnc_keysym.h Thu Nov 02 23:05:24 2006 +0000 +++ b/tools/ioemu/vnc_keysym.h Wed Nov 08 09:38:06 2006 +0000 @@ -271,5 +271,15 @@ static name2keysym_t name2keysym[]={ {"Num_Lock", 0xff7f}, /* XK_Num_Lock */ {"Pause", 0xff13}, /* XK_Pause */ {"Escape", 0xff1b}, /* XK_Escape */ + + /* localized keys */ +{"BackApostrophe", 0xff21}, +{"Muhenkan", 0xff22}, +{"Katakana", 0xff25}, +{"Zenkaku_Hankaku", 0xff29}, +{"Henkan_Mode_Real", 0xff23}, +{"Henkan_Mode_Ultra", 0xff3e}, +{"backslash_ja", 0xffa5}, + {0,0}, }; # HG changeset patch # User kasai.takanori at jp.fujitsu.com # Node ID 6ae5d58cf54d930cfd1d4901754644e113582606 # Parent 6e22ba7217201f3c3d7219d824f7aa80cd431c36 Add to select keyboard layout Signed-off-by: Takanori Kasai diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Wed Nov 15 09:44:12 2006 +0000 +++ b/tools/python/xen/xend/image.py Thu Nov 16 20:32:44 2006 +0900 @@ -309,13 +309,14 @@ class HVMImageHandler(ImageHandler): def parseDeviceModelArgs(self, imageConfig, deviceConfig): dmargs = [ 'boot', 'fda', 'fdb', 'soundhw', 'localtime', 'serial', 'stdvga', 'isa', 'vcpus', - 'acpi', 'usb', 'usbdevice'] + 'acpi', 'usb', 'usbdevice', 'keymap' ] ret = [] for a in dmargs: v = sxp.child_value(imageConfig, a) # python doesn't allow '-' in variable names if a == 'stdvga': a = 'std-vga' + if a == 'keymap': a = 'k' # Handle booleans gracefully if a in ['localtime', 'std-vga', 'isa', 'usb', 'acpi']: @@ -454,7 +454,6 @@ class HVMImageHandler(ImageHandler): ret += ['-vncunused'] else: ret += ['-vnc', '%d' % vncdisplay] - ret += ['-k', 'en-us'] vnclisten = sxp.child_value(config, 'vnclisten') if not(vnclisten): vnclisten = xen.xend.XendRoot.instance().get_vnclisten_address() diff -r 6e22ba721720 -r 6ae5d58cf54d tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py Wed Nov 15 09:44:12 2006 +0000 +++ b/tools/python/xen/xm/create.py Thu Nov 16 20:32:44 2006 +0900 @@ -386,6 +386,10 @@ gopts.var('localtime', val='no|yes', gopts.var('localtime', val='no|yes', fn=set_bool, default=0, use="Is RTC set to localtime?") + +gopts.var('keymap', val='FILE', + fn=set_value, default='', + use="Set keyboard layout used") gopts.var('usb', val='no|yes', fn=set_bool, default=0, @@ -648,7 +652,7 @@ def configure_hvm(config_image, vals): 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', 'sdl', 'display', 'xauthority', - 'acpi', 'apic', 'usb', 'usbdevice' ] + 'acpi', 'apic', 'usb', 'usbdevice', 'keymap' ] for a in args: if (vals.__dict__[a]): config_image.append([a, vals.__dict__[a]]) # HG changeset patch # User kasai.takanori at jp.fujitsu.com # Node ID 82ba3c086e6ca02b4c24f0a0171bd34e1bcc612a # Parent ea457d9d3fb2008e528486e8be89a232c3a91312 Add example of keyboard layout Signed-off-by: Takanori Kasai diff -r ea457d9d3fb2 -r 82ba3c086e6c tools/examples/xmexample.hvm --- a/tools/examples/xmexample.hvm Mon Nov 20 16:59:07 2006 +0000 +++ b/tools/examples/xmexample.hvm Tue Nov 21 09:26:43 2006 +0000 @@ -190,3 +190,7 @@ serial='pty' # absolute mouse) #usbdevice='mouse' #usbdevice='tablet' + +#----------------------------------------------------------------------------- +# Set keyboard layout, default is en-us keyboard. +#keymap='ja' diff -r ea457d9d3fb2 -r 82ba3c086e6c tools/examples/xmexample.vti --- a/tools/examples/xmexample.vti Mon Nov 20 16:59:07 2006 +0000 +++ b/tools/examples/xmexample.vti Tue Nov 21 09:26:43 2006 +0000 @@ -134,3 +134,7 @@ serial='pty' # absolute mouse) #usbdevice='mouse' #usbdevice='tablet' + +#----------------------------------------------------------------------------- +# Set keyboard layout, default is en-us keyboard. +#keymap='ja' xen-memory-map.patch: tools/libxc/xc_domain.c | 46 +++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 4 ++ tools/python/xen/lowlevel/xc/xc.c | 23 +++++++++++++++ tools/python/xen/xend/XendDomainInfo.py | 4 ++ tools/python/xen/xend/image.py | 24 +++++++++++++++- xen/arch/x86/mm.c | 47 +++++++++++++++++++++++++++++++- xen/include/asm-x86/domain.h | 10 +++--- xen/include/public/memory.h | 17 ++++++++++- 8 files changed, 167 insertions(+), 8 deletions(-) --- NEW FILE xen-memory-map.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID df5fa63490f4da7b65c56087a68783dbcb7944f8 # Parent 8beecb8c5ae29660b2c6073c25a329cc1d9240f6 [XEN] Implement XENMEM_set_memory_map, which specifies memory map to be returned by XENMEM_memory_map. Hook this into the domain builder. Based on a patch by Glauber de Oliveira Costa Signed-off-by: Keir Fraser More fixes by Daniel Berrange and Rik van Riel merged in. --- xen-3.0.3_0-src/tools/libxc/xc_domain.c.memmap 2006-10-15 08:22:03.000000000 -0400 +++ xen-3.0.3_0-src/tools/libxc/xc_domain.c 2006-12-11 17:55:48.000000000 -0500 @@ -313,6 +313,52 @@ int xc_domain_setmaxmem(int xc_handle, return do_domctl(xc_handle, &domctl); } +#if defined(__i386__) || defined(__x86_64__) +#include +int xc_domain_set_memmap_limit(int xc_handle, + uint32_t domid, + unsigned long map_limitkb) +{ + int rc; + + struct xen_foreign_memory_map fmap = { + .domid = domid, + .map = { .nr_entries = 1 } + }; + + struct e820entry e820 = { + .addr = 0, + .size = (uint64_t)map_limitkb << 10, + .type = E820_RAM + }; + + set_xen_guest_handle(fmap.map.buffer, &e820); + + if ( mlock(&fmap, sizeof(fmap)) || mlock(&e820, sizeof(e820)) ) + { + PERROR("Could not lock memory for Xen hypercall"); + rc = -1; + goto out; + } + + rc = xc_memory_op(xc_handle, XENMEM_set_memory_map, &fmap); + + out: + safe_munlock(&fmap, sizeof(fmap)); + safe_munlock(&e820, sizeof(e820)); + return rc; +} +#else +int xc_domain_set_memmap_limit(int xc_handle, + uint32_t domid, + unsigned long map_limitkb) +{ + PERROR("Function not implemented"); + errno = ENOSYS; + return -1; +} +#endif + int xc_domain_set_time_offset(int xc_handle, uint32_t domid, int32_t time_offset_seconds) --- xen-3.0.3_0-src/tools/libxc/xenctrl.h.memmap 2006-10-15 08:22:03.000000000 -0400 +++ xen-3.0.3_0-src/tools/libxc/xenctrl.h 2006-12-11 17:55:48.000000000 -0500 @@ -407,6 +407,10 @@ int xc_domain_setmaxmem(int xc_handle, uint32_t domid, unsigned int max_memkb); +int xc_domain_set_memmap_limit(int xc_handle, + uint32_t domid, + unsigned long map_limitkb); + int xc_domain_set_time_offset(int xc_handle, uint32_t domid, int32_t time_offset_seconds); --- xen-3.0.3_0-src/tools/python/xen/lowlevel/xc/xc.c.memmap 2006-10-15 08:22:03.000000000 -0400 +++ xen-3.0.3_0-src/tools/python/xen/lowlevel/xc/xc.c 2006-12-11 17:55:48.000000000 -0500 @@ -705,6 +705,21 @@ static PyObject *pyxc_domain_setmaxmem(X return zero; } +static PyObject *pyxc_domain_set_memmap_limit(XcObject *self, PyObject *args) +{ + uint32_t dom; + unsigned int maplimit_kb; + + if ( !PyArg_ParseTuple(args, "ii", &dom, &maplimit_kb) ) + return NULL; + + if ( xc_domain_set_memmap_limit(self->xc_handle, dom, maplimit_kb) != 0 ) + return PyErr_SetFromErrno(xc_error); + + Py_INCREF(zero); + return zero; +} + static PyObject *pyxc_domain_memory_increase_reservation(XcObject *self, PyObject *args, PyObject *kwds) @@ -1082,6 +1097,14 @@ static PyMethodDef pyxc_methods[] = { " maxmem_kb [int]: .\n" "Returns: [int] 0 on success; -1 on error.\n" }, + { "domain_set_memmap_limit", + (PyCFunction)pyxc_domain_set_memmap_limit, + METH_VARARGS, "\n" + "Set a domain's physical memory mappping limit\n" + " dom [int]: Identifier of domain.\n" + " map_limitkb [int]: .\n" + "Returns: [int] 0 on success; -1 on error.\n" }, + { "domain_memory_increase_reservation", (PyCFunction)pyxc_domain_memory_increase_reservation, METH_VARARGS | METH_KEYWORDS, "\n" --- xen-3.0.3_0-src/tools/python/xen/xend/image.py.memmap 2006-12-11 17:55:48.000000000 -0500 +++ xen-3.0.3_0-src/tools/python/xen/xend/image.py 2006-12-11 17:56:23.000000000 -0500 @@ -151,6 +153,14 @@ class ImageHandler: necessary.""" return mem_kb + def getRequiredMaximumReservation(self): + """@param mem_kb The maximum possible memory, in KiB. + @return The corresponding required amount of memory to be free, also + in KiB. This is normally the same as getRequiredAvailableMemory, but + architecture- or image-specific code may override this to + add headroom where necessary.""" + return self.getRequiredAvailableMemory(self.vm.getMemoryMaximum()) + def getRequiredInitialReservation(self, mem_kb): """@param mem_kb The configured memory, in KiB. @return The corresponding required amount of memory to be free, also @@ -448,6 +552,9 @@ class IA64_HVM_ImageHandler(HVMImageHand extra_pages = 1024 + 2 return mem_kb + extra_pages * page_kb + def getRequiredMaximumReservation(self): + return self.vm.getMemoryMaximum() + def getRequiredShadowMemory(self, shadow_mem_kb, maxmem_kb): # Explicit shadow memory is not a concept return 0 @@ -479,6 +586,17 @@ class X86_HVM_ImageHandler(HVMImageHandl return max(1024 * self.vm.getVCpuCount() + maxmem_kb / 256, shadow_mem_kb) +class X86_Linux_ImageHandler(LinuxImageHandler): + + def buildDomain(self): + # set physical mapping limit + # add an 8MB slack to balance backend allocations. + try: + mem_kb = self.getRequiredMaximumReservation() + (8 * 1024) + xc.domain_set_memmap_limit(self.vm.getDomid(), mem_kb) + except RuntimeError, exn: + log.warning("Unable to set e820 map. Probably an old HyperVisor. " + str(exn)) + return LinuxImageHandler.buildDomain(self) _handlers = { "powerpc": { @@ -489,7 +604,7 @@ _handlers = { "hvm": IA64_HVM_ImageHandler, }, "x86": { - "linux": LinuxImageHandler, + "linux": X86_Linux_ImageHandler, "hvm": X86_HVM_ImageHandler, }, } --- xen-3.0.3_0-src/tools/python/xen/xend/XendDomainInfo.py.memmap 2006-12-11 17:56:07.000000000 -0500 +++ xen-3.0.3_0-src/tools/python/xen/xend/XendDomainInfo.py 2006-12-11 17:56:23.000000000 -0500 @@ -823,6 +823,10 @@ class XendDomainInfo: """Get this domain's target memory size, in KB.""" return self.info['memory'] * 1024 + def getMemoryMaximum(self): + """Get this domain's maximum memory size, in KB.""" + return self.info['maxmem'] * 1024 + def getResume(self): return "%s" % self.info['resume'] --- xen-3.0.3_0-src/xen/arch/x86/mm.c.memmap 2006-10-15 08:22:03.000000000 -0400 +++ xen-3.0.3_0-src/xen/arch/x86/mm.c 2006-12-11 17:55:48.000000000 -0500 @@ -2972,9 +2972,54 @@ long arch_memory_op(int op, XEN_GUEST_HA break; } + case XENMEM_set_memory_map: + { + struct xen_foreign_memory_map fmap; + struct domain *d; + int rc; + + if ( copy_from_guest(&fmap, arg, 1) ) + return -EFAULT; + + if ( fmap.map.nr_entries > ARRAY_SIZE(d->arch.e820) ) + return -EINVAL; + + if ( fmap.domid == DOMID_SELF ) + { + d = current->domain; + get_knownalive_domain(d); + } + else if ( !IS_PRIV(current->domain) ) + return -EPERM; + else if ( (d = find_domain_by_id(fmap.domid)) == NULL ) + return -ESRCH; + + rc = copy_from_guest(&d->arch.e820[0], fmap.map.buffer, + fmap.map.nr_entries) ? -EFAULT : 0; + d->arch.nr_e820 = fmap.map.nr_entries; + + put_domain(d); + return rc; + } + case XENMEM_memory_map: { - return -ENOSYS; + struct xen_memory_map map; + struct domain *d = current->domain; + + /* Backwards compatibility. */ + if ( d->arch.nr_e820 == 0 ) + return -ENOSYS; + + if ( copy_from_guest(&map, arg, 1) ) + return -EFAULT; + + map.nr_entries = min(map.nr_entries, d->arch.nr_e820); + if ( copy_to_guest(map.buffer, &d->arch.e820[0], map.nr_entries) || + copy_to_guest(arg, &map, 1) ) + return -EFAULT; + + return 0; } case XENMEM_machine_memory_map: --- xen-3.0.3_0-src/xen/include/asm-x86/domain.h.memmap 2006-10-15 08:22:03.000000000 -0400 +++ xen-3.0.3_0-src/xen/include/asm-x86/domain.h 2006-12-11 17:55:48.000000000 -0500 @@ -5,6 +5,7 @@ #include #include #include +#include struct trap_bounce { unsigned long error_code; @@ -101,17 +102,16 @@ struct arch_domain /* I/O-port admin-specified access capabilities. */ struct rangeset *ioport_caps; - /* HVM stuff */ - struct hvm_domain hvm_domain; - - /* Shadow-translated guest: Pseudophys base address of reserved area. */ - unsigned long first_reserved_pfn; + struct hvm_domain hvm_domain; struct shadow_domain shadow; /* Shadow translated domain: P2M mapping */ pagetable_t phys_table; + /* Pseudophysical e820 map (XENMEM_memory_map). */ + struct e820entry e820[3]; + unsigned int nr_e820; } __cacheline_aligned; #ifdef CONFIG_X86_PAE --- xen-3.0.3_0-src/xen/include/public/memory.h.memmap 2006-10-15 08:22:03.000000000 -0400 +++ xen-3.0.3_0-src/xen/include/public/memory.h 2006-12-11 17:55:48.000000000 -0500 @@ -204,7 +204,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_translate_gp /* * Returns the pseudo-physical memory map as it was when the domain - * was started. + * was started (specified by XENMEM_set_memory_map). + * arg == addr of xen_memory_map_t. */ #define XENMEM_memory_map 9 struct xen_memory_map { @@ -227,9 +228,23 @@ DEFINE_XEN_GUEST_HANDLE(xen_memory_map_t /* * Returns the real physical memory map. Passes the same structure as * XENMEM_memory_map. + * arg == addr of xen_memory_map_t. */ #define XENMEM_machine_memory_map 10 +/* + * Set the pseudo-physical memory map of a domain, as returned by + * XENMEM_memory_map. + * arg == addr of xen_foreign_memory_map_t. + */ +#define XENMEM_set_memory_map 13 +struct xen_foreign_memory_map { + domid_t domid; + struct xen_memory_map map; +}; +typedef struct xen_foreign_memory_map xen_foreign_memory_map_t; +DEFINE_XEN_GUEST_HANDLE(xen_foreign_memory_map_t); + #endif /* __XEN_PUBLIC_MEMORY_H__ */ /* xen-pci-config-overflow.patch: vl.h | 7 +++++-- vl.h.orig |only 2 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE xen-pci-config-overflow.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID f66f7c3a82a7420d80714b0d349ee9a24b50ec28 # Parent ccc419cbe0bada0ae901e0d426dabce70a429876 [QEMU] Simpler workaround for guest writes to PCI config space that extend past byte 0xff. Signed-off-by: Keir Fraser diff -urp xen-3.0.3_0-src.orig/tools/ioemu/vl.h xen-3.0.3_0-src/tools/ioemu/vl.h --- xen-3.0.3_0-src.orig/tools/ioemu/vl.h 2006-12-03 12:18:16.000000000 -0500 +++ xen-3.0.3_0-src/tools/ioemu/vl.h 2006-12-03 12:19:35.000000000 -0500 @@ -650,8 +650,11 @@ typedef struct PCIIORegion { #define PCI_MAX_LAT 0x3f /* 8 bits */ struct PCIDevice { - /* PCI config space */ - uint8_t config[256]; + /* + * PCI config space. The 4 extra bytes are a safety buffer for guest + * word/dword writes that can extend past byte 0xff. + */ + uint8_t config[256+4]; /* the following fields are read only */ PCIBus *bus; Only in xen-3.0.3_0-src/tools/ioemu: vl.h.orig xen-qemu-8139c-chaining.patch: rtl8139.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE xen-qemu-8139c-chaining.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID 075f4ffdbbce5527ba525a515abe320703d17a0e # Parent 51edd3c6a4d861db6ce1c9a02251ed49213c3002 [QEMU] rtl8139: Disallow chaining above 64K As it stands the 8139C+ TX chaining is only bounded by realloc failure. This is contrary to how the real hardware operates. It also has DoS potential when ioemu runs in dom0. This patch makes any attempt to chain a frame beyond 64K fail immediately. Signed-off-by: Herbert Xu diff -r 51edd3c6a4d8 -r 075f4ffdbbce tools/ioemu/hw/rtl8139.c --- a/tools/ioemu/hw/rtl8139.c Fri Nov 17 10:32:57 2006 +0000 +++ b/tools/ioemu/hw/rtl8139.c Fri Nov 17 10:34:08 2006 +0000 @@ -1999,12 +1999,12 @@ static int rtl8139_cplus_transmit_one(RT DEBUG_PRINT(("RTL8139: +++ C+ mode transmission buffer allocated space %d\n", s->cplus_txbuffer_len)); } - while (s->cplus_txbuffer && s->cplus_txbuffer_offset + txsize >= s->cplus_txbuffer_len) - { - s->cplus_txbuffer_len += CP_TX_BUFFER_SIZE; - s->cplus_txbuffer = realloc(s->cplus_txbuffer, s->cplus_txbuffer_len); - - DEBUG_PRINT(("RTL8139: +++ C+ mode transmission buffer space changed to %d\n", s->cplus_txbuffer_len)); + if (s->cplus_txbuffer && s->cplus_txbuffer_offset + txsize >= s->cplus_txbuffer_len) + { + free(s->cplus_txbuffer); + s->cplus_txbuffer = NULL; + + DEBUG_PRINT(("RTL8139: +++ C+ mode transmission buffer space exceeded: %d\n", s->cplus_txbuffer_offset + txsize)); } if (!s->cplus_txbuffer) xen-qemu-cdrom-dma.patch: ide.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE xen-qemu-cdrom-dma.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID 1e8ba8d2117548d4f13b7b438d1e992b1815f580 # Parent f247e0b52dda257c0000c9da5a0cdff507b3ced8 [HVM] Enable DMA mode for CD-ROM IDE ATAPI interface. Signed-off-by: Winston Wang Signed-off-by: Keir Fraser diff -r d8befb109c394c2c2d3e1870a500107d461724ef -r fd28a1b139dea91b8bfcf06dd233dbdda8f51ff1 tools/ioemu/hw/ide.c --- a/tools/ioemu/hw/ide.c Mon Dec 04 09:21:10 2006 +0000 +++ b/tools/ioemu/hw/ide.c Mon Dec 04 09:29:26 2006 +0000 @@ -680,7 +680,7 @@ static void ide_sector_read(IDEState *s) static void ide_sector_read(IDEState *s) { int64_t sector_num; - int ret, n; + int n; s->status = READY_STAT | SEEK_STAT; s->error = 0; /* not needed by IDE spec, but needed by Windows */ @@ -695,7 +695,11 @@ static void ide_sector_read(IDEState *s) #endif if (n > s->req_nb_sectors) n = s->req_nb_sectors; - ret = bdrv_read(s->bs, sector_num, s->io_buffer, n); + if (bdrv_read(s->bs, sector_num, s->io_buffer, n) != 0) { + ide_abort_command(s); + ide_set_irq(s); + return; + } ide_transfer_start(s, s->io_buffer, 512 * n, ide_sector_read); ide_set_irq(s); ide_set_sector(s, sector_num + n); @@ -721,7 +725,11 @@ static int ide_read_dma_cb(IDEState *s, if (n > MAX_MULT_SECTORS) n = MAX_MULT_SECTORS; sector_num = ide_get_sector(s); - bdrv_read(s->bs, sector_num, s->io_buffer, n); + if (bdrv_read(s->bs, sector_num, s->io_buffer, n) != 0) { + ide_abort_command(s); + ide_set_irq(s); + return 0; + } s->io_buffer_index = 0; s->io_buffer_size = n * 512; len = s->io_buffer_size; @@ -767,7 +775,7 @@ static void ide_sector_write(IDEState *s static void ide_sector_write(IDEState *s) { int64_t sector_num; - int ret, n, n1; + int n, n1; s->status = READY_STAT | SEEK_STAT; sector_num = ide_get_sector(s); @@ -777,7 +785,11 @@ static void ide_sector_write(IDEState *s n = s->nsector; if (n > s->req_nb_sectors) n = s->req_nb_sectors; - ret = bdrv_write(s->bs, sector_num, s->io_buffer, n); + if (bdrv_write(s->bs, sector_num, s->io_buffer, n) != 0) { + ide_abort_command(s); + ide_set_irq(s); + return; + } s->nsector -= n; if (s->nsector == 0) { /* no more sector to write */ @@ -823,8 +835,13 @@ static int ide_write_dma_cb(IDEState *s, if (len == 0) { n = s->io_buffer_size >> 9; sector_num = ide_get_sector(s); - bdrv_write(s->bs, sector_num, s->io_buffer, - s->io_buffer_size >> 9); + if (bdrv_write(s->bs, sector_num, s->io_buffer, + s->io_buffer_size >> 9) != 0) { + ide_abort_command(s); + ide_set_irq(s); + return 0; + } + sector_num += n; ide_set_sector(s, sector_num); s->nsector -= n; xen-qemu-floppy-overflow.patch: fdc.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-qemu-floppy-overflow.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID f711b87ba951e608287abd0de028c6f0d83400a9 # Parent f3ee62b7fb5299c89d442845e0883bcfab78c067 [QEMU] fdc: Limit sector size to 16K In fdctrl_start_transfer the sector size field (fifo[5]) is not checked for overflows. This allows an arbitrarily large sector size to be used, which can in turn result in a negative data_len field that is then used for DMA transfers. This can lead to the corrpuption of qemu state because some subsequent checks on the transfer length is conducted using signed integers. This patch limits the value fifo[5] to 7 which is the standard limit on floppy sector size. Signed-off-by: Herbert Xu diff -r f3ee62b7fb52 -r f711b87ba951 tools/ioemu/hw/fdc.c --- a/tools/ioemu/hw/fdc.c Mon Nov 27 10:08:12 2006 +0000 +++ b/tools/ioemu/hw/fdc.c Mon Nov 27 10:09:19 2006 +0000 @@ -898,7 +898,7 @@ static void fdctrl_start_transfer (fdctr fdctrl->data_len = fdctrl->fifo[8]; } else { int tmp; - fdctrl->data_len = 128 << fdctrl->fifo[5]; + fdctrl->data_len = 128 << (fdctrl->fifo[5] > 7 ? 7 : fdctrl->fifo[5]); tmp = (cur_drv->last_sect - ks + 1); if (fdctrl->fifo[0] & 0x80) tmp += cur_drv->last_sect; xen-qemu-hdd-limit.patch: xenstore.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-qemu-hdd-limit.patch --- # HG changeset patch # User Ewan Mellor # Date 1163675477 0 # Node ID c677f4e756084a1499f6367a2b3e2c15f5b9e66d # Parent d0e9da9cc84a5c58c8b2a9591e02d74f50418d82 Fix clobbering bug when hde is specified; QEMU only supports up to hdd, but hde is accepted and writes off the end of some tables. >From Hiromichi Itou . Signed-off-by: Ewan Mellor diff -r d0e9da9cc84a -r c677f4e75608 tools/ioemu/xenstore.c --- a/tools/ioemu/xenstore.c Thu Nov 16 10:52:03 2006 +0000 +++ b/tools/ioemu/xenstore.c Thu Nov 16 11:11:17 2006 +0000 @@ -100,7 +100,7 @@ void xenstore_parse_domain_config(int do if (strncmp(dev, "hd", 2) || strlen(dev) != 3) continue; hd_index = dev[2] - 'a'; - if (hd_index > MAX_DISKS) + if (hd_index >= MAX_DISKS) continue; /* read the type of the device */ if (pasprintf(&buf, "%s/device/vbd/%s/device-type", path, e[i]) == -1) xen-qemu-memory-check.patch: exec-dm.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 20 deletions(-) --- NEW FILE xen-qemu-memory-check.patch --- # HG changeset patch # User Tim Deegan # Node ID 2041122e0c4a6df3cfce2691bf83d443dc2f698d # Parent 66cdabe97205613ec9f3b0462961dbedceb68e27 [HVM] Fix qemu's test for whether physcal addresses are RAM. HVM guests have a memory hole below 4GB, so can't just check whether addresses are < the amount of RAM allocated. Signed-off-by: Tim Deegan diff -r 66cdabe97205 -r 2041122e0c4a tools/ioemu/target-i386-dm/exec-dm.c --- a/tools/ioemu/target-i386-dm/exec-dm.c Thu Oct 26 11:50:17 2006 +0100 +++ b/tools/ioemu/target-i386-dm/exec-dm.c Thu Oct 26 15:08:20 2006 +0100 @@ -32,6 +32,8 @@ #include #include +#include + #include "cpu.h" #include "exec-all.h" @@ -407,22 +409,36 @@ int iomem_index(target_phys_addr_t addr) return 0; } +static inline int paddr_is_ram(target_phys_addr_t addr) +{ + /* Is this guest physical address RAM-backed? */ +#if defined(CONFIG_DM) && (defined(__i386__) || defined(__x86_64__)) + if (ram_size <= HVM_BELOW_4G_RAM_END) + /* RAM is contiguous */ + return (addr < ram_size); + else + /* There is RAM below and above the MMIO hole */ + return ((addr < HVM_BELOW_4G_MMIO_START) || + ((addr >= HVM_BELOW_4G_MMIO_START + HVM_BELOW_4G_MMIO_LENGTH) + && (addr < ram_size + HVM_BELOW_4G_MMIO_LENGTH))); +#else + return (addr < ram_size); +#endif +} + void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, int len, int is_write) { int l, io_index; uint8_t *ptr; uint32_t val; - target_phys_addr_t page; - unsigned long pd; while (len > 0) { - page = addr & TARGET_PAGE_MASK; - l = (page + TARGET_PAGE_SIZE) - addr; + /* How much can we copy before the next page boundary? */ + l = TARGET_PAGE_SIZE - (addr & ~TARGET_PAGE_MASK); if (l > len) l = len; - pd = page; io_index = iomem_index(addr); if (is_write) { if (io_index) { @@ -442,15 +458,11 @@ void cpu_physical_memory_rw(target_phys_ io_mem_write[io_index][0](io_mem_opaque[io_index], addr, val); l = 1; } - } else { - unsigned long addr1; - - addr1 = (pd & TARGET_PAGE_MASK) + (addr & ~TARGET_PAGE_MASK); - /* RAM case */ - ptr = phys_ram_base + addr1; - memcpy(ptr, buf, l); + } else if (paddr_is_ram(addr)) { + /* Reading from RAM */ + memcpy(phys_ram_base + addr, buf, l); #ifdef __ia64__ - sync_icache((unsigned long)ptr, l); + sync_icache((unsigned long)(phys_ram_base + addr), l); #endif } } else { @@ -471,14 +483,12 @@ void cpu_physical_memory_rw(target_phys_ stb_raw(buf, val); l = 1; } - } else if (addr < ram_size) { - /* RAM case */ - ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + - (addr & ~TARGET_PAGE_MASK); - memcpy(buf, ptr, l); + } else if (paddr_is_ram(addr)) { + /* Reading from RAM */ + memcpy(buf, phys_ram_base + addr, l); } else { - /* unreported MMIO space */ - memset(buf, 0xff, len); + /* Neither RAM nor known MMIO space */ + memset(buf, 0xff, len); } } len -= l; xen-qemu-ne2000-buffer.patch: ne2000.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) --- NEW FILE xen-qemu-ne2000-buffer.patch --- # HG changeset patch # User kaf24 at localhost.localdomain # Node ID 66fe61db9e69e03e12d0c4086683bebfb4a67780 # Parent 1940ee13f9d6ab1be2c614a0fbf7769536a056d2 [QEMU] ne2000: Stop memory access beyond buffer As a program that runs in dom0 which serves users from guests, the qemu drivers need to be vigilant to the input that comes from the guests since they may be malicious. As it is there are multiple ways to get ne2000 to read/write memory beyond the 48K buffer that it has allocated for each adapter. This patch checks the addresses and prevents this from occuring. The boundary is checked each time since it's changed for every packet received while the other parameters are only changed (by the guest) during setup. Signed-off: Herbert Xu diff -r 1940ee13f9d6 -r 66fe61db9e69 tools/ioemu/hw/ne2000.c --- a/tools/ioemu/hw/ne2000.c Fri Oct 27 15:44:27 2006 +0100 +++ b/tools/ioemu/hw/ne2000.c Fri Oct 27 17:50:40 2006 +0100 @@ -137,6 +137,7 @@ typedef struct NE2000State { uint8_t curpag; uint8_t mult[8]; /* multicast mask array */ int irq; + int tainted; PCIDevice *pci_dev; VLANClientState *vc; uint8_t macaddr[6]; @@ -226,6 +227,27 @@ static int ne2000_can_receive(void *opaq #define MIN_BUF_SIZE 60 +static inline int ne2000_valid_ring_addr(NE2000State *s, unsigned int addr) +{ + addr <<= 8; + return addr < s->stop && addr >= s->start; +} + +static inline int ne2000_check_state(NE2000State *s) +{ + if (!s->tainted) + return 0; + + if (s->start >= s->stop || s->stop > NE2000_MEM_SIZE) + return -EINVAL; + + if (!ne2000_valid_ring_addr(s, s->curpag)) + return -EINVAL; + + s->tainted = 0; + return 0; +} + static void ne2000_receive(void *opaque, const uint8_t *buf, int size) { NE2000State *s = opaque; @@ -238,6 +260,12 @@ static void ne2000_receive(void *opaque, #if defined(DEBUG_NE2000) printf("NE2000: received len=%d\n", size); #endif + + if (ne2000_check_state(s)) + return; + + if (!ne2000_valid_ring_addr(s, s->boundary)) + return; if (s->cmd & E8390_STOP || ne2000_buffer_full(s)) return; @@ -359,9 +387,11 @@ static void ne2000_ioport_write(void *op switch(offset) { case EN0_STARTPG: s->start = val << 8; + s->tainted = 1; break; case EN0_STOPPG: s->stop = val << 8; + s->tainted = 1; break; case EN0_BOUNDARY: s->boundary = val; @@ -406,6 +436,7 @@ static void ne2000_ioport_write(void *op break; case EN1_CURPAG: s->curpag = val; + s->tainted = 1; break; case EN1_MULT ... EN1_MULT + 7: s->mult[offset - EN1_MULT] = val; @@ -509,7 +540,7 @@ static inline void ne2000_mem_writel(NE2 { addr &= ~1; /* XXX: check exact behaviour if not even */ if (addr < 32 || - (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { + (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE - 2)) { cpu_to_le32wu((uint32_t *)(s->mem + addr), val); } } @@ -539,7 +570,7 @@ static inline uint32_t ne2000_mem_readl( { addr &= ~1; /* XXX: check exact behaviour if not even */ if (addr < 32 || - (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE)) { + (addr >= NE2000_PMEM_START && addr < NE2000_MEM_SIZE - 2)) { return le32_to_cpupu((uint32_t *)(s->mem + addr)); } else { return 0xffffffff; xen-qemu-uppercase.patch: vnc.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE xen-qemu-uppercase.patch --- changeset: 12653:582d21e2d3cd12a13ad4debee9af8bb0f1be413a user: kfraser at localhost.localdomain date: Thu Nov 30 17:47:50 2006 +0000 files: tools/ioemu/vnc.c description: [QEMU] Do shift-key processing in QEMU monitor terminal when connected via VNC. Signed-off-by: Daniel P. Berrange diff -r b7095209e31ae1f52cd4b196225a360543e37a80 -r 582d21e2d3cd12a13ad4debee9af8bb0f1be413a tools/ioemu/vnc.c --- a/tools/ioemu/vnc.c Thu Nov 30 17:36:03 2006 +0000 +++ b/tools/ioemu/vnc.c Thu Nov 30 17:47:50 2006 +0000 @@ -114,6 +114,7 @@ struct VncState int visible_h; int ctl_keys; /* Ctrl+Alt starts calibration */ + int shift_keys; /* Shift / CapsLock keys */ }; #define DIRTY_PIXEL_BITS 64 @@ -870,9 +871,12 @@ static void do_key_event(VncState *vs, i } else if (down) { int qemu_keysym = 0; - if (sym <= 128) /* normal ascii */ + if (sym <= 128) { /* normal ascii */ + int shifted = vs->shift_keys == 1 || vs->shift_keys == 2; qemu_keysym = sym; - else { + if (sym >= 'a' && sym <= 'z' && shifted) + qemu_keysym -= 'a' - 'A'; + } else { switch (sym) { case XK_Up: qemu_keysym = QEMU_KEY_UP; break; case XK_Down: qemu_keysym = QEMU_KEY_DOWN; break; @@ -903,6 +907,10 @@ static void do_key_event(VncState *vs, i vs->ctl_keys |= 2; break; + case XK_Shift_L: + vs->shift_keys |= 1; + break; + default: break; } @@ -914,6 +922,14 @@ static void do_key_event(VncState *vs, i case XK_Alt_L: vs->ctl_keys &= ~2; + break; + + case XK_Shift_L: + vs->shift_keys &= ~1; + break; + + case XK_Caps_Lock: + vs->shift_keys ^= 2; break; case XK_1 ... XK_9: xen-qemu-usb-buffer.patch: usb-uhci.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-qemu-usb-buffer.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Node ID f19ddc0ee3e68d5d8a250ba0a20ab7d90ae9a36a # Parent f66f7c3a82a7420d80714b0d349ee9a24b50ec28 [QEMU] usb-uhci: Data buffer is too small The data buffer is only 1280 bytes long but the user-supplied length can be as large as 0x7ff. This patch extends the buffer to 2048 bytes. Signed-off-by: Herbert Xu diff -r f66f7c3a82a7 -r f19ddc0ee3e6 tools/ioemu/hw/usb-uhci.c --- a/tools/ioemu/hw/usb-uhci.c Thu Nov 30 17:32:16 2006 +0000 +++ b/tools/ioemu/hw/usb-uhci.c Thu Nov 30 17:33:11 2006 +0000 @@ -421,7 +421,7 @@ static int uhci_handle_td(UHCIState *s, static int uhci_handle_td(UHCIState *s, UHCI_TD *td, int *int_mask) { uint8_t pid; - uint8_t buf[1280]; + uint8_t buf[2048]; int len, max_len, err, ret; if (td->ctrl & TD_CTRL_IOC) { xen-vnc-domid-vm.patch: XendDomainInfo.py | 1 + 1 files changed, 1 insertion(+) --- NEW FILE xen-vnc-domid-vm.patch --- # HG changeset patch # User Ewan Mellor # Node ID b8a2db59150a084e4e1a5a1cae660dbf7cc14c2d # Parent 42769ff008b5ac024db7c460a624d5092f82b3e4 Write the /local/domain//vm node early in the startup process (immediately after the domain is created). QEMU needs this in place when it starts up, in order to find the VNC password. Signed-off-by: Ewan Mellor diff -r 42769ff008b5 -r b8a2db59150a tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Wed Nov 08 18:27:31 2006 +0000 +++ b/tools/python/xen/xend/XendDomainInfo.py Wed Nov 08 18:29:16 2006 +0000 @@ -678,6 +678,7 @@ class XendDomainInfo: t.remove() t.mkdir() t.set_permissions({ 'dom' : self.domid }) + t.write('vm', self.vmpath) def _storeDomDetails(self): to_store = { xen-xc-loglevel.patch: XendCheckpoint.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE xen-xc-loglevel.patch --- # HG changeset patch # User Ewan Mellor # Node ID bc14f1e1961abe28911dd043605e808ad98cc0c2 # Parent 0c0ef61de06b523fa44f67d97de01def87306e1d There is a somewhat trivial issue with XendCheckpoint.py right now in that it logs everything written to stderr by xc_save and xc_restore as errors whereas in fact the vast majority of this output is information/debug (and all actual errors are marked by the string ERROR: at the start of the message) -- this is confusing to folks looking at the logs and makes automated log analysis tricky. Fix is to scan for the ERROR: string and log anything without it using log.info instead. Signed-off by: Simon Graham diff -r 0c0ef61de06b -r bc14f1e1961a tools/python/xen/xend/XendCheckpoint.py --- a/tools/python/xen/xend/XendCheckpoint.py Tue Nov 21 10:16:58 2006 +++ b/tools/python/xen/xend/XendCheckpoint.py Tue Nov 21 10:19:01 2006 @@ -234,4 +234,9 @@ if line == "": break else: - log.error('%s', line.strip()) + line = line.strip() + m = re.match(r"^ERROR: (.*)", line) + if m is None: + log.info('%s', line) + else: + log.error('%s', m.group(1)) xen-xenbus-force-option.patch: xend/XendDomainInfo.py | 4 ++-- xend/server/DevController.py | 9 ++++++++- xend/server/blkif.py | 6 +++--- xm/main.py | 15 +++++++++++---- 4 files changed, 24 insertions(+), 10 deletions(-) --- NEW FILE xen-xenbus-force-option.patch --- --- xen-3.0.3_0-src/tools/python/xen/xend/XendDomainInfo.py.orig 2006-12-18 07:53:08.000000000 -0500 +++ xen-3.0.3_0-src/tools/python/xen/xend/XendDomainInfo.py 2006-12-18 07:56:44.000000000 -0500 @@ -1111,7 +1111,7 @@ class XendDomainInfo: ## public: - def destroyDevice(self, deviceClass, devid): + def destroyDevice(self, deviceClass, devid, force=None): if type(devid) is str: devicePath = '%s/device/%s' % (self.dompath, deviceClass) for entry in xstransact.List(devicePath): @@ -1122,7 +1122,7 @@ class XendDomainInfo: # We found the integer matching our devid, use it instead devid = entry break - return self.getDeviceController(deviceClass).destroyDevice(devid) + return self.getDeviceController(deviceClass).destroyDevice(devid, force) def getDeviceSxprs(self, deviceClass): --- xen-3.0.3_0-src/tools/python/xen/xend/server/DevController.py.orig 2006-12-18 07:53:08.000000000 -0500 +++ xen-3.0.3_0-src/tools/python/xen/xend/server/DevController.py 2006-12-18 07:54:16.000000000 -0500 @@ -191,7 +191,7 @@ class DevController: raise VmError('%s devices may not be reconfigured' % self.deviceClass) - def destroyDevice(self, devid): + def destroyDevice(self, devid, force): """Destroy the specified device. @param devid The device ID, or something device-specific from which @@ -212,6 +212,13 @@ class DevController: self.writeBackend(devid, 'online', "0") self.writeBackend(devid, 'state', str(xenbusState['Closing'])) + if force: + frontpath = self.frontendPath(devid) + backpath = xstransact.Read(frontpath, "backend") + if backpath: + xstransact.Remove(backpath) + xstransact.Remove(frontpath) + def configurations(self): return map(self.configuration, self.deviceIDs()) --- xen-3.0.3_0-src/tools/python/xen/xend/server/blkif.py.orig 2006-12-18 07:53:08.000000000 -0500 +++ xen-3.0.3_0-src/tools/python/xen/xend/server/blkif.py 2006-12-18 07:54:16.000000000 -0500 @@ -130,7 +130,7 @@ class BlkifController(DevController): return result - def destroyDevice(self, devid): + def destroyDevice(self, devid, force): """@see DevController.destroyDevice""" # If we are given a device name, then look up the device ID from it, @@ -139,13 +139,13 @@ class BlkifController(DevController): # superclass's method. try: - DevController.destroyDevice(self, int(devid)) + DevController.destroyDevice(self, int(devid), force) except ValueError: devid_end = type(devid) is str and devid.split('/')[-1] or None for i in self.deviceIDs(): d = self.readBackend(i, 'dev') if d == devid or (devid_end and d == devid_end): - DevController.destroyDevice(self, i) + DevController.destroyDevice(self, i, force) return raise VmError("Device %s not connected" % devid) --- xen-3.0.3_0-src/tools/python/xen/xm/main.py.orig 2006-12-18 07:53:08.000000000 -0500 +++ xen-3.0.3_0-src/tools/python/xen/xm/main.py 2006-12-18 07:54:16.000000000 -0500 @@ -121,14 +121,14 @@ SUBCOMMAND_HELP = { 'Create a new virtual block device.'), 'block-configure': (' [BackDomId]', 'Change block device configuration'), - 'block-detach' : (' ', + 'block-detach' : (' [-f|--force]', 'Destroy a domain\'s virtual block device.'), 'block-list' : (' [--long]', 'List virtual block devices for a domain.'), 'network-attach': (' [--script=

Synopsis

- ntpdc [ -ilnps ] [ -c command ] [ host ] [ ... ] + ntpdc [ -46dilnps ] [ -c command ] [ host ] [ ... ]

Description

- ntpdc is used to query the ntpd daemon about its current state and to request changes in that state. The program may be run either in interactive mode or controlled using command line arguments. Extensive state and statistics information is available through the ntpdc interface. In addition, nearly all the configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using ntpdc. +

ntpdc is used to query the ntpd daemon about its current state and to request changes in that state. The program may be run either in interactive mode or controlled using command line arguments. Extensive state and statistics information is available through the ntpdc interface. In addition, nearly all the configuration options which can be specified at startup using ntpd's configuration file may also be specified at run time using ntpdc.

If one or more request options are included on the command line when ntpdc is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpdc will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpdc will prompt for commands if the standard input is a terminal device.

ntpdc uses NTP mode 7 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. Note that since NTP is a UDP protocol this communication will be somewhat unreliable, especially over large distances in terms of network topology. ntpdc makes no attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout time.

The operation of ntpdc are specific to the particular implementation of the ntpd daemon and can be expected to work only with this and maybe some previous versions of the daemon. Requests from a remote ntpdc program which affect the state of the local server must be authenticated, which requires both the remote program and local server share a common key and key identifier.

@@ -35,6 +35,8 @@
Force DNS resolution of following host names on the command line to the IPv6 namespace.
-c command
The following argument is interpreted as an interactive format command and is added to the list of commands to be executed on the specified host(s). Multiple -c options may be given. +
-d +
Turn on debugging mode.
-i
Force ntpdc to operate in interactive mode. Prompts will be written to the standard output and commands read from the standard input.
-l @@ -134,11 +136,11 @@
addpeer peer_address [ keyid ] [ version ] [ minpoll# | prefer | iburst | burst | minpoll - N | maxpoll N [ dynamic ] [...] ] + N | maxpoll N [ dynamic ] [...] ]
addpeer peer_address [ prefer | iburst | burst | minpoll N | maxpoll N | keyid - N | version N [...] ] + N | version N [...] ]
Add a configured peer association at the given address and operating in symmetric active mode. Note that an existing association @@ -162,16 +164,16 @@ peer configuration file command of ntpd. See the Server Options page for further information. Each flag (or its absence) replaces the - previous setting. The prefer keyword indicates a preferred peer (and thus will be used primarily for clock synchronisation if possible). The preferred peer also determines the validity of the PPS signal - if the preferred peer is suitable for synchronisation so is the PPS signal. + previous setting. The prefer keyword indicates a preferred peer (and thus will be used primarily for clock synchronization if possible). The preferred peer also determines the validity of the PPS signal - if the preferred peer is suitable for synchronization so is the PPS signal. The dynamic keyword allows association configuration even when no suitable network interface is found at configuration time. The dynamic interface update mechanism may complete the configuration when new interfaces appear (e.g. WLAN/PPP interfaces) at a later time and thus render the association operable.
addserver peer_address [ keyid ] [ version ] [ minpoll# | prefer | iburst | burst | minpoll - N | maxpoll N [...] ] + N | maxpoll N [...] ]
addserver peer_address [ prefer | iburst | burst | minpoll N | maxpoll N | keyid - N | version N [...] [ dynamic ] ] + N | version N [...] [ dynamic ] ]
Identical to the addpeer command, except that the operating mode is client.
broadcast peer_address [ keyid ] [ version ] [ prefer ] @@ -200,9 +202,9 @@
Returns information concerning the authentication module, including known keys and counts of encryptions and decryptions which have been done.
traps
Display the traps set in the server. See the source listing for further information. -
addtrap [ address [ port ] [ interface ] +
addtrap [ address ] [ port ] [ interface ]
Set a trap for asynchronous messages. See the source listing for further information. -
clrtrap [ address [ port ] [ interface] +
clrtrap [ address ] [ port ] [ interface]
Clear a trap for asynchronous messages. See the source listing for further information.
reset
Clear the statistics counters in various modules of the server. See the source listing for further information. --- ntp-4.2.4/html/ntpq.html.htmldoc 2006-06-06 22:16:06.000000000 +0200 +++ ntp-4.2.4/html/ntpq.html 2007-01-05 15:40:59.000000000 +0100 @@ -19,11 +19,11 @@

Synopsis

- ntpq [-inp] [-c command] [host] [...] + ntpq [-46dinp] [-c command] [host] [...]

Description

The ntpq utility program is used to monitor NTP daemon ntpd operations and determine performance. It uses the standard NTP mode 6 control message formats defined in Appendix B of the NTPv3 specification RFC1305. The same formats are used in NTPv4, although some of the variables have changed and new ones added. The description on this page is for the NTPv4 variables.

The program can be run either in interactive mode or controlled using command line arguments. Requests to read and write arbitrary variables can be assembled, with raw and pretty-printed output options being available. The ntpq can also obtain and print a list of peers in a common format by sending multiple queries to the server.

-

If one or more request options is included on the command line when ntpq is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpq will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpqwill prompt for commands if the standard input is a terminal device.

+

If one or more request options is included on the command line when ntpq is executed, each of the requests will be sent to the NTP servers running on each of the hosts given as command line arguments, or on localhost by default. If no request options are given, ntpq will attempt to read commands from the standard input and execute these on the NTP server running on the first host given on the command line, again defaulting to localhost when no other host is specified. ntpq will prompt for commands if the standard input is a terminal device.

ntpq uses NTP mode 6 packets to communicate with the NTP server, and hence can be used to query any compatible server on the network which permits it. Note that since NTP is a UDP protocol this communication will be somewhat unreliable, especially over large distances in terms of network topology. ntpq makes one attempt to retransmit requests, and will time requests out if the remote host is not heard from within a suitable timeout time.

Note that in contexts where a host name is expected, a -4 qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a -6 qualifier forces DNS resolution to the IPv6 namespace.

For examples and usage, see the NTP Debugging Techniques page.

@@ -73,7 +73,7 @@
quit
Exit ntpq.
raw -
Causes all output from query commands is printed as received from the remote server. The only formating/interpretation done on the data is to transform nonascii data into a printable (but barely understandable) form. +
Causes all output from query commands is printed as received from the remote server. The only formatting/interpretation done on the data is to transform non-ASCII data into a printable (but barely understandable) form.
timeout millseconds
Specify a timeout period for responses to server queries. The default is about 5000 milliseconds. Note that since ntpq retries each query once after a timeout, the total waiting time for a timeout will be twice the timeout value set.
@@ -135,7 +135,7 @@
*  sys.peer
The peer has been declared the system peer and lends its variables to the system variables.
o  pps.peer -
The peer has been declared the system peer and lends its variables to thesystem variables. However, the actual system synchronization is derived from a pulse-per-second (PPS) signal, either indirectly via the PPS reference clock driver or directly via kernel interface. +
The peer has been declared the system peer and lends its variables to the system variables. However, the actual system synchronization is derived from a pulse-per-second (PPS) signal, either indirectly via the PPS reference clock driver or directly via kernel interface.

System Variables

The status, leap, stratum, precision, rootdelay, rootdispersion, refid, reftime, poll, offset, and frequency variables are described in RFC-1305 specification. Additional NTPv4 system variables include the following.

@@ -240,14 +240,14 @@
Access is denied. See the Access Control Options page.
0x010 TEST5
Cryptographic authentication fails. See the Authentication Options page. -
0x020TEST6 +
0x020 TEST6
The server is unsynchronized. Wind up its clock first.
0x040 TEST7
The server stratum is at the maximum than 15. It is probably unsynchronized and its clock needs to be wound up.
0x080 TEST8
Either the root delay or dispersion is greater than one second, which is highly unlikely unless the peer is unsynchronized to Mars.
0x100 TEST9 -
Either the peer delay or dispersion is greater than one second, which is higly unlikely unless the peer is on Mars. +
Either the peer delay or dispersion is greater than one second, which is highly unlikely unless the peer is on Mars.
0x200 TEST10
The autokey protocol has detected an authentication failure. See the Authentication Options page.
0x400 TEST11 --- ntp-4.2.4/html/monopt.html.htmldoc 2006-12-28 13:02:56.000000000 +0100 +++ ntp-4.2.4/html/monopt.html 2007-01-05 15:42:20.000000000 +0100 @@ -82,9 +82,7 @@
name
This is the type of the statistics records, as shown in the statistics command. -
-
file filename -
+
file filename
This is the file name for the statistics records. Filenames of set members are built from three concatenated elements prefix, filename and suffix:
prefix @@ -94,9 +92,7 @@
suffix
This part is reflects individual elements of a file set. It is generated according to the type of a file set.
-
-
type typename -
+
type typename
A file generation set is characterized by its type. The following types are supported:
none @@ -114,13 +110,9 @@
age
This type of file generation sets changes to a new element of the file set every 24 hours of server operation. The filename suffix consists of a dot, the letter a, and an 8-digit number. This number is taken to be the number of seconds the server is running at the start of the corresponding 24-hour period. Information is only written to a file generation by specifying enable; output is prevented by specifying disable.
-
-
link | nolink -
+
link | nolink
It is convenient to be able to access the current element of a file generation set by a fixed name. This feature is enabled by specifying link and disabled using nolink. If link is specified, a hard link from the current file set element to a file without suffix is created. When there is already a file with this name and the number of links of this file is one, it is renamed appending a dot, the letter C, and the pid of the ntpd server process. When the number of links is greater than one, the file is unlinked. This allows the current file to be accessed by a constant name. -
-
enable | disable -
+
enable | disable
Enables or disables the recording function.
--- ntp-4.2.4/html/confopt.html.htmldoc 2006-12-28 13:02:55.000000000 +0100 +++ ntp-4.2.4/html/confopt.html 2007-01-05 15:40:59.000000000 +0100 @@ -32,8 +32,8 @@

There are three types of associations: persistent, preemptable and ephemeral. Persistent associations are mobilized by a configuration command and never demobilized. Preemptable associations, which are new to NTPv4, are mobilized by a configuration command which includes the prempt flag and are demobilized by timeout or error. Ephemeral associations are mobilized upon arrival of designated messages and demobilized by timeout or error.

server address [options ...]
- peer address [options ...]
- broadcast address [options ...]
+ peer address [options ...]
+ broadcast address [options ...]
manycastclient address [options ...]
These four commands specify the time server name or address to be used and the mode in which to operate. The address can be either a DNS name or a IP address in dotted-quad notation. Additional information on association behavior can be found in the Association Management page.
ntp-4.2.4-intresflags.patch: ntp_intres.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE ntp-4.2.4-intresflags.patch --- --- ntp-4.2.4/ntpd/ntp_intres.c.intresflags 2006-12-28 13:03:28.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_intres.c 2007-01-03 16:09:44.000000000 +0100 @@ -1059,6 +1059,7 @@ } if ((intval[TOK_FLAGS] & ~(FLAG_AUTHENABLE | FLAG_PREFER | + FLAG_DYNAMIC | FLAG_NOSELECT | FLAG_BURST | FLAG_IBURST | FLAG_SKEY)) != 0) { msyslog(LOG_ERR, "invalid flags (%ld) in file %s", @@ -1079,6 +1080,8 @@ flags |= CONF_FLAG_IBURST; if (intval[TOK_FLAGS] & FLAG_SKEY) flags |= CONF_FLAG_SKEY; + if (intval[TOK_FLAGS] & FLAG_DYNAMIC) + flags |= CONF_FLAG_DYNAMIC; /* * This is as good as we can check it. Add it in. ntp-4.2.4-linkfastmath.patch: Makefile.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ntp-4.2.4-linkfastmath.patch --- --- ntp-4.2.4/ntpd/Makefile.in.linkfastmath 2006-12-29 00:58:57.000000000 +0100 +++ ntp-4.2.4/ntpd/Makefile.in 2007-01-02 17:56:48.000000000 +0100 @@ -281,7 +281,7 @@ # sqrt ntp_control.o # floor refclock_wwv.o # which are (usually) provided by -lm. -ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ $(LIBOPTS_LDADD) ../libntp/libntp.a +ntpd_LDADD = $(LDADD) -lm -ffast-math @LCRYPTO@ $(LIBOPTS_LDADD) ../libntp/libntp.a ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ $(LIBOPTS_LDADD) ntpdsim_CFLAGS = $(CFLAGS) -DSIM check_y2k_LDADD = $(LDADD) ../libntp/libntp.a ntp-4.2.4-revert452.patch: ntp_loopfilter.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) --- NEW FILE ntp-4.2.4-revert452.patch --- --- ntp-4.2.4/ntpd/ntp_loopfilter.c.revert452 2006-12-28 13:03:30.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_loopfilter.c 2007-01-08 12:47:31.000000000 +0100 @@ -650,15 +650,17 @@ * frequency and pretend we did it here. */ if (ntp_adjtime(&ntv) == TIME_ERROR) { - NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) - msyslog(LOG_NOTICE, - "kernel time sync error %04x", ntv.status); + if (ntv.status != pll_status) + NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) + msyslog(LOG_NOTICE, + "kernel time sync disabled %04x", + ntv.status); ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME); } else { - if ((ntv.status ^ pll_status) & ~STA_FLL) + if (ntv.status != pll_status) NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) msyslog(LOG_NOTICE, - "kernel time sync status change %04x", + "kernel time sync enabled %04x", ntv.status); } pll_status = ntv.status; ntp-4.2.4-sprintf.patch: refclock_wwv.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) --- NEW FILE ntp-4.2.4-sprintf.patch --- --- ntp-4.2.4/ntpd/refclock_wwv.c.sprintf 2006-12-28 13:03:49.000000000 +0100 +++ ntp-4.2.4/ntpd/refclock_wwv.c 2007-01-02 17:52:10.000000000 +0100 @@ -1364,7 +1364,7 @@ else sp->metric = wwv_metric(sp); if (pp->sloppyclockflag & CLK_FLAG4) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv8 %04x %3d %s %04x %.0f %.0f/%.1f %4ld %4ld", up->status, up->gain, sp->refid, sp->reach & 0xffff, sp->metric, sp->synmax, @@ -1491,7 +1491,7 @@ } if ((pp->sloppyclockflag & CLK_FLAG4) && !(up->status & MSYNC)) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv1 %04x %3d %4d %5.0f %5.1f %5d %4d %4d %4d", up->status, up->gain, tepoch, up->epomax, up->eposnr, tmp2, avgcnt, syncnt, @@ -1582,7 +1582,7 @@ } } if (pp->sloppyclockflag & CLK_FLAG4) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv2 %04x %5.0f %5.1f %5d %4d %4d %4d %4.0f %7.2f", up->status, up->epomax, up->eposnr, mepoch, up->avgint, maxrun, mcount - zcount, dtemp, @@ -1768,7 +1768,7 @@ struct wwvunit *up; struct chan *cp; struct sync *sp, *rp; - char tbuf[80]; /* monitor buffer */ + char tbuf[128]; /* monitor buffer */ int sw, arg, nsec; pp = peer->procptr; @@ -1869,7 +1869,7 @@ } rp->metric = wwv_metric(rp); if (pp->sloppyclockflag & CLK_FLAG4) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv5 %04x %3d %4d %.0f/%.1f %.0f/%.1f %s %04x %.0f %.0f/%.1f %s %04x %.0f %.0f/%.1f", up->status, up->gain, up->yepoch, up->epomax, up->eposnr, up->datsig, @@ -2041,7 +2041,7 @@ } if ((pp->sloppyclockflag & CLK_FLAG4) && !(up->status & DSYNC)) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv3 %2d %04x %3d %4d %5.0f %5.1f %5.0f %5.1f %5.0f", nsec, up->status, up->gain, up->yepoch, up->epomax, up->eposnr, up->datsig, up->datsnr, bit); @@ -2212,7 +2212,7 @@ } if ((pp->sloppyclockflag & CLK_FLAG4) && !(up->status & INSYNC)) { - sprintf(tbuf, + snprintf(tbuf, sizeof (tbuf), "wwv4 %2d %04x %3d %4d %5.0f %2d %d %d %d %5.0f %5.1f", up->rsec - 1, up->status, up->gain, up->yepoch, up->epomax, vp->radix, vp->digit, vp->mldigit, Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 21 Nov 2006 16:33:05 -0000 1.22 +++ .cvsignore 17 Jan 2007 16:06:39 -0000 1.23 @@ -1,3 +1,2 @@ ntpstat-0.2.tgz -ntp-4.2.2-manpages-2.tar.gz -ntp-4.2.2p4.tar.gz +ntp-4.2.4.tar.gz Index: ntp.conf =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp.conf,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ntp.conf 20 Jul 2006 15:33:58 -0000 1.12 +++ ntp.conf 17 Jan 2007 16:06:39 -0000 1.13 @@ -14,9 +14,9 @@ # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -server 0.fedora.pool.ntp.org -server 1.fedora.pool.ntp.org -server 2.fedora.pool.ntp.org +server 0.fedora.pool.ntp.org dynamic +server 1.fedora.pool.ntp.org dynamic +server 2.fedora.pool.ntp.org dynamic #broadcast 192.168.1.255 key 42 # broadcast server #broadcastclient # broadcast client Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ntp.spec 22 Nov 2006 14:57:15 -0000 1.60 +++ ntp.spec 17 Jan 2007 16:06:39 -0000 1.61 @@ -2,8 +2,8 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp -Version: 4.2.2p4 -Release: 2%{?dist} +Version: 4.2.4 +Release: 1%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -12,32 +12,33 @@ Source3: ntpd.init Source4: ntpd.sysconfig Source5: ntpstat-0.2.tgz -Source6: ntp-4.2.2-manpages-2.tar.gz # new find-requires Source7: filter-requires-ntp.sh %define __find_requires %{SOURCE7} -Patch2: ntp-4.2.2-droproot.patch -Patch3: ntp-stable-4.2.0a-20040616-groups.patch +Patch2: ntp-4.2.4-droproot.patch +Patch3: ntp-4.2.4-groups.patch Patch4: ntp-4.1.1c-rc3-authkey.patch -Patch5: ntp-4.2.2-linkfastmath.patch -Patch6: ntp-4.2.2-loopfilter.patch -Patch7: ntp-4.2.0-sbinpath.patch -Patch8: ntp-4.2.2-manycast.patch -Patch9: ntp-4.2.2-mlockall.patch -Patch10: ntp-stable-4.2.0a-20050816-loopback.patch +Patch5: ntp-4.2.4-linkfastmath.patch +Patch6: ntp-4.2.4-allowbind.patch +Patch7: ntp-4.2.4-revert452.patch +Patch8: ntp-4.2.4-intresflags.patch +Patch9: ntp-4.2.4-html2man.patch +Patch10: ntp-4.2.4-htmldoc.patch Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch -Patch12: ntp-4.2.2-sprintf.patch +Patch12: ntp-4.2.4-sprintf.patch +Patch13: ntp-4.2.4-autoopts.patch URL: http://www.ntp.org -PreReq: /sbin/chkconfig -Prereq: /usr/sbin/groupadd /usr/sbin/useradd -PreReq: /bin/awk sed grep -Requires: libcap -BuildRequires: libcap-devel openssl-devel readline-devel +Requires(pre): shadow-utils +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig /sbin/service +Requires(postun): /sbin/service +BuildRequires: libcap-devel openssl-devel readline-devel perl-HTML-Parser +BuildRequires: ncurses-devel Obsoletes: xntp3 ntpstat -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description The Network Time Protocol (NTP) is used to synchronize a computer's @@ -52,18 +53,19 @@ time synchronized via the NTP protocol. %prep -%setup -q -a 5 -a 6 +%setup -q -a 5 -%patch2 -p1 +%patch2 -p1 -b .droproot %patch3 -p1 -b .groups %patch4 -p1 -b .authkey -%patch6 -p1 -b .loopfilter -%patch7 -p1 -b .sbinpath -%patch8 -p1 -b .manycast -%patch9 -p1 -b .mlockall -%patch10 -p1 -b .loopback +%patch6 -p1 -b .allowbind +%patch7 -p1 -b .revert452 +%patch8 -p1 -b .intresflags +%patch9 -p1 -b .html2man +%patch10 -p1 -b .htmldoc %patch11 -p1 -b .keyfile %patch12 -p1 -b .sprintf +%patch13 -p1 -b .autoopts %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -79,45 +81,51 @@ --sysconfdir=%{_sysconfdir}/ntp \ --enable-all-clocks --enable-parse-clocks \ --enable-linuxcaps +make -perl -pi -e "s|-lelf||" */Makefile +sed -i 's|$ntpq = "ntpq"|$ntpq = "%{_sbindir}/ntpq"|' scripts/ntptrace -make +pushd html +../scripts/html2man +# remove adjacent blank lines +sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] +popd make -C ntpstat-0.2 CFLAGS="$CFLAGS" %install rm -rf $RPM_BUILD_ROOT -%makeinstall bindir=${RPM_BUILD_ROOT}%{_sbindir} +make DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} install -pushd ntpstat-0.2 -mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1 -mkdir -p ${RPM_BUILD_ROOT}/%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{5,8} +mv $RPM_BUILD_ROOT%{_mandir}/man1/sntp.1 $RPM_BUILD_ROOT%{_mandir}/man8/sntp.8 +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 755 ntpstat ${RPM_BUILD_ROOT}/%{_bindir}/ -install -m 644 ntpstat.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/ +pushd ntpstat-0.2 +mkdir -p $RPM_BUILD_ROOT%{_bindir} +install -m 755 ntpstat $RPM_BUILD_ROOT%{_bindir} +install -m 644 ntpstat.1 $RPM_BUILD_ROOT%{_mandir}/man8/ntpstat.8 popd -pushd man -for i in *.1; do - install -m 644 $i ${RPM_BUILD_ROOT}/%{_mandir}/man1/ -done - -{ cd $RPM_BUILD_ROOT - - mkdir -p .%{_sysconfdir}/ntp - mkdir -p .%{_initrddir} - install -m644 $RPM_SOURCE_DIR/ntp.conf .%{_sysconfdir}/ntp.conf - mkdir -p .%{_var}/lib/ntp - touch .%{_var}/lib/ntp/drift - install -m600 $RPM_SOURCE_DIR/ntp.keys .%{_sysconfdir}/ntp/keys - touch .%{_sysconfdir}/ntp/step-tickers - install -m755 $RPM_SOURCE_DIR/ntpd.init .%{_initrddir}/ntpd - - mkdir -p .%{_sysconfdir}/sysconfig - install -m644 %{SOURCE4} .%{_sysconfdir}/sysconfig/ntpd -} +# fix section numbers +sed -i 's/\(\.TH[a-zA-Z ]*\)[1-9]\(.*\)/\18\2/' $RPM_BUILD_ROOT%{_mandir}/man8/*.8 +cp -r html/man/man[58] $RPM_BUILD_ROOT%{_mandir} + +# prepare html documentation +find html | egrep '\.(html|css|txt|jpg|gif)$' | grep -v '/build/' | cpio -pmd htmldoc +find htmldoc -type f | xargs chmod 644 +find htmldoc -type d | xargs chmod 755 + +pushd $RPM_BUILD_ROOT +mkdir -p .%{_sysconfdir}/{ntp,sysconfig} .%{_initrddir} +mkdir -p .%{_localstatedir}/lib/ntp +touch .%{_localstatedir}/lib/ntp/drift .%{_sysconfdir}/ntp/step-tickers +install -m644 %{SOURCE1} .%{_sysconfdir} +install -m600 %{SOURCE2} .%{_sysconfdir}/ntp/keys +install -m755 %{SOURCE3} .%{_initrddir}/ntpd +install -m644 %{SOURCE4} .%{_sysconfdir}/sysconfig/ntpd +popd %clean rm -rf $RPM_BUILD_ROOT @@ -128,21 +136,24 @@ %post /sbin/chkconfig --add ntpd +: %preun -if [ $1 = 0 ]; then - service ntpd stop > /dev/null 2>&1 - /sbin/chkconfig --del ntpd +if [ "$1" -eq 0 ]; then + /sbin/service ntpd stop &> /dev/null + /sbin/chkconfig --del ntpd fi +: %postun -if [ "$1" -ge "1" ]; then - service ntpd condrestart > /dev/null 2>&1 +if [ "$1" -ge 1 ]; then + /sbin/service ntpd condrestart &> /dev/null fi +: %files %defattr(-,root,root) -%doc html/* NEWS TODO +%doc htmldoc/html/* NEWS TODO %{_sbindir}/ntp-wait %{_sbindir}/ntptrace %{_sbindir}/ntp-keygen @@ -159,13 +170,21 @@ %dir %{_sysconfdir}/ntp %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/ntp/step-tickers %config(noreplace) %{_sysconfdir}/ntp/keys -%dir %attr(-,ntp,ntp) %{_var}/lib/ntp -%ghost %attr(644,ntp,ntp) %{_var}/lib/ntp/drift -%{_mandir}/man1/* +%dir %attr(-,ntp,ntp) %{_localstatedir}/lib/ntp +%ghost %attr(644,ntp,ntp) %{_localstatedir}/lib/ntp/drift +%{_mandir}/man[58]/*.[58]* %{_bindir}/ntpstat %changelog +* Wed Jan 17 2007 Miroslav Lichvar 4.2.4-1.fc6 +- update to 4.2.4 (#216351) +- autogenerate man pages from HTML +- add ncurses-devel to BuildRequires +- disable autoopts option preset mechanisms for ntpd +- document -I option of ntpd +- clean up spec a bit + * Wed Nov 22 2006 Miroslav Lichvar 4.2.2p4-2 - pass additional options to ntpdate (#202204) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 21 Nov 2006 16:33:05 -0000 1.23 +++ sources 17 Jan 2007 16:06:39 -0000 1.24 @@ -1,3 +1,2 @@ 6b2bedefe2e7c63ea52609b222022121 ntpstat-0.2.tgz -28d26352b918a1d77674534a8a6079d3 ntp-4.2.2-manpages-2.tar.gz -916fe57525f8327f340b203f129088fa ntp-4.2.2p4.tar.gz +eb9147d26cbe18bd8fbec07f1df55aef ntp-4.2.4.tar.gz --- ntp-4.2.0-sbinpath.patch DELETED --- --- ntp-4.2.2-droproot.patch DELETED --- --- ntp-4.2.2-linkfastmath.patch DELETED --- --- ntp-4.2.2-loopfilter.patch DELETED --- --- ntp-4.2.2-manycast.patch DELETED --- --- ntp-4.2.2-mlockall.patch DELETED --- --- ntp-4.2.2-sprintf.patch DELETED --- --- ntp-stable-4.2.0a-20040616-groups.patch DELETED --- --- ntp-stable-4.2.0a-20050816-loopback.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 17 16:12:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 11:12:41 -0500 Subject: rpms/autofs/FC-6 autofs-5.0.1-rc3-correct-expire-check.patch, NONE, 1.1 autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch, NONE, 1.1 autofs.spec, 1.166, 1.167 autofs-5.0.1-rc2-nsswitch-ignore-winbind.patch, 1.1, NONE Message-ID: <200701171612.l0HGCfZG031394@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31376 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-correct-expire-check.patch autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch Removed Files: autofs-5.0.1-rc2-nsswitch-ignore-winbind.patch Log Message: * Wed Jan 17 2007 Ian Kent - 5.0.1-0.rc3.8 - fix another expire regression introduced in the "mitigate manual umount" patch (bz 222872). - replace patch 3 with rc3 variant instead of the rc2 one. autofs-5.0.1-rc3-correct-expire-check.patch: CHANGELOG | 1 + daemon/direct.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-correct-expire-check.patch --- diff --git a/CHANGELOG b/CHANGELOG index 011da35..8ca790a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ - fix typo in Fix typo in var when removing temp directory. - remove redundant rpath link option. - ignore "winbind" if it appears in "automount" nsswitch.conf. +- fix another expire regression introduced in the "mitigate manual umount" patch. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/daemon/direct.c b/daemon/direct.c index 070e614..aa1a501 100644 --- a/daemon/direct.c +++ b/daemon/direct.c @@ -930,6 +930,7 @@ void *expire_proc_direct(void *arg) if (!strcmp(next->fs_type, "autofs")) { struct stat st; + struct statfs fs; int ioctlfd; cache_unlock(me->mc); @@ -950,7 +951,14 @@ void *expire_proc_direct(void *arg) continue; } - if (tree_is_mounted(mnts, next->path, MNTS_REAL)) { + if (statfs(next->path, &fs) == -1) { + pthread_setcancelstate(cur_state, NULL); + warn(ap->logopt, + "fstatfs failed for %s", next->path); + continue; + } + + if (fs.f_type != AUTOFS_SUPER_MAGIC) { pthread_setcancelstate(cur_state, NULL); continue; } autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch: CHANGELOG | 1 + lib/nss_parse.y | 27 ++++++++++++++++++++------- lib/nss_tok.l | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) --- NEW FILE autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch --- diff --git a/CHANGELOG b/CHANGELOG index b043e7e..011da35 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ --------------------- - fix typo in Fix typo in var when removing temp directory. - remove redundant rpath link option. +- ignore "winbind" if it appears in "automount" nsswitch.conf. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/nss_parse.y b/lib/nss_parse.y index bc12c73..6be243e 100644 --- a/lib/nss_parse.y +++ b/lib/nss_parse.y @@ -51,6 +51,7 @@ extern int nss_lineno; extern int nss_lex(void); extern FILE *nss_in; +static int nss_ignore(const char *s); static int nss_error(const char *s); %} @@ -82,18 +83,24 @@ sources: nss_source nss_source: SOURCE { - src = add_source(nss_list, $1); + if (strcmp($1, "winbind")) + src = add_source(nss_list, $1); + else + nss_ignore($1); } | SOURCE LBRACKET status_exp_list RBRACKET { enum nsswitch_status a; - src = add_source(nss_list, $1); - for (a = 0; a < NSS_STATUS_MAX; a++) { - if (act[a].action != NSS_ACTION_UNKNOWN) { - src->action[a].action = act[a].action; - src->action[a].negated = act[a].negated; + if (strcmp($1, "winbind")) { + src = add_source(nss_list, $1); + for (a = 0; a < NSS_STATUS_MAX; a++) { + if (act[a].action != NSS_ACTION_UNKNOWN) { + src->action[a].action = act[a].action; + src->action[a].negated = act[a].negated; + } } - } + } else + nss_ignore($1); } | SOURCE LBRACKET status_exp_list SOURCE { nss_error($4); YYABORT; } | SOURCE LBRACKET status_exp_list OTHER { nss_error($4); YYABORT; } | SOURCE LBRACKET status_exp_list NL { nss_error("no closing bracket"); YYABORT; } @@ -118,6 +125,12 @@ status_exp: STATUS EQUAL ACTION %% +static int nss_ignore(const char *s) +{ + msg("ignored invalid nsswitch config near [ %s ]", s); + return(0); +} + static int nss_error(const char *s) { msg("syntax error in nsswitch config near [ %s ]\n", s); diff --git a/lib/nss_tok.l b/lib/nss_tok.l index dea8203..597fc76 100644 --- a/lib/nss_tok.l +++ b/lib/nss_tok.l @@ -68,7 +68,7 @@ WS [[:blank:]]+ automount ([Aa][Uu][Tt][Oo][Mm][Oo][Uu][Nn][Tt]) -source files|yp|nis|nisplus|ldap|hesiod +source files|yp|nis|nisplus|ldap|hesiod|winbind success ([Ss][Uu][Cc][Cc][Ee][Ss][Ss]) notfound ([Nn][Oo][Tt][Ff][Oo][Uu][Nn][Dd]) Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- autofs.spec 15 Jan 2007 04:12:08 -0000 1.166 +++ autofs.spec 17 Jan 2007 16:12:39 -0000 1.167 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.6 +%define release 0.rc3.8 Version: %{version} Release: %{release} Epoch: 1 @@ -13,7 +13,8 @@ Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc3.tar.bz2 Patch1: autofs-5.0.1-rc3-fix-typo-rmdir-temp.patch Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch -Patch3: autofs-5.0.1-rc2-nsswitch-ignore-winbind.patch +Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch +Patch4: autofs-5.0.1-rc3-correct-expire-check.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 @@ -59,6 +60,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -115,6 +117,11 @@ %{_libdir}/autofs/* %changelog +* Wed Jan 17 2007 Ian Kent - 5.0.1-0.rc3.8 +- fix another expire regression introduced in the "mitigate manual umount" + patch (bz 222872). +- replace patch 3 with rc3 variant instead of the rc2 one. + * Mon Jan 15 2007 Ian Kent - 5.0.1-0.rc3.6 - ignore "winbind" if it appears in "automount" nsswitch.conf (bz 214632). --- autofs-5.0.1-rc2-nsswitch-ignore-winbind.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 17 16:12:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 11:12:58 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.126, 1.127 libselinux.spec, 1.244, 1.245 sources, 1.128, 1.129 Message-ID: <200701171612.l0HGCw3G031428@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31411 Modified Files: .cvsignore libselinux.spec sources Log Message: * Mon Jan 17 2007 Dan Walsh - 1.33.6-1 - Upgrade to upstream * Merged man page updates to make "apropos selinux" work from Dan Walsh. * Mon Jan 15 2007 Dan Walsh - 1.33.5-1 - Upgrade to upstream * Merged getdefaultcon utility from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- .cvsignore 16 Jan 2007 21:46:11 -0000 1.126 +++ .cvsignore 17 Jan 2007 16:12:56 -0000 1.127 @@ -102,3 +102,4 @@ libselinux-1.33.3.tgz libselinux-1.33.4.tgz libselinux-1.33.5.tgz +libselinux-1.33.6.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- libselinux.spec 16 Jan 2007 21:46:11 -0000 1.244 +++ libselinux.spec 17 Jan 2007 16:12:56 -0000 1.245 @@ -1,12 +1,11 @@ %define libsepolver 1.15.2-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.33.5 +Version: 1.33.6 Release: 1%{?dist} 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} swig Requires: libsepol >= %{libsepolver} setransd @@ -49,7 +48,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -121,6 +119,9 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Mon Jan 17 2007 Dan Walsh - 1.33.6-1 +- Upgrade to upstream + * Merged man page updates to make "apropos selinux" work from Dan Walsh. * Mon Jan 15 2007 Dan Walsh - 1.33.5-1 - Upgrade to upstream * Merged getdefaultcon utility from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- sources 16 Jan 2007 21:46:11 -0000 1.128 +++ sources 17 Jan 2007 16:12:56 -0000 1.129 @@ -1 +1 @@ -f571eebdbef792b55cce6a7401d0a0c2 libselinux-1.33.5.tgz +1f8802c1adaf37f1fb12e5523d3c5cdf libselinux-1.33.6.tgz From fedora-cvs-commits at redhat.com Wed Jan 17 16:14:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 11:14:34 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.133, 1.134 policycoreutils-rhat.patch, 1.274, 1.275 policycoreutils.spec, 1.361, 1.362 sources, 1.137, 1.138 Message-ID: <200701171614.l0HGEYLJ031557@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31539 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jan 17 2007 Dan Walsh 1.33.15-1 - Update to upstream * Merged unicode-to-string fix for seobject audit from Dan Walsh. * Merged man page updates to make "apropos selinux" work from Dan Walsh. * Tue Jan 16 2007 Dan Walsh 1.33.14-1 * Merged newrole man page patch from Michael Thompson. * Merged patch to fix python unicode problem from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- .cvsignore 16 Jan 2007 21:44:42 -0000 1.133 +++ .cvsignore 17 Jan 2007 16:14:32 -0000 1.134 @@ -126,3 +126,4 @@ policycoreutils-1.33.11.tgz policycoreutils-1.33.12.tgz policycoreutils-1.33.14.tgz +policycoreutils-1.33.15.tgz policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 semanage/seobject.py | 10 18 files changed, 4803 insertions(+), 9 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- policycoreutils-rhat.patch 16 Jan 2007 21:44:42 -0000 1.274 +++ policycoreutils-rhat.patch 17 Jan 2007 16:14:32 -0000 1.275 @@ -1,18 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.33.12/audit2allow/audit2allow.1 ---- nsapolicycoreutils/audit2allow/audit2allow.1 2006-11-16 17:14:29.000000000 -0500 -+++ policycoreutils-1.33.12/audit2allow/audit2allow.1 2007-01-12 10:58:14.000000000 -0500 -@@ -24,7 +24,7 @@ - .\" - .TH AUDIT2ALLOW "1" "January 2005" "Security Enhanced Linux" NSA - .SH NAME --audit2allow \- generate policy allow rules from logs of denied operations -+audit2allow \- generate SELinux policy allow rules from logs of denied operations - .SH SYNOPSIS - .B audit2allow - .RI [ options "] " -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.12/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.14/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/booleansPage.py 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/booleansPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -213,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.12/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.14/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/fcontextPage.py 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/fcontextPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -375,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.12/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.14/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/loginsPage.py 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/loginsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -540,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.12/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.14/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/Makefile 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/Makefile 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -574,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.12/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.14/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/mappingsPage.py 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/mappingsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -632,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.12/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.14/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/modulesPage.py 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/modulesPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -797,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.12/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.14/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/portsPage.py 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/portsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1015,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.12/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.14/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/selinux.tbl 2007-01-11 14:12:49.000000000 -0500 ++++ policycoreutils-1.33.14/gui/selinux.tbl 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1284,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.12/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.14/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/semanagePage.py 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/gui/semanagePage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1397,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.12/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.14/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/statusPage.py 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/gui/statusPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1614,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.12/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.14/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/system-config-selinux.glade 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/gui/system-config-selinux.glade 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4421,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.12/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.14/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/system-config-selinux.py 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/gui/system-config-selinux.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4581,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.12/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.14/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/translationsPage.py 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/gui/translationsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4694,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.12/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.14/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.12/gui/usersPage.py 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/gui/usersPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4853,62 +4841,18 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/load_policy/load_policy.8 policycoreutils-1.33.12/load_policy/load_policy.8 ---- nsapolicycoreutils/load_policy/load_policy.8 2006-11-16 17:14:31.000000000 -0500 -+++ policycoreutils-1.33.12/load_policy/load_policy.8 2007-01-12 10:57:30.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH LOAD_POLICY "8" "May 2003" "Security Enhanced Linux" NSA - .SH NAME --load_policy \- load a new policy into the kernel -+load_policy \- load a new SELinux policy into the kernel - - .SH SYNOPSIS - .B load_policy -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.12/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.14/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.12/Makefile 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/Makefile 2007-01-16 15:13:02.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.1 policycoreutils-1.33.12/newrole/newrole.1 ---- nsapolicycoreutils/newrole/newrole.1 2007-01-16 15:08:21.000000000 -0500 -+++ policycoreutils-1.33.12/newrole/newrole.1 2007-01-12 10:58:07.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH NEWROLE "1" "October 2000" "Security Enhanced Linux" NSA - .SH NAME --newrole \- run a shell with a new role -+newrole \- run a shell with a new SELinux role - .SH SYNOPSIS - .B newrole - [\fB-r\fR|\fB--role\fR] -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.33.12/restorecon/restorecon.8 ---- nsapolicycoreutils/restorecon/restorecon.8 2006-11-16 17:14:26.000000000 -0500 -+++ policycoreutils-1.33.12/restorecon/restorecon.8 2007-01-12 10:57:01.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "restorecon" "8" "2002031409" "" "" - .SH "NAME" --restorecon \- set file security contexts. -+restorecon \- restore file(s) default SELinux security contexts. - - .SH "SYNOPSIS" - .B restorecon -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.33.12/restorecond/restorecond.8 ---- nsapolicycoreutils/restorecond/restorecond.8 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.12/restorecond/restorecond.8 2007-01-12 10:57:25.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "restorecond" "8" "2002031409" "" "" - .SH "NAME" --restorecond \- daemon that watches for file creation and then corrects file context -+restorecond \- daemon that watches for file creation and then sets the default SELinux file context - - .SH "SYNOPSIS" - .B restorecond [\-d] -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.12/restorecond/restorecond.c +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.14/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.12/restorecond/restorecond.c 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/restorecond/restorecond.c 2007-01-16 15:13:02.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4935,84 +4879,19 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.12/restorecond/restorecond.conf +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.14/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.12/restorecond/restorecond.conf 2007-01-11 14:12:50.000000000 -0500 ++++ policycoreutils-1.33.14/restorecond/restorecond.conf 2007-01-16 15:13:02.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/run_init/run_init.8 policycoreutils-1.33.12/run_init/run_init.8 ---- nsapolicycoreutils/run_init/run_init.8 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.33.12/run_init/run_init.8 2007-01-12 10:56:18.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH RUN_INIT "8" "May 2003" "Security Enhanced Linux" NSA - .SH NAME --run_init \- run an init script in the proper context -+run_init \- run an init script in the proper SELinux context - .SH SYNOPSIS - .B run_init - \fISCRIPT\fR [[\fIARGS\fR]...] -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.33.12/scripts/chcat.8 ---- nsapolicycoreutils/scripts/chcat.8 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.33.12/scripts/chcat.8 2007-01-12 10:56:09.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH CHCAT "8" "September 2005" "chcat" "User Commands" - .SH NAME --chcat \- change file security category -+chcat \- change file SELinux security category - .SH SYNOPSIS - .B chcat - \fICATEGORY FILE\fR... -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.33.12/scripts/fixfiles.8 ---- nsapolicycoreutils/scripts/fixfiles.8 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.33.12/scripts/fixfiles.8 2007-01-12 10:56:04.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "fixfiles" "8" "2002031409" "" "" - .SH "NAME" --fixfiles \- fix file security contexts. -+fixfiles \- fix file SELinux security contexts. - - .SH "SYNOPSIS" - .B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel | verify }" -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/genhomedircon.8 policycoreutils-1.33.12/scripts/genhomedircon.8 ---- nsapolicycoreutils/scripts/genhomedircon.8 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.12/scripts/genhomedircon.8 2007-01-12 10:55:56.000000000 -0500 -@@ -24,7 +24,7 @@ - .\" - .TH GENHOMEDIRCON "8" "January 2005" "Security Enhanced Linux" "" - .SH NAME --genhomedircon \- generate file context configuration entries for user home directories -+genhomedircon \- generate SELinux file context configuration entries for user home directories - .SH SYNOPSIS - .B genhomedircon [ -d selinuxdir ] [-n | --nopasswd] [-t selinuxtype ] [-h] - -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/secon/secon.1 policycoreutils-1.33.12/secon/secon.1 ---- nsapolicycoreutils/secon/secon.1 2006-11-16 17:14:31.000000000 -0500 -+++ policycoreutils-1.33.12/secon/secon.1 2007-01-12 10:58:00.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH SECON "1" "April 2006" "Security Enhanced Linux" NSA - .SH NAME --secon \- See a context, from a file, program or user input. -+secon \- See an SELinux context, from a file, program or user input. - .SH SYNOPSIS - .B secon - [\fB-hVurtscmPRfLp\fR] -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.12/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2007-01-16 15:08:21.000000000 -0500 -+++ policycoreutils-1.33.12/semanage/seobject.py 2007-01-16 14:22:44.000000000 -0500 -@@ -63,7 +63,7 @@ - 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); -+ audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],str(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 = ""): -@@ -209,14 +209,14 @@ +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.14/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2007-01-17 11:11:34.000000000 -0500 ++++ policycoreutils-1.33.14/semanage/seobject.py 2007-01-16 15:16:27.000000000 -0500 +@@ -209,7 +209,8 @@ os.write(fd, self.out()) os.close(fd) os.rename(newfilename, self.filename) @@ -5022,15 +4901,7 @@ class semanageRecords: def __init__(self): self.sh = semanage_handle_create() -+ self.semanaged = semanage_is_managed(self.sh) - if not self.sh: - raise ValueError(_("Could not create semanage handle")) -- -- self.semanaged = semanage_is_managed(self.sh) - - if not self.semanaged: - semanage_handle_destroy(self.sh) -@@ -464,7 +464,8 @@ +@@ -464,7 +465,8 @@ rc = semanage_user_set_mlslevel(self.sh, u, selevel) if rc < 0: raise ValueError(_("Could not set MLS level for %s") % name) @@ -5040,7 +4911,7 @@ rc = semanage_user_set_prefix(self.sh, u, prefix) if rc < 0: raise ValueError(_("Could not add prefix %s for %s") % (r, prefix)) -@@ -530,7 +531,9 @@ +@@ -530,7 +532,9 @@ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) if prefix != "": @@ -5051,25 +4922,3 @@ if len(roles) != 0: for r in rlist: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semodule_deps/semodule_deps.8 policycoreutils-1.33.12/semodule_deps/semodule_deps.8 ---- nsapolicycoreutils/semodule_deps/semodule_deps.8 2006-11-16 17:14:31.000000000 -0500 -+++ policycoreutils-1.33.12/semodule_deps/semodule_deps.8 2007-01-12 10:55:43.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH SEMODULE_DEPS "8" "June 2006" "Security Enhanced Linux" NSA - .SH NAME --semodule_deps \- show the dependencies between policy packages. -+semodule_deps \- show the dependencies between SELinux policy packages. - - .SH SYNOPSIS - .B semodule_deps [-v -g -b] basemodpkg modpkg1 [modpkg2 ... ] -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.33.12/setfiles/setfiles.8 ---- nsapolicycoreutils/setfiles/setfiles.8 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.12/setfiles/setfiles.8 2007-01-12 10:55:31.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "setfiles" "8" "2002031409" "" "" - .SH "NAME" --setfiles \- set file security contexts. -+setfiles \- set file SELinux security contexts. - - .SH "SYNOPSIS" - .B setfiles Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- policycoreutils.spec 16 Jan 2007 21:44:42 -0000 1.361 +++ policycoreutils.spec 17 Jan 2007 16:14:32 -0000 1.362 @@ -4,7 +4,7 @@ %define libselinuxver 1.33.4-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.14 +Version: 1.33.15 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -168,6 +168,10 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Wed Jan 17 2007 Dan Walsh 1.33.15-1 +- Update to upstream + * Merged unicode-to-string fix for seobject audit from Dan Walsh. + * Merged man page updates to make "apropos selinux" work from Dan Walsh. * Tue Jan 16 2007 Dan Walsh 1.33.14-1 * Merged newrole man page patch from Michael Thompson. * Merged patch to fix python unicode problem from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- sources 16 Jan 2007 21:44:42 -0000 1.137 +++ sources 17 Jan 2007 16:14:32 -0000 1.138 @@ -1 +1 @@ -af8e1fcccaa6050d3387732e010a529f policycoreutils-1.33.14.tgz +a2d797ed6d1ef30a10c7ddfc03cc4af8 policycoreutils-1.33.15.tgz From fedora-cvs-commits at redhat.com Wed Jan 17 16:22:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 11:22:55 -0500 Subject: rpms/totem/devel totem.spec,1.93,1.94 Message-ID: <200701171622.l0HGMtbJ019718@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19685 Modified Files: totem.spec Log Message: update file lists Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- totem.spec 17 Jan 2007 15:48:02 -0000 1.93 +++ totem.spec 17 Jan 2007 16:22:53 -0000 1.94 @@ -196,7 +196,7 @@ %files mozplugin %defattr(-, root, root) %{_libdir}/mozilla/plugins/* -%{_libexecdir}/totem-mozilla-viewer +%{_libexecdir}/totem-plugin-viewer %files devel %defattr(-, root, root) From fedora-cvs-commits at redhat.com Wed Jan 17 16:34:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 11:34:33 -0500 Subject: rpms/aqbanking/devel aqbanking.spec,1.37,1.38 Message-ID: <200701171634.l0HGYXON003795@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/aqbanking/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3712 Modified Files: aqbanking.spec Log Message: more fixing Index: aqbanking.spec =================================================================== RCS file: /cvs/dist/rpms/aqbanking/devel/aqbanking.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- aqbanking.spec 16 Jan 2007 19:14:10 -0000 1.37 +++ aqbanking.spec 17 Jan 2007 16:34:31 -0000 1.38 @@ -6,7 +6,7 @@ Name: aqbanking Summary: A library for online banking functions and financial data import/export Version: 2.1.0 -Release: 13 +Release: 14 Source: http://download.sourceforge.net/aqbanking/%{name}-%{version}.tar.gz Group: System Environment/Libraries License: GPL @@ -46,7 +46,7 @@ Requires: pkgconfig # for %{_datadir}/aclocal Requires: automake -Obsoletes: aqhbci-devel +Obsoletes: aqhbci-devel <= 1.0.3 %description devel This package contains aqbanking-config and header files for writing and @@ -161,7 +161,7 @@ %find_lang %{name} %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -181,6 +181,7 @@ %files -f %{name}.lang %defattr(-,root,root) +%doc %{_datadir}/doc/%{name}-%{version} %{_libdir}/libaq*.so.* %{_libdir}/libcbanking.so.* %{_libdir}/aqbanking @@ -196,7 +197,7 @@ %files devel %defattr(-,root,root) -%doc doc/0* tutorials +%doc doc/0[12]* tutorials %{_bindir}/hbcixml2 %{_bindir}/aq*-config %{_bindir}/cbanking-config @@ -253,6 +254,9 @@ %{python_sitelib}/%{name} %changelog +* Wed Jan 17 2007 Bill Nottingham - 2.1.0-14 +- fix docdir, obsoletes for aqhbci-devel, and %%clean + * Tue Jan 16 2007 Bill Nottingham - 2.1.0-13 - fix docs - add PyXML buildreq From fedora-cvs-commits at redhat.com Wed Jan 17 16:59:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 11:59:57 -0500 Subject: rpms/policycoreutils/FC-6 policycoreutils-po.patch, 1.12, 1.13 policycoreutils-rhat.patch, 1.249, 1.250 policycoreutils.spec, 1.328, 1.329 sources, 1.132, 1.133 Message-ID: <200701171659.l0HGxvZu011455@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11388 Modified Files: policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jan 17 2007 Dan Walsh 1.33.15-1 - Update to upstream * Merged unicode-to-string fix for seobject audit from Dan Walsh. * Merged man page updates to make "apropos selinux" work from Dan Walsh. * Tue Jan 16 2007 Dan Walsh 1.33.14-1 * Merged newrole man page patch from Michael Thompson. * Merged patch to fix python unicode problem from Dan Walsh. policycoreutils-po.patch: POTFILES.in | 46 ++ af.po | 481 +++++++++++++++------------- am.po | 481 +++++++++++++++------------- ar.po | 481 +++++++++++++++------------- as.po | 481 +++++++++++++++------------- be.po | 481 +++++++++++++++------------- bg.po | 481 +++++++++++++++------------- bn.po | 481 +++++++++++++++------------- bn_IN.po | 545 +++++++++++++++++-------------- ca.po | 554 +++++++++++++++++--------------- cs.po | 481 +++++++++++++++------------- cy.po | 481 +++++++++++++++------------- da.po | 525 ++++++++++++++++-------------- de.po | 543 +++++++++++++++++-------------- el.po | 527 +++++++++++++++++------------- en_GB.po | 481 +++++++++++++++------------- es.po | 538 +++++++++++++++++-------------- et.po | 479 +++++++++++++++------------- eu_ES.po | 481 +++++++++++++++------------- fa.po | 481 +++++++++++++++------------- fi.po | 481 +++++++++++++++------------- fr.po | 799 +++++++++++++++++++++++++--------------------- gl.po | 479 +++++++++++++++------------- gu.po | 535 +++++++++++++++++-------------- he.po | 481 +++++++++++++++------------- hi.po | 538 +++++++++++++++++-------------- hr.po | 627 ++++++++++++++++++++++-------------- hu.po | 527 +++++++++++++++++------------- hy.po | 481 +++++++++++++++------------- id.po | 479 +++++++++++++++------------- is.po | 481 +++++++++++++++------------- it.po | 555 ++++++++++++++++++-------------- ja.po | 889 ++++++++++++++++++++++++++++------------------------ ka.po | 481 +++++++++++++++------------- kn.po | 334 +++++++++---------- ko.po | 552 +++++++++++++++++--------------- ku.po | 481 +++++++++++++++------------- lo.po | 481 +++++++++++++++------------- lt.po | 481 +++++++++++++++------------- lv.po | 481 +++++++++++++++------------- mk.po | 481 +++++++++++++++------------- ml.po | 539 +++++++++++++++++-------------- mr.po | 497 ++++++++++++++++------------- ms.po | 537 +++++++++++++++++-------------- my.po | 481 +++++++++++++++------------- nb.po | 481 +++++++++++++++------------- nl.po | 546 +++++++++++++++++-------------- nn.po | 481 +++++++++++++++------------- no.po | 481 +++++++++++++++------------- nso.po | 481 +++++++++++++++------------- or.po | 561 ++++++++++++++++++-------------- pa.po | 516 ++++++++++++++++-------------- pl.po | 544 +++++++++++++++++-------------- policycoreutils.pot | 481 +++++++++++++++------------- pt.po | 543 +++++++++++++++++-------------- pt_BR.po | 576 +++++++++++++++++++-------------- ro.po | 481 +++++++++++++++------------- ru.po | 592 ++++++++++++++++++---------------- si.po | 481 +++++++++++++++------------- sk.po | 523 ++++++++++++++++-------------- sl.po | 481 +++++++++++++++------------- sq.po | 481 +++++++++++++++------------- sr.po | 625 ++++++++++++++++++++++-------------- sr at Latn.po | 625 ++++++++++++++++++++++-------------- sv.po | 525 ++++++++++++++++-------------- ta.po | 535 +++++++++++++++++-------------- te.po | 481 +++++++++++++++------------- th.po | 481 +++++++++++++++------------- tr.po | 481 +++++++++++++++------------- uk.po | 527 +++++++++++++++++------------- ur.po | 481 +++++++++++++++------------- vi.po | 481 +++++++++++++++------------- zh_CN.po | 538 +++++++++++++++++-------------- zh_TW.po | 841 ++++++++++++++++++++++++++----------------------- zu.po | 481 +++++++++++++++------------- 75 files changed, 21426 insertions(+), 17113 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-po.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- policycoreutils-po.patch 9 Jan 2007 17:04:42 -0000 1.12 +++ policycoreutils-po.patch 17 Jan 2007 16:59:55 -0000 1.13 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.6/po/af.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.10/po/af.po --- nsapolicycoreutils/po/af.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/af.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/af.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -1108,9 +1108,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.6/po/am.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/am.po policycoreutils-1.33.10/po/am.po --- nsapolicycoreutils/po/am.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/am.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/am.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -2218,9 +2218,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.6/po/ar.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ar.po policycoreutils-1.33.10/po/ar.po --- nsapolicycoreutils/po/ar.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ar.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/ar.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -3328,9 +3328,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.6/po/as.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/as.po policycoreutils-1.33.10/po/as.po --- nsapolicycoreutils/po/as.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/as.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/as.po 2007-01-09 10:09:19.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: as\n" @@ -4438,9 +4438,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.6/po/be.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/be.po policycoreutils-1.33.10/po/be.po --- nsapolicycoreutils/po/be.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/be.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/be.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -5548,9 +5548,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.6/po/bg.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bg.po policycoreutils-1.33.10/po/bg.po --- nsapolicycoreutils/po/bg.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/bg.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/bg.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -6658,9 +6658,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.6/po/bn_IN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn_IN.po policycoreutils-1.33.10/po/bn_IN.po --- nsapolicycoreutils/po/bn_IN.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/bn_IN.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/bn_IN.po 2007-01-09 10:09:19.000000000 -0500 @@ -36,8 +36,8 @@ msgstr "" "Project-Id-Version: bn_IN\n" @@ -7820,9 +7820,9 @@ #, c-format msgid "Options Error: %s " msgstr "?????????????????? ??????????????????????????? ??????????????????: %s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.33.6/po/bn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bn.po policycoreutils-1.33.10/po/bn.po --- nsapolicycoreutils/po/bn.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/bn.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/bn.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -8930,9 +8930,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.6/po/ca.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po policycoreutils-1.33.10/po/ca.po --- nsapolicycoreutils/po/ca.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ca.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/ca.po 2007-01-09 10:09:19.000000000 -0500 @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -10105,9 +10105,9 @@ #, c-format msgid "Options Error: %s " msgstr "Error en les opcions: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.33.6/po/cs.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cs.po policycoreutils-1.33.10/po/cs.po --- nsapolicycoreutils/po/cs.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/cs.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/cs.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -11215,9 +11215,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.33.6/po/cy.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/cy.po policycoreutils-1.33.10/po/cy.po --- nsapolicycoreutils/po/cy.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/cy.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/cy.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -12325,9 +12325,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.33.6/po/da.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.33.10/po/da.po --- nsapolicycoreutils/po/da.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/da.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/da.po 2007-01-09 10:09:19.000000000 -0500 @@ -3,13 +3,13 @@ # Christian Rose , 2006. # Keld Simonsen , 2006. @@ -13468,9 +13468,9 @@ #, c-format msgid "Options Error: %s " msgstr "Flagfejl: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.33.6/po/de.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/de.po policycoreutils-1.33.10/po/de.po --- nsapolicycoreutils/po/de.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/de.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/de.po 2007-01-09 10:09:19.000000000 -0500 @@ -1,4 +1,5 @@ # translation of de.po to +# translation of de.po to @@ -14641,9 +14641,9 @@ #, c-format msgid "Options Error: %s " msgstr "Options Fehler: %s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.33.6/po/el.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/el.po policycoreutils-1.33.10/po/el.po --- nsapolicycoreutils/po/el.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/el.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/el.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: el\n" @@ -15806,9 +15806,9 @@ #, fuzzy, c-format msgid "Options Error: %s " msgstr "???????????? ????????????????????????: %s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.33.6/po/en_GB.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/en_GB.po policycoreutils-1.33.10/po/en_GB.po --- nsapolicycoreutils/po/en_GB.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/en_GB.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/en_GB.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -16916,9 +16916,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.33.6/po/es.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/es.po policycoreutils-1.33.10/po/es.po --- nsapolicycoreutils/po/es.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/es.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/es.po 2007-01-09 10:09:19.000000000 -0500 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: \n" @@ -18066,9 +18066,9 @@ #, c-format msgid "Options Error: %s " [...1818 lines suppressed...] -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.33.6/po/si.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/si.po policycoreutils-1.33.10/po/si.po --- nsapolicycoreutils/po/si.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/si.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/si.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -66249,9 +66025,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.33.6/po/sk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sk.po policycoreutils-1.33.10/po/sk.po --- nsapolicycoreutils/po/sk.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sk.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/sk.po 2007-01-09 10:09:19.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -67385,9 +67161,9 @@ #, c-format msgid "Options Error: %s " msgstr "Chyba volieb: %s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.33.6/po/sl.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sl.po policycoreutils-1.33.10/po/sl.po --- nsapolicycoreutils/po/sl.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sl.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/sl.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -68495,9 +68271,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.33.6/po/sq.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sq.po policycoreutils-1.33.10/po/sq.po --- nsapolicycoreutils/po/sq.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sq.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/sq.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -69605,9 +69381,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.33.6/po/sr at Latn.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr at Latn.po policycoreutils-1.33.10/po/sr at Latn.po --- nsapolicycoreutils/po/sr at Latn.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sr at Latn.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/sr at Latn.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -70861,9 +70637,9 @@ msgid "Options Error: %s " msgstr "Gre??ka opcija: %s " + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.33.6/po/sr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sr.po policycoreutils-1.33.10/po/sr.po --- nsapolicycoreutils/po/sr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sr.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/sr.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -72117,9 +71893,9 @@ msgid "Options Error: %s " msgstr "???????????? ????????????: %s " + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.33.6/po/sv.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.33.10/po/sv.po --- nsapolicycoreutils/po/sv.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/sv.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/sv.po 2007-01-09 10:09:19.000000000 -0500 @@ -2,13 +2,13 @@ # Copyright (C) 2006 Christian Rose. # Christian Rose , 2006. @@ -73260,9 +73036,9 @@ #, c-format msgid "Options Error: %s " msgstr "Flaggfel: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.33.6/po/ta.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ta.po policycoreutils-1.33.10/po/ta.po --- nsapolicycoreutils/po/ta.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ta.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/ta.po 2007-01-09 10:09:19.000000000 -0500 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: ta\n" @@ -74409,9 +74185,9 @@ #, c-format msgid "Options Error: %s " msgstr "???????????????????????????????????? ????????????: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.33.6/po/te.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/te.po policycoreutils-1.33.10/po/te.po --- nsapolicycoreutils/po/te.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/te.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/te.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -75519,9 +75295,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.33.6/po/th.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/th.po policycoreutils-1.33.10/po/th.po --- nsapolicycoreutils/po/th.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/th.po 2006-12-08 09:11:53.000000000 -0500 ++++ policycoreutils-1.33.10/po/th.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -76629,9 +76405,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.33.6/po/tr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/tr.po policycoreutils-1.33.10/po/tr.po --- nsapolicycoreutils/po/tr.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/tr.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/tr.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -77739,9 +77515,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.33.6/po/uk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.33.10/po/uk.po --- nsapolicycoreutils/po/uk.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/uk.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/uk.po 2007-01-09 10:09:19.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: policycoreutils\n" @@ -78880,9 +78656,9 @@ #, c-format msgid "Options Error: %s " msgstr "?????????????? ?? ????????????????????: %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.33.6/po/ur.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ur.po policycoreutils-1.33.10/po/ur.po --- nsapolicycoreutils/po/ur.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/ur.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/ur.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -79990,9 +79766,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.33.6/po/vi.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/vi.po policycoreutils-1.33.10/po/vi.po --- nsapolicycoreutils/po/vi.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/vi.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/vi.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -81100,9 +80876,9 @@ #, c-format msgid "Options Error: %s " msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.33.6/po/zh_CN.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_CN.po policycoreutils-1.33.10/po/zh_CN.po --- nsapolicycoreutils/po/zh_CN.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/zh_CN.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/zh_CN.po 2007-01-09 10:09:19.000000000 -0500 @@ -5,16 +5,18 @@ # translation of zh_CN.po to # translation of zh_CN.po to @@ -82251,9 +82027,9 @@ #, c-format msgid "Options Error: %s " msgstr "??????????????? %s " -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.6/po/zh_TW.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po policycoreutils-1.33.10/po/zh_TW.po --- nsapolicycoreutils/po/zh_TW.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/zh_TW.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/zh_TW.po 2007-01-09 10:09:19.000000000 -0500 @@ -1,15 +1,16 @@ # translation of zh_TW.po to Chinese, Traditional -# translation of policycoreutils.po to Chinese, Traditional @@ -83671,9 +83447,9 @@ msgid "Options Error: %s " -msgstr "" +msgstr "???????????????%s" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.6/po/zu.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils-1.33.10/po/zu.po --- nsapolicycoreutils/po/zu.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.6/po/zu.po 2006-12-08 09:11:54.000000000 -0500 ++++ policycoreutils-1.33.10/po/zu.po 2007-01-09 10:09:19.000000000 -0500 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 semanage/seobject.py | 10 18 files changed, 4803 insertions(+), 9 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils-rhat.patch,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- policycoreutils-rhat.patch 9 Jan 2007 17:04:42 -0000 1.249 +++ policycoreutils-rhat.patch 17 Jan 2007 16:59:55 -0000 1.250 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.8/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.14/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/booleansPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/booleansPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -201,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.8/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.14/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/fcontextPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/fcontextPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -363,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.8/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.14/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/loginsPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/loginsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -528,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.8/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.14/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/Makefile 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/Makefile 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -562,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.8/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.14/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/mappingsPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/mappingsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -620,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.8/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.14/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/modulesPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/modulesPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -785,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.8/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.14/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/portsPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/portsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1003,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.8/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.14/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/selinux.tbl 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/selinux.tbl 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1272,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.8/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.14/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/semanagePage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/semanagePage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1385,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.8/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.14/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/statusPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/statusPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1602,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.8/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.14/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/system-config-selinux.glade 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/system-config-selinux.glade 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4409,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.8/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.14/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/system-config-selinux.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/system-config-selinux.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4569,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.8/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.14/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/translationsPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/translationsPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4682,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.8/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.14/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.8/gui/usersPage.py 2007-01-09 11:57:00.000000000 -0500 ++++ policycoreutils-1.33.14/gui/usersPage.py 2007-01-16 15:13:02.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4841,65 +4841,18 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.8/Makefile ---- nsapolicycoreutils/Makefile 2007-01-04 17:01:46.000000000 -0500 -+++ policycoreutils-1.33.8/Makefile 2007-01-09 11:57:00.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.14/Makefile +--- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 ++++ policycoreutils-1.33.14/Makefile 2007-01-16 15:13:02.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.33.8/newrole/newrole.c ---- nsapolicycoreutils/newrole/newrole.c 2007-01-04 17:01:47.000000000 -0500 -+++ policycoreutils-1.33.8/newrole/newrole.c 2007-01-09 11:57:00.000000000 -0500 -@@ -67,6 +67,7 @@ - #include /* for SELINUX_DEFAULTUSER */ - #include - #include /* for getuid(), exit(), getopt() */ -+#include - #ifdef USE_AUDIT - #include - #endif -@@ -733,6 +734,7 @@ - security_context_t *new_context, - int *preserve_environment) - { -+ int i; /* index for open file descriptors */ - int flag_index; /* flag index in argv[] */ - int clflag; /* holds codes for command line flags */ - char *role_s = NULL; /* role spec'd by user in argv[] */ -@@ -741,6 +743,8 @@ - char *level_s = NULL; /* level spec'd by user in argv[] */ - char *range_ptr = NULL; - security_context_t new_con = NULL; -+ security_context_t tty_con = NULL; -+ int securetty=0; - context_t context = NULL; /* manipulatable form of new_context */ - const struct option long_options[] = { - {"role", 1, 0, 'r'}, -@@ -793,6 +797,18 @@ - "specified\n")); - return -1; - } -+ for (i=0; i < 3; i++) { -+ securetty=0; -+ if (fgetfilecon(i,&tty_con) >= 0) { -+ securetty = (selinux_check_securetty_context(tty_con) == 1); -+ freecon(tty_con); -+ } -+ if (!securetty) { -+ fprintf(stderr, "Error: you are not allowed to change levels on a non secure terminal\n"); -+ return -1; -+ } -+ } -+ - level_s = optarg; - break; - default: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.8/restorecond/restorecond.c ---- nsapolicycoreutils/restorecond/restorecond.c 2007-01-04 17:01:48.000000000 -0500 -+++ policycoreutils-1.33.8/restorecond/restorecond.c 2007-01-09 11:57:00.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.14/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 ++++ policycoreutils-1.33.14/restorecond/restorecond.c 2007-01-16 15:13:02.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4926,109 +4879,19 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.8/restorecond/restorecond.conf ---- nsapolicycoreutils/restorecond/restorecond.conf 2007-01-04 17:01:48.000000000 -0500 -+++ policycoreutils-1.33.8/restorecond/restorecond.conf 2007-01-09 11:57:00.000000000 -0500 +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.14/restorecond/restorecond.conf +--- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 ++++ policycoreutils-1.33.14/restorecond/restorecond.conf 2007-01-16 15:13:02.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.33.8/scripts/fixfiles ---- nsapolicycoreutils/scripts/fixfiles 2007-01-04 17:01:48.000000000 -0500 -+++ policycoreutils-1.33.8/scripts/fixfiles 2007-01-09 11:57:00.000000000 -0500 -@@ -29,6 +29,9 @@ - RPMILES="" - OUTFILES="" - LOGFILE=`tty` -+if [ $? != 0 ]; then -+ LOGFILE="/dev/null" -+fi - SYSLOGFLAG="-l" - LOGGER=/usr/sbin/logger - SETFILES=/sbin/setfiles -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.33.8/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2007-01-04 17:01:47.000000000 -0500 -+++ policycoreutils-1.33.8/semanage/semanage 2007-01-09 11:58:17.000000000 -0500 -@@ -23,12 +23,21 @@ - import os, sys, getopt - import seobject - import selinux -+PROGNAME="policycoreutils" -+ - import gettext -+gettext.bindtextdomain(PROGNAME, "/usr/share/locale") -+gettext.textdomain(PROGNAME) -+import codecs -+import locale -+sys.stderr = codecs.getwriter(locale.getpreferredencoding())(sys.__stderr__, 'replace') -+sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.__stdout__, 'replace') - - try: -- gettext.install('policycoreutils') --except: -- pass -+ gettext.install(PROGNAME, localedir="/usr/share/locale", unicode=1) -+except IOError: -+ import __builtin__ -+ __builtin__.__dict__['_'] = unicode - - is_mls_enabled=selinux.is_selinux_mls_enabled() - -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.8/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2007-01-04 17:01:47.000000000 -0500 -+++ policycoreutils-1.33.8/semanage/seobject.py 2007-01-09 11:57:00.000000000 -0500 -@@ -94,23 +94,25 @@ - return re.search("^" + reg +"$",raw) - - def translate(raw, prepend = 1): -- if prepend == 1: -- context = "a:b:c:%s" % raw -+ filler="a:b:c:" -+ if prepend == 1: -+ context = "%s%s" % (filler,raw) - else: - context = raw -- (rc, trans) = selinux.selinux_raw_to_trans_context(context) -+ (rc, trans) = selinux.selinux_raw_to_trans_context(context) - if rc != 0: - return raw - if prepend: -- trans = trans.strip("a:b:c") -+ trans = trans[len(filler):] - if trans == "": - return raw - else: - return trans - - def untranslate(trans, prepend = 1): -+ filler="a:b:c:" - if prepend == 1: -- context = "a:b:c:%s" % trans -+ context = "%s%s" % (filler,trans) - else: - context = trans - -@@ -118,7 +120,7 @@ - if rc != 0: - return trans - if prepend: -- raw = raw.strip("a:b:c") -+ raw = raw[len(filler):] - if raw == "": - return trans - else: -@@ -157,7 +159,7 @@ - def out(self): - rec = "" - for c in self.comments: -- rec += c +"\n" -+ rec += c - keys = self.ddict.keys() - keys.sort() - for k in keys: -@@ -204,7 +206,8 @@ +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.14/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2007-01-17 11:11:34.000000000 -0500 ++++ policycoreutils-1.33.14/semanage/seobject.py 2007-01-16 15:16:27.000000000 -0500 +@@ -209,7 +209,8 @@ os.write(fd, self.out()) os.close(fd) os.rename(newfilename, self.filename) @@ -5038,7 +4901,7 @@ class semanageRecords: def __init__(self): self.sh = semanage_handle_create() -@@ -456,7 +459,8 @@ +@@ -464,7 +465,8 @@ rc = semanage_user_set_mlslevel(self.sh, u, selevel) if rc < 0: raise ValueError(_("Could not set MLS level for %s") % name) @@ -5048,7 +4911,7 @@ rc = semanage_user_set_prefix(self.sh, u, prefix) if rc < 0: raise ValueError(_("Could not add prefix %s for %s") % (r, prefix)) -@@ -522,11 +526,17 @@ +@@ -530,7 +532,9 @@ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) if prefix != "": @@ -5058,14 +4921,4 @@ + semanage_user_set_prefix(self.sh, u, prefix) if len(roles) != 0: -- for r in roles: -- semanage_user_add_role(self.sh, u, r) -+ for r in rlist: -+ if r not in roles: -+ semanage_user_del_role(u, r) -+ for r in roles: -+ if r not in rlist: -+ semanage_user_add_role(self.sh, u, r) - - rc = semanage_begin_transaction(self.sh) - if rc < 0: + for r in rlist: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/policycoreutils.spec,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- policycoreutils.spec 9 Jan 2007 17:04:43 -0000 1.328 +++ policycoreutils.spec 17 Jan 2007 16:59:55 -0000 1.329 @@ -1,11 +1,11 @@ %define libauditver 1.1.4-3 %define libsepolver 1.12.27-1 %define libsemanagever 1.6.17-1 -%define libselinuxver 1.33.3-2 +%define libselinuxver 1.33.4-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.8 -Release: 3%{?dist} +Version: 1.33.15 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -17,9 +17,9 @@ Patch1: policycoreutils-po.patch BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel gettext -Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff +Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >= %{libauditver} -Requires(post): /sbin/service /sbin/chkconfig +Requires(post): /sbin/service /sbin/chkconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -168,9 +168,39 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog -* Fri Jan 5 2007 Dan Walsh 1.33.8-3 -- Fix translation errors -Resolves: #221977 +* Wed Jan 17 2007 Dan Walsh 1.33.15-1 +- Update to upstream + * Merged unicode-to-string fix for seobject audit from Dan Walsh. + * Merged man page updates to make "apropos selinux" work from Dan Walsh. +* Tue Jan 16 2007 Dan Walsh 1.33.14-1 + * Merged newrole man page patch from Michael Thompson. + * Merged patch to fix python unicode problem from Dan Walsh. + +* Tue Jan 16 2007 Dan Walsh 1.33.12-3 +- Fix handling of audit messages for useradd change +Resolves: #222159 + +* Fri Jan 12 2007 Dan Walsh 1.33.12-2 +- Update man pages by adding SELinux to header to fix apropos database +Resolves: #217881 + +* Tue Jan 9 2007 Dan Walsh 1.33.12-1 +- Want to update to match api +- Update to upstream + * Merged newrole securetty check from Dan Walsh. + * Merged semodule patch to generalize list support from Karl MacMillan. +Resolves: #200110 + +* Tue Jan 9 2007 Dan Walsh 1.33.11-1 +- Update to upstream + * Merged fixfiles and seobject fixes from Dan Walsh. + * Merged semodule support for list of modules after -i from Karl MacMillan. + +* Tue Jan 9 2007 Dan Walsh 1.33.10-1 +- Update to upstream + * Merged patch to correctly handle a failure during semanage handle + creation from Karl MacMillan. + * Merged patch to fix seobject role modification from Dan Walsh. * Fri Jan 5 2007 Dan Walsh 1.33.8-2 - Stop newrole -l from working on non secure ttys Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-6/sources,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- sources 9 Jan 2007 17:04:43 -0000 1.132 +++ sources 17 Jan 2007 16:59:55 -0000 1.133 @@ -1 +1 @@ -c4c3ebbaf1c11e122441da38fd11478c policycoreutils-1.33.8.tgz +a2d797ed6d1ef30a10c7ddfc03cc4af8 policycoreutils-1.33.15.tgz From fedora-cvs-commits at redhat.com Wed Jan 17 18:04:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 13:04:01 -0500 Subject: rpms/device-mapper/devel device-mapper.1.02.15.tgz.asc, NONE, 1.1 .cvsignore, 1.21, 1.22 device-mapper.spec, 1.49, 1.50 sources, 1.26, 1.27 upstream, 1.17, 1.18 device-mapper.1.02.14.tgz.asc, 1.1, NONE Message-ID: <200701171804.l0HI41Ca008930@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8913 Modified Files: .cvsignore device-mapper.spec sources upstream Added Files: device-mapper.1.02.15.tgz.asc Removed Files: device-mapper.1.02.14.tgz.asc Log Message: new upstream --- NEW FILE device-mapper.1.02.15.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFrmHWIoGRwVZ+LBcRAnx4AJ48+4iFrTWazeq4oB/uSw7jhmvu/wCfcp1y zffn5iYei53AuUs/KOljLjo= =E6t4 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 11 Jan 2007 23:06:19 -0000 1.21 +++ .cvsignore 17 Jan 2007 18:03:59 -0000 1.22 @@ -1 +1 @@ -device-mapper.1.02.14.tgz +device-mapper.1.02.15.tgz Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- device-mapper.spec 12 Jan 2007 12:43:22 -0000 1.49 +++ device-mapper.spec 17 Jan 2007 18:03:59 -0000 1.50 @@ -1,7 +1,7 @@ Summary: Device mapper library Name: device-mapper -Version: 1.02.14 -Release: 2%{?dist} +Version: 1.02.15 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/dm @@ -48,6 +48,9 @@ %changelog +* Wed Jan 17 2007 Alasdair Kergon - 1.02.15-1 +- Add basic reporting functions to libdevmapper. + * Fri Jan 12 2007 Alasdair Kergon - 1.02.14-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 11 Jan 2007 23:06:19 -0000 1.26 +++ sources 17 Jan 2007 18:03:59 -0000 1.27 @@ -1 +1 @@ -b34b230d154c5d2de3455a33c12d6fe8 device-mapper.1.02.14.tgz +79c61b014ecabf3160de60de2c8b9719 device-mapper.1.02.15.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/upstream,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- upstream 11 Jan 2007 23:06:19 -0000 1.17 +++ upstream 17 Jan 2007 18:03:59 -0000 1.18 @@ -1 +1 @@ -device-mapper.1.02.14.tgz +device-mapper.1.02.15.tgz --- device-mapper.1.02.14.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 17 18:07:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 13:07:33 -0500 Subject: rpms/lvm2/devel LVM2.2.02.19.tgz.asc, NONE, 1.1 .cvsignore, 1.44, 1.45 lvm2.spec, 1.96, 1.97 sources, 1.47, 1.48 upstream, 1.37, 1.38 Message-ID: <200701171807.l0HI7XHc009120@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9103 Modified Files: .cvsignore lvm2.spec sources upstream Added Files: LVM2.2.02.19.tgz.asc Log Message: new upstream --- NEW FILE LVM2.2.02.19.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFrmLVIoGRwVZ+LBcRAt/wAKC9VtzJg0Z9WPbxIFC3UJQkazlyoACfYrpv VhUgR89Yw6j6tQcG4e/bdPE= =qNFj -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 11 Jan 2007 23:11:32 -0000 1.44 +++ .cvsignore 17 Jan 2007 18:07:30 -0000 1.45 @@ -1 +1 @@ -LVM2.2.02.18.tgz +LVM2.2.02.19.tgz Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- lvm2.spec 12 Jan 2007 12:42:44 -0000 1.96 +++ lvm2.spec 17 Jan 2007 18:07:30 -0000 1.97 @@ -1,9 +1,9 @@ -%define device_mapper_version 1.02.14-2 +%define device_mapper_version 1.02.15-1 Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.18 -Release: 2%{?dist} +Version: 2.02.19 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -113,6 +113,12 @@ %changelog +* Wed Jan 17 2007 Alasdair Kergon - 2.02.19-1 +- Fix a segfault if an empty config file section encountered. +- Fix partition table processing after sparc changes. +- Fix cmdline PE range processing segfault. +- Move basic reporting functions into libdevmapper. + * Fri Jan 12 2007 Alasdair Kergon - 2.02.18-2 - Rebuild. Index: sources =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 11 Jan 2007 23:11:33 -0000 1.47 +++ sources 17 Jan 2007 18:07:31 -0000 1.48 @@ -1 +1 @@ -d7b5c5aa415afd4244d03f3c62dabb32 LVM2.2.02.18.tgz +70a7ee2a0f1cf113e593eeb6d2e7e1e3 LVM2.2.02.19.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/upstream,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- upstream 11 Jan 2007 23:11:33 -0000 1.37 +++ upstream 17 Jan 2007 18:07:31 -0000 1.38 @@ -1 +1 @@ -LVM2.2.02.18.tgz +LVM2.2.02.19.tgz From fedora-cvs-commits at redhat.com Wed Jan 17 18:08:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 13:08:04 -0500 Subject: rpms/lvm2/devel LVM2.2.02.18.tgz.asc,1.1,NONE Message-ID: <200701171808.l0HI84bT009215@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9200 Removed Files: LVM2.2.02.18.tgz.asc Log Message: old --- LVM2.2.02.18.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 17 18:29:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 13:29:14 -0500 Subject: rpms/gmp/devel .cvsignore, 1.11, 1.12 gmp.spec, 1.34, 1.35 sources, 1.11, 1.12 mpfr-2.2.0-cumulative.patch, 1.1, NONE Message-ID: <200701171829.l0HITELj030696@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30679 Modified Files: .cvsignore gmp.spec sources Removed Files: mpfr-2.2.0-cumulative.patch Log Message: 4.1.4-11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gmp/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Oct 2006 16:11:49 -0000 1.11 +++ .cvsignore 17 Jan 2007 18:29:12 -0000 1.12 @@ -1,2 +1,2 @@ gmp-4.1.4.tar.bz2 -mpfr-2.2.0.tar.bz2 +mpfr-2.2.1.tar.bz2 Index: gmp.spec =================================================================== RCS file: /cvs/dist/rpms/gmp/devel/gmp.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gmp.spec 2 Nov 2006 17:55:21 -0000 1.34 +++ gmp.spec 17 Jan 2007 18:29:12 -0000 1.35 @@ -4,12 +4,12 @@ # %define configure CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; ./configure %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} -%define mpfr_version 2.2.0 +%define mpfr_version 2.2.1 Summary: A GNU arbitrary precision library. Name: gmp Version: 4.1.4 -Release: 10 +Release: 11 URL: http://www.swox.com/gmp/ Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2 Source1: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 @@ -20,7 +20,7 @@ Patch2: gmp-4.1.2-autoconf.patch Patch3: gmp-4.1.4-fpu.patch # http://www.mpfr.org/mpfr-%{mpfr_version}/patches -Patch4: mpfr-2.2.0-cumulative.patch +#Patch4: mpfr-%{mpfr_version}-cumulative.patch License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -58,9 +58,9 @@ #patch1 -p1 %patch2 -p1 %patch3 -p1 -b .fpu -cd mpfr-%{mpfr_version} -%patch4 -p1 -cd .. +#cd mpfr-%{mpfr_version} +#%patch4 -p1 +#cd .. libtoolize --force aclocal-1.6 -I mpn -I mpfr @@ -84,11 +84,12 @@ mkdir build-sse2 cd build-sse2 ln -s ../configure . -CFLAGS="-O2 -g -march=pentium4" -%configure --enable-mpbsd --enable-mpfr --enable-cxx pentium4-redhat-linux +CFLAGS="%{optflags} -march=pentium4" +%configure --enable-mpbsd --disable-mpfr --enable-cxx pentium4-redhat-linux perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool export LD_LIBRARY_PATH=`pwd`/.libs make %{?_smp_mflags} +unset CFLAGS cd .. %endif cd mpfr-%{mpfr_version} @@ -204,6 +205,10 @@ %{_infodir}/mpfr.info* %changelog +* Wed Jan 17 2007 Jakub Jelinek 4.1.4-11 +- make sure libmpfr.a doesn't contain SSE2 instructions on i?86 (#222371) +- rebase to mpfr 2.2.1 from 2.2.0 + cumulative fixes + * Thu Nov 2 2006 Thomas Woerner 4.1.4-10 - fixed arch order in gmp.h and gmp-mparam.h wrapper for all architectures Index: sources =================================================================== RCS file: /cvs/dist/rpms/gmp/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Oct 2006 16:11:49 -0000 1.11 +++ sources 17 Jan 2007 18:29:12 -0000 1.12 @@ -1,2 +1,2 @@ 0aa7d3b3f5b5ec5951e7dddd6f65e891 gmp-4.1.4.tar.bz2 -1a81f721ee78cb027f6c41a243d3a33d mpfr-2.2.0.tar.bz2 +40bf06f8081461d8db7d6f4ad5b9f6bd mpfr-2.2.1.tar.bz2 --- mpfr-2.2.0-cumulative.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 17 19:27:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 14:27:40 -0500 Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.57,1.58 Message-ID: <200701171927.l0HJRenC031525@cvs.devel.redhat.com> Author: klee Update of /cvs/dist/rpms/eclipse-changelog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31474 Modified Files: eclipse-changelog.spec Log Message: * Wed Jan 17 2007 Kyu Lee 2.3.3-3 - For Fedora Extras review, cleaned up this file. Red Hat BZ#222365. Index: eclipse-changelog.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- eclipse-changelog.spec 11 Jan 2007 19:16:06 -0000 1.57 +++ eclipse-changelog.spec 17 Jan 2007 19:27:38 -0000 1.58 @@ -1,15 +1,7 @@ Epoch: 1 -%define fedora 1 -%define redhat 0 -%if %{fedora} %define gcj_support 1 -%else -%define gcj_support 0 -%endif - -%define eclipse_name eclipse -%define eclipse_base %{_datadir}/%{eclipse_name} +%define eclipse_base %{_datadir}/eclipse Name: eclipse-changelog Version: 2.3.3 @@ -17,25 +9,25 @@ Summary: Eclipse ChangeLog plug-in Group: Text Editors/Integrated Development Environments (IDE) -License: Eclipse Public License v1.0 +License: Eclipse Public License URL: http://sources.redhat.com/eclipse -Source0: %{name}-src-%{version}.zip +Source0: http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: eclipse-pde >= 1:3.2.0 -BuildRequires: eclipse-cdt +BuildRequires: eclipse-pde >= 1:3.2.0 +BuildRequires: eclipse-cdt >= 1:3.1.1 %if %{gcj_support} -BuildRequires: gcc-java >= 4.0.2 -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat +BuildRequires: gcc-java >= 4.0.2 +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat %else -BuildRequires: java-devel >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 %endif -# this plugins is really noarch but it needs cdt which +# These plugins are really noarch but they need cdt which # we only build on these architectures. %if %{gcj_support} ExclusiveArch: %{ix86} x86_64 ppc ia64 @@ -43,7 +35,7 @@ ExclusiveArch: %{ix86} x86_64 ppc ia64 %endif -Requires: eclipse-platform >= 1:3.2.0 +Requires: eclipse-platform >= 1:3.2.0 %description The Eclipse ChangeLog package contains Eclipse features and plugins that are @@ -52,7 +44,6 @@ %prep %setup -q -c -n eclipse-changelog-%{version} - %build # See comments in the script to understand this. /bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{eclipse_base} cdt @@ -67,7 +58,7 @@ -Duser.home=$homedir \ -application org.eclipse.ant.core.antRunner \ -Dtype=feature \ - -Did=com.redhat.eclipse.changelog \ + -Did=com.redhat.eclipse.changelog \ -DsourceDirectory=$(pwd) \ -DbaseLocation=$SDK \ -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ @@ -99,6 +90,9 @@ %endif %changelog +* Wed Jan 17 2007 Kyu Lee 2.3.3-3 +- For Fedora Extras review, cleaned up this file. Red Hat BZ#222365. + * Thu Jan 11 2007 Kyu Lee 2.3.3-3 - Updated license information. - Use copy-platform in %%{_datadir}. @@ -219,7 +213,7 @@ * Fri Mar 4 2005 Phil Muldoon 2.0.1-15 - Added python(pydev) parser to core -- Addex x86_64 back to ExclusiveArch +- Addex x86_64 back to ExclusiveArch * Thu Mar 3 2005 Phil Muldoon 2.0.1-12 - Fixed archs for Fedora Core From fedora-cvs-commits at redhat.com Wed Jan 17 19:58:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 14:58:34 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch, 1.3, 1.4 selinux-policy.spec, 1.382, 1.383 Message-ID: <200701171958.l0HJwYmD019061@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19045 Modified Files: policy-20070102.patch selinux-policy.spec Log Message: * Wed Jan 10 2007 Dan Walsh 2.5.1-2 - Fixes for prelink, ktalkd, netlabel policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 policy/flask/access_vectors | 4 policy/global_tunables | 55 +++ policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/evolution.if | 135 ++++++++- policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 +++++++++++++++-- policy/modules/apps/mplayer.if | 79 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/userhelper.if | 19 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 57 +++- policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 180 ++++++++++++ policy/modules/kernel/filesystem.if | 19 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 1 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++--- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 +++ policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 ++- policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 ++++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 63 ++++ policy/modules/services/ssh.te | 6 policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 72 +++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 4 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 3 policy/modules/system/init.te | 35 ++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 7 policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 ++++++++ policy/modules/system/selinuxutil.te | 116 ++------ policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 16 + policy/modules/system/userdomain.if | 423 ++++++++++++++++++++++++++++-- policy/modules/system/userdomain.te | 42 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 148 files changed, 3245 insertions(+), 416 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- policy-20070102.patch 11 Jan 2007 22:31:24 -0000 1.3 +++ policy-20070102.patch 17 Jan 2007 19:58:32 -0000 1.4 @@ -1,28 +1,37 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.5.1/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.5.1/config/appconfig-strict/seusers 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/config/appconfig-strict/seusers 2007-01-17 13:32:47.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers 2007-01-17 13:32:47.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.5.1/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.5.1/config/appconfig-strict-mls/seusers 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/config/appconfig-strict-mls/seusers 2007-01-17 13:32:47.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.1/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-16 17:15:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/flask/access_vectors 2007-01-05 12:59:57.000000000 -0500 -@@ -619,6 +619,8 @@ ++++ serefpolicy-2.5.1/policy/flask/access_vectors 2007-01-17 13:32:47.000000000 -0500 +@@ -594,6 +594,8 @@ + shmempwd + shmemgrp + shmemhost ++ getserv ++ shmemserv + } + + # Define the access vector interpretation for controlling +@@ -619,6 +621,8 @@ send recv relabelto @@ -33,7 +42,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.1/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/global_tunables 2007-01-08 15:32:46.000000000 -0500 ++++ serefpolicy-2.5.1/policy/global_tunables 2007-01-17 13:32:47.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -80,7 +89,7 @@ ## Allow mount to mount any file ##

## -@@ -601,3 +624,27 @@ +@@ -601,3 +624,35 @@ ## gen_tunable(spamd_enable_home_dirs,true) ') @@ -100,6 +109,13 @@ +gen_tunable(use_lpd_server,false) + + ++## ++##

++## Allow unlabeled packets to work on system ++##

++## ++gen_tunable(allow_unlabeled_packets,true) ++ +ifdef(`mls_policy',` +## +##

@@ -108,9 +124,10 @@ +## +gen_tunable(allow_netlabel,true) +') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.1/policy/mls --- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/mls 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/mls 2007-01-17 13:32:47.000000000 -0500 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -184,7 +201,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.1/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/acct.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/acct.te 2007-01-17 13:32:47.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -195,7 +212,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.5.1/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/bootloader.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/bootloader.fc 2007-01-17 13:32:47.000000000 -0500 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -210,7 +227,7 @@ /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.5.1/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/bootloader.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/bootloader.te 2007-01-17 13:32:47.000000000 -0500 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -232,7 +249,7 @@ files_manage_isid_type_files(bootloader_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.1/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/consoletype.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/consoletype.te 2007-01-17 13:32:47.000000000 -0500 @@ -8,7 +8,12 @@ type consoletype_t; @@ -269,7 +286,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.1/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/dmesg.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/dmesg.te 2007-01-17 13:32:47.000000000 -0500 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -280,7 +297,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.5.1/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/logwatch.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/logwatch.te 2007-01-17 13:32:47.000000000 -0500 @@ -58,6 +58,7 @@ # Read /proc/PID directories for all domains. domain_read_all_domains_state(logwatch_t) @@ -289,9 +306,17 @@ files_read_etc_files(logwatch_t) files_read_etc_runtime_files(logwatch_t) files_read_usr_files(logwatch_t) +@@ -127,3 +128,7 @@ + optional_policy(` + samba_read_log(logwatch_t) + ') ++ ++optional_policy(` ++ nis_use_ypbind(logwatch_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.1/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/netutils.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/netutils.te 2007-01-17 13:32:47.000000000 -0500 @@ -22,6 +22,7 @@ type traceroute_t; type traceroute_exec_t; @@ -302,7 +327,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.5.1/policy/modules/admin/prelink.te --- nsaserefpolicy/policy/modules/admin/prelink.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/prelink.te 2007-01-08 14:23:51.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/prelink.te 2007-01-17 13:32:47.000000000 -0500 @@ -18,6 +18,9 @@ type prelink_log_t; logging_log_file(prelink_log_t) @@ -326,7 +351,7 @@ allow prelink_t prelink_object:file { manage_file_perms execute relabelto relabelfrom }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/quota.fc serefpolicy-2.5.1/policy/modules/admin/quota.fc --- nsaserefpolicy/policy/modules/admin/quota.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/quota.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/quota.fc 2007-01-17 13:32:47.000000000 -0500 @@ -7,8 +7,13 @@ /sbin/convertquota -- gen_context(system_u:object_r:quota_exec_t,s0) ') @@ -344,7 +369,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/quota.te serefpolicy-2.5.1/policy/modules/admin/quota.te --- nsaserefpolicy/policy/modules/admin/quota.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/quota.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/quota.te 2007-01-17 13:32:47.000000000 -0500 @@ -26,15 +26,18 @@ allow quota_t self:process signal_perms; @@ -387,7 +412,7 @@ -') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.5.1/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/rpm.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/rpm.fc 2007-01-17 13:32:47.000000000 -0500 @@ -21,6 +21,9 @@ /usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -400,7 +425,7 @@ /var/lib/alternatives(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.5.1/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/rpm.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/rpm.if 2007-01-17 13:32:47.000000000 -0500 @@ -270,3 +270,27 @@ dontaudit $1 rpm_var_lib_t:file manage_file_perms; dontaudit $1 rpm_var_lib_t:lnk_file manage_lnk_file_perms; @@ -431,7 +456,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.5.1/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/rpm.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/rpm.te 2007-01-17 13:32:47.000000000 -0500 @@ -9,6 +9,8 @@ type rpm_t; type rpm_exec_t; @@ -480,7 +505,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.5.1/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/sudo.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/sudo.if 2007-01-17 13:32:47.000000000 -0500 @@ -71,6 +71,7 @@ allow $1_sudo_t self:unix_dgram_socket sendto; allow $1_sudo_t self:unix_stream_socket connectto; @@ -522,7 +547,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.5.1/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/su.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/su.if 2007-01-17 13:32:47.000000000 -0500 @@ -31,9 +31,10 @@ template(`su_restricted_domain_template', ` gen_require(` @@ -618,7 +643,7 @@ allow $1_su_t $1_home_t:file manage_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.te serefpolicy-2.5.1/policy/modules/admin/su.te --- nsaserefpolicy/policy/modules/admin/su.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/su.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/su.te 2007-01-17 13:32:47.000000000 -0500 @@ -8,3 +8,5 @@ type su_exec_t; @@ -627,7 +652,7 @@ +attribute sudomain; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.5.1/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/usermanage.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/usermanage.te 2007-01-17 13:32:47.000000000 -0500 @@ -112,6 +112,7 @@ files_manage_etc_files(chfn_t) files_read_etc_runtime_files(chfn_t) @@ -692,7 +717,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.5.1/policy/modules/admin/vpn.te --- nsaserefpolicy/policy/modules/admin/vpn.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/vpn.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/vpn.te 2007-01-17 13:32:47.000000000 -0500 @@ -95,6 +95,7 @@ miscfiles_read_localization(vpnc_t) @@ -703,7 +728,7 @@ sysnet_etc_filetrans_config(vpnc_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolution.if serefpolicy-2.5.1/policy/modules/apps/evolution.if --- nsaserefpolicy/policy/modules/apps/evolution.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/evolution.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/evolution.if 2007-01-17 13:32:47.000000000 -0500 @@ -53,7 +53,7 @@ userdom_user_home_content($1,$1_evolution_home_t) @@ -1003,7 +1028,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-2.5.1/policy/modules/apps/gnome.fc --- nsaserefpolicy/policy/modules/apps/gnome.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/gnome.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/gnome.fc 2007-01-17 13:32:47.000000000 -0500 @@ -7,3 +7,5 @@ /tmp/gconfd-USER/.* -- gen_context(system_u:object_r:ROLE_gconf_tmp_t,s0) @@ -1012,7 +1037,7 @@ +HOME_DIR/\.config/gtk-.* gen_context(system_u:object_r:ROLE_gnome_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.5.1/policy/modules/apps/gnome.if --- nsaserefpolicy/policy/modules/apps/gnome.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/gnome.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/gnome.if 2007-01-17 13:32:47.000000000 -0500 @@ -35,19 +35,24 @@ template(`gnome_per_role_template',` gen_require(` @@ -1151,7 +1176,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.te serefpolicy-2.5.1/policy/modules/apps/gnome.te --- nsaserefpolicy/policy/modules/apps/gnome.te 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/gnome.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/gnome.te 2007-01-17 13:32:47.000000000 -0500 @@ -6,8 +6,13 @@ # Declarations # @@ -1168,7 +1193,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-2.5.1/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/gpg.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/gpg.if 2007-01-17 13:32:47.000000000 -0500 @@ -89,6 +89,7 @@ manage_files_pattern($1_gpg_t,$1_gpg_secret_t,$1_gpg_secret_t) @@ -1179,7 +1204,7 @@ domtrans_pattern($2,gpg_exec_t,$1_gpg_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.5.1/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/java.fc 2007-01-10 16:27:16.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/java.fc 2007-01-17 13:32:47.000000000 -0500 @@ -1,7 +1,7 @@ # # /opt @@ -1191,7 +1216,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.5.1/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/java.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/java.if 2007-01-17 13:32:47.000000000 -0500 @@ -191,3 +191,36 @@ refpolicywarn(`$0($1) has no effect in strict policy.') ') @@ -1231,7 +1256,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.5.1/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/java.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/java.te 2007-01-17 13:32:47.000000000 -0500 @@ -20,4 +20,6 @@ allow java_t self:process { execstack execmem execheap }; unconfined_domain_noaudit(java_t) @@ -1241,7 +1266,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.5.1/policy/modules/apps/loadkeys.if --- nsaserefpolicy/policy/modules/apps/loadkeys.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/loadkeys.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/loadkeys.if 2007-01-17 13:32:47.000000000 -0500 @@ -45,18 +45,13 @@ ## # @@ -1269,7 +1294,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-2.5.1/policy/modules/apps/loadkeys.te --- nsaserefpolicy/policy/modules/apps/loadkeys.te 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/loadkeys.te 2007-01-07 08:27:42.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/loadkeys.te 2007-01-17 13:32:47.000000000 -0500 @@ -18,7 +18,7 @@ domain_type(loadkeys_t) @@ -1311,7 +1336,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.5.1/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/mozilla.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/mozilla.if 2007-01-17 13:32:47.000000000 -0500 @@ -60,7 +60,7 @@ allow $1_mozilla_t self:capability { sys_nice setgid setuid }; @@ -1660,7 +1685,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-2.5.1/policy/modules/apps/mplayer.if --- nsaserefpolicy/policy/modules/apps/mplayer.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/mplayer.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/mplayer.if 2007-01-17 13:32:47.000000000 -0500 @@ -178,6 +178,10 @@ files_dontaudit_list_default($1_mencoder_t) ') @@ -1774,7 +1799,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.te serefpolicy-2.5.1/policy/modules/apps/mplayer.te --- nsaserefpolicy/policy/modules/apps/mplayer.te 2006-11-16 17:15:07.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/mplayer.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/mplayer.te 2007-01-17 13:32:47.000000000 -0500 @@ -21,3 +21,4 @@ unconfined_execmem_alias_program(mencoder_exec_t) unconfined_execmem_alias_program(mplayer_exec_t) @@ -1782,7 +1807,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.if serefpolicy-2.5.1/policy/modules/apps/slocate.if --- nsaserefpolicy/policy/modules/apps/slocate.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/slocate.if 2007-01-07 08:35:20.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/slocate.if 2007-01-17 13:32:47.000000000 -0500 @@ -19,3 +19,23 @@ create_files_pattern($1,locate_log_t,locate_log_t) append_files_pattern($1,locate_log_t,locate_log_t) @@ -1809,7 +1834,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.5.1/policy/modules/apps/slocate.te --- nsaserefpolicy/policy/modules/apps/slocate.te 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/slocate.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/slocate.te 2007-01-17 13:32:47.000000000 -0500 @@ -39,11 +39,14 @@ files_list_all(locate_t) @@ -1827,7 +1852,7 @@ libs_use_ld_so(locate_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/thunderbird.if serefpolicy-2.5.1/policy/modules/apps/thunderbird.if --- nsaserefpolicy/policy/modules/apps/thunderbird.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/thunderbird.if 2007-01-07 09:07:40.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/thunderbird.if 2007-01-17 13:32:47.000000000 -0500 @@ -46,6 +46,7 @@ type $1_thunderbird_home_t alias $1_thunderbird_rw_t; @@ -2045,7 +2070,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelper.if serefpolicy-2.5.1/policy/modules/apps/userhelper.if --- nsaserefpolicy/policy/modules/apps/userhelper.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/userhelper.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/userhelper.if 2007-01-17 13:32:47.000000000 -0500 @@ -49,7 +49,7 @@ domain_obj_id_change_exemption($1_userhelper_t) domain_interactive_fd($1_userhelper_t) @@ -2078,7 +2103,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.5.1/policy/modules/apps/webalizer.te --- nsaserefpolicy/policy/modules/apps/webalizer.te 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/webalizer.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/webalizer.te 2007-01-17 13:58:19.000000000 -0500 @@ -67,6 +67,7 @@ corenet_tcp_sendrecv_all_ports(webalizer_t) @@ -2089,7 +2114,7 @@ files_read_etc_runtime_files(webalizer_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.fc serefpolicy-2.5.1/policy/modules/kernel/corecommands.fc --- nsaserefpolicy/policy/modules/kernel/corecommands.fc 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.fc 2007-01-17 13:32:47.000000000 -0500 @@ -1,4 +1,3 @@ - # @@ -2125,7 +2150,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.1/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.if 2007-01-17 13:32:47.000000000 -0500 @@ -909,7 +909,20 @@ type bin_t, sbin_t; ') @@ -2211,7 +2236,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.if.in serefpolicy-2.5.1/policy/modules/kernel/corenetwork.if.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.if.in 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corenetwork.if.in 2007-01-05 15:45:04.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/corenetwork.if.in 2007-01-17 13:32:47.000000000 -0500 @@ -1016,9 +1016,11 @@ interface(`corenet_tcp_sendrecv_reserved_port',` gen_require(` @@ -2380,7 +2405,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.5.1/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corenetwork.te.in 2007-01-05 13:25:29.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/corenetwork.te.in 2007-01-17 13:32:47.000000000 -0500 @@ -43,11 +43,16 @@ sid port gen_context(system_u:object_r:port_t,s0) @@ -2424,7 +2449,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 serefpolicy-2.5.1/policy/modules/kernel/corenetwork.te.m4 --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.m4 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corenetwork.te.m4 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/corenetwork.te.m4 2007-01-17 13:32:47.000000000 -0500 @@ -55,8 +55,8 @@ define(`declare_ports',`dnl ifelse(eval($3 < 1024),1,` @@ -2438,7 +2463,7 @@ ifelse(`$5',`',`',`declare_ports($1,shiftn(4,$*))')dnl diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.5.1/policy/modules/kernel/devices.te --- nsaserefpolicy/policy/modules/kernel/devices.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/devices.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/devices.te 2007-01-17 13:32:47.000000000 -0500 @@ -70,6 +70,7 @@ # type kmsg_device_t; @@ -2449,7 +2474,7 @@ # Type for /dev/mapper/control diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.1/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/domain.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/domain.if 2007-01-17 13:32:47.000000000 -0500 @@ -1217,3 +1217,24 @@ typeattribute $1 can_change_object_identity; typeattribute $1 set_curr_context; @@ -2477,7 +2502,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.1/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/domain.te 2007-01-08 15:33:17.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/domain.te 2007-01-17 13:32:47.000000000 -0500 @@ -144,3 +144,22 @@ # act on all domains keys @@ -2503,7 +2528,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.1/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-07 09:03:23.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-17 13:32:47.000000000 -0500 @@ -350,8 +350,7 @@ ######################################## @@ -2750,7 +2775,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.1/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.if 2007-01-11 17:01:46.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.if 2007-01-17 13:32:47.000000000 -0500 @@ -2740,6 +2740,25 @@ ######################################## @@ -2779,7 +2804,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.5.1/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.te 2007-01-08 12:19:13.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.te 2007-01-17 14:13:14.000000000 -0500 @@ -103,6 +103,7 @@ type rpc_pipefs_t; fs_type(rpc_pipefs_t) @@ -2788,7 +2813,15 @@ # # tmpfs_t is the type for tmpfs filesystems -@@ -151,6 +152,7 @@ +@@ -139,6 +140,7 @@ + # + type cifs_t alias sambafs_t; + fs_noxattr_type(cifs_t) ++files_mountpoint(cifs_t) + genfscon cifs / gen_context(system_u:object_r:cifs_t,s0) + genfscon smbfs / gen_context(system_u:object_r:cifs_t,s0) + +@@ -151,6 +153,7 @@ allow dosfs_t fs_t:filesystem associate; genfscon fat / gen_context(system_u:object_r:dosfs_t,s0) genfscon msdos / gen_context(system_u:object_r:dosfs_t,s0) @@ -2798,7 +2831,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.5.1/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/kernel.if 2007-01-05 15:44:27.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/kernel.if 2007-01-17 13:32:47.000000000 -0500 @@ -2140,9 +2140,6 @@ ') @@ -2879,7 +2912,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.5.1/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/kernel.te 2007-01-11 16:49:31.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/kernel.te 2007-01-17 13:32:47.000000000 -0500 @@ -138,6 +138,8 @@ type unlabeled_t; sid unlabeled gen_context(system_u:object_r:unlabeled_t,mls_systemhigh) @@ -2909,7 +2942,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.if serefpolicy-2.5.1/policy/modules/kernel/mls.if --- nsaserefpolicy/policy/modules/kernel/mls.if 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/mls.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/mls.if 2007-01-17 13:32:47.000000000 -0500 @@ -154,6 +154,26 @@ ######################################## ##

@@ -2939,7 +2972,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.5.1/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/mls.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/mls.te 2007-01-17 13:32:47.000000000 -0500 @@ -18,6 +18,7 @@ attribute mlsnetreadtoclr; attribute mlsnetwrite; @@ -2959,7 +2992,7 @@ attribute privrangetrans; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.1/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/terminal.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/terminal.if 2007-01-17 13:32:47.000000000 -0500 @@ -636,6 +636,8 @@ attribute ptynode; ') @@ -2971,7 +3004,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.5.1/policy/modules/kernel/terminal.te --- nsaserefpolicy/policy/modules/kernel/terminal.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/terminal.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/terminal.te 2007-01-17 13:32:47.000000000 -0500 @@ -28,6 +28,7 @@ type devpts_t; files_mountpoint(devpts_t) @@ -2982,7 +3015,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.1/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/apache.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/apache.fc 2007-01-17 13:32:47.000000000 -0500 @@ -81,3 +81,12 @@ /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) @@ -2998,7 +3031,7 @@ +/opt/fortitude/run(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.1/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/apache.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/apache.te 2007-01-17 13:32:47.000000000 -0500 @@ -686,6 +686,7 @@ optional_policy(` @@ -3009,7 +3042,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.5.1/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/apm.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/apm.te 2007-01-17 13:32:47.000000000 -0500 @@ -109,6 +109,7 @@ corecmd_exec_all_executables(apmd_t) @@ -3036,7 +3069,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-2.5.1/policy/modules/services/automount.fc --- nsaserefpolicy/policy/modules/services/automount.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/automount.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/automount.fc 2007-01-17 13:32:47.000000000 -0500 @@ -2,7 +2,6 @@ # /etc # @@ -3047,7 +3080,7 @@ # /usr diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.5.1/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/automount.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/automount.te 2007-01-17 13:32:47.000000000 -0500 @@ -13,8 +13,7 @@ type automount_var_run_t; files_pid_file(automount_var_run_t) @@ -3063,7 +3096,7 @@ # -allow automount_t self:capability { net_bind_service sys_nice sys_resource dac_override sys_admin }; -+allow automount_t self:capability { net_bind_service setgid sys_nice sys_resource dac_override sys_admin }; ++allow automount_t self:capability { net_bind_service setgid setuid sys_nice sys_resource dac_override sys_admin }; dontaudit automount_t self:capability sys_tty_config; allow automount_t self:process { signal_perms getpgid setpgid setsched setrlimit }; allow automount_t self:fifo_file rw_fifo_file_perms; @@ -3087,7 +3120,7 @@ fs_unmount_all_fs(automount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.5.1/policy/modules/services/clamav.te --- nsaserefpolicy/policy/modules/services/clamav.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/clamav.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/clamav.te 2007-01-17 13:32:47.000000000 -0500 @@ -86,6 +86,8 @@ kernel_dontaudit_list_proc(clamd_t) kernel_read_sysctl(clamd_t) @@ -3099,7 +3132,7 @@ corenet_tcp_sendrecv_all_nodes(clamd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.fc serefpolicy-2.5.1/policy/modules/services/cron.fc --- nsaserefpolicy/policy/modules/services/cron.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/cron.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/cron.fc 2007-01-17 13:32:47.000000000 -0500 @@ -5,11 +5,11 @@ /usr/bin/at -- gen_context(system_u:object_r:crontab_exec_t,s0) /usr/bin/(f)?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) @@ -3129,7 +3162,7 @@ +/var/lib/misc(/.*)? gen_context(system_u:object_r:crond_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.if serefpolicy-2.5.1/policy/modules/services/cron.if --- nsaserefpolicy/policy/modules/services/cron.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/cron.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/cron.if 2007-01-17 13:32:47.000000000 -0500 @@ -35,6 +35,7 @@ # template(`cron_per_role_template',` @@ -3309,7 +3342,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.5.1/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/cron.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/cron.te 2007-01-17 13:32:47.000000000 -0500 @@ -11,9 +11,6 @@ # attribute cron_spool_type; @@ -3435,7 +3468,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.5.1/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/cups.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/cups.te 2007-01-17 13:32:47.000000000 -0500 @@ -120,6 +120,8 @@ manage_files_pattern(cupsd_t,cupsd_tmp_t,cupsd_tmp_t) manage_fifo_files_pattern(cupsd_t,cupsd_tmp_t,cupsd_tmp_t) @@ -3457,7 +3490,7 @@ ifdef(`targeted_policy',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.5.1/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/cvs.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/cvs.te 2007-01-17 13:32:47.000000000 -0500 @@ -9,6 +9,7 @@ type cvs_t; type cvs_exec_t; @@ -3468,7 +3501,7 @@ type cvs_data_t; # customizable diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.1/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/dbus.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/dbus.if 2007-01-17 13:32:47.000000000 -0500 @@ -69,13 +69,14 @@ # Local policy # @@ -3563,7 +3596,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.5.1/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ftp.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ftp.te 2007-01-17 14:08:21.000000000 -0500 @@ -102,6 +102,8 @@ corenet_tcp_bind_ftp_port(ftpd_t) corenet_tcp_bind_ftp_data_port(ftpd_t) @@ -3593,7 +3626,11 @@ tunable_policy(`ftp_home_dir',` allow ftpd_t self:capability { dac_override dac_read_search }; -@@ -185,7 +193,11 @@ +@@ -182,10 +190,15 @@ + userdom_manage_all_users_home_content_dirs(ftpd_t) + userdom_manage_all_users_home_content_files(ftpd_t) + userdom_manage_all_users_home_content_symlinks(ftpd_t) ++ auth_manage_all_files_except_shadow(ftpd_t) ifdef(`targeted_policy',` userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file }) @@ -3607,7 +3644,7 @@ tunable_policy(`ftp_home_dir && use_nfs_home_dirs',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.5.1/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/hal.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/hal.if 2007-01-17 13:32:47.000000000 -0500 @@ -171,3 +171,41 @@ files_search_pids($1) allow $1 hald_var_run_t:file rw_file_perms; @@ -3652,7 +3689,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.1/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/hal.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/hal.te 2007-01-17 13:32:47.000000000 -0500 @@ -134,6 +134,7 @@ init_read_utmp(hald_t) #hal runs shutdown, probably need a shutdown domain @@ -3663,19 +3700,71 @@ libs_use_shared_libs(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/inetd.te serefpolicy-2.5.1/policy/modules/services/inetd.te --- nsaserefpolicy/policy/modules/services/inetd.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/inetd.te 2007-01-11 17:26:52.000000000 -0500 -@@ -149,6 +149,10 @@ - ') ++++ serefpolicy-2.5.1/policy/modules/services/inetd.te 2007-01-17 13:49:24.000000000 -0500 +@@ -37,10 +37,11 @@ - optional_policy(` -+ ssh_domtrans(inetd_t) -+') + allow inetd_t self:capability { setuid setgid }; + dontaudit inetd_t self:capability sys_tty_config; +-allow inetd_t self:process setsched; ++allow inetd_t self:process { setsched setexec }; + allow inetd_t self:fifo_file rw_fifo_file_perms; + allow inetd_t self:tcp_socket create_stream_socket_perms; + allow inetd_t self:udp_socket create_socket_perms; ++allow inetd_t self:fd use; + + allow inetd_t inetd_log_t:file manage_file_perms; + logging_log_filetrans(inetd_t,inetd_log_t,file) +@@ -55,6 +56,8 @@ + kernel_read_kernel_sysctls(inetd_t) + kernel_list_proc(inetd_t) + kernel_read_proc_symlinks(inetd_t) ++kernel_read_system_state(inetd_t) ++kernel_tcp_recvfrom_unlabeled(inetd_t) + + # base networking: + corenet_non_ipsec_sendrecv(inetd_t) +@@ -88,6 +91,7 @@ + corenet_tcp_bind_swat_port(inetd_t) + corenet_udp_bind_swat_port(inetd_t) + corenet_udp_bind_tftp_port(inetd_t) ++corenet_tcp_bind_ssh_port(inetd_t) + + # service port packets: + corenet_sendrecv_amanda_server_packets(inetd_t) +@@ -109,6 +113,9 @@ + fs_getattr_all_fs(inetd_t) + fs_search_auto_mountpoints(inetd_t) + ++selinux_validate_context(inetd_t) ++selinux_compute_create_context(inetd_t) ++ + term_dontaudit_use_console(inetd_t) + + # Run other daemons in the inetd_child_t domain. +@@ -129,6 +136,12 @@ + + miscfiles_read_localization(inetd_t) + ++# xinetd needs MLS override privileges to work ++mls_fd_use_all_levels(inetd_t) ++mls_fd_share_all_levels(inetd_t) ++mls_socket_read_to_clearance(inetd_t) ++mls_process_set_level(inetd_t) ++ + sysnet_read_config(inetd_t) + + userdom_dontaudit_use_unpriv_user_fds(inetd_t) +@@ -173,6 +186,9 @@ + # for identd + allow inetd_child_t self:netlink_tcpdiag_socket r_netlink_socket_perms; + allow inetd_child_t self:capability { setuid setgid }; ++allow inetd_child_t self:dir search; ++allow inetd_child_t self:{ lnk_file file } { getattr read }; + -+optional_policy(` - udev_read_db(inetd_t) - ') + files_search_home(inetd_child_t) -@@ -209,10 +213,11 @@ + manage_dirs_pattern(inetd_child_t,inetd_child_tmp_t,inetd_child_tmp_t) +@@ -209,10 +225,11 @@ sysnet_read_config(inetd_child_t) @@ -3691,7 +3780,7 @@ ') optional_policy(` -@@ -233,3 +238,7 @@ +@@ -233,3 +250,7 @@ optional_policy(` nscd_socket_use(inetd_child_t) ') @@ -3701,7 +3790,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.5.1/policy/modules/services/irqbalance.te --- nsaserefpolicy/policy/modules/services/irqbalance.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/irqbalance.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/irqbalance.te 2007-01-17 13:32:47.000000000 -0500 @@ -18,12 +18,16 @@ # Local policy # @@ -3721,7 +3810,7 @@ kernel_rw_irq_sysctls(irqbalance_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.5.1/policy/modules/services/kerberos.if --- nsaserefpolicy/policy/modules/services/kerberos.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/kerberos.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/kerberos.if 2007-01-17 13:32:47.000000000 -0500 @@ -41,6 +41,7 @@ allow $1 krb5_conf_t:file { getattr read }; dontaudit $1 krb5_conf_t:file write; @@ -3732,7 +3821,7 @@ allow $1 self:tcp_socket create_socket_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.5.1/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ktalk.fc 2007-01-10 16:37:20.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ktalk.fc 2007-01-17 13:32:47.000000000 -0500 @@ -1,4 +1,5 @@ -/usr/bin/in\.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) @@ -3742,7 +3831,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.5.1/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ktalk.te 2007-01-10 15:47:54.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ktalk.te 2007-01-17 13:32:47.000000000 -0500 @@ -84,3 +84,8 @@ optional_policy(` nscd_socket_use(ktalkd_t) @@ -3754,7 +3843,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/lpd.if serefpolicy-2.5.1/policy/modules/services/lpd.if --- nsaserefpolicy/policy/modules/services/lpd.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/lpd.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/lpd.if 2007-01-17 13:32:47.000000000 -0500 @@ -64,31 +64,33 @@ allow $1_lpr_t self:udp_socket create_socket_perms; allow $1_lpr_t self:netlink_route_socket r_netlink_socket_perms; @@ -3829,7 +3918,7 @@ userdom_read_all_untrusted_content($1_lpr_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.5.1/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/mta.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/mta.te 2007-01-17 14:44:11.000000000 -0500 @@ -27,6 +27,7 @@ type sendmail_exec_t; @@ -3838,9 +3927,17 @@ mta_base_mail_template(system) role system_r types system_mail_t; +@@ -58,6 +59,7 @@ + init_use_script_ptys(system_mail_t) + + userdom_use_sysadm_terms(system_mail_t) ++userdom_dontaudit_search_sysadm_home_dirs(system_mail_t) + + ifdef(`targeted_policy',` + typealias system_mail_t alias sysadm_mail_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.5.1/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/networkmanager.te 2007-01-10 16:13:37.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/networkmanager.te 2007-01-17 13:32:47.000000000 -0500 @@ -119,6 +119,8 @@ term_dontaudit_use_unallocated_ttys(NetworkManager_t) term_dontaudit_use_generic_ptys(NetworkManager_t) @@ -3852,7 +3949,7 @@ unconfined_rw_pipes(NetworkManager_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.5.1/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/nis.fc 2007-01-08 15:57:32.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/nis.fc 2007-01-17 13:32:47.000000000 -0500 @@ -6,7 +6,7 @@ /usr/lib/yp/ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) @@ -3864,7 +3961,7 @@ /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.5.1/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/nis.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/nis.if 2007-01-17 13:32:47.000000000 -0500 @@ -52,10 +52,13 @@ corenet_udp_bind_reserved_port($1) corenet_dontaudit_tcp_bind_all_reserved_ports($1) @@ -3890,7 +3987,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.5.1/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/nis.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/nis.te 2007-01-17 13:32:47.000000000 -0500 @@ -285,6 +285,7 @@ domain_use_interactive_fds(ypserv_t) @@ -3922,7 +4019,7 @@ +sysnet_read_config(ypxfr_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.5.1/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/nscd.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/nscd.if 2007-01-17 13:32:47.000000000 -0500 @@ -173,3 +173,23 @@ allow $1 nscd_t:nscd *; @@ -3949,7 +4046,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.5.1/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/nscd.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/nscd.te 2007-01-17 13:32:47.000000000 -0500 @@ -35,7 +35,6 @@ allow nscd_t self:unix_stream_socket create_stream_socket_perms; allow nscd_t self:unix_dgram_socket create_socket_perms; @@ -4001,7 +4098,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/openvpn.te serefpolicy-2.5.1/policy/modules/services/openvpn.te --- nsaserefpolicy/policy/modules/services/openvpn.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/openvpn.te 2007-01-05 13:25:53.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/openvpn.te 2007-01-17 13:32:47.000000000 -0500 @@ -28,11 +28,11 @@ # openvpn local policy # @@ -4018,7 +4115,7 @@ allow openvpn_t openvpn_etc_t:dir list_dir_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.fc serefpolicy-2.5.1/policy/modules/services/pcscd.fc --- nsaserefpolicy/policy/modules/services/pcscd.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/pcscd.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/pcscd.fc 2007-01-17 13:32:47.000000000 -0500 @@ -0,0 +1,9 @@ +# pcscd executable will have: +# label: system_u:object_r:pcscd_exec_t @@ -4031,7 +4128,7 @@ +/var/run/pcscd\.comm -s gen_context(system_u:object_r:pcscd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.if serefpolicy-2.5.1/policy/modules/services/pcscd.if --- nsaserefpolicy/policy/modules/services/pcscd.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/pcscd.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/pcscd.if 2007-01-17 13:32:47.000000000 -0500 @@ -0,0 +1,58 @@ +## policy for pcscd + @@ -4093,8 +4190,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pcscd.te serefpolicy-2.5.1/policy/modules/services/pcscd.te --- nsaserefpolicy/policy/modules/services/pcscd.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/pcscd.te 2007-01-10 14:12:42.000000000 -0500 -@@ -0,0 +1,77 @@ ++++ serefpolicy-2.5.1/policy/modules/services/pcscd.te 2007-01-17 13:32:47.000000000 -0500 +@@ -0,0 +1,78 @@ +policy_module(pcscd,1.0.0) + +######################################## @@ -4153,6 +4250,7 @@ + +dev_rw_generic_usb_dev(pcscd_t) +dev_rw_usbfs(pcscd_t) ++dev_search_sysfs(pcscd_t) + +files_read_etc_runtime_files(pcscd_t) + @@ -4174,7 +4272,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.if serefpolicy-2.5.1/policy/modules/services/pegasus.if --- nsaserefpolicy/policy/modules/services/pegasus.if 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/pegasus.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/pegasus.if 2007-01-17 13:32:47.000000000 -0500 @@ -1 +1,28 @@ ## The Open Group Pegasus CIM/WBEM Server. + @@ -4206,7 +4304,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.5.1/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/pegasus.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/pegasus.te 2007-01-17 13:32:47.000000000 -0500 @@ -99,13 +99,12 @@ auth_use_nsswitch(pegasus_t) @@ -4225,7 +4323,7 @@ hostname_exec(pegasus_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.1/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/procmail.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/procmail.te 2007-01-17 13:32:47.000000000 -0500 @@ -10,6 +10,7 @@ type procmail_exec_t; domain_type(procmail_t) @@ -4234,9 +4332,23 @@ role system_r types procmail_t; ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.te serefpolicy-2.5.1/policy/modules/services/pyzor.te +--- nsaserefpolicy/policy/modules/services/pyzor.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/pyzor.te 2007-01-17 14:30:28.000000000 -0500 +@@ -65,6 +65,10 @@ + amavis_manage_spool_files(pyzor_t) + ') + ++ifdef(`targeted_policy',` ++ userdom_read_generic_user_home_content_files(pyzor_t) ++') ++ + optional_policy(` + spamassassin_read_spamd_tmp_files(pyzor_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/radvd.te serefpolicy-2.5.1/policy/modules/services/radvd.te --- nsaserefpolicy/policy/modules/services/radvd.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/radvd.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/radvd.te 2007-01-17 13:32:47.000000000 -0500 @@ -28,7 +28,7 @@ allow radvd_t self:tcp_socket create_stream_socket_perms; allow radvd_t self:udp_socket create_socket_perms; @@ -4248,7 +4360,7 @@ files_pid_filetrans(radvd_t,radvd_var_run_t,file) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.if serefpolicy-2.5.1/policy/modules/services/rhgb.if --- nsaserefpolicy/policy/modules/services/rhgb.if 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/rhgb.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/rhgb.if 2007-01-17 13:32:47.000000000 -0500 @@ -124,3 +124,79 @@ allow $1 rhgb_tmpfs_t:file { read write }; @@ -4331,7 +4443,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.te serefpolicy-2.5.1/policy/modules/services/rhgb.te --- nsaserefpolicy/policy/modules/services/rhgb.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/rhgb.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/rhgb.te 2007-01-17 13:32:47.000000000 -0500 @@ -114,6 +114,8 @@ xserver_kill_xdm_xserver(rhgb_t) # for running setxkbmap @@ -4351,7 +4463,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-2.5.1/policy/modules/services/rlogin.te --- nsaserefpolicy/policy/modules/services/rlogin.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/rlogin.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/rlogin.te 2007-01-17 13:32:47.000000000 -0500 @@ -61,6 +61,7 @@ dev_read_urand(rlogind_t) @@ -4381,7 +4493,7 @@ ifdef(`TODO',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.fc serefpolicy-2.5.1/policy/modules/services/rpc.fc --- nsaserefpolicy/policy/modules/services/rpc.fc 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/rpc.fc 2007-01-05 16:41:04.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/rpc.fc 2007-01-17 13:32:47.000000000 -0500 @@ -11,7 +11,6 @@ # # /usr @@ -4392,7 +4504,7 @@ /usr/sbin/rpc\.mountd -- gen_context(system_u:object_r:nfsd_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.5.1/policy/modules/services/rsync.te --- nsaserefpolicy/policy/modules/services/rsync.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/rsync.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/rsync.te 2007-01-17 13:32:47.000000000 -0500 @@ -9,6 +9,7 @@ type rsync_t; type rsync_exec_t; @@ -4403,7 +4515,7 @@ type rsync_data_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.5.1/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/samba.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/samba.te 2007-01-17 13:32:47.000000000 -0500 @@ -347,6 +347,8 @@ create_dirs_pattern(nmbd_t,samba_log_t,samba_log_t) @@ -4415,7 +4527,7 @@ allow nmbd_t samba_log_t:dir setattr; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.5.1/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/sendmail.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/sendmail.te 2007-01-17 13:32:47.000000000 -0500 @@ -140,6 +140,10 @@ udev_read_db(sendmail_t) ') @@ -4429,7 +4541,7 @@ allow sendmail_t etc_mail_t:file manage_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.if serefpolicy-2.5.1/policy/modules/services/setroubleshoot.if --- nsaserefpolicy/policy/modules/services/setroubleshoot.if 2006-11-16 17:15:20.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/setroubleshoot.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/setroubleshoot.if 2007-01-17 13:32:47.000000000 -0500 @@ -1 +1,21 @@ ## SELinux troubleshooting service + @@ -4454,7 +4566,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.5.1/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/setroubleshoot.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/setroubleshoot.te 2007-01-17 13:32:47.000000000 -0500 @@ -53,6 +53,7 @@ kernel_read_kernel_sysctls(setroubleshootd_t) @@ -4465,7 +4577,7 @@ corecmd_exec_bin(setroubleshootd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.1/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/smartmon.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/smartmon.te 2007-01-17 13:32:47.000000000 -0500 @@ -60,6 +60,7 @@ fs_search_auto_mountpoints(fsdaemon_t) @@ -4476,7 +4588,7 @@ storage_raw_write_fixed_disk(fsdaemon_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.if serefpolicy-2.5.1/policy/modules/services/snmp.if --- nsaserefpolicy/policy/modules/services/snmp.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/snmp.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/snmp.if 2007-01-17 13:32:47.000000000 -0500 @@ -66,3 +66,20 @@ dontaudit $1 snmpd_var_lib_t:file read_file_perms; dontaudit $1 snmpd_var_lib_t:lnk_file { getattr read }; @@ -4500,7 +4612,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.1/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/spamassassin.te 2007-01-08 14:24:41.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/spamassassin.te 2007-01-17 13:32:47.000000000 -0500 @@ -8,7 +8,7 @@ # spamassassin client executable @@ -4539,7 +4651,7 @@ userdom_manage_generic_user_home_content_symlinks(spamd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.1/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ssh.if 2007-01-11 17:26:28.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ssh.if 2007-01-17 13:32:47.000000000 -0500 @@ -226,6 +226,7 @@ domain_type($1_ssh_agent_t) domain_entry_file($1_ssh_agent_t,ssh_agent_exec_t) @@ -4623,7 +4735,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.1/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ssh.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ssh.te 2007-01-17 13:44:43.000000000 -0500 @@ -10,7 +10,7 @@ # ssh client executable. @@ -4641,7 +4753,16 @@ ') ################################# -@@ -82,6 +83,7 @@ +@@ -73,6 +74,8 @@ + # + + ifdef(`strict_policy',` ++ inetd_tcp_service_domain(sshd_t, sshd_exec_t) ++ + # so a tunnel can point to another ssh tunnel + allow sshd_t self:netlink_route_socket r_netlink_socket_perms; + allow sshd_t self:key { search link write }; +@@ -82,6 +85,7 @@ manage_sock_files_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) files_tmp_filetrans(sshd_t, sshd_tmp_t, { dir file sock_file }) @@ -4649,9 +4770,25 @@ kernel_link_key(sshd_t) # for X forwarding +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-2.5.1/policy/modules/services/uucp.te +--- nsaserefpolicy/policy/modules/services/uucp.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/uucp.te 2007-01-17 14:45:25.000000000 -0500 +@@ -120,6 +120,7 @@ + uucp_append_log(uux_t) + uucp_manage_spool(uux_t) + ++corenet_non_ipsec_sendrecv(uux_t) + corecmd_exec_sbin(uux_t) + + files_read_etc_files(uux_t) +@@ -143,3 +144,4 @@ + optional_policy(` + nscd_socket_use(uux_t) + ') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.5.1/policy/modules/services/xserver.fc --- nsaserefpolicy/policy/modules/services/xserver.fc 2006-11-16 17:15:21.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/xserver.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/xserver.fc 2007-01-17 13:32:47.000000000 -0500 @@ -44,7 +44,7 @@ # /tmp # @@ -4663,7 +4800,7 @@ /tmp/\.X11-unix/.* -s <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.5.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/xserver.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/xserver.if 2007-01-17 13:32:47.000000000 -0500 @@ -45,7 +45,7 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -4901,7 +5038,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.5.1/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/xserver.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/xserver.te 2007-01-17 13:32:47.000000000 -0500 @@ -10,9 +10,6 @@ attribute fonts_cache_type; attribute fonts_config_type; @@ -4951,7 +5088,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.1/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/authlogin.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/authlogin.if 2007-01-17 14:20:45.000000000 -0500 @@ -180,6 +180,9 @@ ## # @@ -5065,7 +5202,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.5.1/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/authlogin.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/authlogin.te 2007-01-17 13:57:36.000000000 -0500 @@ -9,6 +9,7 @@ attribute can_read_shadow_passwords; attribute can_write_shadow_passwords; @@ -5074,17 +5211,18 @@ type chkpwd_exec_t; corecmd_executable_file(chkpwd_exec_t) -@@ -140,6 +141,7 @@ - read_files_pattern(pam_console_t,pam_var_console_t,pam_var_console_t) - read_lnk_files_pattern(pam_console_t,pam_var_console_t,pam_var_console_t) - dontaudit pam_console_t pam_var_console_t:file write; -+files_dontaudit_search_isid_type_dirs(pam_console_t) +@@ -251,6 +252,8 @@ + # System check password local policy + # - kernel_read_kernel_sysctls(pam_console_t) - kernel_use_fds(pam_console_t) ++allow system_chkpwd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; ++ + allow system_chkpwd_t shadow_t:file { getattr read }; + + corecmd_search_sbin(system_chkpwd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.te serefpolicy-2.5.1/policy/modules/system/clock.te --- nsaserefpolicy/policy/modules/system/clock.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/clock.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/clock.te 2007-01-17 13:32:47.000000000 -0500 @@ -32,8 +32,7 @@ allow hwclock_t adjtime_t:file { rw_file_perms setattr }; @@ -5097,7 +5235,7 @@ corecmd_exec_shell(hwclock_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.fc serefpolicy-2.5.1/policy/modules/system/fstools.fc --- nsaserefpolicy/policy/modules/system/fstools.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/fstools.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/fstools.fc 2007-01-17 13:32:47.000000000 -0500 @@ -19,7 +19,6 @@ /sbin/mkfs.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) /sbin/mkraid -- gen_context(system_u:object_r:fsadm_exec_t,s0) @@ -5108,7 +5246,7 @@ /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.5.1/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/fstools.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/fstools.te 2007-01-17 13:32:47.000000000 -0500 @@ -9,7 +9,7 @@ type fsadm_t; type fsadm_exec_t; @@ -5129,7 +5267,7 @@ allow fsadm_t self:fifo_file rw_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.5.1/policy/modules/system/getty.te --- nsaserefpolicy/policy/modules/system/getty.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/getty.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/getty.te 2007-01-17 13:32:47.000000000 -0500 @@ -33,9 +33,11 @@ # @@ -5165,7 +5303,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.5.1/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/hostname.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/hostname.te 2007-01-17 13:32:47.000000000 -0500 @@ -8,8 +8,12 @@ type hostname_t; @@ -5194,7 +5332,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.1/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/init.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/init.if 2007-01-17 13:32:47.000000000 -0500 @@ -202,11 +202,14 @@ gen_require(` type initrc_t; @@ -5212,7 +5350,7 @@ domtrans_pattern(initrc_t,$2,$1) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.1/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/init.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/init.te 2007-01-17 13:42:33.000000000 -0500 @@ -125,6 +125,7 @@ # file descriptors inherited from the rootfs: files_dontaudit_rw_root_files(init_t) @@ -5309,7 +5447,7 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.1/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/iptables.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/iptables.te 2007-01-17 13:32:47.000000000 -0500 @@ -80,6 +80,11 @@ term_dontaudit_use_unallocated_ttys(iptables_t) term_dontaudit_use_generic_ptys(iptables_t) @@ -5332,7 +5470,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.5.1/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/libraries.fc 2007-01-10 16:29:40.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/libraries.fc 2007-01-17 13:32:47.000000000 -0500 @@ -79,6 +79,7 @@ /opt/netbeans(.*/)?jdk.*/linux/.+\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /opt/(.*/)?java/.+\.jar -- gen_context(system_u:object_r:shlib_t,s0) @@ -5357,7 +5495,7 @@ +/usr/lib64/python2.4/site-packages/M2Crypto/__m2crypto.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.5.1/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/locallogin.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/locallogin.te 2007-01-17 13:32:47.000000000 -0500 @@ -48,6 +48,8 @@ allow local_login_t self:msgq create_msgq_perms; allow local_login_t self:msg { send receive }; @@ -5387,7 +5525,7 @@ corecmd_read_sbin_symlinks(local_login_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.5.1/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/logging.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/logging.te 2007-01-17 13:53:26.000000000 -0500 @@ -320,6 +320,14 @@ corenet_udp_sendrecv_all_ports(syslogd_t) corenet_udp_bind_all_nodes(syslogd_t) @@ -5403,9 +5541,18 @@ # syslog-ng can send or receive logs corenet_sendrecv_syslogd_client_packets(syslogd_t) corenet_sendrecv_syslogd_server_packets(syslogd_t) +@@ -392,3 +400,8 @@ + # log to the xconsole + xserver_rw_console(syslogd_t) + ') ++ ++optional_policy(` ++ ssh_sigchld(auditctl_t) ++ ssh_rw_stream_sockets(auditctl_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.1/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/lvm.te 2007-01-11 17:02:09.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/lvm.te 2007-01-17 14:38:17.000000000 -0500 @@ -44,6 +44,7 @@ # Cluster LVM daemon local policy # @@ -5433,9 +5580,17 @@ storage_relabel_fixed_disk(lvm_t) storage_dontaudit_read_removable_device(lvm_t) +@@ -244,6 +248,7 @@ + term_dontaudit_getattr_pty_dirs(lvm_t) + + corecmd_exec_sbin(lvm_t) ++corecmd_dontaudit_getattr_sbin_files(lvm_t) + + domain_use_interactive_fds(lvm_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.5.1/policy/modules/system/miscfiles.fc --- nsaserefpolicy/policy/modules/system/miscfiles.fc 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/miscfiles.fc 2007-01-11 15:23:26.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/miscfiles.fc 2007-01-17 13:32:47.000000000 -0500 @@ -74,3 +74,5 @@ /var/lib/msttcorefonts(/.*)? gen_context(system_u:object_r:fonts_t,s0) /var/lib/usbutils(/.*)? gen_context(system_u:object_r:hwdata_t,s0) @@ -5444,7 +5599,7 @@ +/var/empty/sshd/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.5.1/policy/modules/system/miscfiles.if --- nsaserefpolicy/policy/modules/system/miscfiles.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/miscfiles.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/miscfiles.if 2007-01-17 13:32:47.000000000 -0500 @@ -138,6 +138,44 @@ ######################################## @@ -5537,7 +5692,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.5.1/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/modutils.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/modutils.te 2007-01-17 13:32:47.000000000 -0500 @@ -54,6 +54,8 @@ can_exec(insmod_t, insmod_exec_t) @@ -5585,7 +5740,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.1/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/mount.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/mount.te 2007-01-17 13:32:47.000000000 -0500 @@ -9,6 +9,7 @@ type mount_t; type mount_exec_t; @@ -5613,7 +5768,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/raid.te serefpolicy-2.5.1/policy/modules/system/raid.te --- nsaserefpolicy/policy/modules/system/raid.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/raid.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/raid.te 2007-01-17 13:32:47.000000000 -0500 @@ -93,3 +93,7 @@ optional_policy(` udev_read_db(mdadm_t) @@ -5624,7 +5779,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.5.1/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.fc 2007-01-17 13:32:47.000000000 -0500 @@ -40,7 +40,9 @@ /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) /usr/sbin/setsebool -- gen_context(system_u:object_r:semanage_exec_t,s0) @@ -5637,7 +5792,7 @@ # /var/run diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.5.1/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.if 2007-01-08 14:52:46.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.if 2007-01-17 13:32:47.000000000 -0500 @@ -682,6 +682,7 @@ ') @@ -5766,7 +5921,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.1/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.te 2007-01-10 16:09:02.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.te 2007-01-17 14:20:58.000000000 -0500 @@ -108,6 +108,18 @@ domain_entry_file(semanage_t, semanage_exec_t) role system_r types semanage_t; @@ -5802,7 +5957,18 @@ ') ') -@@ -292,6 +306,7 @@ +@@ -283,6 +297,10 @@ + auth_domtrans_chk_passwd(newrole_t) + auth_rw_faillog(newrole_t) + ++tunable_policy(`allow_polyinstantiation',` ++ files_polyinstantiate_all(newrole_t) ++') ++ + corecmd_list_bin(newrole_t) + corecmd_read_bin_symlinks(newrole_t) + +@@ -292,6 +310,7 @@ # Write to utmp. init_rw_utmp(newrole_t) @@ -5810,7 +5976,7 @@ files_read_etc_files(newrole_t) files_read_var_files(newrole_t) -@@ -307,6 +322,7 @@ +@@ -307,6 +326,7 @@ userdom_use_unpriv_users_fds(newrole_t) # for some PAM modules and for cwd userdom_dontaudit_search_all_users_home_content(newrole_t) @@ -5818,15 +5984,18 @@ ifdef(`strict_policy',` # if secure mode is enabled, then newrole -@@ -403,6 +419,7 @@ +@@ -403,6 +423,10 @@ fs_rw_tmpfs_blk_files(restorecon_t) fs_relabel_tmpfs_blk_file(restorecon_t) fs_relabel_tmpfs_chr_file(restorecon_t) -+ unconfined_dontaudit_rw_pipes(restorecon_t) ++ optional_policy(` ++ unconfined_dontaudit_rw_pipes(restorecon_t) ++ unconfined_dontaudit_rw_tcp_sockets(restorecon_t) ++ ') ') ifdef(`hide_broken_symptoms',` -@@ -546,82 +563,12 @@ +@@ -546,82 +570,12 @@ ######################################## # @@ -5913,7 +6082,7 @@ ######################################## # -@@ -669,6 +616,7 @@ +@@ -669,6 +623,7 @@ init_use_fds(setfiles_t) init_use_script_fds(setfiles_t) init_use_script_ptys(setfiles_t) @@ -5921,9 +6090,26 @@ domain_use_interactive_fds(setfiles_t) +@@ -688,3 +643,16 @@ + userdom_use_all_users_fds(setfiles_t) + # for config files in a home directory + userdom_read_all_users_home_content_files(setfiles_t) ++ ++optional_policy(` ++ ssh_sigchld(run_init_t) ++ ssh_rw_stream_sockets(run_init_t) ++ ssh_sigchld(setfiles_t) ++ ssh_rw_stream_sockets(setfiles_t) ++ ssh_sigchld(semanage_t) ++ ssh_rw_stream_sockets(semanage_t) ++ ssh_sigchld(restorecon_t) ++ ssh_rw_stream_sockets(restorecon_t) ++ ssh_sigchld(load_policy_t) ++ ssh_rw_stream_sockets(load_policy_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.1/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/sysnetwork.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/sysnetwork.te 2007-01-17 13:32:47.000000000 -0500 @@ -326,6 +326,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) @@ -5936,14 +6122,14 @@ optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.5.1/policy/modules/system/tzdata.fc --- nsaserefpolicy/policy/modules/system/tzdata.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/tzdata.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/tzdata.fc 2007-01-17 13:32:47.000000000 -0500 @@ -0,0 +1,3 @@ +# tzdata executable will have: + +/usr/sbin/tzdata-update -- gen_context(system_u:object_r:tzdata_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.5.1/policy/modules/system/tzdata.if --- nsaserefpolicy/policy/modules/system/tzdata.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/tzdata.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/tzdata.if 2007-01-17 13:32:47.000000000 -0500 @@ -0,0 +1,19 @@ +## policy for tzdata + @@ -5966,7 +6152,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.5.1/policy/modules/system/tzdata.te --- nsaserefpolicy/policy/modules/system/tzdata.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/tzdata.te 2007-01-11 08:08:34.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/tzdata.te 2007-01-17 13:32:47.000000000 -0500 @@ -0,0 +1,38 @@ +policy_module(tzdata,1.0.0) + @@ -6008,7 +6194,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.1/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.fc 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/unconfined.fc 2007-01-17 13:32:47.000000000 -0500 @@ -9,4 +9,6 @@ /usr/bin/valgrind -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -6018,7 +6204,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.1/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.if 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/unconfined.if 2007-01-17 13:32:47.000000000 -0500 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -6029,7 +6215,7 @@ corenet_unconfined($1) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.1/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/unconfined.te 2007-01-17 13:32:47.000000000 -0500 @@ -145,6 +145,8 @@ optional_policy(` @@ -6073,7 +6259,7 @@ init_dbus_chat_script(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-11 16:28:07.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-17 13:32:47.000000000 -0500 @@ -102,6 +102,9 @@ libs_exec_ld_so($1_t) @@ -6646,7 +6832,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-17 13:32:47.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -6741,7 +6927,7 @@ usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.1/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/xen.te 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/xen.te 2007-01-17 14:42:44.000000000 -0500 @@ -166,8 +166,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) @@ -6770,7 +6956,19 @@ term_use_generic_ptys(xenstored_t) term_use_console(xenconsoled_t) -@@ -357,3 +368,10 @@ +@@ -321,6 +332,11 @@ + + allow xm_t xen_image_t:dir rw_dir_perms; + allow xm_t xen_image_t:file read_file_perms; ++allow xm_t xen_image_t:blk_file r_file_perms; ++ ++#tunable_policy(`xen_use_raw_disk',` ++ storage_raw_read_fixed_disk(xm_t) ++#') + + kernel_read_system_state(xm_t) + kernel_read_kernel_sysctls(xm_t) +@@ -357,3 +373,10 @@ xen_append_log(xm_t) xen_stream_connect(xm_t) xen_stream_connect_xenstore(xm_t) @@ -6783,7 +6981,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.1/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/support/obj_perm_sets.spt 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/policy/support/obj_perm_sets.spt 2007-01-17 13:32:47.000000000 -0500 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') @@ -6795,7 +6993,7 @@ define(`write_file_perms',`{ getattr write append lock ioctl }') diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.1/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-16 17:15:29.000000000 -0500 -+++ serefpolicy-2.5.1/Rules.modular 2007-01-05 12:59:57.000000000 -0500 ++++ serefpolicy-2.5.1/Rules.modular 2007-01-17 13:32:47.000000000 -0500 @@ -219,6 +219,16 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- selinux-policy.spec 11 Jan 2007 22:43:22 -0000 1.382 +++ selinux-policy.spec 17 Jan 2007 19:58:32 -0000 1.383 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz From fedora-cvs-commits at redhat.com Wed Jan 17 20:13:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 15:13:11 -0500 Subject: rpms/gfs2-utils/FC-6 gfs2-utils.spec,1.19,1.20 sources,1.11,1.12 Message-ID: <200701172013.l0HKDBOB019734@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gfs2-utils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19719 Modified Files: gfs2-utils.spec sources Log Message: Build fixes for Fedora. Index: gfs2-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gfs2-utils/FC-6/gfs2-utils.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gfs2-utils.spec 9 Oct 2006 18:53:30 -0000 1.19 +++ gfs2-utils.spec 17 Jan 2007 20:13:09 -0000 1.20 @@ -11,7 +11,7 @@ ############################################################################### Name: gfs2-utils -Version: 0.1.9 +Version: 0.1.25 Release: 1%{?dist} License: GPL Group: System Environment/Kernel @@ -73,6 +73,43 @@ %{_mandir}/*/* %changelog +* Tue Jan 16 2007 Chris Feist 0.1.24-1 +- New upstream sources. +- Resolves: rhbz#222747 + +* Wed Jan 03 2007 Chris Feist 0.1.24-1 +- Updated sources +- Resolves: rhbz#218560 + +* Thu Dec 21 2006 Chris Feist 0.1.23-1 +- Updated sources +- Resolves: rhbz#218560 + +* Tue Dec 19 2006 Chris Feist 0.1.22-1 +- New upstream sources. +- Resolves: rhbz#219878 + +* Tue Dec 04 2006 Chris Feist 0.1.21-1 +- New upstream sources. +- Resolves: rhbz#218134 rhbz#215962 + +* Thu Nov 30 2006 Chris Feist 0.1.19-1 +- New upstream sources. +- Resolves: rhbz#217798 + +* Wed Nov 29 2006 Chris Feist 0.1.18-1 +- New upstream sources. +- Resolves: rhbz#217460 + +* Thu Oct 26 2006 Chris Feist 0.1.14-1 +- New upstream sources. + +* Fri Oct 13 2006 Chris Feist 0.1.12-1 +- New Upstream sources. + +* Fri Oct 13 2006 Chris Feist 0.1.10-1 +- New Upstream sources. + * Mon Oct 09 2006 Chris Feist 0.1.9-1 - New Upstream sources. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gfs2-utils/FC-6/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 Oct 2006 18:53:30 -0000 1.11 +++ sources 17 Jan 2007 20:13:09 -0000 1.12 @@ -1 +1 @@ -4c4836c01a739fe18bd68005c834e216 gfs2-0.1.9.tar.gz +0f40f3028edb2f0a7be77390e1ee862e gfs2-0.1.25.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 17 20:27:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 15:27:52 -0500 Subject: rpms/rpm/devel rpm.spec,1.220,1.221 Message-ID: <200701172027.l0HKRqFU008305@cvs.devel.redhat.com> Author: dbhole Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8291 Modified Files: rpm.spec Log Message: Added a missing BR for elfutils-libelf-devel-static (needed for -lelf) Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- rpm.spec 11 Dec 2006 18:35:35 -0000 1.220 +++ rpm.spec 17 Jan 2007 20:27:49 -0000 1.221 @@ -20,7 +20,7 @@ %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 38%{?dist} +Release: 39%{?dist} Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source1: mono-find-provides @@ -72,6 +72,7 @@ BuildRequires: autoconf BuildRequires: elfutils-devel >= 0.112 +BuildRequires: elfutils-libelf-devel-static BuildRequires: sed readline-devel zlib-devel @@ -607,6 +608,9 @@ %{__includedir}/popt.h %changelog +* Wed Jan 17 2007 Deepak Bhole 4.4.2-39%{?dist} +- Added a missing BR for elfutils-libelf-devel-static (needed for -lelf) + * Mon Dec 11 2006 Jeremy Katz - 4.4.2-38 - python: dbmatch keys can be unicode objects also (#219008) From fedora-cvs-commits at redhat.com Wed Jan 17 20:41:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 15:41:22 -0500 Subject: rpms/automake17/devel automake17.spec, 1.8, 1.9 automake-1.7.9-dvi.patch, 1.1, NONE filter-provides-automake.sh, 1.1, NONE filter-requires-automake.sh, 1.1, NONE Message-ID: <200701172041.l0HKfMDw030080@cvs.devel.redhat.com> Author: dgregor Update of /cvs/dist/rpms/automake17/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30031/devel Modified Files: automake17.spec Removed Files: automake-1.7.9-dvi.patch filter-provides-automake.sh filter-requires-automake.sh Log Message: auto-import automake17-1.7.9-5 on branch devel from automake17-1.7.9-5.src.rpm Index: automake17.spec =================================================================== RCS file: /cvs/dist/rpms/automake17/devel/automake17.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- automake17.spec 12 Jun 2006 15:16:18 -0000 1.8 +++ automake17.spec 17 Jan 2007 20:41:15 -0000 1.9 @@ -3,24 +3,17 @@ Summary: A GNU tool for automatically creating Makefiles. Name: automake17 Version: %{api_version}.9 -Release: 7 +Release: 5 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2 -Source10: filter-provides-automake.sh -Source11: filter-requires-automake.sh -Patch0: automake-1.7.9-dvi.patch URL: http://sources.redhat.com/automake Conflicts: automake = 1.7.8 Requires: perl, autoconf >= 2.54 -Buildrequires: autoconf >= 2.54, texinfo, texinfo-tex +Buildrequires: autoconf >= 2.54 BuildArchitectures: noarch Buildroot: %{_tmppath}/%{name}-%{version}-root -%define _use_internal_dependency_generator 0 -%define __find_provides %{SOURCE10} -%define __find_requires %{SOURCE11} - # run "make check" by default %{?_without_check: %define _without_check 1} %{!?_without_check: %define _without_check 0} @@ -35,7 +28,6 @@ %prep %setup -q -n automake-%{version} -%patch0 -p1 -b .rh1 %build %configure @@ -71,18 +63,6 @@ %dir %{_datadir}/aclocal %changelog -* Mon Jun 12 2006 Karsten Hopp 1.7.9-7 -- filter dependencies -- buildrequire texinfo for self checks - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Mar 01 2005 Karsten Hopp 1.7.9-6 -- pdfoutput seems to be set to 0 by other tex* stuff, this - breaks txinfo16 selfcheck as is now produces pdf files instead - of dvi. Added workaround - * Tue Sep 28 2004 Warren Togami - 1.7.9-5 - trim docs --- automake-1.7.9-dvi.patch DELETED --- --- filter-provides-automake.sh DELETED --- --- filter-requires-automake.sh DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 17 21:42:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 16:42:17 -0500 Subject: rpms/libXfont/devel built-in-scalable.patch, NONE, 1.1 libXfont.spec, 1.29, 1.30 Message-ID: <200701172142.l0HLgHVI008589@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/libXfont/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8573 Modified Files: libXfont.spec Added Files: built-in-scalable.patch Log Message: * Wed Jan 17 2007 Kristian H??gsberg 1.2.6-2 - Add built-in-scalable.patch to prevent crash when trying to scale built-in bitmap fonts. built-in-scalable.patch: include/X11/fonts/bitmap.h | 0 src/bitmap/bitscale.c | 0 src/builtins/render.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) --- NEW FILE built-in-scalable.patch --- diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c diff --git a/src/builtins/render.c b/src/builtins/render.c index 39a8f07..6599e0b 100644 --- a/src/builtins/render.c +++ b/src/builtins/render.c @@ -97,9 +97,38 @@ BuiltinGetInfoBitmap (fpe, pFontInfo, entry, fileName) return ret; } +static int +BuiltinOpenScalable (FontPathElementPtr fpe, + FontPtr *pFont, + int flags, + FontEntryPtr entry, + char *fileName, + FontScalablePtr vals, + fsBitmapFormat format, + fsBitmapFormatMask fmask, + FontPtr non_cachable_font) /* We don't do licensing */ +{ + return BadFontName; +} + +static int +BitmapGetInfoScalable (FontPathElementPtr fpe, + FontInfoPtr pFontInfo, + FontEntryPtr entry, + FontNamePtr fontName, + char *fileName, + FontScalablePtr vals) +{ + return BadFontName; +} + static FontRendererRec renderers[] = { ".builtin", 8, - BuiltinOpenBitmap, 0, BuiltinGetInfoBitmap, 0, 0 + BuiltinOpenBitmap, + BuiltinOpenScalable, + BuiltinGetInfoBitmap, + BitmapGetInfoScalable, + 0 }; #define numRenderers (sizeof renderers / sizeof renderers[0]) Index: libXfont.spec =================================================================== RCS file: /cvs/dist/rpms/libXfont/devel/libXfont.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- libXfont.spec 6 Jan 2007 03:57:24 -0000 1.29 +++ libXfont.spec 17 Jan 2007 21:42:15 -0000 1.30 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXfont runtime library Name: libXfont Version: 1.2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -9,6 +9,7 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 Patch0: libXfont-1.2.3-namespace-pollution.patch +Patch1: built-in-scalable.patch BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros @@ -40,6 +41,7 @@ %prep %setup -q #%patch0 -p1 -b .hidden +%patch1 -p1 -b built-in-scalable.patch # Disable static library creation by default. %define with_static 0 @@ -100,6 +102,10 @@ %{_libdir}/pkgconfig/xfont.pc %changelog +* Wed Jan 17 2007 Kristian H??gsberg 1.2.6-2 +- Add built-in-scalable.patch to prevent crash when trying to scale + built-in bitmap fonts. + * Fri Jan 05 2007 Adam Jackson 1.2.6-1 - Update to 1.2.6 From fedora-cvs-commits at redhat.com Wed Jan 17 21:53:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 16:53:13 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.43, 1.44 pykickstart.spec, 1.47, 1.48 sources, 1.47, 1.48 Message-ID: <200701172153.l0HLrD56029228@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29212 Modified Files: .cvsignore pykickstart.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 16 Jan 2007 19:29:52 -0000 1.43 +++ .cvsignore 17 Jan 2007 21:53:11 -0000 1.44 @@ -5,3 +5,4 @@ pykickstart-0.42.tar.gz pykickstart-0.43.tar.gz pykickstart-0.90.tar.gz +pykickstart-0.91.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- pykickstart.spec 16 Jan 2007 19:29:52 -0000 1.47 +++ pykickstart.spec 17 Jan 2007 21:53:11 -0000 1.48 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.90 +Version: 0.91 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,9 @@ /usr/share/locale/*/*/* %changelog +* Wed Jan 17 2007 Chris Lumens - 0.91-1 +- Add a method to read kickstart files from strings. + * Tue Jan 16 2007 Chris Lumens - 0.90-1 - Support multiple versions of kickstart syntax from one code base (#189348). Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 16 Jan 2007 19:29:52 -0000 1.47 +++ sources 17 Jan 2007 21:53:11 -0000 1.48 @@ -1 +1 @@ -d3ddde639a100ed43422b0aa12bc595f pykickstart-0.90.tar.gz +9986e2996da9b336e02be961153bd156 pykickstart-0.91.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 18 00:54:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 19:54:24 -0500 Subject: rpms/freetype/devel .cvsignore, 1.12, 1.13 freetype.spec, 1.46, 1.47 sources, 1.12, 1.13 freetype-2.2.1-fix-get-orientation.patch, 1.1, NONE freetype-2.2.1-ttcmap.patch, 1.1, NONE freetype-2.2.1-zero-item-size.patch, 1.1, NONE freetype-composite.patch, 1.1, NONE freetype-more-composite.patch, 1.1, NONE Message-ID: <200701180054.l0I0sNQR013973@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/freetype/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13842 Modified Files: .cvsignore freetype.spec sources Removed Files: freetype-2.2.1-fix-get-orientation.patch freetype-2.2.1-ttcmap.patch freetype-2.2.1-zero-item-size.patch freetype-composite.patch freetype-more-composite.patch Log Message: * Wed Jan 17 2007 Behdad Esfahbod 2.3.0-1 - Update to 2.3.0. - Drop upstream patches. - Drop -fno-strict-aliasing, it should just work. - Fix typo in ftconfig.h generation. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/freetype/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 8 Jul 2006 01:07:01 -0000 1.12 +++ .cvsignore 18 Jan 2007 00:54:21 -0000 1.13 @@ -1,3 +1,3 @@ -freetype-2.2.1.tar.bz2 -ft2demos-2.2.1.tar.bz2 -freetype-doc-2.2.1.tar.bz2 +freetype-2.3.0.tar.bz2 +ft2demos-2.3.0.tar.bz2 +freetype-doc-2.3.0.tar.bz2 Index: freetype.spec =================================================================== RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- freetype.spec 9 Jan 2007 21:32:17 -0000 1.46 +++ freetype.spec 18 Jan 2007 00:54:21 -0000 1.47 @@ -6,8 +6,8 @@ Summary: A free and portable font rendering engine Name: freetype -Version: 2.2.1 -Release: 16%{?dist} +Version: 2.3.0 +Release: 1%{?dist} License: BSD/GPL dual license Group: System Environment/Libraries URL: http://www.freetype.org @@ -29,11 +29,6 @@ Patch89: freetype-2.2.1-memcpy-fix.patch # Upstream patches -Patch100: freetype-composite.patch -Patch101: freetype-more-composite.patch -Patch102: freetype-2.2.1-zero-item-size.patch -Patch103: freetype-2.2.1-fix-get-orientation.patch -Patch104: freetype-2.2.1-ttcmap.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -91,27 +86,13 @@ %patch88 -p1 -b .multilib %patch89 -p1 -b .memcpy -%patch100 -p1 -b .composite -%patch101 -p1 -b .more-composite -%patch102 -p1 -b .zero-item-size -%patch103 -p0 -b .fix-get-orientation -%patch104 -p1 -b .ttcmap - %build -# Work around code generation problem with strict-aliasing -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118021 -# -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -# Build Freetype 2 -{ - %configure --disable-static - make X11_PATH=/usr %{?_smp_mflags} -} +%configure --disable-static +make X11_PATH=/usr %{?_smp_mflags} %if %{with_xfree86} -# Build freetype 2 demos +# Build demos { pushd ft2demos-%{version} make X11_PATH=/usr TOP_DIR=".." @@ -123,7 +104,6 @@ rm -rf $RPM_BUILD_ROOT -# Install Freetype 2 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale { @@ -132,7 +112,6 @@ done } %if %{with_xfree86} -# Install freetype 2 demos { for ftdemo in ftgamma ftmulti ftstring fttimer ftview ; do builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} @@ -151,7 +130,7 @@ $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h cat >$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h < @@ -218,6 +197,12 @@ %{_libdir}/pkgconfig/ %changelog +* Wed Jan 17 2007 Behdad Esfahbod 2.3.0-1 +- Update to 2.3.0. +- Drop upstream patches. +- Drop -fno-strict-aliasing, it should just work. +- Fix typo in ftconfig.h generation. + * Tue Jan 09 2007 Behdad Esfahbod 2.2.1-16 - Backport binary-search fixes from HEAD - Add freetype-2.2.1-ttcmap.patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/freetype/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 8 Jul 2006 01:07:01 -0000 1.12 +++ sources 18 Jan 2007 00:54:21 -0000 1.13 @@ -1,3 +1,3 @@ -5b2f827082c544392a7701f7423f0781 freetype-2.2.1.tar.bz2 -64f5fa4425cd8241b130c0be35ba6760 ft2demos-2.2.1.tar.bz2 -27bcd2540702afe6753c9fd74670f617 freetype-doc-2.2.1.tar.bz2 +5b331456e0357e90d57cab5943dbe560 freetype-2.3.0.tar.bz2 +adfb4ef31ff7d3910bbdd226769cc170 ft2demos-2.3.0.tar.bz2 +25b57ea93170376377ee9154adc66f63 freetype-doc-2.3.0.tar.bz2 --- freetype-2.2.1-fix-get-orientation.patch DELETED --- --- freetype-2.2.1-ttcmap.patch DELETED --- --- freetype-2.2.1-zero-item-size.patch DELETED --- --- freetype-composite.patch DELETED --- --- freetype-more-composite.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 18 01:43:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 20:43:55 -0500 Subject: rpms/evolution-data-server/FC-6 evolution-data-server.spec, 1.134.2.1, 1.134.2.2 Message-ID: <200701180143.l0I1htMj026498@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/evolution-data-server/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26482 Modified Files: Tag: private-e-d-s-sanity-1_8_2-1-branch evolution-data-server.spec Log Message: Update for 1.8.2-2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/evolution-data-server.spec,v retrieving revision 1.134.2.1 retrieving revision 1.134.2.2 diff -u -r1.134.2.1 -r1.134.2.2 --- evolution-data-server.spec 28 Nov 2006 16:05:10 -0000 1.134.2.1 +++ evolution-data-server.spec 18 Jan 2007 01:43:52 -0000 1.134.2.2 @@ -25,7 +25,7 @@ Name: evolution-data-server Version: 1.8.2 -Release: 1%{?dist}.dwmw2.1 +Release: 2%{?dist}.dwmw2.1 License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -47,12 +47,15 @@ # RH bug #202309 Patch15: evolution-data-server-1.7.91-maybe-fix-crash.patch -# RH bug #198935 / Gnome.org bug #348888 +# RH bug #198935 / GNOME bug #348888 Patch16: evolution-data-server-1.8.0-emsgport.patch # RH bug #203915 Patch17: evolution-data-server-1.8.0-fix-camel-malloc.patch +# RH bug #208724 / GNOME bug #384183 +Patch18: evolution-data-server-1.8.2-msgport-fix.patch + Patch100: evolution-data-server-1.2.0-vcrap.patch Patch101: evolution-data-server-1.5.91-check-only-active-folders.patch @@ -141,6 +144,7 @@ %patch15 -p1 -b .maybe-fix-crash %patch16 -p1 -b .emsgport %patch17 -p1 -b .fix-camel-malloc +%patch18 -p1 -b .msgport-fix %patch100 -p1 -b .vcrap %patch101 -p1 -b .checksub @@ -361,6 +365,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Wed Jan 10 2007 Matthew Barnes - 1.8.2-2.fc6 +- Add patch for RH bug #208724 (hang on send/receive). + * Mon Nov 20 2006 Matthew Barnes - 1.8.2-1.fc6 - Update to 1.8.2 - Remove patch for RH bug #213706 (fixed upstream). From fedora-cvs-commits at redhat.com Thu Jan 18 02:08:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 17 Jan 2007 21:08:56 -0500 Subject: rpms/metacity/devel .cvsignore, 1.50, 1.51 metacity.spec, 1.104, 1.105 sources, 1.50, 1.51 Message-ID: <200701180208.l0I28uCZ014936@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14916 Modified Files: .cvsignore metacity.spec sources Log Message: 2.17.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 7 Nov 2006 03:33:35 -0000 1.50 +++ .cvsignore 18 Jan 2007 02:08:53 -0000 1.51 @@ -1 +1 @@ -metacity-2.17.2.tar.bz2 +metacity-2.17.5.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- metacity.spec 7 Nov 2006 03:33:35 -0000 1.104 +++ metacity.spec 18 Jan 2007 02:08:53 -0000 1.105 @@ -1,6 +1,6 @@ %define gettext_package metacity -%define metacity_version 2.17.2 +%define metacity_version 2.17.5 %define metacity_filename metacity-%{metacity_version} @@ -12,7 +12,7 @@ Source0: %{metacity_filename}.tar.bz2 License: GPL Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.2.0 BuildRequires: pango-devel >= 1.2.0 BuildRequires: fontconfig-devel @@ -117,6 +117,9 @@ %{_mandir}/man1/* %changelog +* Wed Jan 17 2007 Matthias Clasen - 2.17.5-1 +- Update to 2.17.5 + * Mon Nov 6 2006 Matthias Clasen - 2.17.2-1 - Update to 2.17.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 7 Nov 2006 03:33:35 -0000 1.50 +++ sources 18 Jan 2007 02:08:53 -0000 1.51 @@ -1 +1 @@ -653edb93201940de5a947b362fe574f5 metacity-2.17.2.tar.bz2 +0657f5471f82c7e9b434e54f642cf565 metacity-2.17.5.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 05:05:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 00:05:34 -0500 Subject: rpms/fonts-indic/devel .cvsignore, 1.16, 1.17 fonts-indic.spec, 1.21, 1.22 sources, 1.19, 1.20 Message-ID: <200701180505.l0I55Yww003195@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-indic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3109 Modified Files: .cvsignore fonts-indic.spec sources Log Message: - Resolved Bugs from Parag Nemade - Bug 222407: [or_IN] [fonts-indic] - One GSUB Conjunct is not appearing with its correct shape - Bug 206434: [ml_IN] Digits are appearing in English instead of malayalam - Priority C - Bug 215894: Relative height of 0x0901 (and 0x0902) on 0x0915 is different than other devnagari characters (hi_IN, mr_IN) - Bug 222408: [te_IN] [fonts-indic] - Danda and Double Danda to be implemented with 0964 && 0965 - Bug 222409: [kn_IN] [fonts-indic] - Danda and Double Danda to be implemented with 0964 && 0965 - Bug 221384: [kn_IN] - shape of ra (U+0CB0) is not corret in combined character (below base) - Added AUTHORS,README to %%doc Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 12 Jan 2007 05:45:27 -0000 1.16 +++ .cvsignore 18 Jan 2007 05:05:31 -0000 1.17 @@ -13,3 +13,4 @@ fonts-indic-2.0.11.tar.gz fonts-indic-2.0.12.tar.gz fonts-indic-2.0.13.tar.gz +fonts-indic-2.1.2.tar.gz Index: fonts-indic.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/fonts-indic.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fonts-indic.spec 12 Jan 2007 05:45:27 -0000 1.21 +++ fonts-indic.spec 18 Jan 2007 05:05:31 -0000 1.22 @@ -3,7 +3,7 @@ %define langlist "bengali hindi gujarati tamil punjabi kannada malayalam oriya telugu" Name: fonts-indic -Version: 2.0.13 +Version: 2.1.2 Release: 1%{?dist} License: GPL Group: User Interface/X @@ -187,7 +187,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/bengali -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/bengali/fonts.cache-1 %{xfontdir}/bengali/*ttf @@ -195,7 +195,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/gujarati -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/gujarati/fonts.cache-1 %{xfontdir}/gujarati/*ttf @@ -203,7 +203,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/hindi -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/hindi/fonts.cache-1 %{xfontdir}/hindi/*ttf @@ -211,7 +211,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/punjabi -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/punjabi/fonts.cache-1 %{xfontdir}/punjabi/*ttf @@ -219,7 +219,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/tamil -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/tamil/fonts.cache-1 %{xfontdir}/tamil/*ttf @@ -227,7 +227,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/kannada -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/kannada/fonts.cache-1 %{xfontdir}/kannada/*ttf @@ -235,7 +235,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/malayalam -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/malayalam/fonts.cache-1 %{xfontdir}/malayalam/*ttf @@ -243,7 +243,7 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/oriya -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/oriya/fonts.cache-1 %{xfontdir}/oriya/*ttf @@ -251,11 +251,21 @@ %defattr(-, root, root) %dir %{xfontdir} %dir %{xfontdir}/telugu -%doc COPYING +%doc COPYING README AUTHORS %ghost %{xfontdir}/telugu/fonts.cache-1 %{xfontdir}/telugu/*ttf %changelog +* Tue Jan 18 2007 Parag Nemade - 2.1.2-1 +- Resolved Bugs from Parag Nemade +- Bug 222407: [or_IN] [fonts-indic] - One GSUB Conjunct is not appearing with its correct shape +- Bug 206434: [ml_IN] Digits are appearing in English instead of malayalam - Priority C +- Bug 215894: Relative height of 0x0901 (and 0x0902) on 0x0915 is different than other devnagari characters (hi_IN, mr_IN) +- Bug 222408: [te_IN] [fonts-indic] - Danda and Double Danda to be implemented with 0964 && 0965 +- Bug 222409: [kn_IN] [fonts-indic] - Danda and Double Danda to be implemented with 0964 && 0965 +- Bug 221384: [kn_IN] - shape of ra (U+0CB0) is not corret in combined character (below base) +- Added AUTHORS,README to %%doc + * Fri Jan 12 2007 Parag Nemade - 2.0.13-1 - Resolves: RH#220880 for [or_IN], RH#222406 for [ml_IN] (Parag Nemade) Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 12 Jan 2007 05:45:27 -0000 1.19 +++ sources 18 Jan 2007 05:05:31 -0000 1.20 @@ -1 +1 @@ -fa8f49ea212360cd87f9a1b9d1749de8 fonts-indic-2.0.13.tar.gz +114ba4984dbe0d3727ab49346551b5c3 fonts-indic-2.1.2.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 18 05:17:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 00:17:22 -0500 Subject: rpms/fonts-indic/devel sources,1.20,1.21 Message-ID: <200701180517.l0I5HMGj008238@cvs.devel.redhat.com> Author: pnemade Update of /cvs/dist/rpms/fonts-indic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7074 Modified Files: sources Log Message: - Modified tarball Index: sources =================================================================== RCS file: /cvs/dist/rpms/fonts-indic/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 18 Jan 2007 05:05:31 -0000 1.20 +++ sources 18 Jan 2007 05:17:19 -0000 1.21 @@ -1 +1 @@ -114ba4984dbe0d3727ab49346551b5c3 fonts-indic-2.1.2.tar.gz +68433fe4b18edda39373d3c42226d6eb fonts-indic-2.1.2.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 18 05:21:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 00:21:39 -0500 Subject: rpms/pango/devel .cvsignore, 1.48, 1.49 pango.spec, 1.101, 1.102 sources, 1.48, 1.49 Message-ID: <200701180521.l0I5Ldta029357@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29254 Modified Files: .cvsignore pango.spec sources Log Message: * Wed Jan 17 2007 Behdad Esfahbod - 1.15.4-1 - Update to 1.15.4 - [Build]Require libthai[-devel] - Require pkgconfig in -devel - Remove "static libs" from -devel description, since we don't ship them. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 9 Jan 2007 20:55:31 -0000 1.48 +++ .cvsignore 18 Jan 2007 05:21:30 -0000 1.49 @@ -1 +1 @@ -pango-1.15.3.tar.bz2 +pango-1.15.4.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- pango.spec 12 Jan 2007 21:27:06 -0000 1.101 +++ pango.spec 18 Jan 2007 05:21:30 -0000 1.102 @@ -4,11 +4,12 @@ %define freetype_version 2.1.3-3 %define fontconfig_version 2.0 %define cairo_version 1.2.2 +%define libthai_version 0.1.7 Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.15.3 -Release: 5%{?dist} +Version: 1.15.4 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -21,6 +22,7 @@ Requires(pre): libXrender, libX11, libXext, libXft Requires: freetype >= %{freetype_version} Requires: cairo >= %{cairo_version} +Requires: libthai >= %{libthai_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pkgconfig >= %{pkgconfig_version} BuildRequires: freetype-devel >= %{freetype_version} @@ -31,6 +33,7 @@ BuildRequires: libXft-devel BuildRequires: libXt-devel BuildRequires: cairo-devel >= %{cairo_version} +BuildRequires: libthai-devel >= %{libthai_version} Obsoletes: pango-gtkbeta, fribidi-gtkbeta Patch1: pango-slighthint.patch @@ -53,11 +56,12 @@ Requires: freetype-devel >= %{freetype_version} Requires: fontconfig-devel >= %{fontconfig_version} Requires: cairo-devel >= %{cairo_version} +Requires: pkgconfig Obsoletes: fribidi-gtkbeta-devel, pango-gtkbeta-devel %description devel -The pango-devel package includes the static libraries, header files, -and developer docs for the pango package. +The pango-devel package includes the header files and developer docs +for the pango package. Install pango-devel if you want to develop programs which will use pango. @@ -217,6 +221,12 @@ %changelog +* Wed Jan 17 2007 Behdad Esfahbod - 1.15.4-1 +- Update to 1.15.4 +- [Build]Require libthai[-devel] +- Require pkgconfig in -devel +- Remove "static libs" from -devel description, since we don't ship them. + * Fri Jan 12 2007 Behdad Esfahbod - 1.15.3-5 - Require pango = %{version}-%{release} in devel (previously didn't have releaes). Index: sources =================================================================== RCS file: /cvs/dist/rpms/pango/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 9 Jan 2007 20:55:31 -0000 1.48 +++ sources 18 Jan 2007 05:21:30 -0000 1.49 @@ -1 +1 @@ -f77ff87808d8e54e15a23913a13be337 pango-1.15.3.tar.bz2 +02c8ea6d3851e44520b131f509bea9ff pango-1.15.4.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 05:36:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 00:36:25 -0500 Subject: rpms/pango/devel pango-1.15.4-slighthint.patch, NONE, 1.1 pango.spec, 1.102, 1.103 pango-slighthint.patch, 1.2, NONE Message-ID: <200701180536.l0I5aPuJ005758@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5639 Modified Files: pango.spec Added Files: pango-1.15.4-slighthint.patch Removed Files: pango-slighthint.patch Log Message: * Wed Jan 17 2007 Behdad Esfahbod - 1.15.4-2 - Update slighthint patch to apply. pango-1.15.4-slighthint.patch: pangoft2.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) --- NEW FILE pango-1.15.4-slighthint.patch --- --- pango-1.15.4/pango/pangoft2.c.orig 2007-01-16 15:18:33.000000000 -0500 +++ pango-1.15.4/pango/pangoft2.c 2007-01-18 00:33:58.000000000 -0500 @@ -173,6 +173,7 @@ FcPattern *pattern; FcChar8 *filename; FcBool antialias, hinting, autohint; + int hintstyle; int id; if (G_UNLIKELY (!PANGO_FT2_IS_FONT (font))) @@ -206,8 +207,21 @@ FC_HINTING, 0, &hinting) != FcResultMatch) hinting = FcTrue; - if (!hinting) - ft2font->load_flags |= FT_LOAD_NO_HINTING; + if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) + hintstyle = FC_HINT_FULL; + + if (!hinting || hintstyle == FC_HINT_NONE) + ft2font->load_flags |= FT_LOAD_NO_HINTING; + + switch (hintstyle) { + case FC_HINT_SLIGHT: + case FC_HINT_MEDIUM: + ft2font->load_flags |= FT_LOAD_TARGET_LIGHT; + break; + default: + ft2font->load_flags |= FT_LOAD_TARGET_NORMAL; + break; + } /* force autohinting if requested */ if (FcPatternGetBool (pattern, Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- pango.spec 18 Jan 2007 05:21:30 -0000 1.102 +++ pango.spec 18 Jan 2007 05:36:17 -0000 1.103 @@ -9,7 +9,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.15.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -36,7 +36,7 @@ BuildRequires: libthai-devel >= %{libthai_version} Obsoletes: pango-gtkbeta, fribidi-gtkbeta -Patch1: pango-slighthint.patch +Patch1: pango-1.15.4-slighthint.patch # Look for pango.modules in an arch-specific directory Patch2: pango-1.2.5-lib64.patch @@ -221,6 +221,9 @@ %changelog +* Wed Jan 17 2007 Behdad Esfahbod - 1.15.4-2 +- Update slighthint patch to apply. + * Wed Jan 17 2007 Behdad Esfahbod - 1.15.4-1 - Update to 1.15.4 - [Build]Require libthai[-devel] --- pango-slighthint.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 18 06:32:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 01:32:04 -0500 Subject: rpms/pango/devel pango.spec,1.103,1.104 Message-ID: <200701180632.l0I6W4Ze031764@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31506 Modified Files: pango.spec Log Message: * Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-3 - s/HELLO.utf8/HELLO.txt/ to match upstream. Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- pango.spec 18 Jan 2007 05:36:17 -0000 1.103 +++ pango.spec 18 Jan 2007 06:32:01 -0000 1.104 @@ -9,7 +9,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.15.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -201,7 +201,7 @@ %files -f modules.files %defattr(-, root, root) %doc README AUTHORS COPYING ChangeLog -%doc examples/HELLO.utf8 +%doc examples/HELLO.txt %{_libdir}/libpango*-*.so.* %{_bindir}/pango-querymodules* %{_libdir}/pango @@ -221,6 +221,9 @@ %changelog +* Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-3 +- s/HELLO.utf8/HELLO.txt/ to match upstream. + * Wed Jan 17 2007 Behdad Esfahbod - 1.15.4-2 - Update slighthint patch to apply. From fedora-cvs-commits at redhat.com Thu Jan 18 06:47:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 01:47:43 -0500 Subject: rpms/pango/devel pango.spec,1.104,1.105 Message-ID: <200701180647.l0I6lh84031352@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31232 Modified Files: pango.spec Log Message: * Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-4 - Bump again. I accidentally tagged 1.15.3-4 as 1.15.4-3 previously :(. Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- pango.spec 18 Jan 2007 06:32:01 -0000 1.104 +++ pango.spec 18 Jan 2007 06:47:40 -0000 1.105 @@ -9,7 +9,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.15.4 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -221,6 +221,9 @@ %changelog +* Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-4 +- Bump again. I accidentally tagged 1.15.3-4 as 1.15.4-3 previously :(. + * Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-3 - s/HELLO.utf8/HELLO.txt/ to match upstream. From fedora-cvs-commits at redhat.com Thu Jan 18 06:58:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 01:58:43 -0500 Subject: rpms/pango/devel pango.spec,1.105,1.106 Message-ID: <200701180658.l0I6whPm007695@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7583 Modified Files: pango.spec Log Message: * Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-5 - Again... HELLO.txt is moved. Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- pango.spec 18 Jan 2007 06:47:40 -0000 1.105 +++ pango.spec 18 Jan 2007 06:58:41 -0000 1.106 @@ -9,7 +9,7 @@ Summary: System for layout and rendering of internationalized text Name: pango Version: 1.15.4 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -201,7 +201,7 @@ %files -f modules.files %defattr(-, root, root) %doc README AUTHORS COPYING ChangeLog -%doc examples/HELLO.txt +%doc pango-view/HELLO.txt %{_libdir}/libpango*-*.so.* %{_bindir}/pango-querymodules* %{_libdir}/pango @@ -221,6 +221,9 @@ %changelog +* Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-5 +- Again... HELLO.txt is moved. + * Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-4 - Bump again. I accidentally tagged 1.15.3-4 as 1.15.4-3 previously :(. From fedora-cvs-commits at redhat.com Thu Jan 18 08:57:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 03:57:43 -0500 Subject: rpms/vsftpd/devel vsftpd.spec, 1.57, 1.58 vsftpd-2.0.1-signal.patch, 1.1, NONE Message-ID: <200701180857.l0I8vhbC015812@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/vsftpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15763 Modified Files: vsftpd.spec Removed Files: vsftpd-2.0.1-signal.patch Log Message: add dist tag, remove unused patch Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- vsftpd.spec 17 Jan 2007 12:53:53 -0000 1.57 +++ vsftpd.spec 18 Jan 2007 08:57:41 -0000 1.58 @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 11 +Release: 12%{?dist} License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -150,6 +150,9 @@ /var/ftp %changelog +* Thu Jan 18 2007 Radek Vok??l - 2.0.5-12 +- add dist tag + * Wed Jan 17 2007 Maros Barabas - 2.0.5-11 - add errno EACCES to not die by vsf_sysutil_bind - Resolves #198677 --- vsftpd-2.0.1-signal.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 18 09:06:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 04:06:55 -0500 Subject: rpms/dejavu-lgc-fonts/devel Makefile,1.2,1.3 Message-ID: <200701180906.l0I96tt3023387@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23267 Modified Files: Makefile Log Message: Revert accidental change. Index: Makefile =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 16 Jan 2007 18:56:57 -0000 1.2 +++ Makefile 18 Jan 2007 09:06:53 -0000 1.3 @@ -1,7 +1,6 @@ # Makefile for source rpm: dejavu-lgc-fonts # $Id$ -NAME := libthai -SPECFILE = libthai.spec -#$(firstword $(wildcard *.spec)) +NAME := dejavu-lgc-fonts +SPECFILE = $(firstword $(wildcard *.spec)) include ../common/Makefile.common From fedora-cvs-commits at redhat.com Thu Jan 18 09:07:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 04:07:09 -0500 Subject: rpms/vsftpd/devel vsftpd.spec,1.58,1.59 Message-ID: <200701180907.l0I979v4023580@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/vsftpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23531 Modified Files: vsftpd.spec Log Message: - add buildrequires tcp_wrappers-devel Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- vsftpd.spec 18 Jan 2007 08:57:41 -0000 1.58 +++ vsftpd.spec 18 Jan 2007 09:07:07 -0000 1.59 @@ -42,7 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} -BuildPrereq: tcp_wrappers +BuildPrereq: tcp_wrappers-devel %endif BuildRequires: pam-devel Requires: pam @@ -152,6 +152,7 @@ %changelog * Thu Jan 18 2007 Radek Vok??l - 2.0.5-12 - add dist tag +- add buildrequires tcp_wrappers-devel * Wed Jan 17 2007 Maros Barabas - 2.0.5-11 - add errno EACCES to not die by vsf_sysutil_bind From fedora-cvs-commits at redhat.com Thu Jan 18 11:31:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 06:31:23 -0500 Subject: rpms/ed/devel ed.spec,1.20,1.21 Message-ID: <200701181131.l0IBVNML003027@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/ed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2974 Modified Files: ed.spec Log Message: - fix man page permissions (#222581) Index: ed.spec =================================================================== RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ed.spec 13 Nov 2006 12:42:31 -0000 1.20 +++ ed.spec 18 Jan 2007 11:31:20 -0000 1.21 @@ -1,7 +1,7 @@ Summary: The GNU line editor. Name: ed Version: 0.3 -Release: 1 +Release: 2 License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2 @@ -53,9 +53,12 @@ %doc ChangeLog NEWS README TODO AUTHORS COPYING /bin/* %{_infodir}/ed.info.gz -%{_mandir}/*/* +%attr(0644,root,root) %{_mandir}/*/* %changelog +* Thu Jan 18 2007 Karsten Hopp 0.3-2 +- fix man page permissions (#222581) + * Mon Nov 13 2006 Karsten Hopp 0.3-1 - update to ed-0.3 From fedora-cvs-commits at redhat.com Thu Jan 18 11:57:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 06:57:47 -0500 Subject: rpms/ed/FC-6 ed.spec,1.18,1.19 sources,1.2,1.3 Message-ID: <200701181157.l0IBvlYY020222@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/ed/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20198 Modified Files: ed.spec sources Log Message: - rebuild for FC-6, fixes CVE-2006-6939 - update to ed-0.3 Index: ed.spec =================================================================== RCS file: /cvs/dist/rpms/ed/FC-6/ed.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ed.spec 12 Jul 2006 05:43:23 -0000 1.18 +++ ed.spec 18 Jan 2007 11:57:45 -0000 1.19 @@ -1,14 +1,11 @@ Summary: The GNU line editor. Name: ed -Version: 0.2 -Release: 38.2.2 +Version: 0.3 +Release: 0%{?dist} License: GPL Group: Applications/Text -Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz +Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2 URL: http://www.gnu.org/software/ed/ -Patch0: ed-mkstemp.patch -Patch1: ed-0.2-autoconf253.patch -Patch2: ed-0.2-regex.patch Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-root BuildRequires: autoconf @@ -25,22 +22,20 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -b .ac -%patch2 -p1 -b .regex rm -f stamp-h.in %build -chmod 755 configure -autoconf %configure --exec-prefix=/ make %{?_smp_mflags} %install +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 %makeinstall bindir=$RPM_BUILD_ROOT/bin \ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 +rm -f $RPM_BUILD_ROOT%{_infodir}/dir* gzip -9qnf $RPM_BUILD_ROOT%{_infodir}/* +install doc/ed.1 $RPM_BUILD_ROOT%{_mandir}/man1 %post /sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." @@ -55,12 +50,21 @@ %files %defattr(-,root,root) -%doc ChangeLog NEWS POSIX README THANKS TODO +%doc ChangeLog NEWS README TODO AUTHORS COPYING /bin/* %{_infodir}/ed.info.gz -%{_mandir}/*/* +%attr(0644,root,root) %{_mandir}/*/* %changelog +* Thu Jan 18 2007 Karsten Hopp 0.3-0.fc6 +- rebuild for FC-6, fixes CVE-2006-6939 + +* Thu Jan 18 2007 Karsten Hopp 0.3-2 +- fix man page permissions (#222581) + +* Mon Nov 13 2006 Karsten Hopp 0.3-1 +- update to ed-0.3 + * Wed Jul 12 2006 Jesse Keating - 0.2-38.2.2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/ed/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 04:26:24 -0000 1.2 +++ sources 18 Jan 2007 11:57:45 -0000 1.3 @@ -1 +1 @@ -ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz +56950c74e0239556296310a01c83ae7d ed-0.3.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 11:59:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 06:59:00 -0500 Subject: rpms/ed/FC-5 ed.spec,1.17,1.18 sources,1.2,1.3 Message-ID: <200701181159.l0IBx0Ks020325@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/ed/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20310 Modified Files: ed.spec sources Log Message: - rebuild for FC-5, fixes CVE-2006-6939 - update to ed-0.3 Index: ed.spec =================================================================== RCS file: /cvs/dist/rpms/ed/FC-5/ed.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ed.spec 11 Feb 2006 02:32:58 -0000 1.17 +++ ed.spec 18 Jan 2007 11:58:58 -0000 1.18 @@ -1,14 +1,11 @@ Summary: The GNU line editor. Name: ed -Version: 0.2 -Release: 38.2.1 +Version: 0.3 +Release: 0%{?dist} License: GPL Group: Applications/Text -Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz +Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2 URL: http://www.gnu.org/software/ed/ -Patch0: ed-mkstemp.patch -Patch1: ed-0.2-autoconf253.patch -Patch2: ed-0.2-regex.patch Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-root BuildRequires: autoconf @@ -25,22 +22,20 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -b .ac -%patch2 -p1 -b .regex rm -f stamp-h.in %build -chmod 755 configure -autoconf %configure --exec-prefix=/ make %{?_smp_mflags} %install +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 %makeinstall bindir=$RPM_BUILD_ROOT/bin \ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 +rm -f $RPM_BUILD_ROOT%{_infodir}/dir* gzip -9qnf $RPM_BUILD_ROOT%{_infodir}/* +install doc/ed.1 $RPM_BUILD_ROOT%{_mandir}/man1 %post /sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." @@ -55,12 +50,24 @@ %files %defattr(-,root,root) -%doc ChangeLog NEWS POSIX README THANKS TODO +%doc ChangeLog NEWS README TODO AUTHORS COPYING /bin/* %{_infodir}/ed.info.gz -%{_mandir}/*/* +%attr(0644,root,root) %{_mandir}/*/* %changelog +* Thu Jan 18 2007 Karsten Hopp 0.3-0.fc6 +- rebuild for FC-6, fixes CVE-2006-6939 + +* Thu Jan 18 2007 Karsten Hopp 0.3-2 +- fix man page permissions (#222581) + +* Mon Nov 13 2006 Karsten Hopp 0.3-1 +- update to ed-0.3 + +* Wed Jul 12 2006 Jesse Keating - 0.2-38.2.2 +- rebuild + * Fri Feb 10 2006 Jesse Keating - 0.2-38.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ed/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 04:26:24 -0000 1.2 +++ sources 18 Jan 2007 11:58:58 -0000 1.3 @@ -1 +1 @@ -ddd57463774cae9b50e70cd51221281b ed-0.2.tar.gz +56950c74e0239556296310a01c83ae7d ed-0.3.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 12:42:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 07:42:12 -0500 Subject: rpms/ghostscript/FC-6 ghostscript-gxcht-64bit-crash.patch, NONE, 1.1 ghostscript.spec, 1.127, 1.128 Message-ID: <200701181242.l0ICgCHI030348@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30277 Modified Files: ghostscript.spec Added Files: ghostscript-gxcht-64bit-crash.patch Log Message: * Thu Jan 18 2007 Tim Waugh - Backported gxcht 64bit crash fix from GPL trunk (bug #177763). - Resolves: rhbz#177763 ghostscript-gxcht-64bit-crash.patch: gxcht.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ghostscript-gxcht-64bit-crash.patch --- --- espgs-8.15.3/src/gxcht.c.gxcht-64bit-crash 2007-01-18 12:29:20.000000000 +0000 +++ espgs-8.15.3/src/gxcht.c 2007-01-18 12:29:36.000000000 +0000 @@ -1095,7 +1095,7 @@ ptc->xbits = ((tw - 1) & 7) + 1; ptc->tdata = btile->data; ptc->raster = btile->raster; - ptc->row = ptc->tdata + by * ptc->raster; + ptc->row = ptc->tdata + by * (int)ptc->raster; ptc->data = ptc->row + ptc->xoffset; ptc->bit_shift = ptc->xshift; if_debug6('h', "[h]plane %d: size=%d,%d shift=%d bx=%d by=%d\n", Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/FC-6/ghostscript.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- ghostscript.spec 12 Jan 2007 14:51:08 -0000 1.127 +++ ghostscript.spec 18 Jan 2007 12:42:10 -0000 1.128 @@ -19,6 +19,7 @@ Patch3: ghostscript-noopt.patch Patch4: ghostscript-big-cmap-post.patch Patch5: ghostscript-split-cidfnmap.patch +Patch6: ghostscript-gxcht-64bit-crash.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -87,6 +88,9 @@ # Support CIDFnmap inclusion from other files (bug #194592). %patch5 -p1 -b .split-cidfnmap +# Backported gxcht 64bit crash fix from GPL trunk (bug #177763). +%patch6 -p1 -b .gxcht-64bit-crash + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -242,6 +246,9 @@ %{_libdir}/libijs.*a %changelog +* Thu Jan 18 2007 Tim Waugh +- Backported gxcht 64bit crash fix from GPL trunk (bug #177763). + * Fri Jan 12 2007 Tim Waugh 8.15.3-2 - Own cjkv directory (bug #221380, bug #222375). From fedora-cvs-commits at redhat.com Thu Jan 18 12:55:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 07:55:03 -0500 Subject: rpms/sip/devel .cvsignore, 1.16, 1.17 sip.spec, 1.34, 1.35 sources, 1.16, 1.17 Message-ID: <200701181255.l0ICt3aO028046@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/sip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27966 Modified Files: .cvsignore sip.spec sources Log Message: 4.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sip/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 6 Nov 2006 16:44:41 -0000 1.16 +++ .cvsignore 18 Jan 2007 12:55:01 -0000 1.17 @@ -6,3 +6,4 @@ sip-4.4.3.tar.gz sip-4.4.5.tar.gz sip-4.5.tar.gz +sip-4.5.2.tar.gz Index: sip.spec =================================================================== RCS file: /cvs/dist/rpms/sip/devel/sip.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sip.spec 7 Dec 2006 16:21:25 -0000 1.34 +++ sip.spec 18 Jan 2007 12:55:01 -0000 1.35 @@ -1,13 +1,13 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define minor .2 -%define qtver 3.3.6 +%define qtver 3.3.7 %define qtpkg qt Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.5 -Release: 2 +Version: 4.5.2 +Release: 1 License: GPL Group: Development/Tools Url: http://www.riverbankcomputing.co.uk/ @@ -82,6 +82,9 @@ %{_includedir}/python?.?/* %changelog +* Thu Jan 18 2007 Than Ngo - 4.5.2-1 +- 4.5.2 + * Thu Dec 7 2006 Jeremy Katz - 4.5-2 - rebuild against python 2.5 - cleanups for python packaging guidelines Index: sources =================================================================== RCS file: /cvs/dist/rpms/sip/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 6 Nov 2006 16:44:41 -0000 1.16 +++ sources 18 Jan 2007 12:55:01 -0000 1.17 @@ -1 +1 @@ -8171a370e15b2bf7ed3a1b579c0e9ae1 sip-4.5.tar.gz +0fdb0cbdcbbe158009196437711eb8bd sip-4.5.2.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 18 13:02:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:02:02 -0500 Subject: rpms/PyQt/devel PyQt.spec,1.35,1.36 Message-ID: <200701181302.l0ID22hg000777@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/PyQt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv564 Modified Files: PyQt.spec Log Message: rebuild against sip-4.5.2 Index: PyQt.spec =================================================================== RCS file: /cvs/dist/rpms/PyQt/devel/PyQt.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- PyQt.spec 7 Dec 2006 18:29:06 -0000 1.35 +++ PyQt.spec 18 Jan 2007 13:02:00 -0000 1.36 @@ -3,12 +3,12 @@ %define qtversion 3.3.7 %define qtpkg qt -%define sip_version 4.5 +%define sip_version 4.5.2 Summary: Python bindings for Qt Name: PyQt Version: 3.17 -Release: 2 +Release: 3 License: GPL Group: Development/Languages Url: http://www.riverbankcomputing.co.uk/pyqt/ @@ -88,6 +88,9 @@ %doc examples/*.png examples/*.gif examples/*.bmp %changelog +* Thu Jan 18 2007 Than Ngo - 3.17-3 +- rebuilt + * Thu Dec 7 2006 Jeremy Katz - 3.17-2 - rebuild for python 2.5 From fedora-cvs-commits at redhat.com Thu Jan 18 13:16:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:16:51 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.127,1.128 Message-ID: <200701181316.l0IDGpNM012181@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12105 Modified Files: ghostscript.spec Log Message: * Thu Jan 18 2007 Tim Waugh - Backported gxcht 64bit crash fix from GPL trunk (bug #177763). - Resolves: rhbz#177763 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- ghostscript.spec 12 Jan 2007 14:52:16 -0000 1.127 +++ ghostscript.spec 18 Jan 2007 13:16:49 -0000 1.128 @@ -19,6 +19,7 @@ Patch3: ghostscript-noopt.patch Patch4: ghostscript-big-cmap-post.patch Patch5: ghostscript-split-cidfnmap.patch +Patch6: ghostscript-gxcht-64bit-crash.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -87,6 +88,9 @@ # Support CIDFnmap inclusion from other files (bug #194592). %patch5 -p1 -b .split-cidfnmap +# Backported gxcht 64bit crash fix from GPL trunk (bug #177763). +%patch6 -p1 -b .gxcht-64bit-crash + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -242,6 +246,9 @@ %{_libdir}/libijs.*a %changelog +* Thu Jan 18 2007 Tim Waugh +- Backported gxcht 64bit crash fix from GPL trunk (bug #177763). + * Fri Jan 12 2007 Tim Waugh 8.15.3-4 - Own cjkv directory (bug #221380, bug #222375). From fedora-cvs-commits at redhat.com Thu Jan 18 13:19:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:19:45 -0500 Subject: rpms/ghostscript/FC-6 ghostscript.spec,1.128,1.129 Message-ID: <200701181319.l0IDJj5H002201@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2137 Modified Files: ghostscript.spec Log Message: 8.15.3-3 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/FC-6/ghostscript.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- ghostscript.spec 18 Jan 2007 12:42:10 -0000 1.128 +++ ghostscript.spec 18 Jan 2007 13:19:43 -0000 1.129 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.cups.org/espgs/ @@ -246,7 +246,7 @@ %{_libdir}/libijs.*a %changelog -* Thu Jan 18 2007 Tim Waugh +* Thu Jan 18 2007 Tim Waugh 8.15.3-3 - Backported gxcht 64bit crash fix from GPL trunk (bug #177763). * Fri Jan 12 2007 Tim Waugh 8.15.3-2 From fedora-cvs-commits at redhat.com Thu Jan 18 13:20:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:20:11 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.128,1.129 Message-ID: <200701181320.l0IDKBKo002594@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2535 Modified Files: ghostscript.spec Log Message: 8.15.3-5 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- ghostscript.spec 18 Jan 2007 13:16:49 -0000 1.128 +++ ghostscript.spec 18 Jan 2007 13:20:09 -0000 1.129 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://www.cups.org/espgs/ @@ -246,7 +246,7 @@ %{_libdir}/libijs.*a %changelog -* Thu Jan 18 2007 Tim Waugh +* Thu Jan 18 2007 Tim Waugh 8.15.3-5 - Backported gxcht 64bit crash fix from GPL trunk (bug #177763). * Fri Jan 12 2007 Tim Waugh 8.15.3-4 From fedora-cvs-commits at redhat.com Thu Jan 18 13:22:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:22:06 -0500 Subject: rpms/ghostscript/devel ghostscript-gxcht-64bit-crash.patch, NONE, 1.1 Message-ID: <200701181322.l0IDM52g004187@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4138 Added Files: ghostscript-gxcht-64bit-crash.patch Log Message: Include patch ghostscript-gxcht-64bit-crash.patch: gxcht.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ghostscript-gxcht-64bit-crash.patch --- --- espgs-8.15.3/src/gxcht.c.gxcht-64bit-crash 2007-01-18 12:29:20.000000000 +0000 +++ espgs-8.15.3/src/gxcht.c 2007-01-18 12:29:36.000000000 +0000 @@ -1095,7 +1095,7 @@ ptc->xbits = ((tw - 1) & 7) + 1; ptc->tdata = btile->data; ptc->raster = btile->raster; - ptc->row = ptc->tdata + by * ptc->raster; + ptc->row = ptc->tdata + by * (int)ptc->raster; ptc->data = ptc->row + ptc->xoffset; ptc->bit_shift = ptc->xshift; if_debug6('h', "[h]plane %d: size=%d,%d shift=%d bx=%d by=%d\n", From fedora-cvs-commits at redhat.com Thu Jan 18 13:34:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:34:12 -0500 Subject: rpms/tzdata/devel .cvsignore, 1.31, 1.32 sources, 1.33, 1.34 tzdata.spec, 1.41, 1.42 Message-ID: <200701181334.l0IDYCBt007299@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7267 Modified Files: .cvsignore sources tzdata.spec Log Message: * Thu Jan 18 2007 Petr Machata - 2007a-1 - Upstream 2007a - Updates to Bahamas, they will be in sync with 2007 US DST change - New zone Australia/Eucla - Africa/Asmera renamed to Africa/Asmara, link created - Atlantic/Faeroe renamed to Atlantic/Faroe, link created - Packaging - Adding BuildRequires: glibc-common >= 2.5.90-7 to build tzdata with extended 64-bit format necessary for dates beyond 2037 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 29 Nov 2006 09:50:56 -0000 1.31 +++ .cvsignore 18 Jan 2007 13:34:09 -0000 1.32 @@ -1,3 +1,3 @@ -tzcode2006p.tar.gz -tzdata2006p.tar.gz +tzcode2007a.tar.gz +tzdata2007a.tar.gz tzdata-base-0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 29 Nov 2006 09:50:56 -0000 1.33 +++ sources 18 Jan 2007 13:34:09 -0000 1.34 @@ -1,3 +1,3 @@ -a1665dde14d48353563cd98cc196df4a tzcode2006p.tar.gz -cbdf758536710f444de1467fdc19594f tzdata2006p.tar.gz +9162d8d447eec31f60d0602edd17e123 tzcode2007a.tar.gz +5ba3a8c3581a0ef962179fba1328f3cb tzdata2007a.tar.gz 906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- tzdata.spec 29 Nov 2006 09:50:56 -0000 1.41 +++ tzdata.spec 18 Jan 2007 13:34:09 -0000 1.42 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2006p +Version: 2007a %define tzdata_version %{version} %define tzcode_version %{version} Release: 1%{?dist} @@ -9,10 +9,11 @@ Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gawk, glibc, glibc-common, perl +BuildRequires: glibc-common >= 2.5.90-7 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 @@ -52,6 +53,16 @@ %doc tzcode%{tzcode_version}/tz-link.html %changelog +* Thu Jan 18 2007 Petr Machata - 2007a-1 +- Upstream 2007a + - Updates to Bahamas, they will be in sync with 2007 US DST change + - New zone Australia/Eucla + - Africa/Asmera renamed to Africa/Asmara, link created + - Atlantic/Faeroe renamed to Atlantic/Faroe, link created +- Packaging + - Adding BuildRequires: glibc-common >= 2.5.90-7 to build tzdata + with extended 64-bit format necessary for dates beyond 2037 + * Wed Nov 29 2006 Petr Machata - 2006p-1 - Upstream 2006p - Official version of Western Australia DST trial changes From fedora-cvs-commits at redhat.com Thu Jan 18 13:34:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 08:34:18 -0500 Subject: rpms/seamonkey/FC-5 mozilla-rebuild-databases.pl.in, 1.1, 1.2 seamonkey.spec, 1.16, 1.17 Message-ID: <200701181334.l0IDYIHx007354@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/seamonkey/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7310 Modified Files: mozilla-rebuild-databases.pl.in seamonkey.spec Log Message: created a link in /usr/bin/seamonkey, added fix for #204139: mozilla-rebuild-databases.pl script Index: mozilla-rebuild-databases.pl.in =================================================================== RCS file: /cvs/dist/rpms/seamonkey/FC-5/mozilla-rebuild-databases.pl.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mozilla-rebuild-databases.pl.in 12 May 2006 21:18:25 -0000 1.1 +++ mozilla-rebuild-databases.pl.in 18 Jan 2007 13:34:16 -0000 1.2 @@ -7,27 +7,27 @@ $timeout = 60; -%{ENV}->{"MOZILLA_FIVE_HOME"}="LIBDIR/mozilla-MOZILLA_VERSION"; -%{ENV}->{"LD_LIBRARY_PATH"}="LIBDIR/mozilla-MOZILLA_VERSION"; +%{ENV}->{"MOZILLA_FIVE_HOME"}="LIBDIR/mozilla-seamonkey-MOZILLA_VERSION"; +%{ENV}->{"LD_LIBRARY_PATH"}="LIBDIR/mozilla-seamonkey-MOZILLA_VERSION"; %{ENV}->{"MOZ_DISABLE_GNOME"}="1"; umask 022; -if ( -f "LIBDIR/mozilla-MOZILLA_VERSION/regxpcom" ) +if ( -f "LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/regxpcom" ) { # remove all of the old files - rmtree("LIBDIR/mozilla-MOZILLA_VERSION/chrome/overlayinfo"); - unlink ; - unlink("LIBDIR/mozilla-MOZILLA_VERSION/component.reg"); - unlink("LIBDIR/mozilla-MOZILLA_VERSION/components/compreg.dat"); - unlink("LIBDIR/mozilla-MOZILLA_VERSION/components/xpti.dat"); + rmtree("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/overlayinfo"); + unlink ; + unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/component.reg"); + unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/components/compreg.dat"); + unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/components/xpti.dat"); # create a new clean path - mkpath("LIBDIR/mozilla-MOZILLA_VERSION/chrome/overlayinfo"); + mkpath("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/overlayinfo"); # rebuild the installed-chrome.txt file from the installed # languages - if ( -f "LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/installed-chrome.txt" ) { + if ( -f "LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/installed-chrome.txt" ) { rebuild_lang_files(); } @@ -36,7 +36,7 @@ # I am the child. if ($pid == 0) { - exec("LIBDIR/mozilla-MOZILLA_VERSION/regxpcom > /dev/null 2> /dev/null"); + exec("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/regxpcom > /dev/null 2> /dev/null"); } # I am the parent. else { @@ -60,7 +60,7 @@ # I am the child. if ($pid == 0) { - exec("LIBDIR/mozilla-MOZILLA_VERSION/regchrome > /dev/null 2> /dev/null"); + exec("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/regchrome > /dev/null 2> /dev/null"); } # I am the parent. else { @@ -83,18 +83,18 @@ sub rebuild_lang_files { - unlink("LIBDIR/mozilla-MOZILLA_VERSION/chrome/installed-chrome.txt"); + unlink("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/installed-chrome.txt"); - open (OUTPUT, "+>", "LIBDIR/mozilla-MOZILLA_VERSION/chrome/installed-chrome.txt")|| + open (OUTPUT, "+>", "LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/installed-chrome.txt")|| die("Failed to open installed-chrome.txt: $!\n"); - copy("LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/installed-chrome.txt", + copy("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/installed-chrome.txt", \*OUTPUT); - foreach (bsd_glob("LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/lang-*.txt")) { + foreach (bsd_glob("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/lang-*.txt")) { copy($_, \*OUTPUT); } - copy("LIBDIR/mozilla-MOZILLA_VERSION/chrome/lang/default.txt", + copy("LIBDIR/mozilla-seamonkey-MOZILLA_VERSION/chrome/lang/default.txt", \*OUTPUT); } Index: seamonkey.spec =================================================================== RCS file: /cvs/dist/rpms/seamonkey/FC-5/seamonkey.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- seamonkey.spec 4 Jan 2007 10:00:09 -0000 1.16 +++ seamonkey.spec 18 Jan 2007 13:34:16 -0000 1.17 @@ -15,7 +15,7 @@ Name: seamonkey Summary: Web browser and mail reader Version: 1.0.7 -Release: 0.6%{?dist} +Release: 0.7%{?dist} License: MPL/NPL/GPL/LGPL Source0: seamonkey-%{version}.source.tar.bz2 Source1: mozilla.sh.in @@ -76,7 +76,7 @@ %endif %description -Mozilla is an open-source web browser, designed for standards +SeaMonkey (former Mozilla) is an open-source web browser, designed for standards compliance, performance and portability. %package devel @@ -89,7 +89,7 @@ Obsoletes: mozilla-devel %description devel -Development header files for mozilla. +Development header files for SeaMonkey (mozilla). %package mail Summary: Mozilla-based mail system @@ -99,7 +99,7 @@ Obsoletes: mozilla-mail %description mail -Mail/news client based on the Mozilla web browser. The mail/news +Mail/news client based on the SeaMonkey (former Mozilla) web browser. The mail/news client supports IMAP, POP, and NNTP and has an easy to use interface. %package chat @@ -110,7 +110,7 @@ Obsoletes: mozilla-chat %description chat -IRC client that is integrated with the Mozilla web browser. +IRC client that is integrated with the SeaMonkey (former Mozilla) web browser. %package js-debugger Summary: JavaScript debugger for use with Mozilla @@ -120,7 +120,7 @@ Obsoletes: mozilla-js-debugger %description js-debugger -JavaScript debugger for use with Mozilla. +JavaScript debugger for use with SeaMonkey (former Mozilla). %package dom-inspector Summary: A tool for inspecting the DOM of pages in Mozilla. @@ -131,7 +131,7 @@ %description dom-inspector This is a tool that allows you to inspect the DOM for web pages in -Mozilla. This is of great use to people who are doing Mozilla chrome +SeaMonkey (former Mozilla). This is of great use to people who are doing seamonkey chrome development or web page development. @@ -531,6 +531,9 @@ echo GRE_PATH=%{_libdir}/mozilla-%{seamonkeyver} >> \ $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} +# create a symlink for seamonkey +ln -s mozilla $RPM_BUILD_ROOT/%{_bindir}/seamonkey + %clean /bin/rm -rf $RPM_BUILD_ROOT @@ -645,6 +648,7 @@ %files -f mozilla.list %defattr(-,root,root) %{_prefix}/bin/mozilla +%{_prefix}/bin/seamonkey %{mozdir}/mozilla-bin %{mozdir}/mozilla-rebuild-databases.pl /etc/gre.d/%{gre_conf_file} @@ -792,6 +796,11 @@ %{mozdir}/xpt_link %changelog +* Thu Jan 18 2007 Martin Stransky 1.0.7-0.7 +- created a link in /usr/bin/seamonkey +- added fix for #204139: mozilla-rebuild-databases.pl script called + in %post has incorrect path + * Thu Jan 4 2007 Martin Stransky 1.0.7-0.6 - Release bump From fedora-cvs-commits at redhat.com Thu Jan 18 14:35:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 09:35:33 -0500 Subject: rpms/xterm/devel xterm-223-border.patch, NONE, 1.1 xterm-223-fontsize.patch, NONE, 1.1 xterm-223-resources.patch, NONE, 1.1 xterm.spec, 1.50, 1.51 xterm-212-redhat-resources.patch, 1.1, NONE Message-ID: <200701181435.l0IEZXI7032719@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32327 Modified Files: xterm.spec Added Files: xterm-223-border.patch xterm-223-fontsize.patch xterm-223-resources.patch Removed Files: xterm-212-redhat-resources.patch Log Message: - make xterm binary sgid utempter (#222847) - fix font size changes with -fa option (#222340) - fix redrawing of internal border (#223027) - enable metaSendsEscape resource and set modifyFunctionKeys to 0 by default Resolves: #222847, #222340, #223027 xterm-223-border.patch: util.c | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) --- NEW FILE xterm-223-border.patch --- --- xterm-223/util.c.border 2006-11-29 23:52:10.000000000 +0100 +++ xterm-223/util.c 2007-01-18 15:04:43.000000000 +0100 @@ -1433,9 +1433,7 @@ y0 = (rect_y - OriginY(screen)); y1 = (y0 + rect_height); - if (getXtermBackground(xw, xw->flags, xw->cur_background) != - xw->core.background_pixel && - (x0 < 0 || + if ((x0 < 0 || y0 < 0 || x1 > Width(screen) || y1 > Height(screen))) { xterm-223-fontsize.patch: charproc.c | 71 +++++++++++++++++++++++++++++++++++++-------------------- fontutils.c | 5 ++-- menu.c | 6 ++-- misc.c | 11 +++++--- version.h | 4 +-- xterm.log.html | 16 ++++++++++++ 6 files changed, 77 insertions(+), 36 deletions(-) --- NEW FILE xterm-223-fontsize.patch --- # patch by Thomas E. Dickey # created Wed Jan 17 01:22:38 UTC 2007 # ------------------------------------------------------------------------------ # charproc.c | 71 ++++++++++++++++++++++++++++++++++++------------------- # fontutils.c | 5 ++- # menu.c | 6 ++-- # misc.c | 11 +++++--- # version.h | 4 +-- # xterm.log.html | 16 +++++++++++- # 6 files changed, 77 insertions(+), 36 deletions(-) # ------------------------------------------------------------------------------ Index: charproc.c --- xterm-223+/charproc.c 2006-11-28 20:45:37.000000000 +0000 +++ xterm-223b/charproc.c 2007-01-17 01:18:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.740 2006/11/28 20:45:37 tom Exp $ */ +/* $XTermId: charproc.c,v 1.742 2007/01/17 01:18:01 tom Exp $ */ /* $XFree86: xc/programs/xterm/charproc.c,v 3.185 2006/06/20 00:42:38 dickey Exp $ */ @@ -7446,35 +7446,55 @@ /* ARGSUSED */ static void -DoSetSelectedFont(Widget w GCC_UNUSED, +DoSetSelectedFont(Widget w, XtPointer client_data GCC_UNUSED, Atom * selection GCC_UNUSED, Atom * type, XtPointer value, - unsigned long *length GCC_UNUSED, + unsigned long *length, int *format) { - char *val = (char *) value; - int len; - if (*type != XA_STRING || *format != 8) { + if (!IsXtermWidget(w) || *type != XA_STRING || *format != 8) { Bell(XkbBI_MinorError, 0); - return; - } - len = strlen(val); - if (len > 0) { - if (val[len - 1] == '\n') - val[len - 1] = '\0'; - /* Do some sanity checking to avoid sending a long selection - back to the server in an OpenFont that is unlikely to succeed. - XLFD allows up to 255 characters and no control characters; - we are a little more liberal here. */ - if (len > 1000 || strchr(val, '\n')) - return; - if (!xtermLoadFont(term, - xtermFontName(val), - True, - fontMenu_fontsel)) - Bell(XkbBI_MinorError, 0); + } else { + XtermWidget xw = (XtermWidget) w; + char *save = xw->screen.MenuFontName(fontMenu_fontsel); + char *val = (char *) value; + char *test = 0; + char *used = 0; + int len = strlen(val); + + if (len > (int) *length) { + len = (int) *length; + } + if (len > 0) { + val[len] = '\0'; + used = x_strtrim(val); + TRACE(("DoSetSelectedFont(%s)\n", val)); + /* Do some sanity checking to avoid sending a long selection + back to the server in an OpenFont that is unlikely to succeed. + XLFD allows up to 255 characters and no control characters; + we are a little more liberal here. */ + if (len < 1000 + && !strchr(val, '\n') + && (test = x_strdup(val)) != 0) { + xw->screen.MenuFontName(fontMenu_fontsel) = test; + if (!xtermLoadFont(term, + xtermFontName(val), + True, + fontMenu_fontsel)) { + Bell(XkbBI_MinorError, 0); + free(test); + xw->screen.MenuFontName(fontMenu_fontsel) = save; + } else { + free(save); + } + } else { + Bell(XkbBI_MinorError, 0); + } + if (used != val) + free(used); + } } } @@ -7488,7 +7508,10 @@ Atom target; if (!atom_name) - atom_name = "PRIMARY"; + atom_name = (xw->screen.mappedSelect + ? xw->screen.mappedSelect[0] + : "PRIMARY"); + TRACE(("FindFontSelection(%s)\n", atom_name)); for (pAtom = atoms, a = atomCount; a; a--, pAtom++) { if (strcmp(atom_name, XmuNameOfAtom(*pAtom)) == 0) Index: fontutils.c --- xterm-223+/fontutils.c 2006-11-29 21:57:00.000000000 +0000 +++ xterm-223b/fontutils.c 2007-01-15 01:20:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.219 2006/11/29 21:57:00 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.220 2007/01/15 01:20:08 tom Exp $ */ /* * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $ @@ -6,7 +6,7 @@ /************************************************************ -Copyright 1998-2005,2006 by Thomas E. Dickey +Copyright 1998-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -1493,6 +1493,7 @@ * but this is simpler than adding another resource value - and * as noted above, the data for the fixed fonts are available. */ + lookupOneFontSize(screen, 0); lookupOneFontSize(screen, fontnum); if (fontnum == fontMenu_fontdefault) { face_size = 14.0; Index: menu.c --- xterm-223+/menu.c 2006-11-23 01:18:29.000000000 +0000 +++ xterm-223b/menu.c 2007-01-16 21:38:02.000000000 +0000 @@ -1,8 +1,8 @@ -/* $XTermId: menu.c,v 1.222 2006/11/23 01:18:29 tom Exp $ */ +/* $XTermId: menu.c,v 1.223 2007/01/16 21:38:02 tom Exp $ */ /* -Copyright 1999-2005,2006 by Thomas E. Dickey +Copyright 1999-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -656,7 +656,7 @@ set_menu_font(True); SetItemSensitivity( fontMenuEntries[fontMenu_fontescape].widget, - (screen->menu_font_names[fontMenu_fontescape] + (screen->menu_font_names[fontMenu_fontescape][fNorm] ? True : False)); #if OPT_BOX_CHARS update_font_boxchars(); Index: misc.c --- xterm-223+/misc.c 2006-11-30 22:25:33.000000000 +0000 +++ xterm-223b/misc.c 2007-01-16 23:24:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.332 2006/11/30 22:25:33 tom Exp $ */ +/* $XTermId: misc.c,v 1.333 2007/01/16 23:24:48 tom Exp $ */ /* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */ @@ -1860,6 +1860,7 @@ unparseputc1(xw, final); unparse_end(xw); } else if (buf != 0) { + int num = screen->menu_font_number; VTFontNames fonts; memset(&fonts, 0, sizeof(fonts)); @@ -1870,7 +1871,6 @@ * corresponding menu font entry. */ if (*buf == '#') { - int num = screen->menu_font_number; int rel = 0; if (*++buf == '+') { @@ -1893,19 +1893,22 @@ num = 0; } - if (rel != 0) + if (rel != 0) { num = lookupRelativeFontSize(screen, screen->menu_font_number, rel); + } if (num < 0 || num > fontMenu_lastBuiltin || (buf = screen->MenuFontName(num)) == 0) { Bell(XkbBI_MinorError, 0); break; } + } else { + num = fontMenu_fontescape; } fonts.f_n = buf; - SetVTFont(xw, fontMenu_fontescape, True, &fonts); + SetVTFont(xw, num, True, &fonts); } #endif /* OPT_SHIFT_FONTS */ break; Index: version.h --- xterm-223+/version.h 2006-11-30 22:23:57.000000000 +0000 +++ xterm-223b/version.h 2007-01-16 20:11:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.278 2006/11/30 22:23:57 tom Exp $ */ +/* $XTermId: version.h,v 1.279 2007/01/16 20:11:25 tom Exp $ */ /* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey Exp $ */ /* @@ -7,7 +7,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (T.Dickey). */ -#define XTERM_PATCH 223 +#define XTERM_PATCH 224 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" Index: xterm.log.html --- xterm-223+/xterm.log.html 2006-12-01 01:10:03.000000000 +0000 +++ xterm-223b/xterm.log.html 2007-01-17 00:25:55.000000000 +0000 @@ -20,7 +20,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.499 2006/12/01 01:10:03 tom Exp $ + $XTermId: xterm.log.html,v 1.502 2007/01/17 00:25:55 tom Exp $ $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38 dickey Exp $ --> @@ -46,6 +46,7 @@ is the latest version of this file. +

Development

+
    +
  • make Selection of VT Fonts work with + selectToClipboard resource. + +
  • correct length calculation for Selection entry of + VT Fonts menu, broken since it ignored the + actual selection length since X11R4. + +
  • fixes for fontsize changes with -fa option (Redhat + Bugzilla #222340). +
+

Patch #223 - 2006/11/30

  • add --enable-rectangles configure option (request by xterm-223-resources.patch: XTerm.ad | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE xterm-223-resources.patch --- --- xterm-223/XTerm.ad.redhat-resources 2006-06-24 16:34:45.000000000 +0200 +++ xterm-223/XTerm.ad 2007-01-08 18:13:38.000000000 +0100 @@ -186,3 +186,11 @@ ! ! Alternatively, !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ + +! Red Hat Defaults: +*VT100*eightBitInput: 0 +*VT100*metaSendsEscape: 1 +*VT100*backarrowKey: 0 +*VT100*scrollBar: 1 +*VT100*utf8Title: 1 +*VT100*modifyFunctionKeys: 0 Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- xterm.spec 7 Dec 2006 09:33:58 -0000 1.50 +++ xterm.spec 18 Jan 2007 14:35:31 -0000 1.51 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 223 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -12,9 +12,11 @@ Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz Source1: ftp://invisible-island.net/xterm/16colors.txt -Patch1: xterm-212-redhat-resources.patch +Patch1: xterm-223-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-222-man-page_paths.patch +Patch4: xterm-223-fontsize.patch +Patch5: xterm-223-border.patch %{?!enable_trace: %define enable_trace 0} @@ -31,6 +33,8 @@ %patch1 -p1 -b .redhat-resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths +%patch4 -p1 -b .fontsize +%patch5 -p1 -b .border %build %configure \ @@ -44,6 +48,7 @@ --with-app-defaults=%{x11_app_defaults_dir} \ --with-utempter \ --with-tty-group=tty \ + --with-utmp-setgid=utempter \ --disable-full-tgetent make %{?_smp_mflags} @@ -60,9 +65,9 @@ %files %defattr(-,root,root) %doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n +%attr(2755,root,utempter) %{_bindir}/xterm %{_bindir}/resize %{_bindir}/uxterm -%{_bindir}/xterm %{_mandir}/man1/resize.1* %{_mandir}/man1/xterm.1* %{x11_app_defaults_dir}/UXTerm @@ -70,6 +75,12 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Thu Jan 18 2007 Miroslav Lichvar 223-2 +- make xterm binary sgid utempter (#222847) +- fix font size changes with -fa option (#222340) +- fix redrawing of internal border (#223027) +- enable metaSendsEscape resource and set modifyFunctionKeys to 0 by default + * Thu Dec 07 2006 Miroslav Lichvar 223-1 - update to 223 --- xterm-212-redhat-resources.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 18 14:43:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 09:43:18 -0500 Subject: rpms/autoconf/devel autoconf.spec,1.39,1.40 Message-ID: <200701181443.l0IEhIaw006150@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/autoconf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6010 Modified Files: autoconf.spec Log Message: - don't abort (un)install scriptlets when _excludedocs is set (Ville Skytta) Index: autoconf.spec =================================================================== RCS file: /cvs/dist/rpms/autoconf/devel/autoconf.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- autoconf.spec 21 Nov 2006 09:39:16 -0000 1.39 +++ autoconf.spec 18 Jan 2007 14:43:11 -0000 1.40 @@ -1,7 +1,7 @@ Summary: A GNU tool for automatically configuring source code. Name: autoconf Version: 2.61 -Release: 2 +Release: 3 License: GPL Group: Development/Tools Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2 @@ -53,11 +53,11 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/autoconf.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/autoconf.info.gz %{_infodir}/dir || : %preun if [ "$1" = 0 ]; then - /sbin/install-info --del %{_infodir}/autoconf.info.gz %{_infodir}/dir + /sbin/install-info --del %{_infodir}/autoconf.info.gz %{_infodir}/dir || : fi %files @@ -72,6 +72,9 @@ %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %changelog +* Thu Jan 18 2007 Karsten Hopp 2.61-3 +- don't abort (un)install scriptlets when _excludedocs is set (Ville Skytt??) + * Tue Nov 21 2006 Karsten Hopp 2.61-2 - drop obsolete linkX11 patch From fedora-cvs-commits at redhat.com Thu Jan 18 14:44:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 09:44:29 -0500 Subject: rpms/automake/devel automake.spec,1.29,1.30 Message-ID: <200701181444.l0IEiTRJ007184@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/automake/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7066 Modified Files: automake.spec Log Message: - don't abort (un)install scriptlets when _excludedocs is set (Ville Skytta) Index: automake.spec =================================================================== RCS file: /cvs/dist/rpms/automake/devel/automake.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- automake.spec 21 Nov 2006 09:21:04 -0000 1.29 +++ automake.spec 18 Jan 2007 14:44:27 -0000 1.30 @@ -3,7 +3,7 @@ Summary: A GNU tool for automatically creating Makefiles. Name: automake Version: %{api_version} -Release: 2 +Release: 3 License: GPL Group: Development/Tools Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2 @@ -47,11 +47,11 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/automake.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/automake.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/automake.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/automake.info.gz %{_infodir}/dir || : fi %files @@ -64,6 +64,9 @@ %dir %{_datadir}/aclocal %changelog +* Thu Jan 18 2007 Karsten Hopp 1.10-3 +- don't abort (un)install scriptlets when _excludedocs is set (Ville Skytt??) + * Tue Nov 21 2006 Karsten Hopp 1.10-2 - rebuild From fedora-cvs-commits at redhat.com Thu Jan 18 14:45:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 09:45:38 -0500 Subject: rpms/ed/devel ed.spec,1.21,1.22 Message-ID: <200701181445.l0IEjcMC008109@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/ed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8069 Modified Files: ed.spec Log Message: - don't abort (un)install scriptlets when _excludedocs is set (Ville Skytta) Index: ed.spec =================================================================== RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ed.spec 18 Jan 2007 11:31:20 -0000 1.21 +++ ed.spec 18 Jan 2007 14:45:36 -0000 1.22 @@ -1,7 +1,7 @@ Summary: The GNU line editor. Name: ed Version: 0.3 -Release: 2 +Release: 3 License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2 @@ -38,11 +38,11 @@ install doc/ed.1 $RPM_BUILD_ROOT%{_mandir}/man1 %post -/sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." +/sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." || : %preun if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." + /sbin/install-info --delete %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed). The GNU Line Editor." || : fi %clean @@ -56,6 +56,9 @@ %attr(0644,root,root) %{_mandir}/*/* %changelog +* Thu Jan 18 2007 Karsten Hopp 0.3-3 +- don't abort (un)install scriptlets when _excludedocs is set (Ville Skytt??) + * Thu Jan 18 2007 Karsten Hopp 0.3-2 - fix man page permissions (#222581) From fedora-cvs-commits at redhat.com Thu Jan 18 14:46:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 09:46:59 -0500 Subject: rpms/wget/devel wget.spec,1.54,1.55 Message-ID: <200701181446.l0IEkxdw013998@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/wget/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13318 Modified Files: wget.spec Log Message: - don't abort (un)install scriptlets when _excludedocs is set (Ville Skytta) Index: wget.spec =================================================================== RCS file: /cvs/dist/rpms/wget/devel/wget.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- wget.spec 10 Jan 2007 10:06:13 -0000 1.54 +++ wget.spec 18 Jan 2007 14:46:56 -0000 1.55 @@ -1,7 +1,7 @@ Summary: A utility for retrieving files using the HTTP or FTP protocols. Name: wget Version: 1.10.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Internet Url: http://wget.sunsite.dk/ @@ -58,11 +58,11 @@ %find_lang %name %post -/sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/wget.info.gz %{_infodir}/dir || : %preun if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/wget.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/wget.info.gz %{_infodir}/dir || : fi %clean @@ -77,6 +77,9 @@ %{_infodir}/* %changelog +* Thu Jan 18 2007 Karsten Hopp 1.10.2-12 +- don't abort (un)install scriptlets when _excludedocs is set (Ville Skytt??) + * Wed Jan 10 2007 Karsten Hopp 1.10.2-11 - add fix for CVE-2006-6719 From fedora-cvs-commits at redhat.com Thu Jan 18 14:50:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 09:50:18 -0500 Subject: rpms/xterm/FC-6 xterm-223-border.patch, NONE, 1.1 xterm-223-fontsize.patch, NONE, 1.1 xterm.spec, 1.49, 1.50 Message-ID: <200701181450.l0IEoI68031988@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/xterm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31712 Modified Files: xterm.spec Added Files: xterm-223-border.patch xterm-223-fontsize.patch Log Message: - make xterm binary sgid utempter (#222847) - fix font size changes with -fa option (#222340) - fix redrawing of internal border (#223027) Resolves: #222847, #222340, #223027 xterm-223-border.patch: util.c | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) --- NEW FILE xterm-223-border.patch --- --- xterm-223/util.c.border 2006-11-29 23:52:10.000000000 +0100 +++ xterm-223/util.c 2007-01-18 15:04:43.000000000 +0100 @@ -1433,9 +1433,7 @@ y0 = (rect_y - OriginY(screen)); y1 = (y0 + rect_height); - if (getXtermBackground(xw, xw->flags, xw->cur_background) != - xw->core.background_pixel && - (x0 < 0 || + if ((x0 < 0 || y0 < 0 || x1 > Width(screen) || y1 > Height(screen))) { xterm-223-fontsize.patch: charproc.c | 71 +++++++++++++++++++++++++++++++++++++-------------------- fontutils.c | 5 ++-- menu.c | 6 ++-- misc.c | 11 +++++--- version.h | 4 +-- xterm.log.html | 16 ++++++++++++ 6 files changed, 77 insertions(+), 36 deletions(-) --- NEW FILE xterm-223-fontsize.patch --- # patch by Thomas E. Dickey # created Wed Jan 17 01:22:38 UTC 2007 # ------------------------------------------------------------------------------ # charproc.c | 71 ++++++++++++++++++++++++++++++++++++------------------- # fontutils.c | 5 ++- # menu.c | 6 ++-- # misc.c | 11 +++++--- # version.h | 4 +-- # xterm.log.html | 16 +++++++++++- # 6 files changed, 77 insertions(+), 36 deletions(-) # ------------------------------------------------------------------------------ Index: charproc.c --- xterm-223+/charproc.c 2006-11-28 20:45:37.000000000 +0000 +++ xterm-223b/charproc.c 2007-01-17 01:18:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.740 2006/11/28 20:45:37 tom Exp $ */ +/* $XTermId: charproc.c,v 1.742 2007/01/17 01:18:01 tom Exp $ */ /* $XFree86: xc/programs/xterm/charproc.c,v 3.185 2006/06/20 00:42:38 dickey Exp $ */ @@ -7446,35 +7446,55 @@ /* ARGSUSED */ static void -DoSetSelectedFont(Widget w GCC_UNUSED, +DoSetSelectedFont(Widget w, XtPointer client_data GCC_UNUSED, Atom * selection GCC_UNUSED, Atom * type, XtPointer value, - unsigned long *length GCC_UNUSED, + unsigned long *length, int *format) { - char *val = (char *) value; - int len; - if (*type != XA_STRING || *format != 8) { + if (!IsXtermWidget(w) || *type != XA_STRING || *format != 8) { Bell(XkbBI_MinorError, 0); - return; - } - len = strlen(val); - if (len > 0) { - if (val[len - 1] == '\n') - val[len - 1] = '\0'; - /* Do some sanity checking to avoid sending a long selection - back to the server in an OpenFont that is unlikely to succeed. - XLFD allows up to 255 characters and no control characters; - we are a little more liberal here. */ - if (len > 1000 || strchr(val, '\n')) - return; - if (!xtermLoadFont(term, - xtermFontName(val), - True, - fontMenu_fontsel)) - Bell(XkbBI_MinorError, 0); + } else { + XtermWidget xw = (XtermWidget) w; + char *save = xw->screen.MenuFontName(fontMenu_fontsel); + char *val = (char *) value; + char *test = 0; + char *used = 0; + int len = strlen(val); + + if (len > (int) *length) { + len = (int) *length; + } + if (len > 0) { + val[len] = '\0'; + used = x_strtrim(val); + TRACE(("DoSetSelectedFont(%s)\n", val)); + /* Do some sanity checking to avoid sending a long selection + back to the server in an OpenFont that is unlikely to succeed. + XLFD allows up to 255 characters and no control characters; + we are a little more liberal here. */ + if (len < 1000 + && !strchr(val, '\n') + && (test = x_strdup(val)) != 0) { + xw->screen.MenuFontName(fontMenu_fontsel) = test; + if (!xtermLoadFont(term, + xtermFontName(val), + True, + fontMenu_fontsel)) { + Bell(XkbBI_MinorError, 0); + free(test); + xw->screen.MenuFontName(fontMenu_fontsel) = save; + } else { + free(save); + } + } else { + Bell(XkbBI_MinorError, 0); + } + if (used != val) + free(used); + } } } @@ -7488,7 +7508,10 @@ Atom target; if (!atom_name) - atom_name = "PRIMARY"; + atom_name = (xw->screen.mappedSelect + ? xw->screen.mappedSelect[0] + : "PRIMARY"); + TRACE(("FindFontSelection(%s)\n", atom_name)); for (pAtom = atoms, a = atomCount; a; a--, pAtom++) { if (strcmp(atom_name, XmuNameOfAtom(*pAtom)) == 0) Index: fontutils.c --- xterm-223+/fontutils.c 2006-11-29 21:57:00.000000000 +0000 +++ xterm-223b/fontutils.c 2007-01-15 01:20:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.219 2006/11/29 21:57:00 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.220 2007/01/15 01:20:08 tom Exp $ */ /* * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $ @@ -6,7 +6,7 @@ /************************************************************ -Copyright 1998-2005,2006 by Thomas E. Dickey +Copyright 1998-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -1493,6 +1493,7 @@ * but this is simpler than adding another resource value - and * as noted above, the data for the fixed fonts are available. */ + lookupOneFontSize(screen, 0); lookupOneFontSize(screen, fontnum); if (fontnum == fontMenu_fontdefault) { face_size = 14.0; Index: menu.c --- xterm-223+/menu.c 2006-11-23 01:18:29.000000000 +0000 +++ xterm-223b/menu.c 2007-01-16 21:38:02.000000000 +0000 @@ -1,8 +1,8 @@ -/* $XTermId: menu.c,v 1.222 2006/11/23 01:18:29 tom Exp $ */ +/* $XTermId: menu.c,v 1.223 2007/01/16 21:38:02 tom Exp $ */ /* -Copyright 1999-2005,2006 by Thomas E. Dickey +Copyright 1999-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -656,7 +656,7 @@ set_menu_font(True); SetItemSensitivity( fontMenuEntries[fontMenu_fontescape].widget, - (screen->menu_font_names[fontMenu_fontescape] + (screen->menu_font_names[fontMenu_fontescape][fNorm] ? True : False)); #if OPT_BOX_CHARS update_font_boxchars(); Index: misc.c --- xterm-223+/misc.c 2006-11-30 22:25:33.000000000 +0000 +++ xterm-223b/misc.c 2007-01-16 23:24:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.332 2006/11/30 22:25:33 tom Exp $ */ +/* $XTermId: misc.c,v 1.333 2007/01/16 23:24:48 tom Exp $ */ /* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */ @@ -1860,6 +1860,7 @@ unparseputc1(xw, final); unparse_end(xw); } else if (buf != 0) { + int num = screen->menu_font_number; VTFontNames fonts; memset(&fonts, 0, sizeof(fonts)); @@ -1870,7 +1871,6 @@ * corresponding menu font entry. */ if (*buf == '#') { - int num = screen->menu_font_number; int rel = 0; if (*++buf == '+') { @@ -1893,19 +1893,22 @@ num = 0; } - if (rel != 0) + if (rel != 0) { num = lookupRelativeFontSize(screen, screen->menu_font_number, rel); + } if (num < 0 || num > fontMenu_lastBuiltin || (buf = screen->MenuFontName(num)) == 0) { Bell(XkbBI_MinorError, 0); break; } + } else { + num = fontMenu_fontescape; } fonts.f_n = buf; - SetVTFont(xw, fontMenu_fontescape, True, &fonts); + SetVTFont(xw, num, True, &fonts); } #endif /* OPT_SHIFT_FONTS */ break; Index: version.h --- xterm-223+/version.h 2006-11-30 22:23:57.000000000 +0000 +++ xterm-223b/version.h 2007-01-16 20:11:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.278 2006/11/30 22:23:57 tom Exp $ */ +/* $XTermId: version.h,v 1.279 2007/01/16 20:11:25 tom Exp $ */ /* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey Exp $ */ /* @@ -7,7 +7,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (T.Dickey). */ -#define XTERM_PATCH 223 +#define XTERM_PATCH 224 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" Index: xterm.log.html --- xterm-223+/xterm.log.html 2006-12-01 01:10:03.000000000 +0000 +++ xterm-223b/xterm.log.html 2007-01-17 00:25:55.000000000 +0000 @@ -20,7 +20,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.499 2006/12/01 01:10:03 tom Exp $ + $XTermId: xterm.log.html,v 1.502 2007/01/17 00:25:55 tom Exp $ $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38 dickey Exp $ --> @@ -46,6 +46,7 @@ is the latest version of this file. +

    Development

    +
      +
    • make Selection of VT Fonts work with + selectToClipboard resource. + +
    • correct length calculation for Selection entry of + VT Fonts menu, broken since it ignored the + actual selection length since X11R4. + +
    • fixes for fontsize changes with -fa option (Redhat + Bugzilla #222340). +
    +

    Patch #223 - 2006/11/30

    • add --enable-rectangles configure option (request by Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-6/xterm.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- xterm.spec 8 Jan 2007 17:50:45 -0000 1.49 +++ xterm.spec 18 Jan 2007 14:50:16 -0000 1.50 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 223 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -15,6 +15,8 @@ Patch1: xterm-223-redhat-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-222-man-page_paths.patch +Patch4: xterm-223-fontsize.patch +Patch5: xterm-223-border.patch %{?!enable_trace: %define enable_trace 0} @@ -31,6 +33,8 @@ %patch1 -p1 -b .redhat-resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths +%patch4 -p1 -b .fontsize +%patch5 -p1 -b .border %build %configure \ @@ -43,6 +47,7 @@ --enable-wide-chars \ --with-app-defaults=%{x11_app_defaults_dir} \ --with-utempter \ + --with-utmp-setgid=utempter \ --with-tty-group=tty make %{?_smp_mflags} @@ -59,9 +64,9 @@ %files %defattr(-,root,root) %doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n +%attr(2755,root,utempter) %{_bindir}/xterm %{_bindir}/resize %{_bindir}/uxterm -%{_bindir}/xterm %{_mandir}/man1/resize.1* %{_mandir}/man1/xterm.1* %{x11_app_defaults_dir}/UXTerm @@ -69,6 +74,11 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Thu Jan 18 2007 Miroslav Lichvar 223-2.fc6 +- make xterm binary sgid utempter (#222847) +- fix font size changes with -fa option (#222340) +- fix redrawing of internal border (#223027) + * Mon Jan 08 2007 Miroslav Lichvar 223-1.fc6 - update to 223 - use correct tty group (#219048) From fedora-cvs-commits at redhat.com Thu Jan 18 15:00:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:00:49 -0500 Subject: rpms/xterm/FC-5 xterm-223-border.patch, NONE, 1.1 xterm-223-fontsize.patch, NONE, 1.1 xterm.spec, 1.45, 1.46 Message-ID: <200701181500.l0IF0nUi008259@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/xterm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8076 Modified Files: xterm.spec Added Files: xterm-223-border.patch xterm-223-fontsize.patch Log Message: - fix font size changes with -fa option (#222340) - fix redrawing of internal border (#223027) Resolves: #222340, #223027 xterm-223-border.patch: util.c | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) --- NEW FILE xterm-223-border.patch --- --- xterm-223/util.c.border 2006-11-29 23:52:10.000000000 +0100 +++ xterm-223/util.c 2007-01-18 15:04:43.000000000 +0100 @@ -1433,9 +1433,7 @@ y0 = (rect_y - OriginY(screen)); y1 = (y0 + rect_height); - if (getXtermBackground(xw, xw->flags, xw->cur_background) != - xw->core.background_pixel && - (x0 < 0 || + if ((x0 < 0 || y0 < 0 || x1 > Width(screen) || y1 > Height(screen))) { xterm-223-fontsize.patch: charproc.c | 71 +++++++++++++++++++++++++++++++++++++-------------------- fontutils.c | 5 ++-- menu.c | 6 ++-- misc.c | 11 +++++--- version.h | 4 +-- xterm.log.html | 16 ++++++++++++ 6 files changed, 77 insertions(+), 36 deletions(-) --- NEW FILE xterm-223-fontsize.patch --- # patch by Thomas E. Dickey # created Wed Jan 17 01:22:38 UTC 2007 # ------------------------------------------------------------------------------ # charproc.c | 71 ++++++++++++++++++++++++++++++++++++------------------- # fontutils.c | 5 ++- # menu.c | 6 ++-- # misc.c | 11 +++++--- # version.h | 4 +-- # xterm.log.html | 16 +++++++++++- # 6 files changed, 77 insertions(+), 36 deletions(-) # ------------------------------------------------------------------------------ Index: charproc.c --- xterm-223+/charproc.c 2006-11-28 20:45:37.000000000 +0000 +++ xterm-223b/charproc.c 2007-01-17 01:18:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.740 2006/11/28 20:45:37 tom Exp $ */ +/* $XTermId: charproc.c,v 1.742 2007/01/17 01:18:01 tom Exp $ */ /* $XFree86: xc/programs/xterm/charproc.c,v 3.185 2006/06/20 00:42:38 dickey Exp $ */ @@ -7446,35 +7446,55 @@ /* ARGSUSED */ static void -DoSetSelectedFont(Widget w GCC_UNUSED, +DoSetSelectedFont(Widget w, XtPointer client_data GCC_UNUSED, Atom * selection GCC_UNUSED, Atom * type, XtPointer value, - unsigned long *length GCC_UNUSED, + unsigned long *length, int *format) { - char *val = (char *) value; - int len; - if (*type != XA_STRING || *format != 8) { + if (!IsXtermWidget(w) || *type != XA_STRING || *format != 8) { Bell(XkbBI_MinorError, 0); - return; - } - len = strlen(val); - if (len > 0) { - if (val[len - 1] == '\n') - val[len - 1] = '\0'; - /* Do some sanity checking to avoid sending a long selection - back to the server in an OpenFont that is unlikely to succeed. - XLFD allows up to 255 characters and no control characters; - we are a little more liberal here. */ - if (len > 1000 || strchr(val, '\n')) - return; - if (!xtermLoadFont(term, - xtermFontName(val), - True, - fontMenu_fontsel)) - Bell(XkbBI_MinorError, 0); + } else { + XtermWidget xw = (XtermWidget) w; + char *save = xw->screen.MenuFontName(fontMenu_fontsel); + char *val = (char *) value; + char *test = 0; + char *used = 0; + int len = strlen(val); + + if (len > (int) *length) { + len = (int) *length; + } + if (len > 0) { + val[len] = '\0'; + used = x_strtrim(val); + TRACE(("DoSetSelectedFont(%s)\n", val)); + /* Do some sanity checking to avoid sending a long selection + back to the server in an OpenFont that is unlikely to succeed. + XLFD allows up to 255 characters and no control characters; + we are a little more liberal here. */ + if (len < 1000 + && !strchr(val, '\n') + && (test = x_strdup(val)) != 0) { + xw->screen.MenuFontName(fontMenu_fontsel) = test; + if (!xtermLoadFont(term, + xtermFontName(val), + True, + fontMenu_fontsel)) { + Bell(XkbBI_MinorError, 0); + free(test); + xw->screen.MenuFontName(fontMenu_fontsel) = save; + } else { + free(save); + } + } else { + Bell(XkbBI_MinorError, 0); + } + if (used != val) + free(used); + } } } @@ -7488,7 +7508,10 @@ Atom target; if (!atom_name) - atom_name = "PRIMARY"; + atom_name = (xw->screen.mappedSelect + ? xw->screen.mappedSelect[0] + : "PRIMARY"); + TRACE(("FindFontSelection(%s)\n", atom_name)); for (pAtom = atoms, a = atomCount; a; a--, pAtom++) { if (strcmp(atom_name, XmuNameOfAtom(*pAtom)) == 0) Index: fontutils.c --- xterm-223+/fontutils.c 2006-11-29 21:57:00.000000000 +0000 +++ xterm-223b/fontutils.c 2007-01-15 01:20:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.219 2006/11/29 21:57:00 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.220 2007/01/15 01:20:08 tom Exp $ */ /* * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $ @@ -6,7 +6,7 @@ /************************************************************ -Copyright 1998-2005,2006 by Thomas E. Dickey +Copyright 1998-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -1493,6 +1493,7 @@ * but this is simpler than adding another resource value - and * as noted above, the data for the fixed fonts are available. */ + lookupOneFontSize(screen, 0); lookupOneFontSize(screen, fontnum); if (fontnum == fontMenu_fontdefault) { face_size = 14.0; Index: menu.c --- xterm-223+/menu.c 2006-11-23 01:18:29.000000000 +0000 +++ xterm-223b/menu.c 2007-01-16 21:38:02.000000000 +0000 @@ -1,8 +1,8 @@ -/* $XTermId: menu.c,v 1.222 2006/11/23 01:18:29 tom Exp $ */ +/* $XTermId: menu.c,v 1.223 2007/01/16 21:38:02 tom Exp $ */ /* -Copyright 1999-2005,2006 by Thomas E. Dickey +Copyright 1999-2006,2007 by Thomas E. Dickey All Rights Reserved @@ -656,7 +656,7 @@ set_menu_font(True); SetItemSensitivity( fontMenuEntries[fontMenu_fontescape].widget, - (screen->menu_font_names[fontMenu_fontescape] + (screen->menu_font_names[fontMenu_fontescape][fNorm] ? True : False)); #if OPT_BOX_CHARS update_font_boxchars(); Index: misc.c --- xterm-223+/misc.c 2006-11-30 22:25:33.000000000 +0000 +++ xterm-223b/misc.c 2007-01-16 23:24:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.332 2006/11/30 22:25:33 tom Exp $ */ +/* $XTermId: misc.c,v 1.333 2007/01/16 23:24:48 tom Exp $ */ /* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */ @@ -1860,6 +1860,7 @@ unparseputc1(xw, final); unparse_end(xw); } else if (buf != 0) { + int num = screen->menu_font_number; VTFontNames fonts; memset(&fonts, 0, sizeof(fonts)); @@ -1870,7 +1871,6 @@ * corresponding menu font entry. */ if (*buf == '#') { - int num = screen->menu_font_number; int rel = 0; if (*++buf == '+') { @@ -1893,19 +1893,22 @@ num = 0; } - if (rel != 0) + if (rel != 0) { num = lookupRelativeFontSize(screen, screen->menu_font_number, rel); + } if (num < 0 || num > fontMenu_lastBuiltin || (buf = screen->MenuFontName(num)) == 0) { Bell(XkbBI_MinorError, 0); break; } + } else { + num = fontMenu_fontescape; } fonts.f_n = buf; - SetVTFont(xw, fontMenu_fontescape, True, &fonts); + SetVTFont(xw, num, True, &fonts); } #endif /* OPT_SHIFT_FONTS */ break; Index: version.h --- xterm-223+/version.h 2006-11-30 22:23:57.000000000 +0000 +++ xterm-223b/version.h 2007-01-16 20:11:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.278 2006/11/30 22:23:57 tom Exp $ */ +/* $XTermId: version.h,v 1.279 2007/01/16 20:11:25 tom Exp $ */ /* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey Exp $ */ /* @@ -7,7 +7,7 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (T.Dickey). */ -#define XTERM_PATCH 223 +#define XTERM_PATCH 224 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" Index: xterm.log.html --- xterm-223+/xterm.log.html 2006-12-01 01:10:03.000000000 +0000 +++ xterm-223b/xterm.log.html 2007-01-17 00:25:55.000000000 +0000 @@ -20,7 +20,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.499 2006/12/01 01:10:03 tom Exp $ + $XTermId: xterm.log.html,v 1.502 2007/01/17 00:25:55 tom Exp $ $XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38 dickey Exp $ --> @@ -46,6 +46,7 @@ is the latest version of this file. +

      Development

      +
        +
      • make Selection of VT Fonts work with + selectToClipboard resource. + +
      • correct length calculation for Selection entry of + VT Fonts menu, broken since it ignored the + actual selection length since X11R4. + +
      • fixes for fontsize changes with -fa option (Redhat + Bugzilla #222340). +
      +

      Patch #223 - 2006/11/30

      • add --enable-rectangles configure option (request by Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/xterm.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xterm.spec 8 Jan 2007 17:55:48 -0000 1.45 +++ xterm.spec 18 Jan 2007 15:00:47 -0000 1.46 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 223 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -15,6 +15,8 @@ Patch1: xterm-223-redhat-resources.patch Patch2: xterm-222-can-2003-0063.patch Patch3: xterm-222-man-page_paths.patch +Patch4: xterm-223-fontsize.patch +Patch5: xterm-223-border.patch %{?!enable_trace: %define enable_trace 0} @@ -31,6 +33,8 @@ %patch1 -p1 -b .redhat-resources %patch2 -p1 -b .can-2003-0063 %patch3 -p1 -b .man-page_paths +%patch4 -p1 -b .fontsize +%patch5 -p1 -b .border %build %configure \ @@ -69,6 +73,10 @@ %{x11_app_defaults_dir}/XTerm-color %changelog +* Thu Jan 18 2007 Miroslav Lichvar - 223-2.fc5 +- fix font size changes with -fa option (#222340) +- fix redrawing of internal border (#223027) + * Mon Jan 08 2007 Miroslav Lichvar - 223-1.fc5 - update to 223 - use correct tty group (#219048) From fedora-cvs-commits at redhat.com Thu Jan 18 15:18:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:18:55 -0500 Subject: rpms/tcl/devel tcl.spec,1.33,1.34 Message-ID: <200701181518.l0IFItCb011423@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11273 Modified Files: tcl.spec Log Message: Rebuilt Index: tcl.spec =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- tcl.spec 19 Dec 2006 15:51:16 -0000 1.33 +++ tcl.spec 18 Jan 2007 15:18:52 -0000 1.34 @@ -5,7 +5,7 @@ Summary: Tcl scripting language development environment Name: tcl Version: %{majorver}a5 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Development/Languages URL: http://tcl.sourceforge.net/ @@ -156,7 +156,7 @@ %doc %{name}%{version}/html/* %changelog -* Mon Dec 18 2006 Marcela Maslanova - 8.5a5-1 +* Mon Dec 18 2006 Marcela Maslanova - 8.5a5-4 - change in spec for compatibility with tk, version 8.5a5 - Resolves: rhbz#160441 From fedora-cvs-commits at redhat.com Thu Jan 18 15:37:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:37:14 -0500 Subject: rpms/fbset/devel fbset.spec,1.20,1.21 Message-ID: <200701181537.l0IFbEIY017636@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/fbset/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17617 Modified Files: fbset.spec Log Message: - add dist tag, minor rpmlint fix Index: fbset.spec =================================================================== RCS file: /cvs/dist/rpms/fbset/devel/fbset.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fbset.spec 2 Jan 2007 10:25:35 -0000 1.20 +++ fbset.spec 18 Jan 2007 15:37:11 -0000 1.21 @@ -1,7 +1,7 @@ -Summary: Tools for managing a frame buffer's video mode properties. +Summary: Tools for managing a frame buffer's video mode properties Name: fbset Version: 2.1 -Release: 23 +Release: 24%{?dist} License: GPL Group: Applications/System URL: http://users.telenet.be/geertu/Linux/fbdev/ @@ -44,6 +44,9 @@ %config %{_sysconfdir}/fb.modes %changelog +* Thu Jan 18 2007 Jindrich Novy - 2.1-24 +- add dist tag, minor rpmlint fix + * Thu Jan 2 2007 David Woodhouse - 2.1-23 - Fix man page syntax error From fedora-cvs-commits at redhat.com Thu Jan 18 15:39:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:39:57 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.78,1.79 Message-ID: <200701181539.l0IFdv7c017717@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17703 Modified Files: gphoto2.spec Log Message: - gphoto2-devel requires libusb-devel (#222015) Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- gphoto2.spec 12 Jan 2007 09:32:01 -0000 1.78 +++ gphoto2.spec 18 Jan 2007 15:39:54 -0000 1.79 @@ -8,7 +8,7 @@ %define libpkg libgphoto2 %define libver 2.3.1 Version: %{pkgver} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,7 +47,7 @@ Summary: Headers and links to compile against the libgphoto2 library. Requires: %{name} = %{version} Requires: pkgconfig -Requires: libexif-devel +Requires: libexif-devel libusb-devel Group: Development/Libraries #################################### @@ -204,6 +204,9 @@ # ChangeLog ######################################################################## %changelog +* Thu Jan 18 2007 Jindrich Novy 2.3.1-3 +- gphoto2-devel requires libusb-devel (#222015) + * Thu Jan 11 2007 Jindrich Novy 2.3.1-2 - really fix the gphoto2-devel multilib conflict (#205211) From fedora-cvs-commits at redhat.com Thu Jan 18 15:46:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:46:24 -0500 Subject: rpms/symlinks/devel symlinks-1.2-nostatic.patch, 1.1, 1.2 symlinks.spec, 1.10, 1.11 Message-ID: <200701181546.l0IFkOKf017904@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/symlinks/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17888 Modified Files: symlinks-1.2-nostatic.patch symlinks.spec Log Message: * Thu Jan 18 2007 Tim Waugh 1.2-25 - Build with LFS support (bug #206407). - Resolves: rhbz#206407 symlinks-1.2-nostatic.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: symlinks-1.2-nostatic.patch =================================================================== RCS file: /cvs/dist/rpms/symlinks/devel/symlinks-1.2-nostatic.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- symlinks-1.2-nostatic.patch 9 Sep 2004 12:51:21 -0000 1.1 +++ symlinks-1.2-nostatic.patch 18 Jan 2007 15:46:22 -0000 1.2 @@ -5,7 +5,7 @@ symlinks: symlinks.c - gcc -Wall -Wstrict-prototypes -O2 -N -s -o symlinks symlinks.c -+ gcc -Wall -Wstrict-prototypes ${RPM_OPT_FLAGS} -o symlinks symlinks.c ++ gcc -Wall -Wstrict-prototypes ${CFLAGS} -o symlinks symlinks.c install: all symlinks.8 install -m 755 -o root -g root symlinks /usr/local/bin Index: symlinks.spec =================================================================== RCS file: /cvs/dist/rpms/symlinks/devel/symlinks.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- symlinks.spec 12 Jul 2006 08:19:48 -0000 1.10 +++ symlinks.spec 18 Jan 2007 15:46:22 -0000 1.11 @@ -1,7 +1,7 @@ Summary: A utility which maintains a system's symbolic links. Name: symlinks Version: 1.2 -Release: 24.2.2 +Release: 25%{?dist} Group: Applications/System License: distributable Source: ftp://metalab.unc.edu/pub/Linux/utils/file/%{name}-%{version}.tar.gz @@ -26,7 +26,7 @@ %patch2 -p1 %build -make +make CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)" %install mkdir -p $RPM_BUILD_ROOT%{_bindir} @@ -43,6 +43,9 @@ %{_mandir}/man8/symlinks.8* %changelog +* Thu Jan 18 2007 Tim Waugh 1.2-25 +- Build with LFS support (bug #206407). + * Wed Jul 12 2006 Jesse Keating - 1.2-24.2.2 - rebuild From fedora-cvs-commits at redhat.com Thu Jan 18 15:52:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:52:13 -0500 Subject: rpms/dump/devel dump.spec,1.37,1.38 Message-ID: <200701181552.l0IFqDYi005995@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5979/dump/devel Modified Files: dump.spec Log Message: dump is now linked dynamically Index: dump.spec =================================================================== RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- dump.spec 7 Aug 2006 10:53:44 -0000 1.37 +++ dump.spec 18 Jan 2007 15:52:10 -0000 1.38 @@ -3,7 +3,7 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b41 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ @@ -12,12 +12,12 @@ Patch1: dump-dmfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 -BuildRequires: libtermcap-devel, zlib-devel, bzip2-devel, ncurses-devel +BuildRequires: zlib-devel, bzip2-devel, ncurses-devel BuildRequires: device-mapper, libselinux-devel, libsepol-devel, autoconf # This Requires is now mandatory because we only ship static binaries, and # need to ensure the "disk" group is created before installation (#60461) -Requires: setup -Requires: rmt +Requires: setup, e2fsprogs-libs, zlib, bzip2-libs, device-mapper +Requires: rmt, libselinux, libsepol, glibc Obsoletes: dump-static Provides: dump-static @@ -50,13 +50,12 @@ %build # XXX --enable-kerberos needs krcmd -%configure \ - --enable-static \ +%configure --disable-static \ + --enable-transselinux \ --enable-rmt \ --enable-largefile \ --enable-qfa \ --enable-readline \ - --enable-transselinux \ --with-binmode=0755 \ --with-manowner=root \ --with-mangrp=root \ @@ -118,6 +117,10 @@ %{_mandir}/man8/rmt.8* %changelog +* Wed Jan 18 2007 Adam Tkac 0.4b41-3.fc7 +- dump is now linked dynamically +- removed termcap dependency + * Mon Aug 7 2006 Jindrich Novy 0.4b41-2.fc6 - fix miscompares detected by restore -C caused by SELinux (#189845) - link properly against device-mapper and selinux libraries From fedora-cvs-commits at redhat.com Thu Jan 18 15:52:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 10:52:24 -0500 Subject: rpms/libsoup/FC-6 .cvsignore, 1.22, 1.23 libsoup.spec, 1.44, 1.45 sources, 1.22, 1.23 Message-ID: <200701181552.l0IFqOgu006027@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/libsoup/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6005 Modified Files: .cvsignore libsoup.spec sources Log Message: * Thu Jan 18 2007 Matthew Barnes - 2.2.99-1.fc6 - Update to 2.2.99 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsoup/FC-6/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 21 Nov 2006 12:26:21 -0000 1.22 +++ .cvsignore 18 Jan 2007 15:52:22 -0000 1.23 @@ -1 +1 @@ -libsoup-2.2.98.tar.bz2 +libsoup-2.2.99.tar.bz2 Index: libsoup.spec =================================================================== RCS file: /cvs/dist/rpms/libsoup/FC-6/libsoup.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libsoup.spec 21 Nov 2006 12:26:21 -0000 1.44 +++ libsoup.spec 18 Jan 2007 15:52:22 -0000 1.45 @@ -1,7 +1,7 @@ ### Abstract ### Name: libsoup -Version: 2.2.98 +Version: 2.2.99 Release: 1%{?dist} License: LGPL Group: Development/Libraries @@ -80,6 +80,9 @@ %{_datadir}/gtk-doc/html/libsoup %changelog +* Thu Jan 18 2007 Matthew Barnes - 2.2.99-1.fc6 +- Update to 2.2.99 + * Tue Nov 21 2006 Matthew Barnes - 2.2.98-1.fc6 - Update to 2.2.98 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsoup/FC-6/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 21 Nov 2006 12:26:21 -0000 1.22 +++ sources 18 Jan 2007 15:52:22 -0000 1.23 @@ -1 +1 @@ -c779f84c4add124e704e6ea3ccc4039c libsoup-2.2.98.tar.bz2 +b2f5df25de4a5c00653d1667eb1b5687 libsoup-2.2.99.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 16:29:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 11:29:08 -0500 Subject: rpms/fedora-logos/devel .cvsignore, 1.44, 1.45 fedora-logos.spec, 1.53, 1.54 sources, 1.46, 1.47 README.cvs, 1.1, NONE Message-ID: <200701181629.l0IGT8pf027267@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/fedora-logos/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27240/devel Modified Files: .cvsignore fedora-logos.spec sources Removed Files: README.cvs Log Message: auto-import fedora-logos-6.0.90-1 on branch devel from fedora-logos-6.0.90-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 22 Sep 2006 23:05:07 -0000 1.44 +++ .cvsignore 18 Jan 2007 16:29:06 -0000 1.45 @@ -1,2 +1 @@ -fedora-logos-6.0.5.tar.bz2 -fedora-logos-6.0.6.tar.bz2 +fedora-logos-6.0.90.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- fedora-logos.spec 22 Sep 2006 23:05:07 -0000 1.53 +++ fedora-logos.spec 18 Jan 2007 16:29:06 -0000 1.54 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Fedora-related icons and pictures -Version: 6.0.6 +Version: 6.0.90 Release: 1%{?dist} Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -161,11 +161,15 @@ /usr/lib/anaconda-runtime/boot/*png /usr/lib/anaconda-runtime/*.sh +/usr/lib/anaconda-runtime/*.jpg # should be ifarch i386 /boot/grub/splash.xpm.gz # end i386 bits %changelog +* Thu Jan 18 2007 Jeremy Katz - 6.0.90-1 +- add syslinux splash for use with graphical menu + * Fri Sep 22 2006 Than Ngo - 6.0.6-1 - add FedoraDNA theme for KDM Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 22 Sep 2006 23:05:07 -0000 1.46 +++ sources 18 Jan 2007 16:29:06 -0000 1.47 @@ -1 +1 @@ -b90d3201178b4c61c1b657a8043eb77d fedora-logos-6.0.6.tar.bz2 +3c72ac971d3264970e5989feeb0c9a01 fedora-logos-6.0.90.tar.bz2 --- README.cvs DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 18 16:42:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 11:42:24 -0500 Subject: rpms/gphoto2/FC-6 gphoto2.spec,1.71,1.72 sources,1.14,1.15 Message-ID: <200701181642.l0IGgOrj015986@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15824 Modified Files: gphoto2.spec sources Log Message: - really fix the gphoto2-devel multilib conflict (#205211) - gphoto2-devel requires libusb-devel (#222015) Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-6/gphoto2.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- gphoto2.spec 2 Jan 2007 16:41:23 -0000 1.71 +++ gphoto2.spec 18 Jan 2007 16:42:21 -0000 1.72 @@ -16,7 +16,7 @@ Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2 Source3: 90-gphoto-camera-policy.fdi Source4: gphoto-set-procperm -Source5: gphoto2-config +Patch1: gphoto2-pkgcfg.patch Url: http://www.gphoto.org/ ExcludeArch: s390 s390x Provides: libgphoto2 = %{libver} @@ -47,7 +47,7 @@ Summary: Headers and links to compile against the libgphoto2 library. Requires: %{name} = %{version} Requires: pkgconfig -Requires: libexif-devel +Requires: libexif-devel, libusb-devel Group: Development/Libraries #################################### @@ -68,6 +68,24 @@ #################################### %prep %setup -q -a 1 +%patch1 -p1 -b .pkgcfg + +# write pkg-config stuff +cat > gphoto2.pc.in << EOF +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +VERSION=@VERSION@ + +Name: gphoto2 +Description: Library for easy access to digital cameras +Requires: +Version: @VERSION@ +Libs: -L\${libdir} -lgphoto2 -lgphoto2_port -lm +Cflags: -I\${includedir} -I\${includedir}/gphoto2 +EOF +sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in #################################### %build @@ -118,6 +136,7 @@ install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/ install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm +install -m644 gphoto2.pc gphoto2-port.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a @@ -130,16 +149,6 @@ cat libgphoto2*.lang >> %{name}.lang -# multilib fun, rename old script, add dummy one -%ifarch %{ix86} -basearch=i386 -%else -basearch=%{_arch} -%endif - -mv ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config-${basearch} -install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config - #################################### %clean rm -rf "${RPM_BUILD_ROOT}" @@ -196,6 +205,10 @@ # ChangeLog ######################################################################## %changelog +* Thu Jan 18 2007 Jindrich Novy 2.3.1-2 +- really fix the gphoto2-devel multilib conflict (#205211) +- gphoto2-devel requires libusb-devel (#222015) + * Tue Jan 2 2007 Jindrich Novy 2.3.1-1 - update to 2.3.1 - don't ship docs in separate tarball, use the internal one Index: sources =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 2 Jan 2007 16:41:23 -0000 1.14 +++ sources 18 Jan 2007 16:42:21 -0000 1.15 @@ -1,3 +1,2 @@ -5f0bdd099f8649abf58490ffc2b5df5b gphoto2-config 00da102280dd5743d8f8b80173b4dd26 gphoto2-2.3.1.tar.bz2 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 16:42:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 11:42:48 -0500 Subject: rpms/gphoto2/FC-6 gphoto2-pkgcfg.patch,NONE,1.1 Message-ID: <200701181642.l0IGgmRS016308@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16164 Added Files: gphoto2-pkgcfg.patch Log Message: - add pkgconfig patch gphoto2-pkgcfg.patch: configure | 2 +- libgphoto2-2.3.1/gphoto2-config.in | 12 +++--------- libgphoto2-2.3.1/libgphoto2_port/gphoto2-port-config.in | 12 +++--------- 3 files changed, 7 insertions(+), 19 deletions(-) --- NEW FILE gphoto2-pkgcfg.patch --- --- gphoto2-2.3.1/configure.pkgcfg 2006-12-24 20:36:56.000000000 +0100 +++ gphoto2-2.3.1/configure 2007-01-11 16:12:24.000000000 +0100 @@ -26323,7 +26323,7 @@ # --------------------------------------------------------------------------- # Create output files # --------------------------------------------------------------------------- -ac_config_files="$ac_config_files po/Makefile.in Makefile gphoto2/Makefile m4m/Makefile doc/Makefile packaging/Makefile packaging/rpm/Makefile packaging/rpm/package.spec" +ac_config_files="$ac_config_files gphoto2.pc gphoto2-port.pc po/Makefile.in Makefile gphoto2/Makefile m4m/Makefile doc/Makefile packaging/Makefile packaging/rpm/Makefile packaging/rpm/package.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- gphoto2-2.3.1/libgphoto2-2.3.1/gphoto2-config.in.pkgcfg 2006-11-25 15:47:45.000000000 +0100 +++ gphoto2-2.3.1/libgphoto2-2.3.1/gphoto2-config.in 2007-01-11 16:13:40.000000000 +0100 @@ -1,11 +1,5 @@ #! /bin/sh -# leave these definitions here -# they are required for correct interpolation of -# @libdir@ and @includedir@ later on -prefix="@prefix@" -exec_prefix="@exec_prefix@" - usage() { cat < Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18213 Modified Files: gphoto2.spec Log Message: ++release Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-6/gphoto2.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- gphoto2.spec 18 Jan 2007 16:42:21 -0000 1.72 +++ gphoto2.spec 18 Jan 2007 16:45:43 -0000 1.73 @@ -8,7 +8,7 @@ %define libpkg libgphoto2 %define libver 2.3.1 Version: %{pkgver} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-cvs-commits at redhat.com Thu Jan 18 17:15:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 12:15:06 -0500 Subject: rpms/gphoto2/FC-5 gphoto2-pkgcfg.patch, NONE, 1.1 gphoto2.spec, 1.61, 1.62 sources, 1.11, 1.12 Message-ID: <200701181715.l0IHF6bZ028555@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28410 Modified Files: gphoto2.spec sources Added Files: gphoto2-pkgcfg.patch Log Message: - really fix the gphoto2-devel multilib conflict (#205211) - gphoto2-devel requires libusb-devel (#222015) gphoto2-pkgcfg.patch: configure | 2 +- libgphoto2-2.3.1/gphoto2-config.in | 12 +++--------- libgphoto2-2.3.1/libgphoto2_port/gphoto2-port-config.in | 12 +++--------- 3 files changed, 7 insertions(+), 19 deletions(-) --- NEW FILE gphoto2-pkgcfg.patch --- --- gphoto2-2.3.1/configure.pkgcfg 2006-12-24 20:36:56.000000000 +0100 +++ gphoto2-2.3.1/configure 2007-01-11 16:12:24.000000000 +0100 @@ -26323,7 +26323,7 @@ # --------------------------------------------------------------------------- # Create output files # --------------------------------------------------------------------------- -ac_config_files="$ac_config_files po/Makefile.in Makefile gphoto2/Makefile m4m/Makefile doc/Makefile packaging/Makefile packaging/rpm/Makefile packaging/rpm/package.spec" +ac_config_files="$ac_config_files gphoto2.pc gphoto2-port.pc po/Makefile.in Makefile gphoto2/Makefile m4m/Makefile doc/Makefile packaging/Makefile packaging/rpm/Makefile packaging/rpm/package.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- gphoto2-2.3.1/libgphoto2-2.3.1/gphoto2-config.in.pkgcfg 2006-11-25 15:47:45.000000000 +0100 +++ gphoto2-2.3.1/libgphoto2-2.3.1/gphoto2-config.in 2007-01-11 16:13:40.000000000 +0100 @@ -1,11 +1,5 @@ #! /bin/sh -# leave these definitions here -# they are required for correct interpolation of -# @libdir@ and @includedir@ later on -prefix="@prefix@" -exec_prefix="@exec_prefix@" - usage() { cat < gphoto2.pc.in << EOF +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +VERSION=@VERSION@ + +Name: gphoto2 +Description: Library for easy access to digital cameras +Requires: +Version: @VERSION@ +Libs: -L\${libdir} -lgphoto2 -lgphoto2_port -lm +Cflags: -I\${includedir} -I\${includedir}/gphoto2 +EOF +sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in #################################### %build @@ -118,6 +136,7 @@ install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/ install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm +install -m644 gphoto2.pc gphoto2-port.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a @@ -130,16 +149,6 @@ cat libgphoto2*.lang >> %{name}.lang -# multilib fun, rename old script, add dummy one -%ifarch %{ix86} -basearch=i386 -%else -basearch=%{_arch} -%endif - -mv ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config-${basearch} -install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/gphoto2-config - #################################### %clean rm -rf "${RPM_BUILD_ROOT}" @@ -196,6 +205,10 @@ # ChangeLog ######################################################################## %changelog +* Thu Jan 18 2007 Jindrich Novy 2.3.1-2 +- really fix the gphoto2-devel multilib conflict (#205211) +- gphoto2-devel requires libusb-devel (#222015) + * Tue Jan 2 2007 Jindrich Novy 2.3.1-1 - update to 2.3.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 Jan 2007 16:58:39 -0000 1.11 +++ sources 18 Jan 2007 17:15:03 -0000 1.12 @@ -1,3 +1,2 @@ -5f0bdd099f8649abf58490ffc2b5df5b gphoto2-config 00da102280dd5743d8f8b80173b4dd26 gphoto2-2.3.1.tar.bz2 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 17:22:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 12:22:01 -0500 Subject: rpms/g-wrap/devel g-wrap.spec,1.35,1.36 Message-ID: <200701181722.l0IHM173021758@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21678 Modified Files: g-wrap.spec Log Message: various fixes Index: g-wrap.spec =================================================================== RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- g-wrap.spec 11 Jan 2007 23:09:10 -0000 1.35 +++ g-wrap.spec 18 Jan 2007 17:21:58 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A tool for creating Scheme interfaces to C libraries Name: g-wrap Version: 1.9.6 -Release: 8 +Release: 9 Group: Development/Libraries License: GPL Requires: guile @@ -14,6 +14,7 @@ Patch2: g-wrap-staticffi.patch Patch3: g-wrap-ffiexecstack.patch Patch4: g-wrap-consistent.patch +Patch5: g-wrap-1.9.6-shaddup.patch BuildRequires: guile-devel slib glib2-devel pkgconfig autoconf %description @@ -46,6 +47,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build autoconf @@ -74,7 +76,7 @@ rm -f %{buildroot}/%{_libdir}/libffi.* sed -i "s|-lffi||g" %{buildroot}/%{_libdir}/pkgconfig/* sed -i "s| - 1.9.6-10 +- remove .la files +- fix build with -Werror +- fix install-info () + * Thu Jan 11 2007 Bill Nottingham - 1.9.6-8 - various spec cleanups From fedora-cvs-commits at redhat.com Thu Jan 18 17:22:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 12:22:06 -0500 Subject: rpms/xen/devel xen-compile-fixes.patch, 1.8, 1.9 xen.spec, 1.160, 1.161 Message-ID: <200701181722.l0IHM58q021839@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21793 Modified Files: xen-compile-fixes.patch xen.spec Log Message: Re-enable the patch to strip -Werror flags xen-compile-fixes.patch: blktap/drivers/Makefile | 2 +- blktap/lib/Makefile | 2 +- console/Makefile | 2 +- xenstore/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-compile-fixes.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xen-compile-fixes.patch 14 Dec 2006 19:22:26 -0000 1.8 +++ xen-compile-fixes.patch 18 Jan 2007 17:22:03 -0000 1.9 @@ -1,55 +1,48 @@ ---- xen-unstable-11234/tools/blktap/drivers/Makefile.compile 2006-08-23 06:27:06.000000000 -0400 -+++ xen-unstable-11234/tools/blktap/drivers/Makefile 2006-08-23 16:16:28.000000000 -0400 -@@ -10,9 +10,6 @@ - INSTALL_DIR = /usr/sbin +diff -ruN xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile +--- xen-3.0.4_1-src.orig/tools/blktap/drivers/Makefile 2007-01-08 10:00:46.000000000 -0500 ++++ xen-3.0.4_1-src.new/tools/blktap/drivers/Makefile 2007-01-18 11:26:37.000000000 -0500 +@@ -8,7 +8,7 @@ + INST_DIR = /usr/sbin LIBAIO_DIR = ../../libaio/src -CFLAGS += -Werror --CFLAGS += -Wno-unused --CFLAGS += -fno-strict-aliasing ++#CFLAGS += -Werror + CFLAGS += -Wno-unused + CFLAGS += -fno-strict-aliasing CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR) - CFLAGS += $(INCLUDES) -I. -I../../xenstore - CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE ---- xen-unstable-11234/Config.mk.compile 2006-08-23 06:27:06.000000000 -0400 -+++ xen-unstable-11234/Config.mk 2006-08-23 16:16:28.000000000 -0400 -@@ -10,7 +10,7 @@ +diff -ruN xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile xen-3.0.4_1-src.new/tools/blktap/lib/Makefile +--- xen-3.0.4_1-src.orig/tools/blktap/lib/Makefile 2007-01-08 10:00:47.000000000 -0500 ++++ xen-3.0.4_1-src.new/tools/blktap/lib/Makefile 2007-01-18 11:26:45.000000000 -0500 +@@ -14,7 +14,7 @@ + SRCS := + SRCS += xenbus.c blkif.c xs_api.c + +-CFLAGS += -Werror ++#CFLAGS += -Werror + CFLAGS += -Wno-unused + CFLAGS += -fno-strict-aliasing -fPIC + # get asprintf(): +diff -ruN xen-3.0.4_1-src.orig/tools/console/Makefile xen-3.0.4_1-src.new/tools/console/Makefile +--- xen-3.0.4_1-src.orig/tools/console/Makefile 2007-01-08 10:00:47.000000000 -0500 ++++ xen-3.0.4_1-src.new/tools/console/Makefile 2007-01-18 11:26:00.000000000 -0500 +@@ -5,7 +5,7 @@ + DAEMON_INSTALL_DIR = /usr/sbin + CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer +-CFLAGS += -Werror ++#CFLAGS += -Werror - AS = $(CROSS_COMPILE)as - LD = $(CROSS_COMPILE)ld ---- xen-3.0.3_0-src/tools/xenstore/Makefile.compile 2006-12-14 14:13:10.000000000 -0500 -+++ xen-3.0.3_0-src/tools/xenstore/Makefile 2006-12-14 14:13:14.000000000 -0500 -@@ -11,7 +11,7 @@ - INSTALL_DIR = $(INSTALL) -d -m0755 + CFLAGS += -I $(XEN_LIBXC) + CFLAGS += -I $(XEN_XENSTORE) +diff -ruN xen-3.0.4_1-src.orig/tools/xenstore/Makefile xen-3.0.4_1-src.new/tools/xenstore/Makefile +--- xen-3.0.4_1-src.orig/tools/xenstore/Makefile 2007-01-08 10:00:52.000000000 -0500 ++++ xen-3.0.4_1-src.new/tools/xenstore/Makefile 2007-01-18 11:25:48.000000000 -0500 +@@ -6,7 +6,7 @@ + MINOR = 0 PROFILE=#-pg --BASECFLAGS=-Wall -g -Werror -+BASECFLAGS=-Wall -g +-BASECFLAGS=-Werror ++BASECFLAGS= # Make gcc generate dependencies. BASECFLAGS += -Wp,-MD,.$(@F).d PROG_DEP = .*.d ---- xen-3.0.3_0-src/tools/console/Makefile.compile 2006-12-14 14:15:01.000000000 -0500 -+++ xen-3.0.3_0-src/tools/console/Makefile 2006-12-14 14:15:08.000000000 -0500 -@@ -9,7 +9,7 @@ - INSTALL_PROG = $(INSTALL) -m0755 - INSTALL_DIR = $(INSTALL) -d -m0755 - --CFLAGS += -Werror -g -+CFLAGS += -g - - CFLAGS += -I $(XEN_LIBXC) - CFLAGS += -I $(XEN_XENSTORE) ---- xen-3.0.3_0-src/tools/blktap/lib/Makefile.compile 2006-12-14 14:16:53.000000000 -0500 -+++ xen-3.0.3_0-src/tools/blktap/lib/Makefile 2006-12-14 14:16:58.000000000 -0500 -@@ -18,7 +18,6 @@ - SRCS := - SRCS += xenbus.c blkif.c xs_api.c - --CFLAGS += -Werror - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing -fPIC - CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- xen.spec 11 Jan 2007 17:21:07 -0000 1.160 +++ xen.spec 18 Jan 2007 17:22:03 -0000 1.161 @@ -84,8 +84,7 @@ %setup -q -n xen-3.0.4_1-src -a 1 # XXX fix this #%patch1 -p1 -b .init -# XXX fix -#%patch3 -p1 -b .compile +%patch3 -p1 -b .compile %patch6 -p1 #patch8 -p1 # FIXME: need to pull this one back From fedora-cvs-commits at redhat.com Thu Jan 18 18:03:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 13:03:37 -0500 Subject: rpms/compiz/devel compiz.spec,1.70,1.71 Message-ID: <200701181803.l0II3bFT016795@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/compiz/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16781 Modified Files: compiz.spec Log Message: Fix changelog email address. Index: compiz.spec =================================================================== RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- compiz.spec 17 Jan 2007 15:15:22 -0000 1.70 +++ compiz.spec 18 Jan 2007 18:03:34 -0000 1.71 @@ -187,7 +187,7 @@ %{_libdir}/libdecoration.so %changelog -* Tue Jan 16 2007 Kristian H??gsberg - 0.3.6-1 +* Tue Jan 16 2007 Kristian H??gsberg - 0.3.6-1 - Update to 0.3.6, update patches. - Drop autotool build requires. - Drop glfinish.patch, cow.patch, resize-offset.patch and icon-menu-patch. From fedora-cvs-commits at redhat.com Thu Jan 18 18:19:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 13:19:06 -0500 Subject: rpms/xen/devel xen-initscript.patch, 1.5, 1.6 xen.spec, 1.161, 1.162 xen-vmxballoon-hack.patch, 1.3, NONE Message-ID: <200701181819.l0IIJ6Sd005925@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5907 Modified Files: xen-initscript.patch xen.spec Removed Files: xen-vmxballoon-hack.patch Log Message: Remove obsolete VMX hack. Fix initscript again xen-initscript.patch: xend | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) Index: xen-initscript.patch =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen-initscript.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xen-initscript.patch 28 Sep 2006 22:48:54 -0000 1.5 +++ xen-initscript.patch 18 Jan 2007 18:19:04 -0000 1.6 @@ -1,6 +1,7 @@ ---- xen-unstable-10712/tools/examples/init.d/xend.init 2006-07-21 13:31:22.000000000 -0400 -+++ xen-unstable-10712/tools/examples/init.d/xend 2006-08-22 17:23:55.000000000 -0400 -@@ -7,37 +7,63 @@ +diff -ruN xen-3.0.4_1-src.orig/tools/examples/init.d/xend xen-3.0.4_1-src.new/tools/examples/init.d/xend +--- xen-3.0.4_1-src.orig/tools/examples/init.d/xend 2007-01-08 10:00:48.000000000 -0500 ++++ xen-3.0.4_1-src.new/tools/examples/init.d/xend 2007-01-18 12:41:07.000000000 -0500 +@@ -7,40 +7,66 @@ # chkconfig: 2345 98 01 # description: Starts and stops the Xen control daemon. @@ -30,11 +31,11 @@ - xend status + /usr/sbin/xend status done -+ if [ $i -ge $rets ]; then -+ RETVAL=-1 -+ return 1 -+ fi -+ return 0 ++ if [ $i -ge $rets ]; then ++ RETVAL=-1 ++ return 1 ++ fi ++ return 0 } case "$1" in @@ -42,6 +43,7 @@ - xend start + echo -n $"Starting $prog: " + modprobe blkbk ++ modprobe blktap + modprobe netbk + modprobe netloop + /usr/sbin/xend start @@ -51,26 +53,29 @@ - xend stop + echo -n $"Stopping $prog: " + /usr/sbin/xend stop -+ RETVAL=$? ++ RETVAL=$? ;; status) - xend status + /usr/sbin/xend status + if [ $? = 0 ] ; then -+ echo xend is running ++ echo -n $"$prog is running" + else -+ echo xend is stopped ++ echo -n $"$prog is stopped" ++ RETVAL=3 + fi -+ exit 0 ;; - restart|reload|force-reload) + reload) +- xend reload ++ /usr/sbin/xend reload + ;; + restart|force-reload) - xend restart -+ echo -n $"$1 $prog: " + /usr/sbin/xend restart await_daemons_up ;; *) -@@ -47,5 +73,12 @@ +@@ -50,5 +76,12 @@ exit 1 esac @@ -84,13 +89,3 @@ +fi +exit $RETVAL ---- xen-unstable-11539/tools/examples/init.d/xend.~1~ 2006-09-25 15:57:54.000000000 +0100 -+++ xen-unstable-11539/tools/examples/init.d/xend 2006-09-25 16:11:07.000000000 +0100 -@@ -42,6 +42,7 @@ - start) - echo -n $"Starting $prog: " - modprobe blkbk -+ modprobe blktap - modprobe netbk - modprobe netloop - /usr/sbin/xend start Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- xen.spec 18 Jan 2007 17:22:03 -0000 1.161 +++ xen.spec 18 Jan 2007 18:19:04 -0000 1.162 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.4 -Release: 1 +Release: 1%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -12,7 +12,6 @@ Patch1: xen-initscript.patch Patch3: xen-compile-fixes.patch Patch6: xen-network-iptables-bridge.patch -Patch8: xen-vmxballoon-hack.patch Patch20: xen-blktap-no-aio-epoll.patch Patch21: xen-blktap-error-returns.patch @@ -82,11 +81,9 @@ %prep %setup -q -n xen-3.0.4_1-src -a 1 -# XXX fix this -#%patch1 -p1 -b .init +%patch1 -p1 -b .init %patch3 -p1 -b .compile %patch6 -p1 -#patch8 -p1 # FIXME: need to pull this one back # blktap patches %patch20 -p1 --- xen-vmxballoon-hack.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 18 18:51:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 13:51:57 -0500 Subject: rpms/lftp/devel lftp.spec,1.55,1.56 Message-ID: <200701181851.l0IIpvUY022867@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/lftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22698 Modified Files: lftp.spec Log Message: Upgrade to 3.5.9 from upstream Index: lftp.spec =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- lftp.spec 23 Aug 2006 08:43:34 -0000 1.55 +++ lftp.spec 18 Jan 2007 18:51:52 -0000 1.56 @@ -1,17 +1,14 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.5.1 -Release: 2%{?dist} +Version: 3.5.9 +Release: 1%{?dist} License: GPL Group: Applications/Internet -Source0: http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2 +Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.bz2 URL: http://lftp.yar.ru/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool Requires: perl-String-CRC32 -Patch173276: lftp-3.3.5-bz173276.patch -Patch2: lftp-3.4.1-dont_core.patch -Patch181694: lftp-3.4.2-fix-redirect-coredump.patch %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -21,12 +18,6 @@ %prep %setup -q -#%patch173276 -p1 -b .bz173276 -#^- now fixed upstream -#%patch2 -p1 -b .dont_core -#^- now fixed upstream -#%patch181694 -p1 -b .bz181694 -#^- now fixed upstream %build if pkg-config openssl ; then @@ -84,8 +75,12 @@ %{_libdir}/lftp/%{version}/proto-ftp.so %{_libdir}/lftp/%{version}/proto-http.so %{_libdir}/lftp/%{version}/proto-sftp.so +%{_libdir}/lftp/%{version}/liblftp-getdate.so %changelog +* Thu Jan 18 2007 Maros Barabas - 3.5.9 +- Upgrade to 3.5.9 from upstream + * Wed Aug 23 2006 Maros Barabas - 3.5.1-2 - remove .a & .la from libdir From fedora-cvs-commits at redhat.com Thu Jan 18 19:09:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 14:09:33 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.362, 1.363 anaconda.spec, 1.488, 1.489 sources, 1.486, 1.487 Message-ID: <200701181909.l0IJ9WD7003823@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3734/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.11-1 on branch devel from anaconda-11.2.0.11-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- .cvsignore 17 Jan 2007 03:37:16 -0000 1.362 +++ .cvsignore 18 Jan 2007 19:09:30 -0000 1.363 @@ -1 +1 @@ -anaconda-11.2.0.10.tar.bz2 +anaconda-11.2.0.11.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.488 retrieving revision 1.489 diff -u -r1.488 -r1.489 --- anaconda.spec 17 Jan 2007 03:37:16 -0000 1.488 +++ anaconda.spec 18 Jan 2007 19:09:30 -0000 1.489 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.10 +Version: 11.2.0.11 Release: 1 License: GPL Summary: Graphical system installer @@ -103,6 +103,16 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jan 18 2007 Jeremy Katz - 11.2.0.11-1 +- Add backend for installing from a live CD +- Make backend controllable from the installclass +- Bring up loopback device in ks (clumens, #191424) +- Fix traceback with writing ks.cfg (clumens) +- Add support for new vesamenu bits in syslinux +- Allow for updates.img to be a cpioball (dlehman) +- Fix use of halt in ks.cfg (pjones, #222953) +- Fix traceback in text mode network config (Elliot Peele) + * Tue Jan 16 2007 Chris Lumens - 11.2.0.10-1 - Remove deps when going back from package selection (dlehman, #222894). - Fix UI when going back from package selection (dlehman, #215493). Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.486 retrieving revision 1.487 diff -u -r1.486 -r1.487 --- sources 17 Jan 2007 03:42:00 -0000 1.486 +++ sources 18 Jan 2007 19:09:30 -0000 1.487 @@ -1 +1 @@ -d815a79042919447132bf4aa6a8284af anaconda-11.2.0.10.tar.bz2 +8419c2975e019b98d80279a294a32ecb anaconda-11.2.0.11.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 18 19:42:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 14:42:06 -0500 Subject: rpms/gaim/devel gaim-2.0.0beta5-debian-17_upnp_crash.patch, NONE, 1.1 gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch, NONE, 1.1 gaim.spec, 1.163, 1.164 Message-ID: <200701181942.l0IJg6lv004510@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/gaim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4469 Modified Files: gaim.spec Added Files: gaim-2.0.0beta5-debian-17_upnp_crash.patch gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch Log Message: - Debian patch 17_upnp_crash - Debian patch 18_jabber-roster-crash gaim-2.0.0beta5-debian-17_upnp_crash.patch: upnp.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gaim-2.0.0beta5-debian-17_upnp_crash.patch --- --- trunk/libgaim/upnp.c 2006/12/17 19:17:36 18017 +++ trunk/libgaim/upnp.c 2006/12/17 20:14:41 18018 @@ -339,7 +339,7 @@ } tmp = xmlnode_get_data(controlURLNode); - if(!gaim_str_has_prefix(tmp, "http://") && + if(baseURL && !gaim_str_has_prefix(tmp, "http://") && !gaim_str_has_prefix(tmp, "HTTP://")) { controlURL = g_strdup_printf("%s%s", baseURL, tmp); g_free(tmp); gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch: roster.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch --- --- trunk/libgaim/protocols/jabber/roster.c 2006/12/22 19:15:38 18048 +++ trunk/libgaim/protocols/jabber/roster.c 2006/12/23 05:42:41 18049 @@ -331,9 +331,11 @@ { GaimBuddy *b = gaim_find_buddy(gc->account, name); - gaim_blist_alias_buddy(b, alias); + if(b != NULL) { + gaim_blist_alias_buddy(b, alias); - jabber_roster_update(gc->proto_data, name, NULL); + jabber_roster_update(gc->proto_data, name, NULL); + } } void jabber_roster_group_change(GaimConnection *gc, const char *name, Index: gaim.spec =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- gaim.spec 12 Dec 2006 21:43:28 -0000 1.163 +++ gaim.spec 18 Jan 2007 19:42:04 -0000 1.164 @@ -33,7 +33,7 @@ Name: gaim Version: 2.0.0 -Release: 0.28.%{betaver}%{?dist} +Release: 0.29.%{betaver}%{?dist} License: GPL Group: Applications/Internet URL: http://gaim.sourceforge.net/ @@ -71,6 +71,8 @@ Patch110: gaim-2.0.0beta5-debian-10_text-arrow-keys.patch Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch Patch112: gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch +Patch117: gaim-2.0.0beta5-debian-17_upnp_crash.patch +Patch118: gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch Patch152: gaim-2.0.0beta5-gtk-filename-blanked.patch @@ -209,6 +211,8 @@ %patch110 -p1 %patch111 -p1 %patch112 -p1 +%patch117 -p1 +%patch118 -p1 %patch150 -p1 %patch152 -p1 @@ -363,6 +367,10 @@ %endif %changelog +* Thu Jan 18 2007 Warren Togami - 2:2.0.0-0.29.beta5 +- Debian patch 17_upnp_crash +- Debian patch 18_jabber-roster-crash + * Mon Dec 11 2006 Warren Togami - 2:2.0.0-0.28.beta5 - Debian patch 13_yahoo_webauth_disable temporarily disable the broken yahoo web auth fallback From fedora-cvs-commits at redhat.com Thu Jan 18 19:42:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 14:42:36 -0500 Subject: rpms/freetype/devel freetype-2.3.0-enable-spr.patch, NONE, 1.1 freetype.spec, 1.47, 1.48 Message-ID: <200701181942.l0IJga6g004577@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/freetype/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4446 Modified Files: freetype.spec Added Files: freetype-2.3.0-enable-spr.patch Log Message: * Wed Jan 17 2007 Behdad Esfahbod 2.3.0-2 - Add without_subpixel_rendering. - Drop X11_PATH=/usr. Not needed anymore. freetype-2.3.0-enable-spr.patch: ftoption.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE freetype-2.3.0-enable-spr.patch --- --- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 +++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 @@ -92,7 +92,7 @@ /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING /*************************************************************************/ Index: freetype.spec =================================================================== RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- freetype.spec 18 Jan 2007 00:54:21 -0000 1.47 +++ freetype.spec 18 Jan 2007 19:42:34 -0000 1.48 @@ -1,13 +1,14 @@ -# Disables patented bytecode interpreter. Setting to 0 enables -# the bytecode interpreter. +# Disable patented bytecode interpreter and patented subpixel rendering. +# Setting to 0 enables them. %define without_bytecode_interpreter 1 +%define without_subpixel_rendering 1 %{!?with_xfree86:%define with_xfree86 1} Summary: A free and portable font rendering engine Name: freetype Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD/GPL dual license Group: System Environment/Libraries URL: http://www.freetype.org @@ -18,6 +19,7 @@ # Add -lm when linking X demos Patch5: ft2demos-2.1.9-mathlib.patch Patch20: freetype-2.1.10-enable-ft2-bci.patch +Patch21: freetype-2.3.0-enable-spr.patch # Enable otvalid and gxvalid modules Patch46: freetype-2.2.1-enable-valid.patch @@ -81,6 +83,10 @@ %patch20 -p1 -b .enable-ft2-bci %endif +%if ! %{without_subpixel_rendering} +%patch21 -p1 -b .enable-spr +%endif + %patch46 -p1 -b .enable-valid %patch88 -p1 -b .multilib @@ -89,13 +95,13 @@ %build %configure --disable-static -make X11_PATH=/usr %{?_smp_mflags} +make %{?_smp_mflags} %if %{with_xfree86} # Build demos { pushd ft2demos-%{version} - make X11_PATH=/usr TOP_DIR=".." + make TOP_DIR=".." popd } %endif @@ -197,6 +203,10 @@ %{_libdir}/pkgconfig/ %changelog +* Wed Jan 17 2007 Behdad Esfahbod 2.3.0-2 +- Add without_subpixel_rendering. +- Drop X11_PATH=/usr. Not needed anymore. + * Wed Jan 17 2007 Behdad Esfahbod 2.3.0-1 - Update to 2.3.0. - Drop upstream patches. From fedora-cvs-commits at redhat.com Thu Jan 18 20:19:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 15:19:16 -0500 Subject: rpms/firefox/devel firefox.sh.in, 1.15, 1.16 firefox.spec, 1.165, 1.166 Message-ID: <200701182019.l0IKJGhf014012@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13997 Modified Files: firefox.sh.in firefox.spec Log Message: * Thu Jan 18 2007 Christopher Aillon 2.0.0.1-3 - Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed. Index: firefox.sh.in =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- firefox.sh.in 24 Oct 2006 18:57:43 -0000 1.15 +++ firefox.sh.in 18 Jan 2007 20:19:14 -0000 1.16 @@ -67,15 +67,6 @@ ## -## XXX: UGLY HACK -## The Adobe/Macromedia Flash Player plugin is horribly broken and will -## cause the entire X server to lock up. This is just a temporary workaround. -## -XLIB_SKIP_ARGB_VISUALS=1 -export XLIB_SKIP_ARGB_VISUALS - - -## ## Set FONTCONFIG_PATH for Xft/fontconfig ## FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- firefox.spec 22 Dec 2006 22:18:17 -0000 1.165 +++ firefox.spec 18 Jan 2007 20:19:14 -0000 1.166 @@ -408,6 +408,9 @@ #--------------------------------------------------------------------- %changelog +* Thu Jan 18 2007 Christopher Aillon 2.0.0.1-3 +- Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed. + * Fri Dec 22 2006 Christopher Aillon 2.0.0.1-2 - Strip out some frequent warnings; they muddy up the build output From fedora-cvs-commits at redhat.com Thu Jan 18 20:19:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 15:19:48 -0500 Subject: rpms/firefox/devel firefox.spec,1.166,1.167 Message-ID: <200701182019.l0IKJmfu014066@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14052 Modified Files: firefox.spec Log Message: bump rev Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- firefox.spec 18 Jan 2007 20:19:14 -0000 1.166 +++ firefox.spec 18 Jan 2007 20:19:46 -0000 1.167 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 2.0.0.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet From fedora-cvs-commits at redhat.com Thu Jan 18 22:59:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 17:59:50 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.363, 1.364 anaconda.spec, 1.489, 1.490 sources, 1.487, 1.488 Message-ID: <200701182259.l0IMxoEJ006786@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6738/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.12-1 on branch devel from anaconda-11.2.0.12-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- .cvsignore 18 Jan 2007 19:09:30 -0000 1.363 +++ .cvsignore 18 Jan 2007 22:59:48 -0000 1.364 @@ -1 +1 @@ -anaconda-11.2.0.11.tar.bz2 +anaconda-11.2.0.12.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.489 retrieving revision 1.490 diff -u -r1.489 -r1.490 --- anaconda.spec 18 Jan 2007 19:09:30 -0000 1.489 +++ anaconda.spec 18 Jan 2007 22:59:48 -0000 1.490 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.11 +Version: 11.2.0.12 Release: 1 License: GPL Summary: Graphical system installer @@ -103,6 +103,13 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jan 18 2007 Jeremy Katz - 11.2.0.12-1 +- Fix so that package selection in the yum backend is actually enabled +- UI tweaks so that we work better with a real window manager +- Ensure that file contexts are reset to the right thing after a live CD copy +- Fix another ks.cfg traceback +- Make it easier to do a 32bit build on a 64bit host + * Thu Jan 18 2007 Jeremy Katz - 11.2.0.11-1 - Add backend for installing from a live CD - Make backend controllable from the installclass Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.487 retrieving revision 1.488 diff -u -r1.487 -r1.488 --- sources 18 Jan 2007 19:09:30 -0000 1.487 +++ sources 18 Jan 2007 22:59:48 -0000 1.488 @@ -1 +1 @@ -8419c2975e019b98d80279a294a32ecb anaconda-11.2.0.11.tar.bz2 +06e94d24f0f70d1ef7337a9c73be2349 anaconda-11.2.0.12.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 19 01:11:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 20:11:06 -0500 Subject: rpms/scim-bridge/FC-6 scim-bridge.spec,1.35,1.36 sources,1.23,1.24 Message-ID: <200701190111.l0J1B6C2027789@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim-bridge/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26633 Modified Files: scim-bridge.spec sources Log Message: - update to 0.4.9 - fixes hanging agent processes (#210772) - fixes movement of preedit with clicking (#217329) - protect update-gtk-immodules in %%post and %%postun - build qtimm again Index: scim-bridge.spec =================================================================== RCS file: /cvs/dist/rpms/scim-bridge/FC-6/scim-bridge.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- scim-bridge.spec 23 Oct 2006 09:51:04 -0000 1.35 +++ scim-bridge.spec 19 Jan 2007 01:11:01 -0000 1.36 @@ -1,17 +1,14 @@ -#%%define snapdate 20060929 -%define snapshot 0%{?snapdate:1} - -%define build_qt 0 +%define build_qt 1 Name: scim-bridge -Version: 0.4.7 +Version: 0.4.9 Release: 1%{?dist} Summary: SCIM Bridge Gtk IM module Group: System Environment/Libraries License: GPL and LGPL URL: http://www.scim-im.org/projects/scim_bridge -Source0: http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}%{?snapdate:-%{snapdate}}.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz Source1: xinput-scim-bridge-gtk Source2: xinput-scim-bridge-qt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,9 +16,6 @@ %if %{build_qt} BuildRequires: qt-devel %endif -%if %{snapshot} -Buildrequires: autoconf, automake, libtool -%endif # for new xinput files (fc6) Requires: scim >= 1.4.4-33 @@ -59,10 +53,7 @@ %prep -%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -%if %{snapshot} -./bootstrap -%endif +%setup -q %build @@ -96,11 +87,11 @@ %post gtk -%{_bindir}/update-gtk-immodules %{_host} +%{_bindir}/update-gtk-immodules %{_host} || : %postun gtk -%{_bindir}/update-gtk-immodules %{_host} +%{_bindir}/update-gtk-immodules %{_host} || : %files @@ -125,8 +116,17 @@ %changelog +* Fri Jan 19 2007 Jens Petersen - 0.4.9-1.fc6 +- update to 0.4.9 + - fixes hanging agent processes (#210772) + - fixes movement of preedit with clicking (#217329) +- protect update-gtk-immodules in %%post and %%postun +- build qtimm again + * Mon Oct 23 2006 Jens Petersen - 0.4.7-1.fc6 -- update to 0.4.7 release (fixes #208921, #209573) +- update to 0.4.7 release + - fixes underline in preedit for Hangul (#208921) + - fixes crash with long input with Chewing (#209573) - as of 0.4.6 now dual GPL/LGPL license - scim-bridge-0.4.5-key-event-order-206261.patch no longer needed Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-bridge/FC-6/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 23 Oct 2006 09:51:04 -0000 1.23 +++ sources 19 Jan 2007 01:11:01 -0000 1.24 @@ -1 +1 @@ -0d9364f0fd3d3e259cc434a1a6ee3574 scim-bridge-0.4.7.tar.gz +5997d4172e6602775e906f21eaf28552 scim-bridge-0.4.9.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 19 01:20:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 20:20:03 -0500 Subject: rpms/scim-tables/FC-6 scim-tables.spec,1.28,1.29 sources,1.7,1.8 Message-ID: <200701190120.l0J1K3kX022360@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim-tables/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21900 Modified Files: scim-tables.spec sources Log Message: sync with devel: - update to 0.5.7 release Index: scim-tables.spec =================================================================== RCS file: /cvs/dist/rpms/scim-tables/FC-6/scim-tables.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- scim-tables.spec 13 Jul 2006 21:47:40 -0000 1.28 +++ scim-tables.spec 19 Jan 2007 01:20:01 -0000 1.29 @@ -1,5 +1,3 @@ -%define with_libstdc_preview 0 - # set to include Japanese and Korean tables %define jk_tables 0 @@ -7,8 +5,8 @@ %define indic_tables 0 Name: scim-tables -Version: 0.5.6 -Release: 7 +Version: 0.5.7 +Release: 1%{?dist} Summary: SCIM Generic Table IMEngine License: GPL @@ -19,9 +17,6 @@ BuildRequires: scim-devel, gtk2-devel BuildRequires: gettext-devel automake libtool -%if %{with_libstdc_preview} -Buildrequires: libstdc++so7-devel -%endif %if !%{jk_tables} Obsoletes: scim-tables-japanese < 0.5.6, scim-tables-korean < 0.5.6 %endif @@ -208,22 +203,12 @@ %build -%if %{with_libstdc_preview} -export CXX=%{_bindir}/g++-libstdc++-so_7 -%endif %configure --disable-static -%if %{with_libstdc_preview} -# tweak libtool for libstdc++-so7 -sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool -%endif make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -%if %{with_libstdc_preview} -export CXX=%{_bindir}/g++-libstdc++-so_7 -%endif make DESTDIR=${RPM_BUILD_ROOT} install # kill *.a and *.la files @@ -452,6 +437,9 @@ %changelog +* Fri Jan 19 2007 Jens Petersen - 0.5.7-1.fc6 +- update to 0.5.7 release + * Wed Jul 12 2006 Jesse Keating - 0.5.6-7 - rebuild - Add missing br automake, gettext, libtool Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-tables/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Jan 2006 08:51:19 -0000 1.7 +++ sources 19 Jan 2007 01:20:01 -0000 1.8 @@ -1 +1 @@ -ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz +58d7f7dd231d73ef179e072b3124ebac scim-tables-0.5.7.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 19 03:36:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 18 Jan 2007 22:36:24 -0500 Subject: rpms/libsoup/devel libsoup.spec,1.48,1.49 Message-ID: <200701190336.l0J3aOJu001877@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/libsoup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1863 Modified Files: libsoup.spec Log Message: - Minor cosmetic changes. Index: libsoup.spec =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- libsoup.spec 9 Jan 2007 01:42:59 -0000 1.48 +++ libsoup.spec 19 Jan 2007 03:36:21 -0000 1.49 @@ -7,8 +7,8 @@ Group: Development/Libraries Summary: Soup, an HTTP library implementation URL: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/ -BuildRoot: %{_tmppath}/%{name}-root -Source: %{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source: libsoup-%{version}.tar.bz2 ### Dependencies ### @@ -48,7 +48,7 @@ you to develop applications that use the libsoup library. %prep -%setup -q +%setup -q -n libsoup-%{version} %build %configure --disable-gtk-doc From fedora-cvs-commits at redhat.com Fri Jan 19 06:26:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 01:26:38 -0500 Subject: rpms/autofs/devel autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch, NONE, 1.1 autofs.spec, 1.177, 1.178 Message-ID: <200701190626.l0J6QcCl018073@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18057 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch Log Message: * Thu Jan 18 2007 Ian Kent - 5.0.1-0.rc3.11 - correct check for busy offset mounts before offset umount (bz 222872). autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch: CHANGELOG | 1 + lib/parse_subs.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch --- diff --git a/CHANGELOG b/CHANGELOG index 8ca790a..b77c2cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - remove redundant rpath link option. - ignore "winbind" if it appears in "automount" nsswitch.conf. - fix another expire regression introduced in the "mitigate manual umount" patch. +- correct check for busy offset mounts before offset umount. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/parse_subs.c b/lib/parse_subs.c index c98989c..6666aa5 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -454,10 +454,12 @@ int umount_multi_triggers(struct autofs_point *ap, char *root, struct mapent *me * nonstrict mount fail. */ oe_base = oe->key + strlen(root); - left = umount_multi_triggers(ap, root, oe, oe_base); + left += umount_multi_triggers(ap, root, oe, oe_base); + debug(LOGOPT_ANY, "check %s %d", oe->key, oe->ioctlfd); if (oe->ioctlfd != -1) left++; + debug(LOGOPT_ANY, "left %d", left); } if (left) Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- autofs.spec 17 Jan 2007 16:05:41 -0000 1.177 +++ autofs.spec 19 Jan 2007 06:26:36 -0000 1.178 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.9 +%define release 0.rc3.11 Version: %{version} Release: %{release} Epoch: 1 @@ -15,6 +15,7 @@ Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch Patch4: autofs-5.0.1-rc3-correct-expire-check.patch +Patch5: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 @@ -117,6 +118,9 @@ %{_libdir}/autofs/* %changelog +* Thu Jan 18 2007 Ian Kent - 5.0.1-0.rc3.11 +- correct check for busy offset mounts before offset umount (bz 222872). + * Wed Jan 17 2007 Ian Kent - 5.0.1-0.rc3.9 - fix another expire regression introduced in the "mitigate manual umount" patch (bz 222872). From fedora-cvs-commits at redhat.com Fri Jan 19 06:32:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 01:32:29 -0500 Subject: rpms/autofs/devel autofs.spec,1.178,1.179 Message-ID: <200701190632.l0J6WTZu032577@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32229 Modified Files: autofs.spec Log Message: - and actually apply the new patch in the build. Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- autofs.spec 19 Jan 2007 06:26:36 -0000 1.178 +++ autofs.spec 19 Jan 2007 06:32:27 -0000 1.179 @@ -62,6 +62,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} From fedora-cvs-commits at redhat.com Fri Jan 19 06:34:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 01:34:55 -0500 Subject: rpms/autofs/FC-6 autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch, NONE, 1.1 autofs.spec, 1.167, 1.168 Message-ID: <200701190634.l0J6YtOp001912@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv1696 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch Log Message: * Thu Jan 18 2007 Ian Kent - 5.0.1-0.rc3.10 - correct check for busy offset mounts before offset umount (bz 222872). autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch: CHANGELOG | 1 + lib/parse_subs.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch --- diff --git a/CHANGELOG b/CHANGELOG index 8ca790a..b77c2cd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - remove redundant rpath link option. - ignore "winbind" if it appears in "automount" nsswitch.conf. - fix another expire regression introduced in the "mitigate manual umount" patch. +- correct check for busy offset mounts before offset umount. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/parse_subs.c b/lib/parse_subs.c index c98989c..6666aa5 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -454,10 +454,12 @@ int umount_multi_triggers(struct autofs_point *ap, char *root, struct mapent *me * nonstrict mount fail. */ oe_base = oe->key + strlen(root); - left = umount_multi_triggers(ap, root, oe, oe_base); + left += umount_multi_triggers(ap, root, oe, oe_base); + debug(LOGOPT_ANY, "check %s %d", oe->key, oe->ioctlfd); if (oe->ioctlfd != -1) left++; + debug(LOGOPT_ANY, "left %d", left); } if (left) Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- autofs.spec 17 Jan 2007 16:12:39 -0000 1.167 +++ autofs.spec 19 Jan 2007 06:34:53 -0000 1.168 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.8 +%define release 0.rc3.10 Version: %{version} Release: %{release} Epoch: 1 @@ -15,6 +15,7 @@ Patch2: autofs-5.0.1-rc3-remove-rpath-link-option.patch Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch Patch4: autofs-5.0.1-rc3-correct-expire-check.patch +Patch5: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 @@ -61,6 +62,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -117,6 +119,9 @@ %{_libdir}/autofs/* %changelog +* Thu Jan 18 2007 Ian Kent - 5.0.1-0.rc3.10 +- correct check for busy offset mounts before offset umount (bz 222872). + * Wed Jan 17 2007 Ian Kent - 5.0.1-0.rc3.8 - fix another expire regression introduced in the "mitigate manual umount" patch (bz 222872). From fedora-cvs-commits at redhat.com Fri Jan 19 09:51:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 04:51:56 -0500 Subject: rpms/lftp/devel .cvsignore,1.28,1.29 sources,1.28,1.29 Message-ID: <200701190951.l0J9pteh012276@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/lftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12261 Modified Files: .cvsignore sources Log Message: Upgrade tarball package Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 17 Jul 2006 20:02:04 -0000 1.28 +++ .cvsignore 19 Jan 2007 09:51:53 -0000 1.29 @@ -18,3 +18,4 @@ lftp-3.4.6.tar.bz2 lftp-3.4.7.tar.bz2 lftp-3.5.1.tar.bz2 +lftp-3.5.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 17 Jul 2006 20:02:05 -0000 1.28 +++ sources 19 Jan 2007 09:51:53 -0000 1.29 @@ -1 +1 @@ -c6d48782cdad4759000bf7cd24555723 lftp-3.5.1.tar.bz2 +242aa0b01be79942bb9bcdd2a4b079ba lftp-3.5.9.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 19 10:17:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 05:17:25 -0500 Subject: rpms/icu/devel icu.icu5506.multiplevowels.patch, 1.1, 1.2 icu.spec, 1.44, 1.45 Message-ID: <200701191017.l0JAHPde000666@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31142 Modified Files: icu.icu5506.multiplevowels.patch icu.spec Log Message: Resolves: rhbz#214948 icu.icu5506.multiplevowels.patch icu.icu5506.multiplevowels.patch: IndicReordering.cpp | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletion(-) Index: icu.icu5506.multiplevowels.patch =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.icu5506.multiplevowels.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icu.icu5506.multiplevowels.patch 10 Nov 2006 10:00:29 -0000 1.1 +++ icu.icu5506.multiplevowels.patch 19 Jan 2007 10:17:23 -0000 1.2 @@ -10,3 +10,52 @@ {-1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // 6 - vowel mark {-1, -1, -1, -1, -1, -1, 3, 2, -1, -1, -1, -1, -1, -1, -1}, // 7 - consonant virama ZWJ, consonant ZWJ virama {-1, 6, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, -1}, // 8 - independent vowels that can take a virama +@@ -423,6 +423,48 @@ + + state = stateTable[state][charClass & CF_CLASS_MASK]; + ++ /*for the components of split matra*/ ++ if ((charCount >= cursor + 3) && ++ (chars[cursor] == 0x0DD9 && chars[cursor + 1] == 0x0DCF && chars[cursor + 2] == 0x0DCA)) { /*for 3 split matra of Sinhala*/ ++ return cursor + 3; ++ } ++ else if ((charCount >= cursor + 3) && ++ (chars[cursor] == 0x0CC6 && chars[cursor + 1] == 0x0CC2 && chars[cursor + 2] == 0x0CD5)) { /*for 3 split matra of Kannada*/ ++ return cursor + 3; ++ } ++ /*for 2 split matra*/ ++ else if (charCount >= cursor + 2) { ++ /*for Bengali*/ ++ if ((chars[cursor] == 0x09C7 && chars[cursor + 1] == 0x09BE) || ++ (chars[cursor] == 0x09C7 && chars[cursor + 1] == 0x09D7) || ++ /*for Oriya*/ ++ (chars[cursor] == 0x0B47 && chars[cursor + 1] == 0x0B3E) || ++ (chars[cursor] == 0x0B47 && chars[cursor + 1] == 0x0B56) || ++ (chars[cursor] == 0x0B47 && chars[cursor + 1] == 0x0B57) || ++ /*for Tamil*/ ++ (chars[cursor] == 0x0BC6 && chars[cursor + 1] == 0x0BBE) || ++ (chars[cursor] == 0x0BC6 && chars[cursor + 1] == 0x0BD7) || ++ (chars[cursor] == 0x0BC7 && chars[cursor + 1] == 0x0BBE) || ++ /*for Malayalam*/ ++ (chars[cursor] == 0x0D46 && chars[cursor + 1] == 0x0D3E) || ++ (chars[cursor] == 0x0D46 && chars[cursor + 1] == 0x0D57) || ++ (chars[cursor] == 0x0D47 && chars[cursor + 1] == 0x0D3E) || ++ /*for Sinhala*/ ++ (chars[cursor] == 0x0DD9 && chars[cursor + 1] == 0x0DCA) || ++ (chars[cursor] == 0x0DD9 && chars[cursor + 1] == 0x0DCF) || ++ (chars[cursor] == 0x0DD9 && chars[cursor + 1] == 0x0DDF) || ++ (chars[cursor] == 0x0DDC && chars[cursor + 1] == 0x0DCA) || ++ /*for Telugu*/ ++ (chars[cursor] == 0x0C46 && chars[cursor + 1] == 0x0C56) || ++ /*for Kannada*/ ++ (chars[cursor] == 0x0CBF && chars[cursor + 1] == 0x0CD5) || ++ (chars[cursor] == 0x0CC6 && chars[cursor + 1] == 0x0CD5) || ++ (chars[cursor] == 0x0CC6 && chars[cursor + 1] == 0x0CD6) || ++ (chars[cursor] == 0x0CC6 && chars[cursor + 1] == 0x0CC2) || ++ (chars[cursor] == 0x0CCA && chars[cursor + 1] == 0x0CD5)) ++ return cursor + 2; ++ } ++ + if (state < 0) { + break; + } Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- icu.spec 9 Jan 2007 14:45:19 -0000 1.44 +++ icu.spec 19 Jan 2007 10:17:23 -0000 1.45 @@ -1,6 +1,6 @@ Name: icu Version: 3.6 -Release: 14 +Release: 15 Summary: International Components for Unicode Group: System Environment/Libraries @@ -154,6 +154,9 @@ %changelog +* Fri Jan 19 2007 Caolan McNamara - 3.6-15 +- Resolves: rhbz#214948 icu.icu5506.multiplevowels.patch + * Thu Jan 09 2007 Caolan McNamara - 3.6-14 - Related: rhbz#216089 add icu.icu5557.safety.patch From fedora-cvs-commits at redhat.com Fri Jan 19 12:17:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 07:17:10 -0500 Subject: rpms/vsftpd/devel vsftpd-2.0.5-uniq_rename.patch, NONE, 1.1 vsftpd.spec, 1.59, 1.60 vsftpd-uniq_rename.patch, 1.1, NONE Message-ID: <200701191217.l0JCHACx029125@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/vsftpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27310 Modified Files: vsftpd.spec Added Files: vsftpd-2.0.5-uniq_rename.patch Removed Files: vsftpd-uniq_rename.patch Log Message: Added lost patch uniq_rename vsftpd-2.0.5-uniq_rename.patch: postlogin.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) --- NEW FILE vsftpd-2.0.5-uniq_rename.patch --- --- vsftpd-2.0.3/postlogin.c.uniq_rename 2005-03-19 12:15:59.000000000 +0100 +++ vsftpd-2.0.3/postlogin.c 2005-07-18 15:52:20.000000000 +0200 @@ -70,7 +70,7 @@ static void check_abor(struct vsf_session* p_sess); static void handle_sigurg(void* p_private); static void handle_upload_common(struct vsf_session* p_sess, int is_append, - int is_unique); + int is_unique, int uniq_rename); static void get_unique_filename(struct mystr* p_outstr, const struct mystr* p_base); static int data_transfer_checks_ok(struct vsf_session* p_sess); @@ -931,11 +931,11 @@ static void handle_stor(struct vsf_session* p_sess) { - handle_upload_common(p_sess, 0, 0); + handle_upload_common(p_sess, 0, 0, 1); } static void -handle_upload_common(struct vsf_session* p_sess, int is_append, int is_unique) +handle_upload_common(struct vsf_session* p_sess, int is_append, int is_unique, int uniq_rename) { static struct mystr s_filename; struct mystr* p_filename; @@ -952,6 +952,12 @@ p_filename = &p_sess->ftp_arg_str; if (is_unique) { + if (uniq_rename) + if (!vsf_access_check_file(p_filename)) + { + vsf_cmdio_write(p_sess, FTP_NOPERM, "Permission denied."); + return; + } get_unique_filename(&s_filename, p_filename); p_filename = &s_filename; } @@ -1057,6 +1063,14 @@ port_cleanup(p_sess); pasv_cleanup(p_sess); vsf_sysutil_close(new_file_fd); + if (is_unique && uniq_rename) + /* NOTE - might overwrite destination file. Not a concern because the same + * could be accomplished with DELE. + */ + { + printf("I'm here\n");//vsf_cmdio_write(p_sess, FTP_TRANSFEROK, "IM HERE."); + str_rename(p_filename, &p_sess->ftp_arg_str); + } } static void @@ -1477,7 +1491,7 @@ static void handle_appe(struct vsf_session* p_sess) { - handle_upload_common(p_sess, 1, 0); + handle_upload_common(p_sess, 1, 0, 0); } static void @@ -1655,7 +1669,7 @@ static void handle_stou(struct vsf_session* p_sess) { - handle_upload_common(p_sess, 0, 1); + handle_upload_common(p_sess, 0, 1, 0); } static void @@ -1804,4 +1818,3 @@ } } } - Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- vsftpd.spec 18 Jan 2007 09:07:07 -0000 1.59 +++ vsftpd.spec 19 Jan 2007 12:17:08 -0000 1.60 @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -39,6 +39,7 @@ Patch24: vsftpd-2.0.5-file_stat.patch Patch25: vsftpd-2.0.5-confspell.patch Patch26: vsftpd-2.0.5-bind_denied.patch +Patch27: vsftpd-2.0.5-uniq_rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} @@ -92,6 +93,7 @@ %patch24 -p1 -b .file_stat %patch25 -p1 %patch26 -p1 -b .bind_denied +%patch27 -p1 -b .uniq_rename %build %ifarch s390x @@ -150,6 +152,10 @@ /var/ftp %changelog +* Fri Jan 19 2007 Maros Barabas - 2.0.5-13 +- add lost patch: don't die when no user config file is present +- Resolves #166986 + * Thu Jan 18 2007 Radek Vok??l - 2.0.5-12 - add dist tag - add buildrequires tcp_wrappers-devel --- vsftpd-uniq_rename.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 19 12:23:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 07:23:16 -0500 Subject: rpms/vsftpd/FC-6 vsftpd-2.0.5-uniq_rename.patch, NONE, 1.1 vsftpd.spec, 1.52, 1.53 vsftpd-uniq_rename.patch, 1.1, NONE Message-ID: <200701191223.l0JCNG0m007462@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/vsftpd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7446 Modified Files: vsftpd.spec Added Files: vsftpd-2.0.5-uniq_rename.patch Removed Files: vsftpd-uniq_rename.patch Log Message: Added lost patch uniq_rename vsftpd-2.0.5-uniq_rename.patch: postlogin.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) --- NEW FILE vsftpd-2.0.5-uniq_rename.patch --- --- vsftpd-2.0.3/postlogin.c.uniq_rename 2005-03-19 12:15:59.000000000 +0100 +++ vsftpd-2.0.3/postlogin.c 2005-07-18 15:52:20.000000000 +0200 @@ -70,7 +70,7 @@ static void check_abor(struct vsf_session* p_sess); static void handle_sigurg(void* p_private); static void handle_upload_common(struct vsf_session* p_sess, int is_append, - int is_unique); + int is_unique, int uniq_rename); static void get_unique_filename(struct mystr* p_outstr, const struct mystr* p_base); static int data_transfer_checks_ok(struct vsf_session* p_sess); @@ -931,11 +931,11 @@ static void handle_stor(struct vsf_session* p_sess) { - handle_upload_common(p_sess, 0, 0); + handle_upload_common(p_sess, 0, 0, 1); } static void -handle_upload_common(struct vsf_session* p_sess, int is_append, int is_unique) +handle_upload_common(struct vsf_session* p_sess, int is_append, int is_unique, int uniq_rename) { static struct mystr s_filename; struct mystr* p_filename; @@ -952,6 +952,12 @@ p_filename = &p_sess->ftp_arg_str; if (is_unique) { + if (uniq_rename) + if (!vsf_access_check_file(p_filename)) + { + vsf_cmdio_write(p_sess, FTP_NOPERM, "Permission denied."); + return; + } get_unique_filename(&s_filename, p_filename); p_filename = &s_filename; } @@ -1057,6 +1063,14 @@ port_cleanup(p_sess); pasv_cleanup(p_sess); vsf_sysutil_close(new_file_fd); + if (is_unique && uniq_rename) + /* NOTE - might overwrite destination file. Not a concern because the same + * could be accomplished with DELE. + */ + { + printf("I'm here\n");//vsf_cmdio_write(p_sess, FTP_TRANSFEROK, "IM HERE."); + str_rename(p_filename, &p_sess->ftp_arg_str); + } } static void @@ -1477,7 +1491,7 @@ static void handle_appe(struct vsf_session* p_sess) { - handle_upload_common(p_sess, 1, 0); + handle_upload_common(p_sess, 1, 0, 0); } static void @@ -1655,7 +1669,7 @@ static void handle_stou(struct vsf_session* p_sess) { - handle_upload_common(p_sess, 0, 1); + handle_upload_common(p_sess, 0, 1, 0); } static void @@ -1804,4 +1818,3 @@ } } } - Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/FC-6/vsftpd.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- vsftpd.spec 28 Aug 2006 15:46:01 -0000 1.52 +++ vsftpd.spec 19 Jan 2007 12:23:14 -0000 1.53 @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 8 +Release: 9 License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -36,6 +36,7 @@ Patch21: vsftpd-2.0.5-correct_comments.patch Patch22: vsftpd-2.0.5-man.patch Patch23: vsftpd-2.0.4-filter.patch +Patch24: vsftpd-2.0.5-uniq_rename.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} @@ -86,6 +87,7 @@ %patch21 -p1 -b .comments %patch22 -p1 -b .manp %patch23 -p1 -b .filter +%patch24 -p1 -b .uniq_rename %build %ifarch s390x @@ -144,6 +146,10 @@ /var/ftp %changelog +* Fri Jan 19 2007 Maros Barabas - 2.0.5-9 +- add lost patch: don't die when no user config file is present +- Resolves #166986 + * Mon Aug 28 2006 Maros Barabas - 2.0.5-8 - added forgotten patch to make filename filter (#174764) --- vsftpd-uniq_rename.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 19 13:04:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:04:44 -0500 Subject: rpms/alsa-lib/devel .cvsignore, 1.24, 1.25 alsa-lib.spec, 1.50, 1.51 sources, 1.27, 1.28 Message-ID: <200701191304.l0JD4iSB001454@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1404 Modified Files: .cvsignore alsa-lib.spec sources Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 11 Dec 2006 22:17:01 -0000 1.24 +++ .cvsignore 19 Jan 2007 13:04:42 -0000 1.25 @@ -11,3 +11,4 @@ alsa-lib-1.0.12rc2.tar.bz2 alsa-lib-1.0.12.tar.bz2 alsa-lib-1.0.14rc1.tar.bz2 +alsa-lib-1.0.14rc2.tar.bz2 Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- alsa-lib.spec 11 Dec 2006 22:17:01 -0000 1.50 +++ alsa-lib.spec 19 Jan 2007 13:04:42 -0000 1.51 @@ -1,11 +1,11 @@ %define version_main 1.0.14 -%define prever rc1 +%define prever rc2 %define prever_dot .%{prever} Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: %{version_main} -Release: 0.1%{?prever_dot}%{?dist} +Release: 0.2%{?prever_dot}%{?dist} License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2 @@ -90,6 +90,9 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Fri Jan 19 2007 Martin Stransky 1.0.14-0.2.rc2 +- new upstream + * Mon Dec 11 2006 Martin Stransky 1.0.14-0.1.rc1 - new upstream Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 11 Dec 2006 22:17:01 -0000 1.27 +++ sources 19 Jan 2007 13:04:42 -0000 1.28 @@ -1 +1 @@ -6e45bb92e9162ffaeb26395e8210971f alsa-lib-1.0.14rc1.tar.bz2 +7ea3319690672d4bbd5f950947b705b7 alsa-lib-1.0.14rc2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 19 13:07:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:07:17 -0500 Subject: rpms/alsa-utils/devel .cvsignore, 1.19, 1.20 alsa-utils.spec, 1.48, 1.49 sources, 1.22, 1.23 Message-ID: <200701191307.l0JD7HTs003451@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3397 Modified Files: .cvsignore alsa-utils.spec sources Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 11 Dec 2006 22:12:08 -0000 1.19 +++ .cvsignore 19 Jan 2007 13:07:15 -0000 1.20 @@ -12,3 +12,4 @@ alsa-utils-1.0.12rc2.tar.bz2 alsa-utils-1.0.12.tar.bz2 alsa-utils-1.0.14rc1.tar.bz2 +alsa-utils-1.0.14rc2.tar.bz2 Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- alsa-utils.spec 10 Jan 2007 10:24:44 -0000 1.48 +++ alsa-utils.spec 19 Jan 2007 13:07:15 -0000 1.49 @@ -1,10 +1,10 @@ -%define prever rc1 +%define prever rc2 %define prever_dot .%{prever} Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.14 -Release: 0.2%{?prever_dot}%{?dist} +Release: 0.3%{?prever_dot}%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -68,6 +68,9 @@ /usr/share/locale/* %changelog +* Fri Jan 19 2007 Martin Stransky 1.0.14-0.3.rc2 +- new upstream + * Wed Jan 10 2007 Martin Stransky 1.0.14-0.2.rc1 - added a config line for hda-intel driver Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 11 Dec 2006 22:12:08 -0000 1.22 +++ sources 19 Jan 2007 13:07:15 -0000 1.23 @@ -1 +1 @@ -931b22590a3a897d71c92fef6b1c1949 alsa-utils-1.0.14rc1.tar.bz2 +7e9f132b34b7773d2a29b0ff14719a49 alsa-utils-1.0.14rc2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 19 13:07:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:07:33 -0500 Subject: rpms/star/devel .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 star-1.5-newMake.patch, 1.1, 1.2 star-1.5-selinux.patch, 1.5, 1.6 star.spec, 1.30, 1.31 Message-ID: <200701191307.l0JD7Xt7003722@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/star/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3612 Modified Files: .cvsignore sources star-1.5-newMake.patch star-1.5-selinux.patch star.spec Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/star/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 8 Aug 2006 12:03:38 -0000 1.16 +++ .cvsignore 19 Jan 2007 13:07:31 -0000 1.17 @@ -1 +1 @@ -star-1.5a75.tar.bz2 +star-1.5a76.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/star/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 8 Aug 2006 12:03:38 -0000 1.17 +++ sources 19 Jan 2007 13:07:31 -0000 1.18 @@ -1 +1 @@ -5caa472e213964065baed871ca0f06f7 star-1.5a75.tar.bz2 +f4707cf0eb469e877cbcfc84f9e18227 star-1.5a76.tar.bz2 star-1.5-newMake.patch: Defaults.linux | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) Index: star-1.5-newMake.patch =================================================================== RCS file: /cvs/dist/rpms/star/devel/star-1.5-newMake.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- star-1.5-newMake.patch 22 Nov 2004 14:57:57 -0000 1.1 +++ star-1.5-newMake.patch 19 Jan 2007 13:07:31 -0000 1.2 @@ -1,5 +1,5 @@ ---- star-1.5/DEFAULTS/Defaults.linux.newMake 2003-02-16 01:01:48.000000000 +0100 -+++ star-1.5/DEFAULTS/Defaults.linux 2004-11-22 12:29:02.973507632 +0100 +--- star-1.5/DEFAULTS/Defaults.linux.newMake 2006-07-21 14:53:23.000000000 +0200 ++++ star-1.5/DEFAULTS/Defaults.linux 2007-01-18 15:41:19.000000000 +0100 @@ -8,8 +8,8 @@ # Compiler stuff # @@ -8,10 +8,10 @@ -#DEFCCOM= gcc +#DEFCCOM= cc +DEFCCOM= gcc + ########################################################################### # - # If the next line is commented out, compilation is done with max warn level -@@ -18,21 +18,21 @@ +@@ -28,21 +28,21 @@ ########################################################################### CWARNOPTS= star-1.5-selinux.patch: conf/configure.in | 10 ++++++++++ conf/rules.cnf.in | 1 + star/Makefile | 3 ++- star/cpio.mk | 3 ++- star/extract.c | 11 +++++++++++ star/gnutar.mk | 3 ++- star/pax.mk | 3 ++- star/star.c | 9 +++++++++ star/star.mk | 3 ++- star/star_fat.mk | 3 ++- star/starsubs.h | 5 +++++ star/suntar.mk | 3 ++- star/xattr.c | 27 +++++++++++++++++++++++++++ 13 files changed, 77 insertions(+), 7 deletions(-) Index: star-1.5-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/star/devel/star-1.5-selinux.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- star-1.5-selinux.patch 22 Feb 2006 10:14:45 -0000 1.5 +++ star-1.5-selinux.patch 19 Jan 2007 13:07:31 -0000 1.6 @@ -1,6 +1,6 @@ ---- star-1.5/conf/configure.in.selinux 2006-02-07 11:23:13.000000000 -0500 -+++ star-1.5/conf/configure.in 2006-02-22 10:11:28.000000000 -0500 -@@ -357,6 +357,15 @@ +--- star-1.5/conf/configure.in.selinux 2006-10-20 15:33:49.000000000 +0200 ++++ star-1.5/conf/configure.in 2007-01-18 15:51:43.000000000 +0100 +@@ -401,6 +401,15 @@ echo no fi @@ -16,28 +16,27 @@ dnl Checks for OS madness. AC_BROKEN_LINUX_EXT2_FS_H AC_BROKEN_SRC_LINUX_EXT2_FS_H -@@ -373,5 +382,6 @@ - AC_SUBST(lib_acl_test) - AC_SUBST(lib_attr) +@@ -420,5 +429,6 @@ AC_SUBST(lib_secdb) + AC_SUBST(lib_pthread) + AC_SUBST(lib_rt) +AC_SUBST(lib_selinux) AC_OUTPUT(rules.cnf) ---- star-1.5/conf/rules.cnf.in.selinux 2005-12-20 06:41:02.000000000 -0500 -+++ star-1.5/conf/rules.cnf.in 2006-02-22 10:12:56.000000000 -0500 -@@ -10,3 +10,5 @@ - LIB_ACL_TEST= @lib_acl_test@ - LIB_ATTR = @lib_attr@ +--- star-1.5/conf/rules.cnf.in.selinux 2006-09-16 22:01:41.000000000 +0200 ++++ star-1.5/conf/rules.cnf.in 2007-01-18 15:52:05.000000000 +0100 +@@ -14,3 +14,4 @@ LIB_SECDB = @lib_secdb@ + LIB_PTHREAD = @lib_pthread@ + LIB_RT = @lib_rt@ +LIB_SELINUX = @lib_selinux@ -+ ---- star-1.5/star/pax.mk.selinux 2006-02-02 10:00:31.000000000 -0500 -+++ star-1.5/star/pax.mk 2006-02-22 10:10:09.000000000 -0500 +--- star-1.5/star/pax.mk.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/pax.mk 2007-01-18 15:53:07.000000000 +0100 @@ -17,6 +17,7 @@ CPPOPTS += -DUSE_LARGEFILES CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR -+CPPOPTS += -DWITH_SELINUX ++CPPOPTS += -DWITH_SELINUX CPPOPTS += -DUSE_FFLAGS CPPOPTS += -DPAX CFILES= pax.c header.c cpiohdr.c xheader.c xattr.c \ @@ -50,8 +49,8 @@ XMK_FILE= spaxman.mk ########################################################################### ---- star-1.5/star/star.mk.selinux 2005-08-28 07:22:30.000000000 -0400 -+++ star-1.5/star/star.mk 2006-02-22 10:10:09.000000000 -0500 +--- star-1.5/star/star.mk.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/star.mk 2007-01-18 15:54:11.000000000 +0100 @@ -19,6 +19,7 @@ CPPOPTS += -DUSE_XATTR CPPOPTS += -DUSE_FFLAGS @@ -69,18 +68,18 @@ XMK_FILE= Makefile.man starformatman.mk ########################################################################### ---- star-1.5/star/star_fat.mk.selinux 2005-11-01 15:53:51.000000000 -0500 -+++ star-1.5/star/star_fat.mk 2006-02-22 10:10:09.000000000 -0500 -@@ -28,6 +28,7 @@ - CPPOPTS += -DUSE_FFLAGS +--- star-1.5/star/star_fat.mk.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/star_fat.mk 2007-01-18 15:54:39.000000000 +0100 +@@ -29,6 +29,7 @@ CPPOPTS += -DCOPY_LINKS_DELAYED CPPOPTS += -DSTAR_FAT + CPPOPTS += -DSCHILY_PRINT +CPPOPTS += -DWITH_SELINUX CFILES= star_fat.c header.c cpiohdr.c xheader.c xattr.c \ list.c extract.c create.c append.c diff.c restore.c \ remove.c star_unix.c acl_unix.c acltext.c fflags.c \ -@@ -48,7 +49,7 @@ - find.h gettnum.h fetchdir.h walk.h find_list.h mem.h find_misc.h +@@ -49,7 +50,7 @@ + find.h gettnum.h fetchdir.h walk.h find_list.h find_misc.h #LIBS= -lunos #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib -LIBS= -ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) @@ -88,18 +87,18 @@ XMK_FILE= Makefile.man starformatman.mk scpioman.mk gnutarman.mk \ spaxman.mk suntarman.mk Makefile.dfl ---- star-1.5/star/Makefile.selinux 2005-11-01 15:53:51.000000000 -0500 -+++ star-1.5/star/Makefile 2006-02-22 10:10:09.000000000 -0500 +--- star-1.5/star/Makefile.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/Makefile 2007-01-18 15:55:29.000000000 +0100 @@ -25,6 +25,7 @@ CPPOPTS += -DUSE_FIND CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR -+CPPOPTS += -DWITH_SELINUX ++CPPOPTS += -DWITH_SELINUX CPPOPTS += -DUSE_FFLAGS CPPOPTS += -DCOPY_LINKS_DELAYED CPPOPTS += -DSTAR_FAT -@@ -48,7 +49,7 @@ - find.h gettnum.h fetchdir.h walk.h find_list.h mem.h find_misc.h +@@ -49,7 +50,7 @@ + find.h gettnum.h fetchdir.h walk.h find_list.h find_misc.h #LIBS= -lunos #LIBS= -lschily -lc /usr/local/lib/gcc-gnulib -LIBS= -ldeflt -lrmt -lschily $(LIB_ACL) $(LIB_ATTR) $(LIB_SOCKET) @@ -107,9 +106,9 @@ XMK_FILE= Makefile.man starformatman.mk scpioman.mk gnutarman.mk \ spaxman.mk suntarman.mk Makefile.dfl ---- star-1.5/star/star.c.selinux 2006-02-18 14:09:39.000000000 -0500 -+++ star-1.5/star/star.c 2006-02-22 10:10:09.000000000 -0500 -@@ -42,6 +42,10 @@ +--- star-1.5/star/star.c.selinux 2006-11-20 14:31:30.000000000 +0100 ++++ star-1.5/star/star.c 2007-01-18 15:56:46.000000000 +0100 +@@ -45,6 +45,10 @@ #include "starsubs.h" #include "checkerr.h" @@ -120,7 +119,7 @@ EXPORT int main __PR((int ac, char **av)); LOCAL void star_create __PR((int ac, char *const *av)); LOCAL void checkdumptype __PR((GINFO *gp)); -@@ -375,6 +379,11 @@ +@@ -382,6 +386,11 @@ comerr("Panic cannot set back effective uid.\n"); } my_uid = geteuid(); @@ -132,9 +131,9 @@ /* * WARNING: We now are no more able to open a new remote connection * unless we have been called by root. ---- star-1.5/star/extract.c.selinux 2005-11-13 08:57:21.000000000 -0500 -+++ star-1.5/star/extract.c 2006-02-22 10:14:45.000000000 -0500 -@@ -224,6 +224,17 @@ +--- star-1.5/star/extract.c.selinux 2006-10-15 15:51:44.000000000 +0200 ++++ star-1.5/star/extract.c 2007-01-18 15:57:57.000000000 +0100 +@@ -233,6 +233,17 @@ continue; } #endif @@ -152,8 +151,8 @@ if (finfo.f_flags & F_BAD_META) { if (!void_bad(&finfo)) break; ---- star-1.5/star/cpio.mk.selinux 2006-02-02 10:01:18.000000000 -0500 -+++ star-1.5/star/cpio.mk 2006-02-22 10:10:09.000000000 -0500 +--- star-1.5/star/cpio.mk.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/cpio.mk 2007-01-18 15:58:23.000000000 +0100 @@ -18,6 +18,7 @@ CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR @@ -171,8 +170,8 @@ XMK_FILE= scpioman.mk ########################################################################### ---- star-1.5/star/gnutar.mk.selinux 2006-02-02 10:00:31.000000000 -0500 -+++ star-1.5/star/gnutar.mk 2006-02-22 10:10:09.000000000 -0500 +--- star-1.5/star/gnutar.mk.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/gnutar.mk 2007-01-18 15:59:13.000000000 +0100 @@ -18,6 +18,7 @@ CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR @@ -190,8 +189,8 @@ XMK_FILE= gnutarman.mk ########################################################################### ---- star-1.5/star/suntar.mk.selinux 2006-02-02 10:00:31.000000000 -0500 -+++ star-1.5/star/suntar.mk 2006-02-22 10:10:09.000000000 -0500 +--- star-1.5/star/suntar.mk.selinux 2006-11-05 02:52:19.000000000 +0100 ++++ star-1.5/star/suntar.mk 2007-01-18 15:59:56.000000000 +0100 @@ -18,6 +18,7 @@ CPPOPTS += -DUSE_ACL CPPOPTS += -DUSE_XATTR @@ -209,9 +208,9 @@ XMK_FILE= suntarman.mk ########################################################################### ---- star-1.5/star/starsubs.h.selinux 2005-11-01 16:32:18.000000000 -0500 -+++ star-1.5/star/starsubs.h 2006-02-22 10:10:09.000000000 -0500 -@@ -301,6 +301,11 @@ +--- star-1.5/star/starsubs.h.selinux 2006-11-05 02:48:13.000000000 +0100 ++++ star-1.5/star/starsubs.h 2007-01-18 16:01:07.000000000 +0100 +@@ -296,6 +296,11 @@ extern BOOL get_xattr __PR((register FINFO *info)); extern BOOL set_xattr __PR((register FINFO *info)); extern void free_xattr __PR((star_xattr_t **xattr)); @@ -223,9 +222,9 @@ #endif /* ---- star-1.5/star/xattr.c.selinux 2006-02-13 20:00:40.000000000 -0500 -+++ star-1.5/star/xattr.c 2006-02-22 10:16:44.000000000 -0500 -@@ -181,6 +181,29 @@ +--- star-1.5/star/xattr.c.selinux 2006-09-13 18:24:20.000000000 +0200 ++++ star-1.5/star/xattr.c 2007-01-18 16:02:59.000000000 +0100 +@@ -184,6 +184,29 @@ #endif /* USE_XATTR */ } @@ -255,7 +254,7 @@ /* ARGSUSED */ EXPORT BOOL set_xattr(info) -@@ -194,6 +217,10 @@ +@@ -197,6 +220,10 @@ return (TRUE); for (xap = info->f_xattr; xap->name != NULL; xap++) { Index: star.spec =================================================================== RCS file: /cvs/dist/rpms/star/devel/star.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- star.spec 8 Aug 2006 12:03:38 -0000 1.30 +++ star.spec 19 Jan 2007 13:07:31 -0000 1.31 @@ -3,8 +3,8 @@ %endif Summary: An archiving tool with ACL support Name: star -Version: 1.5a75 -Release: 1 +Version: 1.5a76 +Release: 1%{?dist} URL: http://cdrecord.berlios.de/old/private/star.html Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2 Patch1: star-1.5-newMake.patch @@ -97,6 +97,9 @@ %{_mandir}/man1/spax.1* %changelog +* Thu Jan 18 2007 Jan Cholasta 1.5a76-1 +- upgrade + * Tue Aug 08 2006 Peter Vrabec 1.5a75-1 - upgrade From fedora-cvs-commits at redhat.com Fri Jan 19 13:14:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:14:03 -0500 Subject: rpms/pinfo/devel pinfo-0.6.9-infosuff.patch, NONE, 1.1 pinfo-0.6.9-nogroup.patch, NONE, 1.1 pinfo.spec, 1.28, 1.29 Message-ID: <200701191314.l0JDE3V6008719@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/pinfo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8100 Modified Files: pinfo.spec Added Files: pinfo-0.6.9-infosuff.patch pinfo-0.6.9-nogroup.patch Log Message: - use correct group when dropping group privileges (#221107) - open also files without .info suffix - make scriptlets safer - make sure readline support isn't compiled in Resolves: #221107 pinfo-0.6.9-infosuff.patch: filehandling_functions.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE pinfo-0.6.9-infosuff.patch --- --- pinfo-0.6.9/src/filehandling_functions.c.infosuff 2006-03-16 16:15:02.000000000 +0100 +++ pinfo-0.6.9/src/filehandling_functions.c 2006-09-18 14:32:32.000000000 +0200 @@ -94,6 +94,7 @@ /* iterate over all files in the directory */ while ((dp = readdir(dir)) != NULL) { + int info_suffix; /* use strcat rather than strdup, because xmalloc handles all * malloc errors */ char *thisfile = xmalloc(strlen(dp->d_name)+1); @@ -101,7 +102,9 @@ /* strip suffixes (so "gcc.info.gz" -> "gcc") */ strip_compression_suffix(thisfile); + info_suffix = strlen(thisfile); strip_info_suffix(thisfile); + info_suffix -= strlen(thisfile); /* compare this file with the file we're looking for */ if (strcmp(thisfile,bname) == 0) @@ -110,7 +113,8 @@ matched++; /* put it in the buffer */ strncat(Buf, thisfile, 1023-strlen(Buf)); - strncat(Buf, ".info", 1023-strlen(Buf)); + if (info_suffix) + strncat(Buf, ".info", 1023-strlen(Buf)); /* clean up, and exit the loop */ xfree(thisfile); pinfo-0.6.9-nogroup.patch: pinforc.in | 2 +- utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE pinfo-0.6.9-nogroup.patch --- --- pinfo-0.6.9/src/utils.c.nogroup 2006-03-16 15:14:30.000000000 +0100 +++ pinfo-0.6.9/src/utils.c 2007-01-19 13:45:53.000000000 +0100 @@ -32,7 +32,7 @@ #endif char *safe_user = "nobody"; -char *safe_group = "nogroup"; +char *safe_group = "nobody"; #ifndef HAVE_CURS_SET void --- pinfo-0.6.9/src/pinforc.in.nogroup 2007-01-19 13:42:14.000000000 +0100 +++ pinfo-0.6.9/src/pinforc.in 2007-01-19 13:45:35.000000000 +0100 @@ -91,7 +91,7 @@ PRINTUTILITY=lpr MANLINKS=1:8:2:3:4:5:6:7:9:n:p:o:3X11:3Xt:3x:3X SAFE-USER=nobody -SAFE-GROUP=nogroup +SAFE-GROUP=nobody # # Remember, HIGHLIGHTREGEXP may be slow (thus it's commented by default) # Index: pinfo.spec =================================================================== RCS file: /cvs/dist/rpms/pinfo/devel/pinfo.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- pinfo.spec 12 Sep 2006 15:34:31 -0000 1.28 +++ pinfo.spec 19 Jan 2007 13:14:01 -0000 1.29 @@ -1,12 +1,14 @@ Summary: An info file viewer. Name: pinfo Version: 0.6.9 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base License: GPL URL: http://pinfo.alioth.debian.org Source: pinfo-%{version}.tar.bz2 Patch1: pinfo-0.6.8-htmlview.patch +Patch2: pinfo-0.6.9-infosuff.patch +Patch3: pinfo-0.6.9-nogroup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,9 +24,11 @@ %prep %setup -q %patch1 -p1 -b .links +%patch2 -p1 -b .infosuff +%patch3 -p1 -b .nogroup %build -%configure +%configure --without-readline make %install @@ -52,16 +56,24 @@ %post /sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir +: %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir fi +: %clean rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 19 2007 Miroslav Lichvar 0.6.9-2 +- use correct group when dropping group privileges (#221107) +- open also files without .info suffix +- make scriptlets safer +- make sure readline support isn't compiled in + * Tue Sep 12 2006 Miroslav Lichvar 0.6.9-1.fc6 - update to 0.6.9 - package locale files From fedora-cvs-commits at redhat.com Fri Jan 19 13:20:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:20:46 -0500 Subject: rpms/pinfo/FC-6 pinfo-0.6.9-infosuff.patch, NONE, 1.1 pinfo-0.6.9-nogroup.patch, NONE, 1.1 pinfo.spec, 1.28, 1.29 Message-ID: <200701191320.l0JDKk8x001668@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/pinfo/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv1276 Modified Files: pinfo.spec Added Files: pinfo-0.6.9-infosuff.patch pinfo-0.6.9-nogroup.patch Log Message: - use correct group when dropping group privileges (#221107) - open also files without .info suffix - make scriptlets safer - make sure readline support isn't compiled in Resolves: #221107 pinfo-0.6.9-infosuff.patch: filehandling_functions.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE pinfo-0.6.9-infosuff.patch --- --- pinfo-0.6.9/src/filehandling_functions.c.infosuff 2006-03-16 16:15:02.000000000 +0100 +++ pinfo-0.6.9/src/filehandling_functions.c 2006-09-18 14:32:32.000000000 +0200 @@ -94,6 +94,7 @@ /* iterate over all files in the directory */ while ((dp = readdir(dir)) != NULL) { + int info_suffix; /* use strcat rather than strdup, because xmalloc handles all * malloc errors */ char *thisfile = xmalloc(strlen(dp->d_name)+1); @@ -101,7 +102,9 @@ /* strip suffixes (so "gcc.info.gz" -> "gcc") */ strip_compression_suffix(thisfile); + info_suffix = strlen(thisfile); strip_info_suffix(thisfile); + info_suffix -= strlen(thisfile); /* compare this file with the file we're looking for */ if (strcmp(thisfile,bname) == 0) @@ -110,7 +113,8 @@ matched++; /* put it in the buffer */ strncat(Buf, thisfile, 1023-strlen(Buf)); - strncat(Buf, ".info", 1023-strlen(Buf)); + if (info_suffix) + strncat(Buf, ".info", 1023-strlen(Buf)); /* clean up, and exit the loop */ xfree(thisfile); pinfo-0.6.9-nogroup.patch: pinforc.in | 2 +- utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE pinfo-0.6.9-nogroup.patch --- --- pinfo-0.6.9/src/utils.c.nogroup 2006-03-16 15:14:30.000000000 +0100 +++ pinfo-0.6.9/src/utils.c 2007-01-19 13:45:53.000000000 +0100 @@ -32,7 +32,7 @@ #endif char *safe_user = "nobody"; -char *safe_group = "nogroup"; +char *safe_group = "nobody"; #ifndef HAVE_CURS_SET void --- pinfo-0.6.9/src/pinforc.in.nogroup 2007-01-19 13:42:14.000000000 +0100 +++ pinfo-0.6.9/src/pinforc.in 2007-01-19 13:45:35.000000000 +0100 @@ -91,7 +91,7 @@ PRINTUTILITY=lpr MANLINKS=1:8:2:3:4:5:6:7:9:n:p:o:3X11:3Xt:3x:3X SAFE-USER=nobody -SAFE-GROUP=nogroup +SAFE-GROUP=nobody # # Remember, HIGHLIGHTREGEXP may be slow (thus it's commented by default) # Index: pinfo.spec =================================================================== RCS file: /cvs/dist/rpms/pinfo/FC-6/pinfo.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- pinfo.spec 12 Sep 2006 15:34:31 -0000 1.28 +++ pinfo.spec 19 Jan 2007 13:20:44 -0000 1.29 @@ -1,12 +1,14 @@ Summary: An info file viewer. Name: pinfo Version: 0.6.9 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base License: GPL URL: http://pinfo.alioth.debian.org Source: pinfo-%{version}.tar.bz2 Patch1: pinfo-0.6.8-htmlview.patch +Patch2: pinfo-0.6.9-infosuff.patch +Patch3: pinfo-0.6.9-nogroup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,9 +24,11 @@ %prep %setup -q %patch1 -p1 -b .links +%patch2 -p1 -b .infosuff +%patch3 -p1 -b .nogroup %build -%configure +%configure --without-readline make %install @@ -52,16 +56,24 @@ %post /sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir +: %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir fi +: %clean rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 19 2007 Miroslav Lichvar 0.6.9-2 +- use correct group when dropping group privileges (#221107) +- open also files without .info suffix +- make scriptlets safer +- make sure readline support isn't compiled in + * Tue Sep 12 2006 Miroslav Lichvar 0.6.9-1.fc6 - update to 0.6.9 - package locale files From fedora-cvs-commits at redhat.com Fri Jan 19 13:23:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:23:07 -0500 Subject: rpms/pinfo/FC-5 pinfo-0.6.9-infosuff.patch, NONE, 1.1 pinfo-0.6.9-nogroup.patch, NONE, 1.1 pinfo.spec, 1.27, 1.28 Message-ID: <200701191323.l0JDN7cM003588@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/pinfo/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3416 Modified Files: pinfo.spec Added Files: pinfo-0.6.9-infosuff.patch pinfo-0.6.9-nogroup.patch Log Message: - use correct group when dropping group privileges (#221107) - open also files without .info suffix - make scriptlets safer - make sure readline support isn't compiled in Resolves: #221107 pinfo-0.6.9-infosuff.patch: filehandling_functions.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE pinfo-0.6.9-infosuff.patch --- --- pinfo-0.6.9/src/filehandling_functions.c.infosuff 2006-03-16 16:15:02.000000000 +0100 +++ pinfo-0.6.9/src/filehandling_functions.c 2006-09-18 14:32:32.000000000 +0200 @@ -94,6 +94,7 @@ /* iterate over all files in the directory */ while ((dp = readdir(dir)) != NULL) { + int info_suffix; /* use strcat rather than strdup, because xmalloc handles all * malloc errors */ char *thisfile = xmalloc(strlen(dp->d_name)+1); @@ -101,7 +102,9 @@ /* strip suffixes (so "gcc.info.gz" -> "gcc") */ strip_compression_suffix(thisfile); + info_suffix = strlen(thisfile); strip_info_suffix(thisfile); + info_suffix -= strlen(thisfile); /* compare this file with the file we're looking for */ if (strcmp(thisfile,bname) == 0) @@ -110,7 +113,8 @@ matched++; /* put it in the buffer */ strncat(Buf, thisfile, 1023-strlen(Buf)); - strncat(Buf, ".info", 1023-strlen(Buf)); + if (info_suffix) + strncat(Buf, ".info", 1023-strlen(Buf)); /* clean up, and exit the loop */ xfree(thisfile); pinfo-0.6.9-nogroup.patch: pinforc.in | 2 +- utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE pinfo-0.6.9-nogroup.patch --- --- pinfo-0.6.9/src/utils.c.nogroup 2006-03-16 15:14:30.000000000 +0100 +++ pinfo-0.6.9/src/utils.c 2007-01-19 13:45:53.000000000 +0100 @@ -32,7 +32,7 @@ #endif char *safe_user = "nobody"; -char *safe_group = "nogroup"; +char *safe_group = "nobody"; #ifndef HAVE_CURS_SET void --- pinfo-0.6.9/src/pinforc.in.nogroup 2007-01-19 13:42:14.000000000 +0100 +++ pinfo-0.6.9/src/pinforc.in 2007-01-19 13:45:35.000000000 +0100 @@ -91,7 +91,7 @@ PRINTUTILITY=lpr MANLINKS=1:8:2:3:4:5:6:7:9:n:p:o:3X11:3Xt:3x:3X SAFE-USER=nobody -SAFE-GROUP=nogroup +SAFE-GROUP=nobody # # Remember, HIGHLIGHTREGEXP may be slow (thus it's commented by default) # Index: pinfo.spec =================================================================== RCS file: /cvs/dist/rpms/pinfo/FC-5/pinfo.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pinfo.spec 12 Sep 2006 15:44:38 -0000 1.27 +++ pinfo.spec 19 Jan 2007 13:23:05 -0000 1.28 @@ -1,12 +1,14 @@ Summary: An info file viewer. Name: pinfo Version: 0.6.9 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Base License: GPL URL: http://pinfo.alioth.debian.org Source: pinfo-%{version}.tar.bz2 Patch1: pinfo-0.6.8-htmlview.patch +Patch2: pinfo-0.6.9-infosuff.patch +Patch3: pinfo-0.6.9-nogroup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -22,9 +24,11 @@ %prep %setup -q %patch1 -p1 -b .links +%patch2 -p1 -b .infosuff +%patch3 -p1 -b .nogroup %build -%configure +%configure --without-readline make %install @@ -52,16 +56,24 @@ %post /sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir +: %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir fi +: %clean rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 19 2007 Miroslav Lichvar 0.6.9-2 +- use correct group when dropping group privileges (#221107) +- open also files without .info suffix +- make scriptlets safer +- make sure readline support isn't compiled in + * Tue Sep 12 2006 Miroslav Lichvar 0.6.9-1.fc5 - update to 0.6.9 - package locale files From fedora-cvs-commits at redhat.com Fri Jan 19 13:55:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:55:34 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.113, 1.114 libsepol.spec, 1.150, 1.151 sources, 1.114, 1.115 Message-ID: <200701191355.l0JDtYjF026710@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26694 Modified Files: .cvsignore libsepol.spec sources Log Message: * Fri Jan 19 2006 Dan Walsh 1.16.0-1 - Upgrade to latest from NSA * Updated version for stable branch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- .cvsignore 28 Nov 2006 14:28:05 -0000 1.113 +++ .cvsignore 19 Jan 2007 13:55:32 -0000 1.114 @@ -113,3 +113,4 @@ libsepol-1.15.1.tgz libsepol-1.15.2.tgz libsepol-1.15.3.tgz +libsepol-1.16.0.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- libsepol.spec 12 Dec 2006 18:59:40 -0000 1.150 +++ libsepol.spec 19 Jan 2007 13:55:32 -0000 1.151 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.15.3 +Version: 1.16.0 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -85,6 +85,10 @@ /%{_lib}/libsepol.so.1 %changelog +* Fri Jan 19 2006 Dan Walsh 1.16.0-1 +- Upgrade to latest from NSA + * Updated version for stable branch. + * Tue Dec 12 2006 Adam Jackson 1.15.3-1 - Add dist tag and rebuild, fixes 6 to 7 upgrades. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- sources 28 Nov 2006 14:28:05 -0000 1.114 +++ sources 19 Jan 2007 13:55:32 -0000 1.115 @@ -1 +1 @@ -a28b1304e7bfe86bc0100f592d5039ad libsepol-1.15.3.tgz +defabd55e16f35ec4314cf115cf2f103 libsepol-1.16.0.tgz From fedora-cvs-commits at redhat.com Fri Jan 19 13:56:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 08:56:31 -0500 Subject: rpms/libsepol/devel libsepol.spec,1.151,1.152 Message-ID: <200701191356.l0JDuV5b026757@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26743 Modified Files: libsepol.spec Log Message: * Fri Jan 19 2007 Dan Walsh 1.16.0-1 - Upgrade to latest from NSA * Updated version for stable branch. Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- libsepol.spec 19 Jan 2007 13:55:32 -0000 1.151 +++ libsepol.spec 19 Jan 2007 13:56:29 -0000 1.152 @@ -85,7 +85,7 @@ /%{_lib}/libsepol.so.1 %changelog -* Fri Jan 19 2006 Dan Walsh 1.16.0-1 +* Fri Jan 19 2007 Dan Walsh 1.16.0-1 - Upgrade to latest from NSA * Updated version for stable branch. From fedora-cvs-commits at redhat.com Fri Jan 19 14:22:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 09:22:49 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.127, 1.128 libselinux.spec, 1.245, 1.246 sources, 1.129, 1.130 Message-ID: <200701191422.l0JEMn1B015983@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15967 Modified Files: .cvsignore libselinux.spec sources Log Message: * Fri Jan 19 2007 Dan Walsh - 1.34.0-1 - Upgrade to upstream * Updated version for stable branch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- .cvsignore 17 Jan 2007 16:12:56 -0000 1.127 +++ .cvsignore 19 Jan 2007 14:22:46 -0000 1.128 @@ -103,3 +103,4 @@ libselinux-1.33.4.tgz libselinux-1.33.5.tgz libselinux-1.33.6.tgz +libselinux-1.34.0.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- libselinux.spec 17 Jan 2007 16:12:56 -0000 1.245 +++ libselinux.spec 19 Jan 2007 14:22:46 -0000 1.246 @@ -1,7 +1,7 @@ -%define libsepolver 1.15.2-1 +%define libsepolver 1.16.0-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.33.6 +Version: 1.34.0 Release: 1%{?dist} License: Public domain (uncopyrighted) Group: System Environment/Libraries @@ -119,10 +119,14 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog -* Mon Jan 17 2007 Dan Walsh - 1.33.6-1 +* Fri Jan 19 2007 Dan Walsh - 1.34.0-1 +- Upgrade to upstream + * Updated version for stable branch. + +* Wed Jan 17 2007 Dan Walsh - 1.33.6-1 - Upgrade to upstream * Merged man page updates to make "apropos selinux" work from Dan Walsh. -* Mon Jan 15 2007 Dan Walsh - 1.33.5-1 +* Wed Jan 15 2007 Dan Walsh - 1.33.5-1 - Upgrade to upstream * Merged getdefaultcon utility from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- sources 17 Jan 2007 16:12:56 -0000 1.129 +++ sources 19 Jan 2007 14:22:46 -0000 1.130 @@ -1 +1 @@ -1f8802c1adaf37f1fb12e5523d3c5cdf libselinux-1.33.6.tgz +c73fa30b9394bd448550e788351d8ea7 libselinux-1.34.0.tgz From fedora-cvs-commits at redhat.com Fri Jan 19 15:13:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 10:13:31 -0500 Subject: rpms/festival/devel festival.spec,1.23,1.24 Message-ID: <200701191513.l0JFDVQI016592@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16451 Modified Files: festival.spec Log Message: - link with ncurses - add dist tag - make scriptlets safer Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- festival.spec 12 Jul 2006 05:47:52 -0000 1.23 +++ festival.spec 19 Jan 2007 15:13:29 -0000 1.24 @@ -1,7 +1,7 @@ Name: festival Summary: A free speech synthesizer Version: 1.95 -Release: 5.2.1 +Release: 6%{?dist} # we ship the 1.4.2 docs for now. %define docversion 1.4.2 @@ -84,7 +84,7 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info BuildRequires: tetex -BuildRequires: libtermcap-devel +BuildRequires: ncurses-devel Requires: info %package devel @@ -262,12 +262,14 @@ %post /sbin/ldconfig /sbin/install-info %{_infodir}/festival.info.gz %{_infodir}/dir --section "Accessibility" > /dev/null 2>&1 +: %postun /sbin/ldconfig if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/festival.info.gz %{_infodir}/dir --section "Accessibility" > /dev/null 2>&1 fi +: %files %defattr(-,root,root) @@ -292,6 +294,11 @@ %{_includedir}/festival/* %changelog +* Fri Jan 19 2007 Miroslav Lichvar - 1.95-6 +- link with ncurses +- add dist tag +- make scriptlets safer + * Wed Jul 12 2006 Jesse Keating - 1.95-5.2.1 - rebuild From fedora-cvs-commits at redhat.com Fri Jan 19 15:26:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 10:26:47 -0500 Subject: rpms/binutils/FC-6 binutils-2.17.50.0.6-rh223181.patch, NONE, 1.1 binutils-2.17.50.0.6-tekhex.patch, NONE, 1.1 binutils.spec, 1.104, 1.105 Message-ID: <200701191526.l0JFQkaA014356@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14318 Modified Files: binutils.spec Added Files: binutils-2.17.50.0.6-rh223181.patch binutils-2.17.50.0.6-tekhex.patch Log Message: 2.17.50.0.6-3.fc6 binutils-2.17.50.0.6-rh223181.patch: elf.c | 113 +++++++++++++----------------------------------------------------- 1 files changed, 23 insertions(+), 90 deletions(-) --- NEW FILE binutils-2.17.50.0.6-rh223181.patch --- 207-01-19 Jakub Jelinek * elf.c (elf_sort_elf_symbol): Removed. (bfd_elf_match_symbols_in_sections): Remove unnecessary expensive sorting of the symbol tables. --- bfd/elf.c.jj 2006-10-20 20:50:57.000000000 +0200 +++ bfd/elf.c 2007-01-19 14:54:04.000000000 +0100 @@ -8623,33 +8623,6 @@ _bfd_elf_get_synthetic_symtab (bfd *abfd return n; } -/* Sort symbol by binding and section. We want to put definitions - sorted by section at the beginning. */ - -static int -elf_sort_elf_symbol (const void *arg1, const void *arg2) -{ - const Elf_Internal_Sym *s1; - const Elf_Internal_Sym *s2; - int shndx; - - /* Make sure that undefined symbols are at the end. */ - s1 = (const Elf_Internal_Sym *) arg1; - if (s1->st_shndx == SHN_UNDEF) - return 1; - s2 = (const Elf_Internal_Sym *) arg2; - if (s2->st_shndx == SHN_UNDEF) - return -1; - - /* Sorted by section index. */ - shndx = s1->st_shndx - s2->st_shndx; - if (shndx != 0) - return shndx; - - /* Sorted by binding. */ - return ELF_ST_BIND (s1->st_info) - ELF_ST_BIND (s2->st_info); -} - struct elf_symbol { Elf_Internal_Sym *sym; @@ -8675,9 +8648,8 @@ bfd_elf_match_symbols_in_sections (asect Elf_Internal_Shdr *hdr1, *hdr2; bfd_size_type symcount1, symcount2; Elf_Internal_Sym *isymbuf1, *isymbuf2; - Elf_Internal_Sym *isymstart1 = NULL, *isymstart2 = NULL, *isym; - Elf_Internal_Sym *isymend; - struct elf_symbol *symp, *symtable1 = NULL, *symtable2 = NULL; + Elf_Internal_Sym *isym, *isymend; + struct elf_symbol *symtable1 = NULL, *symtable2 = NULL; bfd_size_type count1, count2, i; int shndx1, shndx2; bfd_boolean result; @@ -8733,75 +8705,36 @@ bfd_elf_match_symbols_in_sections (asect if (isymbuf1 == NULL || isymbuf2 == NULL) goto done; - /* Sort symbols by binding and section. Global definitions are at - the beginning. */ - qsort (isymbuf1, symcount1, sizeof (Elf_Internal_Sym), - elf_sort_elf_symbol); - qsort (isymbuf2, symcount2, sizeof (Elf_Internal_Sym), - elf_sort_elf_symbol); + symtable1 = bfd_malloc2 (symcount1, sizeof (struct elf_symbol)); + symtable2 = bfd_malloc2 (symcount2, sizeof (struct elf_symbol)); - /* Count definitions in the section. */ - count1 = 0; - for (isym = isymbuf1, isymend = isym + symcount1; - isym < isymend; isym++) - { - if (isym->st_shndx == (unsigned int) shndx1) - { - if (count1 == 0) - isymstart1 = isym; - count1++; - } + if (symtable1 == NULL || symtable2 == NULL) + goto done; - if (count1 && isym->st_shndx != (unsigned int) shndx1) - break; - } + /* Choose symbol definitions in the section. */ + count1 = 0; + for (isym = isymbuf1, isymend = isym + symcount1; isym < isymend; isym++) + if (isym->st_shndx == (unsigned int) shndx1) + symtable1[count1++].sym = isym; count2 = 0; - for (isym = isymbuf2, isymend = isym + symcount2; - isym < isymend; isym++) - { - if (isym->st_shndx == (unsigned int) shndx2) - { - if (count2 == 0) - isymstart2 = isym; - count2++; - } - - if (count2 && isym->st_shndx != (unsigned int) shndx2) - break; - } + for (isym = isymbuf2, isymend = isym + symcount2; isym < isymend; isym++) + if (isym->st_shndx == (unsigned int) shndx2) + symtable2[count2++].sym = isym; if (count1 == 0 || count2 == 0 || count1 != count2) goto done; - symtable1 = bfd_malloc (count1 * sizeof (struct elf_symbol)); - symtable2 = bfd_malloc (count1 * sizeof (struct elf_symbol)); - - if (symtable1 == NULL || symtable2 == NULL) - goto done; + for (i = 0; i < count1; i++) + symtable1[i].name + = bfd_elf_string_from_elf_section (bfd1, hdr1->sh_link, + symtable1[i].sym->st_name); + + for (i = 0; i < count2; i++) + symtable2[i].name + = bfd_elf_string_from_elf_section (bfd2, hdr2->sh_link, + symtable2[i].sym->st_name); - symp = symtable1; - for (isym = isymstart1, isymend = isym + count1; - isym < isymend; isym++) - { - symp->sym = isym; - symp->name = bfd_elf_string_from_elf_section (bfd1, - hdr1->sh_link, - isym->st_name); - symp++; - } - - symp = symtable2; - for (isym = isymstart2, isymend = isym + count1; - isym < isymend; isym++) - { - symp->sym = isym; - symp->name = bfd_elf_string_from_elf_section (bfd2, - hdr2->sh_link, - isym->st_name); - symp++; - } - /* Sort symbol by name. */ qsort (symtable1, count1, sizeof (struct elf_symbol), elf_sym_name_compare); binutils-2.17.50.0.6-tekhex.patch: tekhex.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) --- NEW FILE binutils-2.17.50.0.6-tekhex.patch --- 2007-01-05 Jakub Jelinek * texhex.c (first_phase): Don't fall through into the default case. (pass_over): Replace abort () calls with return FALSE. Fix buffer overflow. --- bfd/tekhex.c.jj 2006-06-19 15:17:43.000000000 +0200 +++ bfd/tekhex.c 2007-01-05 11:08:25.000000000 +0100 @@ -436,6 +436,7 @@ first_phase (bfd *abfd, int type, char * if (!getvalue (&src, &val)) return FALSE; new->symbol.value = val - section->vma; + break; } default: return FALSE; @@ -457,11 +458,10 @@ pass_over (bfd *abfd, bfd_boolean (*func /* To the front of the file. */ if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) - abort (); + return FALSE; while (! eof) { - char buffer[MAXCHUNK]; - char *src = buffer; + char src[MAXCHUNK]; char type; /* Find first '%'. */ @@ -471,22 +471,24 @@ pass_over (bfd *abfd, bfd_boolean (*func if (eof) break; - src++; /* Fetch the type and the length and the checksum. */ if (bfd_bread (src, (bfd_size_type) 5, abfd) != 5) - abort (); /* FIXME. */ + return FALSE; type = src[2]; if (!ISHEX (src[0]) || !ISHEX (src[1])) break; - /* Already read five char. */ + /* Already read five chars. */ chars_on_line = HEX (src) - 5; + if (chars_on_line >= MAXCHUNK) + return FALSE; + if (bfd_bread (src, (bfd_size_type) chars_on_line, abfd) != chars_on_line) - abort (); /* FIXME. */ + return FALSE; /* Put a null at the end. */ src[chars_on_line] = 0; Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/FC-6/binutils.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- binutils.spec 21 Dec 2006 15:10:35 -0000 1.104 +++ binutils.spec 19 Jan 2007 15:26:44 -0000 1.105 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.17.50.0.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -18,6 +18,8 @@ Patch10: binutils-2.17.50.0.6-fixsyms.patch Patch11: binutils-2.17.50.0.6-gas-debug-ranges-revert.patch Patch12: binutils-2.17.50.0.6-popcnt.patch +Patch13: binutils-2.17.50.0.6-rh223181.patch +Patch14: binutils-2.17.50.0.6-tekhex.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -71,6 +73,8 @@ %patch10 -p0 -b .fixsyms~ %patch11 -p0 -R -b .gas-debug-ranges-revert~ %patch12 -p0 -b .popcnt~ +%patch13 -p0 -b .rh223181~ +%patch14 -p0 -b .tekhex~ # On ppc64 we might use 64K pages sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c @@ -213,6 +217,10 @@ %{_infodir}/bfd*info* %changelog +* Fri Jan 19 2007 Jakub Jelinek 2.17.50.0.6-3.fc6 +- 10x linking speedup on large C++ apps (#223181) +- fix tekhex reader + * Thu Dec 21 2006 Jakub Jelinek 2.17.50.0.6-2.fc6 - update to 2.17.50.0.6 - fix for section relative linker script defined symbols in From fedora-cvs-commits at redhat.com Fri Jan 19 15:43:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 10:43:22 -0500 Subject: rpms/coreutils/devel coreutils.spec,1.154,1.155 Message-ID: <200701191543.l0JFhMBN015105@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15088 Modified Files: coreutils.spec Log Message: * Fri Jan 19 2007 Tim Waugh 6.7-2 - Build does not require libtermcap-devel. Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- coreutils.spec 9 Jan 2007 19:29:30 -0000 1.154 +++ coreutils.spec 19 Jan 2007 15:43:20 -0000 1.155 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -47,7 +47,7 @@ Patch950: coreutils-selinux.patch BuildRoot: %_tmppath/%{name}-root -BuildRequires: gettext libtermcap-devel bison +BuildRequires: gettext bison %{?!nopam:BuildRequires: pam-devel} BuildRequires: texinfo >= 4.3 BuildRequires: autoconf >= 2.58, automake >= 1.8 @@ -269,6 +269,9 @@ /sbin/runuser %changelog +* Fri Jan 19 2007 Tim Waugh 6.7-2 +- Build does not require libtermcap-devel. + * Tue Jan 9 2007 Tim Waugh 6.7-1 - 6.7. No longer need sort-compatibility, rename, newhashes, timestyle, acl, df-cifs, afs or autoconf patches. From fedora-cvs-commits at redhat.com Fri Jan 19 16:22:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 11:22:03 -0500 Subject: rpms/gnome-screensaver/FC-6 gnome-screensaver-2.16.1-better-pam-integration.patch, NONE, 1.1 gnome-screensaver.spec, 1.117, 1.118 gnome-screensaver-2.16.0-better-pam-integration.patch, 1.2, NONE Message-ID: <200701191622.l0JGM32w024263@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24247 Modified Files: gnome-screensaver.spec Added Files: gnome-screensaver-2.16.1-better-pam-integration.patch Removed Files: gnome-screensaver-2.16.0-better-pam-integration.patch Log Message: - correctly queue keystrokes so they aren't lost when bringing up lock dialog (bug 206677) - run pam account management modules from correct thread gnome-screensaver-2.16.1-better-pam-integration.patch: data/lock-dialog-default.glade | 4 src/gnome-screensaver-dialog.c | 22 +- src/gs-auth-pam.c | 389 +++++++++++++++++++++++++++++++---------- src/gs-lock-plug.c | 97 ++++++++++ src/gs-lock-plug.h | 4 src/gs-manager.c | 9 src/gs-manager.h | 1 src/gs-window-x11.c | 16 + src/gs-window.h | 1 9 files changed, 448 insertions(+), 95 deletions(-) --- NEW FILE gnome-screensaver-2.16.1-better-pam-integration.patch --- --- gnome-screensaver-2.16.1/data/lock-dialog-default.glade.better-pam-integration 2006-08-25 10:40:48.000000000 -0400 +++ gnome-screensaver-2.16.1/data/lock-dialog-default.glade 2007-01-19 11:08:48.000000000 -0500 @@ -145,8 +145,7 @@ - True - Password: + False False GTK_JUSTIFY_LEFT @@ -173,7 +172,6 @@ - True True True False --- gnome-screensaver-2.16.1/src/gs-window.h.better-pam-integration 2006-07-31 13:54:48.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-window.h 2007-01-19 11:08:48.000000000 -0500 @@ -81,6 +81,7 @@ const char *command); void gs_window_request_unlock (GSWindow *window); +void gs_window_cancel_unlock_request (GSWindow *window); GSWindow * gs_window_new (GdkScreen *screen, int monitor, --- gnome-screensaver-2.16.1/src/gs-manager.c.better-pam-integration 2006-09-06 15:38:08.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-manager.c 2007-01-19 11:08:48.000000000 -0500 @@ -1566,3 +1566,12 @@ return TRUE; } + +void +gs_manager_cancel_unlock_request (GSManager *manager) +{ + GSList *l; + for (l = manager->priv->windows; l; l = l->next) { + gs_window_cancel_unlock_request (l->data); + } +} --- gnome-screensaver-2.16.1/src/gs-auth-pam.c.better-pam-integration 2006-06-08 16:23:40.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-auth-pam.c 2007-01-19 11:08:48.000000000 -0500 @@ -28,6 +28,7 @@ # include #endif +#include #include #include #include @@ -40,6 +41,7 @@ #include #include #include +#include #include "gs-auth.h" @@ -81,8 +83,20 @@ const char *username; GSAuthMessageFunc cb_func; gpointer cb_data; + int signal_fd; + int result; }; +typedef struct { + struct pam_closure *closure; + GSAuthMessageStyle style; + const char *msg; + char **resp; + gboolean should_interrupt_stack; +} GsAuthMessageHandlerData; +static GCond *message_handled_condition; +static GMutex *message_handler_mutex; + GQuark gs_auth_error_quark (void) { @@ -162,6 +176,75 @@ return ret; } +static gboolean +gs_auth_queued_message_handler (GsAuthMessageHandlerData *data) +{ + gboolean res; + + if (gs_auth_get_verbose ()) { + g_message ("Waiting for lock"); + } + + g_mutex_lock (message_handler_mutex); + + if (gs_auth_get_verbose ()) { + g_message ("Waiting for response"); + } + + res = data->closure->cb_func (data->style, + data->msg, + data->resp, + data->closure->cb_data); + + data->should_interrupt_stack = res == FALSE; + + g_cond_signal (message_handled_condition); + g_mutex_unlock (message_handler_mutex); + + if (gs_auth_get_verbose ()) { + g_message ("Got response"); + } + + return FALSE; +} + +static gboolean +gs_auth_run_message_handler (struct pam_closure *c, + GSAuthMessageStyle style, + const char *msg, + char **resp) +{ + GsAuthMessageHandlerData data; + + data.closure = c; + data.style = style; + data.msg = msg; + data.resp = resp; + data.should_interrupt_stack = TRUE; + + g_mutex_lock (message_handler_mutex); + + /* Queue the callback in the gui (the main) thread + */ + g_idle_add ((GSourceFunc) gs_auth_queued_message_handler, &data); + + if (gs_auth_get_verbose ()) { + g_message ("Waiting for respose to message style %d: '%s'", style, msg); + } + + /* Wait for the response + */ + g_cond_wait (message_handled_condition, + message_handler_mutex); + g_mutex_unlock (message_handler_mutex); + + if (gs_auth_get_verbose ()) { + g_message ("Got respose to message style %d: interrupt:%d", style, data.should_interrupt_stack); + } + + return data.should_interrupt_stack == FALSE; +} + static int pam_conversation (int nmsgs, const struct pam_message **msg, @@ -195,11 +278,20 @@ NULL); if (c->cb_func != NULL) { - res = c->cb_func (style, - msg [replies]->msg, - &reply [replies].resp, - c->cb_data); + if (gs_auth_get_verbose ()) { + g_message ("Handling message style %d: '%s'", style, msg [replies]->msg); + } + + /* blocks until the gui responds + */ + res = gs_auth_run_message_handler (c, style, + msg [replies]->msg, + &reply [replies].resp); + if (gs_auth_get_verbose ()) { + g_message ("Msg handler returned %d", res); + } + /* If the handler returns FALSE - interrupt the PAM stack */ if (res) { reply [replies].resp_retcode = PAM_SUCCESS; @@ -231,6 +323,16 @@ } } + if (message_handled_condition != NULL) { + g_cond_free (message_handled_condition); + message_handled_condition = NULL; + } + + if (message_handler_mutex != NULL) { + g_mutex_free (message_handler_mutex); + message_handler_mutex = NULL; + } + return TRUE; } @@ -296,6 +398,8 @@ } ret = TRUE; + message_handled_condition = g_cond_new (); + message_handler_mutex = g_mutex_new (); out: if (status_code != NULL) { @@ -342,6 +446,189 @@ } +static int +gs_auth_thread_func (int auth_operation_fd) +{ + static const int flags = 0; + int status; + int status2; + struct timespec timeout; + sigset_t set; + const void *p; + + timeout.tv_sec = 0; + timeout.tv_nsec = 1; + + set = block_sigchld (); + + status = pam_authenticate (pam_handle, flags); + + sigtimedwait (&set, NULL, &timeout); + unblock_sigchld (); + + if (gs_auth_get_verbose ()) { + g_message (" pam_authenticate (...) ==> %d (%s)", + status, + PAM_STRERROR (pam_handle, status)); + } + + if (status != PAM_SUCCESS) { + goto done; + } + + if ((status = pam_get_item (pam_handle, PAM_USER, &p)) != PAM_SUCCESS) { + /* is not really an auth problem, but it will + pretty much look as such, it shouldn't really + happen */ + goto done; + } + + /* We don't actually care if the account modules fail or succeed, + * but we need to run them anyway because certain pam modules + * depend on side effects of the account modules getting run. + */ + status2 = pam_acct_mgmt (pam_handle, 0); + + if (gs_auth_get_verbose ()) { + g_message ("pam_acct_mgmt (...) ==> %d (%s)\n", + status2, + PAM_STRERROR (pam_handle, status2)); + } + + /* FIXME: should we handle these? */ + switch (status2) { + case PAM_SUCCESS: + break; + case PAM_NEW_AUTHTOK_REQD: + break; + case PAM_AUTHINFO_UNAVAIL: + break; + case PAM_ACCT_EXPIRED: + break; + case PAM_PERM_DENIED: + break; + default : + break; + } + + /* Each time we successfully authenticate, refresh credentials, + for Kerberos/AFS/DCE/etc. If this fails, just ignore that + failure and blunder along; it shouldn't matter. + + Note: this used to be PAM_REFRESH_CRED instead of + PAM_REINITIALIZE_CRED, but Jason Heiss + says that the Linux PAM library ignores that one, and only refreshes + credentials when using PAM_REINITIALIZE_CRED. + */ + status2 = pam_setcred (pam_handle, PAM_REINITIALIZE_CRED); + if (gs_auth_get_verbose ()) { + g_message (" pam_setcred (...) ==> %d (%s)", + status2, + PAM_STRERROR (pam_handle, status2)); + } + +done: + + /* we're done, close the fd and wake up the main + * loop + */ + close (auth_operation_fd); + + return status; +} + +static gboolean +gs_auth_loop_quit (GIOChannel *source, + GIOCondition condition, + gboolean *thread_done) +{ + *thread_done = TRUE; + gtk_main_quit (); + return FALSE; +} + +static gboolean +gs_auth_pam_verify_user (pam_handle_t *handle, + int *status) +{ + GThread *auth_thread; + GIOChannel *channel; + guint watch_id; + int auth_operation_fds[2]; + int auth_status; + gboolean thread_done; + + channel = NULL; + watch_id = 0; + auth_status = PAM_INCOMPLETE; + + /* This pipe gives us a set of fds we can hook into + * the event loop to be notified when our helper thread + * is ready to be reaped. + */ + if (pipe (auth_operation_fds) < 0) { + goto out; + } + + if (fcntl (auth_operation_fds[0], F_SETFD, FD_CLOEXEC) < 0) { + close (auth_operation_fds[0]); + close (auth_operation_fds[1]); + goto out; + } + + if (fcntl (auth_operation_fds[1], F_SETFD, FD_CLOEXEC) < 0) { + close (auth_operation_fds[0]); + close (auth_operation_fds[1]); + goto out; + } + + channel = g_io_channel_unix_new (auth_operation_fds[0]); + + /* we use a recursive main loop to process ui events + * while we wait on a thread to handle the blocking parts + * of pam authentication. + */ + thread_done = FALSE; + watch_id = g_io_add_watch (channel, G_IO_ERR | G_IO_HUP, + (GIOFunc) gs_auth_loop_quit, &thread_done); + + auth_thread = g_thread_create ((GThreadFunc) gs_auth_thread_func, + GINT_TO_POINTER (auth_operation_fds[1]), + TRUE, NULL); + + if (auth_thread == NULL) { + goto out; + } + + gtk_main (); + + /* if the event loop was quit before the thread is done then we can't + * reap the thread without blocking on it finishing. The + * thread may not ever finish though if the pam module is blocking. + * + * The only time the event loop is going to stop when the thread isn't + * done, however, is if the dialog quits early (from, e.g., "cancel"), + * so we can just exit. An alternative option would be to switch to + * using pthreads directly and calling pthread_cancel. + */ + if (!thread_done) + raise (SIGTERM); + + auth_status = GPOINTER_TO_INT (g_thread_join (auth_thread)); + +out: + if (watch_id != 0) + g_source_remove (watch_id); + + if (channel != NULL) + g_io_channel_unref (channel); + + if (status) + *status = auth_status; + + return auth_status == PAM_SUCCESS; +} + gboolean gs_auth_verify_user (const char *username, const char *display, @@ -350,20 +637,16 @@ GError **error) { int status = -1; - int status2; struct pam_conv conv; struct pam_closure c; - sigset_t set; - struct timespec timeout; struct passwd *pwent; - int null_tok = 0; - const void *p; pwent = getpwnam (username); if (pwent == NULL) { return FALSE; } + c.username = username; c.cb_func = func; c.cb_data = data; @@ -374,92 +657,26 @@ /* Initialize PAM. */ create_pam_handle (username, display, &conv, &status); if (status != PAM_SUCCESS) { - goto DONE; + goto done; } pam_set_item (pam_handle, PAM_USER_PROMPT, _("Username:")); PAM_NO_DELAY(pam_handle); - timeout.tv_sec = 0; - timeout.tv_nsec = 1; - set = block_sigchld (); - did_we_ask_for_password = FALSE; - status = pam_authenticate (pam_handle, null_tok); - - sigtimedwait (&set, NULL, &timeout); - unblock_sigchld (); - - if (gs_auth_get_verbose ()) { - g_message (" pam_authenticate (...) ==> %d (%s)", - status, - PAM_STRERROR (pam_handle, status)); - } - - if (status != PAM_SUCCESS) { - goto DONE; - } - - if ((status = pam_get_item (pam_handle, PAM_USER, &p)) != PAM_SUCCESS) { - /* is not really an auth problem, but it will - pretty much look as such, it shouldn't really - happen */ - goto DONE; - } - - /* We don't actually care if the account modules fail or succeed, - * but we need to run them anyway because certain pam modules - * depend on side effects of the account modules getting run. - */ - status2 = pam_acct_mgmt (pam_handle, null_tok); - - if (gs_auth_get_verbose ()) { - g_message ("pam_acct_mgmt (...) ==> %d (%s)\n", - status2, - PAM_STRERROR (pam_handle, status2)); - } - - /* FIXME: should we handle these? */ - switch (status2) { - case PAM_SUCCESS: - break; - case PAM_NEW_AUTHTOK_REQD: - break; - case PAM_AUTHINFO_UNAVAIL: - break; - case PAM_ACCT_EXPIRED: - break; - case PAM_PERM_DENIED: - break; - default : - break; - } - - /* Each time we successfully authenticate, refresh credentials, - for Kerberos/AFS/DCE/etc. If this fails, just ignore that - failure and blunder along; it shouldn't matter. - - Note: this used to be PAM_REFRESH_CRED instead of - PAM_REINITIALIZE_CRED, but Jason Heiss - says that the Linux PAM library ignores that one, and only refreshes - credentials when using PAM_REINITIALIZE_CRED. - */ - status2 = pam_setcred (pam_handle, PAM_REINITIALIZE_CRED); - if (gs_auth_get_verbose ()) { - g_message (" pam_setcred (...) ==> %d (%s)", - status2, - PAM_STRERROR (pam_handle, status2)); - } - - DONE: - if (status != PAM_SUCCESS) { - set_pam_error (error, status); - } + if (! gs_auth_pam_verify_user (pam_handle, &status)) { + goto done; + } + +done: + if (status != PAM_SUCCESS) { + set_pam_error (error, status); + } - close_pam_handle (status); + close_pam_handle (status); - return (status == PAM_SUCCESS ? TRUE : FALSE); + return (status == PAM_SUCCESS ? TRUE : FALSE); } gboolean --- gnome-screensaver-2.16.1/src/gs-window-x11.c.better-pam-integration 2006-10-02 13:08:37.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-window-x11.c 2007-01-19 11:08:48.000000000 -0500 @@ -1467,6 +1467,22 @@ g_signal_emit (window, signals [DIALOG_UP], 0); } +void +gs_window_cancel_unlock_request (GSWindow *window) +{ + /* FIXME: This is a bit of a hammer approach... + * Maybe we should send a delete-event to + * the plug? + */ + g_return_if_fail (GS_IS_WINDOW (window)); + + if (window->priv->lock_socket == NULL) + return; + + if (window->priv->lock_pid > 0) + kill (window->priv->lock_pid, SIGTERM); +} + void gs_window_set_lock_enabled (GSWindow *window, gboolean lock_enabled) --- gnome-screensaver-2.16.1/src/gs-lock-plug.c.better-pam-integration 2006-08-25 10:40:49.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-lock-plug.c 2007-01-19 11:08:48.000000000 -0500 @@ -102,6 +102,7 @@ guint response_idle_id; GTimeVal start_time; + GList *key_events; }; typedef struct _ResponseData ResponseData; @@ -233,6 +234,11 @@ const char *text) { if (plug->priv->auth_message_label != NULL) { + if (strcmp (text, "") == 0) + gtk_widget_hide (plug->priv->auth_message_label); + else + gtk_widget_show (plug->priv->auth_message_label); + gtk_label_set_text (GTK_LABEL (plug->priv->auth_message_label), text); } } @@ -581,6 +587,32 @@ } } +static void +queue_key_event (GSLockPlug *plug, + GdkEventKey *event) +{ + GdkEvent *saved_event; + + saved_event = gdk_event_copy ((GdkEvent *)event); + plug->priv->key_events = g_list_prepend (plug->priv->key_events, + saved_event); +} + +static void +forward_key_events (GSLockPlug *plug) +{ + plug->priv->key_events = g_list_reverse (plug->priv->key_events); + while (plug->priv->key_events) { + GdkEventKey *event = plug->priv->key_events->data; + + gtk_window_propagate_key_event (GTK_WINDOW (plug), event); + + gdk_event_free ((GdkEvent *)event); + + plug->priv->key_events = g_list_delete_link (plug->priv->key_events, + plug->priv->key_events); + } +} static void gs_lock_plug_size_request (GtkWidget *widget, @@ -861,6 +893,32 @@ } void +gs_lock_plug_set_busy (GSLockPlug *plug) +{ + GdkCursor *cursor; + GtkWidget *top_level; + + top_level = gtk_widget_get_toplevel (GTK_WIDGET (plug)); + + cursor = gdk_cursor_new (GDK_WATCH); + gdk_window_set_cursor (top_level->window, cursor); + gdk_cursor_unref (cursor); +} + +void +gs_lock_plug_set_ready (GSLockPlug *plug) +{ + GdkCursor *cursor; + GtkWidget *top_level; + + top_level = gtk_widget_get_toplevel (GTK_WIDGET (plug)); + + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gdk_window_set_cursor (top_level->window, cursor); + gdk_cursor_unref (cursor); +} + +void gs_lock_plug_show_prompt (GSLockPlug *plug, const char *message, gboolean visible) @@ -869,17 +927,40 @@ gs_debug ("Setting prompt to: %s", message); + gtk_widget_set_sensitive (plug->priv->auth_unlock_button, TRUE); + gtk_widget_show (plug->priv->auth_unlock_button); + gtk_widget_grab_default (plug->priv->auth_unlock_button); gtk_label_set_text (GTK_LABEL (plug->priv->auth_prompt_label), message); + gtk_widget_show (plug->priv->auth_prompt_label); gtk_entry_set_visibility (GTK_ENTRY (plug->priv->auth_prompt_entry), visible); - + gtk_widget_show (plug->priv->auth_prompt_entry); + if (! GTK_WIDGET_HAS_FOCUS (plug->priv->auth_prompt_entry)) { gtk_widget_grab_focus (plug->priv->auth_prompt_entry); } + /* were there any key events sent to the plug while the entry wasnt + * ready? If so, forward them along + */ + forward_key_events (plug); + restart_monitor_progress (plug); } void +gs_lock_plug_hide_prompt (GSLockPlug *plug) +{ + g_return_if_fail (GS_IS_LOCK_PLUG (plug)); + + gtk_widget_hide (plug->priv->auth_prompt_entry); + gtk_widget_hide (plug->priv->auth_prompt_label); + gtk_widget_set_sensitive (plug->priv->auth_unlock_button, FALSE); + gtk_widget_hide (plug->priv->auth_unlock_button); + + gtk_widget_grab_default (plug->priv->auth_cancel_button); +} + +void gs_lock_plug_show_message (GSLockPlug *plug, const char *message) { @@ -915,7 +996,19 @@ capslock_update (plug, capslock_on); } - return FALSE; + /* if the input widget is visible and ready for input + * then just carry on as usual + */ + if (GTK_WIDGET_VISIBLE (plug->priv->auth_prompt_entry) && + GTK_WIDGET_IS_SENSITIVE (plug->priv->auth_prompt_entry)) + return FALSE; + + if (strcmp (event->string, "") == 0) + return FALSE; + + queue_key_event (plug, event); + + return TRUE; } /* adapted from gtk_dialog_add_button */ --- gnome-screensaver-2.16.1/src/gs-lock-plug.h.better-pam-integration 2006-07-18 13:49:24.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-lock-plug.h 2007-01-19 11:08:48.000000000 -0500 @@ -68,6 +68,10 @@ void gs_lock_plug_show_prompt (GSLockPlug *plug, const char *message, gboolean visible); +void gs_lock_plug_hide_prompt (GSLockPlug *plug); +void gs_lock_plug_set_busy (GSLockPlug *plug); +void gs_lock_plug_set_ready (GSLockPlug *plug); + void gs_lock_plug_get_text (GSLockPlug *plug, char **text); void gs_lock_plug_show_message (GSLockPlug *plug, --- gnome-screensaver-2.16.1/src/gs-manager.h.better-pam-integration 2006-08-04 15:36:03.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gs-manager.h 2007-01-19 11:08:48.000000000 -0500 @@ -94,6 +94,7 @@ void gs_manager_set_mode (GSManager *manager, GSSaverMode mode); gboolean gs_manager_request_unlock (GSManager *manager); +void gs_manager_cancel_unlock_request (GSManager *manager); G_END_DECLS --- gnome-screensaver-2.16.1/src/gnome-screensaver-dialog.c.better-pam-integration 2006-07-18 14:18:23.000000000 -0400 +++ gnome-screensaver-2.16.1/src/gnome-screensaver-dialog.c 2007-01-19 11:09:01.000000000 -0500 @@ -147,6 +147,7 @@ if (response == GS_LOCK_PLUG_RESPONSE_OK) { gs_lock_plug_get_text (plug, &text); } + gs_lock_plug_hide_prompt (plug); return text; } @@ -214,6 +215,9 @@ gs_profile_start (NULL); gs_debug ("Got message style %d: '%s'", style, msg); + gtk_widget_show (GTK_WIDGET (plug)); + gs_lock_plug_set_ready (plug); + ret = TRUE; *response = NULL; message = maybe_translate_message (msg); @@ -256,6 +260,7 @@ gtk_main_iteration (); } + gs_lock_plug_set_busy (plug); gs_profile_end (NULL); return ret; @@ -278,6 +283,8 @@ error = NULL; + gs_lock_plug_hide_prompt (plug); + gs_lock_plug_set_busy (plug); res = gs_auth_verify_user (g_get_user_name (), g_getenv ("DISPLAY"), auth_message_handler, plug, &error); gs_debug ("Verify user returned: %s", res ? "TRUE" : "FALSE"); @@ -306,7 +313,8 @@ response_cb (GSLockPlug *plug, gint response_id) { - if (response_id == GS_LOCK_PLUG_RESPONSE_CANCEL) { + if ((response_id == GS_LOCK_PLUG_RESPONSE_CANCEL) || + (response_id == GTK_RESPONSE_DELETE_EVENT)) { quit_response_cancel (); } } @@ -325,6 +333,13 @@ return !res; } +static void +show_cb (GtkWidget *widget, + gpointer data) +{ + print_id (widget); +} + static gboolean popup_dialog_idle (void) { @@ -347,10 +362,9 @@ } g_signal_connect (GS_LOCK_PLUG (widget), "response", G_CALLBACK (response_cb), NULL); + g_signal_connect (widget, "show", G_CALLBACK (show_cb), NULL); - gtk_widget_show (widget); - - print_id (widget); + gtk_widget_realize (widget); g_idle_add ((GSourceFunc)auth_check_idle, widget); Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/FC-6/gnome-screensaver.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- gnome-screensaver.spec 10 Nov 2006 20:03:39 -0000 1.117 +++ gnome-screensaver.spec 19 Jan 2007 16:22:01 -0000 1.118 @@ -13,14 +13,14 @@ Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.16.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Graphics Source0: %{name}-%{version}.tar.bz2 Source1: gnome-screensaver-hide-xscreensaver.menu Patch1: gnome-screensaver-2.15.4-default-theme.patch -Patch2: gnome-screensaver-2.16.0-better-pam-integration.patch +Patch2: gnome-screensaver-2.16.1-better-pam-integration.patch Patch3: gnome-screensaver-2.16.0-securitytoken.patch Patch4: gnome-screensaver-2.16.1-localize-prompt.patch @@ -124,6 +124,11 @@ %{_sysconfdir}/pam.d/* %changelog +* Fri Jan 19 2007 Ray Strode - 2.16.1-4.fc6 +- correctly queue keystrokes so they aren't lost when bringing + up lock dialog (bug 206677) +- run pam account management modules from correct thread + * Fri Nov 10 2006 Ray Strode - 2.16.1-3.fc6 - convert pam messages from users encoding to utf8 before puttin in ui (bug 214681) --- gnome-screensaver-2.16.0-better-pam-integration.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 19 16:35:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 11:35:32 -0500 Subject: rpms/bash/devel bash-cond-rmatch.patch, NONE, 1.1 bash.spec, 1.128, 1.129 Message-ID: <200701191635.l0JGZWZ3008554@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8489 Modified Files: bash.spec Added Files: bash-cond-rmatch.patch Log Message: * Fri Jan 19 2007 Tim Waugh 3.2-3 - Back out rmatch change introduced in 3.2 (bug #220087). - Resolves: rhbz#220087 bash-cond-rmatch.patch: execute_cmd.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bash-cond-rmatch.patch --- --- bash-3.2/execute_cmd.c.cond_rmatch 2007-01-19 16:29:03.000000000 +0000 +++ bash-3.2/execute_cmd.c 2007-01-19 16:29:25.000000000 +0000 @@ -2560,7 +2560,7 @@ arg1 = cond_expand_word (cond->left->op, 0); if (arg1 == 0) arg1 = nullstr; - arg2 = cond_expand_word (cond->right->op, patmatch||rmatch); + arg2 = cond_expand_word (cond->right->op, patmatch); if (arg2 == 0) arg2 = nullstr; Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- bash.spec 16 Jan 2007 17:56:07 -0000 1.128 +++ bash.spec 19 Jan 2007 16:35:30 -0000 1.129 @@ -1,7 +1,7 @@ Version: 3.2 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -34,6 +34,7 @@ Patch118: bash-tty-tests.patch Patch126: bash-setlocale.patch Patch130: bash-infotags.patch +Patch131: bash-cond-rmatch.patch Prefix: %{_prefix} Requires: mktemp Obsoletes: bash2 etcskel @@ -79,6 +80,7 @@ %patch118 -p1 -b .tty-tests %patch126 -p1 -b .setlocale %patch130 -p1 -b .infotags +%patch131 -p1 -b .cond-rmatch echo %{version} > _distribution echo %{release} > _patchlevel @@ -207,6 +209,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Fri Jan 19 2007 Tim Waugh 3.2-3 +- Back out rmatch change introduced in 3.2 (bug #220087). + * Tue Jan 16 2007 Miroslav Lichvar 3.2-2 - Link with ncurses. From fedora-cvs-commits at redhat.com Fri Jan 19 16:37:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 11:37:56 -0500 Subject: rpms/eclipse-cdt/devel .cvsignore, 1.23, 1.24 eclipse-cdt.spec, 1.70, 1.71 sources, 1.28, 1.29 Message-ID: <200701191637.l0JGbuUu010434@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10254 Modified Files: .cvsignore eclipse-cdt.spec sources Log Message: * Wed Jan 17 2007 Jeff Johnston 3.1.1-7 - Resolves: #222350 - Rebase autotools to 0.0.6.1 source. - Add comments. - Put arch-specific jars in library dir. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 11 Dec 2006 21:40:37 -0000 1.23 +++ .cvsignore 19 Jan 2007 16:37:53 -0000 1.24 @@ -2,3 +2,4 @@ eclipse-cdt-fetched-src-3.1.1.tar.bz2 eclipse-cdt-cppunit-20061102.tar.gz eclipse-cdt-autotools-0.0.6.tar.gz +eclipse-cdt-autotools-0.0.6.1.tar.gz Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- eclipse-cdt.spec 11 Dec 2006 21:40:37 -0000 1.70 +++ eclipse-cdt.spec 19 Jan 2007 16:37:53 -0000 1.71 @@ -1,15 +1,12 @@ Epoch: 1 -%define gcj_support 1 -%define pkg_summary C/C++ Development Tools (CDT) plugin for Eclipse -%define section free -%define eclipse_name eclipse -%define major 3 -%define minor 1 -%define majmin %{major}.%{minor} -%define micro 1 -%define eclipse_base %{_datadir}/%{eclipse_name} -%define eclipse_lib_base %{_libdir}/%{eclipse_name} +%define gcj_support 1 +%define major 3 +%define minor 1 +%define majmin %{major}.%{minor} +%define micro 1 +%define eclipse_base %{_datadir}/eclipse +%define eclipse_lib_base %{_libdir}/eclipse # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -18,41 +15,77 @@ %define eclipse_arch %{_arch} %endif -Summary: %{pkg_summary} -Name: %{eclipse_name}-cdt -Version: %{majmin}.%{micro} -Release: 6%{dist} -License: Eclipse Public License - v 1.0 (EPL) -Group: Text Editors/Integrated Development Environments (IDE) -URL: http://www.eclipse.org/cdt -Requires: eclipse-platform +Summary: Eclipse C/C++ Development Tools (CDT) plugin +Name: eclipse-cdt +Version: %{majmin}.%{micro} +Release: 7%{?dist} +License: Eclipse Public License / CPL +Group: Development/Tools +URL: http://www.eclipse.org/cdt +Requires: eclipse-platform -# This tarball was generated like this: -# +# The following tarball was generated like this: +# # mkdir temp && cd temp # mkdir home -# cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co -r v200609270800 \ -# org.eclipse.cdt-releng/org.eclipse.cdt.releng +# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_3_1_1 \ +# org.eclipse.cdt-releng/org.eclipse.cdt.releng # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/ -# sed --in-place 's/@cdtTag@/v200609270800/' maps/cdt.map -# java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \ -# org.eclipse.core.launcher.Main \ +# sed --in-place 's/@cdtTag@/CDT_3_1_1/' maps/cdt.map +# sed --in-place 's/home/cvsroot/' maps/cdt.map +# eclipse -nosplash -Duser.home=../../home \ # -application org.eclipse.ant.core.antRunner \ # -buildfile build.xml -DbaseLocation=/usr/share/eclipse \ # -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \ # -DdontUnzip=true fetch # cd .. && tar jcf eclipse-cdt-fetched-src-3.1.1.tar.bz2 org.eclipse.cdt.releng + Source0: %{name}-fetched-src-%{version}.tar.bz2 -Source1: %{name}-autotools-0.0.6.tar.gz + +# The following tarball was generated thusly: +# +# mkdir temp && cd temp +# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \ +# autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \ +# autotools/com.redhat.eclipse.cdt.autotools.feature +# cd autotools +# tar -czvf eclipse-cdt-autotools-0.0.6.1.tar.gz com.redhat.eclipse.cdt.autotools* + +Source1: %{name}-autotools-0.0.6.1.tar.gz + +# The following tarball was generated thusly: +# +# mkdir temp && cd temp +# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CPPUnit_20061102 \ +# org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit \ +# org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit-feature +# cd org.eclipse.cdt-cppunit +# tar -czvf eclipse-cdt-cppunit-20061102.tar.gz org.eclipse.cdt.cppunit* + Source2: %{name}-cppunit-20061102.tar.gz +# Patch to add special "ForAllElements" targets to CDT sdk/customTargets.xml. Patch1: %{name}-no-cvs2-patch +# Patch to remove tests from CDT build.xml. Patch4: %{name}-no-tests.patch +# Patch to CDT to add the ability to specify a build subconsole. Subconsole is +# used by Autotools to display configuration output. Patch5: %{name}-subconsole.patch +# Patch to add new IScannerInfoPlus interface to CDT and add code to recognize it +# when opening header files via clicking on them in the outline view. This +# stops multiple include paths from being shown when the true path is already +# known by calculation from the build's Makefile. Patch6: %{name}-scannerinfoplus.patch +# Patch to CDT to add hover help for compiler defined symbols (i.e. -D flags). Patch7: %{name}-definedsymbolhover.patch +# Patch to cppunit code to support double-clicking on file names, classes, and +# member names in the Hierarchy and Failure views such that the appropriate +# file will be opened and the appropriate line will be selected. Patch8: %{name}-cppunit-ui.patch +# Patch to upgrade version number for cppunit feature. Patch9: %{name}-cppunit-feature.patch +# Patch to fix default paths used by cppunit wizards to find header files and +# libraries. Patch10: %{name}-cppunit-default-location.patch BuildRequires: eclipse-pde @@ -62,22 +95,23 @@ Requires(post): java-gcj-compat >= 1.0.64 Requires(postun): java-gcj-compat >= 1.0.64 %else -BuildRequires: java-devel >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 %endif -Requires: ctags gdb make -Requires: eclipse-platform >= 1:3.2.0 +Requires: gdb make gcc-c++ autoconf automake +Requires: eclipse-platform >= 1:3.2.0 +# Currently, upstream CDT only supports building on the platforms listed here. %if %{gcj_support} ExclusiveArch: %{ix86} x86_64 ppc ia64 %else ExclusiveArch: %{ix86} x86_64 ppc ia64 %endif -BuildRoot: %{_tmppath}/%{name}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package sdk -Summary: %{pkg_summary} SDK -Group: Text Editors/Integrated Development Environments (IDE) +Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin +Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name} = %{epoch}:%{version}-%{release} %description @@ -85,7 +119,7 @@ useful for C and C++ development. %description sdk -This is the SDK version of the eclipse-cdt package. +Source for Eclipse CDT for use within Eclipse. %prep %setup -q -c @@ -189,7 +223,7 @@ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Dtype=feature \ - -Did=org.eclipse.cdt.cppunit \ + -Did=org.eclipse.cdt.cppunit \ -DsourceDirectory=$(pwd) \ -DbaseLocation=$SDK \ -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ @@ -204,15 +238,13 @@ tar -C ${RPM_BUILD_ROOT}/%{eclipse_base} --strip-components=1 -zxvf \ org.eclipse.cdt.releng/results/I.*/org.eclipse.cdt.sdk-*.tar.gz -# We move the libraries to libdir, leaving symlinks behind. And since -# zip doesn't preserve file permissions, we must also mark all the .so -# files as executable. +# We move arch-specific plugins to libdir. mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/eclipse pushd ${RPM_BUILD_ROOT} -for sofile in $(find .%{eclipse_base} -name \*.so); do - mv $sofile .%{_libdir}/eclipse - chmod -R 755 .%{_libdir}/eclipse/$(basename $sofile) - ln -s %{_libdir}/eclipse/$(basename $sofile) $sofile +mkdir -p .%{_libdir}/eclipse/plugins +for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do + mv $archplugin .%{_libdir}/eclipse/plugins + chmod -R 755 .%{_libdir}/eclipse/plugins/$(basename $archplugin) done popd @@ -261,10 +293,12 @@ %{eclipse_base}/plugins/org.eclipse.cdt.refactoring* %{eclipse_base}/plugins/org.eclipse.cdt.ui* %{eclipse_base}/plugins/com.redhat.eclipse.cdt* -%{_libdir}/eclipse/lib* +%{_libdir}/eclipse/plugins/org.eclipse.cdt.core* %if %{gcj_support} %{_libdir}/gcj/%{name} %endif +%doc %{eclipse_base}/features/org.eclipse.cdt.cppunit_*/cpl-v10.html +%doc %{eclipse_base}/features/org.eclipse.cdt_*/epl-v10.html %files sdk %defattr(-,root,root) @@ -272,15 +306,20 @@ %{eclipse_base}/features/org.eclipse.cdt.source* %{eclipse_base}/plugins/org.eclipse.cdt.source* %{eclipse_base}/plugins/org.eclipse.cdt.sdk* -%if %{gcj_support} -%{_libdir}/gcj/%{name} -%endif +%{_libdir}/eclipse/plugins/org.eclipse.cdt.source* +%doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog -* Mon Dec 11 2006 Jeff Johnstont 3.1.1-6 +* Wed Jan 17 2007 Jeff Johnston 3.1.1-7 +- Resolves: #222350 +- Rebase autotools to 0.0.6.1 source. +- Add comments. +- Put arch-specific jars in library dir. + +* Mon Dec 11 2006 Jeff Johnston 3.1.1-6 - Rebase autotools to 0.0.6 source. -* Wed Nov 15 2006 Jeff Johnstont 3.1.1-5 +* Wed Nov 15 2006 Jeff Johnston 3.1.1-5 - Add cppunit support. * Mon Nov 06 2006 Andrew Overholt 3.1.1-4 @@ -442,7 +481,7 @@ - Added "if gcj_support" toggle - Fixed installing all arch fragments (now only installs one (correct) arch) - Redid BuildRequires and Requires to remove old/unneeded dependencies -- Cleaned %eclipse_arch declares. +- Cleaned %%eclipse_arch declares. * Thu Apr 21 2005 Phil Muldoon 3.0.0_fc-0.M6.4 - Added Chris Moller's libhover patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 13 Dec 2006 16:51:12 -0000 1.28 +++ sources 19 Jan 2007 16:37:53 -0000 1.29 @@ -1,3 +1,3 @@ -0c32e0a130f102727ba1c2a0645c483d eclipse-cdt-fetched-src-3.1.1.tar.bz2 -d66010506732482f48bd89775ebf1884 eclipse-cdt-cppunit-20061102.tar.gz -b83d1a201f8f981a09075289b31dbf73 eclipse-cdt-autotools-0.0.6.tar.gz +03800551796d05a68116ee0475240315 eclipse-cdt-autotools-0.0.6.1.tar.gz +922f65074113363570d0f5a0b56a1e70 eclipse-cdt-fetched-src-3.1.1.tar.bz2 +5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 19 16:47:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 11:47:05 -0500 Subject: rpms/parted/devel parted-1.8.2-vista.patch, NONE, 1.1 parted.spec, 1.93, 1.94 Message-ID: <200701191647.l0JGl5fu017572@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/parted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17530 Modified Files: parted.spec Added Files: parted-1.8.2-vista.patch Log Message: * Thu Jan 18 2007 David Cantrell - 1.8.2-2 - Preserve starting sector for primary NTFS 3.1 partitions (Windows Vista) when modifying the DOS disk label. NTFS 3.1 partitions do not start on the 2nd head of the 1st cylinder at the beginning of the drive. parted-1.8.2-vista.patch: dos.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) --- NEW FILE parted-1.8.2-vista.patch --- --- parted-1.8.2/libparted/labels/dos.c.vista 2006-12-15 17:20:53.000000000 -0500 +++ parted-1.8.2/libparted/labels/dos.c 2007-01-18 08:58:43.000000000 -0500 @@ -1535,9 +1535,15 @@ /* This constraint is for partitions starting on the first cylinder. They * must start on the 2nd head of the 1st cylinder. + * + * NOTE: We don't always start on the 2nd head of the 1st cylinder. If the + * partition's starting sector is not equal to the starting sector of the + * second head, we preserve it's location in this alignment. This is needed + * for operating systems such as Windows Vista (NTFS v3.1). */ static PedConstraint* -_primary_start_constraint (PedDisk* disk, const PedCHSGeometry* bios_geom, +_primary_start_constraint (PedDisk* disk, PedPartition *part, + const PedCHSGeometry* bios_geom, PedGeometry* min_geom) { PedDevice* dev = disk->dev; @@ -1546,21 +1552,26 @@ PedAlignment end_align; PedGeometry start_geom; PedGeometry end_geom; + PedSector start_pos; + + if (part->geom.start == bios_geom->sectors) + start_pos = bios_geom->sectors; + else + start_pos = part->geom.start; if (!ped_alignment_init (&start_align, bios_geom->sectors, 0)) return NULL; if (!ped_alignment_init (&end_align, -1, cylinder_size)) return NULL; if (min_geom) { - if (!ped_geometry_init (&start_geom, dev, - bios_geom->sectors, 1)) + if (!ped_geometry_init (&start_geom, dev, start_pos, 1)) return NULL; if (!ped_geometry_init (&end_geom, dev, min_geom->end, dev->length - min_geom->end)) return NULL; } else { - if (!ped_geometry_init (&start_geom, dev, bios_geom->sectors, - dev->length - bios_geom->sectors)) + if (!ped_geometry_init (&start_geom, dev, start_pos, + dev->length - start_pos)) return NULL; if (!ped_geometry_init (&end_geom, dev, 0, dev->length)) return NULL; @@ -1669,12 +1680,14 @@ solution = _best_solution (part, bios_geom, solution, _try_constraint (part, constraint, - _primary_start_constraint (disk, + _primary_start_constraint (disk, part, bios_geom, min_geom))); - solution = _best_solution (part, bios_geom, solution, - _try_constraint (part, constraint, - _primary_constraint (disk, bios_geom, - min_geom))); + + if (!solution) + solution = _best_solution (part, bios_geom, solution, + _try_constraint (part, constraint, + _primary_constraint (disk, bios_geom, + min_geom))); if (min_geom) ped_geometry_destroy (min_geom); Index: parted.spec =================================================================== RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- parted.spec 12 Jan 2007 20:07:49 -0000 1.93 +++ parted.spec 19 Jan 2007 16:47:02 -0000 1.94 @@ -4,9 +4,11 @@ Summary: The GNU disk partition manipulation program. Name: parted Version: 1.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 +Patch0: parted-1.8.2-vista.patch + Buildroot: %{_tmppath}/%{name}-root License: GPL Group: Applications/System @@ -34,6 +36,7 @@ %prep %setup -q +%patch0 -p 1 -b .vista aclocal autoconf @@ -89,6 +92,12 @@ %{_libdir}/*.so %changelog +* Thu Jan 18 2007 David Cantrell - 1.8.2-2 +- Preserve starting sector for primary NTFS 3.1 partitions (Windows + Vista) when modifying the DOS disk label. NTFS 3.1 partitions do + not start on the 2nd head of the 1st cylinder at the beginning of + the drive. + * Fri Jan 12 2007 David Cantrell - 1.8.2-1 - Upgrade to GNU parted-1.8.2 From fedora-cvs-commits at redhat.com Fri Jan 19 17:16:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 12:16:15 -0500 Subject: rpms/docbook-style-xsl/devel .cvsignore, 1.15, 1.16 docbook-style-xsl.Makefile, 1.2, 1.3 docbook-style-xsl.spec, 1.28, 1.29 sources, 1.15, 1.16 docbook-xsl-lists.patch, 1.2, NONE docbook-xsl-sp.patch, 1.1, NONE Message-ID: <200701191716.l0JHGFIk027602@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27540 Modified Files: .cvsignore docbook-style-xsl.Makefile docbook-style-xsl.spec sources Removed Files: docbook-xsl-lists.patch docbook-xsl-sp.patch Log Message: * Fri Jan 19 2007 Tim Waugh 1.71.1-1 - 1.71.1. No longer seem to need lists patch. Removed out of date sp patch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 12 Aug 2005 09:13:36 -0000 1.15 +++ .cvsignore 19 Jan 2007 17:16:13 -0000 1.16 @@ -8,3 +8,5 @@ docbook-xsl-doc-1.69.0.tar.bz2 docbook-xsl-1.69.1.tar.bz2 docbook-xsl-doc-1.69.1.tar.bz2 +docbook-xsl-1.71.1.tar.bz2 +docbook-xsl-doc-1.71.1.tar.bz2 Index: docbook-style-xsl.Makefile =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- docbook-style-xsl.Makefile 9 Sep 2004 04:21:07 -0000 1.2 +++ docbook-style-xsl.Makefile 19 Jan 2007 17:16:13 -0000 1.3 @@ -17,11 +17,8 @@ cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp cp javahelp/*.xsl $(DESTDIR)/javahelp cp lib/lib.xsl $(DESTDIR)/lib - cp template/README $(DESTDIR)/template - cp template/*.xml $(DESTDIR)/template cp template/*.xsl $(DESTDIR)/template cp xhtml/*.xsl $(DESTDIR)/xhtml - cp manpages/README $(DESTDIR)/manpages cp manpages/*.xsl $(DESTDIR)/manpages cp profiling/*.xsl $(DESTDIR)/profiling Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- docbook-style-xsl.spec 12 Jul 2006 05:41:25 -0000 1.28 +++ docbook-style-xsl.spec 19 Jan 2007 17:16:13 -0000 1.29 @@ -1,6 +1,6 @@ Name: docbook-style-xsl -Version: 1.69.1 -Release: 5.1 +Version: 1.71.1 +Release: 1%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -24,8 +24,6 @@ Patch1: docbook-xsl-pagesetup.patch Patch2: docbook-xsl-marginleft.patch -Patch3: docbook-xsl-lists.patch -Patch4: docbook-xsl-sp.patch %description @@ -40,8 +38,6 @@ popd %patch1 -p1 -b .pagesetup %patch2 -p1 -b .marginleft -%patch3 -p1 -b .lists -%patch4 -p1 -b .sp cp %{SOURCE1} Makefile for f in $(find -name "*'*") do @@ -71,7 +67,6 @@ %files %defattr (-,root,root) %doc BUGS -%doc ChangeLog %doc README %doc TODO %doc doc @@ -102,6 +97,10 @@ %changelog +* Fri Jan 19 2007 Tim Waugh 1.71.1-1 +- 1.71.1. No longer seem to need lists patch. Removed out of date sp + patch. + * Wed Jul 12 2006 Jesse Keating - 1.69.1-5.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 12 Aug 2005 09:13:36 -0000 1.15 +++ sources 19 Jan 2007 17:16:13 -0000 1.16 @@ -1,2 +1,2 @@ -6ebd29a67f2dcc3f2220f475ee6f6552 docbook-xsl-1.69.1.tar.bz2 -b3bf09a0b1a368a3490e68ffc695d290 docbook-xsl-doc-1.69.1.tar.bz2 +6a269abc854ae949b2cfd6377bc17fde docbook-xsl-1.71.1.tar.bz2 +f7844a751a4612c56acddc0790fbc501 docbook-xsl-doc-1.71.1.tar.bz2 --- docbook-xsl-lists.patch DELETED --- --- docbook-xsl-sp.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 19 17:42:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 12:42:23 -0500 Subject: rpms/pam/devel Linux-PAM-0.99.7.0.tar.bz2.sign, NONE, 1.1 pam-0.99.7.0-dbpam.patch, NONE, 1.1 pam-0.99.7.0-namespace-level.patch, NONE, 1.1 pam-0.99.7.0-namespace-no-unmount.patch, NONE, 1.1 pam-0.99.7.0-redhat-modules.patch, NONE, 1.1 pam-0.99.7.0-selinux-build.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 pam.spec, 1.139, 1.140 sources, 1.42, 1.43 Linux-PAM-0.99.6.2.tar.bz2.sign, 1.1, NONE pam-0.99.4.0-dbpam.patch, 1.1, NONE pam-0.99.5.0-redhat-modules.patch, 1.1, NONE pam-0.99.6.0-succif-session.patch, 1.1, NONE pam-0.99.6.2-doc-add-ids.patch, 1.1, NONE pam-0.99.6.2-ja-no-shortcut.patch, 1.1, NONE pam-0.99.6.2-keyinit-setgid.patch, 1.2, NONE pam-0.99.6.2-namespace-level.patch, 1.1, NONE pam-0.99.6.2-namespace-no-unmount.patch, 1.1, NONE pam-0.99.6.2-namespace-overflow.patch, 1.1, NONE pam-0.99.6.2-reconf.patch, 1.1, NONE pam-0.99.6.2-unix-username.patch, 1.1, NONE pam_namespace-10.patch, 1.1, NONE Message-ID: <200701191742.l0JHgNRJ024454@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24421 Modified Files: .cvsignore pam.spec sources Added Files: Linux-PAM-0.99.7.0.tar.bz2.sign pam-0.99.7.0-dbpam.patch pam-0.99.7.0-namespace-level.patch pam-0.99.7.0-namespace-no-unmount.patch pam-0.99.7.0-redhat-modules.patch pam-0.99.7.0-selinux-build.patch Removed Files: Linux-PAM-0.99.6.2.tar.bz2.sign pam-0.99.4.0-dbpam.patch pam-0.99.5.0-redhat-modules.patch pam-0.99.6.0-succif-session.patch pam-0.99.6.2-doc-add-ids.patch pam-0.99.6.2-ja-no-shortcut.patch pam-0.99.6.2-keyinit-setgid.patch pam-0.99.6.2-namespace-level.patch pam-0.99.6.2-namespace-no-unmount.patch pam-0.99.6.2-namespace-overflow.patch pam-0.99.6.2-reconf.patch pam-0.99.6.2-unix-username.patch pam_namespace-10.patch Log Message: * Fri Jan 19 2007 Tomas Mraz 0.99.7.0-1 - upgrade to new upstream version - drop pam_stack module as it is obsolete - some changes to silence rpmlint --- NEW FILE Linux-PAM-0.99.7.0.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFrqNOyGugalF9Dw4RAu8XAJ4va0VeqHoD4bvB3mG8h+0Rpzk1aACfY0eR 6+CQiju/QXqny24knVRj1cI= =miOa -----END PGP SIGNATURE----- pam-0.99.7.0-dbpam.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE pam-0.99.7.0-dbpam.patch --- --- Linux-PAM-0.99.7.0/configure.in.dbpam 2007-01-19 07:39:09.000000000 -0500 +++ Linux-PAM-0.99.7.0/configure.in 2007-01-19 07:40:07.000000000 -0500 @@ -348,7 +348,7 @@ WITH_DB=$enableval, WITH_DB=yes) if test x"$WITH_DB" != xno ; then if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then - AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="") + AC_CHECK_LIB([db], [db_create_pam], LIBDB="-ldb", LIBDB="") if test -z "$LIBDB" ; then AC_CHECK_LIB([db], [dbm_store], LIBDB="-ldb", LIBDB="") fi pam-0.99.7.0-namespace-level.patch: namespace.conf | 16 +++------ namespace.conf.5.xml | 18 +++++----- pam_namespace.c | 90 ++++++++++++++++++++++++++++++++++++++------------- pam_namespace.h | 4 +- 4 files changed, 87 insertions(+), 41 deletions(-) --- NEW FILE pam-0.99.7.0-namespace-level.patch --- --- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c.level 2007-01-19 08:33:11.000000000 -0500 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c 2007-01-19 08:33:11.000000000 -0500 @@ -244,23 +244,29 @@ } strcpy(poly.dir, dir); strcpy(poly.instance_prefix, instance_prefix); - if (strcmp(method, "user") == 0) - poly.method = USER; + + poly.method = NONE; + if (strcmp(method, "user") == 0) + poly.method = USER; + #ifdef WITH_SELINUX - else if (strcmp(method, "context") == 0) { + if (strcmp(method, "level") == 0) { if (idata->flags & PAMNS_CTXT_BASED_INST) - poly.method = CONTEXT; + poly.method = LEVEL; else poly.method = USER; - } else if (strcmp(method, "both") == 0) { + } + + if (strcmp(method, "context") == 0) { if (idata->flags & PAMNS_CTXT_BASED_INST) - poly.method = BOTH; + poly.method = CONTEXT; else poly.method = USER; } #endif - else { + + if ( poly.method == NONE) { pam_syslog(idata->pamh, LOG_NOTICE, "Illegal method"); goto skipping; } @@ -448,19 +454,23 @@ return PAM_SESSION_ERR; } + if (polyptr->method == USER) return PAM_SUCCESS; + + rc = getexeccon(&scon); + if (rc < 0 || scon == NULL) { + pam_syslog(idata->pamh, LOG_ERR, + "Error getting exec context, %m"); + return PAM_SESSION_ERR; + } + /* * If polyinstantiating based on security context, get current * process security context, get security class for directories, * and ask the policy to provide security context of the * polyinstantiated instance directory. */ - if ((polyptr->method == CONTEXT) || (polyptr->method == BOTH)) { - rc = getexeccon(&scon); - if (rc < 0 || scon == NULL) { - pam_syslog(idata->pamh, LOG_ERR, - "Error getting exec context, %m"); - return PAM_SESSION_ERR; - } + + if (polyptr->method == CONTEXT) { tclass = string_to_security_class("dir"); if (security_compute_member(scon, *origcon, tclass, @@ -473,7 +483,48 @@ pam_syslog(idata->pamh, LOG_DEBUG, "member context returned by policy %s", *i_context); freecon(scon); + return PAM_SUCCESS; } + + /* + * If polyinstantiating based on security level, get current + * process security context, get security class for directories, + * and change the directories MLS Level to match process. + */ + + if (polyptr->method == LEVEL) { + context_t scontext = NULL; + context_t fcontext = NULL; + rc = PAM_SESSION_ERR; + + scontext = context_new(scon); + if (! scontext) { + pam_syslog(idata->pamh, LOG_ERR, "out of memory"); + goto fail; + } + fcontext = context_new(*origcon); + if (! fcontext) { + pam_syslog(idata->pamh, LOG_ERR, "out of memory"); + goto fail; + } + if (context_range_set(fcontext, context_range_get(scontext)) != 0) { + pam_syslog(idata->pamh, LOG_ERR, "Unable to set MLS Componant of context"); + goto fail; + } + *i_context=strdup(context_str(fcontext)); + if (! *i_context) { + pam_syslog(idata->pamh, LOG_ERR, "out of memory"); + goto fail; + } + + rc = PAM_SUCCESS; + fail: + context_free(scontext); + context_free(fcontext); + freecon(scon); + return rc; + } + /* Should never get here */ return PAM_SUCCESS; } #endif @@ -514,19 +565,14 @@ break; #ifdef WITH_SELINUX + case LEVEL: case CONTEXT: - if (asprintf(i_name, "%s", *i_context) < 0) { - *i_name = NULL; - rc = PAM_SESSION_ERR; - } - break; - - case BOTH: if (asprintf(i_name, "%s_%s", *i_context, idata->user) < 0) { *i_name = NULL; rc = PAM_SESSION_ERR; } break; + #endif /* WITH_SELINUX */ default: @@ -1158,7 +1204,7 @@ #ifdef WITH_SELINUX if (is_selinux_enabled()) idata.flags |= PAMNS_SELINUX_ENABLED; - if (ctxt_based_inst_needed()) + if (ctxt_based_inst_needed()) idata.flags |= PAMNS_CTXT_BASED_INST; #endif --- Linux-PAM-0.99.7.0/modules/pam_namespace/namespace.conf.level 2006-06-27 09:07:43.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/namespace.conf 2007-01-19 08:33:11.000000000 -0500 @@ -4,12 +4,10 @@ # # Uncommenting the following three lines will polyinstantiate # /tmp, /var/tmp and user's home directories. /tmp and /var/tmp will -# be polyinstantiated based on both security context as well as user -# name, whereas home directory will be polyinstantiated based on -# security context only. Polyinstantion will not be performed for -# user root and adm for directories /tmp and /var/tmp, whereas home -# directories will be polyinstantiated for all users. The user name -# and/or context is appended to the instance prefix. +# be polyinstantiated based on the MLS level part of the security context as well as user +# name, Polyinstantion will not be performed for user root and adm for directories +# /tmp and /var/tmp, whereas home directories will be polyinstantiated for all users. +# The user name and context is appended to the instance prefix. # # Note that instance directories do not have to reside inside the # polyinstantiated directory. In the examples below, instances of /tmp @@ -25,6 +23,6 @@ # caution, as it will reduce security and isolation achieved by # polyinstantiation. # -#/tmp /tmp-inst/ both root,adm -#/var/tmp /var/tmp/tmp-inst/ both root,adm -#$HOME $HOME/$USER.inst/inst- context +#/tmp /tmp-inst/ level root,adm +#/var/tmp /var/tmp/tmp-inst/ level root,adm +#$HOME $HOME/$USER.inst/ level --- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.h.level 2007-01-19 08:33:11.000000000 -0500 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.h 2007-01-19 08:33:11.000000000 -0500 @@ -63,6 +63,7 @@ #ifdef WITH_SELINUX #include +#include #endif #ifndef CLONE_NEWNS @@ -93,9 +94,10 @@ * or both */ enum polymethod { + NONE, USER, CONTEXT, - BOTH, + LEVEL, }; /* --- Linux-PAM-0.99.7.0/modules/pam_namespace/namespace.conf.5.xml.level 2006-06-27 09:07:43.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/namespace.conf.5.xml 2007-01-19 08:33:11.000000000 -0500 @@ -22,7 +22,7 @@ This module allows setup of private namespaces with polyinstantiated directories. Directories can be polyinstantiated based on user name - or, in the case of SELinux, user name, security context or both. If an + or, in the case of SELinux, user name, sensitivity level or complete security context. If an executable script /etc/security/namespace.init exists, it is used to initialize the namespace every time a new instance directory is setup. The script receives the polyinstantiated @@ -72,10 +72,10 @@ The third field, method, is the method used for polyinstantiation. It can take 3 different values; "user" - for polyinstantiation based on user name, "context" for - polyinstantiation based on process security context, and "both" - for polyinstantiation based on both user name and security context. - Methods "context" and "both" are only available with SELinux. This + for polyinstantiation based on user name, "level" for + polyinstantiation based on process MLS level and user name, and "context" for + polyinstantiation based on process security context and user name + Methods "context" and "level" are only available with SELinux. This field cannot be blank. @@ -98,9 +98,9 @@ # The following three lines will polyinstantiate /tmp, # /var/tmp and user's home directories. /tmp and /var/tmp - # will be polyinstantiated based on both security context + # will be polyinstantiated based on the security level # as well as user name, whereas home directory will be - # polyinstantiated based on security context only. + # polyinstantiated based on the full security context and user name. # Polyinstantiation will not be performed for user root # and adm for directories /tmp and /var/tmp, whereas home # directories will be polyinstantiated for all users. @@ -112,8 +112,8 @@ # will reside within the directories that are being # polyinstantiated. # - /tmp /tmp-inst/ both root,adm - /var/tmp /var/tmp/tmp-inst/ both root,adm + /tmp /tmp-inst/ level root,adm + /var/tmp /var/tmp/tmp-inst/ level root,adm $HOME $HOME/$USER.inst/inst- context pam-0.99.7.0-namespace-no-unmount.patch: README.xml | 8 ++++++++ pam_namespace.8.xml | 19 +++++++++++++++++++ pam_namespace.c | 18 ++++++++++++++++++ pam_namespace.h | 1 + 4 files changed, 46 insertions(+) --- NEW FILE pam-0.99.7.0-namespace-no-unmount.patch --- --- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c.no-unmount 2006-10-24 07:45:36.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c 2007-01-19 08:08:58.000000000 -0500 @@ -1266,12 +1266,30 @@ idata.flags |= PAMNS_DEBUG; if (strcmp(argv[i], "ignore_config_error") == 0) idata.flags |= PAMNS_IGN_CONFIG_ERR; + if (strcmp(argv[i], "no_unmount_on_close") == 0) + idata.flags |= PAMNS_NO_UNMOUNT_ON_CLOSE; } if (idata.flags & PAMNS_DEBUG) pam_syslog(idata.pamh, LOG_DEBUG, "close_session - start"); /* + * For certain trusted programs such as newrole, open session + * is called from a child process while the parent perfoms + * close session and pam end functions. For these commands + * pam_close_session should not perform the unmount of the + * polyinstantiatied directory because it will result in + * undoing of parents polyinstantiatiaion. These commands + * will invoke pam_namespace with the "no_unmount_on_close" + * argument. + */ + if (idata.flags & PAMNS_NO_UNMOUNT_ON_CLOSE) { + if (idata.flags & PAMNS_DEBUG) + pam_syslog(idata.pamh, LOG_DEBUG, "close_session - sucessful"); + return PAM_SUCCESS; + } + + /* * Lookup user and fill struct items */ retval = pam_get_item(idata.pamh, PAM_USER, (void*) &user_name ); --- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.8.xml.no-unmount 2006-06-27 09:07:44.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.8.xml 2007-01-19 07:45:02.000000000 -0500 @@ -43,6 +43,9 @@ ignore_instance_parent_mode + + no_unmount_on_close + @@ -179,6 +182,22 @@ + + + + + + + For certain trusted programs such as newrole, open session + is called from a child process while the parent perfoms + close session and pam end functions. For these commands + use this option to instruct pam_close_session to not + unmount the bind mounted polyinstantiated directory in the + parent. + + + + --- Linux-PAM-0.99.7.0/modules/pam_namespace/README.xml.no-unmount 2006-06-28 03:22:43.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/README.xml 2007-01-19 07:45:02.000000000 -0500 @@ -121,6 +121,14 @@ the restrictive mode of 000. Using this option, an administrator can choose to ignore the mode of the instance parent. + no_unmount_on_close + For certain trusted programs such as newrole, open session + is called from a child process while the parent perfoms + close session and pam end functions. For these commands + use this option to instruct pam_close_session to not + unmount the bind mounted polyinstantiated directory in the + parent. + MODULE SERVICES PROVIDED: session open_session and close_session --- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.h.no-unmount 2006-07-28 07:59:28.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.h 2007-01-19 07:45:02.000000000 -0500 @@ -86,6 +86,7 @@ #define PAMNS_GEN_HASH 0x00002000 /* Generate md5 hash for inst names */ #define PAMNS_IGN_CONFIG_ERR 0x00004000 /* Ignore format error in conf file */ #define PAMNS_IGN_INST_PARENT_MODE 0x00008000 /* Ignore instance parent mode */ +#define PAMNS_NO_UNMOUNT_ON_CLOSE 0x00010000 /* no unmount at session close */ /* * Polyinstantiation method options, based on user, security context pam-0.99.7.0-redhat-modules.patch: configure.in | 4 ++++ modules/Makefile.am | 2 ++ 2 files changed, 6 insertions(+) --- NEW FILE pam-0.99.7.0-redhat-modules.patch --- --- Linux-PAM-0.99.5.0/configure.in.redhat-modules 2006-06-28 09:25:02.000000000 +0200 +++ Linux-PAM-0.99.5.0/configure.in 2006-06-30 10:24:35.000000000 +0200 @@ -492,6 +492,10 @@ libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \ po/Makefile.in \ modules/Makefile \ + modules/pam_chroot/Makefile modules/pam_console/Makefile \ + modules/pam_postgresok/Makefile \ + modules/pam_rps/Makefile \ + modules/pam_timestamp/Makefile modules/pam_tally2/Makefile \ modules/pam_access/Makefile modules/pam_cracklib/Makefile \ modules/pam_debug/Makefile modules/pam_deny/Makefile \ modules/pam_echo/Makefile modules/pam_env/Makefile \ --- Linux-PAM-0.99.5.0/modules/Makefile.am.redhat-modules 2006-06-27 16:21:08.000000000 +0200 +++ Linux-PAM-0.99.5.0/modules/Makefile.am 2006-06-30 10:27:02.000000000 +0200 @@ -3,6 +3,8 @@ # SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \ + pam_chroot pam_console pam_postgresok pam_rps \ + pam_timestamp pam_tally2 \ pam_env pam_filter pam_ftp pam_group pam_issue pam_keyinit \ pam_lastlog pam_limits pam_listfile pam_localuser pam_mail \ pam_mkhomedir pam_motd pam_nologin pam_permit pam_rhosts pam_rootok \ pam-0.99.7.0-selinux-build.patch: Makefile.am | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE pam-0.99.7.0-selinux-build.patch --- --- Linux-PAM-0.99.7.0/modules/pam_selinux/Makefile.am.build 2006-06-21 02:35:26.000000000 -0400 +++ Linux-PAM-0.99.7.0/modules/pam_selinux/Makefile.am 2007-01-19 11:12:06.000000000 -0500 @@ -22,10 +22,11 @@ AM_LDFLAGS = -no-undefined \ -L$(top_builddir)/libpam -lpam @LIBSELINUX@ -pam_selinux_check_LDFLAGS = -L$(top_builddir)/libpam_misc -lpam_misc +pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/libpam_misc -lpam_misc +pam_selinux_la_LDFLAGS = $(AM_LDFLAGS) if HAVE_VERSIONING - pam_selinux_la_LDFLAGS = -avoid-version -module \ + pam_selinux_la_LDFLAGS += -avoid-version -module \ -Wl,--version-script=$(srcdir)/../modules.map endif Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 13 Nov 2006 21:05:40 -0000 1.40 +++ .cvsignore 19 Jan 2007 17:42:21 -0000 1.41 @@ -1,3 +1,5 @@ -Linux-PAM-0.99.6.2.tar.bz2 -pam-redhat-0.99.6-2.tar.bz2 db-4.5.20.tar.gz +*.src.rpm +*.tar.bz2 +Linux-PAM-0.99.7.0.tar.bz2 +pam-redhat-0.99.7-1.tar.bz2 Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- pam.spec 16 Jan 2007 19:35:46 -0000 1.139 +++ pam.spec 19 Jan 2007 17:42:21 -0000 1.140 @@ -6,12 +6,12 @@ %define pwdb_version 0.62 %define db_version 4.5.20 %define db_conflicting_version 4.6.0 -%define pam_redhat_version 0.99.6-2 +%define pam_redhat_version 0.99.7-1 Summary: A security tool which provides authentication for applications Name: pam -Version: 0.99.6.2 -Release: 8%{?dist} +Version: 0.99.7.0 +Release: 1%{?dist} License: GPL or BSD Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -24,32 +24,27 @@ Source8: dlopen.sh Source9: system-auth.5 Source10: config-util.5 -Patch1: pam-0.99.5.0-redhat-modules.patch +Patch1: pam-0.99.7.0-redhat-modules.patch +Patch2: pam-0.99.7.0-selinux-build.patch Patch21: pam-0.78-unix-hpux-aging.patch -Patch34: pam-0.99.4.0-dbpam.patch +Patch34: pam-0.99.7.0-dbpam.patch Patch70: pam-0.99.2.1-selinux-nofail.patch Patch80: pam-0.99.6.2-selinux-drop-multiple.patch Patch81: pam-0.99.3.0-cracklib-try-first-pass.patch Patch82: pam-0.99.3.0-tally-fail-close.patch Patch84: pam-0.99.6.2-selinux-keycreate.patch -Patch85: pam-0.99.6.0-succif-session.patch -Patch86: pam-0.99.6.2-namespace-no-unmount.patch +Patch86: pam-0.99.7.0-namespace-no-unmount.patch Patch87: pam-0.99.6.2-namespace-preserve-uid.patch -Patch88: pam-0.99.6.2-doc-add-ids.patch -Patch89: pam-0.99.6.2-namespace-overflow.patch -Patch90: pam-0.99.6.2-keyinit-setgid.patch -Patch91: pam-0.99.6.2-unix-username.patch Patch92: pam-0.99.6.2-selinux-select-context.patch -Patch93: pam-0.99.6.2-namespace-level.patch -Patch94: pam-0.99.6.2-ja-no-shortcut.patch +Patch93: pam-0.99.7.0-namespace-level.patch Patch95: pam-0.99.6.2-selinux-use-current-range.patch -Patch100: pam-0.99.6.2-reconf.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: cracklib, cracklib-dicts >= 2.8 -Obsoletes: pamconfig -Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig -BuildRequires: autoconf, automake, libtool +Requires(pre): grep, coreutils +Requires(post): mktemp, sed, coreutils, /sbin/ldconfig +BuildRequires: autoconf >= 2.60 +BuildRequires: automake, libtool BuildRequires: bison, flex, sed BuildRequires: cracklib-devel, cracklib-dicts >= 2.8 BuildRequires: perl, pkgconfig, gettext @@ -96,6 +91,7 @@ cp %{SOURCE7} . %patch1 -p1 -b .redhat-modules +%patch2 -p1 -b .build %patch21 -p1 -b .unix-hpux-aging %patch34 -p1 -b .dbpam %patch70 -p1 -b .nofail @@ -103,19 +99,12 @@ %patch81 -p1 -b .try-first-pass %patch82 -p1 -b .fail-close %patch84 -p1 -b .keycreate -%patch85 -p0 -b .session %patch86 -p1 -b .no-unmount %patch87 -p1 -b .preserve-uid -%patch88 -p0 -b .add-ids -%patch89 -p1 -b .overflow -%patch90 -p1 -b .setgid -%patch91 -p1 -b .username %patch92 -p1 -b .select-context -%patch93 -p1 -b .selinux-namespace -%patch94 -p1 -b .no-shortcut +%patch93 -p1 -b .level %patch95 -p1 -b .range -%patch100 -p1 -b .reconf -#autoreconf +autoreconf %build CFLAGS="-fPIC $RPM_OPT_FLAGS" ; export CFLAGS @@ -170,6 +159,11 @@ # Install the binaries, libraries, and modules. make install DESTDIR=$RPM_BUILD_ROOT LDCONFIG=: +# RPM uses docs from source tree +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/Linux-PAM +# Included in setup package +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/environment + # Install default configuration files. install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -m 644 other.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/other @@ -327,6 +321,7 @@ /%{_lib}/security/pam_echo.so /%{_lib}/security/pam_env.so /%{_lib}/security/pam_exec.so +/%{_lib}/security/pam_faildelay.so /%{_lib}/security/pam_filter.so /%{_lib}/security/pam_ftp.so /%{_lib}/security/pam_group.so @@ -351,7 +346,6 @@ /%{_lib}/security/pam_selinux.so /%{_lib}/security/pam_securetty.so /%{_lib}/security/pam_shells.so -/%{_lib}/security/pam_stack.so /%{_lib}/security/pam_stress.so /%{_lib}/security/pam_succeed_if.so /%{_lib}/security/pam_tally.so @@ -401,6 +395,11 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Fri Jan 19 2007 Tomas Mraz 0.99.7.0-1 +- upgrade to new upstream version +- drop pam_stack module as it is obsolete +- some changes to silence rpmlint + * Tue Jan 16 2007 Tomas Mraz 0.99.6.2-8 - properly include /var/log/faillog and tallylog as ghosts and create them in post script (#209646) @@ -432,7 +431,7 @@ - don't overflow a buffer in pam_namespace (#211989) * Mon Oct 16 2006 Tomas Mraz 0.99.6.2-3.2 -- /var/log/faillog and tallylog must be %config(noreplace) +- /var/log/faillog and tallylog must be config(noreplace) * Fri Oct 13 2006 Tomas Mraz 0.99.6.2-3.1 - preserve effective uid in namespace.init script (LSPP for newrole) @@ -733,7 +732,7 @@ - #134941 pam_console should check X11 socket only on login * Tue Oct 19 2004 Tomas Mraz 0.77-63 -- Fix checking of group %group syntax in pam_limits +- Fix checking of group %%group syntax in pam_limits - Drop fencepost patch as it was already fixed by upstream change from 0.75 to 0.77 - Fix brokenshadow patch @@ -1349,7 +1348,7 @@ - add 'sed' to the buildprereq list (#24666) * Sun Jan 21 2001 Matt Wilson -- added "exit 0" to the end of the %pre script +- added "exit 0" to the end of the pre script * Fri Jan 19 2001 Nalin Dahyabhai - self-hosting fix from Guy Streeter @@ -1493,7 +1492,7 @@ - try to make pam_console a little more discriminating * Mon Jun 19 2000 Nalin Dahyabhai -- symlink libpam.so to libpam.so.%{version}, and likewise for libpam_misc +- symlink libpam.so to libpam.so.%%{version}, and likewise for libpam_misc - reverse order of checks in _unix_getpwnam for pam_unix * Wed Jun 14 2000 Preston Brown Index: sources =================================================================== RCS file: /cvs/dist/rpms/pam/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 13 Nov 2006 21:05:40 -0000 1.42 +++ sources 19 Jan 2007 17:42:21 -0000 1.43 @@ -1,3 +1,3 @@ -52844c64efa6f8b6a9ed702eec341a4c Linux-PAM-0.99.6.2.tar.bz2 -03b4148754928c045b28650f14f427af pam-redhat-0.99.6-2.tar.bz2 b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz +e4c9e503ac6af0efdd6031a46bdf506f Linux-PAM-0.99.7.0.tar.bz2 +66845048120c71205bd3363264f2bfe7 pam-redhat-0.99.7-1.tar.bz2 --- Linux-PAM-0.99.6.2.tar.bz2.sign DELETED --- --- pam-0.99.4.0-dbpam.patch DELETED --- --- pam-0.99.5.0-redhat-modules.patch DELETED --- --- pam-0.99.6.0-succif-session.patch DELETED --- --- pam-0.99.6.2-doc-add-ids.patch DELETED --- --- pam-0.99.6.2-ja-no-shortcut.patch DELETED --- --- pam-0.99.6.2-keyinit-setgid.patch DELETED --- --- pam-0.99.6.2-namespace-level.patch DELETED --- --- pam-0.99.6.2-namespace-no-unmount.patch DELETED --- --- pam-0.99.6.2-namespace-overflow.patch DELETED --- --- pam-0.99.6.2-reconf.patch DELETED --- --- pam-0.99.6.2-unix-username.patch DELETED --- --- pam_namespace-10.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 19 19:06:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 14:06:31 -0500 Subject: rpms/hunspell/devel hunspell-1.1.4-sharedlibs.patch, 1.1, 1.2 hunspell.spec, 1.5, 1.6 Message-ID: <200701191906.l0JJ6V0T029703@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/hunspell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29633 Modified Files: hunspell-1.1.4-sharedlibs.patch hunspell.spec Log Message: pkg-config support hunspell-1.1.4-sharedlibs.patch: configure.ac | 2 +- hunspell-1.1.4/Makefile.am | 5 ++++- hunspell-1.1.4/configure.ac | 5 +++++ hunspell-1.1.4/hunspell.pc.in | 10 ++++++++++ src/hunspell/Makefile.am | 11 +++++++---- src/parsers/Makefile.am | 9 +-------- src/tools/Makefile.am | 9 ++++----- 7 files changed, 32 insertions(+), 19 deletions(-) Index: hunspell-1.1.4-sharedlibs.patch =================================================================== RCS file: /cvs/dist/rpms/hunspell/devel/hunspell-1.1.4-sharedlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hunspell-1.1.4-sharedlibs.patch 28 Nov 2006 17:11:55 -0000 1.1 +++ hunspell-1.1.4-sharedlibs.patch 19 Jan 2007 19:06:29 -0000 1.2 @@ -75,3 +75,54 @@ # need mystrdup() -LDADD = ../hunspell/libhunspell.a +LDADD = ../hunspell/libhunspell-1.1.la +diff -urNad hunspell-1.1.4.orig/Makefile.am hunspell-1.1.4/Makefile.am +--- hunspell-1.1.4.orig/Makefile.am 2007-01-18 14:46:45.000000000 +0100 ++++ hunspell-1.1.4/Makefile.am 2007-01-18 14:46:51.000000000 +0100 +@@ -2,5 +2,8 @@ + + SUBDIRS= intl po src man m4 tests + ++pkgconfdir = $(libdir)/pkgconfig ++pkgconf_DATA = hunspell.pc ++ + EXTRA_DIST = BUGS README.myspell AUTHORS.myspell license.myspell license.hunspell \ +- ChangeLog.O COPYING.MPL COPYING.LGPL ++ ChangeLog.O COPYING.MPL COPYING.LGPL hunspell.pc.in +diff -urNad hunspell-1.1.4.orig/configure.ac hunspell-1.1.4/configure.ac +--- hunspell-1.1.4.orig/configure.ac 2007-01-18 14:46:50.000000000 +0100 ++++ hunspell-1.1.4/configure.ac 2007-01-18 14:49:06.000000000 +0100 +@@ -11,6 +11,10 @@ + AC_SUBST(XFAILED) + + AM_INIT_AUTOMAKE(hunspell, 1.1.4) ++HUNSPELL_VERSION_MAJOR=`echo $VERSION | cut -d"." -f1` ++HUNSPELL_VERSION_MINOR=`echo $VERSION | cut -d"." -f2` ++AC_SUBST(HUNSPELL_VERSION_MAJOR) ++AC_SUBST(HUNSPELL_VERSION_MINOR) + + AC_CONFIG_SRCDIR([config.h.in]) + AC_CONFIG_HEADER([config.h]) +@@ -79,6 +83,7 @@ + AC_SUBST(READLINELIB) + + AC_CONFIG_FILES([Makefile ++ hunspell.pc + man/Makefile + man/hu/Makefile + intl/Makefile +diff -urNad hunspell-1.1.4.orig/hunspell.pc.in hunspell-1.1.4/hunspell.pc.in +--- hunspell-1.1.4.orig/hunspell.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ hunspell-1.1.4/hunspell.pc.in 2007-01-18 14:50:45.000000000 +0100 +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include ++ ++Name: hunspell ++Description: Hunpell spellchecking library ++Version: @VERSION@ ++Libs: -L${libdir} -lhunspell- at HUNSPELL_VERSION_MAJOR@. at HUNSPELL_VERSION_MINOR@ ++Cflags: -I${includedir}/hunspell + + Index: hunspell.spec =================================================================== RCS file: /cvs/dist/rpms/hunspell/devel/hunspell.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hunspell.spec 11 Jan 2007 17:17:41 -0000 1.5 +++ hunspell.spec 19 Jan 2007 19:06:29 -0000 1.6 @@ -1,7 +1,7 @@ Name: hunspell Summary: Hunspell is a spell checker and morphological analyzer library Version: 1.1.4 -Release: 4%{?dist} +Release: 5%{?dist} Source: %{name}-%{version}.tar.gz Group: System Environment/Libraries URL: http://hunspell.sourceforge.net/ @@ -19,7 +19,7 @@ Curses library, Ispell pipe interface, OpenOffice.org UNO module. %package devel -Requires: hunspell = %{PACKAGE_VERSION} +Requires: hunspell = %{PACKAGE_VERSION}, pkgconfig Summary: Files for developing with hunspell Group: Development/Libraries @@ -79,8 +79,12 @@ %{_libdir}/*.so %{_bindir}/munch %{_bindir}/unmunch +%{_libdir}/pkgconfig/hunspell.pc %changelog +* Fri Jan 19 2007 Caolan McNamara - 1.1.4-5 +- .pc + * Thu Jan 11 2007 Caolan McNamara - 1.1.4-4 - fix out of range From fedora-cvs-commits at redhat.com Fri Jan 19 20:12:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 15:12:33 -0500 Subject: rpms/syslinux/devel syslinux.spec,1.38,1.39 Message-ID: <200701192012.l0JKCX41022394@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/syslinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22380 Modified Files: syslinux.spec Log Message: Make syslinux own /usr/lib/syslinux. Index: syslinux.spec =================================================================== RCS file: /cvs/dist/rpms/syslinux/devel/syslinux.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- syslinux.spec 17 Jan 2007 19:50:26 -0000 1.38 +++ syslinux.spec 19 Jan 2007 20:12:31 -0000 1.39 @@ -2,7 +2,7 @@ Name: syslinux Version: 3.31 %define tarball_version 3.31 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2 @@ -81,6 +81,7 @@ %{_bindir}/ppmtolss16 %{_bindir}/lss16toppm %{_bindir}/gethostip +%dir %{_prefix}/lib/syslinux %{_prefix}/lib/syslinux/*.com %{_prefix}/lib/syslinux/*.exe %{_prefix}/lib/syslinux/*.c32 @@ -94,6 +95,9 @@ %{_prefix}/lib/syslinux/com32 %changelog +* Thu Jan 18 2007 Jesse Keating - 3.31-2 +- Make syslinux own /usr/lib/syslinux. + * Wed Jan 17 2007 Jeremy Katz - 3.31-1 - update to 3.31 From fedora-cvs-commits at redhat.com Fri Jan 19 20:21:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 15:21:08 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.79,1.80 Message-ID: <200701192021.l0JKL8km010508@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10494 Modified Files: spamassassin.spec Log Message: - Options for RHEL4 * spamc/spamd cannot connect over IPv6 or SSL * sa-update is disabled The above functionality requires perl modules not included in RHEL4. You may still use them if you get those perl modules from elsewhere. RHEL5 ships these perl modules. Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- spamassassin.spec 14 Dec 2006 22:06:51 -0000 1.79 +++ spamassassin.spec 19 Jan 2007 20:21:01 -0000 1.80 @@ -1,6 +1,12 @@ -%define real_name Mail-SpamAssassin -%define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0) +# OPTION: SSL and IPv6 (FC6+, RHEL5+) +%define option_ssl 1 +# OPTION: perl-Archive-Tar (FC2+, RHEL5+) +%define option_archive_tar 1 + +# DEPRECATED OPTION: Old krb5.h location (RHEL3 and old FC) +%define option_old_krb5 0 +%define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Summary: Spam filter for email which can be invoked from mail delivery agents. @@ -39,12 +45,17 @@ Requires: perl(Net::DNS) Requires: perl(Time::HiRes) Requires: perl(DB_File) -Requires: perl(Archive::Tar) Requires: procmail + +%if %{option_archive_tar} +Requires: perl(Archive::Tar) +%endif +%if %{option_ssl} # Needed for spamc/spamd SSL Requires: perl(IO::Socket::SSL) # Needed for IPv6 Requires: perl(IO::Socket::INET6) +%endif Obsoletes: perl-Mail-SpamAssassin @@ -77,7 +88,7 @@ export CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null -%{__make} %{?krb5backcompat:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" +%{__make} %{?option_old_krb5:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -172,6 +183,14 @@ exit 0 %changelog +* Thu Jan 18 2007 Warren Togami +- Options for RHEL4 + * spamc/spamd cannot connect over IPv6 or SSL + * sa-update is disabled + The above functionality requires perl modules not included in RHEL4. + You may still use them if you get those perl modules from elsewhere. + RHEL5 ships these perl modules. + * Thu Dec 14 2006 Warren Togami - 3.1.7-4 - add standardized sa-update cron script, disabled by default From fedora-cvs-commits at redhat.com Fri Jan 19 20:26:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 15:26:07 -0500 Subject: rpms/spamassassin/FC-5 sa-update.cronscript, NONE, 1.1 sa-update.crontab, NONE, 1.1 sa-update.logrotate, NONE, 1.1 spamassassin.spec, 1.68, 1.69 Message-ID: <200701192026.l0JKQ7ZC010577@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10563 Modified Files: spamassassin.spec Added Files: sa-update.cronscript sa-update.crontab sa-update.logrotate Log Message: - add standardized sa-update cron script, disabled by default - own directory /var/lib/spamassassin --- NEW FILE sa-update.cronscript --- #!/bin/bash sleep $(expr $RANDOM % 7200) echo SpamAssassin rule update begins at `date` /usr/bin/sa-update /etc/init.d/spamassassin condrestart echo --- NEW FILE sa-update.crontab --- ### OPTIONAL: Spamassassin Rules Updates ### # # http://wiki.apache.org/spamassassin/RuleUpdates # Highly recommended that you read the documentation before using this. # ENABLE UPDATES AT YOUR OWN RISK. # # /var/log/sa-update.log contains a history log of sa-update runs #10 4 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 | tee -a /var/log/sa-update.log --- NEW FILE sa-update.logrotate --- /var/log/sa-update.log { monthly notifyempty missingok } Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/spamassassin.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- spamassassin.spec 21 Nov 2006 00:47:25 -0000 1.68 +++ spamassassin.spec 19 Jan 2007 20:26:05 -0000 1.69 @@ -1,12 +1,18 @@ -%define real_name Mail-SpamAssassin -%define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0) +# OPTION: SSL and IPv6 (FC6+, RHEL5+) +%define option_ssl 0 +# OPTION: perl-Archive-Tar (FC2+, RHEL5+) +%define option_archive_tar 0 + +# DEPRECATED OPTION: Old krb5.h location (RHEL3 and old FC) +%define option_old_krb5 0 +%define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.7 -Release: 1%{?dist} +Release: 4%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -15,6 +21,9 @@ Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc Source5: spamassassin.sysconfig +Source6: sa-update.logrotate +Source7: sa-update.crontab +Source8: sa-update.cronscript Source10: spamassassin-helper.sh # Patches 0-99 are RH specific # none yet @@ -38,6 +47,16 @@ Requires: perl(DB_File) Requires: procmail +%if %{option_archive_tar} +Requires: perl(Archive::Tar) +%endif +%if %{option_ssl} +# Needed for spamc/spamd SSL +Requires: perl(IO::Socket::SSL) +# Needed for IPv6 +Requires: perl(IO::Socket::INET6) +%endif + Obsoletes: perl-Mail-SpamAssassin %description @@ -69,7 +88,7 @@ export CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null -%{__make} %{?krb5backcompat:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" +%{__make} %{?option_old_krb5:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -83,12 +102,17 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/local.cf install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin install -m 0644 %{SOURCE3} %buildroot/etc/mail/spamassassin install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin +install -m 0644 %{SOURCE6} %buildroot/etc/logrotate.d/sa-update +install -m 0600 %{SOURCE7} %buildroot/etc/cron.d/sa-update +install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress @@ -107,6 +131,7 @@ sed "s@^$RPM_BUILD_ROOT@%dir @g" >> %{name}-%{version}-filelist mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin %files -f %{name}-%{version}-filelist %defattr(-,root,root) @@ -115,8 +140,11 @@ %config %{_initrddir}/spamassassin %config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin +%config(noreplace) %{_sysconfdir}/cron.d/sa-update %dir %{_datadir}/spamassassin %dir %{_localstatedir}/run/spamassassin +%dir %{_localstatedir}/lib/spamassassin +%{_sysconfdir}/logrotate.d/sa-update %clean rm -rf $RPM_BUILD_ROOT @@ -155,14 +183,39 @@ exit 0 %changelog +* Thu Jan 18 2007 Warren Togami +- Options for RHEL4 + * spamc/spamd cannot connect over IPv6 or SSL + * sa-update is disabled + The above functionality requires perl modules not included in RHEL4. + You may still use them if you get those perl modules from elsewhere. + RHEL5 ships these perl modules. + +* Thu Dec 14 2006 Warren Togami - 3.1.7-4 +- add standardized sa-update cron script, disabled by default + +* Thu Dec 14 2006 Warren Togami - 3.1.7-2 +- own directory /var/lib/spamassassin + * Mon Nov 20 2006 Warren Togami - 3.1.7-1 - 3.1.7 maintenance release +* Wed Aug 02 2006 Warren Togami - 3.1.4-1 +- 3.1.4 maintenance release + +* Mon Jul 17 2006 Warren Togami - 3.1.3-5 +- req perl-IO-Socket-SSL for spamc/spamd SSL communication +- req perl-IO-Socket-INET6 for IPv6 + +* Wed Jul 12 2006 Jesse Keating - 3.1.3-3.1 +- rebuild + * Tue Jun 27 2006 Florian La Roche - 3.1.3-3 - require diffutils for the post script (cmp is used) * Wed Jun 07 2006 Warren Togami - 3.1.3-2 - start spamd before sendmail (#193818) +- require perl-Archive-Tar (#193100) * Mon Jun 05 2006 Warren Togami - 3.1.3-1 - CVE-2006-2447 From fedora-cvs-commits at redhat.com Fri Jan 19 20:29:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 15:29:01 -0500 Subject: rpms/spamassassin/FC-6 sa-update.cronscript, NONE, 1.1 sa-update.crontab, NONE, 1.1 sa-update.logrotate, NONE, 1.1 spamassassin.spec, 1.75, 1.76 Message-ID: <200701192029.l0JKT1q7010662@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10645 Modified Files: spamassassin.spec Added Files: sa-update.cronscript sa-update.crontab sa-update.logrotate Log Message: - add standardized sa-update cron script, disabled by default - own directory /var/lib/spamassassin --- NEW FILE sa-update.cronscript --- #!/bin/bash sleep $(expr $RANDOM % 7200) echo SpamAssassin rule update begins at `date` /usr/bin/sa-update /etc/init.d/spamassassin condrestart echo --- NEW FILE sa-update.crontab --- ### OPTIONAL: Spamassassin Rules Updates ### # # http://wiki.apache.org/spamassassin/RuleUpdates # Highly recommended that you read the documentation before using this. # ENABLE UPDATES AT YOUR OWN RISK. # # /var/log/sa-update.log contains a history log of sa-update runs #10 4 * * * root /usr/share/spamassassin/sa-update.cron 2>&1 | tee -a /var/log/sa-update.log --- NEW FILE sa-update.logrotate --- /var/log/sa-update.log { monthly notifyempty missingok } Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-6/spamassassin.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- spamassassin.spec 21 Nov 2006 00:44:26 -0000 1.75 +++ spamassassin.spec 19 Jan 2007 20:28:59 -0000 1.76 @@ -1,12 +1,18 @@ -%define real_name Mail-SpamAssassin -%define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0) +# OPTION: SSL and IPv6 (FC6+, RHEL5+) +%define option_ssl 1 +# OPTION: perl-Archive-Tar (FC2+, RHEL5+) +%define option_archive_tar 1 + +# DEPRECATED OPTION: Old krb5.h location (RHEL3 and old FC) +%define option_old_krb5 0 +%define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.7 -Release: 1%{?dist} +Release: 4%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -15,6 +21,9 @@ Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc Source5: spamassassin.sysconfig +Source6: sa-update.logrotate +Source7: sa-update.crontab +Source8: sa-update.cronscript Source10: spamassassin-helper.sh # Patches 0-99 are RH specific # none yet @@ -36,12 +45,17 @@ Requires: perl(Net::DNS) Requires: perl(Time::HiRes) Requires: perl(DB_File) -Requires: perl(Archive::Tar) Requires: procmail + +%if %{option_archive_tar} +Requires: perl(Archive::Tar) +%endif +%if %{option_ssl} # Needed for spamc/spamd SSL Requires: perl(IO::Socket::SSL) # Needed for IPv6 Requires: perl(IO::Socket::INET6) +%endif Obsoletes: perl-Mail-SpamAssassin @@ -74,7 +88,7 @@ export CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null -%{__make} %{?krb5backcompat:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" +%{__make} %{?option_old_krb5:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -88,12 +102,17 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/local.cf install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin install -m 0644 %{SOURCE3} %buildroot/etc/mail/spamassassin install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin +install -m 0644 %{SOURCE6} %buildroot/etc/logrotate.d/sa-update +install -m 0600 %{SOURCE7} %buildroot/etc/cron.d/sa-update +install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress @@ -112,6 +131,7 @@ sed "s@^$RPM_BUILD_ROOT@%dir @g" >> %{name}-%{version}-filelist mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin %files -f %{name}-%{version}-filelist %defattr(-,root,root) @@ -120,8 +140,11 @@ %config %{_initrddir}/spamassassin %config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin +%config(noreplace) %{_sysconfdir}/cron.d/sa-update %dir %{_datadir}/spamassassin %dir %{_localstatedir}/run/spamassassin +%dir %{_localstatedir}/lib/spamassassin +%{_sysconfdir}/logrotate.d/sa-update %clean rm -rf $RPM_BUILD_ROOT @@ -160,6 +183,20 @@ exit 0 %changelog +* Thu Jan 18 2007 Warren Togami +- Options for RHEL4 + * spamc/spamd cannot connect over IPv6 or SSL + * sa-update is disabled + The above functionality requires perl modules not included in RHEL4. + You may still use them if you get those perl modules from elsewhere. + RHEL5 ships these perl modules. + +* Thu Dec 14 2006 Warren Togami - 3.1.7-4 +- add standardized sa-update cron script, disabled by default + +* Thu Dec 14 2006 Warren Togami - 3.1.7-2 +- own directory /var/lib/spamassassin + * Mon Nov 20 2006 Warren Togami - 3.1.7-1 - 3.1.7 maintenance release From fedora-cvs-commits at redhat.com Fri Jan 19 21:15:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:15:21 -0500 Subject: rpms/libdv/devel libdv-1.0.0-gtk2.patch, NONE, 1.1 libdv-1.0.0-pic.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 libdv.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <200701192115.l0JLFLLH012486@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/libdv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12367 Modified Files: .cvsignore libdv.spec sources Added Files: libdv-1.0.0-gtk2.patch libdv-1.0.0-pic.patch Log Message: - New upstream release - PIC patch from Mike Frysinger (#146596) - Re-enable asm on i386 libdv-1.0.0-gtk2.patch: configure.ac | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libdv-1.0.0-gtk2.patch --- --- libdv-1.0.0/configure.ac.orig 2007-01-19 15:48:43.000000000 -0500 +++ libdv-1.0.0/configure.ac 2007-01-19 15:50:08.000000000 -0500 @@ -162,7 +162,7 @@ dnl Checks for libraries. have_gtk="false" 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,have_gtk="true",have_gtk="false") AC_DEFINE(HAVE_GTK) fi libdv-1.0.0-pic.patch: asm_common.S | 29 ++++++ dct_block_mmx.S | 88 ++++++++++---------- dv.c | 7 + encode.c | 9 +- encode_x86.S | 19 ++-- idct_block_mmx.S | 68 ++++++++-------- parse.c | 7 + quant.c | 4 quant.h | 2 quant_x86.S | 15 ++- rgbtoyuv.S | 228 +++++++++++++++++++++++++++--------------------------- rgbtoyuv_x86_64.S | 3 vlc_x86.S | 182 ++++++++++++++++++++++++++++++++++++------- 13 files changed, 424 insertions(+), 237 deletions(-) --- NEW FILE libdv-1.0.0-pic.patch --- Patch downloaded from http://bugs.gentoo.org/show_bug.cgi?id=121871 http://bugs.gentoo.org/attachment.cgi?id=98094 --- libdv-0.104-old/libdv/asm_common.S +++ libdv-0.104/libdv/asm_common.S @@ -0,0 +1,29 @@ +/* public domain, do what you want */ + +#ifdef __PIC__ +# define MUNG(sym) sym##@GOTOFF(%ebp) +# define MUNG_ARR(sym, args...) sym##@GOTOFF(%ebp,##args) +#else +# define MUNG(sym) sym +# define MUNG_ARR(sym, args...) sym(,##args) +#endif + +#ifdef __PIC__ +# undef __i686 /* gcc define gets in our way */ +# define LOAD_PIC_REG(reg) \ + .ifndef __i686.get_pc_thunk.reg; \ + .section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax", at progbits; \ + .global __i686.get_pc_thunk.reg; \ + .hidden __i686.get_pc_thunk.reg; \ + .type __i686.get_pc_thunk.reg, at function; \ + __i686.get_pc_thunk.reg: \ + movl (%esp), %e##reg; \ + ret; \ + .size __i686.get_pc_thunk.reg,.-__i686.get_pc_thunk.reg; \ + .previous; \ + .endif; \ + call __i686.get_pc_thunk.reg; \ + addl $_GLOBAL_OFFSET_TABLE_, %e##reg +#else +# define LOAD_PIC_REG(reg) +#endif --- libdv-0.104-old/libdv/dct_block_mmx.S +++ libdv-0.104/libdv/dct_block_mmx.S @@ -53,19 +53,22 @@ scratch2: .quad 0 .section .note.GNU-stack, "", @progbits +#include "asm_common.S" + .text .align 8 .global _dv_dct_88_block_mmx .hidden _dv_dct_88_block_mmx .type _dv_dct_88_block_mmx, at function _dv_dct_88_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi - movl 8(%ebp), %esi # source + LOAD_PIC_REG(bp) + + movl 12(%esp), %esi # source # column 0 movq 16*0(%esi), %mm0 # v0 @@ -86,22 +91,22 @@ _dv_dct_88_block_mmx: movq 16*3(%esi), %mm5 # v3 movq 16*4(%esi), %mm7 # v4 - movq %mm7, scratch1 # scratch1: v4 ; + movq %mm7, MUNG(scratch1) # scratch1: v4 ; movq %mm5, %mm7 # duplicate v3 - paddw scratch1, %mm5 # v03: v3+v4 - psubw scratch1, %mm7 # v04: v3-v4 - movq %mm5, scratch2 # scratch2: v03 + paddw MUNG(scratch1), %mm5 # v03: v3+v4 + psubw MUNG(scratch1), %mm7 # v04: v3-v4 + movq %mm5, MUNG(scratch2) # scratch2: v03 movq %mm0, %mm5 # mm5: v00 - paddw scratch2, %mm0 # v10: v00+v03 - psubw scratch2, %mm5 # v13: v00-v03 - movq %mm3, scratch3 # scratch3: v02 + paddw MUNG(scratch2), %mm0 # v10: v00+v03 + psubw MUNG(scratch2), %mm5 # v13: v00-v03 + movq %mm3, MUNG(scratch3) # scratch3: v02 movq %mm1, %mm3 # duplicate v01 - paddw scratch3, %mm1 # v11: v01+v02 - psubw scratch3, %mm3 # v12: v01-v02 + paddw MUNG(scratch3), %mm1 # v11: v01+v02 + psubw MUNG(scratch3), %mm3 # v12: v01-v02 - movq %mm6, scratch4 # scratch4: v05 + movq %mm6, MUNG(scratch4) # scratch4: v05 movq %mm0, %mm6 # duplicate v10 paddw %mm1, %mm0 # v10+v11 @@ -111,10 +116,10 @@ _dv_dct_88_block_mmx: movq %mm6, 16*4(%esi) # out4: v10-v11 movq %mm4, %mm0 # mm0: v06 - paddw scratch4, %mm4 # v15: v05+v06 + paddw MUNG(scratch4), %mm4 # v15: v05+v06 paddw %mm2, %mm0 # v16: v07+v06 - pmulhw WA3, %mm4 # v35~: WA3*v15 + pmulhw MUNG(WA3), %mm4 # v35~: WA3*v15 psllw $1, %mm4 # v35: compensate the coeefient scale movq %mm4, %mm6 # duplicate v35 @@ -123,7 +128,7 @@ _dv_dct_88_block_mmx: paddw %mm5, %mm3 # v22: v12+v13 - pmulhw WA1, %mm3 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm3 # v32~: WA1*v22 psllw $16-NSHIFT, %mm3 # v32: compensate the coeefient scale movq %mm5, %mm6 # duplicate v13 @@ -134,13 +139,13 @@ _dv_dct_88_block_mmx: movq %mm6, 16*6(%esi) # out6: v13-v32 - paddw scratch4, %mm7 # v14n: v04+v05 + paddw MUNG(scratch4), %mm7 # v14n: v04+v05 movq %mm0, %mm5 # duplicate v16 psubw %mm7, %mm0 # va1: v16-v14n - pmulhw WA5, %mm0 # va0~: va1*WA5 - pmulhw WA4, %mm5 # v36~~: v16*WA4 - pmulhw WA2, %mm7 # v34~~: v14n*WA2 + pmulhw MUNG(WA5), %mm0 # va0~: va1*WA5 + pmulhw MUNG(WA4), %mm5 # v36~~: v16*WA4 + pmulhw MUNG(WA2), %mm7 # v34~~: v14n*WA2 psllw $16-WA4_SHIFT, %mm5 # v36: compensate the coeefient scale psllw $16-NSHIFT, %mm7 # v34: compensate the coeefient scale @@ -188,22 +193,22 @@ _dv_dct_88_block_mmx: movq 16*3(%esi), %mm5 # v3 movq 16*4(%esi), %mm7 # v4 - movq %mm7, scratch1 # scratch1: v4 ; + movq %mm7, MUNG(scratch1) # scratch1: v4 ; movq %mm5, %mm7 # duplicate v3 - paddw scratch1, %mm5 # v03: v3+v4 - psubw scratch1, %mm7 # v04: v3-v4 - movq %mm5, scratch2 # scratch2: v03 + paddw MUNG(scratch1), %mm5 # v03: v3+v4 + psubw MUNG(scratch1), %mm7 # v04: v3-v4 + movq %mm5, MUNG(scratch2) # scratch2: v03 movq %mm0, %mm5 # mm5: v00 - paddw scratch2, %mm0 # v10: v00+v03 - psubw scratch2, %mm5 # v13: v00-v03 - movq %mm3, scratch3 # scratc3: v02 + paddw MUNG(scratch2), %mm0 # v10: v00+v03 + psubw MUNG(scratch2), %mm5 # v13: v00-v03 + movq %mm3, MUNG(scratch3) # scratc3: v02 movq %mm1, %mm3 # duplicate v01 - paddw scratch3, %mm1 # v11: v01+v02 - psubw scratch3, %mm3 # v12: v01-v02 + paddw MUNG(scratch3), %mm1 # v11: v01+v02 + psubw MUNG(scratch3), %mm3 # v12: v01-v02 - movq %mm6, scratch4 # scratc4: v05 + movq %mm6, MUNG(scratch4) # scratc4: v05 movq %mm0, %mm6 # duplicate v10 paddw %mm1, %mm0 # v10+v11 @@ -213,10 +218,10 @@ _dv_dct_88_block_mmx: movq %mm6, 16*4(%esi) # out4: v10-v11 movq %mm4, %mm0 # mm0: v06 - paddw scratch4, %mm4 # v15: v05+v06 + paddw MUNG(scratch4), %mm4 # v15: v05+v06 paddw %mm2, %mm0 # v16: v07+v06 - pmulhw WA3, %mm4 # v35~: WA3*v15 + pmulhw MUNG(WA3), %mm4 # v35~: WA3*v15 psllw $16-NSHIFT, %mm4 # v35: compensate the coeefient scale movq %mm4, %mm6 # duplicate v35 @@ -225,7 +230,7 @@ _dv_dct_88_block_mmx: paddw %mm5, %mm3 # v22: v12+v13 - pmulhw WA1, %mm3 # v32~: WA3*v15 + pmulhw MUNG(WA1), %mm3 # v32~: WA3*v15 psllw $16-NSHIFT, %mm3 # v32: compensate the coeefient scale movq %mm5, %mm6 # duplicate v13 @@ -235,13 +240,13 @@ _dv_dct_88_block_mmx: movq %mm5, 16*2(%esi) # out2: v13+v32 movq %mm6, 16*6(%esi) # out6: v13-v32 - paddw scratch4, %mm7 # v14n: v04+v05 + paddw MUNG(scratch4), %mm7 # v14n: v04+v05 movq %mm0, %mm5 # duplicate v16 psubw %mm7, %mm0 # va1: v16-v14n - pmulhw WA2, %mm7 # v34~~: v14n*WA2 - pmulhw WA5, %mm0 # va0~: va1*WA5 - pmulhw WA4, %mm5 # v36~~: v16*WA4 + pmulhw MUNG(WA2), %mm7 # v34~~: v14n*WA2 + pmulhw MUNG(WA5), %mm0 # va0~: va1*WA5 + pmulhw MUNG(WA4), %mm5 # v36~~: v16*WA4 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 @@ -748,11 +755,12 @@ _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 + LOAD_PIC_REG(bp) + + movl 16(%esp), %esi # source # column 0 @@ -779,7 +789,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -818,7 +828,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -855,7 +865,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -892,7 +902,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale --- libdv-0.104-old/libdv/dv.c +++ libdv-0.104/libdv/dv.c @@ -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 --- libdv-0.104-old/libdv/encode.c +++ libdv-0.104/libdv/encode.c @@ -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 } --- libdv-0.104-old/libdv/encode_x86.S +++ libdv-0.104/libdv/encode_x86.S @@ -23,9 +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 .section .note.GNU-stack, "", @progbits @@ -45,11 +43,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 # these four lines + pushl $0x000000FF # load VLCADDMASK + movq (%esp), %mm1 # into %mm1 off the stack + addl $8, %esp # --> no TEXTRELs xorl %ebp, %ebp subl $8, %edx vlc_encode_block_mmx_loop: @@ -121,7 +124,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 +590,11 @@ _dv_need_dct_248_mmx_rows: paddw %mm5, %mm1 paddw %mm1, %mm0 - - pmaddwd ALLONE, %mm0 + + pushl $0x00010001 # these four lines + pushl $0x00010001 # load ALLONE + pmaddwd (%esp), %mm0 # into %mm0 off the stack + addl $8, %esp # --> no TEXTRELs movq %mm0, %mm1 psrlq $32, %mm1 paddd %mm1, %mm0 --- libdv-0.104-old/libdv/idct_block_mmx.S +++ libdv-0.104/libdv/idct_block_mmx.S @@ -8,17 +8,21 @@ .section .note.GNU-stack, "", @progbits +#include "asm_common.S" + .text .align 4 .global _dv_idct_block_mmx .hidden _dv_idct_block_mmx .type _dv_idct_block_mmx, at function _dv_idct_block_mmx: pushl %ebp - movl %esp,%ebp pushl %esi - leal preSC, %ecx - movl 8(%ebp),%esi /* source matrix */ + + LOAD_PIC_REG(bp) + + leal MUNG(preSC), %ecx + movl 12(%esp),%esi /* source matrix */ /* * column 0: even part @@ -35,7 +41,7 @@ _dv_idct_block_mmx: movq %mm1, %mm2 /* added 11/1/96 */ pmulhw 8*8(%esi),%mm5 /* V8 */ psubsw %mm0, %mm1 /* V16 */ - pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V18 */ + pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V18 */ paddsw %mm0, %mm2 /* V17 */ movq %mm2, %mm0 /* duplicate V17 */ psraw $1, %mm2 /* t75=t82 */ @@ -76,7 +82,7 @@ _dv_idct_block_mmx: paddsw %mm0, %mm3 /* V29 ; free mm0 */ movq %mm7, %mm1 /* duplicate V26 */ psraw $1, %mm3 /* t91=t94 */ - pmulhw x539f539f539f539f,%mm7 /* V33 */ + pmulhw MUNG(x539f539f539f539f),%mm7 /* V33 */ psraw $1, %mm1 /* t96 */ movq %mm5, %mm0 /* duplicate V2 */ psraw $2, %mm4 /* t85=t87 */ @@ -84,15 +90,15 @@ _dv_idct_block_mmx: psubsw %mm4, %mm0 /* V28 ; free mm4 */ movq %mm0, %mm2 /* duplicate V28 */ psraw $1, %mm5 /* t90=t93 */ - pmulhw x4546454645464546,%mm0 /* V35 */ + pmulhw MUNG(x4546454645464546),%mm0 /* V35 */ psraw $1, %mm2 /* t97 */ movq %mm5, %mm4 /* duplicate t90=t93 */ psubsw %mm2, %mm1 /* V32 ; free mm2 */ - pmulhw x61f861f861f861f8,%mm1 /* V36 */ + pmulhw MUNG(x61f861f861f861f8),%mm1 /* V36 */ psllw $1, %mm7 /* t107 */ paddsw %mm3, %mm5 /* V31 */ psubsw %mm3, %mm4 /* V30 ; free mm3 */ - pmulhw x5a825a825a825a82,%mm4 /* V34 */ + pmulhw MUNG(x5a825a825a825a82),%mm4 /* V34 */ nop psubsw %mm1, %mm0 /* V38 */ psubsw %mm7, %mm1 /* V37 ; free mm7 */ @@ -159,7 +165,7 @@ _dv_idct_block_mmx: psubsw %mm7, %mm1 /* V50 */ pmulhw 8*9(%esi), %mm5 /* V9 */ paddsw %mm7, %mm2 /* V51 */ - pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V52 */ + pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V52 */ movq %mm2, %mm6 /* duplicate V51 */ psraw $1, %mm2 /* t138=t144 */ movq %mm3, %mm4 /* duplicate V1 */ @@ -200,11 +206,11 @@ _dv_idct_block_mmx: * even more by doing the correction step in a later stage when the number * is actually multiplied by 16 */ - paddw x0005000200010001, %mm4 + paddw MUNG(x0005000200010001), %mm4 psubsw %mm6, %mm3 /* V60 ; free mm6 */ psraw $1, %mm0 /* t154=t156 */ movq %mm3, %mm1 /* duplicate V60 */ - pmulhw x539f539f539f539f, %mm1 /* V67 */ + pmulhw MUNG(x539f539f539f539f), %mm1 /* V67 */ movq %mm5, %mm6 /* duplicate V3 */ psraw $2, %mm4 /* t148=t150 */ paddsw %mm4, %mm5 /* V61 */ @@ -213,13 +219,13 @@ _dv_idct_block_mmx: psllw $1, %mm1 /* t169 */ paddsw %mm0, %mm5 /* V65 -> result */ psubsw %mm0, %mm4 /* V64 ; free mm0 */ - pmulhw x5a825a825a825a82, %mm4 /* V68 */ + pmulhw MUNG(x5a825a825a825a82), %mm4 /* V68 */ psraw $1, %mm3 /* t158 */ psubsw %mm6, %mm3 /* V66 */ movq %mm5, %mm2 /* duplicate V65 */ - pmulhw x61f861f861f861f8, %mm3 /* V70 */ + pmulhw MUNG(x61f861f861f861f8), %mm3 /* V70 */ psllw $1, %mm6 /* t165 */ - pmulhw x4546454645464546, %mm6 /* V69 */ + pmulhw MUNG(x4546454645464546), %mm6 /* V69 */ psraw $1, %mm2 /* t172 */ /* moved from next block */ movq 8*5(%esi), %mm0 /* V56 */ @@ -344,7 +350,7 @@ _dv_idct_block_mmx: * movq 8*13(%esi), %mm4 tmt13 */ psubsw %mm4, %mm3 /* V134 */ - pmulhw x5a825a825a825a82, %mm3 /* 23170 ->V136 */ + pmulhw MUNG(x5a825a825a825a82), %mm3 /* 23170 ->V136 */ movq 8*9(%esi), %mm6 /* tmt9 */ paddsw %mm4, %mm5 /* V135 ; mm4 free */ movq %mm0, %mm4 /* duplicate tmt1 */ @@ -373,17 +379,17 @@ _dv_idct_block_mmx: psubsw %mm7, %mm0 /* V144 */ movq %mm0, %mm3 /* duplicate V144 */ paddsw %mm7, %mm2 /* V147 ; free mm7 */ - pmulhw x539f539f539f539f, %mm0 /* 21407-> V151 */ + pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V151 */ movq %mm1, %mm7 /* duplicate tmt3 */ paddsw %mm5, %mm7 /* V145 */ psubsw %mm5, %mm1 /* V146 ; free mm5 */ psubsw %mm1, %mm3 /* V150 */ movq %mm7, %mm5 /* duplicate V145 */ - pmulhw x4546454645464546, %mm1 /* 17734-> V153 */ + pmulhw MUNG(x4546454645464546), %mm1 /* 17734-> V153 */ psubsw %mm2, %mm5 /* V148 */ - pmulhw x61f861f861f861f8, %mm3 /* 25080-> V154 */ + pmulhw MUNG(x61f861f861f861f8), %mm3 /* 25080-> V154 */ psllw $2, %mm0 /* t311 */ - pmulhw x5a825a825a825a82, %mm5 /* 23170-> V152 */ + pmulhw MUNG(x5a825a825a825a82), %mm5 /* 23170-> V152 */ paddsw %mm2, %mm7 /* V149 ; free mm2 */ psllw $1, %mm1 /* t313 */ nop /* without the nop - freeze here for one clock */ @@ -409,7 +415,7 @@ _dv_idct_block_mmx: paddsw %mm3, %mm6 /* V164 ; free mm3 */ movq %mm4, %mm3 /* duplicate V142 */ psubsw %mm5, %mm4 /* V165 ; free mm5 */ - movq %mm2, scratch7 /* out7 */ + movq %mm2, MUNG(scratch7) /* out7 */ psraw $4, %mm6 psraw $4, %mm4 paddsw %mm5, %mm3 /* V162 */ @@ -420,11 +426,11 @@ _dv_idct_block_mmx: */ movq %mm6, 8*9(%esi) /* out9 */ paddsw %mm1, %mm0 /* V161 */ - movq %mm3, scratch5 /* out5 */ + movq %mm3, MUNG(scratch5) /* out5 */ psubsw %mm1, %mm5 /* V166 ; free mm1 */ movq %mm4, 8*11(%esi) /* out11 */ psraw $4, %mm5 - movq %mm0, scratch3 /* out3 */ + movq %mm0, MUNG(scratch3) /* out3 */ movq %mm2, %mm4 /* duplicate V140 */ movq %mm5, 8*13(%esi) /* out13 */ paddsw %mm7, %mm2 /* V160 */ @@ -434,7 +440,7 @@ _dv_idct_block_mmx: /* moved from the next block */ movq 8*3(%esi), %mm7 psraw $4, %mm4 - movq %mm2, scratch1 /* out1 */ + movq %mm2, MUNG(scratch1) /* out1 */ /* moved from the next block */ movq %mm0, %mm1 movq %mm4, 8*15(%esi) /* out15 */ @@ -491,15 +497,15 @@ _dv_idct_block_mmx: paddsw %mm4, %mm3 /* V113 ; free mm4 */ movq %mm0, %mm4 /* duplicate V110 */ paddsw %mm1, %mm2 /* V111 */ - pmulhw x539f539f539f539f, %mm0 /* 21407-> V117 */ + pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V117 */ psubsw %mm1, %mm5 /* V112 ; free mm1 */ psubsw %mm5, %mm4 /* V116 */ movq %mm2, %mm1 /* duplicate V111 */ - pmulhw x4546454645464546, %mm5 /* 17734-> V119 */ + pmulhw MUNG(x4546454645464546), %mm5 /* 17734-> V119 */ psubsw %mm3, %mm2 /* V114 */ - pmulhw x61f861f861f861f8, %mm4 /* 25080-> V120 */ + pmulhw MUNG(x61f861f861f861f8), %mm4 /* 25080-> V120 */ paddsw %mm3, %mm1 /* V115 ; free mm3 */ - pmulhw x5a825a825a825a82, %mm2 /* 23170-> V118 */ + pmulhw MUNG(x5a825a825a825a82), %mm2 /* 23170-> V118 */ psllw $2, %mm0 /* t266 */ movq %mm1, (%esi) /* save V115 */ psllw $1, %mm5 /* t268 */ @@ -517,7 +523,7 @@ _dv_idct_block_mmx: movq %mm6, %mm3 /* duplicate tmt4 */ psubsw %mm0, %mm6 /* V100 */ paddsw %mm0, %mm3 /* V101 ; free mm0 */ - pmulhw x5a825a825a825a82, %mm6 /* 23170 ->V102 */ + pmulhw MUNG(x5a825a825a825a82), %mm6 /* 23170 ->V102 */ movq %mm7, %mm5 /* duplicate tmt0 */ movq 8*8(%esi), %mm1 /* tmt8 */ paddsw %mm1, %mm7 /* V103 */ @@ -551,10 +557,10 @@ _dv_idct_block_mmx: movq 8*2(%esi), %mm3 /* V123 */ paddsw %mm4, %mm7 /* out0 */ /* moved up from next block */ - movq scratch3, %mm0 + movq MUNG(scratch3), %mm0 psraw $4, %mm7 /* moved up from next block */ - movq scratch5, %mm6 + movq MUNG(scratch5), %mm6 psubsw %mm4, %mm1 /* out14 ; free mm4 */ paddsw %mm3, %mm5 /* out2 */ psraw $4, %mm1 @@ -565,7 +571,7 @@ _dv_idct_block_mmx: movq %mm5, 8*2(%esi) /* out2 ; free mm5 */ psraw $4, %mm2 /* moved up to the prev block */ - movq scratch7, %mm4 + movq MUNG(scratch7), %mm4 /* moved up to the prev block */ psraw $4, %mm0 movq %mm2, 8*12(%esi) /* out12 ; free mm2 */ @@ -579,7 +585,7 @@ _dv_idct_block_mmx: * psraw $4, %mm0 * psraw $4, %mm6 */ - movq scratch1, %mm1 + movq MUNG(scratch1), %mm1 psraw $4, %mm4 movq %mm0, 8*3(%esi) /* out3 */ psraw $4, %mm1 --- libdv-0.104-old/libdv/parse.c +++ libdv-0.104/libdv/parse.c @@ -477,6 +477,13 @@ dv_parse_ac_coeffs(dv_videosegment_t *se exit(0); #endif } /* dv_parse_ac_coeffs */ +#if defined __GNUC__ && __ELF__ +# define dv_strong_hidden_alias(name, aliasname) \ + extern __typeof (name) aliasname __attribute__ ((alias (#name), visibility ("hidden"))) +dv_strong_hidden_alias(dv_parse_ac_coeffs, asm_dv_parse_ac_coeffs); +#else +int asm_dv_parse_ac_coeffs(dv_videosegment_t *seg) { return dv_parse_ac_coeffs(seg); } +#endif /* --------------------------------------------------------------------------- */ --- libdv-0.104-old/libdv/quant.c +++ libdv-0.104/libdv/quant.c @@ -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 } --- libdv-0.104-old/libdv/quant.h +++ libdv-0.104/libdv/quant.h @@ -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 --- libdv-0.104-old/libdv/quant_x86.S +++ libdv-0.104/libdv/quant_x86.S @@ -71,10 +73,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 +219,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 */ --- libdv-0.104-old/libdv/rgbtoyuv.S +++ libdv-0.104/libdv/rgbtoyuv.S @@ -41,9 +41,6 @@ #define DV_WIDTH_SHORT_HALF 720 #define DV_WIDTH_BYTE_HALF 360 -.global _dv_rgbtoycb_mmx -# .global yuvtoycb_mmx - .data .align 8 @@ -110,25 +107,26 @@ VR0GR: .long 0,0 VBG0B: .long 0,0 #endif - + +#include "asm_common.S" + .section .note.GNU-stack, "", @progbits .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 .global _dv_rgbtoycb_mmx .hidden _dv_rgbtoycb_mmx .type _dv_rgbtoycb_mmx, at function _dv_rgbtoycb_mmx: pushl %ebp - movl %esp, %ebp pushl %eax pushl %ebx pushl %ecx @@ -131,46 +132,47 @@ _dv_rgbtoycb_mmx: pushl %esi pushl %edi - leal ZEROSX, %eax #This section gets around a bug + LOAD_PIC_REG(bp) + + leal MUNG(ZEROSX), %eax #This section gets around a bug movq (%eax), %mm0 #unlikely to persist - movq %mm0, ZEROS - leal OFFSETDX, %eax + movq %mm0, MUNG(ZEROS) + leal MUNG(OFFSETDX), %eax movq (%eax), %mm0 - movq %mm0, OFFSETD - leal OFFSETWX, %eax + movq %mm0, MUNG(OFFSETD) + leal MUNG(OFFSETWX), %eax movq (%eax), %mm0 - movq %mm0, OFFSETW - leal OFFSETBX, %eax + movq %mm0, MUNG(OFFSETW) + leal MUNG(OFFSETBX), %eax movq (%eax), %mm0 - movq %mm0, OFFSETB - leal YR0GRX, %eax + movq %mm0, MUNG(OFFSETB) + leal MUNG(YR0GRX), %eax movq (%eax), %mm0 - movq %mm0, YR0GR - leal YBG0BX, %eax + movq %mm0, MUNG(YR0GR) + leal MUNG(YBG0BX), %eax movq (%eax), %mm0 - movq %mm0, YBG0B - leal UR0GRX, %eax + movq %mm0, MUNG(YBG0B) + leal MUNG(UR0GRX), %eax movq (%eax), %mm0 - movq %mm0, UR0GR - leal UBG0BX, %eax + movq %mm0, MUNG(UR0GR) + leal MUNG(UBG0BX), %eax movq (%eax), %mm0 - movq %mm0, UBG0B - leal VR0GRX, %eax + movq %mm0, MUNG(UBG0B) + leal MUNG(VR0GRX), %eax movq (%eax), %mm0 - movq %mm0, VR0GR - leal VBG0BX, %eax + movq %mm0, MUNG(VR0GR) + leal MUNG(VBG0BX), %eax movq (%eax), %mm0 - movq %mm0, VBG0B - - movl _rows(%ebp), %eax - movl _columns(%ebp), %ebx + movq %mm0, MUNG(VBG0B) + 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 +186,29 @@ rgbtoycb_mmx_loop: punpcklbw %mm6, %mm1 #B1G1R1B0 -> mm1 movq %mm0, %mm2 #R1B0G0R0 -> mm2 - pmaddwd YR0GR, %mm0 #yrR1,ygG0+yrR0 -> mm0 + pmaddwd MUNG(YR0GR), %mm0 #yrR1,ygG0+yrR0 -> mm0 movq %mm1, %mm3 #B1G1R1B0 -> mm3 - pmaddwd YBG0B, %mm1 #ybB1+ygG1,ybB0 -> mm1 + pmaddwd MUNG(YBG0B), %mm1 #ybB1+ygG1,ybB0 -> mm1 movq %mm2, %mm4 #R1B0G0R0 -> mm4 - pmaddwd UR0GR, %mm2 #urR1,ugG0+urR0 -> mm2 + pmaddwd MUNG(UR0GR), %mm2 #urR1,ugG0+urR0 -> mm2 movq %mm3, %mm5 #B1G1R1B0 -> mm5 - pmaddwd UBG0B, %mm3 #ubB1+ugG1,ubB0 -> mm3 + pmaddwd MUNG(UBG0B), %mm3 #ubB1+ugG1,ubB0 -> mm3 punpckhbw %mm6, %mm7 # 00G2R2 -> mm7 - pmaddwd VR0GR, %mm4 #vrR1,vgG0+vrR0 -> mm4 + pmaddwd MUNG(VR0GR), %mm4 #vrR1,vgG0+vrR0 -> mm4 paddd %mm1, %mm0 #Y1Y0 -> mm0 - pmaddwd VBG0B, %mm5 #vbB1+vgG1,vbB0 -> mm5 + pmaddwd MUNG(VBG0B), %mm5 #vbB1+vgG1,vbB0 -> mm5 movq 8(%eax), %mm1 #R5B4G4R4B3G3R3B2 -> mm1 paddd %mm3, %mm2 #U1U0 -> mm2 movq %mm1, %mm6 #R5B4G4R4B3G3R3B2 -> mm6 - punpcklbw ZEROS, %mm1 #B3G3R3B2 -> mm1 + punpcklbw MUNG(ZEROS), %mm1 #B3G3R3B2 -> mm1 paddd %mm5, %mm4 #V1V0 -> mm4 movq %mm1, %mm5 #B3G3R3B2 -> mm5 @@ -214,29 +216,29 @@ rgbtoycb_mmx_loop: paddd %mm7, %mm1 #R3B200+00G2R2=R3B2G2R2->mm1 - punpckhbw ZEROS, %mm6 #R5B4G4R3 -> mm6 + punpckhbw MUNG(ZEROS), %mm6 #R5B4G4R3 -> mm6 movq %mm1, %mm3 #R3B2G2R2 -> mm3 - pmaddwd YR0GR, %mm1 #yrR3,ygG2+yrR2 -> mm1 + pmaddwd MUNG(YR0GR), %mm1 #yrR3,ygG2+yrR2 -> mm1 movq %mm5, %mm7 #B3G3R3B2 -> mm7 - pmaddwd YBG0B, %mm5 #ybB3+ygG3,ybB2 -> mm5 + pmaddwd MUNG(YBG0B), %mm5 #ybB3+ygG3,ybB2 -> mm5 psrad $FIXPSHIFT, %mm0 #32-bit scaled Y1Y0 -> mm0 - movq %mm6, TEMP0 #R5B4G4R4 -> TEMP0 + movq %mm6, MUNG(TEMP0) #R5B4G4R4 -> TEMP0 movq %mm3, %mm6 #R3B2G2R2 -> mm6 - pmaddwd UR0GR, %mm6 #urR3,ugG2+urR2 -> mm6 + pmaddwd MUNG(UR0GR), %mm6 #urR3,ugG2+urR2 -> mm6 psrad $FIXPSHIFT, %mm2 #32-bit scaled U1U0 -> mm2 paddd %mm5, %mm1 #Y3Y2 -> mm1 movq %mm7, %mm5 #B3G3R3B2 -> mm5 - pmaddwd UBG0B, %mm7 #ubB3+ugG3,ubB2 + pmaddwd MUNG(UBG0B), %mm7 #ubB3+ugG3,ubB2 psrad $FIXPSHIFT, %mm1 #32-bit scaled Y3Y2 -> mm1 - pmaddwd VR0GR, %mm3 #vrR3,vgG2+vgR2 + pmaddwd MUNG(VR0GR), %mm3 #vrR3,vgG2+vgR2 packssdw %mm1, %mm0 #Y3Y2Y1Y0 -> mm0 - pmaddwd VBG0B, %mm5 #vbB3+vgG3,vbB2 -> mm5 + pmaddwd MUNG(VBG0B), %mm5 #vbB3+vgG3,vbB2 -> mm5 psrad $FIXPSHIFT, %mm4 #32-bit scaled V1V0 -> mm4 movq 16(%eax), %mm1 #B7G7R7B6G6R6B5G5 -> mm7 @@ -251,58 +253,58 @@ rgbtoycb_mmx_loop: movq %mm7, %mm5 #R7B6G6R6B5G500 -> mm5 psrad $FIXPSHIFT, %mm3 #32-bit scaled V3V2 -> mm3 - paddw OFFSETY, %mm0 + paddw MUNG(OFFSETY), %mm0 movq %mm0, (%ebx) #store Y3Y2Y1Y0 packssdw %mm6, %mm2 #32-bit scaled U3U2U1U0 -> mm2 - movq TEMP0, %mm0 #R5B4G4R4 -> mm0 + movq MUNG(TEMP0), %mm0 #R5B4G4R4 -> mm0 addl $8, %ebx - - punpcklbw ZEROS, %mm7 #B5G500 -> mm7 + + punpcklbw MUNG(ZEROS), %mm7 #B5G500 -> mm7 movq %mm0, %mm6 #R5B4G4R4 -> mm6 - movq %mm2, TEMPU #32-bit scaled U3U2U1U0 -> TEMPU + movq %mm2, MUNG(TEMPU) #32-bit scaled U3U2U1U0 -> TEMPU psrlq $32, %mm0 #00R5B4 -> mm0 paddw %mm0, %mm7 #B5G5R5B4 -> mm7 movq %mm6, %mm2 #B5B4G4R4 -> mm2 - pmaddwd YR0GR, %mm2 #yrR5,ygG4+yrR4 -> mm2 + pmaddwd MUNG(YR0GR), %mm2 #yrR5,ygG4+yrR4 -> mm2 movq %mm7, %mm0 #B5G5R5B4 -> mm0 - pmaddwd YBG0B, %mm7 #ybB5+ygG5,ybB4 -> mm7 + pmaddwd MUNG(YBG0B), %mm7 #ybB5+ygG5,ybB4 -> mm7 packssdw %mm3, %mm4 #32-bit scaled V3V2V1V0 -> mm4 addl $24, %eax #increment RGB count - movq %mm4, TEMPV #(V3V2V1V0)/256 -> mm4 + movq %mm4, MUNG(TEMPV) #(V3V2V1V0)/256 -> mm4 movq %mm6, %mm4 #B5B4G4R4 -> mm4 - pmaddwd UR0GR, %mm6 #urR5,ugG4+urR4 + pmaddwd MUNG(UR0GR), %mm6 #urR5,ugG4+urR4 movq %mm0, %mm3 #B5G5R5B4 -> mm0 - pmaddwd UBG0B, %mm0 #ubB5+ugG5,ubB4 + pmaddwd MUNG(UBG0B), %mm0 #ubB5+ugG5,ubB4 paddd %mm7, %mm2 #Y5Y4 -> mm2 - pmaddwd VR0GR, %mm4 #vrR5,vgG4+vrR4 -> mm4 + pmaddwd MUNG(VR0GR), %mm4 #vrR5,vgG4+vrR4 -> mm4 pxor %mm7, %mm7 #0 -> mm7 - pmaddwd VBG0B, %mm3 #vbB5+vgG5,vbB4 -> mm3 + pmaddwd MUNG(VBG0B), %mm3 #vbB5+vgG5,vbB4 -> mm3 punpckhbw %mm7, %mm1 #B7G7R7B6 -> mm1 paddd %mm6, %mm0 #U5U4 -> mm0 movq %mm1, %mm6 #B7G7R7B6 -> mm6 - pmaddwd YBG0B, %mm6 #ybB7+ygG7,ybB6 -> mm6 + pmaddwd MUNG(YBG0B), %mm6 #ybB7+ygG7,ybB6 -> mm6 punpckhbw %mm7, %mm5 #R7B6G6R6 -> mm5 movq %mm5, %mm7 #R7B6G6R6 -> mm7 paddd %mm4, %mm3 #V5V4 -> mm3 - pmaddwd YR0GR, %mm5 #yrR7,ygG6+yrR6 -> mm5 + pmaddwd MUNG(YR0GR), %mm5 #yrR7,ygG6+yrR6 -> mm5 movq %mm1, %mm4 #B7G7R7B6 -> mm4 - pmaddwd UBG0B, %mm4 #ubB7+ugG7,ubB6 -> mm4 + pmaddwd MUNG(UBG0B), %mm4 #ubB7+ugG7,ubB6 -> mm4 psrad $FIXPSHIFT, %mm0 #32-bit scaled U5U4 -> mm0 psrad $FIXPSHIFT, %mm2 #32-bit scaled Y5Y4 -> mm2 @@ -310,25 +312,25 @@ rgbtoycb_mmx_loop: paddd %mm5, %mm6 #Y7Y6 -> mm6 movq %mm7, %mm5 #R7B6G6R6 -> mm5 - pmaddwd UR0GR, %mm7 #urR7,ugG6+ugR6 -> mm7 + pmaddwd MUNG(UR0GR), %mm7 #urR7,ugG6+ugR6 -> mm7 psrad $FIXPSHIFT, %mm3 #32-bit scaled V5V4 -> mm3 - pmaddwd VBG0B, %mm1 #vbB7+vgG7,vbB6 -> mm1 + pmaddwd MUNG(VBG0B), %mm1 #vbB7+vgG7,vbB6 -> mm1 psrad $FIXPSHIFT, %mm6 #32-bit scaled Y7Y6 -> mm6 packssdw %mm6, %mm2 #Y7Y6Y5Y4 -> mm2 - pmaddwd VR0GR, %mm5 #vrR7,vgG6+vrR6 -> mm5 + pmaddwd MUNG(VR0GR), %mm5 #vrR7,vgG6+vrR6 -> mm5 paddd %mm4, %mm7 #U7U6 -> mm7 psrad $FIXPSHIFT, %mm7 #32-bit scaled U7U6 -> mm7 - paddw OFFSETY, %mm2 + paddw MUNG(OFFSETY), %mm2 movq %mm2, (%ebx) #store Y7Y6Y5Y4 - movq ALLONE, %mm6 + movq MUNG(ALLONE), %mm6 packssdw %mm7, %mm0 #32-bit scaled U7U6U5U4 -> mm0 - movq TEMPU, %mm4 #32-bit scaled U3U2U1U0 -> mm4 + movq MUNG(TEMPU), %mm4 #32-bit scaled U3U2U1U0 -> mm4 pmaddwd %mm6, %mm0 #U7U6U5U4 averaged -> (U7U6)(U5U4)=UU3 UU2->mm0 pmaddwd %mm6, %mm4 #U3U2U1U0 averaged -> (U3U2)(U1U0)=UU1 UU0->mm4 @@ -338,8 +340,8 @@ rgbtoycb_mmx_loop: psrad $FIXPSHIFT, %mm1 #32-bit scaled V7V6 -> mm1 psraw $1, %mm4 #divide UU3 UU2 UU1 UU0 by 2 -> mm4 - - movq TEMPV, %mm5 #32-bit scaled V3V2V1V0 -> mm5 + + movq MUNG(TEMPV), %mm5 #32-bit scaled V3V2V1V0 -> mm5 movq %mm4, (%ecx) # store U @@ -422,14 +426,15 @@ _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 - movq OFFSETY, %mm7 + LOAD_PIC_REG(bp) + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + + movq MUNG(OFFSETY), %mm7 pxor %mm6, %mm6 movq (%esi), %mm0 @@ -564,14 +571,15 @@ _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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 pxor %mm6, %mm6 movq (%esi), %mm0 @@ -852,16 +864,16 @@ _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 + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src - movq OFFSETBX, %mm7 + movq MUNG(OFFSETBX), %mm7 pxor %mm6, %mm6 @@ -1000,15 +1014,16 @@ _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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 paddw %mm7, %mm7 pxor %mm6, %mm6 @@ -1095,18 +1112,18 @@ 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 + + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src movl $4, %ebx - movq ALLONE, %mm6 - + movq MUNG(ALLONE), %mm6 ppm_copy_ntsc_c_block_mmx_loop: movq (%esi), %mm0 @@ -1168,14 +1187,15 @@ 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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 paddw %mm7, %mm7 pxor %mm6, %mm6 @@ -1325,15 +1347,16 @@ _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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 paddw %mm7, %mm7 pxor %mm6, %mm6 --- libdv-0.104-old/libdv/rgbtoyuv_x86_64.S +++ libdv-0.104/libdv/rgbtoyuv_x86_64.S @@ -41,9 +41,6 @@ #define DV_WIDTH_SHORT_HALF 720 #define DV_WIDTH_BYTE_HALF 360 -.global _dv_rgbtoycb_mmx_x86_64 -# .global yuvtoycb_mmx_x86_64 - .data .align 8 --- libdv-0.104-old/libdv/vlc_x86.S +++ libdv-0.104/libdv/vlc_x86.S @@ -1,31 +1,39 @@ #include "asmoff.h" .section .note.GNU-stack, "", @progbits + #include "asm_common.S" .text .align 4 .globl dv_decode_vlc +.globl asm_dv_decode_vlc +.hidden asm_dv_decode_vlc +asm_dv_decode_vlc = dv_decode_vlc + .type dv_decode_vlc, at function dv_decode_vlc: pushl %ebx + pushl %ebp + + LOAD_PIC_REG(bp) - /* Args are at 8(%esp). */ - movl 8(%esp),%eax /* %eax is bits */ - movl 12(%esp),%ebx /* %ebx is maxbits */ + /* 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*/ - movl dv_vlc_class_index_mask(,%ebx,4),%edx + movl MUNG_ARR(dv_vlc_class_index_mask,%ebx,4),%edx andl %eax,%edx - movl dv_vlc_class_index_rshift(,%ebx,4),%ecx + movl MUNG_ARR(dv_vlc_class_index_rshift,%ebx,4),%ecx sarl %cl,%edx - movl dv_vlc_classes(,%ebx,4),%ecx + movl MUNG_ARR(dv_vlc_classes,%ebx,4),%ecx movsbl (%ecx,%edx,1),%edx /* %edx is class */ - movl dv_vlc_index_mask(,%edx,4),%ebx - movl dv_vlc_index_rshift(,%edx,4),%ecx + movl MUNG_ARR(dv_vlc_index_mask,%edx,4),%ebx + movl MUNG_ARR(dv_vlc_index_rshift,%edx,4),%ecx andl %eax,%ebx sarl %cl,%ebx - movl dv_vlc_lookups(,%edx,4),%edx + movl MUNG_ARR(dv_vlc_lookups,%edx,4),%edx movl (%edx,%ebx,4),%edx /* Now %edx holds result, like this: @@ -42,7 +51,7 @@ dv_decode_vlc: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx - movl sign_mask(,%ecx,4),%ebx + movl MUNG_ARR(sign_mask,%ecx,4),%ebx andl %ebx,%eax negl %eax sarl $31,%eax @@ -63,14 +72,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 +89,28 @@ dv_decode_vlc: .type __dv_decode_vlc, at function __dv_decode_vlc: pushl %ebx + pushl %ebp + + LOAD_PIC_REG(bp) - /* Args are at 8(%esp). */ - movl 8(%esp),%eax /* %eax is bits */ + /* 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 +#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 + + movl MUNG_ARR(dv_vlc_index_mask,%edx,4),%ebx + movl MUNG_ARR(dv_vlc_index_rshift,%edx,4),%ecx andl %eax,%ebx sarl %cl,%ebx - movl dv_vlc_lookups(,%edx,4),%edx + movl MUNG_ARR(dv_vlc_lookups,%edx,4),%edx movl (%edx,%ebx,4),%edx /* Now %edx holds result, like this: @@ -112,7 +128,7 @@ __dv_decode_vlc: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx - movl sign_mask(,%ecx,4),%ecx + movl MUNG_ARR(sign_mask,%ecx,4),%ecx andl %ecx,%eax negl %eax sarl $31,%eax @@ -127,9 +143,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 @@ -140,14 +156,20 @@ void dv_parse_ac_coeffs_pass0(bitstream_ */ .text .align 4 +.globl asm_dv_parse_ac_coeffs_pass0 +.hidden asm_dv_parse_ac_coeffs_pass0 + asm_dv_parse_ac_coeffs_pass0 = dv_parse_ac_coeffs_pass0 + .globl dv_parse_ac_coeffs_pass0 .type dv_parse_ac_coeffs_pass0, at function dv_parse_ac_coeffs_pass0: pushl %ebx pushl %edi pushl %esi pushl %ebp + LOAD_PIC_REG(si) + #define ARGn(N) (20+(4*(N)))(%esp) /* @@ -159,8 +182,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 +195,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 +220,17 @@ dv_parse_ac_coeffs_pass0: readloop: movl %edi,%ecx shrl $3,%ecx +#ifdef __PIC__ + movl ARGn(0),%eax + addl bitstream_t_buf(%eax),%ecx + movzbl (%ecx),%eax + movzbl 1(%ecx),%edx + movzbl 2(%ecx),%ecx +#else movzbl (%esi,%ecx,1),%eax movzbl 1(%esi,%ecx,1),%edx movzbl 2(%esi,%ecx,1),%ecx +#endif shll $16,%eax shll $8,%edx orl %ecx,%eax @@ -217,7 +254,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 +269,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 +304,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 +378,16 @@ 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 */ - call dv_decode_vlc + call asm_dv_decode_vlc addl $12,%esp test $0x80,%edx /* If (vlc.run < 0) break */ jne escape @@ -359,6 +417,8 @@ show16: pushl %esi pushl %ebp + LOAD_PIC_REG(si) + #define ARGn(N) (20+(4*(N)))(%esp) movl ARGn(1),%eax /* quality */ @@ -373,7 +434,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 +449,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 +472,13 @@ macloop: /* mb->qno = bitstream_get(bs,4); */ movl %ecx,%edx shr $3,%edx +#ifdef __PIC__ + movl dv_videosegment_t_bs(%ebx),%ecx + movl bitstream_t_buf(%ecx),%ecx + movzbl 3(%ecx,%edx,1),%edx +#else movzbl 3(%esi,%edx,1),%edx +#endif andl $0xf,%edx movl %edx,dv_macroblock_t_qno(%edi) @@ -411,7 +489,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 +504,20 @@ skarly: andl $1,%ecx shll $5,%ecx /* ecx = (isPAL ? 32 : 0) */ +#ifdef __PIC__ + leal mod_10 at GOTOFF(%esi),%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 +536,28 @@ 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__ + movl ARGn(0),%ecx + movl dv_videosegment_t_bs(%ecx),%ecx + movl bitstream_t_buf(%ecx),%ecx + movzbl (%ecx,%edx,1),%eax /* hi byte */ + movzbl 1(%ecx,%edx,1),%ecx /* lo byte */ +#else movzbl (%esi,%edx,1),%eax /* hi byte */ movzbl 1(%esi,%edx,1),%ecx /* lo byte */ +#endif shll $8,%eax orl %ecx,%eax @@ -477,7 +584,11 @@ blkloop: /* bl->reorder = &dv_reorder[bl->dct_mode][1]; */ shll $6,%eax +#ifdef __PIC__ + leal dv_reorder at GOTOFF+1(%esi,%eax),%eax +#else addl $(dv_reorder+1),%eax +#endif movl %eax,dv_block_t_reorder(%ebp) /* bl->reorder_sentinel = bl->reorder + 63; */ @@ -485,13 +596,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 +623,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 +652,27 @@ do_ac_pass: pushl %ebp pushl %edi pushl %eax - call dv_parse_ac_coeffs_pass0 + call asm_dv_parse_ac_coeffs_pass0 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 +690,7 @@ done_ac: andl $DV_QUALITY_AC_MASK,%eax cmpl $DV_QUALITY_AC_2,%eax - jz dv_parse_ac_coeffs + jz asm_dv_parse_ac_coeffs movl $0,%eax ret Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libdv/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Mar 2006 21:38:20 -0000 1.6 +++ .cvsignore 19 Jan 2007 21:15:19 -0000 1.7 @@ -1 +1,2 @@ libdv-0.104.tar.gz +libdv-1.0.0.tar.gz Index: libdv.spec =================================================================== RCS file: /cvs/dist/rpms/libdv/devel/libdv.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libdv.spec 22 Sep 2006 19:37:28 -0000 1.20 +++ libdv.spec 19 Jan 2007 21:15:19 -0000 1.21 @@ -1,17 +1,15 @@ Summary: Software decoder for DV format video Name: libdv -Version: 0.104 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Epoch: 0 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 +Patch2: libdv-1.0.0-pic.patch +Patch3: libdv-1.0.0-gtk2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gtk2-devel BuildRequires: libXt-devel, libXv-devel @@ -48,20 +46,14 @@ %prep %setup -q -%patch0 -p1 -b .mmx %patch1 -p0 -b .no-exec-stack -#patch2 -p1 -b .pic-fix -%patch3 -p3 -b .amd64reloc -%patch4 -p1 -b .gtk2 +%patch2 -p1 -b .pic +%patch3 -p1 -b .gtk2 # Required for the gtk2 patch autoreconf %build -%configure \ -%ifarch %{ix86} - --disable-asm \ -%endif - --with-pic +%configure --with-pic make %{?_smp_mflags} %install @@ -101,6 +93,11 @@ %{_libdir}/pkgconfig/libdv.pc %changelog +* Fri Jan 19 2007 Jarod Wilson 1.0.0-1 +- New upstream release +- PIC patch from Mike Frysinger (#146596) +- Re-enable asm on i386 + * Thu Sep 21 2006 Jarod Wilson 0.104-5 - Disable asm on i386 for now to prevent text relocations in DSO Index: sources =================================================================== RCS file: /cvs/dist/rpms/libdv/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Mar 2006 21:38:20 -0000 1.8 +++ sources 19 Jan 2007 21:15:19 -0000 1.9 @@ -1 +1 @@ -f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz +f895162161cfa4bb4a94c070a7caa6c7 libdv-1.0.0.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 19 21:16:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:16:43 -0500 Subject: rpms/libdv/FC-6 libdv-1.0.0-gtk2.patch, NONE, 1.1 libdv-1.0.0-pic.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 libdv.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <200701192116.l0JLGheT013703@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/libdv/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13590 Modified Files: .cvsignore libdv.spec sources Added Files: libdv-1.0.0-gtk2.patch libdv-1.0.0-pic.patch Log Message: - New upstream release - PIC patch from Mike Frysinger (#146596) - Re-enable asm on i386 libdv-1.0.0-gtk2.patch: configure.ac | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libdv-1.0.0-gtk2.patch --- --- libdv-1.0.0/configure.ac.orig 2007-01-19 15:48:43.000000000 -0500 +++ libdv-1.0.0/configure.ac 2007-01-19 15:50:08.000000000 -0500 @@ -162,7 +162,7 @@ dnl Checks for libraries. have_gtk="false" 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,have_gtk="true",have_gtk="false") AC_DEFINE(HAVE_GTK) fi libdv-1.0.0-pic.patch: asm_common.S | 29 ++++++ dct_block_mmx.S | 88 ++++++++++---------- dv.c | 7 + encode.c | 9 +- encode_x86.S | 19 ++-- idct_block_mmx.S | 68 ++++++++-------- parse.c | 7 + quant.c | 4 quant.h | 2 quant_x86.S | 15 ++- rgbtoyuv.S | 228 +++++++++++++++++++++++++++--------------------------- rgbtoyuv_x86_64.S | 3 vlc_x86.S | 182 ++++++++++++++++++++++++++++++++++++------- 13 files changed, 424 insertions(+), 237 deletions(-) --- NEW FILE libdv-1.0.0-pic.patch --- Patch downloaded from http://bugs.gentoo.org/show_bug.cgi?id=121871 http://bugs.gentoo.org/attachment.cgi?id=98094 --- libdv-0.104-old/libdv/asm_common.S +++ libdv-0.104/libdv/asm_common.S @@ -0,0 +1,29 @@ +/* public domain, do what you want */ + +#ifdef __PIC__ +# define MUNG(sym) sym##@GOTOFF(%ebp) +# define MUNG_ARR(sym, args...) sym##@GOTOFF(%ebp,##args) +#else +# define MUNG(sym) sym +# define MUNG_ARR(sym, args...) sym(,##args) +#endif + +#ifdef __PIC__ +# undef __i686 /* gcc define gets in our way */ +# define LOAD_PIC_REG(reg) \ + .ifndef __i686.get_pc_thunk.reg; \ + .section .gnu.linkonce.t.__i686.get_pc_thunk.reg,"ax", at progbits; \ + .global __i686.get_pc_thunk.reg; \ + .hidden __i686.get_pc_thunk.reg; \ + .type __i686.get_pc_thunk.reg, at function; \ + __i686.get_pc_thunk.reg: \ + movl (%esp), %e##reg; \ + ret; \ + .size __i686.get_pc_thunk.reg,.-__i686.get_pc_thunk.reg; \ + .previous; \ + .endif; \ + call __i686.get_pc_thunk.reg; \ + addl $_GLOBAL_OFFSET_TABLE_, %e##reg +#else +# define LOAD_PIC_REG(reg) +#endif --- libdv-0.104-old/libdv/dct_block_mmx.S +++ libdv-0.104/libdv/dct_block_mmx.S @@ -53,19 +53,22 @@ scratch2: .quad 0 .section .note.GNU-stack, "", @progbits +#include "asm_common.S" + .text .align 8 .global _dv_dct_88_block_mmx .hidden _dv_dct_88_block_mmx .type _dv_dct_88_block_mmx, at function _dv_dct_88_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi - movl 8(%ebp), %esi # source + LOAD_PIC_REG(bp) + + movl 12(%esp), %esi # source # column 0 movq 16*0(%esi), %mm0 # v0 @@ -86,22 +91,22 @@ _dv_dct_88_block_mmx: movq 16*3(%esi), %mm5 # v3 movq 16*4(%esi), %mm7 # v4 - movq %mm7, scratch1 # scratch1: v4 ; + movq %mm7, MUNG(scratch1) # scratch1: v4 ; movq %mm5, %mm7 # duplicate v3 - paddw scratch1, %mm5 # v03: v3+v4 - psubw scratch1, %mm7 # v04: v3-v4 - movq %mm5, scratch2 # scratch2: v03 + paddw MUNG(scratch1), %mm5 # v03: v3+v4 + psubw MUNG(scratch1), %mm7 # v04: v3-v4 + movq %mm5, MUNG(scratch2) # scratch2: v03 movq %mm0, %mm5 # mm5: v00 - paddw scratch2, %mm0 # v10: v00+v03 - psubw scratch2, %mm5 # v13: v00-v03 - movq %mm3, scratch3 # scratch3: v02 + paddw MUNG(scratch2), %mm0 # v10: v00+v03 + psubw MUNG(scratch2), %mm5 # v13: v00-v03 + movq %mm3, MUNG(scratch3) # scratch3: v02 movq %mm1, %mm3 # duplicate v01 - paddw scratch3, %mm1 # v11: v01+v02 - psubw scratch3, %mm3 # v12: v01-v02 + paddw MUNG(scratch3), %mm1 # v11: v01+v02 + psubw MUNG(scratch3), %mm3 # v12: v01-v02 - movq %mm6, scratch4 # scratch4: v05 + movq %mm6, MUNG(scratch4) # scratch4: v05 movq %mm0, %mm6 # duplicate v10 paddw %mm1, %mm0 # v10+v11 @@ -111,10 +116,10 @@ _dv_dct_88_block_mmx: movq %mm6, 16*4(%esi) # out4: v10-v11 movq %mm4, %mm0 # mm0: v06 - paddw scratch4, %mm4 # v15: v05+v06 + paddw MUNG(scratch4), %mm4 # v15: v05+v06 paddw %mm2, %mm0 # v16: v07+v06 - pmulhw WA3, %mm4 # v35~: WA3*v15 + pmulhw MUNG(WA3), %mm4 # v35~: WA3*v15 psllw $1, %mm4 # v35: compensate the coeefient scale movq %mm4, %mm6 # duplicate v35 @@ -123,7 +128,7 @@ _dv_dct_88_block_mmx: paddw %mm5, %mm3 # v22: v12+v13 - pmulhw WA1, %mm3 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm3 # v32~: WA1*v22 psllw $16-NSHIFT, %mm3 # v32: compensate the coeefient scale movq %mm5, %mm6 # duplicate v13 @@ -134,13 +139,13 @@ _dv_dct_88_block_mmx: movq %mm6, 16*6(%esi) # out6: v13-v32 - paddw scratch4, %mm7 # v14n: v04+v05 + paddw MUNG(scratch4), %mm7 # v14n: v04+v05 movq %mm0, %mm5 # duplicate v16 psubw %mm7, %mm0 # va1: v16-v14n - pmulhw WA5, %mm0 # va0~: va1*WA5 - pmulhw WA4, %mm5 # v36~~: v16*WA4 - pmulhw WA2, %mm7 # v34~~: v14n*WA2 + pmulhw MUNG(WA5), %mm0 # va0~: va1*WA5 + pmulhw MUNG(WA4), %mm5 # v36~~: v16*WA4 + pmulhw MUNG(WA2), %mm7 # v34~~: v14n*WA2 psllw $16-WA4_SHIFT, %mm5 # v36: compensate the coeefient scale psllw $16-NSHIFT, %mm7 # v34: compensate the coeefient scale @@ -188,22 +193,22 @@ _dv_dct_88_block_mmx: movq 16*3(%esi), %mm5 # v3 movq 16*4(%esi), %mm7 # v4 - movq %mm7, scratch1 # scratch1: v4 ; + movq %mm7, MUNG(scratch1) # scratch1: v4 ; movq %mm5, %mm7 # duplicate v3 - paddw scratch1, %mm5 # v03: v3+v4 - psubw scratch1, %mm7 # v04: v3-v4 - movq %mm5, scratch2 # scratch2: v03 + paddw MUNG(scratch1), %mm5 # v03: v3+v4 + psubw MUNG(scratch1), %mm7 # v04: v3-v4 + movq %mm5, MUNG(scratch2) # scratch2: v03 movq %mm0, %mm5 # mm5: v00 - paddw scratch2, %mm0 # v10: v00+v03 - psubw scratch2, %mm5 # v13: v00-v03 - movq %mm3, scratch3 # scratc3: v02 + paddw MUNG(scratch2), %mm0 # v10: v00+v03 + psubw MUNG(scratch2), %mm5 # v13: v00-v03 + movq %mm3, MUNG(scratch3) # scratc3: v02 movq %mm1, %mm3 # duplicate v01 - paddw scratch3, %mm1 # v11: v01+v02 - psubw scratch3, %mm3 # v12: v01-v02 + paddw MUNG(scratch3), %mm1 # v11: v01+v02 + psubw MUNG(scratch3), %mm3 # v12: v01-v02 - movq %mm6, scratch4 # scratc4: v05 + movq %mm6, MUNG(scratch4) # scratc4: v05 movq %mm0, %mm6 # duplicate v10 paddw %mm1, %mm0 # v10+v11 @@ -213,10 +218,10 @@ _dv_dct_88_block_mmx: movq %mm6, 16*4(%esi) # out4: v10-v11 movq %mm4, %mm0 # mm0: v06 - paddw scratch4, %mm4 # v15: v05+v06 + paddw MUNG(scratch4), %mm4 # v15: v05+v06 paddw %mm2, %mm0 # v16: v07+v06 - pmulhw WA3, %mm4 # v35~: WA3*v15 + pmulhw MUNG(WA3), %mm4 # v35~: WA3*v15 psllw $16-NSHIFT, %mm4 # v35: compensate the coeefient scale movq %mm4, %mm6 # duplicate v35 @@ -225,7 +230,7 @@ _dv_dct_88_block_mmx: paddw %mm5, %mm3 # v22: v12+v13 - pmulhw WA1, %mm3 # v32~: WA3*v15 + pmulhw MUNG(WA1), %mm3 # v32~: WA3*v15 psllw $16-NSHIFT, %mm3 # v32: compensate the coeefient scale movq %mm5, %mm6 # duplicate v13 @@ -235,13 +240,13 @@ _dv_dct_88_block_mmx: movq %mm5, 16*2(%esi) # out2: v13+v32 movq %mm6, 16*6(%esi) # out6: v13-v32 - paddw scratch4, %mm7 # v14n: v04+v05 + paddw MUNG(scratch4), %mm7 # v14n: v04+v05 movq %mm0, %mm5 # duplicate v16 psubw %mm7, %mm0 # va1: v16-v14n - pmulhw WA2, %mm7 # v34~~: v14n*WA2 - pmulhw WA5, %mm0 # va0~: va1*WA5 - pmulhw WA4, %mm5 # v36~~: v16*WA4 + pmulhw MUNG(WA2), %mm7 # v34~~: v14n*WA2 + pmulhw MUNG(WA5), %mm0 # va0~: va1*WA5 + pmulhw MUNG(WA4), %mm5 # v36~~: v16*WA4 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 @@ -748,11 +755,12 @@ _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 + LOAD_PIC_REG(bp) + + movl 16(%esp), %esi # source # column 0 @@ -779,7 +789,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -818,7 +828,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -855,7 +865,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -892,7 +902,7 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 - pmulhw WA1, %mm5 # v32~: WA1*v22 + pmulhw MUNG(WA1), %mm5 # v32~: WA1*v22 movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale --- libdv-0.104-old/libdv/dv.c +++ libdv-0.104/libdv/dv.c @@ -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 --- libdv-0.104-old/libdv/encode.c +++ libdv-0.104/libdv/encode.c @@ -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 } --- libdv-0.104-old/libdv/encode_x86.S +++ libdv-0.104/libdv/encode_x86.S @@ -23,9 +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 .section .note.GNU-stack, "", @progbits @@ -45,11 +43,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 # these four lines + pushl $0x000000FF # load VLCADDMASK + movq (%esp), %mm1 # into %mm1 off the stack + addl $8, %esp # --> no TEXTRELs xorl %ebp, %ebp subl $8, %edx vlc_encode_block_mmx_loop: @@ -121,7 +124,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 +590,11 @@ _dv_need_dct_248_mmx_rows: paddw %mm5, %mm1 paddw %mm1, %mm0 - - pmaddwd ALLONE, %mm0 + + pushl $0x00010001 # these four lines + pushl $0x00010001 # load ALLONE + pmaddwd (%esp), %mm0 # into %mm0 off the stack + addl $8, %esp # --> no TEXTRELs movq %mm0, %mm1 psrlq $32, %mm1 paddd %mm1, %mm0 --- libdv-0.104-old/libdv/idct_block_mmx.S +++ libdv-0.104/libdv/idct_block_mmx.S @@ -8,17 +8,21 @@ .section .note.GNU-stack, "", @progbits +#include "asm_common.S" + .text .align 4 .global _dv_idct_block_mmx .hidden _dv_idct_block_mmx .type _dv_idct_block_mmx, at function _dv_idct_block_mmx: pushl %ebp - movl %esp,%ebp pushl %esi - leal preSC, %ecx - movl 8(%ebp),%esi /* source matrix */ + + LOAD_PIC_REG(bp) + + leal MUNG(preSC), %ecx + movl 12(%esp),%esi /* source matrix */ /* * column 0: even part @@ -35,7 +41,7 @@ _dv_idct_block_mmx: movq %mm1, %mm2 /* added 11/1/96 */ pmulhw 8*8(%esi),%mm5 /* V8 */ psubsw %mm0, %mm1 /* V16 */ - pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V18 */ + pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V18 */ paddsw %mm0, %mm2 /* V17 */ movq %mm2, %mm0 /* duplicate V17 */ psraw $1, %mm2 /* t75=t82 */ @@ -76,7 +82,7 @@ _dv_idct_block_mmx: paddsw %mm0, %mm3 /* V29 ; free mm0 */ movq %mm7, %mm1 /* duplicate V26 */ psraw $1, %mm3 /* t91=t94 */ - pmulhw x539f539f539f539f,%mm7 /* V33 */ + pmulhw MUNG(x539f539f539f539f),%mm7 /* V33 */ psraw $1, %mm1 /* t96 */ movq %mm5, %mm0 /* duplicate V2 */ psraw $2, %mm4 /* t85=t87 */ @@ -84,15 +90,15 @@ _dv_idct_block_mmx: psubsw %mm4, %mm0 /* V28 ; free mm4 */ movq %mm0, %mm2 /* duplicate V28 */ psraw $1, %mm5 /* t90=t93 */ - pmulhw x4546454645464546,%mm0 /* V35 */ + pmulhw MUNG(x4546454645464546),%mm0 /* V35 */ psraw $1, %mm2 /* t97 */ movq %mm5, %mm4 /* duplicate t90=t93 */ psubsw %mm2, %mm1 /* V32 ; free mm2 */ - pmulhw x61f861f861f861f8,%mm1 /* V36 */ + pmulhw MUNG(x61f861f861f861f8),%mm1 /* V36 */ psllw $1, %mm7 /* t107 */ paddsw %mm3, %mm5 /* V31 */ psubsw %mm3, %mm4 /* V30 ; free mm3 */ - pmulhw x5a825a825a825a82,%mm4 /* V34 */ + pmulhw MUNG(x5a825a825a825a82),%mm4 /* V34 */ nop psubsw %mm1, %mm0 /* V38 */ psubsw %mm7, %mm1 /* V37 ; free mm7 */ @@ -159,7 +165,7 @@ _dv_idct_block_mmx: psubsw %mm7, %mm1 /* V50 */ pmulhw 8*9(%esi), %mm5 /* V9 */ paddsw %mm7, %mm2 /* V51 */ - pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V52 */ + pmulhw MUNG(x5a825a825a825a82), %mm1 /* 23170 ->V52 */ movq %mm2, %mm6 /* duplicate V51 */ psraw $1, %mm2 /* t138=t144 */ movq %mm3, %mm4 /* duplicate V1 */ @@ -200,11 +206,11 @@ _dv_idct_block_mmx: * even more by doing the correction step in a later stage when the number * is actually multiplied by 16 */ - paddw x0005000200010001, %mm4 + paddw MUNG(x0005000200010001), %mm4 psubsw %mm6, %mm3 /* V60 ; free mm6 */ psraw $1, %mm0 /* t154=t156 */ movq %mm3, %mm1 /* duplicate V60 */ - pmulhw x539f539f539f539f, %mm1 /* V67 */ + pmulhw MUNG(x539f539f539f539f), %mm1 /* V67 */ movq %mm5, %mm6 /* duplicate V3 */ psraw $2, %mm4 /* t148=t150 */ paddsw %mm4, %mm5 /* V61 */ @@ -213,13 +219,13 @@ _dv_idct_block_mmx: psllw $1, %mm1 /* t169 */ paddsw %mm0, %mm5 /* V65 -> result */ psubsw %mm0, %mm4 /* V64 ; free mm0 */ - pmulhw x5a825a825a825a82, %mm4 /* V68 */ + pmulhw MUNG(x5a825a825a825a82), %mm4 /* V68 */ psraw $1, %mm3 /* t158 */ psubsw %mm6, %mm3 /* V66 */ movq %mm5, %mm2 /* duplicate V65 */ - pmulhw x61f861f861f861f8, %mm3 /* V70 */ + pmulhw MUNG(x61f861f861f861f8), %mm3 /* V70 */ psllw $1, %mm6 /* t165 */ - pmulhw x4546454645464546, %mm6 /* V69 */ + pmulhw MUNG(x4546454645464546), %mm6 /* V69 */ psraw $1, %mm2 /* t172 */ /* moved from next block */ movq 8*5(%esi), %mm0 /* V56 */ @@ -344,7 +350,7 @@ _dv_idct_block_mmx: * movq 8*13(%esi), %mm4 tmt13 */ psubsw %mm4, %mm3 /* V134 */ - pmulhw x5a825a825a825a82, %mm3 /* 23170 ->V136 */ + pmulhw MUNG(x5a825a825a825a82), %mm3 /* 23170 ->V136 */ movq 8*9(%esi), %mm6 /* tmt9 */ paddsw %mm4, %mm5 /* V135 ; mm4 free */ movq %mm0, %mm4 /* duplicate tmt1 */ @@ -373,17 +379,17 @@ _dv_idct_block_mmx: psubsw %mm7, %mm0 /* V144 */ movq %mm0, %mm3 /* duplicate V144 */ paddsw %mm7, %mm2 /* V147 ; free mm7 */ - pmulhw x539f539f539f539f, %mm0 /* 21407-> V151 */ + pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V151 */ movq %mm1, %mm7 /* duplicate tmt3 */ paddsw %mm5, %mm7 /* V145 */ psubsw %mm5, %mm1 /* V146 ; free mm5 */ psubsw %mm1, %mm3 /* V150 */ movq %mm7, %mm5 /* duplicate V145 */ - pmulhw x4546454645464546, %mm1 /* 17734-> V153 */ + pmulhw MUNG(x4546454645464546), %mm1 /* 17734-> V153 */ psubsw %mm2, %mm5 /* V148 */ - pmulhw x61f861f861f861f8, %mm3 /* 25080-> V154 */ + pmulhw MUNG(x61f861f861f861f8), %mm3 /* 25080-> V154 */ psllw $2, %mm0 /* t311 */ - pmulhw x5a825a825a825a82, %mm5 /* 23170-> V152 */ + pmulhw MUNG(x5a825a825a825a82), %mm5 /* 23170-> V152 */ paddsw %mm2, %mm7 /* V149 ; free mm2 */ psllw $1, %mm1 /* t313 */ nop /* without the nop - freeze here for one clock */ @@ -409,7 +415,7 @@ _dv_idct_block_mmx: paddsw %mm3, %mm6 /* V164 ; free mm3 */ movq %mm4, %mm3 /* duplicate V142 */ psubsw %mm5, %mm4 /* V165 ; free mm5 */ - movq %mm2, scratch7 /* out7 */ + movq %mm2, MUNG(scratch7) /* out7 */ psraw $4, %mm6 psraw $4, %mm4 paddsw %mm5, %mm3 /* V162 */ @@ -420,11 +426,11 @@ _dv_idct_block_mmx: */ movq %mm6, 8*9(%esi) /* out9 */ paddsw %mm1, %mm0 /* V161 */ - movq %mm3, scratch5 /* out5 */ + movq %mm3, MUNG(scratch5) /* out5 */ psubsw %mm1, %mm5 /* V166 ; free mm1 */ movq %mm4, 8*11(%esi) /* out11 */ psraw $4, %mm5 - movq %mm0, scratch3 /* out3 */ + movq %mm0, MUNG(scratch3) /* out3 */ movq %mm2, %mm4 /* duplicate V140 */ movq %mm5, 8*13(%esi) /* out13 */ paddsw %mm7, %mm2 /* V160 */ @@ -434,7 +440,7 @@ _dv_idct_block_mmx: /* moved from the next block */ movq 8*3(%esi), %mm7 psraw $4, %mm4 - movq %mm2, scratch1 /* out1 */ + movq %mm2, MUNG(scratch1) /* out1 */ /* moved from the next block */ movq %mm0, %mm1 movq %mm4, 8*15(%esi) /* out15 */ @@ -491,15 +497,15 @@ _dv_idct_block_mmx: paddsw %mm4, %mm3 /* V113 ; free mm4 */ movq %mm0, %mm4 /* duplicate V110 */ paddsw %mm1, %mm2 /* V111 */ - pmulhw x539f539f539f539f, %mm0 /* 21407-> V117 */ + pmulhw MUNG(x539f539f539f539f), %mm0 /* 21407-> V117 */ psubsw %mm1, %mm5 /* V112 ; free mm1 */ psubsw %mm5, %mm4 /* V116 */ movq %mm2, %mm1 /* duplicate V111 */ - pmulhw x4546454645464546, %mm5 /* 17734-> V119 */ + pmulhw MUNG(x4546454645464546), %mm5 /* 17734-> V119 */ psubsw %mm3, %mm2 /* V114 */ - pmulhw x61f861f861f861f8, %mm4 /* 25080-> V120 */ + pmulhw MUNG(x61f861f861f861f8), %mm4 /* 25080-> V120 */ paddsw %mm3, %mm1 /* V115 ; free mm3 */ - pmulhw x5a825a825a825a82, %mm2 /* 23170-> V118 */ + pmulhw MUNG(x5a825a825a825a82), %mm2 /* 23170-> V118 */ psllw $2, %mm0 /* t266 */ movq %mm1, (%esi) /* save V115 */ psllw $1, %mm5 /* t268 */ @@ -517,7 +523,7 @@ _dv_idct_block_mmx: movq %mm6, %mm3 /* duplicate tmt4 */ psubsw %mm0, %mm6 /* V100 */ paddsw %mm0, %mm3 /* V101 ; free mm0 */ - pmulhw x5a825a825a825a82, %mm6 /* 23170 ->V102 */ + pmulhw MUNG(x5a825a825a825a82), %mm6 /* 23170 ->V102 */ movq %mm7, %mm5 /* duplicate tmt0 */ movq 8*8(%esi), %mm1 /* tmt8 */ paddsw %mm1, %mm7 /* V103 */ @@ -551,10 +557,10 @@ _dv_idct_block_mmx: movq 8*2(%esi), %mm3 /* V123 */ paddsw %mm4, %mm7 /* out0 */ /* moved up from next block */ - movq scratch3, %mm0 + movq MUNG(scratch3), %mm0 psraw $4, %mm7 /* moved up from next block */ - movq scratch5, %mm6 + movq MUNG(scratch5), %mm6 psubsw %mm4, %mm1 /* out14 ; free mm4 */ paddsw %mm3, %mm5 /* out2 */ psraw $4, %mm1 @@ -565,7 +571,7 @@ _dv_idct_block_mmx: movq %mm5, 8*2(%esi) /* out2 ; free mm5 */ psraw $4, %mm2 /* moved up to the prev block */ - movq scratch7, %mm4 + movq MUNG(scratch7), %mm4 /* moved up to the prev block */ psraw $4, %mm0 movq %mm2, 8*12(%esi) /* out12 ; free mm2 */ @@ -579,7 +585,7 @@ _dv_idct_block_mmx: * psraw $4, %mm0 * psraw $4, %mm6 */ - movq scratch1, %mm1 + movq MUNG(scratch1), %mm1 psraw $4, %mm4 movq %mm0, 8*3(%esi) /* out3 */ psraw $4, %mm1 --- libdv-0.104-old/libdv/parse.c +++ libdv-0.104/libdv/parse.c @@ -477,6 +477,13 @@ dv_parse_ac_coeffs(dv_videosegment_t *se exit(0); #endif } /* dv_parse_ac_coeffs */ +#if defined __GNUC__ && __ELF__ +# define dv_strong_hidden_alias(name, aliasname) \ + extern __typeof (name) aliasname __attribute__ ((alias (#name), visibility ("hidden"))) +dv_strong_hidden_alias(dv_parse_ac_coeffs, asm_dv_parse_ac_coeffs); +#else +int asm_dv_parse_ac_coeffs(dv_videosegment_t *seg) { return dv_parse_ac_coeffs(seg); } +#endif /* --------------------------------------------------------------------------- */ --- libdv-0.104-old/libdv/quant.c +++ libdv-0.104/libdv/quant.c @@ -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 } --- libdv-0.104-old/libdv/quant.h +++ libdv-0.104/libdv/quant.h @@ -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 --- libdv-0.104-old/libdv/quant_x86.S +++ libdv-0.104/libdv/quant_x86.S @@ -71,10 +73,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 +219,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 */ --- libdv-0.104-old/libdv/rgbtoyuv.S +++ libdv-0.104/libdv/rgbtoyuv.S @@ -41,9 +41,6 @@ #define DV_WIDTH_SHORT_HALF 720 #define DV_WIDTH_BYTE_HALF 360 -.global _dv_rgbtoycb_mmx -# .global yuvtoycb_mmx - .data .align 8 @@ -110,25 +107,26 @@ VR0GR: .long 0,0 VBG0B: .long 0,0 #endif - + +#include "asm_common.S" + .section .note.GNU-stack, "", @progbits .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 .global _dv_rgbtoycb_mmx .hidden _dv_rgbtoycb_mmx .type _dv_rgbtoycb_mmx, at function _dv_rgbtoycb_mmx: pushl %ebp - movl %esp, %ebp pushl %eax pushl %ebx pushl %ecx @@ -131,46 +132,47 @@ _dv_rgbtoycb_mmx: pushl %esi pushl %edi - leal ZEROSX, %eax #This section gets around a bug + LOAD_PIC_REG(bp) + + leal MUNG(ZEROSX), %eax #This section gets around a bug movq (%eax), %mm0 #unlikely to persist - movq %mm0, ZEROS - leal OFFSETDX, %eax + movq %mm0, MUNG(ZEROS) + leal MUNG(OFFSETDX), %eax movq (%eax), %mm0 - movq %mm0, OFFSETD - leal OFFSETWX, %eax + movq %mm0, MUNG(OFFSETD) + leal MUNG(OFFSETWX), %eax movq (%eax), %mm0 - movq %mm0, OFFSETW - leal OFFSETBX, %eax + movq %mm0, MUNG(OFFSETW) + leal MUNG(OFFSETBX), %eax movq (%eax), %mm0 - movq %mm0, OFFSETB - leal YR0GRX, %eax + movq %mm0, MUNG(OFFSETB) + leal MUNG(YR0GRX), %eax movq (%eax), %mm0 - movq %mm0, YR0GR - leal YBG0BX, %eax + movq %mm0, MUNG(YR0GR) + leal MUNG(YBG0BX), %eax movq (%eax), %mm0 - movq %mm0, YBG0B - leal UR0GRX, %eax + movq %mm0, MUNG(YBG0B) + leal MUNG(UR0GRX), %eax movq (%eax), %mm0 - movq %mm0, UR0GR - leal UBG0BX, %eax + movq %mm0, MUNG(UR0GR) + leal MUNG(UBG0BX), %eax movq (%eax), %mm0 - movq %mm0, UBG0B - leal VR0GRX, %eax + movq %mm0, MUNG(UBG0B) + leal MUNG(VR0GRX), %eax movq (%eax), %mm0 - movq %mm0, VR0GR - leal VBG0BX, %eax + movq %mm0, MUNG(VR0GR) + leal MUNG(VBG0BX), %eax movq (%eax), %mm0 - movq %mm0, VBG0B - - movl _rows(%ebp), %eax - movl _columns(%ebp), %ebx + movq %mm0, MUNG(VBG0B) + 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 +186,29 @@ rgbtoycb_mmx_loop: punpcklbw %mm6, %mm1 #B1G1R1B0 -> mm1 movq %mm0, %mm2 #R1B0G0R0 -> mm2 - pmaddwd YR0GR, %mm0 #yrR1,ygG0+yrR0 -> mm0 + pmaddwd MUNG(YR0GR), %mm0 #yrR1,ygG0+yrR0 -> mm0 movq %mm1, %mm3 #B1G1R1B0 -> mm3 - pmaddwd YBG0B, %mm1 #ybB1+ygG1,ybB0 -> mm1 + pmaddwd MUNG(YBG0B), %mm1 #ybB1+ygG1,ybB0 -> mm1 movq %mm2, %mm4 #R1B0G0R0 -> mm4 - pmaddwd UR0GR, %mm2 #urR1,ugG0+urR0 -> mm2 + pmaddwd MUNG(UR0GR), %mm2 #urR1,ugG0+urR0 -> mm2 movq %mm3, %mm5 #B1G1R1B0 -> mm5 - pmaddwd UBG0B, %mm3 #ubB1+ugG1,ubB0 -> mm3 + pmaddwd MUNG(UBG0B), %mm3 #ubB1+ugG1,ubB0 -> mm3 punpckhbw %mm6, %mm7 # 00G2R2 -> mm7 - pmaddwd VR0GR, %mm4 #vrR1,vgG0+vrR0 -> mm4 + pmaddwd MUNG(VR0GR), %mm4 #vrR1,vgG0+vrR0 -> mm4 paddd %mm1, %mm0 #Y1Y0 -> mm0 - pmaddwd VBG0B, %mm5 #vbB1+vgG1,vbB0 -> mm5 + pmaddwd MUNG(VBG0B), %mm5 #vbB1+vgG1,vbB0 -> mm5 movq 8(%eax), %mm1 #R5B4G4R4B3G3R3B2 -> mm1 paddd %mm3, %mm2 #U1U0 -> mm2 movq %mm1, %mm6 #R5B4G4R4B3G3R3B2 -> mm6 - punpcklbw ZEROS, %mm1 #B3G3R3B2 -> mm1 + punpcklbw MUNG(ZEROS), %mm1 #B3G3R3B2 -> mm1 paddd %mm5, %mm4 #V1V0 -> mm4 movq %mm1, %mm5 #B3G3R3B2 -> mm5 @@ -214,29 +216,29 @@ rgbtoycb_mmx_loop: paddd %mm7, %mm1 #R3B200+00G2R2=R3B2G2R2->mm1 - punpckhbw ZEROS, %mm6 #R5B4G4R3 -> mm6 + punpckhbw MUNG(ZEROS), %mm6 #R5B4G4R3 -> mm6 movq %mm1, %mm3 #R3B2G2R2 -> mm3 - pmaddwd YR0GR, %mm1 #yrR3,ygG2+yrR2 -> mm1 + pmaddwd MUNG(YR0GR), %mm1 #yrR3,ygG2+yrR2 -> mm1 movq %mm5, %mm7 #B3G3R3B2 -> mm7 - pmaddwd YBG0B, %mm5 #ybB3+ygG3,ybB2 -> mm5 + pmaddwd MUNG(YBG0B), %mm5 #ybB3+ygG3,ybB2 -> mm5 psrad $FIXPSHIFT, %mm0 #32-bit scaled Y1Y0 -> mm0 - movq %mm6, TEMP0 #R5B4G4R4 -> TEMP0 + movq %mm6, MUNG(TEMP0) #R5B4G4R4 -> TEMP0 movq %mm3, %mm6 #R3B2G2R2 -> mm6 - pmaddwd UR0GR, %mm6 #urR3,ugG2+urR2 -> mm6 + pmaddwd MUNG(UR0GR), %mm6 #urR3,ugG2+urR2 -> mm6 psrad $FIXPSHIFT, %mm2 #32-bit scaled U1U0 -> mm2 paddd %mm5, %mm1 #Y3Y2 -> mm1 movq %mm7, %mm5 #B3G3R3B2 -> mm5 - pmaddwd UBG0B, %mm7 #ubB3+ugG3,ubB2 + pmaddwd MUNG(UBG0B), %mm7 #ubB3+ugG3,ubB2 psrad $FIXPSHIFT, %mm1 #32-bit scaled Y3Y2 -> mm1 - pmaddwd VR0GR, %mm3 #vrR3,vgG2+vgR2 + pmaddwd MUNG(VR0GR), %mm3 #vrR3,vgG2+vgR2 packssdw %mm1, %mm0 #Y3Y2Y1Y0 -> mm0 - pmaddwd VBG0B, %mm5 #vbB3+vgG3,vbB2 -> mm5 + pmaddwd MUNG(VBG0B), %mm5 #vbB3+vgG3,vbB2 -> mm5 psrad $FIXPSHIFT, %mm4 #32-bit scaled V1V0 -> mm4 movq 16(%eax), %mm1 #B7G7R7B6G6R6B5G5 -> mm7 @@ -251,58 +253,58 @@ rgbtoycb_mmx_loop: movq %mm7, %mm5 #R7B6G6R6B5G500 -> mm5 psrad $FIXPSHIFT, %mm3 #32-bit scaled V3V2 -> mm3 - paddw OFFSETY, %mm0 + paddw MUNG(OFFSETY), %mm0 movq %mm0, (%ebx) #store Y3Y2Y1Y0 packssdw %mm6, %mm2 #32-bit scaled U3U2U1U0 -> mm2 - movq TEMP0, %mm0 #R5B4G4R4 -> mm0 + movq MUNG(TEMP0), %mm0 #R5B4G4R4 -> mm0 addl $8, %ebx - - punpcklbw ZEROS, %mm7 #B5G500 -> mm7 + + punpcklbw MUNG(ZEROS), %mm7 #B5G500 -> mm7 movq %mm0, %mm6 #R5B4G4R4 -> mm6 - movq %mm2, TEMPU #32-bit scaled U3U2U1U0 -> TEMPU + movq %mm2, MUNG(TEMPU) #32-bit scaled U3U2U1U0 -> TEMPU psrlq $32, %mm0 #00R5B4 -> mm0 paddw %mm0, %mm7 #B5G5R5B4 -> mm7 movq %mm6, %mm2 #B5B4G4R4 -> mm2 - pmaddwd YR0GR, %mm2 #yrR5,ygG4+yrR4 -> mm2 + pmaddwd MUNG(YR0GR), %mm2 #yrR5,ygG4+yrR4 -> mm2 movq %mm7, %mm0 #B5G5R5B4 -> mm0 - pmaddwd YBG0B, %mm7 #ybB5+ygG5,ybB4 -> mm7 + pmaddwd MUNG(YBG0B), %mm7 #ybB5+ygG5,ybB4 -> mm7 packssdw %mm3, %mm4 #32-bit scaled V3V2V1V0 -> mm4 addl $24, %eax #increment RGB count - movq %mm4, TEMPV #(V3V2V1V0)/256 -> mm4 + movq %mm4, MUNG(TEMPV) #(V3V2V1V0)/256 -> mm4 movq %mm6, %mm4 #B5B4G4R4 -> mm4 - pmaddwd UR0GR, %mm6 #urR5,ugG4+urR4 + pmaddwd MUNG(UR0GR), %mm6 #urR5,ugG4+urR4 movq %mm0, %mm3 #B5G5R5B4 -> mm0 - pmaddwd UBG0B, %mm0 #ubB5+ugG5,ubB4 + pmaddwd MUNG(UBG0B), %mm0 #ubB5+ugG5,ubB4 paddd %mm7, %mm2 #Y5Y4 -> mm2 - pmaddwd VR0GR, %mm4 #vrR5,vgG4+vrR4 -> mm4 + pmaddwd MUNG(VR0GR), %mm4 #vrR5,vgG4+vrR4 -> mm4 pxor %mm7, %mm7 #0 -> mm7 - pmaddwd VBG0B, %mm3 #vbB5+vgG5,vbB4 -> mm3 + pmaddwd MUNG(VBG0B), %mm3 #vbB5+vgG5,vbB4 -> mm3 punpckhbw %mm7, %mm1 #B7G7R7B6 -> mm1 paddd %mm6, %mm0 #U5U4 -> mm0 movq %mm1, %mm6 #B7G7R7B6 -> mm6 - pmaddwd YBG0B, %mm6 #ybB7+ygG7,ybB6 -> mm6 + pmaddwd MUNG(YBG0B), %mm6 #ybB7+ygG7,ybB6 -> mm6 punpckhbw %mm7, %mm5 #R7B6G6R6 -> mm5 movq %mm5, %mm7 #R7B6G6R6 -> mm7 paddd %mm4, %mm3 #V5V4 -> mm3 - pmaddwd YR0GR, %mm5 #yrR7,ygG6+yrR6 -> mm5 + pmaddwd MUNG(YR0GR), %mm5 #yrR7,ygG6+yrR6 -> mm5 movq %mm1, %mm4 #B7G7R7B6 -> mm4 - pmaddwd UBG0B, %mm4 #ubB7+ugG7,ubB6 -> mm4 + pmaddwd MUNG(UBG0B), %mm4 #ubB7+ugG7,ubB6 -> mm4 psrad $FIXPSHIFT, %mm0 #32-bit scaled U5U4 -> mm0 psrad $FIXPSHIFT, %mm2 #32-bit scaled Y5Y4 -> mm2 @@ -310,25 +312,25 @@ rgbtoycb_mmx_loop: paddd %mm5, %mm6 #Y7Y6 -> mm6 movq %mm7, %mm5 #R7B6G6R6 -> mm5 - pmaddwd UR0GR, %mm7 #urR7,ugG6+ugR6 -> mm7 + pmaddwd MUNG(UR0GR), %mm7 #urR7,ugG6+ugR6 -> mm7 psrad $FIXPSHIFT, %mm3 #32-bit scaled V5V4 -> mm3 - pmaddwd VBG0B, %mm1 #vbB7+vgG7,vbB6 -> mm1 + pmaddwd MUNG(VBG0B), %mm1 #vbB7+vgG7,vbB6 -> mm1 psrad $FIXPSHIFT, %mm6 #32-bit scaled Y7Y6 -> mm6 packssdw %mm6, %mm2 #Y7Y6Y5Y4 -> mm2 - pmaddwd VR0GR, %mm5 #vrR7,vgG6+vrR6 -> mm5 + pmaddwd MUNG(VR0GR), %mm5 #vrR7,vgG6+vrR6 -> mm5 paddd %mm4, %mm7 #U7U6 -> mm7 psrad $FIXPSHIFT, %mm7 #32-bit scaled U7U6 -> mm7 - paddw OFFSETY, %mm2 + paddw MUNG(OFFSETY), %mm2 movq %mm2, (%ebx) #store Y7Y6Y5Y4 - movq ALLONE, %mm6 + movq MUNG(ALLONE), %mm6 packssdw %mm7, %mm0 #32-bit scaled U7U6U5U4 -> mm0 - movq TEMPU, %mm4 #32-bit scaled U3U2U1U0 -> mm4 + movq MUNG(TEMPU), %mm4 #32-bit scaled U3U2U1U0 -> mm4 pmaddwd %mm6, %mm0 #U7U6U5U4 averaged -> (U7U6)(U5U4)=UU3 UU2->mm0 pmaddwd %mm6, %mm4 #U3U2U1U0 averaged -> (U3U2)(U1U0)=UU1 UU0->mm4 @@ -338,8 +340,8 @@ rgbtoycb_mmx_loop: psrad $FIXPSHIFT, %mm1 #32-bit scaled V7V6 -> mm1 psraw $1, %mm4 #divide UU3 UU2 UU1 UU0 by 2 -> mm4 - - movq TEMPV, %mm5 #32-bit scaled V3V2V1V0 -> mm5 + + movq MUNG(TEMPV), %mm5 #32-bit scaled V3V2V1V0 -> mm5 movq %mm4, (%ecx) # store U @@ -422,14 +426,15 @@ _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 - movq OFFSETY, %mm7 + LOAD_PIC_REG(bp) + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + + movq MUNG(OFFSETY), %mm7 pxor %mm6, %mm6 movq (%esi), %mm0 @@ -564,14 +571,15 @@ _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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 pxor %mm6, %mm6 movq (%esi), %mm0 @@ -852,16 +864,16 @@ _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 + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src - movq OFFSETBX, %mm7 + movq MUNG(OFFSETBX), %mm7 pxor %mm6, %mm6 @@ -1000,15 +1014,16 @@ _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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 paddw %mm7, %mm7 pxor %mm6, %mm6 @@ -1095,18 +1112,18 @@ 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 + + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src movl $4, %ebx - movq ALLONE, %mm6 - + movq MUNG(ALLONE), %mm6 ppm_copy_ntsc_c_block_mmx_loop: movq (%esi), %mm0 @@ -1168,14 +1187,15 @@ 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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 paddw %mm7, %mm7 pxor %mm6, %mm6 @@ -1325,15 +1347,16 @@ _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 - movq OFFSETBX, %mm7 + LOAD_PIC_REG(bp) + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src + + movq MUNG(OFFSETBX), %mm7 paddw %mm7, %mm7 pxor %mm6, %mm6 --- libdv-0.104-old/libdv/rgbtoyuv_x86_64.S +++ libdv-0.104/libdv/rgbtoyuv_x86_64.S @@ -41,9 +41,6 @@ #define DV_WIDTH_SHORT_HALF 720 #define DV_WIDTH_BYTE_HALF 360 -.global _dv_rgbtoycb_mmx_x86_64 -# .global yuvtoycb_mmx_x86_64 - .data .align 8 --- libdv-0.104-old/libdv/vlc_x86.S +++ libdv-0.104/libdv/vlc_x86.S @@ -1,31 +1,39 @@ #include "asmoff.h" .section .note.GNU-stack, "", @progbits + #include "asm_common.S" .text .align 4 .globl dv_decode_vlc +.globl asm_dv_decode_vlc +.hidden asm_dv_decode_vlc +asm_dv_decode_vlc = dv_decode_vlc + .type dv_decode_vlc, at function dv_decode_vlc: pushl %ebx + pushl %ebp + + LOAD_PIC_REG(bp) - /* Args are at 8(%esp). */ - movl 8(%esp),%eax /* %eax is bits */ - movl 12(%esp),%ebx /* %ebx is maxbits */ + /* 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*/ - movl dv_vlc_class_index_mask(,%ebx,4),%edx + movl MUNG_ARR(dv_vlc_class_index_mask,%ebx,4),%edx andl %eax,%edx - movl dv_vlc_class_index_rshift(,%ebx,4),%ecx + movl MUNG_ARR(dv_vlc_class_index_rshift,%ebx,4),%ecx sarl %cl,%edx - movl dv_vlc_classes(,%ebx,4),%ecx + movl MUNG_ARR(dv_vlc_classes,%ebx,4),%ecx movsbl (%ecx,%edx,1),%edx /* %edx is class */ - movl dv_vlc_index_mask(,%edx,4),%ebx - movl dv_vlc_index_rshift(,%edx,4),%ecx + movl MUNG_ARR(dv_vlc_index_mask,%edx,4),%ebx + movl MUNG_ARR(dv_vlc_index_rshift,%edx,4),%ecx andl %eax,%ebx sarl %cl,%ebx - movl dv_vlc_lookups(,%edx,4),%edx + movl MUNG_ARR(dv_vlc_lookups,%edx,4),%edx movl (%edx,%ebx,4),%edx /* Now %edx holds result, like this: @@ -42,7 +51,7 @@ dv_decode_vlc: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx - movl sign_mask(,%ecx,4),%ebx + movl MUNG_ARR(sign_mask,%ecx,4),%ebx andl %ebx,%eax negl %eax sarl $31,%eax @@ -63,14 +72,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 +89,28 @@ dv_decode_vlc: .type __dv_decode_vlc, at function __dv_decode_vlc: pushl %ebx + pushl %ebp + + LOAD_PIC_REG(bp) - /* Args are at 8(%esp). */ - movl 8(%esp),%eax /* %eax is bits */ + /* 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 +#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 + + movl MUNG_ARR(dv_vlc_index_mask,%edx,4),%ebx + movl MUNG_ARR(dv_vlc_index_rshift,%edx,4),%ecx andl %eax,%ebx sarl %cl,%ebx - movl dv_vlc_lookups(,%edx,4),%edx + movl MUNG_ARR(dv_vlc_lookups,%edx,4),%edx movl (%edx,%ebx,4),%edx /* Now %edx holds result, like this: @@ -112,7 +128,7 @@ __dv_decode_vlc: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx - movl sign_mask(,%ecx,4),%ecx + movl MUNG_ARR(sign_mask,%ecx,4),%ecx andl %ecx,%eax negl %eax sarl $31,%eax @@ -127,9 +143,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 @@ -140,14 +156,20 @@ void dv_parse_ac_coeffs_pass0(bitstream_ */ .text .align 4 +.globl asm_dv_parse_ac_coeffs_pass0 +.hidden asm_dv_parse_ac_coeffs_pass0 + asm_dv_parse_ac_coeffs_pass0 = dv_parse_ac_coeffs_pass0 + .globl dv_parse_ac_coeffs_pass0 .type dv_parse_ac_coeffs_pass0, at function dv_parse_ac_coeffs_pass0: pushl %ebx pushl %edi pushl %esi pushl %ebp + LOAD_PIC_REG(si) + #define ARGn(N) (20+(4*(N)))(%esp) /* @@ -159,8 +182,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 +195,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 +220,17 @@ dv_parse_ac_coeffs_pass0: readloop: movl %edi,%ecx shrl $3,%ecx +#ifdef __PIC__ + movl ARGn(0),%eax + addl bitstream_t_buf(%eax),%ecx + movzbl (%ecx),%eax + movzbl 1(%ecx),%edx + movzbl 2(%ecx),%ecx +#else movzbl (%esi,%ecx,1),%eax movzbl 1(%esi,%ecx,1),%edx movzbl 2(%esi,%ecx,1),%ecx +#endif shll $16,%eax shll $8,%edx orl %ecx,%eax @@ -217,7 +254,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 +269,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 +304,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 +378,16 @@ 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 */ - call dv_decode_vlc + call asm_dv_decode_vlc addl $12,%esp test $0x80,%edx /* If (vlc.run < 0) break */ jne escape @@ -359,6 +417,8 @@ show16: pushl %esi pushl %ebp + LOAD_PIC_REG(si) + #define ARGn(N) (20+(4*(N)))(%esp) movl ARGn(1),%eax /* quality */ @@ -373,7 +434,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 +449,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 +472,13 @@ macloop: /* mb->qno = bitstream_get(bs,4); */ movl %ecx,%edx shr $3,%edx +#ifdef __PIC__ + movl dv_videosegment_t_bs(%ebx),%ecx + movl bitstream_t_buf(%ecx),%ecx + movzbl 3(%ecx,%edx,1),%edx +#else movzbl 3(%esi,%edx,1),%edx +#endif andl $0xf,%edx movl %edx,dv_macroblock_t_qno(%edi) @@ -411,7 +489,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 +504,20 @@ skarly: andl $1,%ecx shll $5,%ecx /* ecx = (isPAL ? 32 : 0) */ +#ifdef __PIC__ + leal mod_10 at GOTOFF(%esi),%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 +536,28 @@ 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__ + movl ARGn(0),%ecx + movl dv_videosegment_t_bs(%ecx),%ecx + movl bitstream_t_buf(%ecx),%ecx + movzbl (%ecx,%edx,1),%eax /* hi byte */ + movzbl 1(%ecx,%edx,1),%ecx /* lo byte */ +#else movzbl (%esi,%edx,1),%eax /* hi byte */ movzbl 1(%esi,%edx,1),%ecx /* lo byte */ +#endif shll $8,%eax orl %ecx,%eax @@ -477,7 +584,11 @@ blkloop: /* bl->reorder = &dv_reorder[bl->dct_mode][1]; */ shll $6,%eax +#ifdef __PIC__ + leal dv_reorder at GOTOFF+1(%esi,%eax),%eax +#else addl $(dv_reorder+1),%eax +#endif movl %eax,dv_block_t_reorder(%ebp) /* bl->reorder_sentinel = bl->reorder + 63; */ @@ -485,13 +596,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 +623,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 +652,27 @@ do_ac_pass: pushl %ebp pushl %edi pushl %eax - call dv_parse_ac_coeffs_pass0 + call asm_dv_parse_ac_coeffs_pass0 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 +690,7 @@ done_ac: andl $DV_QUALITY_AC_MASK,%eax cmpl $DV_QUALITY_AC_2,%eax - jz dv_parse_ac_coeffs + jz asm_dv_parse_ac_coeffs movl $0,%eax ret Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libdv/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Mar 2006 21:38:20 -0000 1.6 +++ .cvsignore 19 Jan 2007 21:16:41 -0000 1.7 @@ -1 +1,2 @@ libdv-0.104.tar.gz +libdv-1.0.0.tar.gz Index: libdv.spec =================================================================== RCS file: /cvs/dist/rpms/libdv/FC-6/libdv.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libdv.spec 22 Sep 2006 19:37:28 -0000 1.20 +++ libdv.spec 19 Jan 2007 21:16:41 -0000 1.21 @@ -1,17 +1,15 @@ Summary: Software decoder for DV format video Name: libdv -Version: 0.104 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Epoch: 0 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 +Patch2: libdv-1.0.0-pic.patch +Patch3: libdv-1.0.0-gtk2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gtk2-devel BuildRequires: libXt-devel, libXv-devel @@ -48,20 +46,14 @@ %prep %setup -q -%patch0 -p1 -b .mmx %patch1 -p0 -b .no-exec-stack -#patch2 -p1 -b .pic-fix -%patch3 -p3 -b .amd64reloc -%patch4 -p1 -b .gtk2 +%patch2 -p1 -b .pic +%patch3 -p1 -b .gtk2 # Required for the gtk2 patch autoreconf %build -%configure \ -%ifarch %{ix86} - --disable-asm \ -%endif - --with-pic +%configure --with-pic make %{?_smp_mflags} %install @@ -101,6 +93,11 @@ %{_libdir}/pkgconfig/libdv.pc %changelog +* Fri Jan 19 2007 Jarod Wilson 1.0.0-1 +- New upstream release +- PIC patch from Mike Frysinger (#146596) +- Re-enable asm on i386 + * Thu Sep 21 2006 Jarod Wilson 0.104-5 - Disable asm on i386 for now to prevent text relocations in DSO Index: sources =================================================================== RCS file: /cvs/dist/rpms/libdv/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Mar 2006 21:38:20 -0000 1.8 +++ sources 19 Jan 2007 21:16:41 -0000 1.9 @@ -1 +1 @@ -f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz +f895162161cfa4bb4a94c070a7caa6c7 libdv-1.0.0.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 19 21:18:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:18:47 -0500 Subject: rpms/libdv/devel libdv-0.103-mmx.patch, 1.1, NONE libdv-0.104-amd64reloc.patch, 1.1, NONE libdv-0.104-gtk2.patch, 1.1, NONE libdv-0.104-pic-fix.patch, 1.1, NONE Message-ID: <200701192118.l0JLIlLG003132@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/libdv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3091 Removed Files: libdv-0.103-mmx.patch libdv-0.104-amd64reloc.patch libdv-0.104-gtk2.patch libdv-0.104-pic-fix.patch Log Message: Purge old patches --- libdv-0.103-mmx.patch DELETED --- --- libdv-0.104-amd64reloc.patch DELETED --- --- libdv-0.104-gtk2.patch DELETED --- --- libdv-0.104-pic-fix.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 19 21:30:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:30:28 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.44, 1.45 pykickstart.spec, 1.48, 1.49 sources, 1.48, 1.49 Message-ID: <200701192130.l0JLUSuA012128@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12069 Modified Files: .cvsignore pykickstart.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 17 Jan 2007 21:53:11 -0000 1.44 +++ .cvsignore 19 Jan 2007 21:30:26 -0000 1.45 @@ -6,3 +6,4 @@ pykickstart-0.43.tar.gz pykickstart-0.90.tar.gz pykickstart-0.91.tar.gz +pykickstart-0.92.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- pykickstart.spec 17 Jan 2007 21:53:11 -0000 1.48 +++ pykickstart.spec 19 Jan 2007 21:30:26 -0000 1.49 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.91 +Version: 0.92 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,13 @@ /usr/share/locale/*/*/* %changelog +* Fri Jan 19 2007 Chris Lumens - 0.92-1 +- Fix KickstartVersionError reporting. +- Add a version attribute to handler objects. +- Fix line number reporting on lots of commands. +- Add initial support for Fedora 7 and remove deprecated commands. +- Accept a --default argument to the %packages header (#221305). + * Wed Jan 17 2007 Chris Lumens - 0.91-1 - Add a method to read kickstart files from strings. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 17 Jan 2007 21:53:11 -0000 1.48 +++ sources 19 Jan 2007 21:30:26 -0000 1.49 @@ -1 +1 @@ -9986e2996da9b336e02be961153bd156 pykickstart-0.91.tar.gz +610eb46319a222804e978fbd9b9440f2 pykickstart-0.92.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 19 21:31:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:31:46 -0500 Subject: rpms/gok/devel .cvsignore, 1.21, 1.22 gok.spec, 1.40, 1.41 sources, 1.21, 1.22 Message-ID: <200701192131.l0JLVklr013016@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gok/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12955 Modified Files: .cvsignore gok.spec sources Log Message: 1.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gok/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 8 Sep 2006 16:53:41 -0000 1.21 +++ .cvsignore 19 Jan 2007 21:31:44 -0000 1.22 @@ -1 +1 @@ -gok-1.2.0.tar.bz2 +gok-1.2.1.tar.bz2 Index: gok.spec =================================================================== RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gok.spec 18 Oct 2006 17:18:47 -0000 1.40 +++ gok.spec 19 Jan 2007 21:31:44 -0000 1.41 @@ -2,13 +2,13 @@ Summary: GNOME Onscreen Keyboard Name: gok -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.2.1 +Release: 1%{?dist} License: GPL Group: Desktop/Accessibility URL: http://www.gok.ca/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gok/1.0/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gok/1.2/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: gok-0.10.2-launcher.patch Requires(pre): GConf2 @@ -36,10 +36,18 @@ built-in accessibility framework. %package devel -Summary: Libraries/include files for GStreamer plugins. +Summary: Libraries/include files for the Gnome Onscreen Keyboard Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libgnomeui-devel atk-devel libbonobo-devel gtk2-devel gail-devel libwnck-devel esound-devel at-spi-devel +Requires: libgnomeui-devel +Requires: atk-devel +Requires: libbonobo-devel +Requires: gtk2-devel +Requires: gail-devel +Requires: libwnck-devel +Requires: esound-devel +Requires: at-spi-devel +Requires: pkgconfig %description devel The gok project aims to enable users to control their computer without @@ -114,6 +122,9 @@ %{_libdir}/pkgconfig/*pc %changelog +* Fri Jan 19 2007 Matthias Clasen - 1.2.1-1 +- Update to 1.2.1 + * Wed Oct 18 2006 Matthias Clasen - 1.2.0-2 - Fix scripts according to packaging guidelines Index: sources =================================================================== RCS file: /cvs/dist/rpms/gok/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 8 Sep 2006 16:53:41 -0000 1.21 +++ sources 19 Jan 2007 21:31:44 -0000 1.22 @@ -1 +1 @@ -a5b022cf0b83800a38bb1f6d402ffa57 gok-1.2.0.tar.bz2 +cba5eef61ed1a8f6a83fa18015781721 gok-1.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 19 21:32:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:32:40 -0500 Subject: rpms/gok/devel gok.spec,1.41,1.42 Message-ID: <200701192132.l0JLWepn013787@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gok/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13723 Modified Files: gok.spec Log Message: bump rev Index: gok.spec =================================================================== RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gok.spec 19 Jan 2007 21:31:44 -0000 1.41 +++ gok.spec 19 Jan 2007 21:32:38 -0000 1.42 @@ -3,7 +3,7 @@ Summary: GNOME Onscreen Keyboard Name: gok Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Desktop/Accessibility URL: http://www.gok.ca/ @@ -122,7 +122,7 @@ %{_libdir}/pkgconfig/*pc %changelog -* Fri Jan 19 2007 Matthias Clasen - 1.2.1-1 +* Fri Jan 19 2007 Matthias Clasen - 1.2.1-2 - Update to 1.2.1 * Wed Oct 18 2006 Matthias Clasen - 1.2.0-2 From fedora-cvs-commits at redhat.com Fri Jan 19 21:47:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 16:47:33 -0500 Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.Makefile, 1.3, 1.4 docbook-style-xsl.spec, 1.29, 1.30 Message-ID: <200701192147.l0JLlXcN010226@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10209 Modified Files: docbook-style-xsl.Makefile docbook-style-xsl.spec Log Message: * Fri Jan 19 2007 Tomas Mraz 1.71.1-2 - Add new wordml and especially highlighting (which is referenced from html) subdirs to Makefile. Index: docbook-style-xsl.Makefile =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- docbook-style-xsl.Makefile 19 Jan 2007 17:16:13 -0000 1.3 +++ docbook-style-xsl.Makefile 19 Jan 2007 21:47:31 -0000 1.4 @@ -6,7 +6,7 @@ install: install-xsl install-img install-extensions install-misc install-xsl: - mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} + mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling,highlighting,wordml} cp common/*.dtd $(DESTDIR)/common cp common/*.xml $(DESTDIR)/common cp common/*.xsl $(DESTDIR)/common @@ -21,6 +21,10 @@ cp xhtml/*.xsl $(DESTDIR)/xhtml cp manpages/*.xsl $(DESTDIR)/manpages cp profiling/*.xsl $(DESTDIR)/profiling + cp highlighting/*.xml $(DESTDIR)/highlighting + cp highlighting/*.xsl $(DESTDIR)/highlighting + cp wordml/*.xml $(DESTDIR)/wordml + cp wordml/*.xsl $(DESTDIR)/wordml install-img: mkdir -p $(DESTDIR)/images/callouts Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- docbook-style-xsl.spec 19 Jan 2007 17:16:13 -0000 1.29 +++ docbook-style-xsl.spec 19 Jan 2007 21:47:31 -0000 1.30 @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.71.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -97,6 +97,10 @@ %changelog +* Fri Jan 19 2007 Tomas Mraz 1.71.1-2 +- Add new wordml and especially highlighting (which is referenced + from html) subdirs to Makefile. + * Fri Jan 19 2007 Tim Waugh 1.71.1-1 - 1.71.1. No longer seem to need lists patch. Removed out of date sp patch. From fedora-cvs-commits at redhat.com Fri Jan 19 22:45:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 19 Jan 2007 17:45:24 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.364, 1.365 anaconda.spec, 1.490, 1.491 sources, 1.488, 1.489 Message-ID: <200701192245.l0JMjOsG011036@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10949 Modified Files: .cvsignore anaconda.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- .cvsignore 18 Jan 2007 22:59:48 -0000 1.364 +++ .cvsignore 19 Jan 2007 22:45:22 -0000 1.365 @@ -1 +1,2 @@ anaconda-11.2.0.12.tar.bz2 +anaconda-11.2.0.13.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.490 retrieving revision 1.491 diff -u -r1.490 -r1.491 --- anaconda.spec 18 Jan 2007 22:59:48 -0000 1.490 +++ anaconda.spec 19 Jan 2007 22:45:22 -0000 1.491 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.12 +Version: 11.2.0.13 Release: 1 License: GPL Summary: Graphical system installer @@ -103,6 +103,15 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 19 2007 Chris Lumens - 11.2.0.13-1 +- Kickstart and upgrade are no longer installclasses. +- Update x86_64 syslinux config (katzj). +- Support %packages --default (#221305). +- Fix early kickstart UI traceback. +- Remove cruft in x86 images (katzj). +- Fix error handling in loader netconfig screen (dcantrell). +- Add libthai to graphical install (katzj). + * Thu Jan 18 2007 Jeremy Katz - 11.2.0.12-1 - Fix so that package selection in the yum backend is actually enabled - UI tweaks so that we work better with a real window manager Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.488 retrieving revision 1.489 diff -u -r1.488 -r1.489 --- sources 18 Jan 2007 22:59:48 -0000 1.488 +++ sources 19 Jan 2007 22:45:22 -0000 1.489 @@ -1 +1 @@ -06e94d24f0f70d1ef7337a9c73be2349 anaconda-11.2.0.12.tar.bz2 +b0aed21d980d7eb8e6987d0a8723fa49 anaconda-11.2.0.13.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 20 11:37:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 06:37:15 -0500 Subject: rpms/cairo/devel .cvsignore, 1.25, 1.26 cairo.spec, 1.66, 1.67 sources, 1.25, 1.26 Message-ID: <200701201137.l0KBbFBi000389@cvs.devel.redhat.com> Author: cworth Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv372 Modified Files: .cvsignore cairo.spec sources Log Message: Update to 1.3.12 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 23 Dec 2006 09:06:41 -0000 1.25 +++ .cvsignore 20 Jan 2007 11:37:13 -0000 1.26 @@ -1 +1 @@ -cairo-1.3.10.tar.gz +cairo-1.3.12.tar.gz Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- cairo.spec 23 Dec 2006 09:06:41 -0000 1.66 +++ cairo.spec 20 Jan 2007 11:37:13 -0000 1.67 @@ -3,7 +3,7 @@ Summary: A vector graphics library Name: cairo -Version: 1.3.10 +Version: 1.3.12 Release: 1%{?dist} URL: http://cairographics.org Source0: http://cairographics.org/snapshots/%{name}-%{version}.tar.gz @@ -86,6 +86,9 @@ %{_datadir}/gtk-doc/html/cairo %changelog +* Sat Jan 20 2007 Carl Worth 1.3.12-1 +- Update to 1.3.12 + * Sat Dec 23 2006 Carl Worth 1.3.10-1 - Update to 1.3.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 23 Dec 2006 09:06:41 -0000 1.25 +++ sources 20 Jan 2007 11:37:13 -0000 1.26 @@ -1 +1 @@ -78e1c1c57568f51e4da73f52cf57eadb cairo-1.3.10.tar.gz +b6ac81de3c47529d1f39390943728c3d cairo-1.3.12.tar.gz From fedora-cvs-commits at redhat.com Sat Jan 20 16:31:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 11:31:12 -0500 Subject: rpms/gnome-speech/devel .cvsignore, 1.18, 1.19 gnome-speech.spec, 1.34, 1.35 sources, 1.18, 1.19 Message-ID: <200701201631.l0KGVC0o007858@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-speech/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7746 Modified Files: .cvsignore gnome-speech.spec sources Log Message: 0.4.8 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-speech/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Dec 2006 05:08:19 -0000 1.18 +++ .cvsignore 20 Jan 2007 16:31:10 -0000 1.19 @@ -1 +1 @@ -gnome-speech-0.4.7.tar.bz2 +gnome-speech-0.4.8.tar.bz2 Index: gnome-speech.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-speech/devel/gnome-speech.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gnome-speech.spec 20 Dec 2006 05:08:19 -0000 1.34 +++ gnome-speech.spec 20 Jan 2007 16:31:10 -0000 1.35 @@ -2,7 +2,7 @@ Summary: GNOME Text to Speech Name: gnome-speech -Version: 0.4.7 +Version: 0.4.8 Release: 1%{?dist} License: LGPL Group: Desktop/Accessibility @@ -57,7 +57,7 @@ %files %defattr(-,root,root,-) -%doc +%doc AUTHORS COPYING NEWS README %{_bindir}/festival-synthesis-driver %{_bindir}/test-speech %{_libdir}/bonobo/servers/* @@ -66,6 +66,7 @@ %files devel %defattr(-,root,root,-) +%doc doc/gnome-speech.html %{_libdir}/lib*.so %{_includedir}/gnome-speech-1.0 %{_libdir}/pkgconfig/*pc @@ -73,6 +74,9 @@ %changelog +* Sat Jan 20 2007 Matthias Clasen - 0.4.8-1 +- Update to 0.4.8 + * Wed Dec 20 2006 Matthias Clasen - 0.4.7-1 - Update to 0.4.7 - Require pkgconfig in the -devel package Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-speech/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 20 Dec 2006 05:08:19 -0000 1.18 +++ sources 20 Jan 2007 16:31:10 -0000 1.19 @@ -1 +1 @@ -6aa7393fc82ccd0ce0298bb3ca5c2491 gnome-speech-0.4.7.tar.bz2 +f1abbdc7b23fd62f98153aff13161a0d gnome-speech-0.4.8.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 20 20:08:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 15:08:27 -0500 Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.64,1.65 Message-ID: <200701202008.l0KK8RvX020132@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20118 Modified Files: gnome-python-extras.spec Log Message: * Sat Jan 20 2007 Matthew Barnes - 2.14.2-8.fc7 - Add missing BuildRequires gnome-python2-devel (RH bug #223602). Index: gnome-python-extras.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gnome-python-extras.spec 7 Dec 2006 19:17:48 -0000 1.64 +++ gnome-python-extras.spec 20 Jan 2007 20:08:24 -0000 1.65 @@ -12,7 +12,7 @@ Name: gnome-python2-extras Version: 2.14.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL/LGPL Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -33,7 +33,7 @@ BuildRequires: firefox-devel >= %{firefox_version} BuildRequires: glib2 >= %{glib_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} -BuildRequires: gnome-python2 >= %{gnome_python_version} +BuildRequires: gnome-python2-devel >= %{gnome_python_version} BuildRequires: gtk2 >= %{gtk_version} BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version} BuildRequires: gtkspell-devel >= %{gtkspell_version} @@ -136,6 +136,9 @@ %{_datadir}/gtk-doc/html/pygtkmozembed %changelog +* Sat Jan 20 2007 Matthew Barnes - 2.14.2-8.fc7 +- Add missing BuildRequires gnome-python2-devel (RH bug #223602). + * Thu Dec 7 2006 Jeremy Katz - 2.14.2-7 - rebuild for python 2.5 From fedora-cvs-commits at redhat.com Sat Jan 20 20:09:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 15:09:22 -0500 Subject: rpms/gnome-python2-extras/FC-6 gnome-python-extras.spec,1.64,1.65 Message-ID: <200701202009.l0KK9MM5020205@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-python2-extras/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20188 Modified Files: gnome-python-extras.spec Log Message: * Sat Jan 20 2007 Matthew Barnes - 2.14.2-8.fc6 - Add missing BuildRequires gnome-python2-devel (RH bug #223602). Index: gnome-python-extras.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-extras/FC-6/gnome-python-extras.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gnome-python-extras.spec 5 Jan 2007 16:26:50 -0000 1.64 +++ gnome-python-extras.spec 20 Jan 2007 20:09:20 -0000 1.65 @@ -12,7 +12,7 @@ Name: gnome-python2-extras Version: 2.14.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL/LGPL Group: Development/Languages Summary: The sources for additional. PyGNOME Python extension modules. @@ -34,7 +34,7 @@ BuildRequires: firefox-devel >= %{firefox_version} BuildRequires: glib2 >= %{glib_version} BuildRequires: gnome-panel-devel >= %{gnome_panel_version} -BuildRequires: gnome-python2 >= %{gnome_python_version} +BuildRequires: gnome-python2-devel >= %{gnome_python_version} BuildRequires: gtk2 >= %{gtk_version} BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version} BuildRequires: gtkspell-devel >= %{gtkspell_version} @@ -142,6 +142,9 @@ %{_datadir}/gtk-doc/html/pygtkmozembed %changelog +* Sat Jan 20 2007 Matthew Barnes - 2.14.2-8.fc6 +- Add missing BuildRequires gnome-python2-devel (RH bug #223602). + * Thu Jan 05 2007 Matthew Barnes - 2.14.2-7 - Require firefox-1.5.0.9 exactly. This will introduce a dependency conflict the next time libgtkembedmoz.so changes location, to ensure From fedora-cvs-commits at redhat.com Sat Jan 20 22:28:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 17:28:54 -0500 Subject: rpms/libgnomeui/devel libgnomeui.spec,1.64,1.65 Message-ID: <200701202228.l0KMSseY015023@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15009 Modified Files: libgnomeui.spec Log Message: clean up requires Index: libgnomeui.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- libgnomeui.spec 10 Jan 2007 20:16:40 -0000 1.64 +++ libgnomeui.spec 20 Jan 2007 22:28:52 -0000 1.65 @@ -1,16 +1,16 @@ %define libxml2_version 2.5 -%define orbit2_version 2.6.0 -%define libbonobo_version 2.3.6-2 +%define libgnome_version 2.13.7 %define libgnomecanvas_version 2.0.0 -%define libgnome_version 2.2.0 -%define libart_lgpl_version 2.3.8 %define libbonoboui_version 2.13.1 -%define glib2_version 2.6.0 +%define gconf2_version 2.3.0 %define pango_version 1.2.0 +%define glib2_version 2.8.0 %define gtk2_version 2.9.0 -%define gconf2_version 2.3.0 -%define gnome_vfs2_version 2.5.3 +%define gnome_vfs2_version 2.7.3 %define libglade2_version 2.0.0 +%define gnome_keyring_version 0.4 +%define orbit2_version 2.6.0 +%define libart_lgpl_version 2.3.8 %define esound_version 1:0.2.27 %define po_package libgnomeui-2.0 @@ -18,50 +18,30 @@ Summary: GNOME base GUI library Name: libgnomeui Version: 2.17.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: ftp://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 - License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: ORBit2 >= %{orbit2_version} -Requires: glib2 >= %{glib2_version} -Requires: pango >= %{pango_version} -Requires: gtk2 >= %{gtk2_version} -Requires: GConf2 >= %{gconf2_version} -Requires: gnome-vfs2 >= %{gnome_vfs2_version} -Requires: libgnomecanvas >= %{libgnomecanvas_version} -Requires: libbonobo >= %{libbonobo_version} -Requires: libbonoboui >= %{libbonoboui_version} -Requires: libxml2 >= %{libxml2_version} -Requires: libgnome >= %{libgnome_version} -Requires: libart_lgpl >= %{libart_lgpl_version} -Requires: libglade2 >= %{libglade2_version} -Requires: esound >= %{esound_version} -Requires: fontconfig -Requires: gnome-keyring -Requires: libjpeg - -BuildRequires: zlib-devel -BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version} -BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: libgnome-devel >= %{libgnome_version} BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: esound-devel >= %{esound_version} -BuildRequires: libSM-devel, libICE-devel -BuildRequires: fontconfig -BuildRequires: gnome-keyring-devel +BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version} +BuildRequires: zlib-devel +BuildRequires: libSM-devel +BuildRequires: libICE-devel +BuildRequires: fontconfig-devel BuildRequires: libjpeg-devel BuildRequires: perl-XML-Parser BuildRequires: gettext @@ -80,24 +60,22 @@ Group: Development/Libraries Requires: %name = %{version}-%{release} -Requires: zlib-devel -Requires: esound-devel -Requires: ORBit2-devel >= %{orbit2_version} Requires: glib2-devel >= %{glib2_version} Requires: pango-devel >= %{pango_version} Requires: gtk2-devel >= %{gtk2_version} Requires: GConf2-devel >= %{gconf2_version} Requires: gnome-vfs2-devel >= %{gnome_vfs2_version} Requires: libgnomecanvas-devel >= %{libgnomecanvas_version} -Requires: libbonobo-devel >= %{libbonobo_version} Requires: libbonoboui-devel >= %{libbonoboui_version} Requires: libxml2-devel >= %{libxml2_version} Requires: libgnome-devel >= %{libgnome_version} Requires: libart_lgpl-devel >= %{libart_lgpl_version} Requires: libglade2-devel >= %{libglade2_version} Requires: esound-devel >= %{esound_version} -Requires: libSM-devel, libICE-devel -Requires: gnome-keyring-devel +Requires: gnome-keyring-devel >= %{gnome_keyring_version} +Requires: zlib-devel +Requires: libSM-devel +Requires: libICE-devel Requires: pkgconfig Conflicts: gnome-libs-devel < 1.4.1.2 @@ -157,13 +135,16 @@ %files devel %defattr(-,root,root) - %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* %{_datadir}/gtk-doc/html/libgnomeui %changelog +* Sat Jan 20 2007 Matthias Clasen - 2.17.1-2 +- Drop explicit esound requirement in preparation for pulseaudio +- Clean up requires + * Wed Jan 10 2007 Matthias Clasen - 2.17.1-1 - Update to 2.17.1 From fedora-cvs-commits at redhat.com Sat Jan 20 22:55:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 17:55:20 -0500 Subject: rpms/esound/devel esound.spec,1.30,1.31 Message-ID: <200701202255.l0KMtKtS001800@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/esound/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1480 Modified Files: esound.spec Log Message: - Split a -libs package off the core esound package in preparation for pulseaudio (#223503) - Correct the License tag Index: esound.spec =================================================================== RCS file: /cvs/dist/rpms/esound/devel/esound.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- esound.spec 27 Jul 2006 22:26:49 -0000 1.30 +++ esound.spec 20 Jan 2007 22:55:18 -0000 1.31 @@ -1,18 +1,19 @@ # Note that this is NOT a relocatable package -Summary: Allows several audio streams to play on a single audio device. -Name: esound -Version: 0.2.36 -Release: 3 -Epoch: 1 -License: GPL +Summary: Allows several audio streams to play on a single audio device +Name: esound +Version: 0.2.36 +Release: 4%{?dist} +Epoch: 1 +License: LGPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/esound Group: System Environment/Daemons -Source0: esound-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Source0: esound-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: esound-0.2.19-noerrors.patch Patch2: esound-0.2.35-64bit_install.patch Patch3: esound-multilib.patch -BuildRequires: docbook-utils, audiofile-devel +BuildRequires: docbook-utils +BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel %description @@ -25,12 +26,21 @@ Install esound if you'd like to let sound applications share your audio device. You'll also need to install the audiofile package. +%package libs +Summary: Library to talk to the EsounD daemon +Group: Development/Libraries + +%description libs +The esound-libs package includes the libraries required +for applications to talk to the EsounD daemon. + %package devel -Summary: Development files for EsounD applications. +Summary: Development files for EsounD applications Group: Development/Libraries -Requires: esound = %{epoch}:%{version}-%{release} +Requires: esound-libs = %{epoch}:%{version}-%{release} Requires: audiofile-devel Requires: alsa-lib-devel +Requires: pkgconfig %description devel The esound-devel package includes the libraries, include files and @@ -44,7 +54,7 @@ %patch3 -p1 -b .multilib %build -%configure +%configure --disable-static EGREP=egrep make @@ -54,9 +64,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%post -p /sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -65,7 +75,6 @@ %defattr(-, root, root,-) %doc AUTHORS COPYING.LIB ChangeLog docs/esound.sgml %doc NEWS README TIPS TODO -%config(noreplace) /etc/* %{_bindir}/esd %{_bindir}/esdcat %{_bindir}/esdctl @@ -76,19 +85,27 @@ %{_bindir}/esdplay %{_bindir}/esdrec %{_bindir}/esdsample -%{_libdir}/*.so.* %{_datadir}/man/man*/* +%files libs +%defattr(-, root, root,-) +%config(noreplace) /etc/* +%{_libdir}/*.so.* + %files devel %defattr(-, root, root,-) %{_bindir}/esd-config %{_includedir}/* %{_datadir}/aclocal/* %{_libdir}/*.so -%{_libdir}/*.a %{_libdir}/pkgconfig/* %changelog +* Sat Jan 20 2007 Matthias Clasen - 1:0.2.36-4 +- Split a -libs package off the core esound package + in preparation for pulseaudio (#223503) +- Correct the License tag + * Thu Jul 27 2006 Matthias Clasen - 1:0.2.36-3 - fix multilib conflicts From fedora-cvs-commits at redhat.com Sun Jan 21 01:53:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 20:53:03 -0500 Subject: rpms/gdb/devel gdb-6.3-bz202689-exec-from-pthread-test.patch, NONE, 1.1 gdb-6.5-bz196439-valgrind-memcheck-compat-test.patch, NONE, 1.1 gdb-6.6-ia64-kernel-unwind.patch, NONE, 1.1 gdb-6.6-ia64-pc-unwind.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 gdb-6.3-ia64-gcore-page0-20050421.patch, 1.2, 1.3 gdb-6.3-ia64-sigill-20051115.patch, 1.2, 1.3 gdb-6.3-large-core-20051206.patch, 1.2, 1.3 gdb-6.3-nonthreaded-wp-20050117.patch, 1.3, 1.4 gdb-6.3-pie-20050110.patch, 1.2, 1.3 gdb-6.3-security-errata-20050610.patch, 1.3, 1.4 gdb-6.3-test-sepcrc-20050402.patch, 1.1, 1.2 gdb-6.3-warnings-20050317.patch, 1.3, 1.4 gdb-6.5-bz109921-DW_AT_decl_file-fix.patch, 1.1, 1.2 gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch, 1.1, 1.2 gdb-6.5-bz190810-gdbserver-arch-advice.patch, 1.1, 1.2 gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch, 1.1, 1.2 gdb-6.5-gcore-i386-on-amd64.patch, 1.1, 1.2 gdb-6.5-symbols-overlap.patch, 1.1, 1.2 gdb.spec, 1.217, 1.218 sources, 1.20, 1.21 gdb-6.3-augmS-20060303.patch, 1.4, NONE gdb-6.3-bz146810-solib! _absolute_prefix_is_empty.patch, 1.2, NONE gdb-6.3-cfaval-20060303.patch, 1.5, NONE gdb-6.5-bfd-hash-style-20060714.patch, 1.1, NONE gdb-6.5-bz172034-disasm-i386-C6-C7.patch, 1.1, NONE gdb-6.5-bz195429-stale-threads-crash.patch, 1.2, NONE gdb-6.5-bz196439-valgrind-memcheck-compat.patch, 1.3, NONE gdb-6.5-bz206813-cplusplus-symbol-null.patch, 1.1, NONE gdb-6.5-last-address-space-byte.patch, 1.1, NONE gdb-6.5-matching_bfd_sections.patch, 1.2, NONE gdb-6.5-opcodes-i386-nopmem.patch, 1.2, NONE Message-ID: <200701210153.l0L1r3ou007862@cvs.devel.redhat.com> Author: jkratoch Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7847 Modified Files: .cvsignore gdb-6.3-ia64-gcore-page0-20050421.patch gdb-6.3-ia64-sigill-20051115.patch gdb-6.3-large-core-20051206.patch gdb-6.3-nonthreaded-wp-20050117.patch gdb-6.3-pie-20050110.patch gdb-6.3-security-errata-20050610.patch gdb-6.3-test-sepcrc-20050402.patch gdb-6.3-warnings-20050317.patch gdb-6.5-bz109921-DW_AT_decl_file-fix.patch gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch gdb-6.5-bz190810-gdbserver-arch-advice.patch gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch gdb-6.5-gcore-i386-on-amd64.patch gdb-6.5-symbols-overlap.patch gdb.spec sources Added Files: gdb-6.3-bz202689-exec-from-pthread-test.patch gdb-6.5-bz196439-valgrind-memcheck-compat-test.patch gdb-6.6-ia64-kernel-unwind.patch gdb-6.6-ia64-pc-unwind.patch Removed Files: gdb-6.3-augmS-20060303.patch gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch gdb-6.3-cfaval-20060303.patch gdb-6.5-bfd-hash-style-20060714.patch gdb-6.5-bz172034-disasm-i386-C6-C7.patch gdb-6.5-bz195429-stale-threads-crash.patch gdb-6.5-bz196439-valgrind-memcheck-compat.patch gdb-6.5-bz206813-cplusplus-symbol-null.patch gdb-6.5-last-address-space-byte.patch gdb-6.5-matching_bfd_sections.patch gdb-6.5-opcodes-i386-nopmem.patch Log Message: * Sat Jan 20 2007 Jan Kratochvil - 6.6-1 - Upgrade to GDB 6.6. Drop redundant patches, forward-port remaining ones. - Backported post gdb-6.6 release ia64 unwinding fixups. - Testcase for exec() from threaded program (BZ 202689). - Resolves: rhbz#221125 - Related: rhbz#202689 gdb-6.3-bz202689-exec-from-pthread-test.patch: threaded-exec.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ threaded-exec.exp | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) --- NEW FILE gdb-6.3-bz202689-exec-from-pthread-test.patch --- 2007-01-17 Jan Kratochvil * gdb.threads/threaded-exec.exp, gdb.threads/threaded-exec.c: New files. --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.threads/threaded-exec.c 17 Jan 2007 23:10:22 -0000 @@ -0,0 +1,46 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2007 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. */ + +#include +#include +#include +#include +#include + + +static void * +threader (void *arg) +{ + return NULL; +} + +int +main (void) +{ + pthread_t t1; + int i; + + i = pthread_create (&t1, NULL, threader, (void *) NULL); + assert (i == 0); + i = pthread_join (t1, NULL); + assert (i == 0); + + execl ("/bin/true", "/bin/true", NULL); + abort (); +} --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.threads/threaded-exec.exp 17 Jan 2007 23:10:22 -0000 @@ -0,0 +1,41 @@ +# threaded-exec.exp -- Check reset of the tracked threads on exec*(2) +# Copyright (C) 2007 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 + +set testfile threaded-exec +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir + +gdb_load ${binfile} + +gdb_run_cmd + +gdb_test_multiple {} "Program exited" { + -re "\r\nProgram exited normally.\r\n$gdb_prompt $" { + pass "Program exited" + } +} gdb-6.5-bz196439-valgrind-memcheck-compat-test.patch: dw2-stripped.c | 42 +++++++++++++++++++++++++++++ dw2-stripped.exp | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) --- NEW FILE gdb-6.5-bz196439-valgrind-memcheck-compat-test.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196439 2006-08-26 Jan Kratochvil * gdb.dwarf2/dw2-stripped.exp: New file, Handle corrupted or missing location list information. * gdb.dwarf2/dw2-stripped.c: New file, Handle corrupted or missing location list information. Index: gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.c =================================================================== RCS file: gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.c diff -N gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.c 26 Aug 2006 11:47:26 -0000 @@ -0,0 +1,42 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2004 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. */ + + +/* The function `func1' traced into must have debug info on offset > 0; + (DW_UNSND (attr)). This is the reason of `func0' existence. */ + +void +func0(int a, int b) +{ +} + +/* `func1' being traced into must have some arguments to dump. */ + +void +func1(int a, int b) +{ + func0 (a,b); +} + +int +main(void) +{ + func1 (1, 2); + return 0; +} Index: gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp =================================================================== RCS file: gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp diff -N gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gdb-6.5/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp 26 Aug 2006 11:47:27 -0000 @@ -0,0 +1,79 @@ +# 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. + +# Minimal DWARF-2 unit test + +# This test can only be run on targets which support DWARF-2. +# For now pick a sampling of likely targets. +if {![istarget *-*-linux*] + && ![istarget *-*-gnu*] + && ![istarget *-*-elf*] + && ![istarget *-*-openbsd*] + && ![istarget arm-*-eabi*] + && ![istarget powerpc-*-eabi*]} { + return 0 +} + +set testfile "dw2-stripped" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile}.x + +remote_exec build "rm -f ${binfile}" + +# get the value of gcc_compiled +if [get_compiler_info ${binfile}] { + return -1 +} + +# This test can only be run on gcc as we use additional_flags=FIXME +if {$gcc_compiled == 0} { + return 0 +} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-ggdb3}] != "" } { + return -1 +} + +remote_exec build "objcopy -R .debug_loc ${binfile}" +set strip_output [remote_exec build "objdump -h ${binfile}"] + +set test "stripping test file preservation" +if [ regexp ".debug_info " $strip_output] { + pass "$test (.debug_info preserved)" +} else { + fail "$test (.debug_info got also stripped)" +} + +set test "stripping test file functionality" +if [ regexp ".debug_loc " $strip_output] { + fail "$test (.debug_loc still present)" +} else { + pass "$test (.debug_loc stripped)" +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +# For C programs, "start" should stop in main(). + +gdb_test "start" \ + ".*main \\(\\) at .*" \ + "start" +gdb_test "step" \ + "func.* \\(.*\\) at .*" \ + "step" gdb-6.6-ia64-kernel-unwind.patch: ia64-tdep.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) --- NEW FILE gdb-6.6-ia64-kernel-unwind.patch --- 2006-12-28 Daniel Jacobowitz * ia64-tdep.c (get_kernel_table): Correct signedness in check for a negative return value. --- ./gdb/ia64-tdep.c 12 Jul 2006 18:13:45 -0000 1.140 +++ ./gdb/ia64-tdep.c 28 Dec 2006 23:48:51 -0000 1.141 @@ -2486,13 +2486,14 @@ get_kernel_table (unw_word_t ip, unw_dyn if (!ktab) { gdb_byte *ktab_buf; - size_t size; + LONGEST size; - ktab_size = getunwind_table (&ktab_buf); - if (ktab_size <= 0) + size = getunwind_table (&ktab_buf); + if (size <= 0) return -UNW_ENOINFO; - else - ktab = (struct ia64_table_entry *) ktab_buf; + + ktab = (struct ia64_table_entry *) ktab_buf; + ktab_size = size; for (etab = ktab; etab->start_offset; ++etab) etab->info_offset += KERNEL_START; gdb-6.6-ia64-pc-unwind.patch: frame.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) --- NEW FILE gdb-6.6-ia64-pc-unwind.patch --- 2007-01-11 Daniel Jacobowitz * frame.c (get_prev_frame_1): Check PC_REGNUM before using it. --- ./gdb/frame.c 9 Jan 2007 20:19:15 -0000 1.218 +++ ./gdb/frame.c 11 Jan 2007 17:18:22 -0000 1.219 @@ -1221,10 +1221,17 @@ get_prev_frame_1 (struct frame_info *thi have different frame IDs, the new frame will be bogus; two functions can't share a register save slot for the PC. This can happen when the prologue analyzer finds a stack adjustment, but - no PC save. This check does assume that the "PC register" is - roughly a traditional PC, even if the gdbarch_unwind_pc method - frobs it. */ + no PC save. + + This check does assume that the "PC register" is roughly a + traditional PC, even if the gdbarch_unwind_pc method adjusts + it (we do not rely on the value, only on the unwound PC being + dependent on this value). A potential improvement would be + to have the frame prev_pc method and the gdbarch unwind_pc + method set the same lval and location information as + frame_register_unwind. */ if (this_frame->level > 0 + && PC_REGNUM >= 0 && get_frame_type (this_frame) == NORMAL_FRAME && get_frame_type (this_frame->next) == NORMAL_FRAME) { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 11 Jul 2006 08:06:55 -0000 1.21 +++ .cvsignore 21 Jan 2007 01:53:01 -0000 1.22 @@ -1 +1 @@ -gdb-6.5.tar.bz2 +gdb-6.6.tar.bz2 gdb-6.3-ia64-gcore-page0-20050421.patch: gcore.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) Index: gdb-6.3-ia64-gcore-page0-20050421.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-gcore-page0-20050421.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-ia64-gcore-page0-20050421.patch 11 Jul 2006 06:33:02 -0000 1.2 +++ gdb-6.3-ia64-gcore-page0-20050421.patch 21 Jan 2007 01:53:01 -0000 1.3 @@ -1,19 +1,19 @@ -Index: gdb-6.5/gdb/gcore.c +Index: gdb-6.6/gdb/gcore.c =================================================================== ---- gdb-6.5.orig/gdb/gcore.c 2005-12-17 20:33:59.000000000 -0200 -+++ gdb-6.5/gdb/gcore.c 2006-07-07 02:41:33.000000000 -0300 -@@ -462,8 +462,13 @@ gcore_copy_callback (bfd *obfd, asection - error (_("Not enough memory to create corefile.")); - old_chain = make_cleanup (xfree, memhunk); +--- gdb-6.6.orig/gdb/gcore.c ++++ gdb-6.6/gdb/gcore.c +@@ -475,8 +475,13 @@ gcore_copy_callback (bfd *obfd, asection + if (size > total_size) + size = total_size; -+ /* Warn if read error occurs except if we were trying to read the -+ first page for ia64. The first page is marked readable, but it cannot -+ be read. */ - if (target_read_memory (bfd_section_vma (obfd, osec), -- memhunk, size) != 0) -+ memhunk, size) != 0 -+ && (strcmp (TARGET_ARCHITECTURE->arch_name, "ia64") -+ || bfd_section_vma (obfd, osec) != 0)) - warning (_("Memory read failed for corefile section, %s bytes at 0x%s."), - paddr_d (size), paddr (bfd_section_vma (obfd, osec))); - if (!bfd_set_section_contents (obfd, osec, memhunk, 0, size)) ++ /* Warn if read error occurs except if we were trying to read the ++ first page for ia64. The first page is marked readable, but it cannot ++ be read. */ + if (target_read_memory (bfd_section_vma (obfd, osec) + offset, +- memhunk, size) != 0) ++ memhunk, size) != 0 ++ && (strcmp (TARGET_ARCHITECTURE->arch_name, "ia64") ++ || bfd_section_vma (obfd, osec) != 0)) + { + warning (_("Memory read failed for corefile section, %s bytes at 0x%s."), + paddr_d (size), paddr (bfd_section_vma (obfd, osec))); gdb-6.3-ia64-sigill-20051115.patch: linux-nat.c | 7 +++- testsuite/gdb.arch/ia64-sigill.c | 8 +++++ testsuite/gdb.arch/ia64-sigill.exp | 59 +++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) Index: gdb-6.3-ia64-sigill-20051115.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-ia64-sigill-20051115.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-ia64-sigill-20051115.patch 11 Jul 2006 06:33:02 -0000 1.2 +++ gdb-6.3-ia64-sigill-20051115.patch 21 Jan 2007 01:53:01 -0000 1.3 @@ -12,10 +12,10 @@ * gdb.arch/ia64-sigill.c: New test. * gdb.arch/ia64-sigill.exp: Ditto. -Index: gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.exp +Index: gdb-6.6/gdb/testsuite/gdb.arch/ia64-sigill.exp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.exp 2006-07-07 03:16:54.000000000 -0300 +--- /dev/null ++++ gdb-6.6/gdb/testsuite/gdb.arch/ia64-sigill.exp @@ -0,0 +1,59 @@ +# Copyright 2005 Free Software Foundation, Inc. + @@ -76,10 +76,10 @@ +gdb_test "handle SIGILL nostop noprint" "SIGILL.*No.*No.*Yes.*" "handle sigill" +gdb_test "run" "Starting program.*ia64-sigill.*\[New thread.*\].*hello world.*Program exited normally." "run to exit" + -Index: gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.c +Index: gdb-6.6/gdb/testsuite/gdb.arch/ia64-sigill.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.5/gdb/testsuite/gdb.arch/ia64-sigill.c 2006-07-07 03:16:54.000000000 -0300 +--- /dev/null ++++ gdb-6.6/gdb/testsuite/gdb.arch/ia64-sigill.c @@ -0,0 +1,8 @@ +#include + @@ -89,25 +89,11 @@ + return 0; +} + -Index: gdb-6.5/gdb/linux-thread-db.c +Index: gdb-6.6/gdb/linux-nat.c =================================================================== ---- gdb-6.5.orig/gdb/linux-thread-db.c 2006-07-07 01:06:36.000000000 -0300 -+++ gdb-6.5/gdb/linux-thread-db.c 2006-07-07 03:16:54.000000000 -0300 -@@ -926,7 +926,8 @@ thread_db_wait (ptid_t ptid, struct targ - post-processing and bail out early. */ - return ptid; - -- if (ourstatus->kind == TARGET_WAITKIND_EXITED) -+ if (ourstatus->kind == TARGET_WAITKIND_EXITED -+ || ourstatus->kind == TARGET_WAITKIND_SIGNALLED) - return pid_to_ptid (-1); - - if (ourstatus->kind == TARGET_WAITKIND_STOPPED -Index: gdb-6.5/gdb/linux-nat.c -=================================================================== ---- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 03:03:55.000000000 -0300 -+++ gdb-6.5/gdb/linux-nat.c 2006-07-07 03:16:54.000000000 -0300 -@@ -2209,7 +2209,8 @@ retry: +--- gdb-6.6.orig/gdb/linux-nat.c ++++ gdb-6.6/gdb/linux-nat.c +@@ -2241,7 +2241,8 @@ retry: threads can be a bit time-consuming so if we want decent performance with heavily multi-threaded programs, especially when they're using a high frequency timer, we'd better avoid it if we @@ -117,7 +103,7 @@ if (WIFSTOPPED (status)) { -@@ -2220,7 +2221,9 @@ retry: +@@ -2252,7 +2253,9 @@ retry: if (!lp->step && signal_stop_state (signo) == 0 && signal_print_state (signo) == 0 gdb-6.3-large-core-20051206.patch: dcache.c | 4 ++-- dcache.h | 4 ++-- exec.c | 4 ++-- infptrace.c | 12 ++++++------ linux-nat.c | 2 +- remote-sim.c | 21 ++++++++++++--------- remote.c | 15 ++++++++++++--- symfile-mem.c | 10 +++++++++- target.c | 18 +++++++++--------- target.h | 21 +++++++++++---------- 10 files changed, 66 insertions(+), 45 deletions(-) Index: gdb-6.3-large-core-20051206.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-large-core-20051206.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-large-core-20051206.patch 11 Jul 2006 06:33:02 -0000 1.2 +++ gdb-6.3-large-core-20051206.patch 21 Jan 2007 01:53:01 -0000 1.3 @@ -21,10 +21,10 @@ * remote.h: Ditto. * dcache.h: Ditto. -Index: gdb-6.5/gdb/symfile-mem.c +Index: gdb-6.6/gdb/symfile-mem.c =================================================================== ---- gdb-6.5.orig/gdb/symfile-mem.c 2006-07-11 02:35:34.000000000 -0300 -+++ gdb-6.5/gdb/symfile-mem.c 2006-07-11 02:35:49.000000000 -0300 +--- gdb-6.6.orig/gdb/symfile-mem.c 2007-01-20 16:09:05.000000000 +0100 ++++ gdb-6.6/gdb/symfile-mem.c 2007-01-20 16:09:17.000000000 +0100 @@ -58,6 +58,14 @@ #include "elf/common.h" @@ -49,131 +49,56 @@ if (nbfd == NULL) error (_("Failed to read a valid object file image from memory.")); -Index: gdb-6.5/gdb/target.c +Index: gdb-6.6/gdb/target.c =================================================================== ---- gdb-6.5.orig/gdb/target.c 2006-07-11 02:35:49.000000000 -0300 -+++ gdb-6.5/gdb/target.c 2006-07-11 02:35:49.000000000 -0300 -@@ -83,8 +83,8 @@ static LONGEST default_xfer_partial (str - partial transfers, try either target_read_memory_partial or - target_write_memory_partial). */ - --static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, -- int write); -+static int target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, -+ LONGEST len, int write); - - static void init_dummy_target (void); - -@@ -511,8 +511,8 @@ update_current_target (void) - de_fault (to_prepare_to_store, - (void (*) (void)) +--- gdb-6.6.orig/gdb/target.c 2007-01-20 16:09:12.000000000 +0100 ++++ gdb-6.6/gdb/target.c 2007-01-20 16:09:17.000000000 +0100 +@@ -56,7 +56,7 @@ static int nosymbol (char *, CORE_ADDR * + + static void tcomplain (void) ATTR_NORETURN; + +-static int nomemory (CORE_ADDR, char *, int, int, struct target_ops *); ++static LONGEST nomemory (CORE_ADDR, char *, int, int, struct target_ops *); + + static int return_zero (void); + +@@ -284,7 +284,7 @@ target_mourn_inferior (void) + observer_notify_mourn_inferior (¤t_target); + } + +-static int ++static LONGEST + nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write, + struct target_ops *t) + { +@@ -517,7 +517,7 @@ update_current_target (void) + (void (*) (void)) noprocess); -- de_fault (deprecated_xfer_memory, -- (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) -+ de_fault (deprecated_xfer_memory, + de_fault (deprecated_xfer_memory, +- (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) + (LONGEST (*) (CORE_ADDR, gdb_byte *, LONGEST, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_files_info, - (void (*) (struct target_ops *)) -@@ -940,7 +940,7 @@ target_xfer_partial (struct target_ops * - implementing another singluar mechanism (for instance, a generic - object:annex onto inferior:object:annex say). */ - --static LONGEST -+static int - xfer_using_stratum (enum target_object object, const char *annex, - ULONGEST offset, LONGEST len, void *readbuf, - const void *writebuf) -@@ -1005,7 +1005,7 @@ xfer_using_stratum (enum target_object o - deal with partial reads should call target_read_memory_partial. */ + de_fault (to_files_info, + (void (*) (struct target_ops *)) +@@ -1178,7 +1178,7 @@ target_xfer_partial (struct target_ops * + it makes no progress, and then return how much was transferred). */ int -target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len) +target_read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len) { - if (target_xfer_partial_p ()) - return xfer_using_stratum (TARGET_OBJECT_MEMORY, NULL, -@@ -1015,7 +1015,7 @@ target_read_memory (CORE_ADDR memaddr, g + if (target_read (¤t_target, TARGET_OBJECT_MEMORY, NULL, + myaddr, memaddr, len) == len) +@@ -1188,7 +1188,7 @@ target_read_memory (CORE_ADDR memaddr, g } int -target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, int len) +target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, LONGEST len) { - gdb_byte *bytes = alloca (len); - memcpy (bytes, myaddr, len); -@@ -1056,11 +1056,11 @@ Mode for reading from readonly sections - - Result is -1 on error, or the number of bytes transfered. */ - --int --do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write, -+LONGEST -+do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, int write, - struct mem_attrib *attrib) - { -- int res; -+ LONGEST res; - int done = 0; - struct target_ops *t; - -@@ -1118,10 +1118,11 @@ do_xfer_memory (CORE_ADDR memaddr, gdb_b - Result is 0 or errno value. */ - - static int --target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int write) -+target_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, -+ LONGEST len, int write) - { -- int res; -- int reg_len; -+ LONGEST res; -+ LONGEST reg_len; - struct mem_region *region; - - /* Zero length requests are ok and require no work. */ -@@ -1192,12 +1193,12 @@ target_xfer_memory (CORE_ADDR memaddr, g - If we succeed, set *ERR to zero and return the number of bytes transferred. - If we fail, set *ERR to a non-zero errno value, and return -1. */ - --static int --target_xfer_memory_partial (CORE_ADDR memaddr, gdb_byte *myaddr, int len, -+static LONGEST -+target_xfer_memory_partial (CORE_ADDR memaddr, gdb_byte *myaddr, LONGEST len, - int write_p, int *err) - { -- int res; -- int reg_len; -+ LONGEST res; -+ LONGEST reg_len; - struct mem_region *region; - - /* Zero length requests are ok and require no work. */ -@@ -1256,9 +1257,9 @@ target_xfer_memory_partial (CORE_ADDR me - return res; - } - --int -+LONGEST - target_read_memory_partial (CORE_ADDR memaddr, gdb_byte *buf, -- int len, int *err) -+ LONGEST len, int *err) - { - if (target_xfer_partial_p ()) - { -@@ -1285,9 +1286,9 @@ target_read_memory_partial (CORE_ADDR me - return target_xfer_memory_partial (memaddr, buf, len, 0, err); - } - --int -+LONGEST - target_write_memory_partial (CORE_ADDR memaddr, gdb_byte *buf, -- int len, int *err) -+ LONGEST len, int *err) - { - if (target_xfer_partial_p ()) - { -@@ -2044,8 +2045,8 @@ debug_to_prepare_to_store (void) + if (target_write (¤t_target, TARGET_OBJECT_MEMORY, NULL, + myaddr, memaddr, len) == len) +@@ -2186,8 +2186,8 @@ debug_to_prepare_to_store (void) fprintf_unfiltered (gdb_stdlog, "target_prepare_to_store ()\n"); } @@ -184,7 +109,7 @@ int write, struct mem_attrib *attrib, struct target_ops *target) { -@@ -2055,9 +2056,9 @@ deprecated_debug_xfer_memory (CORE_ADDR +@@ -2197,9 +2197,9 @@ deprecated_debug_xfer_memory (CORE_ADDR attrib, target); fprintf_unfiltered (gdb_stdlog, @@ -196,11 +121,11 @@ if (retval > 0) { -Index: gdb-6.5/gdb/target.h +Index: gdb-6.6/gdb/target.h =================================================================== ---- gdb-6.5.orig/gdb/target.h 2006-07-11 02:35:48.000000000 -0300 -+++ gdb-6.5/gdb/target.h 2006-07-11 02:35:49.000000000 -0300 -@@ -332,10 +332,10 @@ struct target_ops +--- gdb-6.6.orig/gdb/target.h 2007-01-20 16:09:10.000000000 +0100 ++++ gdb-6.6/gdb/target.h 2007-01-20 16:09:17.000000000 +0100 +@@ -347,10 +347,10 @@ struct target_ops NOTE: cagney/2004-10-01: This has been entirely superseeded by to_xfer_partial and inferior inheritance. */ @@ -215,15 +140,7 @@ void (*to_files_info) (struct target_ops *); int (*to_insert_breakpoint) (struct bp_target_info *); -@@ -535,21 +535,23 @@ extern void target_disconnect (char *, i - - extern DCACHE *target_dcache; - --extern int do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, -- int write, struct mem_attrib *attrib); -+extern LONGEST do_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, -+ LONGEST len, int write, -+ struct mem_attrib *attrib); +@@ -605,16 +605,17 @@ extern DCACHE *target_dcache; extern int target_read_string (CORE_ADDR, char **, int, int *); @@ -245,29 +162,13 @@ +extern LONGEST child_xfer_memory (CORE_ADDR, gdb_byte *, LONGEST, int, + struct mem_attrib *, struct target_ops *); - /* Make a single attempt at transfering LEN bytes. On a successful - transfer, the number of bytes actually transfered is returned and -@@ -557,11 +559,11 @@ extern int child_xfer_memory (CORE_ADDR, - of bytes actually transfered is not defined) and ERR is set to a - non-zero error indication. */ - --extern int target_read_memory_partial (CORE_ADDR addr, gdb_byte *buf, -- int len, int *err); -+extern LONGEST target_read_memory_partial (CORE_ADDR addr, gdb_byte *buf, -+ LONGEST len, int *err); - --extern int target_write_memory_partial (CORE_ADDR addr, gdb_byte *buf, -- int len, int *err); -+extern LONGEST target_write_memory_partial (CORE_ADDR addr, gdb_byte *buf, -+ LONGEST len, int *err); - - extern char *child_pid_to_exec_file (int); - -Index: gdb-6.5/gdb/infptrace.c + /* Fetches the target's memory map. If one is found it is sorted + and returned, after some consistency checking. Otherwise, NULL +Index: gdb-6.6/gdb/infptrace.c =================================================================== ---- gdb-6.5.orig/gdb/infptrace.c 2006-07-11 02:35:49.000000000 -0300 -+++ gdb-6.5/gdb/infptrace.c 2006-07-11 02:35:49.000000000 -0300 -@@ -368,17 +368,17 @@ store_inferior_registers (int regnum) +--- gdb-6.6.orig/gdb/infptrace.c 2005-12-17 23:34:01.000000000 +0100 ++++ gdb-6.6/gdb/infptrace.c 2007-01-20 16:09:17.000000000 +0100 +@@ -331,17 +331,17 @@ store_inferior_registers (int regnum) deprecated_child_ops doesn't allow memory operations to cross below us in the target stack anyway. */ @@ -291,11 +192,11 @@ PTRACE_TYPE_RET *buffer; struct cleanup *old_chain = NULL; -Index: gdb-6.5/gdb/dcache.c +Index: gdb-6.6/gdb/dcache.c =================================================================== ---- gdb-6.5.orig/gdb/dcache.c 2006-07-11 02:35:34.000000000 -0300 -+++ gdb-6.5/gdb/dcache.c 2006-07-11 02:35:49.000000000 -0300 -@@ -527,9 +527,9 @@ dcache_free (DCACHE *dcache) +--- gdb-6.6.orig/gdb/dcache.c 2006-08-15 20:46:24.000000000 +0200 ++++ gdb-6.6/gdb/dcache.c 2007-01-20 16:09:17.000000000 +0100 +@@ -519,9 +519,9 @@ dcache_free (DCACHE *dcache) This routine is indended to be called by remote_xfer_ functions. */ @@ -307,10 +208,10 @@ { int i; int (*xfunc) (DCACHE *dcache, CORE_ADDR addr, gdb_byte *ptr); -Index: gdb-6.5/gdb/dcache.h +Index: gdb-6.6/gdb/dcache.h =================================================================== ---- gdb-6.5.orig/gdb/dcache.h 2006-07-11 02:35:34.000000000 -0300 -+++ gdb-6.5/gdb/dcache.h 2006-07-11 02:35:49.000000000 -0300 +--- gdb-6.6.orig/gdb/dcache.h 2005-12-17 23:33:59.000000000 +0100 ++++ gdb-6.6/gdb/dcache.h 2007-01-20 16:09:17.000000000 +0100 @@ -37,7 +37,7 @@ void dcache_free (DCACHE *); /* Simple to call from _xfer_memory */ @@ -321,11 +222,11 @@ + LONGEST len, int should_write); #endif /* DCACHE_H */ -Index: gdb-6.5/gdb/exec.c +Index: gdb-6.6/gdb/exec.c =================================================================== ---- gdb-6.5.orig/gdb/exec.c 2006-07-11 02:35:34.000000000 -0300 -+++ gdb-6.5/gdb/exec.c 2006-07-11 02:35:49.000000000 -0300 -@@ -447,8 +447,8 @@ map_vmap (bfd *abfd, bfd *arch) +--- gdb-6.6.orig/gdb/exec.c 2006-11-10 20:20:35.000000000 +0100 ++++ gdb-6.6/gdb/exec.c 2007-01-20 16:09:17.000000000 +0100 +@@ -452,8 +452,8 @@ map_vmap (bfd *abfd, bfd *arch) The same routine is used to handle both core and exec files; we just tail-call it with more arguments to select between them. */ @@ -336,11 +237,11 @@ struct mem_attrib *attrib, struct target_ops *target) { int res; -Index: gdb-6.5/gdb/linux-nat.c +Index: gdb-6.6/gdb/linux-nat.c =================================================================== ---- gdb-6.5.orig/gdb/linux-nat.c 2006-07-11 02:35:49.000000000 -0300 -+++ gdb-6.5/gdb/linux-nat.c 2006-07-11 02:36:39.000000000 -0300 -@@ -3264,7 +3264,7 @@ linux_xfer_partial (struct target_ops *o +--- gdb-6.6.orig/gdb/linux-nat.c 2007-01-20 16:09:14.000000000 +0100 ++++ gdb-6.6/gdb/linux-nat.c 2007-01-20 16:09:17.000000000 +0100 +@@ -3266,7 +3266,7 @@ linux_xfer_partial (struct target_ops *o Revert when Bugzilla 147436 is fixed. */ if (iterate_over_lwps (ia64_linux_check_stack_region, &range) != NULL) { /* This region contains ia64 rse registers, we have to re-read. */ @@ -349,10 +250,10 @@ /* Re-read register stack area. */ xxfer = super_xfer_partial (ops, object, annex, -Index: gdb-6.5/gdb/remote.c +Index: gdb-6.6/gdb/remote.c =================================================================== ---- gdb-6.5.orig/gdb/remote.c 2006-07-11 02:35:48.000000000 -0300 -+++ gdb-6.5/gdb/remote.c 2006-07-11 02:37:02.000000000 -0300 +--- gdb-6.6.orig/gdb/remote.c 2007-01-20 16:09:12.000000000 +0100 ++++ gdb-6.6/gdb/remote.c 2007-01-20 16:09:17.000000000 +0100 @@ -27,6 +27,7 @@ #include "gdb_string.h" #include @@ -361,7 +262,7 @@ #include "inferior.h" #include "bfd.h" #include "symfile.h" -@@ -3701,19 +3702,27 @@ remote_read_bytes (CORE_ADDR memaddr, gd +@@ -4185,19 +4186,27 @@ remote_read_bytes (CORE_ADDR memaddr, gd if SHOULD_WRITE is nonzero. Returns length of data written or read; 0 for error. TARGET is unused. */ @@ -372,8 +273,6 @@ int should_write, struct mem_attrib *attrib, struct target_ops *target) { - CORE_ADDR targ_addr; - int targ_len; int res; + int len; + @@ -384,28 +283,21 @@ + + len = (int)mem_len; - /* Should this be the selected frame? */ - gdbarch_remote_translate_xfer_address (current_gdbarch, - current_regcache, -- mem_addr, mem_len, -+ mem_addr, len, - &targ_addr, &targ_len); - if (targ_len <= 0) - return 0; -@@ -3723,7 +3732,7 @@ remote_xfer_memory (CORE_ADDR mem_addr, + if (should_write) + res = remote_write_bytes (mem_addr, buffer, mem_len); else - res = remote_read_bytes (targ_addr, buffer, targ_len); + res = remote_read_bytes (mem_addr, buffer, mem_len); - return res; + return (LONGEST)res; } - static void -Index: gdb-6.5/gdb/remote-sim.c + /* Sends a packet with content determined by the printf format string +Index: gdb-6.6/gdb/remote-sim.c =================================================================== ---- gdb-6.5.orig/gdb/remote-sim.c 2006-07-11 02:35:34.000000000 -0300 -+++ gdb-6.5/gdb/remote-sim.c 2006-07-11 02:35:49.000000000 -0300 -@@ -742,11 +742,14 @@ gdbsim_prepare_to_store (void) +--- gdb-6.6.orig/gdb/remote-sim.c 2006-11-10 20:20:36.000000000 +0100 ++++ gdb-6.6/gdb/remote-sim.c 2007-01-20 16:10:10.000000000 +0100 +@@ -745,11 +745,14 @@ gdbsim_prepare_to_store (void) Returns the number of bytes transferred. */ @@ -419,10 +311,10 @@ + /* Convert to len type that sim_read and sim_write can handle. */ + int xfer_len = (int)len; + - if (!program_loaded) - error (_("No program loaded.")); - -@@ -756,22 +759,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m + /* If no program is running yet, then ignore the simulator for + memory. Pass the request down to the next target, hopefully + an exec file. */ +@@ -765,22 +768,22 @@ gdbsim_xfer_inferior_memory (CORE_ADDR m printf_filtered ("gdbsim_xfer_inferior_memory: myaddr 0x"); gdb_print_host_address (myaddr, gdb_stdout); printf_filtered (", memaddr 0x%s, len %d, write %d\n", gdb-6.3-nonthreaded-wp-20050117.patch: doc/observer.texi | 4 ++++ linux-nat.c | 32 +++++++++++++++++++++++++++++--- target.c | 8 ++++++++ target.h | 3 +-- 4 files changed, 42 insertions(+), 5 deletions(-) Index: gdb-6.3-nonthreaded-wp-20050117.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-nonthreaded-wp-20050117.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-nonthreaded-wp-20050117.patch 11 Jul 2006 06:33:02 -0000 1.3 +++ gdb-6.3-nonthreaded-wp-20050117.patch 21 Jan 2007 01:53:01 -0000 1.4 @@ -1,7 +1,7 @@ -Index: gdb-6.5/gdb/doc/observer.texi +Index: gdb-6.6/gdb/doc/observer.texi =================================================================== ---- gdb-6.5.orig/gdb/doc/observer.texi 2006-07-07 04:08:37.000000000 -0300 -+++ gdb-6.5/gdb/doc/observer.texi 2006-07-07 04:19:00.000000000 -0300 +--- gdb-6.6.orig/gdb/doc/observer.texi ++++ gdb-6.6/gdb/doc/observer.texi @@ -119,6 +119,10 @@ when @value{GDBN} calls this observer, t haven't been loaded yet. @end deftypefun @@ -13,11 +13,11 @@ @deftypefun void solib_unloaded (struct so_list *@var{solib}) The shared library specified by @var{solib} has been unloaded. @end deftypefun -Index: gdb-6.5/gdb/linux-nat.c +Index: gdb-6.6/gdb/linux-nat.c =================================================================== ---- gdb-6.5.orig/gdb/linux-nat.c 2006-07-07 04:00:05.000000000 -0300 -+++ gdb-6.5/gdb/linux-nat.c 2006-07-07 04:20:40.000000000 -0300 -@@ -802,11 +802,23 @@ iterate_over_lwps (int (*callback) (stru +--- gdb-6.6.orig/gdb/linux-nat.c ++++ gdb-6.6/gdb/linux-nat.c +@@ -803,11 +803,23 @@ iterate_over_lwps (int (*callback) (stru { struct lwp_info *lp, *lpnext; @@ -72,19 +72,19 @@ /* Save the original signal mask. */ sigprocmask (SIG_SETMASK, NULL, &normal_mask); -Index: gdb-6.5/gdb/target.c +Index: gdb-6.6/gdb/target.c =================================================================== ---- gdb-6.5.orig/gdb/target.c 2006-07-07 03:52:38.000000000 -0300 -+++ gdb-6.5/gdb/target.c 2006-07-07 04:19:00.000000000 -0300 -@@ -39,6 +39,7 @@ - #include "regcache.h" +--- gdb-6.6.orig/gdb/target.c ++++ gdb-6.6/gdb/target.c +@@ -40,6 +40,7 @@ #include "gdb_assert.h" #include "gdbcore.h" + #include "exceptions.h" +#include "observer.h" static void target_info (char *, int); -@@ -267,6 +268,13 @@ target_load (char *arg, int from_tty) +@@ -276,6 +277,13 @@ target_load (char *arg, int from_tty) (*current_target.to_load) (arg, from_tty); } @@ -98,11 +98,11 @@ static int nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write, struct target_ops *t) -Index: gdb-6.5/gdb/target.h +Index: gdb-6.6/gdb/target.h =================================================================== ---- gdb-6.5.orig/gdb/target.h 2006-07-07 03:52:40.000000000 -0300 -+++ gdb-6.5/gdb/target.h 2006-07-07 04:19:00.000000000 -0300 -@@ -783,8 +783,7 @@ int target_follow_fork (int follow_child +--- gdb-6.6.orig/gdb/target.h ++++ gdb-6.6/gdb/target.h +@@ -891,8 +891,7 @@ int target_follow_fork (int follow_child /* The inferior process has died. Do what is right. */ gdb-6.3-pie-20050110.patch: auxv.c | 20 ++- auxv.h | 4 breakpoint.c | 91 +++++++++++++--- breakpoint.h | 5 dwarf2read.c | 2 elfread.c | 2 infrun.c | 5 objfiles.c | 17 ++- solib-svr4.c | 317 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- solib.c | 107 ++++++++++++++----- solist.h | 10 + symfile-mem.c | 2 symfile.c | 22 +++- varobj.c | 56 ++++++++++ varobj.h | 2 15 files changed, 576 insertions(+), 86 deletions(-) Index: gdb-6.3-pie-20050110.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-pie-20050110.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-pie-20050110.patch 11 Jul 2006 06:33:02 -0000 1.2 +++ gdb-6.3-pie-20050110.patch 21 Jan 2007 01:53:01 -0000 1.3 @@ -1,8 +1,8 @@ -Index: gdb-6.5/gdb/dwarf2read.c +Index: gdb-6.6/gdb/dwarf2read.c =================================================================== ---- gdb-6.5.orig/gdb/dwarf2read.c 2006-07-11 02:47:11.000000000 -0300 -+++ gdb-6.5/gdb/dwarf2read.c 2006-07-11 02:56:58.000000000 -0300 -@@ -1208,7 +1208,7 @@ dwarf2_build_psymtabs (struct objfile *o +--- gdb-6.6.orig/gdb/dwarf2read.c ++++ gdb-6.6/gdb/dwarf2read.c +@@ -1219,7 +1219,7 @@ dwarf2_build_psymtabs (struct objfile *o else dwarf2_per_objfile->loc_buffer = NULL; @@ -11,11 +11,11 @@ || (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0)) { -Index: gdb-6.5/gdb/auxv.c +Index: gdb-6.6/gdb/auxv.c =================================================================== ---- gdb-6.5.orig/gdb/auxv.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/auxv.c 2006-07-11 02:47:11.000000000 -0300 -@@ -119,7 +119,7 @@ target_auxv_read (struct target_ops *ops +--- gdb-6.6.orig/gdb/auxv.c ++++ gdb-6.6/gdb/auxv.c +@@ -82,7 +82,7 @@ procfs_xfer_auxv (struct target_ops *ops Return 1 if an entry was read into *TYPEP and *VALP. */ int target_auxv_parse (struct target_ops *ops, gdb_byte **readptr, @@ -24,7 +24,7 @@ { const int sizeof_auxv_field = TYPE_LENGTH (builtin_type_void_data_ptr); gdb_byte *ptr = *readptr; -@@ -144,9 +144,10 @@ target_auxv_parse (struct target_ops *op +@@ -107,9 +107,10 @@ target_auxv_parse (struct target_ops *op an error getting the information. On success, return 1 after storing the entry's value field in *VALP. */ int @@ -35,9 +35,9 @@ + CORE_ADDR val; + ULONGEST at_type; gdb_byte *data; - int n = target_auxv_read (ops, &data); + LONGEST n = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL, &data); gdb_byte *ptr = data; -@@ -156,10 +157,10 @@ target_auxv_search (struct target_ops *o +@@ -119,10 +120,10 @@ target_auxv_search (struct target_ops *o return n; while (1) @@ -50,7 +50,7 @@ { xfree (data); *valp = val; -@@ -182,7 +183,8 @@ target_auxv_search (struct target_ops *o +@@ -145,7 +146,8 @@ target_auxv_search (struct target_ops *o int fprint_target_auxv (struct ui_file *file, struct target_ops *ops) { @@ -58,9 +58,9 @@ + CORE_ADDR val; + ULONGEST at_type; gdb_byte *data; - int len = target_auxv_read (ops, &data); - gdb_byte *ptr = data; -@@ -191,14 +193,14 @@ fprint_target_auxv (struct ui_file *file + LONGEST len = target_read_alloc (ops, TARGET_OBJECT_AUXV, NULL, + &data); +@@ -155,14 +157,14 @@ fprint_target_auxv (struct ui_file *file if (len <= 0) return len; @@ -77,7 +77,7 @@ { #define TAG(tag, text, kind) \ case tag: name = #tag; description = text; flavor = kind; break -@@ -249,7 +251,7 @@ fprint_target_auxv (struct ui_file *file +@@ -213,7 +215,7 @@ fprint_target_auxv (struct ui_file *file } fprintf_filtered (file, "%-4s %-20s %-30s ", @@ -86,11 +86,11 @@ switch (flavor) { case dec: -Index: gdb-6.5/gdb/auxv.h +Index: gdb-6.6/gdb/auxv.h =================================================================== ---- gdb-6.5.orig/gdb/auxv.h 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/auxv.h 2006-07-11 02:47:11.000000000 -0300 -@@ -43,14 +43,14 @@ extern LONGEST target_auxv_read (struct +--- gdb-6.6.orig/gdb/auxv.h ++++ gdb-6.6/gdb/auxv.h +@@ -37,14 +37,14 @@ struct target_ops; /* Forward declarati Return 1 if an entry was read into *TYPEP and *VALP. */ extern int target_auxv_parse (struct target_ops *ops, gdb_byte **readptr, gdb_byte *endptr, @@ -107,10 +107,10 @@ /* Print the contents of the target's AUXV on the specified file. */ extern int fprint_target_auxv (struct ui_file *file, struct target_ops *ops); -Index: gdb-6.5/gdb/breakpoint.h +Index: gdb-6.6/gdb/breakpoint.h =================================================================== ---- gdb-6.5.orig/gdb/breakpoint.h 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/breakpoint.h 2006-07-11 02:47:11.000000000 -0300 +--- gdb-6.6.orig/gdb/breakpoint.h ++++ gdb-6.6/gdb/breakpoint.h @@ -159,6 +159,7 @@ enum enable_state automatically enabled and reset when the call "lands" (either completes, or stops at another @@ -132,10 +132,10 @@ extern void create_solib_load_event_breakpoint (char *, int, char *, char *); extern void create_solib_unload_event_breakpoint (char *, int, -Index: gdb-6.5/gdb/symfile-mem.c +Index: gdb-6.6/gdb/symfile-mem.c =================================================================== ---- gdb-6.5.orig/gdb/symfile-mem.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/symfile-mem.c 2006-07-11 02:56:55.000000000 -0300 +--- gdb-6.6.orig/gdb/symfile-mem.c ++++ gdb-6.6/gdb/symfile-mem.c @@ -110,7 +110,7 @@ symbol_file_add_from_memory (struct bfd } @@ -145,11 +145,11 @@ /* This might change our ideas about frames already looked at. */ reinit_frame_cache (); -Index: gdb-6.5/gdb/infrun.c +Index: gdb-6.6/gdb/infrun.c =================================================================== ---- gdb-6.5.orig/gdb/infrun.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/infrun.c 2006-07-11 02:56:58.000000000 -0300 -@@ -2230,6 +2230,11 @@ process_event_stop_test: +--- gdb-6.6.orig/gdb/infrun.c ++++ gdb-6.6/gdb/infrun.c +@@ -2249,6 +2249,11 @@ process_event_stop_test: code segments in shared libraries might be mapped in now. */ re_enable_breakpoints_in_shlibs (); @@ -161,11 +161,11 @@ /* If requested, stop when the dynamic linker notifies gdb of events. This allows the user to get control and place breakpoints in initializer routines for -Index: gdb-6.5/gdb/objfiles.c +Index: gdb-6.6/gdb/objfiles.c =================================================================== ---- gdb-6.5.orig/gdb/objfiles.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/objfiles.c 2006-07-11 02:47:11.000000000 -0300 -@@ -47,6 +47,9 @@ +--- gdb-6.6.orig/gdb/objfiles.c ++++ gdb-6.6/gdb/objfiles.c +@@ -50,6 +50,9 @@ #include "dictionary.h" #include "source.h" @@ -175,7 +175,7 @@ /* Prototypes for local functions */ static void objfile_alloc_data (struct objfile *objfile); -@@ -258,7 +261,19 @@ init_entry_point_info (struct objfile *o +@@ -261,7 +264,19 @@ init_entry_point_info (struct objfile *o CORE_ADDR entry_point_address (void) { @@ -196,10 +196,10 @@ } /* Create the terminating entry of OBJFILE's minimal symbol table. -Index: gdb-6.5/gdb/solib-svr4.c +Index: gdb-6.6/gdb/solib-svr4.c =================================================================== ---- gdb-6.5.orig/gdb/solib-svr4.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/solib-svr4.c 2006-07-11 02:47:11.000000000 -0300 +--- gdb-6.6.orig/gdb/solib-svr4.c ++++ gdb-6.6/gdb/solib-svr4.c @@ -34,6 +34,8 @@ #include "gdbcore.h" #include "target.h" @@ -209,7 +209,7 @@ #include "gdb_assert.h" -@@ -254,7 +256,9 @@ static CORE_ADDR breakpoint_addr; /* Add +@@ -267,7 +269,9 @@ static char *debug_loader_name; /* Local function prototypes */ @@ -219,7 +219,7 @@ static CORE_ADDR bfd_lookup_symbol (bfd *, char *, flagword); -@@ -376,22 +380,79 @@ elf_locate_base (void) +@@ -389,22 +393,79 @@ elf_locate_base (void) { struct bfd_section *dyninfo_sect; int dyninfo_sect_size; @@ -303,7 +303,7 @@ /* Find the DT_DEBUG entry in the the .dynamic section. For mips elf we look for DT_MIPS_RLD_MAP, mips elf apparently has -@@ -418,6 +479,10 @@ elf_locate_base (void) +@@ -431,6 +492,10 @@ elf_locate_base (void) { dyn_ptr = bfd_h_get_32 (exec_bfd, (bfd_byte *) x_dynp->d_un.d_ptr); @@ -314,7 +314,7 @@ return dyn_ptr; } else if (dyn_tag == DT_MIPS_RLD_MAP) -@@ -543,6 +608,10 @@ solib_svr4_r_map (void) +@@ -556,6 +621,10 @@ solib_svr4_r_map (void) { struct link_map_offsets *lmo = svr4_fetch_link_map_offsets (); @@ -325,7 +325,7 @@ return read_memory_typed_address (debug_base + lmo->r_map_offset, builtin_type_void_data_ptr); } -@@ -669,6 +738,11 @@ svr4_current_sos (void) +@@ -713,6 +782,11 @@ svr4_current_sos (void) struct so_list **link_ptr = &head; CORE_ADDR ldsomap = 0; @@ -337,18 +337,18 @@ /* Make sure we've looked up the inferior's dynamic linker's base structure. */ if (! debug_base) -@@ -678,11 +752,21 @@ svr4_current_sos (void) +@@ -722,11 +796,21 @@ svr4_current_sos (void) /* If we can't find the dynamic linker's base structure, this must not be a dynamically linked executable. Hmm. */ if (! debug_base) -- return 0; -+ { +- return svr4_default_sos (); ++ { + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, + "svr4_current_sos: no DT_DEBUG found in %s -- return now\n", + exec_bfd->filename); -+ return 0; -+ } ++ return svr4_default_sos (); ++ } } /* Walk the inferior's link map list, and build our list of @@ -358,9 +358,9 @@ + "svr4_current_sos: walk link map in %s\n", + exec_bfd->filename); lm = solib_svr4_r_map (); + while (lm) - { -@@ -697,23 +781,103 @@ svr4_current_sos (void) +@@ -742,23 +826,103 @@ svr4_current_sos (void) new->lm_info->lm = xzalloc (lmo->link_map_size); make_cleanup (xfree, new->lm_info->lm); @@ -465,7 +465,7 @@ target_read_string (LM_NAME (new), &buffer, SO_NAME_MAX_PATH_SIZE - 1, &errcode); if (errcode != 0) -@@ -721,22 +885,37 @@ svr4_current_sos (void) +@@ -766,22 +930,37 @@ svr4_current_sos (void) safe_strerror (errcode)); else { @@ -519,9 +519,9 @@ } } -@@ -750,6 +929,11 @@ svr4_current_sos (void) - discard_cleanups (old_chain); - } +@@ -798,6 +977,11 @@ svr4_current_sos (void) + if (head == NULL) + return svr4_default_sos (); + if (debug_solib) + fprintf_unfiltered (gdb_stdlog, @@ -531,7 +531,7 @@ return head; } -@@ -826,7 +1010,7 @@ svr4_fetch_objfile_link_map (struct objf +@@ -874,7 +1058,7 @@ svr4_fetch_objfile_link_map (struct objf /* On some systems, the only way to recognize the link map entry for the main executable file is by looking at its name. Return non-zero iff SONAME matches one of the known main executable names. */ @@ -540,7 +540,7 @@ static int match_main (char *soname) { -@@ -840,6 +1024,7 @@ match_main (char *soname) +@@ -888,6 +1072,7 @@ match_main (char *soname) return (0); } @@ -548,7 +548,7 @@ /* Return 1 if PC lies in the dynamic symbol resolution code of the SVR4 run time loader. */ -@@ -939,6 +1124,11 @@ enable_break (void) +@@ -987,6 +1172,11 @@ enable_break (void) /* Find the .interp section; if not found, warn the user and drop into the old breakpoint at symbol code. */ interp_sect = bfd_get_section_by_name (exec_bfd, ".interp"); @@ -560,7 +560,7 @@ if (interp_sect) { unsigned int interp_sect_size; -@@ -972,6 +1162,9 @@ enable_break (void) +@@ -1025,6 +1215,9 @@ enable_break (void) if (tmp_fd >= 0) tmp_bfd = bfd_fopen (tmp_pathname, gnutarget, FOPEN_RB, tmp_fd); @@ -570,7 +570,7 @@ if (tmp_bfd == NULL) goto bkpt_at_symbol; -@@ -1052,6 +1245,9 @@ enable_break (void) +@@ -1111,6 +1304,9 @@ enable_break (void) if (sym_addr != 0) { create_solib_event_breakpoint (load_addr + sym_addr); @@ -580,7 +580,7 @@ return 1; } -@@ -1311,6 +1507,8 @@ svr4_solib_create_inferior_hook (void) +@@ -1372,6 +1568,8 @@ svr4_solib_create_inferior_hook (void) while (stop_signal != TARGET_SIGNAL_TRAP); stop_soon = NO_STOP_QUIETLY; #endif /* defined(_SCO_DS) */ @@ -589,7 +589,7 @@ } static void -@@ -1493,6 +1691,75 @@ svr4_lp64_fetch_link_map_offsets (void) +@@ -1558,6 +1756,75 @@ svr4_lp64_fetch_link_map_offsets (void) return lmp; } @@ -665,7 +665,7 @@ static struct target_so_ops svr4_so_ops; -@@ -1515,4 +1782,8 @@ _initialize_svr4_solib (void) +@@ -1580,4 +1847,8 @@ _initialize_svr4_solib (void) /* FIXME: Don't do this here. *_gdbarch_init() should set so_ops. */ current_target_so_ops = &svr4_so_ops; @@ -674,10 +674,10 @@ + "Display the inferior's linkmap."); + } -Index: gdb-6.5/gdb/varobj.c +Index: gdb-6.6/gdb/varobj.c =================================================================== ---- gdb-6.5.orig/gdb/varobj.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/varobj.c 2006-07-11 02:56:57.000000000 -0300 +--- gdb-6.6.orig/gdb/varobj.c ++++ gdb-6.6/gdb/varobj.c @@ -870,6 +870,62 @@ varobj_list (struct varobj ***varlist) return rootcount; } @@ -741,10 +741,10 @@ /* Update the values for a variable and its children. This is a two-pronged attack. First, re-parse the value for the root's expression to see if it's changed. Then go all the way -Index: gdb-6.5/gdb/solist.h +Index: gdb-6.6/gdb/solist.h =================================================================== ---- gdb-6.5.orig/gdb/solist.h 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/solist.h 2006-07-11 02:47:11.000000000 -0300 +--- gdb-6.6.orig/gdb/solist.h ++++ gdb-6.6/gdb/solist.h @@ -62,6 +62,8 @@ struct so_list bfd *abfd; char symbols_loaded; /* flag: symbols read in yet? */ @@ -777,10 +777,10 @@ +/* Controls the printing of debugging output. */ +extern int debug_solib; #endif -Index: gdb-6.5/gdb/varobj.h +Index: gdb-6.6/gdb/varobj.h =================================================================== ---- gdb-6.5.orig/gdb/varobj.h 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/varobj.h 2006-07-11 02:47:11.000000000 -0300 +--- gdb-6.6.orig/gdb/varobj.h ++++ gdb-6.6/gdb/varobj.h @@ -99,4 +99,6 @@ extern int varobj_list (struct varobj ** extern int varobj_update (struct varobj **varp, struct varobj ***changelist); @@ -788,10 +788,10 @@ +extern void varobj_refresh(void); + #endif /* VAROBJ_H */ -Index: gdb-6.5/gdb/symfile.c +Index: gdb-6.6/gdb/symfile.c =================================================================== ---- gdb-6.5.orig/gdb/symfile.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/symfile.c 2006-07-11 02:56:57.000000000 -0300 +--- gdb-6.6.orig/gdb/symfile.c ++++ gdb-6.6/gdb/symfile.c @@ -49,6 +49,7 @@ #include "readline/readline.h" #include "gdb_assert.h" @@ -799,8 +799,8 @@ +#include "varobj.h" #include "observer.h" #include "exec.h" - -@@ -658,7 +659,7 @@ syms_from_objfile (struct objfile *objfi + #include "parser-defs.h" +@@ -659,7 +660,7 @@ syms_from_objfile (struct objfile *objfi /* Now either addrs or offsets is non-zero. */ @@ -809,7 +809,7 @@ { /* We will modify the main symbol table, make sure that all its users will be cleaned up if an error occurs during symbol reading. */ -@@ -686,7 +687,7 @@ syms_from_objfile (struct objfile *objfi +@@ -687,7 +688,7 @@ syms_from_objfile (struct objfile *objfi We no longer warn if the lowest section is not a text segment (as happens for the PA64 port. */ @@ -818,7 +818,7 @@ { asection *lower_sect; asection *sect; -@@ -855,17 +856,21 @@ new_symfile_objfile (struct objfile *obj +@@ -856,17 +857,21 @@ new_symfile_objfile (struct objfile *obj /* If this is the main symbol file we have to clean up all users of the old main symbol file. Otherwise it is sufficient to fixup all the breakpoints that may have been redefined by this symbol file. */ @@ -842,7 +842,7 @@ /* We're done reading the symbol file; finish off complaints. */ clear_complaints (&symfile_complaints, 0, verbo); -@@ -908,7 +913,7 @@ symbol_file_add_with_addrs_or_offsets (b +@@ -909,7 +914,7 @@ symbol_file_add_with_addrs_or_offsets (b interactively wiping out any existing symbols. */ if ((have_full_symbols () || have_partial_symbols ()) @@ -851,7 +851,7 @@ && from_tty && !query ("Load new symbol table from \"%s\"? ", name)) error (_("Not confirmed.")); -@@ -1089,6 +1094,10 @@ symbol_file_clear (int from_tty) +@@ -1090,6 +1095,10 @@ symbol_file_clear (int from_tty) symfile_objfile->name) : !query (_("Discard symbol table? ")))) error (_("Not confirmed.")); @@ -862,7 +862,7 @@ free_all_objfiles (); /* solib descriptors may have handles to objfiles. Since their -@@ -2154,6 +2163,8 @@ reread_symbols (void) +@@ -2204,6 +2213,8 @@ reread_symbols (void) /* Discard cleanups as symbol reading was successful. */ discard_cleanups (old_cleanups); @@ -871,19 +871,19 @@ /* If the mtime has changed between the time we set new_modtime and now, we *want* this to be out of date, so don't call stat again now. */ -@@ -2529,6 +2540,7 @@ clear_symtab_users (void) +@@ -2579,6 +2590,7 @@ clear_symtab_users (void) clear_pc_function_cache (); if (deprecated_target_new_objfile_hook) deprecated_target_new_objfile_hook (NULL); + varobj_refresh (); - } - static void -Index: gdb-6.5/gdb/breakpoint.c + /* Clear globals which might have pointed into a removed objfile. + FIXME: It's not clear which of these are supposed to persist +Index: gdb-6.6/gdb/breakpoint.c =================================================================== ---- gdb-6.5.orig/gdb/breakpoint.c 2006-07-11 02:47:11.000000000 -0300 -+++ gdb-6.5/gdb/breakpoint.c 2006-07-11 02:56:59.000000000 -0300 -@@ -782,15 +782,15 @@ insert_watchpoints_for_new_thread (ptid_ +--- gdb-6.6.orig/gdb/breakpoint.c ++++ gdb-6.6/gdb/breakpoint.c +@@ -781,15 +781,15 @@ insert_watchpoints_for_new_thread (ptid_ struct value *v = b->owner->val_chain; /* Look at each value on the value chain. */ @@ -902,7 +902,7 @@ /* We only watch structs and arrays if user asked for it explicitly, never if they just happen to -@@ -802,8 +802,8 @@ insert_watchpoints_for_new_thread (ptid_ +@@ -801,8 +801,8 @@ insert_watchpoints_for_new_thread (ptid_ CORE_ADDR addr; int len, type; @@ -913,7 +913,7 @@ type = hw_write; if (b->owner->type == bp_read_watchpoint) type = hw_read; -@@ -2680,12 +2680,12 @@ mark_triggered_watchpoints (CORE_ADDR st +@@ -2682,12 +2682,12 @@ mark_triggered_watchpoints (CORE_ADDR st || b->type == bp_read_watchpoint || b->type == bp_access_watchpoint) { @@ -929,7 +929,7 @@ if (v == b->val_chain || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT -@@ -2693,11 +2693,11 @@ mark_triggered_watchpoints (CORE_ADDR st +@@ -2695,11 +2695,11 @@ mark_triggered_watchpoints (CORE_ADDR st { CORE_ADDR vaddr; @@ -943,7 +943,7 @@ b->watchpoint_triggered = 1; } } -@@ -2867,12 +2867,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2869,12 +2869,12 @@ bpstat_stop_status (CORE_ADDR bp_addr, p bs->stop = 0; continue; } @@ -959,7 +959,7 @@ if (v == b->val_chain || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT -@@ -2880,11 +2880,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p +@@ -2882,11 +2882,11 @@ bpstat_stop_status (CORE_ADDR bp_addr, p { CORE_ADDR vaddr; @@ -973,15 +973,15 @@ must_check_value = 1; } } -@@ -3931,6 +3931,7 @@ describe_other_breakpoints (CORE_ADDR pc - b->number, +@@ -3937,6 +3937,7 @@ describe_other_breakpoints (CORE_ADDR pc + printf_filtered ("%s%s ", ((b->enable_state == bp_disabled || b->enable_state == bp_shlib_disabled || + b->enable_state == bp_startup_disabled || b->enable_state == bp_call_disabled) - ? " (disabled)" + ? " (disabled)" : b->enable_state == bp_permanent -@@ -4609,6 +4610,62 @@ re_enable_breakpoints_in_shlibs (void) +@@ -4615,6 +4616,62 @@ re_enable_breakpoints_in_shlibs (void) } } @@ -1044,7 +1044,7 @@ static void solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname, char *cond_string, enum bptype bp_kind) -@@ -6955,6 +7012,7 @@ delete_breakpoint (struct breakpoint *bp +@@ -6961,6 +7018,7 @@ delete_breakpoint (struct breakpoint *bp && !b->loc->duplicate && b->enable_state != bp_disabled && b->enable_state != bp_shlib_disabled @@ -1052,7 +1052,7 @@ && !b->pending && b->enable_state != bp_call_disabled) { -@@ -7170,7 +7228,8 @@ breakpoint_re_set_one (void *bint) +@@ -7176,7 +7234,8 @@ breakpoint_re_set_one (void *bint) break; save_enable = b->enable_state; @@ -1062,10 +1062,10 @@ b->enable_state = bp_disabled; else /* If resetting a shlib-disabled breakpoint, we don't want to -Index: gdb-6.5/gdb/solib.c +Index: gdb-6.6/gdb/solib.c =================================================================== ---- gdb-6.5.orig/gdb/solib.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/solib.c 2006-07-11 02:47:11.000000000 -0300 +--- gdb-6.6.orig/gdb/solib.c ++++ gdb-6.6/gdb/solib.c @@ -72,6 +72,8 @@ solib_ops (struct gdbarch *gdbarch) /* external data declarations */ @@ -1084,7 +1084,7 @@ /* GLOBAL FUNCTION -@@ -372,7 +376,6 @@ free_so (struct so_list *so) +@@ -376,7 +380,6 @@ free_so (struct so_list *so) xfree (so); } @@ -1092,7 +1092,7 @@ /* Return address of first so_list entry in master shared object list. */ struct so_list * master_so_list (void) -@@ -380,7 +383,6 @@ master_so_list (void) +@@ -384,7 +387,6 @@ master_so_list (void) return so_list_head; } @@ -1100,7 +1100,7 @@ /* A small stub to get us past the arg-passing pinhole of catch_errors. */ static int -@@ -392,15 +394,40 @@ symbol_add_stub (void *arg) +@@ -396,15 +398,40 @@ symbol_add_stub (void *arg) /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) { @@ -1144,7 +1144,7 @@ free_section_addr_info (sap); return (1); -@@ -523,6 +550,10 @@ update_solib_list (int from_tty, struct +@@ -532,6 +559,10 @@ update_solib_list (int from_tty, struct the inferior's current list. */ while (i) { @@ -1155,7 +1155,7 @@ if (! strcmp (gdb->so_original_name, i->so_original_name)) break; -@@ -576,28 +607,7 @@ update_solib_list (int from_tty, struct +@@ -585,28 +616,7 @@ update_solib_list (int from_tty, struct /* Fill in the rest of each of the `struct so_list' nodes. */ for (i = inferior; i; i = i->next) { @@ -1185,8 +1185,8 @@ /* Notify any observer that the shared object has been loaded now that we've added it to GDB's tables. */ -@@ -606,6 +616,41 @@ update_solib_list (int from_tty, struct - } +@@ -702,6 +712,41 @@ solib_add (char *pattern, int from_tty, + } } +void @@ -1225,9 +1225,9 @@ + } +} - /* GLOBAL FUNCTION + /* -@@ -978,4 +1023,12 @@ This takes precedence over the environme +@@ -1006,4 +1051,12 @@ This takes precedence over the environme reload_shared_libraries, show_solib_search_path, &setlist, &showlist); @@ -1240,10 +1240,10 @@ + NULL, NULL, + &setdebuglist, &showdebuglist); } -Index: gdb-6.5/gdb/elfread.c +Index: gdb-6.6/gdb/elfread.c =================================================================== ---- gdb-6.5.orig/gdb/elfread.c 2006-07-11 02:47:06.000000000 -0300 -+++ gdb-6.5/gdb/elfread.c 2006-07-11 02:47:11.000000000 -0300 +--- gdb-6.6.orig/gdb/elfread.c ++++ gdb-6.6/gdb/elfread.c @@ -556,7 +556,7 @@ elf_symfile_read (struct objfile *objfil /* If we are reinitializing, or if we have never loaded syms yet, set table to empty. MAINLINE is cleared so that *_read_psymtab gdb-6.3-security-errata-20050610.patch: Makefile.in | 2 cli/cli-cmds.c | 22 ++++++++ main.c | 4 - testsuite/gdb.base/gdbinit.exp | 98 ++++++++++++++++++++++++++++++++++++++ testsuite/gdb.base/gdbinit.sample | 1 5 files changed, 123 insertions(+), 4 deletions(-) Index: gdb-6.3-security-errata-20050610.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-security-errata-20050610.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-security-errata-20050610.patch 11 Jul 2006 06:33:02 -0000 1.3 +++ gdb-6.3-security-errata-20050610.patch 21 Jan 2007 01:53:01 -0000 1.4 @@ -16,10 +16,10 @@ (source_command): Update documentation. Check permissions if FROM_TTY is -1. -Index: gdb-6.5/gdb/cli/cli-cmds.c +Index: gdb-6.6/gdb/cli/cli-cmds.c =================================================================== ---- gdb-6.5.orig/gdb/cli/cli-cmds.c 2006-07-11 03:22:45.000000000 -0300 -+++ gdb-6.5/gdb/cli/cli-cmds.c 2006-07-11 03:26:36.000000000 -0300 +--- gdb-6.6.orig/gdb/cli/cli-cmds.c ++++ gdb-6.6/gdb/cli/cli-cmds.c @@ -38,6 +38,7 @@ #include "objfiles.h" #include "source.h" @@ -28,7 +28,7 @@ #include "ui-out.h" -@@ -453,12 +454,31 @@ source_command (char *args, int from_tty +@@ -461,12 +462,31 @@ source_script (char *file, int from_tty) if (fd == -1) { @@ -61,10 +61,10 @@ stream = fdopen (fd, FOPEN_RT); script_from_file (stream, file); -Index: gdb-6.5/gdb/testsuite/gdb.base/gdbinit.exp +Index: gdb-6.6/gdb/testsuite/gdb.base/gdbinit.exp =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.5/gdb/testsuite/gdb.base/gdbinit.exp 2006-07-11 03:22:48.000000000 -0300 +--- /dev/null ++++ gdb-6.6/gdb/testsuite/gdb.base/gdbinit.exp @@ -0,0 +1,98 @@ +# Copyright 2005 +# Free Software Foundation, Inc. @@ -164,39 +164,39 @@ +} + +remote_exec build "rm .gdbinit" -Index: gdb-6.5/gdb/testsuite/gdb.base/gdbinit.sample +Index: gdb-6.6/gdb/testsuite/gdb.base/gdbinit.sample =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.5/gdb/testsuite/gdb.base/gdbinit.sample 2006-07-11 03:22:48.000000000 -0300 +--- /dev/null ++++ gdb-6.6/gdb/testsuite/gdb.base/gdbinit.sample @@ -0,0 +1 @@ +echo "\nin gdbinit" -Index: gdb-6.5/gdb/main.c +Index: gdb-6.6/gdb/main.c =================================================================== ---- gdb-6.5.orig/gdb/main.c 2006-07-11 03:22:45.000000000 -0300 -+++ gdb-6.5/gdb/main.c 2006-07-11 03:27:03.000000000 -0300 -@@ -643,7 +643,7 @@ extern int gdbtk_test (char *); +--- gdb-6.6.orig/gdb/main.c ++++ gdb-6.6/gdb/main.c +@@ -644,7 +644,7 @@ extern int gdbtk_test (char *); if (!inhibit_gdbinit) { -- catch_command_errors (source_command, homeinit, 0, RETURN_MASK_ALL); -+ catch_command_errors (source_command, homeinit, -1, RETURN_MASK_ALL); +- catch_command_errors (source_script, homeinit, 0, RETURN_MASK_ALL); ++ catch_command_errors (source_script, homeinit, -1, RETURN_MASK_ALL); } /* Do stats; no need to do them elsewhere since we'll only -@@ -730,7 +730,7 @@ extern int gdbtk_test (char *); +@@ -722,7 +722,7 @@ extern int gdbtk_test (char *); || memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat))) if (!inhibit_gdbinit) { -- catch_command_errors (source_command, gdbinit, 0, RETURN_MASK_ALL); -+ catch_command_errors (source_command, gdbinit, -1, RETURN_MASK_ALL); +- catch_command_errors (source_script, gdbinit, 0, RETURN_MASK_ALL); ++ catch_command_errors (source_script, gdbinit, -1, RETURN_MASK_ALL); } for (i = 0; i < ncmd; i++) -Index: gdb-6.5/gdb/Makefile.in +Index: gdb-6.6/gdb/Makefile.in =================================================================== ---- gdb-6.5.orig/gdb/Makefile.in 2006-07-11 03:22:45.000000000 -0300 -+++ gdb-6.5/gdb/Makefile.in 2006-07-11 03:22:48.000000000 -0300 -@@ -2859,7 +2859,7 @@ cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(d +--- gdb-6.6.orig/gdb/Makefile.in ++++ gdb-6.6/gdb/Makefile.in +@@ -2927,7 +2927,7 @@ cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(d $(expression_h) $(frame_h) $(value_h) $(language_h) $(filenames_h) \ $(objfiles_h) $(source_h) $(disasm_h) $(ui_out_h) $(top_h) \ $(cli_decode_h) $(cli_script_h) $(cli_setshow_h) $(cli_cmds_h) \ gdb-6.3-test-sepcrc-20050402.patch: sepdebug.exp | 37 +++++++++++++++++++++++++++++++++++++ sepdebug2.c | 5 +++++ 2 files changed, 42 insertions(+) Index: gdb-6.3-test-sepcrc-20050402.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-test-sepcrc-20050402.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-test-sepcrc-20050402.patch 2 Apr 2005 22:38:09 -0000 1.1 +++ gdb-6.3-test-sepcrc-20050402.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -1,13 +1,8 @@ -Index: ./gdb/testsuite/ChangeLog -2005-04-02 Andrew Cagney - - * gdb.base/sepdebug.exp: Check that things fail when the debug - info is corrupt. - * gdb.base/sepdebug2.c (main): New file. - ---- ../gdb-6.3/./gdb/testsuite/gdb.base/sepdebug.exp 2004-01-14 10:09:37.000000000 -0500 -+++ ./gdb/testsuite/gdb.base/sepdebug.exp 2005-04-02 15:57:17.000000000 -0500 -@@ -985,3 +985,35 @@ +Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp +=================================================================== +--- gdb-6.6.orig/gdb/testsuite/gdb.base/sepdebug.exp 2006-10-17 22:17:45.000000000 +0200 ++++ gdb-6.6/gdb/testsuite/gdb.base/sepdebug.exp 2007-01-20 18:39:26.000000000 +0100 +@@ -953,3 +953,40 @@ if [istarget "*-*-vxworks*"] { send_gdb "set args main\n" gdb_expect -re ".*$gdb_prompt $" {} } @@ -33,6 +28,11 @@ +} +remote_exec build "cp $corrupt_debug_file ${existing_binfile}.debug" + ++gdb_exit ++gdb_start ++gdb_reinitialize_dir $srcdir/$subdir ++gdb_load ${binfile} ++ +set test "A corrupt debug file gets a warning" +gdb_test_multiple "file $existing_binfile" "$test" { + -re "warning:.*mismatch.*" { @@ -43,8 +43,10 @@ + exp_continue + } +} ---- /dev/null 2005-04-02 11:30:32.604931736 -0500 -+++ ./gdb/testsuite/gdb.base/sepdebug2.c 2005-04-02 13:09:31.000000000 -0500 +Index: gdb-6.6/gdb/testsuite/gdb.base/sepdebug2.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.6/gdb/testsuite/gdb.base/sepdebug2.c 2007-01-20 18:41:35.000000000 +0100 @@ -0,0 +1,5 @@ +int +main (int argc, char *argv[], char *envp[]) gdb-6.3-warnings-20050317.patch: configure | 2 ++ configure.ac | 2 ++ cp-valprint.c | 4 ++-- doublest.c | 13 ++++--------- dwarf2expr.c | 2 ++ dwarf2read.c | 14 +++++++++----- f-exp.y | 2 ++ gdb-events.c | 2 ++ linespec.c | 2 +- macroscope.c | 9 ++++----- mi/mi-cmd-break.c | 4 ++-- mi/mi-cmd-disas.c | 2 +- mi/mi-cmd-env.c | 4 ++-- mi/mi-getopt.c | 2 +- mi/mi-main.c | 4 ++-- p-valprint.c | 4 ++-- remote-fileio.c | 26 +++++++++++++------------- remote.c | 4 ++-- s390-tdep.c | 6 ++++++ source.c | 4 ++-- stabsread.c | 3 ++- symfile.c | 2 ++ target.c | 3 +++ testsuite/gdb.base/move-dir.h | 2 +- testsuite/gdb.base/sigrepeat.c | 1 + tui/tui-layout.c | 8 ++++---- varobj.c | 16 ++++++---------- 27 files changed, 82 insertions(+), 65 deletions(-) Index: gdb-6.3-warnings-20050317.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-warnings-20050317.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-warnings-20050317.patch 11 Jul 2006 18:04:22 -0000 1.3 +++ gdb-6.3-warnings-20050317.patch 21 Jan 2007 01:53:01 -0000 1.4 @@ -1,8 +1,8 @@ -Index: gdb-6.5/gdb/configure +Index: gdb-6.6/gdb/configure =================================================================== ---- gdb-6.5.orig/gdb/configure 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/configure 2006-07-11 15:01:23.000000000 -0300 -@@ -20125,7 +20125,8 @@ fi +--- gdb-6.6.orig/gdb/configure ++++ gdb-6.6/gdb/configure +@@ -20991,7 +20991,8 @@ fi # gdb/doc/gdbint.texinfo. build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \ -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \ @@ -12,10 +12,10 @@ # GCC supports -Wuninitialized only with -O or -On, n != 0. if test x${CFLAGS+set} = xset; then -Index: gdb-6.5/gdb/mi/mi-cmd-env.c +Index: gdb-6.6/gdb/mi/mi-cmd-env.c =================================================================== ---- gdb-6.5.orig/gdb/mi/mi-cmd-env.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/mi/mi-cmd-env.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/mi/mi-cmd-env.c ++++ gdb-6.6/gdb/mi/mi-cmd-env.c @@ -126,7 +126,7 @@ mi_cmd_env_path (char *command, char **a static struct mi_opt opts[] = { @@ -34,10 +34,10 @@ }; dont_repeat (); -Index: gdb-6.5/gdb/mi/mi-getopt.c +Index: gdb-6.6/gdb/mi/mi-getopt.c =================================================================== ---- gdb-6.5.orig/gdb/mi/mi-getopt.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/mi/mi-getopt.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/mi/mi-getopt.c ++++ gdb-6.6/gdb/mi/mi-getopt.c @@ -82,7 +82,7 @@ mi_valid_noargs (const char *prefix, int char *optarg; static struct mi_opt opts[] = @@ -47,10 +47,10 @@ }; if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1) -Index: gdb-6.5/gdb/mi/mi-cmd-break.c +Index: gdb-6.6/gdb/mi/mi-cmd-break.c =================================================================== ---- gdb-6.5.orig/gdb/mi/mi-cmd-break.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/mi/mi-cmd-break.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/mi/mi-cmd-break.c ++++ gdb-6.6/gdb/mi/mi-cmd-break.c @@ -90,7 +90,7 @@ mi_cmd_break_insert (char *command, char {"c", CONDITION_OPT, 1}, {"i", IGNORE_COUNT_OPT, 1}, @@ -69,10 +69,10 @@ }; /* Parse arguments. */ -Index: gdb-6.5/gdb/mi/mi-cmd-disas.c +Index: gdb-6.6/gdb/mi/mi-cmd-disas.c =================================================================== ---- gdb-6.5.orig/gdb/mi/mi-cmd-disas.c 2006-07-11 15:01:22.000000000 -0300 -+++ gdb-6.5/gdb/mi/mi-cmd-disas.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/mi/mi-cmd-disas.c ++++ gdb-6.6/gdb/mi/mi-cmd-disas.c @@ -84,7 +84,7 @@ mi_cmd_disassemble (char *command, char {"n", NUM_OPT, 1}, {"s", START_OPT, 1}, @@ -82,10 +82,10 @@ }; /* Get the options with their arguments. Keep track of what we -Index: gdb-6.5/gdb/mi/mi-main.c +Index: gdb-6.6/gdb/mi/mi-main.c =================================================================== ---- gdb-6.5.orig/gdb/mi/mi-main.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/mi/mi-main.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/mi/mi-main.c ++++ gdb-6.6/gdb/mi/mi-main.c @@ -773,7 +773,7 @@ mi_cmd_data_read_memory (char *command, static struct mi_opt opts[] = { @@ -95,7 +95,7 @@ }; while (1) -@@ -975,7 +975,7 @@ mi_cmd_data_write_memory (char *command, +@@ -973,7 +973,7 @@ mi_cmd_data_write_memory (char *command, static struct mi_opt opts[] = { {"o", OFFSET_OPT, 1}, @@ -104,10 +104,10 @@ }; while (1) -Index: gdb-6.5/gdb/p-valprint.c +Index: gdb-6.6/gdb/p-valprint.c =================================================================== ---- gdb-6.5.orig/gdb/p-valprint.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/p-valprint.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/p-valprint.c ++++ gdb-6.6/gdb/p-valprint.c @@ -753,7 +753,7 @@ pascal_object_print_value_fields (struct int dont_print_statmem) { @@ -126,10 +126,10 @@ struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); int i, n_baseclasses = TYPE_N_BASECLASSES (type); -Index: gdb-6.5/gdb/cp-valprint.c +Index: gdb-6.6/gdb/cp-valprint.c =================================================================== ---- gdb-6.5.orig/gdb/cp-valprint.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/cp-valprint.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/cp-valprint.c ++++ gdb-6.6/gdb/cp-valprint.c @@ -265,7 +265,7 @@ cp_print_value_fields (struct type *type struct type **dont_print_vb,int dont_print_statmem) { @@ -148,10 +148,10 @@ struct type **last_dont_print = (struct type **) obstack_next_free (&dont_print_vb_obstack); int i, n_baseclasses = TYPE_N_BASECLASSES (type); -Index: gdb-6.5/gdb/tui/tui-layout.c +Index: gdb-6.6/gdb/tui/tui-layout.c =================================================================== ---- gdb-6.5.orig/gdb/tui/tui-layout.c 2006-07-11 15:01:22.000000000 -0300 -+++ gdb-6.5/gdb/tui/tui-layout.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/tui/tui-layout.c ++++ gdb-6.6/gdb/tui/tui-layout.c @@ -755,7 +755,7 @@ show_source_disasm_command (void) if (TUI_DISASM_WIN == NULL) { @@ -188,20 +188,20 @@ LOCATOR_WIN, 2 /* 1 */ , tui_term_width (), -Index: gdb-6.5/gdb/testsuite/gdb.base/move-dir.h +Index: gdb-6.6/gdb/testsuite/gdb.base/move-dir.h =================================================================== ---- gdb-6.5.orig/gdb/testsuite/gdb.base/move-dir.h 2006-07-11 15:01:23.000000000 -0300 -+++ gdb-6.5/gdb/testsuite/gdb.base/move-dir.h 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/testsuite/gdb.base/move-dir.h ++++ gdb-6.6/gdb/testsuite/gdb.base/move-dir.h @@ -1,4 +1,4 @@ -#include +#include void other() { const char* ostring = "other"; -Index: gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c +Index: gdb-6.6/gdb/testsuite/gdb.base/sigrepeat.c =================================================================== ---- gdb-6.5.orig/gdb/testsuite/gdb.base/sigrepeat.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/testsuite/gdb.base/sigrepeat.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/testsuite/gdb.base/sigrepeat.c ++++ gdb-6.6/gdb/testsuite/gdb.base/sigrepeat.c @@ -22,6 +22,7 @@ #include #include @@ -210,10 +210,10 @@ #include static volatile int done[2]; -Index: gdb-6.5/gdb/s390-tdep.c +Index: gdb-6.6/gdb/s390-tdep.c =================================================================== ---- gdb-6.5.orig/gdb/s390-tdep.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/s390-tdep.c 2006-07-11 15:02:37.000000000 -0300 +--- gdb-6.6.orig/gdb/s390-tdep.c ++++ gdb-6.6/gdb/s390-tdep.c @@ -2277,6 +2277,9 @@ s390_return_value (struct gdbarch *gdbar case RETURN_VALUE_STRUCT_CONVENTION: error (_("Cannot set function return value.")); @@ -234,27 +234,27 @@ } } -Index: gdb-6.5/gdb/remote.c +Index: gdb-6.6/gdb/remote.c =================================================================== ---- gdb-6.5.orig/gdb/remote.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/remote.c 2006-07-11 15:02:32.000000000 -0300 -@@ -2523,10 +2523,10 @@ cleanup_sigint_signal_handler (void *dum +--- gdb-6.6.orig/gdb/remote.c ++++ gdb-6.6/gdb/remote.c +@@ -2843,10 +2843,10 @@ cleanup_sigint_signal_handler (void *dum { signal (SIGINT, handle_sigint); if (sigint_remote_twice_token) -- delete_async_signal_handler ((struct async_signal_handler **) +- delete_async_signal_handler ((struct async_signal_handler **) + delete_async_signal_handler ((struct async_signal_handler **) (char *) &sigint_remote_twice_token); if (sigint_remote_token) -- delete_async_signal_handler ((struct async_signal_handler **) +- delete_async_signal_handler ((struct async_signal_handler **) + delete_async_signal_handler ((struct async_signal_handler **) (char *) &sigint_remote_token); } -Index: gdb-6.5/gdb/f-exp.y +Index: gdb-6.6/gdb/f-exp.y =================================================================== ---- gdb-6.5.orig/gdb/f-exp.y 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/f-exp.y 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/f-exp.y ++++ gdb-6.6/gdb/f-exp.y @@ -567,6 +567,8 @@ ptype : typebase case tp_function: follow_type = lookup_function_type (follow_type); @@ -264,11 +264,11 @@ } $$ = follow_type; } -Index: gdb-6.5/gdb/remote-fileio.c +Index: gdb-6.6/gdb/remote-fileio.c =================================================================== ---- gdb-6.5.orig/gdb/remote-fileio.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/remote-fileio.c 2006-07-11 15:01:23.000000000 -0300 -@@ -1317,19 +1317,19 @@ static struct { +--- gdb-6.6.orig/gdb/remote-fileio.c ++++ gdb-6.6/gdb/remote-fileio.c +@@ -1332,19 +1332,19 @@ static struct { char *name; void (*func)(char *); } remote_fio_func_map[] = { @@ -301,11 +301,11 @@ }; static int -Index: gdb-6.5/gdb/source.c +Index: gdb-6.6/gdb/source.c =================================================================== ---- gdb-6.5.orig/gdb/source.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/source.c 2006-07-11 15:01:23.000000000 -0300 -@@ -160,7 +160,7 @@ get_current_source_symtab_and_line (void +--- gdb-6.6.orig/gdb/source.c ++++ gdb-6.6/gdb/source.c +@@ -172,7 +172,7 @@ get_current_source_symtab_and_line (void void set_default_source_symtab_and_line (void) { @@ -314,7 +314,7 @@ if (!have_full_symbols () && !have_partial_symbols ()) error (_("No symbol table is loaded. Use the \"file\" command.")); -@@ -1314,7 +1314,7 @@ static void +@@ -1428,7 +1428,7 @@ static void line_info (char *arg, int from_tty) { struct symtabs_and_lines sals; @@ -323,11 +323,11 @@ CORE_ADDR start_pc, end_pc; int i; -Index: gdb-6.5/gdb/symfile.c +Index: gdb-6.6/gdb/symfile.c =================================================================== ---- gdb-6.5.orig/gdb/symfile.c 2006-07-11 15:01:22.000000000 -0300 -+++ gdb-6.5/gdb/symfile.c 2006-07-11 15:02:34.000000000 -0300 -@@ -2877,6 +2877,8 @@ add_psymbol_with_dem_name_to_list (char +--- gdb-6.6.orig/gdb/symfile.c ++++ gdb-6.6/gdb/symfile.c +@@ -2933,6 +2933,8 @@ add_psymbol_with_dem_name_to_list (char deprecated_bcache (buf, dem_namelength + 1, objfile->psymbol_cache); break; /* FIXME What should be done for the default case? Ignoring for now. */ @@ -336,10 +336,10 @@ } /* val and coreaddr are mutually exclusive, one of them *will* be zero */ -Index: gdb-6.5/gdb/linespec.c +Index: gdb-6.6/gdb/linespec.c =================================================================== ---- gdb-6.5.orig/gdb/linespec.c 2006-07-11 15:01:23.000000000 -0300 -+++ gdb-6.5/gdb/linespec.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/linespec.c ++++ gdb-6.6/gdb/linespec.c @@ -1631,7 +1631,7 @@ static struct symtabs_and_lines find_method (int funfirstline, char ***canonical, char *saved_arg, char *copy, struct type *t, struct symbol *sym_class) @@ -349,10 +349,10 @@ struct symbol *sym = 0; int i1; /* Counter for the symbol array. */ struct symbol **sym_arr = alloca (total_number_of_methods (t) -Index: gdb-6.5/gdb/macroscope.c +Index: gdb-6.6/gdb/macroscope.c =================================================================== ---- gdb-6.5.orig/gdb/macroscope.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/macroscope.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/macroscope.c ++++ gdb-6.6/gdb/macroscope.c @@ -33,7 +33,7 @@ struct macro_scope * sal_macro_scope (struct symtab_and_line sal) @@ -390,23 +390,13 @@ struct macro_scope *ms; /* If there's a selected frame, use its PC. */ -Index: gdb-6.5/gdb/target.c +Index: gdb-6.6/gdb/target.c =================================================================== ---- gdb-6.5.orig/gdb/target.c 2006-07-11 15:01:22.000000000 -0300 -+++ gdb-6.5/gdb/target.c 2006-07-11 15:02:33.000000000 -0300 -@@ -1142,6 +1142,9 @@ target_xfer_memory (CORE_ADDR memaddr, g - if (!write) - return EIO; - break; -+ -+ default: -+ break; - } - - while (reg_len > 0) -@@ -1220,6 +1223,9 @@ target_xfer_memory_partial (CORE_ADDR me - return -1; - } +--- gdb-6.6.orig/gdb/target.c ++++ gdb-6.6/gdb/target.c +@@ -1045,6 +1045,9 @@ memory_xfer_partial (struct target_ops * + if (writebuf != NULL) + error (_("Writing to flash memory forbidden in this context")); break; + + default: @@ -414,10 +404,10 @@ } if (region->attrib.cache) -Index: gdb-6.5/gdb/gdb-events.c +Index: gdb-6.6/gdb/gdb-events.c =================================================================== ---- gdb-6.5.orig/gdb/gdb-events.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/gdb-events.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/gdb-events.c ++++ gdb-6.6/gdb/gdb-events.c @@ -321,6 +321,8 @@ gdb_events_deliver (struct gdb_events *v case architecture_changed: vector->architecture_changed (); @@ -427,11 +417,11 @@ } delivering_events = event->next; xfree (event); -Index: gdb-6.5/gdb/dwarf2read.c +Index: gdb-6.6/gdb/dwarf2read.c =================================================================== ---- gdb-6.5.orig/gdb/dwarf2read.c 2006-07-11 15:01:23.000000000 -0300 -+++ gdb-6.5/gdb/dwarf2read.c 2006-07-11 15:02:33.000000000 -0300 -@@ -9179,6 +9179,7 @@ dwarf_decode_macros (struct line_header +--- gdb-6.6.orig/gdb/dwarf2read.c ++++ gdb-6.6/gdb/dwarf2read.c +@@ -9307,6 +9307,7 @@ dwarf_decode_macros (struct line_header for (;;) { enum dwarf_macinfo_record_type macinfo_type; @@ -439,7 +429,7 @@ /* Do we at least have room for a macinfo type byte? */ if (mac_ptr >= mac_end) -@@ -9190,13 +9191,16 @@ dwarf_decode_macros (struct line_header +@@ -9318,13 +9319,16 @@ dwarf_decode_macros (struct line_header macinfo_type = read_1_byte (abfd, mac_ptr); mac_ptr++; @@ -461,10 +451,10 @@ case DW_MACINFO_define: case DW_MACINFO_undef: { -Index: gdb-6.5/gdb/stabsread.c +Index: gdb-6.6/gdb/stabsread.c =================================================================== ---- gdb-6.5.orig/gdb/stabsread.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/stabsread.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/stabsread.c ++++ gdb-6.6/gdb/stabsread.c @@ -1794,7 +1794,8 @@ again: struct type *domain = read_type (pp, objfile); struct type *return_type; @@ -475,10 +465,10 @@ if (**pp != ',') /* Invalid member type data format. */ -Index: gdb-6.5/gdb/dwarf2expr.c +Index: gdb-6.6/gdb/dwarf2expr.c =================================================================== ---- gdb-6.5.orig/gdb/dwarf2expr.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/dwarf2expr.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/dwarf2expr.c ++++ gdb-6.6/gdb/dwarf2expr.c @@ -559,6 +559,8 @@ execute_stack_op (struct dwarf_expr_cont op_ptr = read_uleb128 (op_ptr, op_end, ®); result += reg; @@ -488,10 +478,10 @@ } break; -Index: gdb-6.5/gdb/varobj.c +Index: gdb-6.6/gdb/varobj.c =================================================================== ---- gdb-6.5.orig/gdb/varobj.c 2006-07-11 15:01:22.000000000 -0300 -+++ gdb-6.5/gdb/varobj.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/varobj.c ++++ gdb-6.6/gdb/varobj.c @@ -325,10 +325,9 @@ struct language_specific /* Array of known source language routines. */ @@ -544,11 +534,11 @@ /* Set ourselves as our root */ var->root->rootvar = var; -Index: gdb-6.5/gdb/configure.ac +Index: gdb-6.6/gdb/configure.ac =================================================================== ---- gdb-6.5.orig/gdb/configure.ac 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/configure.ac 2006-07-11 15:01:23.000000000 -0300 -@@ -1133,7 +1133,8 @@ fi +--- gdb-6.6.orig/gdb/configure.ac ++++ gdb-6.6/gdb/configure.ac +@@ -1112,7 +1112,8 @@ fi # gdb/doc/gdbint.texinfo. build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \ -Wformat -Wparentheses -Wpointer-arith -Wformat-nonliteral \ @@ -558,10 +548,10 @@ # GCC supports -Wuninitialized only with -O or -On, n != 0. if test x${CFLAGS+set} = xset; then -Index: gdb-6.5/gdb/doublest.c +Index: gdb-6.6/gdb/doublest.c =================================================================== ---- gdb-6.5.orig/gdb/doublest.c 2006-07-11 15:00:08.000000000 -0300 -+++ gdb-6.5/gdb/doublest.c 2006-07-11 15:01:23.000000000 -0300 +--- gdb-6.6.orig/gdb/doublest.c ++++ gdb-6.6/gdb/doublest.c @@ -94,15 +94,10 @@ get_field (const bfd_byte *data, enum fl { result |= (unsigned long)*(data + cur_byte) << cur_bitshift; gdb-6.5-bz109921-DW_AT_decl_file-fix.patch: buildsym.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- buildsym.h | 4 ++ dwarf2read.c | 23 ++++++++++++--- symtab.c | 8 ++++- symtab.h | 14 +++++++++ 5 files changed, 126 insertions(+), 9 deletions(-) Index: gdb-6.5-bz109921-DW_AT_decl_file-fix.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz109921-DW_AT_decl_file-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-bz109921-DW_AT_decl_file-fix.patch 9 Jan 2007 11:35:44 -0000 1.1 +++ gdb-6.5-bz109921-DW_AT_decl_file-fix.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -21,9 +21,11 @@ (SYMBOL_FILE_INDEX, SYMBOL_FILE_SYMTAB): New macros. ---- ./gdb/buildsym.c 2005-12-17 22:33:59.000000000 +0000 -+++ ./gdb/buildsym.c 2007-01-09 08:30:38.000000000 +0000 -@@ -535,7 +535,7 @@ make_blockvector (struct objfile *objfil +Index: gdb-6.6/gdb/buildsym.c +=================================================================== +--- gdb-6.6.orig/gdb/buildsym.c 2006-08-25 18:32:32.000000000 +0200 ++++ gdb-6.6/gdb/buildsym.c 2007-01-20 13:59:48.000000000 +0100 +@@ -540,7 +540,7 @@ make_blockvector (struct objfile *objfil the directory in which it resides (or NULL if not known). */ void @@ -32,7 +34,7 @@ { struct subfile *subfile; -@@ -547,6 +547,17 @@ start_subfile (char *name, char *dirname +@@ -552,6 +552,17 @@ start_subfile (char *name, char *dirname if (FILENAME_CMP (subfile->name, name) == 0) { current_subfile = subfile; @@ -50,7 +52,7 @@ return; } } -@@ -562,6 +573,7 @@ start_subfile (char *name, char *dirname +@@ -567,6 +578,7 @@ start_subfile (char *name, char *dirname current_subfile = subfile; /* Save its name and compilation directory name */ @@ -58,7 +60,7 @@ subfile->name = (name == NULL) ? NULL : savestring (name, strlen (name)); subfile->dirname = (dirname == NULL) ? NULL : savestring (dirname, strlen (dirname)); -@@ -617,6 +629,13 @@ start_subfile (char *name, char *dirname +@@ -622,6 +634,13 @@ start_subfile (char *name, char *dirname } } @@ -72,7 +74,7 @@ /* For stabs readers, the first N_SO symbol is assumed to be the source file name, and the subfile struct is initialized using that assumption. If another N_SO symbol is later seen, immediately -@@ -816,9 +835,12 @@ end_symtab (CORE_ADDR end_addr, struct o +@@ -821,9 +840,12 @@ end_symtab (CORE_ADDR end_addr, struct o { struct symtab *symtab = NULL; struct blockvector *blockvector; @@ -86,7 +88,7 @@ /* Finish the lexical context of the last function in the file; pop the context stack. */ -@@ -916,6 +938,18 @@ end_symtab (CORE_ADDR end_addr, struct o +@@ -921,6 +943,18 @@ end_symtab (CORE_ADDR end_addr, struct o #endif PROCESS_LINENUMBER_HOOK (); /* Needed for xcoff. */ @@ -105,7 +107,7 @@ /* Now create the symtab objects proper, one for each subfile. */ /* (The main file is the last one on the chain.) */ -@@ -976,6 +1010,16 @@ end_symtab (CORE_ADDR end_addr, struct o +@@ -981,6 +1015,16 @@ end_symtab (CORE_ADDR end_addr, struct o strlen (subfile->dirname) + 1); strcpy (symtab->dirname, subfile->dirname); } @@ -122,7 +124,7 @@ else { symtab->dirname = NULL; -@@ -1004,6 +1048,13 @@ end_symtab (CORE_ADDR end_addr, struct o +@@ -1009,6 +1053,13 @@ end_symtab (CORE_ADDR end_addr, struct o but the main file. */ symtab->primary = 0; @@ -136,7 +138,7 @@ } if (subfile->name != NULL) { -@@ -1032,9 +1083,40 @@ end_symtab (CORE_ADDR end_addr, struct o +@@ -1037,9 +1088,40 @@ end_symtab (CORE_ADDR end_addr, struct o symtab->primary = 1; } @@ -177,8 +179,10 @@ return symtab; } ---- ./gdb/buildsym.h 2005-12-17 22:33:59.000000000 +0000 -+++ ./gdb/buildsym.h 2007-01-09 08:17:17.000000000 +0000 +Index: gdb-6.6/gdb/buildsym.h +=================================================================== +--- gdb-6.6.orig/gdb/buildsym.h 2005-12-17 23:33:59.000000000 +0100 ++++ gdb-6.6/gdb/buildsym.h 2007-01-20 13:59:48.000000000 +0100 @@ -63,6 +63,7 @@ EXTERN CORE_ADDR last_source_start_addr; struct subfile { @@ -197,9 +201,11 @@ extern void start_subfile (char *name, char *dirname); extern void patch_subfile_names (struct subfile *subfile, char *name); ---- ./gdb/dwarf2read.c 2007-01-08 22:28:24.000000000 +0000 -+++ ./gdb/dwarf2read.c 2007-01-09 08:58:41.000000000 +0000 -@@ -847,7 +847,7 @@ static struct line_header *(dwarf_decode +Index: gdb-6.6/gdb/dwarf2read.c +=================================================================== +--- gdb-6.6.orig/gdb/dwarf2read.c 2007-01-20 06:43:04.000000000 +0100 ++++ gdb-6.6/gdb/dwarf2read.c 2007-01-20 14:00:12.000000000 +0100 +@@ -853,7 +853,7 @@ static struct line_header *(dwarf_decode static void dwarf_decode_lines (struct line_header *, char *, bfd *, struct dwarf2_cu *, struct partial_symtab *); @@ -208,7 +214,7 @@ static struct symbol *new_symbol (struct die_info *, struct type *, struct dwarf2_cu *); -@@ -6321,6 +6321,7 @@ add_file_name (struct line_header *lh, +@@ -6428,6 +6428,7 @@ add_file_name (struct line_header *lh, unsigned int length) { struct file_entry *fe; @@ -216,7 +222,7 @@ /* Grow the array if necessary. */ if (lh->file_names_size == 0) -@@ -6343,6 +6344,10 @@ add_file_name (struct line_header *lh, +@@ -6450,6 +6451,10 @@ add_file_name (struct line_header *lh, fe->mod_time = mod_time; fe->length = length; fe->included_p = 0; @@ -227,7 +233,7 @@ } -@@ -6560,7 +6565,7 @@ dwarf_decode_lines (struct line_header * +@@ -6668,7 +6673,7 @@ dwarf_decode_lines (struct line_header * if (fe->dir_index) dir = lh->include_dirs[fe->dir_index - 1]; @@ -236,16 +242,16 @@ } /* Decode the table. */ -@@ -6661,7 +6666,7 @@ dwarf_decode_lines (struct line_header * - dir = lh->include_dirs[fe->dir_index - 1]; - +@@ -6785,7 +6790,7 @@ dwarf_decode_lines (struct line_header * if (!decode_for_pst_p) -- dwarf2_start_subfile (fe->name, dir, comp_dir); -+ dwarf2_start_subfile (fe->name, dir, comp_dir, file); + { + last_subfile = current_subfile; +- dwarf2_start_subfile (fe->name, dir, comp_dir); ++ dwarf2_start_subfile (fe->name, dir, comp_dir, file); + } } break; - case DW_LNS_set_column: -@@ -6764,7 +6769,8 @@ dwarf_decode_lines (struct line_header * +@@ -6889,7 +6894,8 @@ dwarf_decode_lines (struct line_header * subfile's name. */ static void @@ -255,7 +261,7 @@ { char *fullname; -@@ -6783,7 +6789,7 @@ dwarf2_start_subfile (char *filename, ch +@@ -6908,7 +6914,7 @@ dwarf2_start_subfile (char *filename, ch else fullname = filename; @@ -264,7 +270,7 @@ if (fullname != filename) xfree (fullname); -@@ -6892,6 +6898,13 @@ new_symbol (struct die_info *die, struct +@@ -7017,6 +7023,13 @@ new_symbol (struct die_info *die, struct { SYMBOL_LINE (sym) = DW_UNSND (attr); } @@ -278,8 +284,10 @@ switch (die->tag) { case DW_TAG_label: ---- ./gdb/symtab.c 2007-01-08 22:28:25.000000000 +0000 -+++ ./gdb/symtab.c 2007-01-09 08:19:05.000000000 +0000 +Index: gdb-6.6/gdb/symtab.c +=================================================================== +--- gdb-6.6.orig/gdb/symtab.c 2007-01-20 13:59:25.000000000 +0100 ++++ gdb-6.6/gdb/symtab.c 2007-01-20 13:59:48.000000000 +0100 @@ -1129,6 +1129,10 @@ lookup_symbol (const char *name, const s if (needtofreename) xfree (demangled_name); @@ -309,8 +317,10 @@ psr->symbol = sym; psr->msymbol = NULL; psr->next = NULL; ---- ./gdb/symtab.h 2007-01-08 22:28:25.000000000 +0000 -+++ ./gdb/symtab.h 2007-01-09 08:44:02.000000000 +0000 +Index: gdb-6.6/gdb/symtab.h +=================================================================== +--- gdb-6.6.orig/gdb/symtab.h 2007-01-20 06:43:00.000000000 +0100 ++++ gdb-6.6/gdb/symtab.h 2007-01-20 13:59:48.000000000 +0100 @@ -623,6 +623,18 @@ struct symbol ENUM_BITFIELD(address_class) aclass : 6; gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch: target.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletion(-) Index: gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 21 Sep 2006 13:07:53 -0000 1.1 +++ gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -4,10 +4,7 @@ currently for trivia nonthreaded helloworld with no debug info up to -ggdb2 you will get: (gdb) p errno - Cannot access memory at address 0x8 - -* with -ggdb3 "errno" gets resolved as _macro_ and the resulting - "(*__errno_location ())" expression is always fine. + [some error] * with -ggdb2 and less "errno" in fact does not exist anywhere as it was compiled to "(*__errno_location ())" and the macro definition is not present. @@ -16,554 +13,25 @@ (%gs on i386) is not setup and it will result in: Cannot access memory at address 0x8 -IMO the right way is to ignore TLS symbols for inferiors without activated -threading. Patch attached. - -Also attached suggestion patch how to deal with the most common "errno" symbol +Attached suggestion patch how to deal with the most common "errno" symbol for the most common under-ggdb3 compiled programs. 2006-08-25 Jan Kratochvil - * dwarf2loc.c (dwarf_expr_tls_address): Code moved out to - `target_translate_tls_address'. - * target.c (target_translate_tls_address): Moved here. - Provided warnings for TLS `errno' on non-TLS targets. - * target.h (target_translate_tls_address): Moved here. - * eval.c (evaluate_subexp_standard): New `UNOP_MEMVAL_TLS'. - * expprint.c (print_subexp_standard): New `UNOP_MEMVAL_TLS'. - (op_name_standard): New `UNOP_MEMVAL_TLS'. - (dump_subexp_body_standard): New `UNOP_MEMVAL_TLS'. - * expression.h (enum exp_opcode): New `UNOP_MEMVAL_TLS'. - (union exp_element): New `objfile' type. - * parse.c (write_exp_elt_objfile): New `objfile' setter. - (write_exp_msymbol): Support new `UNOP_MEMVAL_TLS'. - (msym_text_tls_symbol_type, msym_data_tls_symbol_type, - msym_unknown_tls_symbol_type, build_parse): New TLS types. - (operator_length_standard): New `UNOP_MEMVAL_TLS'. - * parser-defs.h (write_exp_elt_objfile): New `objfile' setter. - * valops.c (value_at_lazy): Pass control to `value_at_lazy_tls'. - (value_at_lazy_tls): Provide TLS `struct objfile *' storage. - (value_fetch_lazy): Resolve TLS `struct objfile *' storage. - (value_assign): Resolve TLS `struct objfile *' storage. - * value.c (struct value, allocate_value, value_tls_objfile, - set_value_tls_objfile): Provide TLS `struct objfile *' storage. - * value.h (value_tls_objfile, set_value_tls_objfile, - value_at_lazy_tls): Provide TLS `struct objfile *' storage. - * Makefile.in: Updated dependencies. + * target.c (target_translate_tls_address): Provided warnings for TLS + `errno' on non-TLS targets. -2006-08-25 Jan Kratochvil - * gdb.threads/tls-nodebug.c: New file, test TLS symbols on gcc -s. - * gdb.threads/tls-nodebug.exp: New file, test TLS symbols on gcc -s. - - -Index: gdb-6.5/gdb/Makefile.in -=================================================================== -RCS file: /cvs/src/src/gdb/Makefile.in,v -retrieving revision 1.840 -diff -u -p -r1.840 gdb-6.5/gdb/Makefile.in ---- gdb-6.5.org/gdb/Makefile.in 22 Aug 2006 19:08:31 -0000 1.840 -+++ gdb-6.5/gdb/Makefile.in 25 Aug 2006 19:55:35 -0000 -@@ -1977,7 +1977,7 @@ exec.o: exec.c $(defs_h) $(frame_h) $(in - $(xcoffsolib_h) $(observer_h) - expprint.o: expprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ - $(value_h) $(language_h) $(parser_defs_h) $(user_regs_h) $(target_h) \ -- $(gdb_string_h) $(block_h) -+ $(gdb_string_h) $(block_h) $(objfiles_h) - fbsd-nat.o: fbsd-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(regcache_h) \ - $(regset_h) $(gdb_assert_h) $(gdb_string_h) $(elf_bfd_h) \ - $(fbsd_nat_h) -@@ -2422,7 +2422,7 @@ osabi.o: osabi.c $(defs_h) $(gdb_assert_ - parse.o: parse.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \ - $(frame_h) $(expression_h) $(value_h) $(command_h) $(language_h) \ - $(f_lang_h) $(parser_defs_h) $(gdbcmd_h) $(symfile_h) $(inferior_h) \ -- $(doublest_h) $(gdb_assert_h) $(block_h) $(source_h) -+ $(doublest_h) $(gdb_assert_h) $(block_h) $(source_h) $(objfiles_h) - p-exp.o: p-exp.c $(defs_h) $(gdb_string_h) $(expression_h) $(value_h) \ - $(parser_defs_h) $(language_h) $(p_lang_h) $(bfd_h) $(symfile_h) \ - $(objfiles_h) $(block_h) -@@ -2750,7 +2750,8 @@ symtab.o: symtab.c $(defs_h) $(symtab_h) - $(gdb_stat_h) $(cp_abi_h) $(observer_h) - target.o: target.c $(defs_h) $(gdb_string_h) $(target_h) $(gdbcmd_h) \ - $(symtab_h) $(inferior_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ -- $(gdb_wait_h) $(dcache_h) $(regcache_h) $(gdb_assert_h) $(gdbcore_h) -+ $(gdb_wait_h) $(dcache_h) $(regcache_h) $(gdb_assert_h) $(gdbcore_h) \ -+ $(exceptions_h) - thread.o: thread.c $(defs_h) $(symtab_h) $(frame_h) $(inferior_h) \ - $(environ_h) $(value_h) $(target_h) $(gdbthread_h) $(exceptions_h) \ - $(command_h) $(gdbcmd_h) $(regcache_h) $(gdb_h) $(gdb_string_h) \ -Index: gdb-6.5/gdb/dwarf2loc.c +Index: gdb-6.6/gdb/target.c =================================================================== -RCS file: /cvs/src/src/gdb/dwarf2loc.c,v -retrieving revision 1.33 -diff -u -p -r1.33 gdb-6.5/gdb/dwarf2loc.c ---- gdb-6.5.org/gdb/dwarf2loc.c 17 Dec 2005 22:33:59 -0000 1.33 -+++ gdb-6.5/gdb/dwarf2loc.c 25 Aug 2006 19:55:36 -0000 -@@ -189,86 +189,8 @@ static CORE_ADDR - dwarf_expr_tls_address (void *baton, CORE_ADDR offset) - { - struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton; -- volatile CORE_ADDR addr = 0; - -- if (target_get_thread_local_address_p () -- && gdbarch_fetch_tls_load_module_address_p (current_gdbarch)) -- { -- ptid_t ptid = inferior_ptid; -- struct objfile *objfile = debaton->objfile; -- volatile struct gdb_exception ex; -- -- TRY_CATCH (ex, RETURN_MASK_ALL) -- { -- CORE_ADDR lm_addr; -- -- /* Fetch the load module address for this objfile. */ -- lm_addr = gdbarch_fetch_tls_load_module_address (current_gdbarch, -- objfile); -- /* If it's 0, throw the appropriate exception. */ -- if (lm_addr == 0) -- throw_error (TLS_LOAD_MODULE_NOT_FOUND_ERROR, -- _("TLS load module not found")); -- -- addr = target_get_thread_local_address (ptid, lm_addr, offset); -- } -- /* If an error occurred, print TLS related messages here. Otherwise, -- throw the error to some higher catcher. */ -- if (ex.reason < 0) -- { -- int objfile_is_library = (objfile->flags & OBJF_SHARED); -- -- switch (ex.error) -- { -- case TLS_NO_LIBRARY_SUPPORT_ERROR: -- error (_("Cannot find thread-local variables in this thread library.")); -- break; -- case TLS_LOAD_MODULE_NOT_FOUND_ERROR: -- if (objfile_is_library) -- error (_("Cannot find shared library `%s' in dynamic" -- " linker's load module list"), objfile->name); -- else -- error (_("Cannot find executable file `%s' in dynamic" -- " linker's load module list"), objfile->name); -- break; -- case TLS_NOT_ALLOCATED_YET_ERROR: -- if (objfile_is_library) -- error (_("The inferior has not yet allocated storage for" -- " thread-local variables in\n" -- "the shared library `%s'\n" -- "for %s"), -- objfile->name, target_pid_to_str (ptid)); -- else -- error (_("The inferior has not yet allocated storage for" -- " thread-local variables in\n" -- "the executable `%s'\n" -- "for %s"), -- objfile->name, target_pid_to_str (ptid)); -- break; -- case TLS_GENERIC_ERROR: -- if (objfile_is_library) -- error (_("Cannot find thread-local storage for %s, " -- "shared library %s:\n%s"), -- target_pid_to_str (ptid), -- objfile->name, ex.message); -- else -- error (_("Cannot find thread-local storage for %s, " -- "executable file %s:\n%s"), -- target_pid_to_str (ptid), -- objfile->name, ex.message); -- break; -- default: -- throw_exception (ex); -- break; -- } -- } -- } -- /* It wouldn't be wrong here to try a gdbarch method, too; finding -- TLS is an ABI-specific thing. But we don't do that yet. */ -- else +--- gdb-6.6.orig/gdb/target.c 2007-01-17 01:25:31.000000000 +0100 ++++ gdb-6.6/gdb/target.c 2007-01-20 06:31:36.000000000 +0100 +@@ -898,7 +898,18 @@ + /* It wouldn't be wrong here to try a gdbarch method, too; finding + TLS is an ABI-specific thing. But we don't do that yet. */ + else - error (_("Cannot find thread-local variables on this target")); -- -- return addr; -+ return target_translate_tls_address (debaton->objfile, offset); - } - - /* Evaluate a location description, starting at DATA and with length -Index: gdb-6.5/gdb/eval.c -=================================================================== -RCS file: /cvs/src/src/gdb/eval.c,v -retrieving revision 1.63 -diff -u -p -r1.63 gdb-6.5/gdb/eval.c ---- gdb-6.5.org/gdb/eval.c 25 Jul 2006 04:24:50 -0000 1.63 -+++ gdb-6.5/gdb/eval.c 25 Aug 2006 19:55:38 -0000 -@@ -2019,6 +2019,18 @@ evaluate_subexp_standard (struct type *e - return value_at_lazy (exp->elts[pc + 1].type, - value_as_address (arg1)); - -+ case UNOP_MEMVAL_TLS: -+ (*pos) += 3; -+ arg1 = evaluate_subexp (expect_type, exp, pos, noside); -+ if (noside == EVAL_SKIP) -+ goto nosideret; -+ if (noside == EVAL_AVOID_SIDE_EFFECTS) -+ return value_zero (exp->elts[pc + 2].type, lval_memory); -+ else -+ return value_at_lazy_tls (exp->elts[pc + 2].type, -+ value_as_address (arg1), -+ exp->elts[pc + 1].objfile); -+ - case UNOP_PREINCREMENT: - arg1 = evaluate_subexp (expect_type, exp, pos, noside); - if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS) -Index: gdb-6.5/gdb/expprint.c -=================================================================== -RCS file: /cvs/src/src/gdb/expprint.c,v -retrieving revision 1.24 -diff -u -p -r1.24 gdb-6.5/gdb/expprint.c ---- gdb-6.5.org/gdb/expprint.c 7 Aug 2006 03:30:54 -0000 1.24 -+++ gdb-6.5/gdb/expprint.c 25 Aug 2006 19:55:39 -0000 -@@ -31,6 +31,7 @@ - #include "target.h" - #include "gdb_string.h" - #include "block.h" -+#include "objfiles.h" - - #ifdef HAVE_CTYPE_H - #include -@@ -414,6 +415,33 @@ print_subexp_standard (struct expression - fputs_filtered (")", stream); - return; - -+ case UNOP_MEMVAL_TLS: -+ (*pos) += 3; -+ if ((int) prec > (int) PREC_PREFIX) -+ fputs_filtered ("(", stream); -+ if (TYPE_CODE (exp->elts[pc + 2].type) == TYPE_CODE_FUNC && -+ exp->elts[pc + 4].opcode == OP_LONG) -+ { -+ /* We have a minimal symbol fn, probably. It's encoded -+ as a UNOP_MEMVAL (function-type) of an OP_LONG (int, address). -+ Swallow the OP_LONG (including both its opcodes); ignore -+ its type; print the value in the type of the MEMVAL. */ -+ (*pos) += 4; -+ val = value_at_lazy (exp->elts[pc + 2].type, -+ (CORE_ADDR) exp->elts[pc + 6].longconst); -+ value_print (val, stream, 0, Val_no_prettyprint); -+ } -+ else -+ { -+ fputs_filtered ("{", stream); -+ type_print (exp->elts[pc + 2].type, "", stream, 0); -+ fputs_filtered ("} ", stream); -+ print_subexp (exp, pos, stream, PREC_PREFIX); -+ } -+ if ((int) prec > (int) PREC_PREFIX) -+ fputs_filtered (")", stream); -+ return; -+ - case BINOP_ASSIGN_MODIFY: - opcode = exp->elts[pc + 1].opcode; - (*pos) += 2; -@@ -694,6 +722,8 @@ op_name_standard (enum exp_opcode opcode - return "UNOP_CAST"; - case UNOP_MEMVAL: - return "UNOP_MEMVAL"; -+ case UNOP_MEMVAL_TLS: -+ return "UNOP_MEMVAL_TLS"; - case UNOP_NEG: - return "UNOP_NEG"; - case UNOP_LOGICAL_NOT: -@@ -999,6 +1029,16 @@ dump_subexp_body_standard (struct expres - fprintf_filtered (stream, ")"); - elt = dump_subexp (exp, stream, elt + 2); - break; -+ case UNOP_MEMVAL_TLS: -+ fprintf_filtered (stream, "TLS type @"); -+ gdb_print_host_address (exp->elts[elt + 1].type, stream); -+ fprintf_filtered (stream, " (__thread /* \"%s\" */ ", -+ (exp->elts[elt].objfile == NULL ? "(null)" -+ : exp->elts[elt].objfile->name)); -+ type_print (exp->elts[elt + 1].type, NULL, stream, 0); -+ fprintf_filtered (stream, ")"); -+ elt = dump_subexp (exp, stream, elt + 3); -+ break; - case OP_TYPE: - fprintf_filtered (stream, "Type @"); - gdb_print_host_address (exp->elts[elt].type, stream); -Index: gdb-6.5/gdb/expression.h -=================================================================== -RCS file: /cvs/src/src/gdb/expression.h,v -retrieving revision 1.18 -diff -u -p -r1.18 gdb-6.5/gdb/expression.h ---- gdb-6.5.org/gdb/expression.h 17 Dec 2005 22:33:59 -0000 1.18 -+++ gdb-6.5/gdb/expression.h 25 Aug 2006 19:55:40 -0000 -@@ -234,6 +234,13 @@ enum exp_opcode - following subexpression. */ - UNOP_MEMVAL, - -+ /* UNOP_MEMVAL_TLS is followed by a `struct objfile' pointer in the next -+ exp_element and a type pointer in the following exp_element. -+ With another UNOP_MEMVAL_TLS at the end, this makes four exp_elements. -+ It casts the contents of the word offsetted by the value of the -+ following subexpression from the TLS specified by `struct objfile'. */ -+ UNOP_MEMVAL_TLS, -+ - /* UNOP_... operate on one value from a following subexpression - and replace it with a result. They take no immediate arguments. */ - -@@ -360,6 +367,7 @@ union exp_element - struct type *type; - struct internalvar *internalvar; - struct block *block; -+ struct objfile *objfile; - }; - - struct expression -Index: gdb-6.5/gdb/parse.c -=================================================================== -RCS file: /cvs/src/src/gdb/parse.c,v -retrieving revision 1.53 -diff -u -p -r1.53 gdb-6.5/gdb/parse.c ---- gdb-6.5.org/gdb/parse.c 6 Jul 2006 14:00:48 -0000 1.53 -+++ gdb-6.5/gdb/parse.c 25 Aug 2006 19:55:41 -0000 -@@ -53,6 +53,7 @@ - #include "gdb_assert.h" - #include "block.h" - #include "source.h" -+#include "objfiles.h" - - /* Standard set of definitions for printing, dumping, prefixifying, - * and evaluating expressions. */ -@@ -219,6 +220,15 @@ write_exp_elt_block (struct block *b) - } - - void -+write_exp_elt_objfile (struct objfile *objfile) -+{ -+ union exp_element tmp; -+ memset (&tmp, 0, sizeof (union exp_element)); -+ tmp.objfile = objfile; -+ write_exp_elt (tmp); -+} -+ -+void - write_exp_elt_longcst (LONGEST expelt) - { - union exp_element tmp; -@@ -378,6 +388,9 @@ write_exp_bitstring (struct stoken str) - static struct type *msym_text_symbol_type; - static struct type *msym_data_symbol_type; - static struct type *msym_unknown_symbol_type; -+static struct type *msym_text_tls_symbol_type; -+static struct type *msym_data_tls_symbol_type; -+static struct type *msym_unknown_tls_symbol_type; - - void - write_exp_msymbol (struct minimal_symbol *msymbol, -@@ -385,6 +398,8 @@ write_exp_msymbol (struct minimal_symbol - struct type *data_symbol_type) - { - CORE_ADDR addr; -+ int tls = SYMBOL_BFD_SECTION (msymbol)->flags & SEC_THREAD_LOCAL; -+ enum exp_opcode opcode = tls ? UNOP_MEMVAL_TLS : UNOP_MEMVAL; - - write_exp_elt_opcode (OP_LONG); - /* Let's make the type big enough to hold a 64-bit address. */ -@@ -397,27 +412,49 @@ write_exp_msymbol (struct minimal_symbol - - write_exp_elt_opcode (OP_LONG); - -- write_exp_elt_opcode (UNOP_MEMVAL); -+ write_exp_elt_opcode (opcode); -+ -+ if (opcode == UNOP_MEMVAL_TLS) -+ { -+ bfd *bfd = SYMBOL_BFD_SECTION (msymbol)->owner; -+ struct objfile *ofp; -+ -+ ALL_OBJFILES (ofp) -+ if (ofp->obfd == bfd) -+ break; -+ write_exp_elt_objfile (ofp); -+ } -+ - switch (msymbol->type) - { - case mst_text: - case mst_file_text: - case mst_solib_trampoline: -- write_exp_elt_type (msym_text_symbol_type); -+ if (tls) -+ write_exp_elt_type (msym_text_tls_symbol_type); -+ else -+ write_exp_elt_type (msym_text_symbol_type); - break; - - case mst_data: - case mst_file_data: - case mst_bss: - case mst_file_bss: -- write_exp_elt_type (msym_data_symbol_type); -+ if (tls) -+ write_exp_elt_type (msym_data_tls_symbol_type); -+ else -+ write_exp_elt_type (msym_data_symbol_type); - break; - - default: -- write_exp_elt_type (msym_unknown_symbol_type); -+ if (tls) -+ write_exp_elt_type (msym_unknown_tls_symbol_type); -+ else -+ write_exp_elt_type (msym_unknown_symbol_type); - break; - } -- write_exp_elt_opcode (UNOP_MEMVAL); -+ -+ write_exp_elt_opcode (opcode); - } - - /* Recognize tokens that start with '$'. These include: -@@ -904,6 +941,11 @@ operator_length_standard (struct express - args = 1; - break; - -+ case UNOP_MEMVAL_TLS: -+ oplen = 4; -+ args = 1; -+ break; -+ - case UNOP_ABS: - case UNOP_CAP: - case UNOP_CHR: -@@ -1341,6 +1383,17 @@ build_parse (void) - init_type (TYPE_CODE_INT, 1, 0, - "", - NULL); -+ -+ msym_text_tls_symbol_type = -+ init_type (TYPE_CODE_FUNC, 1, 0, "", NULL); -+ TYPE_TARGET_TYPE (msym_text_tls_symbol_type) = builtin_type_int; -+ msym_data_tls_symbol_type = -+ init_type (TYPE_CODE_INT, TARGET_INT_BIT / HOST_CHAR_BIT, 0, -+ "", NULL); -+ msym_unknown_tls_symbol_type = -+ init_type (TYPE_CODE_INT, 1, 0, -+ "", -+ NULL); - } - - /* This function avoids direct calls to fprintf -Index: gdb-6.5/gdb/parser-defs.h -=================================================================== -RCS file: /cvs/src/src/gdb/parser-defs.h,v -retrieving revision 1.20 -diff -u -p -r1.20 gdb-6.5/gdb/parser-defs.h ---- gdb-6.5.org/gdb/parser-defs.h 17 Dec 2005 22:34:01 -0000 1.20 -+++ gdb-6.5/gdb/parser-defs.h 25 Aug 2006 19:55:41 -0000 -@@ -131,6 +131,8 @@ extern void write_exp_bitstring (struct - - extern void write_exp_elt_block (struct block *); - -+extern void write_exp_elt_objfile (struct objfile *objfile); -+ - extern void write_exp_msymbol (struct minimal_symbol *, - struct type *, struct type *); - ---- gdb-6.5.org/gdb/target.c 16 Aug 2006 18:31:03 -0000 1.124 -+++ gdb-6.5/gdb/target.c 25 Aug 2006 19:55:43 -0000 -@@ -40,6 +40,7 @@ - #include "gdb_assert.h" - #include "gdbcore.h" - #include "observer.h" -+#include "exceptions.h" - - static void target_info (char *, int); - -@@ -755,6 +756,103 @@ pop_target (void) - internal_error (__FILE__, __LINE__, _("failed internal consistency check")); - } - -+/* Using the objfile specified in BATON, find the address for the -+ current thread's thread-local storage with offset OFFSET. */ -+CORE_ADDR -+target_translate_tls_address (struct objfile *objfile, CORE_ADDR offset) -+{ -+ volatile CORE_ADDR addr = 0; -+ -+ if (target_get_thread_local_address_p () -+ && gdbarch_fetch_tls_load_module_address_p (current_gdbarch)) -+ { -+ ptid_t ptid = inferior_ptid; -+ volatile struct gdb_exception ex; -+ -+ TRY_CATCH (ex, RETURN_MASK_ALL) -+ { -+ CORE_ADDR lm_addr; -+ -+ /* Fetch the load module address for this objfile. */ -+ lm_addr = gdbarch_fetch_tls_load_module_address (current_gdbarch, -+ objfile); -+ /* If it's 0, throw the appropriate exception. */ -+ if (lm_addr == 0) -+ throw_error (TLS_LOAD_MODULE_NOT_FOUND_ERROR, -+ _("TLS load module not found")); -+ -+ addr = target_get_thread_local_address (ptid, lm_addr, offset); -+ } -+ /* If an error occurred, print TLS related messages here. Otherwise, -+ throw the error to some higher catcher. */ -+ if (ex.reason < 0) -+ { -+ int objfile_is_library = (objfile->flags & OBJF_SHARED); -+ -+ switch (ex.error) -+ { -+ case TLS_NO_LIBRARY_SUPPORT_ERROR: -+ error (_("Cannot find thread-local variables in this thread library.")); -+ break; -+ case TLS_LOAD_MODULE_NOT_FOUND_ERROR: -+ if (objfile_is_library) -+ error (_("Cannot find shared library `%s' in dynamic" -+ " linker's load module list"), objfile->name); -+ else -+ error (_("Cannot find executable file `%s' in dynamic" -+ " linker's load module list"), objfile->name); -+ break; -+ case TLS_NOT_ALLOCATED_YET_ERROR: -+ if (objfile_is_library) -+ error (_("The inferior has not yet allocated storage for" -+ " thread-local variables in\n" -+ "the shared library `%s'\n" -+ "for %s"), -+ objfile->name, target_pid_to_str (ptid)); -+ else -+ error (_("The inferior has not yet allocated storage for" -+ " thread-local variables in\n" -+ "the executable `%s'\n" -+ "for %s"), -+ objfile->name, target_pid_to_str (ptid)); -+ break; -+ case TLS_GENERIC_ERROR: -+ if (objfile_is_library) -+ error (_("Cannot find thread-local storage for %s, " -+ "shared library %s:\n%s"), -+ target_pid_to_str (ptid), -+ objfile->name, ex.message); -+ else -+ error (_("Cannot find thread-local storage for %s, " -+ "executable file %s:\n%s"), -+ target_pid_to_str (ptid), -+ objfile->name, ex.message); -+ break; -+ default: -+ throw_exception (ex); -+ break; -+ } -+ } -+ } -+ /* It wouldn't be wrong here to try a gdbarch method, too; finding -+ TLS is an ABI-specific thing. But we don't do that yet. */ -+ else + { + struct minimal_symbol *msymbol; + @@ -576,250 +44,6 @@ + " compile the program with `gcc -ggdb3' or `gcc -pthread'.")); + error (_("Cannot find thread-local variables on this target")); + } -+ -+ return addr; -+} -+ - #undef MIN - #define MIN(A, B) (((A) <= (B)) ? (A) : (B)) - -Index: gdb-6.5/gdb/target.h -=================================================================== -RCS file: /cvs/src/src/gdb/target.h,v -retrieving revision 1.87 -diff -u -p -r1.87 gdb-6.5/gdb/target.h ---- gdb-6.5.org/gdb/target.h 15 Aug 2006 18:46:25 -0000 1.87 -+++ gdb-6.5/gdb/target.h 25 Aug 2006 19:55:44 -0000 -@@ -1131,6 +1131,9 @@ extern void target_preopen (int); - - extern void pop_target (void); - -+extern CORE_ADDR target_translate_tls_address (struct objfile *objfile, -+ CORE_ADDR offset); -+ - /* Struct section_table maps address ranges to file sections. It is - mostly used with BFD files, but can be used without (e.g. for handling - raw disks, or files not in formats handled by BFD). */ -Index: gdb-6.5/gdb/valops.c -=================================================================== -RCS file: /cvs/src/src/gdb/valops.c,v -retrieving revision 1.164 -diff -u -p -r1.164 gdb-6.5/gdb/valops.c ---- gdb-6.5.org/gdb/valops.c 13 Jul 2006 04:31:42 -0000 1.164 -+++ gdb-6.5/gdb/valops.c 25 Aug 2006 19:55:46 -0000 -@@ -501,7 +501,8 @@ value_at (struct type *type, CORE_ADDR a - /* Return a lazy value with type TYPE located at ADDR (cf. value_at). */ - - struct value * --value_at_lazy (struct type *type, CORE_ADDR addr) -+value_at_lazy_tls (struct type *type, CORE_ADDR addr, -+ struct objfile *tls_objfile) - { - struct value *val; - -@@ -512,11 +513,19 @@ value_at_lazy (struct type *type, CORE_A - - VALUE_LVAL (val) = lval_memory; - VALUE_ADDRESS (val) = addr; -+ if (tls_objfile != NULL) -+ set_value_tls_objfile (val, tls_objfile); - set_value_lazy (val, 1); - - return val; - } - -+struct value * -+value_at_lazy (struct type *type, CORE_ADDR addr) -+{ -+ return value_at_lazy_tls (type, addr, NULL); -+} -+ - /* Called only from the value_contents and value_contents_all() - macros, if the current data for a variable needs to be loaded into - value_contents(VAL). Fetches the data from the user's process, and -@@ -538,7 +547,17 @@ value_fetch_lazy (struct value *val) - - struct type *type = value_type (val); - if (length) -- read_memory (addr, value_contents_all_raw (val), length); -+ { -+ struct objfile *tls_objfile = value_tls_objfile (val); -+ -+ if (tls_objfile != NULL) -+ { -+ /* `target_translate_tls_address' uses `inferior_ptid'. */ -+ addr = target_translate_tls_address (tls_objfile, addr); -+ } -+ -+ read_memory (addr, value_contents_all_raw (val), length); -+ } - - set_value_lazy (val, 0); - return 0; -@@ -596,6 +615,7 @@ value_assign (struct value *toval, struc - CORE_ADDR changed_addr; - int changed_len; - gdb_byte buffer[sizeof (LONGEST)]; -+ struct objfile *tls_objfile = value_tls_objfile (toval); - if (value_bitsize (toval)) - { -@@ -624,6 +644,13 @@ value_assign (struct value *toval, struc - dest_buffer = value_contents (fromval); - } - -+ if (tls_objfile != NULL) -+ { -+ /* `target_translate_tls_address' uses `inferior_ptid'. */ -+ changed_addr = target_translate_tls_address (tls_objfile, -+ changed_addr); -+ } -+ - write_memory (changed_addr, dest_buffer, changed_len); - if (deprecated_memory_changed_hook) - deprecated_memory_changed_hook (changed_addr, changed_len); -Index: gdb-6.5/gdb/value.c -=================================================================== -RCS file: /cvs/src/src/gdb/value.c,v -retrieving revision 1.36 -diff -u -p -r1.36 gdb-6.5/gdb/value.c ---- gdb-6.5.org/gdb/value.c 31 Mar 2006 10:36:18 -0000 1.36 -+++ gdb-6.5/gdb/value.c 25 Aug 2006 19:55:47 -0000 -@@ -158,6 +158,9 @@ struct value - actually exist in the program. */ - char optimized_out; - -+ /* TLS owner. */ -+ struct objfile *tls_objfile; -+ - /* Actual contents of the value. For use of this value; setting it - uses the stuff above. Not valid if lazy is nonzero. Target - byte-order. We force it to be aligned properly for any possible -@@ -230,6 +233,7 @@ allocate_value (struct type *type) - VALUE_REGNUM (val) = -1; - val->lazy = 0; - val->optimized_out = 0; -+ val->tls_objfile = NULL; - val->embedded_offset = 0; - val->pointed_to_offset = 0; - val->modifiable = 1; -@@ -344,6 +348,18 @@ set_value_lazy (struct value *value, int - value->lazy = val; + return addr; } - -+struct objfile * -+value_tls_objfile (struct value *value) -+{ -+ return value->tls_objfile; -+} -+ -+void -+set_value_tls_objfile (struct value *value, struct objfile *tls_objfile) -+{ -+ value->tls_objfile = tls_objfile; -+} -+ - const gdb_byte * - value_contents (struct value *value) - { -Index: gdb-6.5/gdb/value.h -=================================================================== -RCS file: /cvs/src/src/gdb/value.h,v -retrieving revision 1.92 -diff -u -p -r1.92 gdb-6.5/gdb/value.h ---- gdb-6.5.org/gdb/value.h 13 Jul 2006 04:31:42 -0000 1.92 -+++ gdb-6.5/gdb/value.h 25 Aug 2006 19:55:48 -0000 -@@ -154,6 +154,10 @@ extern void set_value_embedded_offset (s - extern int value_lazy (struct value *); - extern void set_value_lazy (struct value *value, int val); - -+extern struct objfile *value_tls_objfile (struct value *value); -+extern void set_value_tls_objfile (struct value *value, -+ struct objfile *tls_objfile); -+ - /* value_contents() and value_contents_raw() both return the address - of the gdb buffer used to hold a copy of the contents of the lval. - value_contents() is used when the contents of the buffer are needed -@@ -277,6 +281,8 @@ extern struct value *value_from_double ( - extern struct value *value_from_string (char *string); - - extern struct value *value_at (struct type *type, CORE_ADDR addr); -+extern struct value *value_at_lazy_tls (struct type *type, CORE_ADDR addr, -+ struct objfile *tls_objfile); - extern struct value *value_at_lazy (struct type *type, CORE_ADDR addr); - - extern struct value *value_from_register (struct type *type, int regnum, -Index: gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.c -=================================================================== -RCS file: gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.c -diff -N gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.c ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.c 25 Aug 2006 19:55:48 -0000 -@@ -0,0 +1,8 @@ -+/* Test accessing TLS based variable without any debug info compiled. */ -+ -+__thread int thread_local = 42; -+ -+int main(void) -+{ -+ return 0; -+} -Index: gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.exp -=================================================================== -RCS file: gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.exp -diff -N gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.exp ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gdb-6.5/gdb/testsuite/gdb.threads/tls-nodebug.exp 25 Aug 2006 19:55:49 -0000 -@@ -0,0 +1,52 @@ -+# tls.exp -- Expect script to test thread-local storage without debuginfo -+# Copyright (C) 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 -+ -+set testfile tls-nodebug -+set srcfile ${testfile}.c -+set binfile ${objdir}/${subdir}/${testfile} -+ -+if [istarget "*-*-linux"] then { -+ set target_cflags "-D_MIT_POSIX_THREADS" -+} else { -+ set target_cflags "" -+} -+ -+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $options] != "" } { -+ return -1 -+} -+ -+gdb_exit -+gdb_start -+gdb_reinitialize_dir $srcdir/$subdir -+ -+gdb_load ${binfile} -+if ![runto_main] then { -+ fail "Can't run to main" -+ return 0 -+} -+ -+# Formerly: Cannot access memory at address 0x0 -+gdb_test "p thread_local" "= 42" "thread local storage" -+ -+# Done! -+# -+gdb_exit -+ -+return 0 gdb-6.5-bz190810-gdbserver-arch-advice.patch: remote.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) Index: gdb-6.5-bz190810-gdbserver-arch-advice.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz190810-gdbserver-arch-advice.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-bz190810-gdbserver-arch-advice.patch 1 Oct 2006 19:21:15 -0000 1.1 +++ gdb-6.5-bz190810-gdbserver-arch-advice.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -7,9 +7,11 @@ (remote_async_wait): Likewise. ---- gdb-6.5/gdb/remote.c.orig 2006-10-01 08:01:17.000000000 -0400 -+++ gdb-6.5/gdb/remote.c 2006-10-01 08:03:18.000000000 -0400 -@@ -2789,8 +2789,13 @@ +Index: gdb-6.6/gdb/remote.c +=================================================================== +--- gdb-6.6.orig/gdb/remote.c 2007-01-20 06:43:04.000000000 +0100 ++++ gdb-6.6/gdb/remote.c 2007-01-20 06:55:50.000000000 +0100 +@@ -3111,8 +3111,13 @@ Packet: '%s'\n"), reg->regnum, regs); } @@ -17,14 +19,14 @@ + target. gdbserver(1) is not aware of the `set architecture' + name itself as it is not using libbfd. */ if (*p++ != ';') -- error (_("Remote register badly formatted: %s\nhere: %s"), +- error (_("Remote register badly formatted: %s\nhere: %s"), + error (_("Remote register badly formatted: %s\nhere: %s" + "\nTry to load the executable by `file' first," + "\nyou may also check `set/show architecture'."), buf, p); } } -@@ -2983,8 +2988,13 @@ +@@ -3307,8 +3312,13 @@ Packet: '%s'\n"), regcache_raw_supply (current_regcache, reg->regnum, regs); } gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch: minsyms.c | 5 +++++ 1 files changed, 5 insertions(+) Index: gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch 23 Dec 2006 21:32:21 -0000 1.1 +++ gdb-6.5-bz218379-ppc-solib-trampoline-fix.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -1,12 +1,14 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379 ---- gdb-6.5-depatched/gdb/minsyms.c 2006-12-17 16:10:53.000000000 -0500 -+++ gdb-6.5/gdb/minsyms.c 2006-12-17 16:51:21.000000000 -0500 -@@ -505,6 +505,11 @@ - don't fill the bfd_section member, so don't - throw away symbols on those platforms. */ - && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL +Index: gdb-6.6/gdb/minsyms.c +=================================================================== +--- gdb-6.6.orig/gdb/minsyms.c 2007-01-20 13:53:48.000000000 +0100 ++++ gdb-6.6/gdb/minsyms.c 2007-01-20 13:58:47.000000000 +0100 +@@ -490,6 +490,11 @@ lookup_minimal_symbol_by_pc_section (COR + don't fill the bfd_section member, so don't + throw away symbols on those platforms. */ + && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL + /* Don't ignore symbols for solib trampolines. + Limit its sideeffects - only for non-0 sized trampolines. + Red Hat Bug 200533 with its regression Bug 218379. */ @@ -14,4 +16,4 @@ + || MSYMBOL_SIZE (&msymbol[hi])) && (!matching_bfd_sections (SYMBOL_BFD_SECTION (&msymbol[hi]), section))) - --hi; + { gdb-6.5-gcore-i386-on-amd64.patch: Makefile.in | 5 + amd64-linux-nat.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ config.in | 6 ++ configure | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 gcore.c | 5 + gdb_procfs32.h | 128 +++++++++++++++++++++++++++++++++++++++++++++ gdb_user32.h | 108 ++++++++++++++++++++++++++++++++++++++ linux-nat.c | 33 +++++++---- linux-nat.h | 9 +++ 10 files changed, 558 insertions(+), 13 deletions(-) Index: gdb-6.5-gcore-i386-on-amd64.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-gcore-i386-on-amd64.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-gcore-i386-on-amd64.patch 1 Oct 2006 19:21:15 -0000 1.1 +++ gdb-6.5-gcore-i386-on-amd64.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -16,11 +16,11 @@ * Makefile.in: Dependencies updated. -Index: gdb-6.5/gdb/Makefile.in +Index: gdb-6.6/gdb/Makefile.in =================================================================== ---- gdb-6.5.orig/gdb/Makefile.in 21 Sep 2006 14:00:53 -0000 1.844 -+++ gdb-6.5/gdb/Makefile.in 1 Oct 2006 16:22:42 -0000 -@@ -696,6 +696,7 @@ gdb_h = gdb.h +--- gdb-6.6.orig/gdb/Makefile.in 2007-01-20 06:43:02.000000000 +0100 ++++ gdb-6.6/gdb/Makefile.in 2007-01-20 06:57:16.000000000 +0100 +@@ -705,6 +705,7 @@ gdb_expat_h = gdb_expat.h gdb_locale_h = gdb_locale.h gdb_obstack_h = gdb_obstack.h $(obstack_h) gdb_proc_service_h = gdb_proc_service.h $(gregset_h) @@ -28,7 +28,7 @@ gdb_ptrace_h = gdb_ptrace.h gdb_regex_h = gdb_regex.h $(xregex_h) gdb_select_h = gdb_select.h -@@ -705,6 +706,7 @@ gdb_string_h = gdb_string.h +@@ -714,6 +715,7 @@ gdb_string_h = gdb_string.h gdb_thread_db_h = gdb_thread_db.h gdbthread_h = gdbthread.h $(breakpoint_h) $(frame_h) gdbtypes_h = gdbtypes.h $(hashtab_h) @@ -36,21 +36,21 @@ gdb_vfork_h = gdb_vfork.h gdb_wait_h = gdb_wait.h glibc_tdep_h = glibc-tdep.h -@@ -1743,7 +1745,8 @@ amd64fbsd-tdep.o: amd64fbsd-tdep.c $(def +@@ -1779,7 +1781,8 @@ amd64fbsd-tdep.o: amd64fbsd-tdep.c $(def amd64-linux-nat.o: amd64-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ $(gdb_proc_service_h) $(gregset_h) $(amd64_tdep_h) \ -- $(i386_linux_tdep_h) $(amd64_nat_h) $(target_h) -+ $(i386_linux_tdep_h) $(amd64_nat_h) $(target_h) \ +- $(i386_linux_tdep_h) $(amd64_nat_h) $(target_h) $(amd64_linux_tdep_h) ++ $(i386_linux_tdep_h) $(amd64_nat_h) $(target_h) $(amd64_linux_tdep_h) \ + $(i387_tdep_h) $(elf_bfd_h) $(gdb_procfs32_h) amd64-linux-tdep.o: amd64-linux-tdep.c $(defs_h) $(frame_h) $(gdbcore_h) \ $(regcache_h) $(osabi_h) $(symtab_h) $(gdb_string_h) $(amd64_tdep_h) \ - $(solib_svr4_h) -Index: gdb-6.5/gdb/amd64-linux-nat.c + $(solib_svr4_h) $(gdbtypes_h) $(reggroups_h) $(amd64_linux_tdep_h) +Index: gdb-6.6/gdb/amd64-linux-nat.c =================================================================== ---- gdb-6.5.orig/gdb/amd64-linux-nat.c 19 Aug 2006 15:15:18 -0000 1.13 -+++ gdb-6.5/gdb/amd64-linux-nat.c 1 Oct 2006 16:22:42 -0000 -@@ -52,6 +52,9 @@ +--- gdb-6.6.orig/gdb/amd64-linux-nat.c 2007-01-20 06:43:00.000000000 +0100 ++++ gdb-6.6/gdb/amd64-linux-nat.c 2007-01-20 06:56:21.000000000 +0100 +@@ -53,6 +53,9 @@ #include "amd64-tdep.h" #include "i386-linux-tdep.h" #include "amd64-nat.h" @@ -60,7 +60,7 @@ /* Mapping between the general-purpose registers in GNU/Linux x86-64 `struct user' format and GDB's register cache layout. */ -@@ -86,6 +89,35 @@ static int amd64_linux_gregset64_reg_off +@@ -87,6 +90,35 @@ static int amd64_linux_gregset64_reg_off GNU/Linux i386 registers are all 32-bit, but since we're little-endian we get away with that. */ @@ -96,7 +96,7 @@ /* From on GNU/Linux i386. */ static int amd64_linux_gregset32_reg_offset[] = { -@@ -104,6 +136,94 @@ static int amd64_linux_gregset32_reg_off +@@ -105,6 +137,94 @@ static int amd64_linux_gregset32_reg_off }; @@ -191,7 +191,7 @@ /* Transfering the general-purpose registers between GDB, inferiors and core files. */ -@@ -406,6 +526,11 @@ _initialize_amd64_linux_nat (void) +@@ -529,6 +649,11 @@ _initialize_amd64_linux_nat (void) t->to_fetch_registers = amd64_linux_fetch_inferior_registers; t->to_store_registers = amd64_linux_store_inferior_registers; @@ -202,11 +202,11 @@ + /* Register the target. */ linux_nat_add_target (t); - } -Index: gdb-6.5/gdb/config.in + +Index: gdb-6.6/gdb/config.in =================================================================== ---- gdb-6.5.orig/gdb/config.in 8 Aug 2006 20:32:15 -0000 1.84 -+++ gdb-6.5/gdb/config.in 1 Oct 2006 16:22:42 -0000 +--- gdb-6.6.orig/gdb/config.in 2006-08-08 22:32:15.000000000 +0200 ++++ gdb-6.6/gdb/config.in 2007-01-20 06:56:21.000000000 +0100 @@ -373,6 +373,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_POLL_H @@ -227,11 +227,11 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_USER_H -Index: gdb-6.5/gdb/configure +Index: gdb-6.6/gdb/configure =================================================================== ---- gdb-6.5.orig/gdb/configure 2006-10-01 18:43:40.000000000 +0200 -+++ gdb-6.5/gdb/configure 2006-10-01 18:40:44.000000000 +0200 -@@ -11949,6 +11949,157 @@ +--- gdb-6.6.orig/gdb/configure 2007-01-20 06:43:00.000000000 +0100 ++++ gdb-6.6/gdb/configure 2007-01-20 06:56:21.000000000 +0100 +@@ -9966,6 +9966,157 @@ done @@ -389,11 +389,11 @@ for ac_header in sys/wait.h wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -Index: gdb-6.5/gdb/configure.ac +Index: gdb-6.6/gdb/configure.ac =================================================================== ---- gdb-6.5.orig/gdb/configure.ac 8 Aug 2006 20:26:23 -0000 1.34 -+++ gdb-6.5/gdb/configure.ac 1 Oct 2006 16:22:43 -0000 -@@ -365,6 +365,7 @@ AC_CHECK_HEADERS(sys/user.h, [], [], +--- gdb-6.6.orig/gdb/configure.ac 2007-01-20 06:43:01.000000000 +0100 ++++ gdb-6.6/gdb/configure.ac 2007-01-20 06:56:21.000000000 +0100 +@@ -371,6 +371,7 @@ AC_CHECK_HEADERS(sys/user.h, [], [], # include #endif ]) @@ -401,11 +401,11 @@ AC_CHECK_HEADERS(sys/wait.h wait.h) AC_CHECK_HEADERS(termios.h termio.h sgtty.h) AC_CHECK_HEADERS(unistd.h) -Index: gdb-6.5/gdb/gcore.c +Index: gdb-6.6/gdb/gcore.c =================================================================== ---- gdb-6.5.orig/gdb/gcore.c 17 Dec 2005 22:33:59 -0000 1.18 -+++ gdb-6.5/gdb/gcore.c 1 Oct 2006 16:22:43 -0000 -@@ -314,6 +314,11 @@ gcore_create_callback (CORE_ADDR vaddr, +--- gdb-6.6.orig/gdb/gcore.c 2007-01-20 06:43:02.000000000 +0100 ++++ gdb-6.6/gdb/gcore.c 2007-01-20 06:56:21.000000000 +0100 +@@ -320,6 +320,11 @@ gcore_create_callback (CORE_ADDR vaddr, asection *osec; flagword flags = SEC_ALLOC | SEC_HAS_CONTENTS | SEC_LOAD; @@ -417,10 +417,10 @@ /* If the memory segment has no permissions set, ignore it, otherwise when we later try to access it for read/write, we'll get an error or jam the kernel. */ -Index: gdb-6.5/gdb/gdb_procfs32.h +Index: gdb-6.6/gdb/gdb_procfs32.h =================================================================== ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gdb-6.5/gdb/gdb_procfs32.h 1 Oct 2006 16:22:43 -0000 +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.6/gdb/gdb_procfs32.h 2007-01-20 06:56:21.000000000 +0100 @@ -0,0 +1,128 @@ +#ifdef HAVE_SYS_PROCFS32_H +#include @@ -550,10 +550,10 @@ +#endif /* _SYS_PROCFS32_H */ + +#endif /* HAVE_SYS_PROCFS32_H */ -Index: gdb-6.5/gdb/gdb_user32.h +Index: gdb-6.6/gdb/gdb_user32.h =================================================================== ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gdb-6.5/gdb/gdb_user32.h 1 Oct 2006 16:22:43 -0000 +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gdb-6.6/gdb/gdb_user32.h 2007-01-20 06:56:21.000000000 +0100 @@ -0,0 +1,108 @@ +#ifdef HAVE_SYS_USER32_H +#include @@ -663,11 +663,11 @@ +#endif /* _SYS_USER32_H */ + +#endif /* HAVE_SYS_USER32_H */ -Index: gdb-6.5/gdb/linux-nat.c +Index: gdb-6.6/gdb/linux-nat.c =================================================================== ---- gdb-6.5.orig/gdb/linux-nat.c 16 Sep 2006 09:48:12 -0000 1.50 -+++ gdb-6.5/gdb/linux-nat.c 1 Oct 2006 16:22:43 -0000 -@@ -99,6 +99,15 @@ static LONGEST (*super_xfer_partial) (st +--- gdb-6.6.orig/gdb/linux-nat.c 2007-01-20 06:43:04.000000000 +0100 ++++ gdb-6.6/gdb/linux-nat.c 2007-01-20 06:56:21.000000000 +0100 +@@ -100,6 +100,15 @@ static LONGEST (*super_xfer_partial) (st const gdb_byte *, ULONGEST, LONGEST); @@ -683,7 +683,7 @@ static int debug_linux_nat; static void show_debug_linux_nat (struct ui_file *file, int from_tty, -@@ -2562,11 +2571,11 @@ linux_nat_do_thread_registers (bfd *obfd +@@ -2715,11 +2724,11 @@ linux_nat_do_thread_registers (bfd *obfd else fill_gregset (&gregs, -1); @@ -700,7 +700,7 @@ if (core_regset_p && (regset = gdbarch_regset_from_core_section (gdbarch, ".reg2", -@@ -2577,10 +2586,10 @@ linux_nat_do_thread_registers (bfd *obfd +@@ -2730,10 +2739,10 @@ linux_nat_do_thread_registers (bfd *obfd else fill_fpregset (&fpregs, -1); @@ -715,7 +715,7 @@ #ifdef FILL_FPXREGSET if (core_regset_p -@@ -2675,9 +2684,9 @@ linux_nat_make_corefile_notes (bfd *obfd +@@ -2828,9 +2837,9 @@ linux_nat_make_corefile_notes (bfd *obfd strncat (psargs, get_inferior_args (), sizeof (psargs) - strlen (psargs)); } @@ -728,11 +728,11 @@ } /* Dump information for threads. */ -Index: gdb-6.5/gdb/linux-nat.h +Index: gdb-6.6/gdb/linux-nat.h =================================================================== ---- gdb-6.5.orig/gdb/linux-nat.h 23 Jul 2006 21:21:01 -0000 1.12 -+++ gdb-6.5/gdb/linux-nat.h 1 Oct 2006 16:22:43 -0000 -@@ -96,3 +96,12 @@ void linux_nat_add_target (struct target +--- gdb-6.6.orig/gdb/linux-nat.h 2007-01-20 06:42:58.000000000 +0100 ++++ gdb-6.6/gdb/linux-nat.h 2007-01-20 06:56:21.000000000 +0100 +@@ -108,3 +108,12 @@ void linux_nat_add_target (struct target /* Update linux-nat internal state when changing from one fork to another. */ void linux_nat_switch_fork (ptid_t new_ptid); gdb-6.5-symbols-overlap.patch: ./gdb/minsyms.c | 23 +++++++ ./gdb/testsuite/gdb.arch/i386-size-overlap.c | 53 ++++++++++++++++ ./gdb/testsuite/gdb.arch/i386-size-overlap.exp | 79 +++++++++++++++++++++++++ gdb/testsuite/gdb.arch/i386-size-overlap.exp | 0 4 files changed, 155 insertions(+) Index: gdb-6.5-symbols-overlap.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.5-symbols-overlap.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.5-symbols-overlap.patch 2 Nov 2006 22:58:41 -0000 1.1 +++ gdb-6.5-symbols-overlap.patch 21 Jan 2007 01:53:01 -0000 1.2 @@ -9,24 +9,14 @@ file, provide nested (overlapping) functions for the PC resolving. ---- gdb-6.5/gdb/minsyms.c-orig 2006-10-31 08:21:32.000000000 -0500 -+++ gdb-6.5/gdb/minsyms.c 2006-10-31 08:24:37.000000000 -0500 -@@ -464,6 +464,7 @@ - objfile's minimal symbol table. See if it is the best one - overall. */ +Index: ./gdb/minsyms.c +=================================================================== +--- ./gdb/minsyms.c 17 Oct 2006 20:17:44 -0000 1.47 ++++ ./gdb/minsyms.c 30 Oct 2006 12:41:26 -0000 +@@ -511,6 +511,29 @@ lookup_minimal_symbol_by_pc_section (COR + continue; + } -+ while (0 - /* Skip any absolute symbols. This is apparently what adb - and dbx do, and is needed for the CM-5. There are two - known possible problems: (1) on ELF, apparently end, edata, -@@ -473,8 +474,27 @@ - NeXT are absolute. If we want special handling for this - it probably should be triggered by a special - mst_abs_or_lib or some such. */ -- while (hi >= 0 -- && msymbol[hi].type == mst_abs) -+ || (hi >= 0 -+ && msymbol[hi].type == mst_abs) + /* We are behind the current symbol's size. + Try the previous symbol - if it is non-zero sized one it + may overlap the current one and reach our PC. @@ -39,16 +29,20 @@ + Limit it only for the overlapping cases as we could harm + the zero-sized symbols detection logic around. + */ -+ || (hi > 0 -+ && MSYMBOL_SIZE (&msymbol[hi]) != 0 -+ && pc >= (SYMBOL_VALUE_ADDRESS (&msymbol[hi]) -+ + MSYMBOL_SIZE (&msymbol[hi])) -+ && pc < (SYMBOL_VALUE_ADDRESS (&msymbol[hi - 1]) -+ + MSYMBOL_SIZE (&msymbol[hi - 1]))) -+ ) - --hi; - - /* If "section" specified, skip any symbol from wrong section */ ++ if (hi > 0 ++ && MSYMBOL_SIZE (&msymbol[hi]) != 0 ++ && pc >= (SYMBOL_VALUE_ADDRESS (&msymbol[hi]) ++ + MSYMBOL_SIZE (&msymbol[hi])) ++ && pc < (SYMBOL_VALUE_ADDRESS (&msymbol[hi - 1]) ++ + MSYMBOL_SIZE (&msymbol[hi - 1]))) ++ { ++ hi--; ++ continue; ++ } ++ + /* Otherwise, this symbol must be as good as we're going + to get. */ + break; Index: ./gdb/testsuite/gdb.arch/i386-size-overlap.c =================================================================== --- /dev/null 1 Jan 1970 00:00:00 -0000 @@ -107,10 +101,10 @@ + " mov %esp, %ebp\n" + " call " SYMBOL (trap) "\n" + " .size " SYMBOL (main) ", .-" SYMBOL (main) "\n"); -Index: ./gdb/testsuite/gdb.arch/i386-size-overlap.exp +Index: gdb/testsuite/gdb.arch/i386-size-overlap.exp =================================================================== RCS file: gdb/testsuite/gdb.arch/i386-size-overlap.exp -diff -N gdb/testsuite/gdb.arch/i386-size-overlap.exp +diff -N ./gdb/testsuite/gdb.arch/i386-size-overlap.exp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.arch/i386-size-overlap.exp 30 Oct 2006 12:41:35 -0000 @@ -0,0 +1,79 @@ Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- gdb.spec 15 Jan 2007 21:08:52 -0000 1.217 +++ gdb.spec 21 Jan 2007 01:53:01 -0000 1.218 @@ -8,19 +8,19 @@ # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -Version: 6.5 +Version: 6.6 -# The release always contains a leading reserved number, start it at 0. -Release: 27%{?dist} +# The release always contains a leading reserved number, start it at 1. +Release: 1%{?dist} License: GPL Group: Development/Debuggers -Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.5.tar.bz2 +Source: ftp://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-root URL: http://gnu.org/software/gdb/ # For our convenience -%define gdb_src gdb-6.5 +%define gdb_src gdb-6.6 %define gdb_build %{gdb_src}/build-%{_target_platform} # Make sure we get rid of the old package gdb64, now that we have unified @@ -29,7 +29,7 @@ Obsoletes: gdb64 %endif -# GDB patches have the format gdb---.patch; +# GDB patches have the format gdb--bz-.patch; # should include the ChangeLog.RedHat change-log entry; and should be # created using diff -u ./gdb (not gdb-6.3/gdb). @@ -189,12 +189,6 @@ # Allow option to continue backtracing past a zero pc value Patch170: gdb-6.3-bt-past-zero-20051201.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 - # Use bigger numbers than int. Patch176: gdb-6.3-large-core-20051206.patch @@ -209,33 +203,18 @@ # ia32el. Patch179: gdb-6.3-ia32el-fix-waitpid-20060615.patch -# Backport GNU .hash support. -Patch180: gdb-6.5-bfd-hash-style-20060714.patch - # Bugfix segv on the source display by ^X 1 (fixes Patch130, BZ 200048). Patch181: gdb-6.5-bz200048-find_line_pc-segv.patch -# Fix exec() from threaded program, partial CVS backport (BZ 182116). -Patch183: gdb-6.3-bz182116-exec-from-pthread.patch - -# Fix occasional failure to load shared libraries (BZ 146810). -Patch184: gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch - # Bugfix object names completion (fixes Patch116, BZ 193763). Patch185: gdb-6.3-bz193763-object-name-completion.patch -# Avoid crash of 'info threads' if stale threads exist (BZ 195429). -Patch186: gdb-6.5-bz195429-stale-threads-crash.patch - -# Handle corrupted or missing location list information (BZ 196439). -Patch187: gdb-6.5-bz196439-valgrind-memcheck-compat.patch +# Testcase for corrupted or missing location list information (BZ 196439). +Patch187: gdb-6.5-bz196439-valgrind-memcheck-compat-test.patch # Fix debuginfo addresses resolving for --emit-relocs Linux kernels (BZ 203661). Patch188: gdb-6.5-bz203661-emit-relocs.patch -# Add support for memory nops on x86. -Patch189: gdb-6.5-opcodes-i386-nopmem.patch - # Security patch: avoid stack overflows in dwarf expression computation. # CVE-2006-4146 Patch190: gdb-6.5-dwarf-stack-overflow.patch @@ -243,9 +222,6 @@ # Fix gdb printf command argument using "%p" (BZ 205551). Patch191: gdb-6.5-bz205551-printf-p.patch -# Fix crash on C++ symbol failing to be demangled (BZ 206813). -Patch192: gdb-6.5-bz206813-cplusplus-symbol-null.patch - # Fix attach to stopped process, supersede `gdb-6.3-attach-stop-20051011.patch'. # Fix attachment also to a threaded stopped process (BZ 219118). Patch193: gdb-6.5-attach-stop.patch @@ -258,16 +234,12 @@ Patch195: gdb-6.5-tls-of-separate-debuginfo.patch # Fix TLS symbols resolving for shared libraries with a relative pathname. -# The testsuite needs `gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch'. # The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'. Patch196: gdb-6.5-sharedlibrary-path.patch # Support IPv6 for gdbserver (BZ 198365). Patch197: gdb-6.5-bz198365-IPv6.patch -# No longer disassemble invalid i386 opcodes of movQ/movA (BZ 172034). -Patch198: gdb-6.5-bz172034-disasm-i386-C6-C7.patch - # Suggest fixing your target architecture for gdbserver(1) (BZ 190810). # FIXME: It could be autodetected. Patch199: gdb-6.5-bz190810-gdbserver-arch-advice.patch @@ -278,13 +250,10 @@ # Fix `gcore' command for 32bit inferiors on 64bit hosts. Patch201: gdb-6.5-gcore-i386-on-amd64.patch -# Fix deadlock accessing last address space byte; for corrupted backtraces. -Patch203: gdb-6.5-last-address-space-byte.patch +# Testcase for deadlocking on last address space byte; for corrupted backtraces. Patch211: gdb-6.5-last-address-space-byte-test.patch # Fix "??" resolving of symbols from (non-prelinked) debuginfo packages. -# "gdb-6.5-matching_bfd_sections.patch" is a prerequisited CVS backport. -Patch205: gdb-6.5-matching_bfd_sections.patch Patch206: gdb-6.5-relativedebug.patch # Fix "??" resolving of symbols from overlapping functions (nanosleep(3)). @@ -330,6 +299,13 @@ # Fix missing testsuite .log output of testcases using get_compiler_info(). Patch230: gdb-6.5-testsuite-log.patch +# Testcase for exec() from threaded program (BZ 202689). +Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch + +# Backported post gdb-6.6 release ia64 unwinding fixups. +Patch232: gdb-6.6-ia64-kernel-unwind.patch +Patch233: gdb-6.6-ia64-pc-unwind.patch + BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext BuildRequires: flex bison sharutils @@ -413,35 +389,24 @@ %patch166 -p1 %patch169 -p1 %patch170 -p1 -%patch173 -p1 -%patch174 -p1 %patch176 -p1 %patch177 -p1 %patch178 -p1 %patch179 -p1 -%patch180 -p1 %patch181 -p1 -%patch183 -p1 -%patch184 -p1 %patch185 -p1 -%patch186 -p1 %patch187 -p1 %patch188 -p1 -%patch189 -p1 %patch190 -p1 %patch191 -p1 -%patch192 -p1 %patch193 -p1 %patch194 -p1 %patch195 -p1 %patch196 -p1 #%patch197 -p1 -%patch198 -p1 %patch199 -p1 %patch200 -p1 %patch201 -p1 -%patch203 -p1 -%patch205 -p1 %patch206 -p1 %patch207 -p1 %patch208 -p1 @@ -463,6 +428,9 @@ %patch228 -p1 %patch229 -p1 %patch230 -p1 +%patch231 -p1 +%patch232 -p1 +%patch233 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -625,6 +593,11 @@ # don't include the files in include, they are part of binutils %changelog +* Sat Jan 20 2007 Jan Kratochvil - 6.6-1 +- Upgrade to GDB 6.6. Drop redundant patches, forward-port remaining ones. +- Backported post gdb-6.6 release ia64 unwinding fixups. +- Testcase for exec() from threaded program (BZ 202689). + * Mon Jan 15 2007 Jan Kratochvil - 6.5-27 - Fix the testsuite results broken in 6.5-26, stop invalid testsuite runs. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 11 Jul 2006 06:33:02 -0000 1.20 +++ sources 21 Jan 2007 01:53:01 -0000 1.21 @@ -1 +1 @@ -af6c8335230d7604aee0803b1df14f54 gdb-6.5.tar.bz2 +a4df41d28dd514d64e8ccbfe125fd9a6 gdb-6.6.tar.bz2 --- gdb-6.3-augmS-20060303.patch DELETED --- --- gdb-6.3-bz146810-solib_absolute_prefix_is_empty.patch DELETED --- --- gdb-6.3-cfaval-20060303.patch DELETED --- --- gdb-6.5-bfd-hash-style-20060714.patch DELETED --- --- gdb-6.5-bz172034-disasm-i386-C6-C7.patch DELETED --- --- gdb-6.5-bz195429-stale-threads-crash.patch DELETED --- --- gdb-6.5-bz196439-valgrind-memcheck-compat.patch DELETED --- --- gdb-6.5-bz206813-cplusplus-symbol-null.patch DELETED --- --- gdb-6.5-last-address-space-byte.patch DELETED --- --- gdb-6.5-matching_bfd_sections.patch DELETED --- --- gdb-6.5-opcodes-i386-nopmem.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 21 03:08:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 22:08:11 -0500 Subject: rpms/gaim/devel .cvsignore, 1.36, 1.37 gaim.spec, 1.164, 1.165 sources, 1.36, 1.37 gaim-2.0.0beta5-debian-04_blist-memleak.patch, 1.1, NONE gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch, 1.1, NONE gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch, 1.1, NONE gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch, 1.1, NONE gaim-2.0.0beta5-debian-08_jabber-info-crash.patch, 1.1, NONE gaim-2.0.0beta5-debian-10_text-arrow-keys.patch, 1.1, NONE gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch, 1.1, NONE gaim-2.0.0beta5-debian-17_upnp_crash.patch, 1.1, NONE gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch, 1.1, NONE gaim-2.0.0beta5-gtk-filename-blanked.patch, 1.1, NONE gaim-2.0.0beta5-silc-edit-account-crash.patch, 1.1, NONE Message-ID: <200701210308.l0L38BJ4024509@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/gaim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24443 Modified Files: .cvsignore gaim.spec sources Removed Files: gaim-2.0.0beta5-debian-04_blist-memleak.patch gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch gaim-2.0.0beta5-debian-08_jabber-info-crash.patch gaim-2.0.0beta5-debian-10_text-arrow-keys.patch gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch gaim-2.0.0beta5-debian-17_upnp_crash.patch gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch gaim-2.0.0beta5-gtk-filename-blanked.patch gaim-2.0.0beta5-silc-edit-account-crash.patch Log Message: 2.0.0 beta6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 21 Nov 2006 22:29:47 -0000 1.36 +++ .cvsignore 21 Jan 2007 03:08:03 -0000 1.37 @@ -1 +1 @@ -gaim-2.0.0beta5.tar.bz2 +gaim-2.0.0beta6.tar.bz2 Index: gaim.spec =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- gaim.spec 18 Jan 2007 19:42:04 -0000 1.164 +++ gaim.spec 21 Jan 2007 03:08:03 -0000 1.165 @@ -29,11 +29,11 @@ %define meanwhile_integration 0 # Prerelease define -%define betaver beta5 +%define betaver beta6 Name: gaim Version: 2.0.0 -Release: 0.29.%{betaver}%{?dist} +Release: 0.30.%{betaver}%{?dist} License: GPL Group: Applications/Internet URL: http://gaim.sourceforge.net/ @@ -63,20 +63,7 @@ ## Patches 100+: To be Included in Future Upstream Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch -Patch104: gaim-2.0.0beta5-debian-04_blist-memleak.patch -Patch105: gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch -Patch106: gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch -Patch107: gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch -Patch108: gaim-2.0.0beta5-debian-08_jabber-info-crash.patch -Patch110: gaim-2.0.0beta5-debian-10_text-arrow-keys.patch Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch -Patch112: gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch -Patch117: gaim-2.0.0beta5-debian-17_upnp_crash.patch -Patch118: gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch - -Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch -Patch152: gaim-2.0.0beta5-gtk-filename-blanked.patch -Patch153: gaim-2.0.0beta5-cyrus-sasl-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -203,20 +190,7 @@ ## Patches 100+: To be Included in Future Upstream %patch102 -p0 %patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch110 -p1 %patch111 -p1 -%patch112 -p1 -%patch117 -p1 -%patch118 -p1 - -%patch150 -p1 -%patch152 -p1 -%patch153 -p1 # Relabel internal version for support purposes sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure @@ -367,6 +341,9 @@ %endif %changelog +* Sat Jan 20 2007 Warren Togami - 2:2.0.0-0.30.beta6 +- 2.0.0 beta6 + * Thu Jan 18 2007 Warren Togami - 2:2.0.0-0.29.beta5 - Debian patch 17_upnp_crash - Debian patch 18_jabber-roster-crash Index: sources =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 21 Nov 2006 22:29:47 -0000 1.36 +++ sources 21 Jan 2007 03:08:03 -0000 1.37 @@ -1 +1 @@ -84099216123de25402fa7e904ceca437 gaim-2.0.0beta5.tar.bz2 +404dcec261f911bcb56f69e5ea192583 gaim-2.0.0beta6.tar.bz2 --- gaim-2.0.0beta5-debian-04_blist-memleak.patch DELETED --- --- gaim-2.0.0beta5-debian-05_url-handler-xmpp.patch DELETED --- --- gaim-2.0.0beta5-debian-06_jabber-registration-srv.patch DELETED --- --- gaim-2.0.0beta5-debian-07_msn-custom-smiley-crash.patch DELETED --- --- gaim-2.0.0beta5-debian-08_jabber-info-crash.patch DELETED --- --- gaim-2.0.0beta5-debian-10_text-arrow-keys.patch DELETED --- --- gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch DELETED --- --- gaim-2.0.0beta5-debian-17_upnp_crash.patch DELETED --- --- gaim-2.0.0beta5-debian-18_jabber-roster-crash.patch DELETED --- --- gaim-2.0.0beta5-gtk-filename-blanked.patch DELETED --- --- gaim-2.0.0beta5-silc-edit-account-crash.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 21 03:12:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 22:12:51 -0500 Subject: rpms/gnome-themes/devel gnome-themes-2.16.0-clearlooks.patch, 1.2, 1.3 gnome-themes.spec, 1.76, 1.77 sources, 1.43, 1.44 Message-ID: <200701210312.l0L3CpgC028145@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-themes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27984 Modified Files: gnome-themes-2.16.0-clearlooks.patch gnome-themes.spec sources Log Message: Re-add Clearlooks icon theme gnome-themes-2.16.0-clearlooks.patch: configure.in | 5 +++++ desktop-themes/Clearlooks/index.theme.in | 2 +- icon-themes/Makefile.am | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) Index: gnome-themes-2.16.0-clearlooks.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes-2.16.0-clearlooks.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-themes-2.16.0-clearlooks.patch 5 Sep 2006 03:08:01 -0000 1.2 +++ gnome-themes-2.16.0-clearlooks.patch 21 Jan 2007 03:12:49 -0000 1.3 @@ -1,18 +1,5 @@ --- gnome-themes-2.16.0/configure.in.clearlooks 2006-09-04 16:23:12.000000000 -0400 +++ gnome-themes-2.16.0/configure.in 2006-09-04 23:08:51.000000000 -0400 -@@ -110,6 +110,12 @@ - metacity-themes/Makefile - gtk-themes/Makefile - gtk-themes/Glider/Makefile -+gtk-themes/Clearlooks-DeepSky/Makefile -+gtk-themes/Clearlooks-DeepSky/gtk-2.0/Makefile -+gtk-themes/Clearlooks-Olive/Makefile -+gtk-themes/Clearlooks-Olive/gtk-2.0/Makefile -+gtk-themes/Clearlooks-Quicksilver/Makefile -+gtk-themes/Clearlooks-Quicksilver/gtk-2.0/Makefile - gtk-themes/Simple/Makefile - icon-themes/Makefile - icon-themes/Crux/Makefile @@ -158,6 +164,11 @@ icon-themes/Mist/scalable/actions/Makefile icon-themes/Mist/scalable/status/Makefile @@ -25,11 +12,6 @@ common/Makefile HighContrast/Makefile HighContrast/gtk-2.0/Makefile ---- gnome-themes-2.16.0/gtk-themes/Makefile.am.clearlooks 2006-09-04 16:21:08.000000000 -0400 -+++ gnome-themes-2.16.0/gtk-themes/Makefile.am 2006-09-04 23:09:13.000000000 -0400 -@@ -1 +1 @@ --SUBDIRS=Glider Simple -+SUBDIRS=Glider Simple Clearlooks-DeepSky Clearlooks-Olive Clearlooks-Quicksilver --- gnome-themes-2.16.0/icon-themes/Makefile.am.clearlooks 2006-08-07 17:00:41.000000000 -0400 +++ gnome-themes-2.16.0/icon-themes/Makefile.am 2006-09-04 23:08:51.000000000 -0400 @@ -1 +1 @@ Index: gnome-themes.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- gnome-themes.spec 10 Jan 2007 17:41:03 -0000 1.76 +++ gnome-themes.spec 21 Jan 2007 03:12:49 -0000 1.77 @@ -3,9 +3,12 @@ Summary: Themes collection for GNOME Name: gnome-themes Version: 2.17.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/ Source: %{name}-%{version}.tar.bz2 +Source1: clearlooks-%{clearlooks_version}.tar.bz2 +Patch1: clearlooks-0.5-inherit-bluecurve.patch +Patch2: gnome-themes-2.16.0-clearlooks.patch License: LGPL Group: User Interface/Desktops BuildArch: noarch @@ -28,6 +31,14 @@ %prep %setup -q +tar xjf %{SOURCE1} +pushd clearlooks-%{clearlooks_version} +%patch1 -p1 -b .inherit-bluecurve +popd + +mv clearlooks-%{clearlooks_version}/themes/Clearlooks/icons icon-themes/Clearlooks + +%patch2 -p1 -b .clearlooks %build ./configure --prefix=/usr @@ -65,6 +76,9 @@ %doc AUTHORS ChangeLog COPYING NEWS README %changelog +* Sat Jan 20 2007 Matthias Clasen - 2.17.5-2 +- Re-add the Clearlooks icon theme + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 10 Jan 2007 17:41:03 -0000 1.43 +++ sources 21 Jan 2007 03:12:49 -0000 1.44 @@ -1 +1,2 @@ 9043c40810fa12160258a2f383bc6cc6 gnome-themes-2.17.5.tar.bz2 +451ef33d1bffa261c5cbe01182199f97 clearlooks-0.6.2.tar.bz2 From fedora-cvs-commits at redhat.com Sun Jan 21 03:59:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 20 Jan 2007 22:59:44 -0500 Subject: rpms/gnome-themes/devel gnome-themes-2.17.5-clearlooks.patch, NONE, 1.1 gnome-themes.spec, 1.77, 1.78 Message-ID: <200701210359.l0L3xijZ014941@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-themes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14924 Modified Files: gnome-themes.spec Added Files: gnome-themes-2.17.5-clearlooks.patch Log Message: Try again gnome-themes-2.17.5-clearlooks.patch: configure.in | 8 + desktop-themes/Clearlooks/index.theme.in | 2 icon-themes/Makefile.am | 2 icon-themes/Makefile.in | 129 ++++++++++++++++--------------- 4 files changed, 79 insertions(+), 62 deletions(-) --- NEW FILE gnome-themes-2.17.5-clearlooks.patch --- --- gnome-themes-2.17.5/configure.in.clearlooks 2007-01-05 09:30:56.000000000 -0500 +++ gnome-themes-2.17.5/configure.in 2007-01-20 22:57:11.000000000 -0500 @@ -25,6 +25,9 @@ AC_CHECK_FUNCS(setenv putenv) AM_PROG_LIBTOOL +AM_PROG_MKDIR_P +MKDIR_P=${mkdir_p} +AC_SUBST(MKDIR_P) # theme engines PKG_CHECK_MODULES(THEME_ENGINE, @@ -181,6 +184,11 @@ icon-themes/Mist/scalable/actions/Makefile icon-themes/Mist/scalable/status/Makefile icon-themes/Mist/scalable/places/Makefile +icon-themes/Clearlooks/Makefile +icon-themes/Clearlooks/16x16/Makefile +icon-themes/Clearlooks/24x24/Makefile +icon-themes/Clearlooks/16x16/gtk/Makefile +icon-themes/Clearlooks/24x24/gtk/Makefile common/Makefile HighContrast/Makefile HighContrast/gtk-2.0/Makefile --- gnome-themes-2.17.5/icon-themes/Makefile.in.clearlooks 2007-01-08 10:42:11.000000000 -0500 +++ gnome-themes-2.17.5/icon-themes/Makefile.in 2007-01-20 22:51:12.000000000 -0500 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -48,10 +44,13 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -60,8 +59,6 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALLOCA = @ALLOCA@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -73,8 +70,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CORE_THEMES_ONLY_FALSE = @CORE_THEMES_ONLY_FALSE@ -CORE_THEMES_ONLY_TRUE = @CORE_THEMES_ONLY_TRUE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -96,8 +91,10 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ GTK_VERSION = @GTK_VERSION@ ICONMAP = @ICONMAP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -141,9 +138,8 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ @@ -160,6 +156,7 @@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -168,17 +165,13 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -190,29 +183,40 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = Crux HighContrast-SVG Mist +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = Crux HighContrast-SVG Mist Clearlooks all: all-recursive .SUFFIXES: @@ -252,10 +256,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -287,8 +287,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -389,22 +388,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -418,7 +416,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -426,6 +424,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -465,8 +465,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -480,12 +479,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -504,22 +511,24 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- gnome-themes-2.17.5/icon-themes/Makefile.am.clearlooks 2007-01-05 09:30:54.000000000 -0500 +++ gnome-themes-2.17.5/icon-themes/Makefile.am 2007-01-20 22:50:41.000000000 -0500 @@ -1 +1 @@ -SUBDIRS=Crux HighContrast-SVG Mist +SUBDIRS=Crux HighContrast-SVG Mist Clearlooks --- gnome-themes-2.17.5/desktop-themes/Clearlooks/index.theme.in.clearlooks 2007-01-05 09:30:19.000000000 -0500 +++ gnome-themes-2.17.5/desktop-themes/Clearlooks/index.theme.in 2007-01-20 22:50:41.000000000 -0500 @@ -5,4 +5,4 @@ Encoding=UTF-8 GtkTheme=Clearlooks MetacityTheme=Clearlooks -IconTheme=gnome +IconTheme=Clearlooks Index: gnome-themes.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- gnome-themes.spec 21 Jan 2007 03:12:49 -0000 1.77 +++ gnome-themes.spec 21 Jan 2007 03:59:42 -0000 1.78 @@ -3,12 +3,12 @@ Summary: Themes collection for GNOME Name: gnome-themes Version: 2.17.5 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/ Source: %{name}-%{version}.tar.bz2 Source1: clearlooks-%{clearlooks_version}.tar.bz2 Patch1: clearlooks-0.5-inherit-bluecurve.patch -Patch2: gnome-themes-2.16.0-clearlooks.patch +Patch2: gnome-themes-2.17.5-clearlooks.patch License: LGPL Group: User Interface/Desktops BuildArch: noarch @@ -41,6 +41,9 @@ %patch2 -p1 -b .clearlooks %build +autoconf +aclocal +automake ./configure --prefix=/usr export tagname=CC make LIBTOOL=/usr/bin/libtool @@ -76,7 +79,7 @@ %doc AUTHORS ChangeLog COPYING NEWS README %changelog -* Sat Jan 20 2007 Matthias Clasen - 2.17.5-2 +* Sat Jan 20 2007 Matthias Clasen - 2.17.5-3 - Re-add the Clearlooks icon theme * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 From fedora-cvs-commits at redhat.com Sun Jan 21 17:20:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 12:20:25 -0500 Subject: rpms/ncurses/devel ncurses-5.6-20070120-urxvt.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 ncurses.spec, 1.68, 1.69 sources, 1.20, 1.21 ncurses-resetall.sh, 1.2, NONE Message-ID: <200701211720.l0LHKPeW004162@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2726 Modified Files: .cvsignore ncurses.spec sources Added Files: ncurses-5.6-20070120-urxvt.patch Removed Files: ncurses-resetall.sh Log Message: - update to patch 20070120 - don't depend on bash, drop resetall script - include rxvt-unicode description ncurses-5.6-20070120-urxvt.patch: terminfo.src | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+) --- NEW FILE ncurses-5.6-20070120-urxvt.patch --- --- ncurses-5.6/misc/terminfo.src.urxvt 2007-01-21 10:56:35.000000000 +0100 +++ ncurses-5.6/misc/terminfo.src 2007-01-21 10:58:49.000000000 +0100 @@ -3747,6 +3747,75 @@ rxvt-16color|xterm with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, +# rxvt-unicode +# http://cvs.schmorp.de/rxvt-unicode/doc/etc/rxvt-unicode.terminfo?rev=1.15 +# From: Thomas Dickey 04 Oct 1997 +# Updated: ??zg??r Kesim 02 Nov 1997 +# Updated: Marc Lehmann , 17 Feb 2005 +# Notes: +# It has an AIX extension +# box2=lqkxjmwuvtn, +# but the latter does not work correctly. +# +rxvt-unicode|rxvt-unicode terminal (X Window System), + am, bce, eo, km, msgr, xenl, hs, + cols#80, it#8, lines#24, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, + bel=^G, blink=\E[5m, bold=\E[1m, blink=\E[5m, civis=\E[?25l, + clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + cvvis=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, + dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, + flash=\E[?5h$<20/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, + hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L, + ind=^J, is1=\E[?47l\E=\E[?1l, + is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, + kDC=\E[3$, kIC=\E2$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, + kPRV=\E[5$, kRIT=\E[c, + kbs=\177, + ka1=\EOw, ka3=\EOy, + kb2=\EOu, + kc1=\EOq, kc3=\EOs, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, + kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kel=\E[8\^, + kend=\E[8~, kent=\EOM, kf1=\E[11~, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, + kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, + kf19=\E[33~, kf2=\E[12~, kf20=\E[34~, kf3=\E[13~, + kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, + kf9=\E[20~, kfnd=\E[1~, khome=\E[7~, kich1=\E[2~, + kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, rc=\E8, + rev=\E[7m, ri=\EM, + rmso=\E[27m, rmul=\E[24m, + rs1=\Ec, + rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>, + sgr0=\E[m\017, + enacs=, smacs=\E(0, rmacs=\E(B, + smso=\E[7m, smul=\E[4m, tbc=\E[3g, + vpa=\E[%i%p1%dd, + colors#88, pairs#256, btns#5, lm#0, + ccc, eo, npc, mc5i, ncv#0, mir, xon, bw, + ech=\E[%p1%dX, + mc0=\E[i, mc4=\E[4i, mc5=\E[5i, + sitm=\E[3m, ritm=\E[23m, + smam=\E[?7h, rmam=\E[?7l, + smir=\E[4h, rmir=\E[4l, + smcup=\E[?1049h, rmcup=\E[r\E[?1049l, + smkx=\E[?1h\E=, rmkx=\E[?1l\E>, + indn=\E[%p1%dS, rin=\E[%p1%dT, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, + op=\E[39;49m, + setaf=\E[38;5;%p1%dm, setab=\E[48;5;%p1%dm, + setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, + setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, + initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, + sc=\E7, + s0ds=\E(B, s1ds=\E(0, s2ds=\E*B, s3ds=\E+B, + u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c, + tsl=\E]2;, fsl=\007, dsl=\E]2;\007, + # From: Michael Jennings # # Eterm 0.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 10 Jan 2007 16:13:34 -0000 1.20 +++ .cvsignore 21 Jan 2007 17:20:22 -0000 1.21 @@ -1,2 +1,2 @@ ncurses-5.6.tar.gz -ncurses-5.6-20061223-20070106.patch.bz2 +ncurses-5.6-20061223-20070120.patch.bz2 Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- ncurses.spec 10 Jan 2007 16:13:34 -0000 1.68 +++ ncurses.spec 21 Jan 2007 17:20:22 -0000 1.69 @@ -1,20 +1,19 @@ Summary: A terminal handling library Name: ncurses Version: 5.6 -Release: 1.20070106%{?dist} +Release: 2.20070120%{?dist} License: distributable Group: System Environment/Libraries URL: http://invisible-island.net/ncurses/ncurses.html Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz -Source3: ncurses-resetall.sh -Patch1: ncurses-5.6-20061223-20070106.patch.bz2 +Patch1: ncurses-5.6-20061223-20070120.patch.bz2 Patch6: ncurses-5.5-20061209-tgetent.patch -Patch7: ncurses-5.6-20070106-staticprogs.patch Patch8: ncurses-5.5-20061209-config.patch Patch9: ncurses-5.5-liblinks.patch Patch10: ncurses-5.5-20061209-xterm.patch +Patch11: ncurses-5.6-20070120-urxvt.patch BuildRequires: gpm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,10 +50,10 @@ %patch1 -p1 %patch6 -p1 -b .tgetent -%patch7 -p1 -b .staticprogs %patch8 -p1 -b .config %patch9 -p1 -b .liblinks %patch10 -p1 -b .xterm +%patch11 -p1 -b .urxvt %build %define rootdatadir /lib @@ -65,35 +64,27 @@ --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\ --includedir=%{_includedir}/ncursesw \\\ --enable-overwrite \\\ - --without-progs \\\ --with-chtype=long -mkdir narrowc widec staticprogs +mkdir narrowc widec cd narrowc ln -s ../configure . -%configure %{ncurses_options} +%configure %{ncurses_options} --with-ticlib make %{?_smp_mflags} libs +make %{?_smp_mflags} -C progs +make %{?_smp_mflags} -C tack cd ../widec ln -s ../configure . -%configure %{ncurses_options} --enable-widec -make %{?_smp_mflags} libs - -cd ../staticprogs -ln -s ../configure . -%configure %{ncurses_options} --with-progs +%configure %{ncurses_options} --enable-widec --without-progs make %{?_smp_mflags} libs -cp -a ../narrowc/lib/libncurses.so* lib -make %{?_smp_mflags} -C progs -make %{?_smp_mflags} -C tack cd .. %install rm -rf ${RPM_BUILD_ROOT} -make -C narrowc install.libs +make -C narrowc install.{libs,progs,tack,data} make -C widec install.{libs,includes,man} -make -C staticprogs install.{progs,tack,data} chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.* chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a @@ -137,8 +128,6 @@ ln -s ../ncursesw/$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses done -install -c -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/resetall - rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo %post -p /sbin/ldconfig @@ -187,6 +176,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sun Jan 21 2007 Miroslav Lichvar 5.6-2.20070120 +- update to patch 20070120 +- don't depend on bash, drop resetall script +- include rxvt-unicode description + * Wed Jan 10 2007 Miroslav Lichvar 5.6-1.20070106 - update to 5.6, patch 20070106 Index: sources =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 10 Jan 2007 16:13:34 -0000 1.20 +++ sources 21 Jan 2007 17:20:22 -0000 1.21 @@ -1,2 +1,2 @@ b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz -70d86f1dddf76c6f7cc8421c232cfa5f ncurses-5.6-20061223-20070106.patch.bz2 +f66addc615259d75eaf2b7143246f516 ncurses-5.6-20061223-20070120.patch.bz2 --- ncurses-resetall.sh DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 21 23:39:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 18:39:56 -0500 Subject: rpms/bison/devel bison.spec,1.29,1.30 Message-ID: <200701212339.l0LNduwx029240@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/bison/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29218 Modified Files: bison.spec Log Message: * Sun Jan 21 2007 Roland McGrath - 2.3-3 - Canonicalize post/preun use of install-info. - Resolves: 223679 Index: bison.spec =================================================================== RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- bison.spec 12 Jul 2006 05:26:54 -0000 1.29 +++ bison.spec 21 Jan 2007 23:39:54 -0000 1.30 @@ -1,15 +1,16 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 2.1 +Release: 3 License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 URL: http://www.gnu.org/software/bison/ -Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-root BuildRequires: m4 >= 1.4 Requires: m4 >= 1.4 +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description Bison is a general purpose parser generator that converts a grammar @@ -73,11 +74,11 @@ gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info* %post -/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." +/sbin/install-info %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." + /sbin/install-info --delete %{_infodir}/bison.info.gz %{_infodir}/dir --entry="* bison: (bison). The GNU parser generator." || : fi %files -f %{name}.lang @@ -99,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 21 2007 Roland McGrath - 2.3-3 +- Canonicalize post/preun use of install-info. +- Resolves: 223679 + * Wed Jul 12 2006 Jesse Keating - 2.3-2.1 - rebuild From fedora-cvs-commits at redhat.com Sun Jan 21 23:42:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 18:42:10 -0500 Subject: rpms/bison/devel bison.spec,1.30,1.31 Message-ID: <200701212342.l0LNgAhZ029356@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/bison/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29341 Modified Files: bison.spec Log Message: Use dist tag. Index: bison.spec =================================================================== RCS file: /cvs/dist/rpms/bison/devel/bison.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- bison.spec 21 Jan 2007 23:39:54 -0000 1.30 +++ bison.spec 21 Jan 2007 23:42:08 -0000 1.31 @@ -1,7 +1,7 @@ Summary: A GNU general-purpose parser generator. Name: bison Version: 2.3 -Release: 3 +Release: 3%{?dist} License: GPL Group: Development/Tools Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 00:19:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 19:19:27 -0500 Subject: rpms/emacspeak/devel .cvsignore, 1.6, 1.7 emacspeak-tcl-pkgreq-tclx.patch, 1.1, 1.2 emacspeak.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200701220019.l0M0JRr4005687@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacspeak/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5667 Modified Files: .cvsignore emacspeak-tcl-pkgreq-tclx.patch emacspeak.spec sources Log Message: - update to version 25 - update emacspeak-tcl-pkgreq-tclx.patch - protect install-info in %%post and %%preun (Ville Skytta) Resolves: #223685 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 15:35:34 -0000 1.6 +++ .cvsignore 22 Jan 2007 00:19:25 -0000 1.7 @@ -1 +1 @@ -emacspeak-23.0.tar.bz2 +emacspeak-25.tar.bz2 emacspeak-tcl-pkgreq-tclx.patch: dsp-outloud | 4 +++- dtk-exp | 4 +++- dtk-mv | 4 +++- dtk-soft | 4 +++- outloud | 4 +++- speech-server | 4 +++- ssh-dtk-exp | 4 +++- ssh-outloud | 2 ++ 8 files changed, 23 insertions(+), 7 deletions(-) Index: emacspeak-tcl-pkgreq-tclx.patch =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak-tcl-pkgreq-tclx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emacspeak-tcl-pkgreq-tclx.patch 8 Feb 2006 06:15:50 -0000 1.1 +++ emacspeak-tcl-pkgreq-tclx.patch 22 Jan 2007 00:19:25 -0000 1.2 @@ -1,142 +1,79 @@ -diff: emacspeak-23.505/realaudio/.cvsignore.~14.4997.: No such file or directory ---- emacspeak-23.505/servers/dtk-soft~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/dtk-soft 2006-02-08 14:50:28.000000000 +0900 -@@ -1,4 +1,4 @@ +--- emacspeak-25/servers/outloud.1-tclx 2006-11-04 01:19:06.000000000 +1000 ++++ emacspeak-25/servers/outloud 2007-01-22 10:11:41.000000000 +1000 +@@ -1,4 +1,6 @@ -#!/usr/bin/tcl +#!/usr/bin/tclsh - # Keywords: Emacspeak, Software Dectalk , TCL - # {{{ LCD Entry: - -@@ -32,6 +32,8 @@ - # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - # }}} +package require Tclx + - # {{{source common code - - set wd [file dirname $argv0] ---- emacspeak-23.505/servers/outloud~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/outloud 2006-02-08 14:49:17.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh # Keywords: Emacspeak, ViaVoice Outloud , TCL # {{{ LCD Entry: -@@ -32,6 +32,9 @@ - # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - # }}} -+ -+package require Tclx -+ - # {{{source common code - - set wd [file dirname $argv0] ---- emacspeak-23.505/servers/dtk-exp~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/dtk-exp 2006-02-08 14:48:55.000000000 +0900 -@@ -1,4 +1,4 @@ +--- emacspeak-25/servers/dsp-outloud.1-tclx 2006-08-12 13:34:09.000000000 +1000 ++++ emacspeak-25/servers/dsp-outloud 2007-01-22 10:10:14.000000000 +1000 +@@ -1,4 +1,6 @@ -#!/usr/bin/tcl +#!/usr/bin/tclsh - # $Id$ - # Description: Interfacing to a Dectalk via TCL. - # Keywords: Emacspeak, Dectalk, TCL -@@ -56,6 +56,9 @@ - # s == some - - # }}} -+ +package require Tclx + - # {{{source common code + # Keywords: Emacspeak, ViaVoice Outloud , TCL + # {{{ LCD Entry: - set wd [file dirname $argv0] ---- emacspeak-23.505/servers/dtk-mv~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/dtk-mv 2006-02-08 14:51:05.000000000 +0900 -@@ -1,4 +1,4 @@ +--- emacspeak-25/servers/dtk-mv.1-tclx 2006-08-12 13:34:09.000000000 +1000 ++++ emacspeak-25/servers/dtk-mv 2007-01-22 10:10:47.000000000 +1000 +@@ -1,4 +1,6 @@ -#!/usr/bin/tcl +#!/usr/bin/tclsh ++package require Tclx ++ # $Id$ # Description: Interfacing to a Dectalk via TCL. # Keywords: Emacspeak, Dectalk, TCL -@@ -38,6 +38,9 @@ - # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - # }}} -+ -+package require Tclx -+ - # {{{commandabbreviations - - #This version uses shortened dtk command strings to improve performance ---- emacspeak-23.505/servers/ssh-dtk-exp~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/ssh-dtk-exp 2006-02-08 14:50:43.000000000 +0900 -@@ -1,4 +1,4 @@ +--- emacspeak-25/servers/dtk-exp.1-tclx 2006-11-04 01:19:06.000000000 +1000 ++++ emacspeak-25/servers/dtk-exp 2007-01-22 10:10:32.000000000 +1000 +@@ -1,4 +1,6 @@ -#!/usr/bin/tcl +#!/usr/bin/tclsh - #$Id$ - #Description: Launch a TTS server on a remote host. - #Copyright (C) 1995 -- 2003, T. V. Raman -@@ -6,6 +6,8 @@ - - # Running TTS server remotely. - # }}} +package require Tclx + - set host [exec hostname] - puts stderr "running on host <$host>" - if [expr $argc == 0] { ---- emacspeak-23.505/servers/dsp-outloud~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/dsp-outloud 2006-02-08 14:47:50.000000000 +0900 -@@ -1,4 +1,4 @@ + # $Id$ + # Description: Interfacing to a Dectalk via TCL. + # Keywords: Emacspeak, Dectalk, TCL +--- emacspeak-25/servers/speech-server.1-tclx 2006-08-12 13:34:09.000000000 +1000 ++++ emacspeak-25/servers/speech-server 2007-01-22 10:12:00.000000000 +1000 +@@ -1,4 +1,6 @@ -#!/usr/bin/tcl +#!/usr/bin/tclsh - # Keywords: Emacspeak, ViaVoice Outloud , TCL - # {{{ LCD Entry: - -@@ -32,6 +32,9 @@ - # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - # }}} -+ +package require Tclx + - # {{{source common code - - set wd [file dirname $argv0] ---- emacspeak-23.505/servers/speech-server~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/speech-server 2006-02-08 14:51:37.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/tcl -+#!/usr/bin/tclsh # $Id$ # Description: Speech server #Usage: tcl speech-server port device-specific-script -@@ -37,6 +37,9 @@ - # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - - # }}} -+ +--- emacspeak-25/servers/dtk-soft.1-tclx 2006-09-13 13:05:15.000000000 +1000 ++++ emacspeak-25/servers/dtk-soft 2007-01-22 10:11:22.000000000 +1000 +@@ -1,4 +1,6 @@ +-#!/usr/bin/tcl ++#!/usr/bin/tclsh +package require Tclx + - # {{{Initialize and get ready + # Keywords: Emacspeak, Software Dectalk , TCL + # {{{ LCD Entry: - set port [lindex $argv 0] ---- emacspeak-23.505/servers/ssh-outloud~ 2005-11-26 01:30:52.000000000 +0900 -+++ emacspeak-23.505/servers/ssh-outloud 2006-02-08 14:49:49.000000000 +0900 -@@ -1,4 +1,4 @@ +--- emacspeak-25/servers/ssh-outloud.1-tclx 2006-08-30 12:50:04.000000000 +1000 ++++ emacspeak-25/servers/ssh-outloud 2007-01-22 10:12:40.000000000 +1000 +@@ -1,4 +1,6 @@ + #!/usr/bin/tcl ++package require Tclx ++ + #$Id$ + #Description: Launch a TTS server on a remote host. + #Copyright (C) 1995 -- 2006, T. V. Raman +--- emacspeak-25/servers/ssh-dtk-exp.1-tclx 2006-08-30 12:50:04.000000000 +1000 ++++ emacspeak-25/servers/ssh-dtk-exp 2007-01-22 10:12:24.000000000 +1000 +@@ -1,4 +1,6 @@ -#!/usr/bin/tcl +#!/usr/bin/tclsh - #$Id$ - #Description: Launch a TTS server on a remote host. via ssh - #Copyright (C) 1995 -- 2003, T. V. Raman -@@ -17,6 +17,8 @@ - #"do you want to continue connecting" question. - - # }}} +package require Tclx + - set host [exec hostname] - puts stderr "running on host <$host>" - if [expr $argc == 0] { + #$Id$ + #Description: Launch a TTS server on a remote host. + #Copyright (C) 1995 -- 2006, T. V. Raman Index: emacspeak.spec =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- emacspeak.spec 12 Jul 2006 05:44:37 -0000 1.15 +++ emacspeak.spec 22 Jan 2007 00:19:25 -0000 1.16 @@ -1,9 +1,7 @@ -%define majver 23 - Summary: emacspeak -- The Complete Audio Desktop Name: emacspeak -Version: %{majver}.0 -Release: 2.1 +Version: 25 +Release: 1%{%dist} License: GPL Group: Applications/Editors Source: http://download.sourceforge.net/emacspeak/emacspeak-%{version}.tar.bz2 @@ -30,11 +28,10 @@ opens up the Internet to visually impaired users around the world. %prep -%setup -q -n %{name}-%{majver}.505 +%setup -q -c %patch0 -p1 %patch1 -p1 -b .1-tclx -find -type f -name .cvsignore | xargs rm %build make config SRC=`pwd` @@ -56,11 +53,11 @@ %post -/sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" +/sbin/install-info %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || : %preun if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" + /sbin/install-info --delete %{_infodir}/emacspeak.info.gz %{_infodir}/dir --section "Accessibility" || : fi %clean @@ -76,6 +73,11 @@ %{_infodir}/* %changelog +* Mon Jan 22 2007 Jens Petersen - 25-1%{%dist} +- update to version 25 + - update emacspeak-tcl-pkgreq-tclx.patch +- protect install-info in %%post and %%preun (Ville Skytt??, #223685) + * Wed Jul 12 2006 Jesse Keating - 23.0-2.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 15:35:34 -0000 1.6 +++ sources 22 Jan 2007 00:19:25 -0000 1.7 @@ -1 +1 @@ -95c09468fb4cc8d2d0cf1f7502f39ee2 emacspeak-23.0.tar.bz2 +0024036a113f743f81ce277f5f557de8 emacspeak-25.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 00:22:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 19:22:45 -0500 Subject: rpms/emacspeak/devel emacspeak.spec,1.16,1.17 Message-ID: <200701220022.l0M0Mjhl005760@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacspeak/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5731 Modified Files: emacspeak.spec Log Message: fix release field Index: emacspeak.spec =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- emacspeak.spec 22 Jan 2007 00:19:25 -0000 1.16 +++ emacspeak.spec 22 Jan 2007 00:22:43 -0000 1.17 @@ -1,7 +1,7 @@ Summary: emacspeak -- The Complete Audio Desktop Name: emacspeak Version: 25 -Release: 1%{%dist} +Release: 1%{?dist} License: GPL Group: Applications/Editors Source: http://download.sourceforge.net/emacspeak/emacspeak-%{version}.tar.bz2 @@ -73,7 +73,7 @@ %{_infodir}/* %changelog -* Mon Jan 22 2007 Jens Petersen - 25-1%{%dist} +* Mon Jan 22 2007 Jens Petersen - 25-1 - update to version 25 - update emacspeak-tcl-pkgreq-tclx.patch - protect install-info in %%post and %%preun (Ville Skytt??, #223685) From fedora-cvs-commits at redhat.com Mon Jan 22 00:37:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 19:37:03 -0500 Subject: rpms/gettext/devel gettext.spec,1.64,1.65 Message-ID: <200701220037.l0M0b3M4023773@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/gettext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23421 Modified Files: gettext.spec Log Message: - protect install-info in %%post and %%preun (Ville Skytta) Resolves: #223689 Index: gettext.spec =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gettext.spec 11 Jan 2007 09:18:10 -0000 1.64 +++ gettext.spec 22 Jan 2007 00:37:01 -0000 1.65 @@ -1,7 +1,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.16.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz @@ -116,12 +116,12 @@ %post /sbin/ldconfig -%{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir +%{install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || : %preun if [ "$1" = 0 ]; then - %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir + %{remove_install_info} %{_infodir}/gettext.info.gz %{_infodir}/dir || : fi exit 0 @@ -206,6 +206,9 @@ %changelog +* Mon Jan 22 2007 Jens Petersen - 0.16.1-2 +- protect install-info in %%post and %%preun (Ville Skytta, #223689) + * Fri Dec 22 2006 Jens Petersen - 0.16.1-1 - update to 0.16.1 From fedora-cvs-commits at redhat.com Mon Jan 22 00:42:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 19:42:41 -0500 Subject: rpms/gettext/devel gettext.spec,1.65,1.66 Message-ID: <200701220042.l0M0gfrN028024@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/gettext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27903 Modified Files: gettext.spec Log Message: bump release Index: gettext.spec =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- gettext.spec 22 Jan 2007 00:37:01 -0000 1.65 +++ gettext.spec 22 Jan 2007 00:42:38 -0000 1.66 @@ -1,7 +1,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.16.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz @@ -206,8 +206,8 @@ %changelog -* Mon Jan 22 2007 Jens Petersen - 0.16.1-2 -- protect install-info in %%post and %%preun (Ville Skytta, #223689) +* Mon Jan 22 2007 Jens Petersen - 0.16.1-3 +- protect install-info in %%post and %%preun (Ville Skytt??, #223689) * Fri Dec 22 2006 Jens Petersen - 0.16.1-1 - update to 0.16.1 From fedora-cvs-commits at redhat.com Mon Jan 22 03:35:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 22:35:06 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server-1.8.0-no-gnome-common.patch, 1.1, 1.2 evolution-data-server.spec, 1.145, 1.146 Message-ID: <200701220335.l0M3Z6gV011948@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11928 Modified Files: evolution-data-server-1.8.0-no-gnome-common.patch evolution-data-server.spec Log Message: * Sun Jan 21 2007 Matthew Barnes - 1.9.5-4.fc7 - Revise evolution-data-server-1.8.0-no-gnome-common.patch so that we no longer have to run autoconf before building. evolution-data-server-1.8.0-no-gnome-common.patch: configure | 135 ----------------------------------------------------------- configure.in | 2 2 files changed, 137 deletions(-) Index: evolution-data-server-1.8.0-no-gnome-common.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.8.0-no-gnome-common.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-data-server-1.8.0-no-gnome-common.patch 5 Sep 2006 03:25:40 -0000 1.1 +++ evolution-data-server-1.8.0-no-gnome-common.patch 22 Jan 2007 03:35:03 -0000 1.2 @@ -1,6 +1,150 @@ ---- evolution-data-server-1.5.4/configure.in.make_imap4_optional 2006-01-09 17:24:10.000000000 -0500 -+++ evolution-data-server-1.5.4/configure.in 2006-01-09 17:24:12.000000000 -0500 -@@ -1093,8 +1103,6 @@ +--- evolution-data-server-1.9.5/configure.no-gnome-common 2007-01-21 21:49:28.000000000 -0500 ++++ evolution-data-server-1.9.5/configure 2007-01-21 21:50:44.000000000 -0500 +@@ -29801,141 +29801,6 @@ + + + +- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then +- enableval="$enable_compile_warnings" +- +-else +- enable_compile_warnings="yes" +-fi; +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (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); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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 +- has_option=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-has_option=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6 +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 +- echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6 +- +- # Check whether --enable-iso-c or --disable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then +- enableval="$enable_iso_c" +- +-else +- enable_iso_c=no +-fi; +- +- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6 +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- +-CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) + # Turn off the annoying "comparison between signed and unsigned" +--- evolution-data-server-1.9.5/configure.in.no-gnome-common 2007-01-08 11:49:57.000000000 -0500 ++++ evolution-data-server-1.9.5/configure.in 2007-01-21 21:49:01.000000000 -0500 +@@ -1206,8 +1206,6 @@ dnl CFLAGS and LIBS and stuff dnl ************************* Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- evolution-data-server.spec 10 Jan 2007 17:14:51 -0000 1.145 +++ evolution-data-server.spec 22 Jan 2007 03:35:03 -0000 1.146 @@ -25,7 +25,7 @@ Name: evolution-data-server Version: 1.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -246,16 +246,6 @@ -Werror-implicit-function-declaration" %endif -# Rerun automake since we patched some Makefile.am files: -aclocal -autoheader -automake -libtoolize -intltoolize --force - -# Rerun autoconf since we patched configure.in: -autoconf - # See Ross Burton's blog entry for why we want --with-libdb. # http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40 @@ -384,6 +374,10 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Sun Jan 21 2007 Matthew Barnes - 1.9.5-4.fc7 +- Revise evolution-data-server-1.8.0-no-gnome-common.patch so that we no + longer have to run autoconf before building. + * Wed Jan 10 2007 Matthew Barnes - 1.9.5-3.fc7 - Add patch for GNOME bug #359979 (change EMsgPort semantics). From fedora-cvs-commits at redhat.com Mon Jan 22 03:37:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 22:37:23 -0500 Subject: rpms/evolution/devel evolution-2.5.4-fix-conduit-dir.patch, 1.1, 1.2 evolution-2.7.1-no-gnome-common.patch, 1.2, 1.3 evolution.spec, 1.224, 1.225 Message-ID: <200701220337.l0M3bN6H012031@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12007 Modified Files: evolution-2.5.4-fix-conduit-dir.patch evolution-2.7.1-no-gnome-common.patch evolution.spec Log Message: * Sun Jan 21 2007 Matthew Barnes - 2.9.5-3.fc7 - Revise evolution-2.7.1-no-gnome-common.patch so that we no longer have to run autoconf before building. - Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer have to run automake before building. evolution-2.5.4-fix-conduit-dir.patch: addressbook/conduit/Makefile.am | 2 +- addressbook/conduit/Makefile.in | 2 +- calendar/conduits/calendar/Makefile.am | 2 +- calendar/conduits/calendar/Makefile.in | 2 +- calendar/conduits/memo/Makefile.am | 2 +- calendar/conduits/memo/Makefile.in | 2 +- calendar/conduits/todo/Makefile.am | 2 +- calendar/conduits/todo/Makefile.in | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) Index: evolution-2.5.4-fix-conduit-dir.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-conduit-dir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.5.4-fix-conduit-dir.patch 11 Jan 2006 05:57:14 -0000 1.1 +++ evolution-2.5.4-fix-conduit-dir.patch 22 Jan 2007 03:37:21 -0000 1.2 @@ -1,5 +1,5 @@ ---- evolution-2.5.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2004-12-02 22:39:53.000000000 -0500 -+++ evolution-2.5.4/addressbook/conduit/Makefile.am 2006-01-11 00:21:25.000000000 -0500 +--- evolution-2.9.5/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.9.5/addressbook/conduit/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -28,7 +28,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -9,36 +9,80 @@ conduit_DATA = e-address-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.5.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2005-06-26 20:43:06.000000000 -0400 -+++ evolution-2.5.4/calendar/conduits/calendar/Makefile.am 2006-01-11 00:21:25.000000000 -0500 +--- evolution-2.9.5/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-01-21 22:05:44.000000000 -0500 ++++ evolution-2.9.5/addressbook/conduit/Makefile.in 2007-01-21 22:06:04.000000000 -0500 +@@ -459,7 +459,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-address-$(BASE_VERSION).conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +--- evolution-2.9.5/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/todo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar-$(BASE_VERSION).conduit + conduit_DATA = e-todo-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.5.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2005-06-26 20:43:07.000000000 -0400 -+++ evolution-2.5.4/calendar/conduits/todo/Makefile.am 2006-01-11 00:21:25.000000000 -0500 +--- evolution-2.9.5/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:31.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/todo/Makefile.in 2007-01-21 22:06:39.000000000 -0500 +@@ -454,7 +454,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-todo-$(BASE_VERSION).conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +--- evolution-2.9.5/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/memo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo-$(BASE_VERSION).conduit + conduit_DATA = e-memo-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.5.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2006-01-11 00:22:26.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/memo/Makefile.am 2006-01-11 00:22:39.000000000 -0500 +--- evolution-2.9.5/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:46.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/memo/Makefile.in 2007-01-21 22:06:54.000000000 -0500 +@@ -454,7 +454,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-memo-$(BASE_VERSION).conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +--- evolution-2.9.5/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/calendar/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo-$(BASE_VERSION).conduit + conduit_DATA = e-calendar-$(BASE_VERSION).conduit + + BUILT_SOURCES = $(conduit_DATA) +--- evolution-2.9.5/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-01-21 22:06:15.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/calendar/Makefile.in 2007-01-21 22:06:23.000000000 -0500 +@@ -456,7 +456,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-calendar-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) evolution-2.7.1-no-gnome-common.patch: configure | 135 ----------------------------------------------------------- configure.in | 3 - 2 files changed, 138 deletions(-) Index: evolution-2.7.1-no-gnome-common.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.1-no-gnome-common.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- evolution-2.7.1-no-gnome-common.patch 17 May 2006 17:21:50 -0000 1.2 +++ evolution-2.7.1-no-gnome-common.patch 22 Jan 2007 03:37:21 -0000 1.3 @@ -1,6 +1,150 @@ ---- evolution-2.7.1/configure.in.no-gnome-common 2006-04-24 07:17:07.000000000 -0400 -+++ evolution-2.7.1/configure.in 2006-05-12 14:46:29.000000000 -0400 -@@ -1072,9 +1080,6 @@ +--- evolution-2.9.5/configure.no-gnome-common 2007-01-21 22:00:01.000000000 -0500 ++++ evolution-2.9.5/configure 2007-01-21 22:00:53.000000000 -0500 +@@ -30764,141 +30764,6 @@ + + + +- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then +- enableval="$enable_compile_warnings" +- +-else +- enable_compile_warnings="yes" +-fi; +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (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); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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 +- has_option=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-has_option=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6 +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 +- echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6 +- +- # Check whether --enable-iso-c or --disable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then +- enableval="$enable_iso_c" +- +-else +- enable_iso_c=no +-fi; +- +- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6 +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- +-CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) + # Turn off the annoying "comparison between signed and unsigned" +--- evolution-2.9.5/configure.in.no-gnome-common 2007-01-08 11:54:43.000000000 -0500 ++++ evolution-2.9.5/configure.in 2007-01-21 21:57:28.000000000 -0500 +@@ -1133,9 +1133,6 @@ dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- evolution.spec 10 Jan 2007 17:15:05 -0000 1.224 +++ evolution.spec 22 Jan 2007 03:37:21 -0000 1.225 @@ -44,13 +44,13 @@ Name: evolution Version: 2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: %{name}-%{version}.tar.bz2 +Source: evolution-%{version}.tar.bz2 Source1: evolution16.png Source2: evolution22.png Source3: evolution24.png @@ -275,7 +275,7 @@ Development files needed for building things which link against evolution. %prep -%setup -q +%setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar %patch12 -p1 -b .move-autosave-file @@ -410,13 +410,13 @@ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 export tagname=CC -make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install +make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # remove libtool archives for importers and the like @@ -460,14 +460,14 @@ for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done -%find_lang %name-%{evo_major} +%find_lang evolution-%{evo_major} %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null done scrollkeeper-update -q @@ -478,7 +478,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}-%{evo_major}.lang +%files -f evolution-%{evo_major}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README @@ -725,6 +725,12 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sun Jan 21 2007 Matthew Barnes - 2.9.5-3.fc7 +- Revise evolution-2.7.1-no-gnome-common.patch so that we no longer + have to run autoconf before building. +- Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer + have to run automake before building. + * Wed Jan 10 2007 Matthew Barnes - 2.9.5-2.fc7 - Add patch for GNOME bug #359979 (change EMsgPort semantics). From fedora-cvs-commits at redhat.com Mon Jan 22 03:38:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 22:38:50 -0500 Subject: rpms/evolution-connector/devel evolution-connector.spec, 1.85, 1.86 evolution-exchange-2.7.2-no_gnome_common.patch, 1.1, 1.2 Message-ID: <200701220338.l0M3comT012130@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12108 Modified Files: evolution-connector.spec evolution-exchange-2.7.2-no_gnome_common.patch Log Message: * Sun Jan 21 2007 Matthew Barnes - 2.9.5-2.fc7 - Revise evolution-exchange-2.7.2-no_gnome_common.patch so that we no longer have to run autoconf before building. Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- evolution-connector.spec 9 Jan 2007 02:52:27 -0000 1.85 +++ evolution-connector.spec 22 Jan 2007 03:38:48 -0000 1.86 @@ -22,7 +22,7 @@ Name: evolution-connector Version: 2.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: Evolution plugin to interact with MS Exchange Server @@ -51,15 +51,12 @@ ### Build Dependencies ### -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1.9 BuildRequires: evolution >= %{evo_version} BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: evolution-devel >= %{evo_version} BuildRequires: gettext BuildRequires: gnutls BuildRequires: gtk-doc -BuildRequires: intltool >= 0.35 BuildRequires: libsoup-devel >= %{libsoup_version} BuildRequires: libtool >= 1.5 BuildRequires: openldap-evolution-devel @@ -103,10 +100,6 @@ -Werror-implicit-function-declaration" %endif -# Rerun the GNU Autotools since we patched some of the input files. -# Disable portability checking to keep automake 1.10 quiet. -autoreconf --force --warnings=no-portability - %configure \ --enable-gtk-doc \ --with-openldap=%{_libdir}/evolution-openldap \ @@ -145,6 +138,10 @@ %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas %changelog +* Sun Jan 21 2007 Matthew Barnes - 2.9.5-2.fc7 +- Revise evolution-exchange-2.7.2-no_gnome_common.patch so that we no longer + have to run autoconf before building. + * Mon Jan 08 2007 Matthew Barnes - 2.9.5-1.fc7 - Update to 2.9.5 - Remove patch for GNOME bug #357660 (fixed upstream). evolution-exchange-2.7.2-no_gnome_common.patch: configure | 135 ----------------------------------------------------------- configure.in | 2 2 files changed, 137 deletions(-) Index: evolution-exchange-2.7.2-no_gnome_common.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-exchange-2.7.2-no_gnome_common.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-exchange-2.7.2-no_gnome_common.patch 18 May 2006 18:18:31 -0000 1.1 +++ evolution-exchange-2.7.2-no_gnome_common.patch 22 Jan 2007 03:38:48 -0000 1.2 @@ -1,5 +1,5 @@ ---- evolution-exchange-2.7.2/configure.in.no_gnome_common 2006-05-18 13:49:24.000000000 -0400 -+++ evolution-exchange-2.7.2/configure.in 2006-05-18 13:49:32.000000000 -0400 +--- evolution-exchange-2.9.5/configure.in.no_gnome_common 2007-01-08 11:50:35.000000000 -0500 ++++ evolution-exchange-2.9.5/configure.in 2007-01-21 22:11:46.000000000 -0500 @@ -95,8 +95,6 @@ dnl CFLAGS and LIBS and stuff dnl ************************* @@ -9,3 +9,147 @@ case $CFLAGS in *-Wall*) CFLAGS="$CFLAGS -Wno-sign-compare" +--- evolution-exchange-2.9.5/configure.no_gnome_common 2007-01-21 22:12:23.000000000 -0500 ++++ evolution-exchange-2.9.5/configure 2007-01-21 22:13:03.000000000 -0500 +@@ -21924,141 +21924,6 @@ + + + +- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then +- enableval="$enable_compile_warnings" +- +-else +- enable_compile_warnings="maximum" +-fi; +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (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); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (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 +- has_option=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-has_option=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6 +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 +- echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6 +- +- # Check whether --enable-iso-c or --disable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then +- enableval="$enable_iso_c" +- +-else +- enable_iso_c=no +-fi; +- +- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6 +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- +-CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) + CFLAGS="$CFLAGS -Wno-sign-compare" From fedora-cvs-commits at redhat.com Mon Jan 22 04:08:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 23:08:35 -0500 Subject: rpms/gnome-desktop/devel .cvsignore, 1.40, 1.41 gnome-desktop.spec, 1.71, 1.72 sources, 1.40, 1.41 Message-ID: <200701220408.l0M48ZWo000486@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv470 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 11 Jan 2007 03:44:21 -0000 1.40 +++ .cvsignore 22 Jan 2007 04:08:33 -0000 1.41 @@ -1 +1 @@ -gnome-desktop-2.17.5.tar.bz2 +gnome-desktop-2.17.90.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- gnome-desktop.spec 11 Jan 2007 03:50:22 -0000 1.71 +++ gnome-desktop.spec 22 Jan 2007 04:08:33 -0000 1.72 @@ -1,23 +1,20 @@ -%define glib2_version 2.8.0 -%define pango_version 1.2.0 +%define libxml2_version 2.4.20 %define gtk2_version 2.8.0 -%define gconf2_version 1.2.1 +%define glib2_version 2.8.0 %define gnome_vfs2_version 2.2.0 %define libgnomeui_version 2.2.0 -%define libgnome_version 2.2.0 +%define libgnomecanvas_version 2.0.0 %define startup_notification_version 0.5 -%define po_package gnome-desktop-2.0 %define gnome_doc_utils_version 0.3.2 +%define po_package gnome-desktop-2.0 + Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.17/%{name}-%{version}.tar.bz2 -# FIXME: why are these needed ? -Source2: gnome-money.png -Source3: gnome-modem.png License: GPL Group: System Environment/Libraries @@ -28,26 +25,22 @@ Requires: redhat-artwork Requires: redhat-menus -Requires: startup-notification >= 0.5 Obsoletes: gnome-core gnome-core-devel Provides: gnome-core -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: pango-devel >= %{pango_version} +BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: GConf2-devel >= %{gconf2_version} +BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: libgnome-devel >= %{libgnome_version} +BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version} BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} -BuildRequires: scrollkeeper gettext +BuildRequires: scrollkeeper +BuildRequires: gettext BuildRequires: perl-XML-Parser -PreReq: GConf2 -PreReq: /usr/bin/gconftool-2 - %description The gnome-desktop package contains an internal library @@ -60,18 +53,19 @@ Group: Development/Libraries Requires: %name = %{version}-%{release} -Requires: glib2-devel >= %{glib2_version} +Requires: libxml2-devel >= %{libxml2_version} Requires: gtk2-devel >= %{gtk2_version} -Requires: GConf2-devel >= %{gconf2_version} +Requires: glib2-devel >= %{glib2_version} Requires: gnome-vfs2-devel >= %{gnome_vfs2_version} Requires: libgnomeui-devel >= %{libgnomeui_version} -Requires: libgnome-devel >= %{libgnome_version} +Requires: libgnomecanvas-devel >= %{libgnomecanvas_version} Requires: startup-notification-devel >= %{startup_notification_version} +Requires: gnome-doc-utils >= %{gnome_doc_utils_version} Requires: pkgconfig %description devel Libraries and header files for the GNOME-internal private library -libgnomedesktop +libgnomedesktop. %prep %setup -q @@ -79,9 +73,6 @@ %patch1 -p1 -b .kdetheme %patch2 -p1 -b .menu -cp -f %{SOURCE2} pixmaps/ -cp -f %{SOURCE3} pixmaps/ - %build %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper @@ -132,6 +123,11 @@ %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Sun Jan 21 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 +- Drop some long-obsolete images +- Clean up BuildRequires + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 11 Jan 2007 03:44:21 -0000 1.40 +++ sources 22 Jan 2007 04:08:33 -0000 1.41 @@ -1 +1 @@ -d5ae7812c8c824b1c2d9700bf2ce9994 gnome-desktop-2.17.5.tar.bz2 +16502fe04d2e1e959066afe9832efd05 gnome-desktop-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 04:58:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 21 Jan 2007 23:58:34 -0500 Subject: rpms/gnome-session/devel .cvsignore, 1.31, 1.32 gnome-session-2.17.5-window-manager.patch, 1.1, 1.2 gnome-session.spec, 1.102, 1.103 sources, 1.31, 1.32 Message-ID: <200701220458.l0M4wY9J010847@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10736 Modified Files: .cvsignore gnome-session-2.17.5-window-manager.patch gnome-session.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 11 Jan 2007 03:49:24 -0000 1.31 +++ .cvsignore 22 Jan 2007 04:58:32 -0000 1.32 @@ -1 +1 @@ -gnome-session-2.17.5.tar.bz2 +gnome-session-2.17.90.tar.bz2 gnome-session-2.17.5-window-manager.patch: data/gnome-session.schemas.in | 13 ++++++++++++- gnome-session/gnome-wm | 7 ++++++- 2 files changed, 18 insertions(+), 2 deletions(-) Index: gnome-session-2.17.5-window-manager.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.17.5-window-manager.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-session-2.17.5-window-manager.patch 11 Jan 2007 19:10:47 -0000 1.1 +++ gnome-session-2.17.5-window-manager.patch 22 Jan 2007 04:58:32 -0000 1.2 @@ -1,5 +1,5 @@ ---- gnome-session-2.17.5/gnome-session/gnome-session.schemas.in.window-manager 2007-01-08 17:32:28.000000000 -0500 -+++ gnome-session-2.17.5/gnome-session/gnome-session.schemas.in 2007-01-11 14:05:30.000000000 -0500 +--- gnome-session-2.17.5/data/gnome-session.schemas.in.window-manager 2007-01-08 17:32:28.000000000 -0500 ++++ gnome-session-2.17.5/data/gnome-session.schemas.in 2007-01-11 14:05:30.000000000 -0500 @@ -2,11 +2,22 @@ Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- gnome-session.spec 11 Jan 2007 19:26:12 -0000 1.102 +++ gnome-session.spec 22 Jan 2007 04:58:32 -0000 1.103 @@ -1,22 +1,20 @@ -%define glib2_version 2.2.0 -%define pango_version 1.2.0 -%define gtk2_version 2.2.0 -%define libgnome_version 2.3.0 +%define esound_version 0.2.26 %define libgnomeui_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 gtk2_version 2.3.1 %define dbus_glib_version 0.70 %define dbus_version 0.90 +%define gnome_keyring_version 0.5.1 +%define gconf2_version 2.14.0 +%define libnotify_version 0.2.1 %define po_package gnome-session-2.0 Summary: GNOME session manager Name: gnome-session -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} URL: http://www.gnome.org -Source0: %{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-session/2.17/%{name}-%{version}.tar.bz2 Source1: redhat-default-session Source2: gnome.desktop License: GPL @@ -39,12 +37,14 @@ Patch1: gnome-session-2.2.2-icons.patch Patch2: gnome-session-2.0.5-login.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=399259 Patch3: gnome-session-2.0.5-dithering.patch # Launch gnome-user-share on login if enabled Patch7: gnome-session-2.13.92-user-share.patch # do shaped window for splash screen +# http://bugzilla.gnome.org/show_bug.cgi?id=399262 Patch8: gnome-session-2.16.0-shaped.patch # too much crashing @@ -55,19 +55,21 @@ # need to figure something out here Patch13: gnome-session-2.17.5-window-manager.patch - -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: gtk2-devel >= %{gtk2_version} -BuildRequires: libgnome-devel >= %{libgnome_version} +BuildRequires: esound-devel >= %{esound_version} +BuildRequires: /usr/bin/esd BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} -BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} +BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} -BuildRequires: libnotify-devel +BuildRequires: gnome-keyring >= %{gnome_keyring_version} +BuildRequires: libnotify-devel >= %{libnotify_version} +BuildRequires: GConf2-devel >= %{gconf2_version} +BuildRequires: gnome-desktop +BuildRequires: pango-devel BuildRequires: control-center-devel BuildRequires: desktop-file-utils +BuildRequires: libXau-devel +BuildRequires: libXrandr-devel # this is so the configure checks find /usr/bin/halt etc. BuildRequires: usermode @@ -78,9 +80,9 @@ BuildRequires: libX11-devel libXt-devel BuildRequires: libXrandr-devel -Requires(pre): GConf2 >= 2.14 -Requires(post): GConf2 >= 2.14 -Requires(preun): GConf2 >= 2.14 +Requires(pre): GConf2 >= %{gconf2_version} +Requires(post): GConf2 >= %{gconf2_version} +Requires(preun): GConf2 >= %{gconf2_version} %description @@ -111,7 +113,7 @@ autoheader autoconf -%configure --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot +%configure --enable-esd --with-halt-command=/usr/bin/poweroff --with-reboot-command=/usr/bin/reboot make %install @@ -155,9 +157,9 @@ rm -rf $RPM_BUILD_ROOT %post +/sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnome-session.schemas >& /dev/null || : -/sbin/ldconfig %pre if [ "$1" -gt 1 ]; then @@ -190,6 +192,10 @@ %{_datadir}/gnome/wm-properties %changelog +* Sun Jan 21 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 +- Clean up BuildRequires + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 11 Jan 2007 03:49:25 -0000 1.31 +++ sources 22 Jan 2007 04:58:32 -0000 1.32 @@ -1 +1 @@ -6fb7919586e8c60bcbde12b3404c26d7 gnome-session-2.17.5.tar.bz2 +ed217f427544c6c7b058f44d964fbdd1 gnome-session-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 05:16:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 00:16:18 -0500 Subject: rpms/gnome-session/devel gnome-session.spec,1.103,1.104 Message-ID: <200701220516.l0M5GIXw017732@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17648 Modified Files: gnome-session.spec Log Message: fix BRs Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- gnome-session.spec 22 Jan 2007 04:58:32 -0000 1.103 +++ gnome-session.spec 22 Jan 2007 05:16:15 -0000 1.104 @@ -64,7 +64,7 @@ BuildRequires: gnome-keyring >= %{gnome_keyring_version} BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: GConf2-devel >= %{gconf2_version} -BuildRequires: gnome-desktop +BuildRequires: gnome-desktop-devel BuildRequires: pango-devel BuildRequires: control-center-devel BuildRequires: desktop-file-utils From fedora-cvs-commits at redhat.com Mon Jan 22 05:32:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 00:32:27 -0500 Subject: rpms/gnome-session/devel gnome-session.spec,1.104,1.105 Message-ID: <200701220532.l0M5WRPR013667@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13524 Modified Files: gnome-session.spec Log Message: fix file lists Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- gnome-session.spec 22 Jan 2007 05:16:15 -0000 1.104 +++ gnome-session.spec 22 Jan 2007 05:32:25 -0000 1.105 @@ -188,8 +188,8 @@ %{_bindir}/* %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/xdg/autostart -%{_datadir}/gnome/autostart -%{_datadir}/gnome/wm-properties +%{_datadir}/icons/hicolor/*/apps/session-properties.png +%{_datadir}/icons/hicolor/scalable/apps/session-properties.svg %changelog * Sun Jan 21 2007 Matthias Clasen - 2.17.90-1 From fedora-cvs-commits at redhat.com Mon Jan 22 06:05:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 01:05:46 -0500 Subject: rpms/gnome-panel/devel gnome-panel-2.17.90-about-fedora.patch, NONE, 1.1 gnome-panel-2.17.90-move-suspend-to-menu.patch, NONE, 1.1 gnome-panel-2.17.90-no-seconds.patch, NONE, 1.1 gnome-panel-2.17.90-vendor.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 gnome-panel.spec, 1.174, 1.175 sources, 1.48, 1.49 Message-ID: <200701220605.l0M65k1d008622@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8582 Modified Files: .cvsignore gnome-panel.spec sources Added Files: gnome-panel-2.17.90-about-fedora.patch gnome-panel-2.17.90-move-suspend-to-menu.patch gnome-panel-2.17.90-no-seconds.patch gnome-panel-2.17.90-vendor.patch Log Message: update patches gnome-panel-2.17.90-about-fedora.patch: panel-menu-items.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gnome-panel-2.17.90-about-fedora.patch --- --- gnome-panel-2.17.90/gnome-panel/panel-menu-items.c.about-fedora 2007-01-22 00:50:43.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-menu-items.c 2007-01-22 00:51:36.000000000 -0500 @@ -705,6 +705,7 @@ panel_menu_items_append_from_desktop (desktop_menu, "gnome-yelp.desktop", NULL); panel_menu_items_append_from_desktop (desktop_menu, "gnome-about.desktop", NULL); + panel_menu_items_append_from_desktop (desktop_menu, "about-fedora.desktop", NULL); if (desktop_item->priv->append_lock_logout) panel_menu_items_append_lock_logout (desktop_menu); gnome-panel-2.17.90-move-suspend-to-menu.patch: panel-action-button.c | 52 ++++++++++++++++++++++++++++++++ panel-enums.h | 1 panel-logout.c | 4 -- panel-menu-items.c | 23 +++++++++++++- panel-power-manager.h | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 5 deletions(-) --- NEW FILE gnome-panel-2.17.90-move-suspend-to-menu.patch --- --- gnome-panel-2.17.90/gnome-panel/panel-enums.h.move-suspend-to-menu 2007-01-21 17:43:12.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-enums.h 2007-01-22 00:52:38.000000000 -0500 @@ -96,6 +96,7 @@ 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.17.90/gnome-panel/panel-logout.c.move-suspend-to-menu 2007-01-21 17:43:12.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-logout.c 2007-01-22 00:52:38.000000000 -0500 @@ -332,10 +332,6 @@ primary_text = _("Shut down this system now?"); logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN; - if (panel_power_manager_can_suspend (logout_dialog->priv->power_manager)) - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("S_uspend"), - PANEL_LOGOUT_RESPONSE_STR); if (panel_power_manager_can_hibernate (logout_dialog->priv->power_manager)) gtk_dialog_add_button (GTK_DIALOG (logout_dialog), --- gnome-panel-2.17.90/gnome-panel/panel-action-button.c.move-suspend-to-menu 2007-01-22 00:52:38.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-action-button.c 2007-01-22 00:54:12.000000000 -0500 @@ -47,12 +47,18 @@ #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)) #define LOGOUT_PROMPT_KEY "/apps/gnome-session/options/logout_prompt" +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, @@ -79,6 +85,7 @@ { 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 }, @@ -180,12 +187,47 @@ } static gboolean +panel_action_can_suspend (void) +{ + PanelPowerManager *manager; + gboolean can_suspend; + + manager = panel_get_power_manager (); + + can_suspend = panel_power_manager_can_suspend (manager); + + g_object_unref (manager); + + return can_suspend; +} + +static gboolean panel_action_shutdown_is_disabled (void) { return (panel_lockdown_get_disable_log_out() || !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_attempt_suspend (manager); + + g_object_unref (manager); +} + /* Run Application */ static void @@ -364,6 +406,16 @@ 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, --- gnome-panel-2.17.90/gnome-panel/panel-menu-items.c.move-suspend-to-menu 2007-01-22 00:52:38.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-menu-items.c 2007-01-22 00:52:38.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" @@ -994,10 +995,22 @@ } menuitem->priv->append_lock_logout = append_lock_logout; - if (append_lock_logout) + if (append_lock_logout) { + 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), menuitem->priv->menu); @@ -1102,6 +1115,14 @@ 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) --- gnome-panel-2.17.90/gnome-panel/panel-power-manager.h.move-suspend-to-menu 2007-01-22 00:55:33.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-power-manager.h 2007-01-21 17:43:12.000000000 -0500 @@ -0,0 +1,80 @@ +/* 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 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_SUSPENDING = 0, + PANEL_POWER_MANAGER_ERROR_HIBERNATING +}; + +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_suspend (PanelPowerManager *manager); +gboolean panel_power_manager_can_hibernate (PanelPowerManager *manager); +gboolean panel_power_manager_can_power_down (PanelPowerManager *manager); +gboolean panel_power_manager_can_restart (PanelPowerManager *manager); + +void panel_power_manager_attempt_suspend (PanelPowerManager *manager); +void panel_power_manager_attempt_hibernate (PanelPowerManager *manager); + +PanelPowerManager *panel_get_power_manager (void); + +G_END_DECLS + +#endif /* PANEL_POWER_MANAGER_H */ gnome-panel-2.17.90-no-seconds.patch: clock.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) --- NEW FILE gnome-panel-2.17.90-no-seconds.patch --- --- gnome-panel-2.17.90/applets/clock/clock.c.no-seconds 2007-01-21 17:43:14.000000000 -0500 +++ gnome-panel-2.17.90/applets/clock/clock.c 2007-01-22 00:57:25.000000000 -0500 @@ -50,6 +50,7 @@ #ifdef HAVE_LANGINFO_H #include #endif +#include #include #include @@ -244,6 +245,7 @@ { ClockData *cd = data; time_t new_time; + int timeouttime; time (&new_time); @@ -263,7 +265,20 @@ update_clock (cd); } - return TRUE; + if (cd->format == CLOCK_FORMAT_INTERNET) + timeouttime = INTERNETSECOND; + else { + struct timeval tv; + gettimeofday(&tv, NULL); + timeouttime = (1000000 - tv.tv_usec)/1000+1; + if (!cd->showseconds) + timeouttime += 1000 * (59 - cd->current_time % 60); + } + cd->timeout = g_timeout_add (timeouttime, + clock_timeout_callback, + cd); + + return FALSE; } static float @@ -490,8 +505,13 @@ if (cd->format == CLOCK_FORMAT_INTERNET) timeouttime = INTERNETSECOND; - else - timeouttime = 1000; + else { + struct timeval tv; + gettimeofday(&tv, NULL); + timeouttime = (1000000 - tv.tv_usec)/1000+1; + if (!cd->showseconds) + timeouttime += 1000 * (59 - cd->current_time % 60); + } cd->timeout = g_timeout_add (timeouttime, clock_timeout_callback, gnome-panel-2.17.90-vendor.patch: panel-menu-items.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE gnome-panel-2.17.90-vendor.patch --- --- gnome-panel-2.17.90/gnome-panel/panel-menu-items.c.vendor 2007-01-21 17:43:12.000000000 -0500 +++ gnome-panel-2.17.90/gnome-panel/panel-menu-items.c 2007-01-22 00:49:36.000000000 -0500 @@ -576,7 +576,7 @@ HOME_NAME_KEY, NULL); panel_menu_items_append_from_desktop (places_menu, - "nautilus-home.desktop", + "gnome-nautilus-home.desktop", gconf_name); if (gconf_name) g_free (gconf_name); @@ -611,7 +611,7 @@ COMPUTER_NAME_KEY, NULL); panel_menu_items_append_from_desktop (places_menu, - "nautilus-computer.desktop", + "gnome-nautilus-computer.desktop", gconf_name); if (gconf_name) g_free (gconf_name); @@ -624,7 +624,7 @@ add_menu_separator (places_menu); panel_menu_items_append_from_desktop (places_menu, - "network-scheme.desktop", + "gnome-network-scheme.desktop", NULL); panel_place_menu_item_append_volumes (places_menu, TRUE); @@ -703,7 +703,7 @@ add_menu_separator (desktop_menu); - panel_menu_items_append_from_desktop (desktop_menu, "yelp.desktop", NULL); + panel_menu_items_append_from_desktop (desktop_menu, "gnome-yelp.desktop", NULL); panel_menu_items_append_from_desktop (desktop_menu, "gnome-about.desktop", NULL); if (desktop_item->priv->append_lock_logout) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 5 Dec 2006 17:51:42 -0000 1.48 +++ .cvsignore 22 Jan 2007 06:05:44 -0000 1.49 @@ -1 +1 @@ -gnome-panel-2.16.2.tar.bz2 +gnome-panel-2.17.90.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- gnome-panel.spec 14 Jan 2007 08:05:53 -0000 1.174 +++ gnome-panel.spec 22 Jan 2007 06:05:44 -0000 1.175 @@ -1,27 +1,28 @@ %define gettext_package gnome-panel-2.0 -%define gtk2_version 2.7.1 +%define gnome_desktop_version 2.11.1 +%define gtk2_version 2.10.0 %define libglade2_version 2.5.0 +%define libgnome_version 2.13.0 %define libgnomeui_version 2.5.4 -%define gnome_desktop_version 2.9.91 -%define libwnck_version 2.9.92 -%define libbonobo_version 2.3.0 %define libbonoboui_version 2.3.0 -%define gnome_vfs2_version 2.9.1 +%define orbit_version 2.4.0 +%define gnome_vfs2_version 2.14.2 +%define libwnck_version 2.13.5 +%define gconf_version 2.14 %define gnome_menus_version 2.11.1 %define evolution_data_server_version 1.9.1 -%define orbit_version 2.4.0 -%define gtk2_version 2.7.1 +%define cairo_version 1.0.0 %define dbus_version 0.60 +%define dbus_glib_version 0.60 %define gnome_doc_utils_version 0.3.2 -%define gconf_version 2.14 %define use_evolution_data_server 1 Summary: GNOME panel Name: gnome-panel -Version: 2.16.2 -Release: 2%{?dist} +Version: 2.17.90 +Release: 1%{?dist} 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 @@ -30,7 +31,7 @@ Source4: add-translations.sh License: GPL Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gnome-desktop >= %{gnome_desktop_version} Requires: libwnck >= %{libwnck_version} @@ -39,10 +40,6 @@ Requires: evolution-data-server >= %{evolution_data_server_version} %endif -Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm -Prereq: GConf2 >= 2.6.0-2 -Prereq: scrollkeeper -Prereq: gtk2 >= %{gtk2_version} Requires(post): GConf2 >= %{gconf_version} Requires(post): scrollkeeper Requires(post): hicolor-icon-theme @@ -50,7 +47,6 @@ Requires(preun): GConf2 >= %{gconf_version} Requires(postun): scrollkeeper -BuildRequires: which BuildRequires: libxml2-python BuildRequires: intltool BuildRequires: gettext @@ -61,36 +57,42 @@ BuildRequires: libxslt BuildRequires: libX11-devel BuildRequires: libXt-devel +BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libglade2-devel >= %{libglade2_version} +BuildRequires: libgnome-devel >= %{libgnome_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} -BuildRequires: libwnck-devel >= %{libwnck_version} -BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} +BuildRequires: libwnck-devel >= %{libwnck_version} +BuildRequires: GConf2-devel >= %{gconf_version} BuildRequires: gnome-menus-devel >= %{gnome_menus_version} +BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} +BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: gtk-doc +BuildRequires: pango-devel +BuildRequires: libbonobo-devel +BuildRequires: libXau-devel %if %{use_evolution_data_server} BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version} BuildRequires: ORBit2-devel >= %{orbit_version} BuildRequires: dbus-devel >= %{dbus_version} %endif -Patch0: gnome-panel-2.12.1-vendor.patch +Patch0: gnome-panel-2.17.90-vendor.patch Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch -Patch5: gnome-panel-2.12.1-about-fedora.patch -Patch6: gnome-panel-2.13.5-switch-user.patch +Patch5: gnome-panel-2.17.90-about-fedora.patch Patch8: gnome-panel-2.16.1-search.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=399270 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=399274 Patch12: gnome-panel-2.14.2-xio-error.patch -Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch -Patch14: gnome-panel-2.15.92-no-seconds.patch +Patch13: gnome-panel-2.17.90-move-suspend-to-menu.patch +Patch14: gnome-panel-2.17.90-no-seconds.patch Patch15: gnome-panel-2.16.0-compiz-support.patch # gnome bugzilla 365640 Patch16: gnome-panel-2.16.0-fix-chinese.patch -Patch18: gnome-panel-2.16.0-respect-session-properties.patch Conflicts: gnome-power-manager < 2.15.3 @@ -117,7 +119,6 @@ %patch0 -p1 -b .vendor %patch2 -p1 -b .speak-to-us-ye-old-wise-fish %patch5 -p1 -b .about-fedora -%patch6 -p1 -b .switch-user %patch8 -p1 -b .search %patch9 -p1 -b .ignore-unknown-options %patch12 -p1 -b .xio-error @@ -125,7 +126,6 @@ %patch14 -p1 -b .no-seconds %patch15 -p0 -b .compiz-support %patch16 -p1 -b .fix-chinese -%patch18 -p1 -b .respect-session-properties.patch . %{SOURCE4} @@ -298,6 +298,11 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 +- Clean up BuildRequires +- Allow user switching from the logout dialog + * Sun Jan 14 2007 Matthias Clasen - 2.16.2-2 - Check for the right tracker desktop file Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 5 Dec 2006 17:51:42 -0000 1.48 +++ sources 22 Jan 2007 06:05:44 -0000 1.49 @@ -1 +1 @@ -82b98a9b2685cca2d381e185cae47596 gnome-panel-2.16.2.tar.bz2 +22f51578f9d70b4159246c04046152b0 gnome-panel-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 08:20:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 03:20:03 -0500 Subject: rpms/tar/devel tar.spec,1.56,1.57 Message-ID: <200701220820.l0M8K3Zm005082@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/tar/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5058 Modified Files: tar.spec Log Message: fix non-failsafe install-info use in scriptlets (#223718) Index: tar.spec =================================================================== RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- tar.spec 3 Jan 2007 09:47:34 -0000 1.56 +++ tar.spec 22 Jan 2007 08:20:01 -0000 1.57 @@ -2,7 +2,7 @@ Name: tar Epoch: 2 Version: 1.15.1 -Release: 24%{?dist} +Release: 25%{?dist} License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ @@ -92,11 +92,11 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/tar.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/tar.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/tar.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/tar.info.gz %{_infodir}/dir || : fi %files -f %{name}.lang @@ -115,6 +115,9 @@ %{_infodir}/tar.info* %changelog +* Mon Jan 03 2007 Peter Vrabec 2:1.15.1-25 +- fix non-failsafe install-info use in scriptlets (#223718) + * Wed Jan 03 2007 Peter Vrabec 2:1.15.1-24 - supply tar man page (#219375) From fedora-cvs-commits at redhat.com Mon Jan 22 08:24:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 03:24:55 -0500 Subject: rpms/cpio/devel cpio.spec,1.45,1.46 Message-ID: <200701220824.l0M8OtTI005168@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5146 Modified Files: cpio.spec Log Message: fix non-failsafe install-info use in scriptlets (#223682) Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- cpio.spec 10 Dec 2006 22:49:45 -0000 1.45 +++ cpio.spec 22 Jan 2007 08:24:53 -0000 1.46 @@ -6,7 +6,7 @@ Summary: A GNU archiving program Name: cpio Version: 2.6 -Release: 22%{?dist} +Release: 23%{?dist} License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -92,11 +92,11 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/cpio.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/cpio.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/cpio.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/cpio.info.gz %{_infodir}/dir || : fi %files -f %{name}.lang @@ -112,6 +112,9 @@ %{_infodir}/*.info* %changelog +- Mon Jan 22 2007 Peter Vrabec 2.6-23 +- fix non-failsafe install-info use in scriptlets (#223682) + * Sun Dec 10 2006 Peter Vrabec 2.6-22 - fix rpmlint issue in spec file From fedora-cvs-commits at redhat.com Mon Jan 22 08:27:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 03:27:43 -0500 Subject: rpms/cpio/devel cpio.spec,1.46,1.47 Message-ID: <200701220827.l0M8Rh4X005227@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5203 Modified Files: cpio.spec Log Message: fix changelog Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- cpio.spec 22 Jan 2007 08:24:53 -0000 1.46 +++ cpio.spec 22 Jan 2007 08:27:40 -0000 1.47 @@ -112,7 +112,7 @@ %{_infodir}/*.info* %changelog -- Mon Jan 22 2007 Peter Vrabec 2.6-23 +* Mon Jan 22 2007 Peter Vrabec 2.6-23 - fix non-failsafe install-info use in scriptlets (#223682) * Sun Dec 10 2006 Peter Vrabec 2.6-22 From fedora-cvs-commits at redhat.com Mon Jan 22 08:48:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 03:48:33 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.92,1.93 Message-ID: <200701220848.l0M8mX5b019667@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19483 Modified Files: rhythmbox.spec Log Message: * Mon Jan 22 2007 Alexander Larsson - 0.9.7-7.fc7 - Specfile cleanups from Todd Zullinger - Buildrequire gnome-media-devel for gnome-media-profiles.pc - Remove explicit libgpod dep - install missing artwork image (Gnome BZ #387413) Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- rhythmbox.spec 16 Jan 2007 10:13:38 -0000 1.92 +++ rhythmbox.spec 22 Jan 2007 08:48:31 -0000 1.93 @@ -3,14 +3,14 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Multimedia -Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 +URL: http://www.gnome.org/projects/rhythmbox/ +Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= 2.4.0 Requires: libgnomeui >= 2.6.0 -Requires: libgpod Requires(post): scrollkeeper Requires(post): desktop-file-utils >= %{desktop_file_utils_version} Requires(post): GConf2 @@ -19,6 +19,7 @@ Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: libgpod-devel +BuildRequires: gnome-media-devel BuildRequires: libgnomeui-devel >= 2.6.0 BuildRequires: nautilus-cd-burner-devel >= 2.15.3 BuildRequires: gstreamer-plugins-base-devel >= 0.10 @@ -56,11 +57,11 @@ /usr/bin/gst-inspect-0.10 --print-all > /dev/null %configure \ - --with-ipod \ - --with-dbus \ - --with-mdns=avahi \ - --disable-scrollkeeper \ - --enable-tag-writing + --with-ipod \ + --with-dbus \ + --with-mdns=avahi \ + --disable-scrollkeeper \ + --enable-tag-writing make %install @@ -71,6 +72,7 @@ rm -f %{buildroot}%{_libdir}/bonobo/*.{a,la} rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*.{a,la} +rm -f %{buildroot}%{_libdir}/rhythmbox/plugins/*/*.{a,la} %find_lang %name @@ -81,6 +83,10 @@ # Don't package api docs rm -rf %{buildroot}/%{_datadir}/gtk-doc/ +# install missing artwork image (Gnome BZ#387413) +install -m0644 plugins/artdisplay/rhythmbox-missing-artwork.svg \ + %{buildroot}%{_libdir}/rhythmbox/plugins/artdisplay/ + %clean rm -rf %{buildroot} @@ -127,6 +133,12 @@ %{_libexecdir}/rhythmbox-metadata %changelog +* Mon Jan 22 2007 Alexander Larsson - 0.9.7-7.fc7 +- Specfile cleanups from Todd Zullinger +- Buildrequire gnome-media-devel for gnome-media-profiles.pc +- Remove explicit libgpod dep +- install missing artwork image (Gnome BZ #387413) + * Tue Jan 16 2007 Alexander Larsson - 0.9.7-6.fc7 - rebuild with new libgpod @@ -381,7 +393,7 @@ * Mon Sep 22 2003 Jonathan Blandford 0.5.3-1 - new version -- use %{_sysconfdir} instead of /etc +- use _sysconfdir instead of /etc * Wed Jan 22 2003 Tim Powers - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 22 09:11:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 04:11:26 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-manual.patch, 1.1, 1.2 vixie-cron.spec, 1.84, 1.85 Message-ID: <200701220911.l0M9BQfU005243@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5011 Modified Files: vixie-cron-4.1-manual.patch vixie-cron.spec Log Message: Change in manual #223532 vixie-cron-4.1-manual.patch: cron.8 | 73 +++++++++++++++++++++++-------------- crontab.1 | 76 +++++++++++++++++++------------------- crontab.5 | 121 +++++++++++++++++++++++++++++++++++++------------------------- 3 files changed, 158 insertions(+), 112 deletions(-) Index: vixie-cron-4.1-manual.patch =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-manual.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vixie-cron-4.1-manual.patch 17 Jan 2007 10:24:41 -0000 1.1 +++ vixie-cron-4.1-manual.patch 22 Jan 2007 09:11:23 -0000 1.2 @@ -1,229 +1,5 @@ ---- vixie-cron-4.1/crontab.5.selmls 2007-01-12 17:29:37.000000000 +0100 -+++ vixie-cron-4.1/crontab.5 2007-01-17 10:57:00.000000000 +0100 -@@ -19,7 +19,7 @@ - .\" - .\" $Id$ - .\" --.TH CRONTAB 5 "24 January 1994" -+.TH CRONTAB 5 "16 January 2007" - .UC 4 - .SH NAME - crontab \- tables for driving cron (ISC Cron V4.1) -@@ -27,12 +27,12 @@ - A - .I crontab - file contains instructions to the --.IR cron (8) --daemon of the general form: ``run this command at this time on this date''. -+.BR cron (8) -+daemon of the general form: "run this command at this time on this date". - Each user has their own crontab, and commands in any given crontab will be - executed as the user who owns the crontab. Uucp and News will usually have - their own crontabs, eliminating the need for explicitly running --.IR su (1) -+.BR su (1) - as part of a cron command. - .PP - Blank lines and leading spaces and tabs are ignored. Lines whose first -@@ -58,7 +58,7 @@ - .PP - Several environment variables are set up - automatically by the --.IR cron (8) -+.BR cron (8) - daemon. - SHELL is set to /bin/sh, and LOGNAME and HOME are set from the /etc/passwd - line of the crontab\'s owner. -@@ -68,9 +68,9 @@ - on these systems, USER will be set also.) - .PP - In addition to LOGNAME, HOME, and SHELL, --.IR cron (8) -+.BR cron (8) - will look at MAILTO if it has any reason to send mail as a result of running --commands in ``this'' crontab. If MAILTO is defined (and non-empty), mail is -+commands in "this" crontab. If MAILTO is defined (and non-empty), mail is - sent to the user so named. If MAILTO is defined but empty (MAILTO=""), no - mail will be sent. Otherwise mail is sent to the owner of the crontab. This - option is useful if you decide on /bin/mail instead of /usr/lib/sendmail as -@@ -78,11 +78,11 @@ - usually doesn\'t read its mail. - .PP - By default, cron will send mail using the mail 'Content-Type:' header of 'text/plain' with the 'charset=' parameter set to the charmap / codeset of the locale in which --.IR crond(8) -+.BR crond (8) - is started up - ie. either the default system locale, if no LC_* environment - variables are set, or the locale specified by the LC_* environment variables --( see --.IR locale(7) ). -+(see -+.BR locale (7)). - You can use different character encodings for mailed cron job output by - setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs, - to the correct values of the mail headers of those names. -@@ -93,29 +93,30 @@ - user that created the crontab file. - When using multiple security levels and roles, this may not be sufficient, because - the same user may be running in a different role or at a different security level. -+For more about roles and mls selinux see selinux (8) and undermentioned crontab example. - You can set SELINUX_ROLE_TYPE to the SELinux security context string specifying - the SELinux security context in which you want the job to run, and crond will set - the execution context of the or jobs to which the setting applies to the specified - context. - See also the --.IR crontab(1) -s option. -+.BR crontab(1)\ -s\ option. - .PP - The format of a cron command is very much the V7 standard, with a number of - upward-compatible extensions. Each line has five time and date fields, - followed by a user name if this is the system crontab file, - followed by a command. Commands are executed by --.IR cron (8) -+.BR cron (8) - when the minute, hour, and month of year fields match the current time, - .I and - at least one of the two day fields (day of month, or day of week) --match the current time (see ``Note'' below). -+match the current time (see "Note" below). - Note that this means that non-existent times, such as "missing hours" - during daylight savings conversion, will never match, causing jobs - scheduled during the "missing times" not to be run. Similarly, times - that occur more than once (again, during daylight savings conversion) - will cause matching jobs to be run twice. - .PP --.IR cron (8) -+.BR cron (8) - examines cron entries once every minute. - .PP - The time and date fields are: -@@ -136,30 +137,30 @@ - day of week 0-7 (0 or 7 is Sun, or use names) - .br - .PP --A field may be an asterisk (*), which always stands for ``first\-last''. -+A field may be an asterisk (*), which always stands for "first\-last". - .PP - Ranges of numbers are allowed. Ranges are two numbers separated - with a hyphen. The specified range is inclusive. For example, --8-11 for an ``hours'' entry specifies execution at hours 8, 9, 10 -+8-11 for an "hours" entry specifies execution at hours 8, 9, 10 - and 11. - .PP - Lists are allowed. A list is a set of numbers (or ranges) --separated by commas. Examples: ``1,2,5,9'', ``0-4,8-12''. -+separated by commas. Examples: "1,2,5,9", "0-4,8-12". - .PP - Step values can be used in conjunction with ranges. Following --a range with ``/'' specifies skips of the number's value --through the range. For example, ``0-23/2'' can be used in the hours -+a range with "" specifies skips of the number's value -+through the range. For example, "0-23/2" can be used in the hours - field to specify command execution every other hour (the alternative --in the V7 standard is ``0,2,4,6,8,10,12,14,16,18,20,22''). Steps are --also permitted after an asterisk, so if you want to say ``every two --hours'', just use ``*/2''. -+in the V7 standard is "0,2,4,6,8,10,12,14,16,18,20,22"). Steps are -+also permitted after an asterisk, so if you want to say "every two -+hours", just use "*/2". - .PP --Names can also be used for the ``month'' and ``day of week'' -+Names can also be used for the "month" and "day of week" - fields. Use the first three letters of the particular - day or month (case doesn't matter). Ranges or - lists of names are not allowed. - .PP --The ``sixth'' field (the rest of the line) specifies the command to be -+The "sixth" field (the rest of the line) specifies the command to be - run. - The entire command portion of the line, up to a newline or % - character, will be executed by /bin/sh or by the shell -@@ -175,30 +176,52 @@ - .I either - field matches the current time. For example, - .br --``30 4 1,15 * 5'' -+"30 4 1,15 * 5" - would cause a command to be run at 4:30 am on the 1st and 15th of each - month, plus every Friday. --.SH EXAMPLE CRON FILE -+.SH EXAMPLE CRON FILE -+.nf -+# use /bin/sh to run commands, no matter what /etc/passwd says -+SHELL=/bin/sh -+# mail any output to `paul', no matter whose crontab this is -+MAILTO=paul -+# -+# run five minutes after midnight, every day -+5 0 * * * $HOME/bin/daily.job >> $HOME/tmp/out 2>&1 -+# run at 2:15pm on the first of every month -- output mailed to paul -+15 14 1 * * $HOME/bin/monthly -+# run at 10 pm on weekdays, annoy Joe -+0 22 * * 1-5 mail -s "It's 10pm" joe%Joe,%%Where are your kids?% -+23 0-23/2 * * * echo "run 23 minutes after midn, 2am, 4am ..., everyday" -+5 4 * * sun echo "run at 5 after 4 every sunday" -+.fi -+.SH SELinux with multi level security (MLS) -+In crontab is important specified security level by \fIcrontab\ -s\fR or specifying -+the required level on the first line of the crontab. Each level is specified -+in \fI/etc/selinux/targeted/seusers\fR. For using crontab in MLS mode is really important: -+.br -+- check/change actual role, -+.br -+- set correct \fIrole for directory\fR, which is used for input/output. -+.SH EXAMPLE FOR SELINUX MLS - .nf --# use /bin/sh to run commands, no matter what /etc/passwd says --SHELL=/bin/sh --# mail any output to `paul', no matter whose crontab this is --MAILTO=paul --# --# run five minutes after midnight, every day --5 0 * * * $HOME/bin/daily.job >> $HOME/tmp/out 2>&1 --# run at 2:15pm on the first of every month -- output mailed to paul --15 14 1 * * $HOME/bin/monthly --# run at 10 pm on weekdays, annoy Joe --0 22 * * 1-5 mail -s "It's 10pm" joe%Joe,%%Where are your kids?% --23 0-23/2 * * * echo "run 23 minutes after midn, 2am, 4am ..., everyday" --5 4 * * sun echo "run at 5 after 4 every sunday" -+# login as root -+newrole -r sysadm_r -+mkdir /tmp/SystemHigh -+chcon -l SystemHigh /tmp/SystemHigh -+crontab -e -+# write in crontab file -+MLS_LEVEL=SystemHigh -+0-59 * * * * id -Z > /tmp/SystemHigh/crontest -+Now if I log in as a normal user it can't work, because /tmp/SystemHigh is -+higher than my level. - .fi - .SH FILES --/etc/crontab System crontab file -- --.SH SEE ALSO --cron(8), crontab(1) -+.I /etc/crontab -+system crontab file -+.SH "SEE ALSO" -+.BR cron (8), -+.BR crontab (1) - .SH EXTENSIONS - When specifying day of week, both day 0 and day 7 will be considered Sunday. - BSD and ATT seem to disagree about this. -@@ -231,8 +254,10 @@ - .fi - .SH CAVEATS - In this version of --.BR cron , --/etc/crontab must not be writable by any user other than root. -+.I cron -+, -+.I /etc/crontab -+must not be writable by any user other than root. - No crontab files may be links, or linked to by any other file. - No crontab files may be executable, or be writable by any user - other than their owner. ---- vixie-cron-4.1/cron.8.selmls 2007-01-12 17:29:37.000000000 +0100 -+++ vixie-cron-4.1/cron.8 2007-01-17 11:08:52.000000000 +0100 +--- vixie-cron-4.1/cron.8.manual 2007-01-17 11:13:28.000000000 +0100 ++++ vixie-cron-4.1/cron.8 2007-01-17 11:13:28.000000000 +0100 @@ -19,31 +19,40 @@ .\" .\" $Id$ @@ -338,8 +114,8 @@ no crontab files may be links, or linked to by any other file, and no crontab files may be executable, or be writable by any user other than their owner. ---- vixie-cron-4.1/crontab.1.selmls 2007-01-12 17:29:37.000000000 +0100 -+++ vixie-cron-4.1/crontab.1 2007-01-17 10:57:54.000000000 +0100 +--- vixie-cron-4.1/crontab.1.manual 2007-01-17 11:13:28.000000000 +0100 ++++ vixie-cron-4.1/crontab.1 2007-01-22 10:03:36.000000000 +0100 @@ -19,7 +19,7 @@ .\" .\" $Id$ @@ -349,7 +125,7 @@ .UC 4 .SH NAME crontab \- maintain crontab files for individual users (ISC Cron V4.1) -@@ -31,15 +31,17 @@ +@@ -31,15 +31,18 @@ .B crontab .RB [ -u .IR user ] @@ -364,14 +140,15 @@ -daemon in ISC Cron. Each user can have their own crontab, and though -these are files in /var, they are not intended to be edited directly. +.BR cron (8) -+daemon in ISC Cron. Each user and each can have their own crontab, and though -+these are files in /var, they are not intended to be edited directly. For -+SELinux in mls mode can be even more crontabs - for each range. For more see ++daemon in ISC Cron. Each user can have their own crontab, and though these are files in ++.I /var/spool/ ++, they are not intended to be edited directly. For SELinux in mls mode can be even ++more crontabs - for each range. For more see +.BR selinux (8). .PP If the .I cron.allow -@@ -48,55 +50,52 @@ +@@ -48,55 +51,52 @@ .I cron.allow file does not exist but the .I cron.deny @@ -445,13 +222,246 @@ -The -.I -s -option will append the current SELinux security context string as an +-SELINUX_ROLE_TYPE setting to the crontab file before editing / replacement +-occurs - see the documentation of SELINUX_ROLE_TYPE in +-.IR crontab(5) . +.TP +.B "\-s" +It will append the current SELinux security context string as an - SELINUX_ROLE_TYPE setting to the crontab file before editing / replacement - occurs - see the documentation of SELINUX_ROLE_TYPE in --.IR crontab(5) . ++MLS_LEVEL setting to the crontab file before editing / replacement ++occurs - see the documentation of MLS_LEVEL in +.BR crontab(5)\. .SH "SEE ALSO" crontab(5), cron(8) .SH FILES +--- vixie-cron-4.1/crontab.5.manual 2007-01-17 11:13:28.000000000 +0100 ++++ vixie-cron-4.1/crontab.5 2007-01-22 10:02:17.000000000 +0100 +@@ -19,7 +19,7 @@ + .\" + .\" $Id$ + .\" +-.TH CRONTAB 5 "24 January 1994" ++.TH CRONTAB 5 "16 January 2007" + .UC 4 + .SH NAME + crontab \- tables for driving cron (ISC Cron V4.1) +@@ -27,12 +27,12 @@ + A + .I crontab + file contains instructions to the +-.IR cron (8) +-daemon of the general form: ``run this command at this time on this date''. ++.BR cron (8) ++daemon of the general form: "run this command at this time on this date". + Each user has their own crontab, and commands in any given crontab will be + executed as the user who owns the crontab. Uucp and News will usually have + their own crontabs, eliminating the need for explicitly running +-.IR su (1) ++.BR su (1) + as part of a cron command. + .PP + Blank lines and leading spaces and tabs are ignored. Lines whose first +@@ -58,7 +58,7 @@ + .PP + Several environment variables are set up + automatically by the +-.IR cron (8) ++.BR cron (8) + daemon. + SHELL is set to /bin/sh, and LOGNAME and HOME are set from the /etc/passwd + line of the crontab\'s owner. +@@ -68,9 +68,9 @@ + on these systems, USER will be set also.) + .PP + In addition to LOGNAME, HOME, and SHELL, +-.IR cron (8) ++.BR cron (8) + will look at MAILTO if it has any reason to send mail as a result of running +-commands in ``this'' crontab. If MAILTO is defined (and non-empty), mail is ++commands in "this" crontab. If MAILTO is defined (and non-empty), mail is + sent to the user so named. If MAILTO is defined but empty (MAILTO=""), no + mail will be sent. Otherwise mail is sent to the owner of the crontab. This + option is useful if you decide on /bin/mail instead of /usr/lib/sendmail as +@@ -78,44 +78,47 @@ + usually doesn\'t read its mail. + .PP + By default, cron will send mail using the mail 'Content-Type:' header of 'text/plain' with the 'charset=' parameter set to the charmap / codeset of the locale in which +-.IR crond(8) ++.BR crond (8) + is started up - ie. either the default system locale, if no LC_* environment + variables are set, or the locale specified by the LC_* environment variables +-( see +-.IR locale(7) ). ++(see ++.BR locale (7)). + You can use different character encodings for mailed cron job output by + setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs, + to the correct values of the mail headers of those names. + .PP +-The SELINUX_ROLE_TYPE environment variable provides support for multiple per-job ++The MLS_LEVEL environment variable provides support for multiple per-job + SELinux security contexts in the same crontab. + By default, cron jobs execute with the default SELinux security context of the + user that created the crontab file. + When using multiple security levels and roles, this may not be sufficient, because + the same user may be running in a different role or at a different security level. +-You can set SELINUX_ROLE_TYPE to the SELinux security context string specifying ++For more about roles and SELinux MLS/MCS see ++.BR selinux (8) ++and undermentioned crontab example. ++You can set MLS_LEVEL to the SELinux security context string specifying + the SELinux security context in which you want the job to run, and crond will set + the execution context of the or jobs to which the setting applies to the specified + context. + See also the +-.IR crontab(1) -s option. ++.BR crontab(1)\ -s\ option. + .PP + The format of a cron command is very much the V7 standard, with a number of + upward-compatible extensions. Each line has five time and date fields, + followed by a user name if this is the system crontab file, + followed by a command. Commands are executed by +-.IR cron (8) ++.BR cron (8) + when the minute, hour, and month of year fields match the current time, + .I and + at least one of the two day fields (day of month, or day of week) +-match the current time (see ``Note'' below). ++match the current time (see "Note" below). + Note that this means that non-existent times, such as "missing hours" + during daylight savings conversion, will never match, causing jobs + scheduled during the "missing times" not to be run. Similarly, times + that occur more than once (again, during daylight savings conversion) + will cause matching jobs to be run twice. + .PP +-.IR cron (8) ++.BR cron (8) + examines cron entries once every minute. + .PP + The time and date fields are: +@@ -136,30 +139,30 @@ + day of week 0-7 (0 or 7 is Sun, or use names) + .br + .PP +-A field may be an asterisk (*), which always stands for ``first\-last''. ++A field may be an asterisk (*), which always stands for "first\-last". + .PP + Ranges of numbers are allowed. Ranges are two numbers separated + with a hyphen. The specified range is inclusive. For example, +-8-11 for an ``hours'' entry specifies execution at hours 8, 9, 10 ++8-11 for an "hours" entry specifies execution at hours 8, 9, 10 + and 11. + .PP + Lists are allowed. A list is a set of numbers (or ranges) +-separated by commas. Examples: ``1,2,5,9'', ``0-4,8-12''. ++separated by commas. Examples: "1,2,5,9", "0-4,8-12". + .PP + Step values can be used in conjunction with ranges. Following +-a range with ``/'' specifies skips of the number's value +-through the range. For example, ``0-23/2'' can be used in the hours ++a range with "" specifies skips of the number's value ++through the range. For example, "0-23/2" can be used in the hours + field to specify command execution every other hour (the alternative +-in the V7 standard is ``0,2,4,6,8,10,12,14,16,18,20,22''). Steps are +-also permitted after an asterisk, so if you want to say ``every two +-hours'', just use ``*/2''. ++in the V7 standard is "0,2,4,6,8,10,12,14,16,18,20,22"). Steps are ++also permitted after an asterisk, so if you want to say "every two ++hours", just use "*/2". + .PP +-Names can also be used for the ``month'' and ``day of week'' ++Names can also be used for the "month" and "day of week" + fields. Use the first three letters of the particular + day or month (case doesn't matter). Ranges or + lists of names are not allowed. + .PP +-The ``sixth'' field (the rest of the line) specifies the command to be ++The "sixth" field (the rest of the line) specifies the command to be + run. + The entire command portion of the line, up to a newline or % + character, will be executed by /bin/sh or by the shell +@@ -175,30 +178,52 @@ + .I either + field matches the current time. For example, + .br +-``30 4 1,15 * 5'' ++"30 4 1,15 * 5" + would cause a command to be run at 4:30 am on the 1st and 15th of each + month, plus every Friday. +-.SH EXAMPLE CRON FILE ++.SH EXAMPLE CRON FILE ++.nf ++# use /bin/sh to run commands, no matter what /etc/passwd says ++SHELL=/bin/sh ++# mail any output to `paul', no matter whose crontab this is ++MAILTO=paul ++# ++# run five minutes after midnight, every day ++5 0 * * * $HOME/bin/daily.job >> $HOME/tmp/out 2>&1 ++# run at 2:15pm on the first of every month -- output mailed to paul ++15 14 1 * * $HOME/bin/monthly ++# run at 10 pm on weekdays, annoy Joe ++0 22 * * 1-5 mail -s "It's 10pm" joe%Joe,%%Where are your kids?% ++23 0-23/2 * * * echo "run 23 minutes after midn, 2am, 4am ..., everyday" ++5 4 * * sun echo "run at 5 after 4 every sunday" ++.fi ++.SH SELinux with multi level security (MLS) ++In crontab is important specified security level by \fIcrontab\ -s\fR or specifying ++the required level on the first line of the crontab. Each level is specified ++in \fI/etc/selinux/targeted/seusers\fR. For using crontab in MLS mode is really important: ++.br ++- check/change actual role, ++.br ++- set correct \fIrole for directory\fR, which is used for input/output. ++.SH EXAMPLE FOR SELINUX MLS + .nf +-# use /bin/sh to run commands, no matter what /etc/passwd says +-SHELL=/bin/sh +-# mail any output to `paul', no matter whose crontab this is +-MAILTO=paul +-# +-# run five minutes after midnight, every day +-5 0 * * * $HOME/bin/daily.job >> $HOME/tmp/out 2>&1 +-# run at 2:15pm on the first of every month -- output mailed to paul +-15 14 1 * * $HOME/bin/monthly +-# run at 10 pm on weekdays, annoy Joe +-0 22 * * 1-5 mail -s "It's 10pm" joe%Joe,%%Where are your kids?% +-23 0-23/2 * * * echo "run 23 minutes after midn, 2am, 4am ..., everyday" +-5 4 * * sun echo "run at 5 after 4 every sunday" ++# login as root ++newrole -r sysadm_r ++mkdir /tmp/SystemHigh ++chcon -l SystemHigh /tmp/SystemHigh ++crontab -e ++# write in crontab file ++MLS_LEVEL=SystemHigh ++0-59 * * * * id -Z > /tmp/SystemHigh/crontest ++Now if I log in as a normal user it can't work, because /tmp/SystemHigh is ++higher than my level. + .fi + .SH FILES +-/etc/crontab System crontab file +- +-.SH SEE ALSO +-cron(8), crontab(1) ++.I /etc/crontab ++system crontab file ++.SH "SEE ALSO" ++.BR cron (8), ++.BR crontab (1) + .SH EXTENSIONS + When specifying day of week, both day 0 and day 7 will be considered Sunday. + BSD and ATT seem to disagree about this. +@@ -231,8 +256,10 @@ + .fi + .SH CAVEATS + In this version of +-.BR cron , +-/etc/crontab must not be writable by any user other than root. ++.I cron ++, ++.I /etc/crontab ++must not be writable by any user other than root. + No crontab files may be links, or linked to by any other file. + No crontab files may be executable, or be writable by any user + other than their owner. Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- vixie-cron.spec 17 Jan 2007 10:24:41 -0000 1.84 +++ vixie-cron.spec 22 Jan 2007 09:11:23 -0000 1.85 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 70%{?dist} +Release: 71%{?dist} Epoch: 4 License: distributable Group: System Environment/Base @@ -253,6 +253,10 @@ %config(noreplace) /etc/sysconfig/crond %changelog +* Mon Jan 22 2007 Marcela Maslanova - 4:4.1-71 +- change in maual +- rhbz#223532 + * Tue Jan 16 2007 Marcela Maslanova - 4:4.1-70 - change in manual From fedora-cvs-commits at redhat.com Mon Jan 22 09:27:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 04:27:07 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch, NONE, 1.1 ooobuild.VBAObjects.patch, 1.7, 1.8 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.13, 1.14 openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch, 1.2, 1.3 openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch, 1.2, 1.3 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.18, 1.19 openoffice.org-2.0.3.rh187919.gtkunderkde.patch, 1.2, 1.3 openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch, 1.3, 1.4 openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch, 1.2, 1.3 openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch, 1.1, 1.2 openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch, 1.3, 1.4 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch, 1.1, 1.2 openoffice.org.spec, 1.997, 1.998 pseudoworkspace.valgrind1.patch, 1.13, 1.14 sources, 1.213, 1.214 workspace.fpicker6.patch, 1.2, 1.3 workspace.libxslt02.patch, 1.5, 1.6 openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch, 1.! 4, NONE openoffice.org-2.0.4.rh213710.vba.patch, 1.4, NONE workspace.aw024.patch, 1.1, NONE workspace.cmcfixes29.patch, 1.1, NONE workspace.dba22b.patch, 1.1, NONE workspace.dr51.patch, 1.1, NONE workspace.icuupgrade.patch, 1.4, NONE workspace.inplaceobjects.patch, 1.1, NONE workspace.os89.patch, 1.1, NONE workspace.sixtyfour09.patch, 1.1, NONE workspace.sixtyfour10.patch, 1.1, NONE workspace.vcl69.patch, 1.1, NONE workspace.vcl70.patch, 1.1, NONE Message-ID: <200701220927.l0M9R7VI004801@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4405 Modified Files: ooobuild.VBAObjects.patch openoffice.org-1.9.129.ooo54603.fontconfig.patch openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch openoffice.org-2.0.3.rh187919.gtkunderkde.patch openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch openoffice.org.spec pseudoworkspace.valgrind1.patch sources workspace.fpicker6.patch workspace.libxslt02.patch Added Files: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch Removed Files: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch openoffice.org-2.0.4.rh213710.vba.patch workspace.aw024.patch workspace.cmcfixes29.patch workspace.dba22b.patch workspace.dr51.patch workspace.icuupgrade.patch workspace.inplaceobjects.patch workspace.os89.patch workspace.sixtyfour09.patch workspace.sixtyfour10.patch workspace.vcl69.patch workspace.vcl70.patch Log Message: next version openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch: source/glyphs/gcach_ftyp.cxx | 0 source/glyphs/gcach_ftyp.hxx | 0 vcl/source/glyphs/gcach_ftyp.cxx | 63 +++++++++++++++++++++++++++++++++++++++ vcl/source/glyphs/gcach_ftyp.hxx | 1 4 files changed, 64 insertions(+) --- NEW FILE openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch --- Index: source/glyphs/gcach_ftyp.cxx =================================================================== RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v retrieving revision 1.133.2.4 diff -u -r1.133.2.4 gcach_ftyp.cxx --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 27 Nov 2006 13:15:38 -0000 1.133.2.4 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 19 Jan 2007 13:00:34 -0000 @@ -1457,6 +1499,66 @@ // ----------------------------------------------------------------------- +void FreetypeServerFont::MakeNotDefGlyph8( RawBitmap& rRawBitmap ) const +{ + GlyphData aGD; + InitGlyphData( 0, aGD ); + long nCharWidth = aGD.GetMetric().GetCharWidth(); + long nCharHeight = GetFontSelData().mnHeight; + + const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics; + + //skip if too small to matter + if (nCharHeight < 7 || nCharWidth < 5) + return; + + rRawBitmap.mnHeight = nCharHeight-2; + rRawBitmap.mnWidth = nCharWidth-2; + + rRawBitmap.mnXOffset = 1; + int nOffset = (rMetrics.descender + rMetrics.ascender + 32) >> 6; + if (nOffset > rRawBitmap.mnHeight-1) + nOffset = rRawBitmap.mnHeight-1; + rRawBitmap.mnYOffset = -nOffset; + + rRawBitmap.mnBitCount = 8; + rRawBitmap.mnScanlineSize = rRawBitmap.mnWidth; + + rRawBitmap.mnScanlineSize = (rRawBitmap.mnScanlineSize + 3) & -4; + + const ULONG nNeededSize = rRawBitmap.mnScanlineSize * rRawBitmap.mnHeight; + if( rRawBitmap.mnAllocated < nNeededSize ) + { + delete[] rRawBitmap.mpBits; + rRawBitmap.mnAllocated = 2*nNeededSize; + rRawBitmap.mpBits = new unsigned char[ rRawBitmap.mnAllocated ]; + } + + unsigned char* pDest = rRawBitmap.mpBits; + memset(pDest, 0, rRawBitmap.mnAllocated); + int bottompos = nOffset; + for( int y = bottompos, x; --y >= 0 ; ) + { + if ((y == bottompos-1) || (y == 0)) + { + for( x = 0; x < rRawBitmap.mnWidth; ++x ) + *(pDest++) = 0xFF; + } + else + { + *(pDest++) = 0xFF; + for( x = 1; x < rRawBitmap.mnWidth-1; ++x ) + *(pDest++) = 0; + *(pDest++) = 0xFF; + ++x; + } + for(; x < int(rRawBitmap.mnScanlineSize); ++x ) + *(pDest++) = 0; + } +} + +// ----------------------------------------------------------------------- + bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const { if( maSizeFT ) @@ -1618,6 +1720,9 @@ } FT_Done_Glyph( pGlyphFT ); + + if (nGlyphIndex == 0 && rRawBitmap.mnWidth == 0) + MakeNotDefGlyph8(rRawBitmap); // special case for 0/90/180/270 degree orientation switch( nAngle ) Index: source/glyphs/gcach_ftyp.hxx =================================================================== RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.hxx,v retrieving revision 1.36 diff -u -r1.36 gcach_ftyp.hxx --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.hxx 19 Jun 2006 19:32:37 -0000 1.36 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.hxx 19 Jan 2007 13:01:29 -0000 @@ -190,6 +186,7 @@ virtual bool GetAntialiasAdvice( void ) const; virtual bool GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const; virtual bool GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const; + void MakeNotDefGlyph8( RawBitmap& ) const; virtual bool GetGlyphOutline( int nGlyphIndex, ::basegfx::B2DPolyPolygon& ) const; virtual int GetGlyphKernValue( int nLeftGlyph, int nRightGlyph ) const; virtual ULONG GetKernPairs( ImplKernPairData** ) const; ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 254 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 163 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl | 20 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 13 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 219 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 116 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 14 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 9 sc/inc/scfuncs.hrc | 2 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/docsh.sdi | 1 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 128 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/core/inc/interpre.hxx | 2 sc/source/core/src/compiler.src | 14 sc/source/core/tool/address.cxx | 10 sc/source/core/tool/interpr1.cxx | 4 sc/source/core/tool/interpr4.cxx | 2 sc/source/filter/excel/excdoc.cxx | 2 sc/source/filter/excel/excform.cxx | 6 sc/source/filter/excel/excimp8.cxx | 6 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/read.cxx | 1 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 159 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlformula.cxx | 6 sc/source/filter/excel/xlocx.cxx | 145 sc/source/filter/inc/excimp8.hxx | 1 sc/source/filter/inc/xcl97dum.hxx | 11 sc/source/filter/inc/xcl97rec.hxx | 14 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/filter/lotus/lotform.cxx | 4 sc/source/filter/xcl97/xcl97dum.cxx | 19 sc/source/filter/xcl97/xcl97rec.cxx | 22 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/src/scfuncs.src | 149 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3743 ++++++++++ sc/source/ui/vba/vbarange.hxx | 235 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/source/ui/view/tabvwshf.cxx | 18 sc/uiconfig/scalc/menubar/menubar.xml | 1 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 40 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 447 files changed, 20648 insertions(+), 701 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 ooobuild.VBAObjects.patch Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ooobuild.VBAObjects.patch 5 Nov 2006 10:53:41 -0000 1.7 +++ ooobuild.VBAObjects.patch 22 Jan 2007 09:27:00 -0000 1.8 @@ -1,3 +1,668 @@ +Index: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +=================================================================== +RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu,v +retrieving revision 1.14 +diff -u -w -p -r1.14 CalcCommands.xcu +--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 15 Mar 2005 12:42:05 -0000 1.14 ++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 28 Nov 2005 19:35:06 -0000 +@@ -1418,6 +1418,20 @@ + R~ight-To-Left + + ++ ++ ++ Use R1~C1 ++ Pou??ij R1~C1 ++ R1~C1 verwenden ++ Usar R1~C1 ++ Utiliser R1~C1 ++ Utilizza R1~C1 ++ R1~C1??????????????? ++ Usar R1~C1 ++ ?????? R1C1(~C) ++ ?????? R1C1(~C) ++ ++ + + + Verankerung: An der Seite +diff -r -u -p sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml +--- sc/uiconfig/scalc/menubar/menubar.xml 2006-09-05 23:35:36.000000000 -0400 ++++ sc/uiconfig/scalc/menubar/menubar.xml 2006-08-24 10:45:05.000000000 -0400 +@@ -213,6 +213,7 @@ + + + ++ + + + +diff -r -u -p sc/inc/scfuncs.hrc sc/inc/scfuncs.hrc +--- sc/inc/scfuncs.hrc 2006-09-05 23:35:37.000000000 -0400 ++++ sc/inc/scfuncs.hrc 2006-08-24 10:47:20.000000000 -0400 +@@ -300,5 +300,7 @@ + #define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) + #define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) ++#define HID_FUNC_INDIREKT_XL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+21) ++#define HID_FUNC_ADRESSE_XL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+22) + + #define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) + #define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) +diff -r -u -p sc/inc/sc.hrc sc/inc/sc.hrc +--- sc/inc/sc.hrc 2006-09-05 23:35:37.000000000 -0400 ++++ sc/inc/sc.hrc 2006-08-24 10:45:04.000000000 -0400 +@@ -805,6 +805,7 @@ + #define FID_TAB_APPEND (TAB_POPUP_START+5) + #define FID_TAB_INDEX (TAB_POPUP_START+6) + #define FID_TAB_RTL (TAB_POPUP_START+7) ++#define FID_TAB_USE_R1C1 (TAB_POPUP_START+8) + + #define TAB_POPUP_END (DATA_MENU_END + 20) + +diff -r -u -p sc/sdi/docsh.sdi sc/sdi/docsh.sdi +--- sc/sdi/docsh.sdi 2006-09-05 23:35:37.000000000 -0400 ++++ sc/sdi/docsh.sdi 2006-08-24 10:45:04.000000000 -0400 +@@ -68,6 +68,7 @@ interface TableSelection + FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] ++ FID_TAB_USE_R1C1 [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] + + SID_TABLE_ACTIVATE [ ExecMethod = Execute; ] + } +diff -r -u -p sc/sdi/scalc.sdi sc/sdi/scalc.sdi +--- sc/sdi/scalc.sdi 2006-09-05 23:35:37.000000000 -0400 ++++ sc/sdi/scalc.sdi 2006-08-24 10:45:04.000000000 -0400 +@@ -7754,3 +7754,30 @@ SfxBoolItem SheetRightToLeft FID_TAB_RTL + ] + + ++//-------------------------------------------------------------------------- ++SfxBoolItem SheetUseR1C1 FID_TAB_USE_R1C1 ++ ++[ ++ /* flags */ ++ AutoUpdate = FALSE, ++ Cachable = Cachable, ++ FastCall = FALSE, ++ HasCoreId = FALSE, ++ HasDialog = FALSE, ++ ReadOnlyDoc = TRUE, ++ Toggle = FALSE, ++ Container = FALSE, ++ RecordAbsolute = FALSE, ++ RecordPerSet; ++ Synchron; ++ ++ Readonly = FALSE, ++ ++ /* config */ ++ AccelConfig = TRUE, ++ MenuConfig = TRUE, ++ StatusBarConfig = FALSE, ++ ToolBoxConfig = TRUE, ++ GroupId = GID_FORMAT; ++] ++ +diff -r -u -p sc/source/core/src/compiler.src sc/source/core/src/compiler.src +--- sc/source/core/src/compiler.src 2006-09-05 23:35:39.000000000 -0400 ++++ sc/source/core/src/compiler.src 2006-08-24 10:45:05.000000000 -0400 +@@ -1092,12 +1092,24 @@ Resource RID_SC_FUNCTION_NAMES + Text [ en-US ] = "INDIRECT" ; + Text [ x-comment ] = " "; + }; ++ String SC_OPCODE_INDIRECT_XL ++ { ++ Text [ de ] = "INDIREKT_XL" ; ++ Text [ en-US ] = "INDIRECT_XL" ; ++ Text [ x-comment ] = " "; ++ }; + String SC_OPCODE_ADDRESS + { + Text [ de ] = "ADRESSE" ; + Text [ en-US ] = "ADDRESS" ; + Text [ x-comment ] = " "; + }; ++ String SC_OPCODE_ADDRESS_XL ++ { ++ Text [ de ] = "ADRESSE_XL" ; ++ Text [ en-US ] = "ADDRESS_XL" ; ++ Text [ x-comment ] = " "; ++ }; + String SC_OPCODE_MATCH + { + Text [ de ] = "VERGLEICH" ; +@@ -1879,7 +1891,9 @@ Resource RID_SC_FUNCTION_NAMES_ENGLISH + String SC_OPCODE_DB_VAR { Text = "DVAR" ; }; + String SC_OPCODE_DB_VAR_P { Text = "DVARP" ; }; + String SC_OPCODE_INDIRECT { Text = "INDIRECT" ; }; ++ String SC_OPCODE_INDIRECT_XL { Text = "INDIRECT_XL" ; }; + String SC_OPCODE_ADDRESS { Text = "ADDRESS" ; }; ++ String SC_OPCODE_ADDRESS_XL { Text = "ADDRESS_XL" ; }; + String SC_OPCODE_MATCH { Text = "MATCH" ; }; + String SC_OPCODE_COUNT_EMPTY_CELLS { Text = "COUNTBLANK" ; }; + String SC_OPCODE_COUNT_IF { Text = "COUNTIF" ; }; +diff -r -u -p sc/source/filter/excel/excdoc.cxx sc/source/filter/excel/excdoc.cxx +--- sc/source/filter/excel/excdoc.cxx 2006-09-05 23:35:40.000000000 -0400 ++++ sc/source/filter/excel/excdoc.cxx 2006-08-24 10:45:05.000000000 -0400 +@@ -326,7 +326,7 @@ void ExcTable::FillAsTable( size_t nCode + { + Add( new ExcBof8 ); + Add( new XclCalccount( rDoc ) ); +- Add( new XclRefmode() ); ++ Add( new XclRefmode( rDoc ) ); + Add( new XclIteration( rDoc ) ); + Add( new XclDelta( rDoc ) ); + Add( new ExcDummy8_02 ); +diff -r -u -p sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform.cxx +--- sc/source/filter/excel/excform.cxx 2006-09-05 23:35:38.000000000 -0400 ++++ sc/source/filter/excel/excform.cxx 2006-08-24 10:45:05.000000000 -0400 +@@ -1372,12 +1372,6 @@ void ExcelToSc::DoMulArgs( DefTokenId eI + if( eId == ocPercentrank && nAnz == 3 ) + nSkipEnd = 0; // letzten Parameter bei Bedarf weglassen + +- else if( eId == ocIndirect && nAnz == 2 ) +- nSkipEnd = 0; +- +- else if( eId == ocAddress && nAnz > 3 ) +- nNull = nAnz - 4; +- + // Joost-Spezialfaelle + else if( eId == ocIf ) + { +diff -r -u -p sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx +--- sc/source/filter/excel/excimp8.cxx 2006-09-05 23:35:40.000000000 -0400 ++++ sc/source/filter/excel/excimp8.cxx 2006-08-24 10:45:05.000000000 -0400 +@@ -190,6 +190,12 @@ void ImportExcel8::Iteration( void ) + } + + ++void ImportExcel8::RefMode( void ) ++{ ++ pD->SetAddressConvention( (aIn.ReaduInt16() == 0) ++ ? ScAddress::CONV_XL_R1C1 ++ : ScAddress::CONV_OOO ); ++} + void ImportExcel8:: WinProtection( void ) + { + if( aIn.ReaduInt16() != 0 ) +diff -r -u -p sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx +--- sc/source/filter/excel/read.cxx 2006-09-05 23:35:40.000000000 -0400 ++++ sc/source/filter/excel/read.cxx 2006-08-24 10:45:05.000000000 -0400 [...12737 lines suppressed...] +diff -rup basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx +--- basic/source/runtime/step0.cxx 2007-01-02 17:08:45.000000000 +0000 ++++ basic/source/runtime/step0.cxx 2007-01-02 13:01:06.000000000 +0000 +@@ -72,7 +72,6 @@ void SbiRuntime::StepArith( SbxOperator + TOSMakeTemp(); + SbxVariable* p2 = GetTOS(); - BOOL DoMacroQuery( const String& rScriptType ); - void AdjustMacroMode( const String& rScriptType ); ---- /data4/sles/ooo-mLnew/ooo-build/build/ooc680-m2/sfx2/source/doc/objmisc.cxx 2006-05-22 08:25:06.000000000 +0100 -+++ sfx2/source/doc/objmisc.cxx 2006-06-02 13:29:02.000000000 +0100 -@@ -1396,7 +1396,7 @@ ErrCode SfxObjectShell::CallXScript( con - ::com::sun::star::uno::Any& aRet, - ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& -- aOutParam) -+ aOutParam, bool bRaiseError ) +- bool bVBAInterop = SbiRuntime::isVBAEnabled(); + + // This could & should be moved to the MakeTempTOS() method in runtime.cxx + // In the code which this is cut'npaste from there is a check for a ref +@@ -82,7 +81,7 @@ void SbiRuntime::StepArith( SbxOperator + // here we alway seem to have a refcount of 1. Also it seems that + // MakeTempTOS is called for other operation, so I hold off for now + // until I have a better idea +- if ( bVBAInterop ++ if ( bVBAEnabled + && ( p2->GetType() == SbxOBJECT || p2->GetType() == SbxVARIANT ) + ) + { +@@ -252,14 +251,13 @@ void SbiRuntime::StepPUT() + n = refVar->GetFlags(); + refVar->SetFlag( SBX_WRITE ); + } +- bool bVBAInterop = SbiRuntime::isVBAEnabled(); + + // if left side arg is an object or variant and right handside isn't + // either an object or a variant then try and see if a default + // property exists. + // to use e.g. Range{"A1") = 34 + // could equate to Range("A1").Value = 34 +- if ( bVBAInterop ) ++ if ( bVBAEnabled ) + { + if ( refVar->GetType() == SbxOBJECT ) + { +@@ -277,7 +275,7 @@ void SbiRuntime::StepPUT() + + *refVar = *refVal; + // lhs is a property who's value is currently null +- if ( !bVBAInterop || ( bVBAInterop && refVar->GetType() != SbxEMPTY ) ) ++ if ( !bVBAEnabled || ( bVBAEnabled && refVar->GetType() != SbxEMPTY ) ) + // #67607 Uno-Structs kopieren + checkUnoStructCopy( refVal, refVar ); + if( bFlagsChanged ) +@@ -410,7 +408,7 @@ void SbiRuntime::StepSET() { - OSL_TRACE( "in CallXScript" ); - ErrCode nErr = ERRCODE_NONE; -@@ -1470,7 +1470,7 @@ ErrCode SfxObjectShell::CallXScript( con - nErr = ERRCODE_BASIC_INTERNAL_ERROR; - } + SbxVariableRef refVal = PopVar(); + SbxVariableRef refVar = PopVar(); +- StepSET_Impl( refVal, refVar, SbiRuntime::isVBAEnabled() ); // this is really assigment ++ StepSET_Impl( refVal, refVar, bVBAEnabled ); // this is really assigment + } -- if ( bCaughtException ) -+ if ( bCaughtException && bRaiseError ) + void SbiRuntime::StepVBASET() +diff -rup basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx +--- basic/source/runtime/step1.cxx 2007-01-02 17:08:45.000000000 +0000 ++++ basic/source/runtime/step1.cxx 2007-01-02 13:01:06.000000000 +0000 +@@ -486,7 +486,7 @@ bool SbiRuntime::checkClass_Impl( const + Error( SbERR_INVALID_USAGE_OBJECT ); + bOk = false; + #else +- if ( SbiRuntime::isVBAEnabled() && pObj->IsA( TYPE(SbUnoObject) ) ) ++ if ( bVBAEnabled && pObj->IsA( TYPE(SbUnoObject) ) ) + { + SbUnoObject* pUnoObj = PTR_CAST(SbUnoObject,pObj); + bOk = checkUnoObjectType( pUnoObj, aClass ); +@@ -508,7 +508,7 @@ bool SbiRuntime::checkClass_Impl( const + } + else { - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); +- if ( !SbiRuntime::isVBAEnabled() ) ++ if ( !bVBAEnabled ) + { + if( bRaiseErrors ) + Error( SbERR_NEEDS_OBJECT ); +--- basic.bak/source/runtime/step2.cxx 2007-01-05 14:19:27.000000000 +0000 ++++ basic/source/runtime/step2.cxx 2007-01-05 15:46:45.000000000 +0000 +@@ -111,8 +111,6 @@ SbxVariable* SbiRuntime::FindElement + ( SbxObject* pObj, UINT32 nOp1, UINT32 nOp2, SbError nNotFound, BOOL bLocal ) + { + +- bool bIsVBAInterOp = SbiRuntime::isVBAEnabled(); +- + SbxVariable* pElem = NULL; + if( !pObj ) + { +@@ -120,29 +120,40 @@ + { + BOOL bFatalError = FALSE; + SbxDataType t = (SbxDataType) nOp2; +- String aName( pImg->GetString( static_cast( nOp1 & 0x7FFF ) ) ); +-#ifdef ENABLE_VBA +- bool bIsVBAInterOp = SbiRuntime::isVBAEnabled(); +- // Hacky capture of Evaluate [] syntax +- // this should be tackled I feel at the pcode level +- if ( bIsVBAInterOp && aName.Search('[') == 0 ) ++ ++ UINT32 nOp1Index = ( nOp1 & 0x7FFF ); ++ ++ if( bLocal ) + { +- // emulate pcode here +- StepARGC(); +- // psuedo StepLOADSC +- String sArg = aName.Copy( 1, aName.Len() - 2 ); +- SbxVariable* p = new SbxVariable; +- p->PutString( sArg ); +- PushVar( p ); +- // +- StepARGV(); +- nOp1 = nOp1 | 0x8000; // indicate params are present +- aName = String::CreateFromAscii("Evaluate"); ++ LocalOpIndexHash::iterator it = localIndex.find( nOp1Index ); ++ if ( it != localIndex.end() ) ++ pElem = refLocals->Get( static_cast( it->second ) ); + } +-#endif //ENABLE_VBA + +- if( bLocal ) +- pElem = refLocals->Find( aName, SbxCLASS_DONTCARE ); ++ String aName; ++ if ( !pElem ) ++ { ++ aName = pImg->GetString( static_cast( nOp1Index ) ); ++ // Hacky capture of Evaluate [] syntax ++ // this should be tackled I feel at the pcode level ++ if ( bVBAEnabled && aName.Search('[') == 0 ) ++ { ++ // emulate pcode here ++ StepARGC(); ++ // psuedo StepLOADSC ++ String sArg = aName.Copy( 1, aName.Len() - 2 ); ++ SbxVariable* p = new SbxVariable; ++ p->PutString( sArg ); ++ PushVar( p ); ++ // ++ StepARGV(); ++ nOp1 = nOp1 | 0x8000; // indicate params are present ++ aName = String::CreateFromAscii("Evaluate"); ++ } ++ if ( bLocal ) ++ pElem = refLocals->Find( aName, SbxCLASS_DONTCARE ); ++ } ++ + if( !pElem ) + { + // Die RTL brauchen wir nicht mehr zu durchsuchen! +@@ -174,7 +184,7 @@ SbxVariable* SbiRuntime::FindElement + + // i#i68894# if VBAInterOp favour searching vba globals + // over searching for uno classess +- if ( bIsVBAInterOp ) ++ if ( bVBAEnabled ) + { + // Try Find in VBA symbols space + pElem = VBAFind( aName, SbxCLASS_DONTCARE, &rBasic ); +@@ -212,6 +222,7 @@ SbxVariable* SbiRuntime::FindElement + if ( bSetName ) + pElem->SetName( aName ); + refLocals->Put( pElem, refLocals->Count() ); ++ localIndex[ nOp1Index ] = ( refLocals->Count() - 1 ); + } + } + +@@ -254,6 +265,7 @@ SbxVariable* SbiRuntime::FindElement + pElem->SetFlag( SBX_FIXED ); + pElem->SetName( aName ); + refLocals->Put( pElem, refLocals->Count() ); ++ localIndex[ nOp1Index ] = ( refLocals->Count() - 1 ); + } + } + } +@@ -1111,6 +1123,7 @@ void SbiRuntime::StepLOCAL( UINT32 nOp1, + SbxVariable* p = new SbxVariable( t ); + p->SetName( aName ); + refLocals->Put( p, refLocals->Count() ); ++ localIndex[ nOp1 ] = ( refLocals->Count() - 1 ); + } + } Index: stoc/source/registry_tdprovider/makefile.mk =================================================================== openoffice.org-1.9.129.ooo54603.fontconfig.patch: OOE680_m6/psprint/inc/psprint/fontmanager.hxx | 11 OOE680_m6/psprint/source/fontmanager/fontcache.cxx | 2 OOE680_m6/psprint/source/fontmanager/fontconfig.cxx | 410 +++++++++++++++---- OOE680_m6/psprint/source/fontmanager/fontmanager.cxx | 9 OOE680_m6/vcl/inc/outdev.h | 2 OOE680_m6/vcl/inc/outfont.hxx | 15 OOE680_m6/vcl/inc/sallayout.hxx | 1 OOE680_m6/vcl/source/gdi/outdev3.cxx | 345 +++++++++++---- OOE680_m6/vcl/source/gdi/sallayout.cxx | 46 ++ OOE680_m6/vcl/source/glyphs/gcach_layout.cxx | 12 OOE680_m6/vcl/source/window/window.cxx | 5 OOE680_m6/vcl/util/makefile.mk | 2 vcl/inc/sallayout.hxx | 3 vcl/source/gdi/outdev3.cxx | 11 vcl/source/gdi/sallayout.cxx | 25 - 15 files changed, 722 insertions(+), 177 deletions(-) Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- openoffice.org-1.9.129.ooo54603.fontconfig.patch 16 Jan 2007 11:21:14 -0000 1.13 +++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 22 Jan 2007 09:27:00 -0000 1.14 @@ -569,7 +569,7 @@ diff -ru OOE680_m6.fontconfig/vcl/source/glyphs/gcach_layout.cxx OOE680_m6/vcl/source/glyphs/gcach_layout.cxx --- OOE680_m6.fontconfig/vcl/source/glyphs/gcach_layout.cxx 2006-12-18 13:00:25.000000000 -0500 +++ OOE680_m6/vcl/source/glyphs/gcach_layout.cxx 2006-12-19 04:30:26.000000000 -0500 -@@ -391,6 +391,11 @@ +@@ -402,6 +402,11 @@ // ----------------------------------------------------------------------- @@ -581,19 +581,18 @@ bool IcuLayoutEngine::operator()( ServerFontLayout& rLayout, ImplLayoutArgs& rArgs ) { LEUnicode* pIcuChars; -@@ -491,7 +496,14 @@ - // when glyph fallback is needed update LayoutArgs +@@ -514,7 +519,14 @@ if( !nGlyphIndex ) { -- rArgs.NeedFallback( nCharPos, bRightToLeft ); -+ if( nCharPos >= 0 ) + if( nCharPos >= 0 ) + { -+ rArgs.NeedFallback( nCharPos, bRightToLeft ); + rArgs.NeedFallback( nCharPos, bRightToLeft ); + if ( (nCharPos > 0) && lcl_CharIsJoiner(rArgs.mpStr[nCharPos-1]) ) + rArgs.NeedFallback( nCharPos-1, bRightToLeft ); + else if ( (nCharPos + 1 < nRawRunGlyphCount) && lcl_CharIsJoiner(rArgs.mpStr[nCharPos+1]) ) + rArgs.NeedFallback( nCharPos+1, bRightToLeft ); + } ++ if( SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags ) continue; } @@ -622,15 +621,15 @@ diff -ru OOE680_m6.fontconfig/vcl/util/makefile.mk OOE680_m6/vcl/util/makefile.mk --- OOE680_m6.fontconfig/vcl/util/makefile.mk 2006-12-18 13:00:28.000000000 -0500 +++ OOE680_m6/vcl/util/makefile.mk 2006-12-19 04:27:48.000000000 -0500 -@@ -235,7 +235,7 @@ - SHL1STDLIBS += -framework Cocoa - .ENDIF +@@ -182,7 +182,7 @@ --SHL1STDLIBS += -lX11 -+SHL1STDLIBS += -lX11 -lpsp$(VERSION)$(DLLPOSTFIX) + .IF "$(USE_BUILTIN_RASTERIZER)"!="" + LIB1FILES += $(SLB)$/glyphs.lib +- SHL1STDLIBS+= $(FREETYPELIB) ++ SHL1STDLIBS+= $(FREETYPELIB) -lpsp$(VERSION)$(DLLPOSTFIX) + .ENDIF # USE_BUILTIN_RASTERIZER - .IF "$(OS)"=="MACOSX" - SHL1STDLIBS += -framework Foundation -framework CoreFoundation + SHL1LIBS= $(LIB1TARGET) diff -ru OOE680_m6.fontconfig/psprint/inc/psprint/fontmanager.hxx OOE680_m6/psprint/inc/psprint/fontmanager.hxx --- OOE680_m6.fontconfig/psprint/inc/psprint/fontmanager.hxx 2006-12-18 12:57:27.000000000 -0500 +++ OOE680_m6/psprint/inc/psprint/fontmanager.hxx 2006-12-19 04:30:49.000000000 -0500 openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch: dictionaries/prj/build.lst | 4 +++- prj/build.lst | 0 2 files changed, 3 insertions(+), 1 deletion(-) Index: openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch 4 Nov 2006 12:11:28 -0000 1.2 +++ openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch 22 Jan 2007 09:27:00 -0000 1.3 @@ -13,9 +13,10 @@ di dictionaries\cs_CZ nmake - all di_cs_CZ di_diclst NULL di dictionaries\da_DK nmake - all di_da_DK di_diclst NULL di dictionaries\de_DE nmake - all di_de_DE di_diclst NULL -@@ -16,4 +17,4 @@ +@@ -17,4 +18,5 @@ di dictionaries\th_TH nmake - all di_th_TH di_diclst NULL di dictionaries\sk_SK nmake - all di_sk_SK di_diclst NULL di dictionaries\sw_TZ nmake - all di_sw_TZ di_diclst NULL --di dictionaries\util nmake - all di_util di_cs_CZ di_da_DK di_de_DE di_de_CH di_de_AT di_en_GB di_en_US di_et_EE di_hu_HU di_it_IT di_nl_NL di_ru_RU di_th_TH di_sk_SK di_sw_TZ di_diclst NULL -+di dictionaries\util nmake - all di_util di_contrib di_cs_CZ di_da_DK di_de_DE di_de_CH di_de_AT di_en_GB di_en_US di_et_EE di_hu_HU di_it_IT di_nl_NL di_ru_RU di_th_TH di_sk_SK di_sw_TZ di_diclst NULL +-di dictionaries\util nmake - all di_util di_cs_CZ di_da_DK di_de_DE di_de_CH di_de_AT di_en_GB di_en_US di_et_EE di_hu_HU di_it_IT di_nl_NL di_pl_PL di_ru_RU di_th_TH di_sk_SK di_sw_TZ di_diclst NULL ++di dictionaries\util nmake - all di_util di_contrib di_cs_CZ di_da_DK di_de_DE di_de_CH di_de_AT di_en_GB di_en_US di_et_EE di_hu_HU di_it_IT di_nl_NL di_pl_PL di_ru_RU di_th_TH di_sk_SK di_sw_TZ di_diclst NULL ++ openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch: desktop/share/makefile.mk | 0 sysui/desktop/share/makefile.mk | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) Index: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch 21 Nov 2006 14:25:29 -0000 1.2 +++ openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch 22 Jan 2007 09:27:00 -0000 1.3 @@ -5,16 +5,16 @@ diff -u -p -r1.3 makefile.mk --- openoffice.org.orig/sysui/desktop/share/makefile.mk 21 Jan 2005 11:19:32 -0000 1.3 +++ openoffice.org/sysui/desktop/share/makefile.mk 27 Apr 2005 10:11:04 -0000 -@@ -107,9 +107,9 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) .. +@@ -97,9 +98,9 @@ @$(MKDIRHIER) $(@:db).$(INPATH) @echo Creating desktop entries .. @echo --------------------------------- - @$(PERL) brand.pl -p "$(LONGPRODUCTNAME)" -u $(UNIXFILENAME) --iconprefix "$(ICONPREFIX)-" $(LAUNCHERDEPN) $(@:db).$(INPATH) -- @$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(COMMONMISC)$/$(TARGET)$/launcher_name.ulf -- @$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(COMMONMISC)$/$(TARGET)$/launcher_comment.ulf +- @$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf +- @$(PERL) translate.pl -p "$(LONGPRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf + @$(PERL) brand.pl -p "$(PRODUCTNAME)" -u openoffice.org --iconprefix "$(ICONPREFIX)-" $(LAUNCHERDEPN) $(@:db).$(INPATH) -+ @$(PERL) translate.pl -p "$(PRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(COMMONMISC)$/$(TARGET)$/launcher_name.ulf -+ @$(PERL) translate.pl -p "$(PRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(COMMONMISC)$/$(TARGET)$/launcher_comment.ulf ++ @$(PERL) translate.pl -p "$(PRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Name" $(ULFDIR)$/launcher_name.ulf ++ @$(PERL) translate.pl -p "$(PRODUCTNAME)" -d $(@:db).$(INPATH) --ext "desktop" --key "Comment" $(ULFDIR)$/launcher_comment.ulf .IF "$(WITH_LIBSN)"=="YES" - @$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop)) + @noop x$(foreach,i,$(LAUNCHERLIST) $(shell +echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x .ENDIF openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/psprint/ppdparser.hxx | 4 psprint/source/printer/cupsmgr.cxx | 7 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 516 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 ++++++ vcl/source/gdi/print.cxx | 11 26 files changed, 755 insertions(+), 12 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 12 Dec 2006 20:27:30 -0000 1.18 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 22 Jan 2007 09:27:00 -0000 1.19 @@ -5,16 +5,16 @@ diff -u -r1.40 printerjob.cxx --- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40 +++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000 -@@ -740,6 +744,9 @@ +@@ -740,6 +740,9 @@ if( ! pKey || ! pValue ) return true; + if (pValue->m_bCupsOnly) + return true; + - String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) ); - aFeature += pKey->getKey(); - aFeature += ' '; + OStringBuffer aFeature(256); + aFeature.append( "[{\n" ); + if( bUseIncluseFeature ) Index: inc/psprint/ppdparser.hxx =================================================================== RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v @@ -351,7 +351,7 @@ diff -u -p -u -r1.12 cupsmgr.cxx --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000 -@@ -475,9 +487,10 @@ void CUPSManager::initialize() +@@ -475,9 +475,10 @@ // clear old stuff m_aCUPSDestMap.clear(); @@ -360,10 +360,10 @@ if( ! (m_nDests && m_pDests ) ) return; +#endif - - rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - int nPrinter = m_nDests; -@@ -550,6 +563,10 @@ void CUPSManager::initialize() + + // check for CUPS server(?) > 1.2 + // since there is no API to query, check for options that were +@@ -569,6 +570,10 @@ m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback ); #endif // ENABLE_CUPS @@ -706,7 +706,7 @@ short PrintDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) -@@ -623,15 +906,241 @@ +@@ -625,15 +908,231 @@ ImplInitControls(); ImplModifyControlHdl( NULL ); @@ -887,22 +887,12 @@ + OUString sOldPrinterName(mpPrinter->GetName()); + if (sNewPrinterName != sOldPrinterName) + { -+ USHORT i = 0; -+ USHORT nCount = Printer::GetQueueCount(); -+ if (nCount) -+ { -+ for (i = 0; i < nCount; ++i) -+ { -+ const QueueInfo& rInfo = Printer::GetQueueInfo(i, false); -+ if (OUString(rInfo.GetPrinterName()) == sNewPrinterName) -+ { -+ Printer aTempPrinter(rInfo); -+ mpPrinter->SetPrinterProps(&aTempPrinter); -+ break; -+ } -+ } -+ } -+ if (i == nCount) ++ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false )) ++ { ++ Printer aTempPrinter(*pInfo); ++ mpPrinter->SetPrinterProps(&aTempPrinter); ++ } ++ else + { + fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", + rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr()); @@ -955,7 +945,7 @@ } maStatusTimer.Stop(); -@@ -646,4 +1155,3 @@ +@@ -648,4 +1147,3 @@ mpPrinterImpl->m_bHelpDisabled = sal_True; maBtnHelp.Disable(); } openoffice.org-2.0.3.rh187919.gtkunderkde.patch: salnativewidgets-gtk.cxx | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) Index: openoffice.org-2.0.3.rh187919.gtkunderkde.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh187919.gtkunderkde.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-2.0.3.rh187919.gtkunderkde.patch 4 Nov 2006 12:11:28 -0000 1.2 +++ openoffice.org-2.0.3.rh187919.gtkunderkde.patch 22 Jan 2007 09:27:00 -0000 1.3 @@ -5,7 +5,7 @@ diff -u -p -u -r1.14 salnativewidgets-gtk.cxx --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx -@@ -408,10 +408,16 @@ +@@ -408,10 +408,15 @@ pSVData->maNWFData.mbDockingAreaSeparateTB = true; if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) ) @@ -14,15 +14,14 @@ - // ignore the clip rectangle passed to the paint methods - GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true; + { -+ if( g_type_from_name( "QtEngineStyle" ) ) -+ { -+ // KDE 3.3 invented a bug in the qt<->gtk theme engine -+ // that makes direct rendering impossible: they totally -+ // ignore the clip rectangle passed to the paint methods -+ GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true; -+ } ++ if( g_type_from_name( "QtEngineStyle" ) ) ++ { ++ // KDE 3.3 invented a bug in the qt<->gtk theme engine ++ // that makes direct rendering impossible: they totally ++ // ignore the clip rectangle passed to the paint methods ++ GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true; ++ } + } -+ - int nScreens = GetX11SalData()->GetDisplay()->GetScreenCount(); - gWidgetData = std::vector( nScreens ); - for( int i = 0; i < nScreens; i++ ) + static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" ); + if( pEnv && *pEnv ) + GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true; openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch: helpcontent2/util/target.pmk | 22 openoffice.org/xmlhelp/source/com/sun/star/help/HelpCompiler.cxx | 534 openoffice.org/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx | 281 openoffice.org/xmlhelp/source/com/sun/star/help/HelpLinker.cxx | 5379 ++++++++++ prj/d.lst | 0 source/com/sun/star/help/makefile.mk | 0 util/target.pmk | 0 xmlhelp/prj/build.lst | 2 xmlhelp/prj/d.lst | 1 xmlhelp/source/com/sun/star/help/makefile.mk | 101 10 files changed, 6212 insertions(+), 108 deletions(-) Index: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch 25 Oct 2006 16:34:45 -0000 1.3 +++ openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch 22 Jan 2007 09:27:00 -0000 1.4 @@ -1,3 +1,11 @@ +--- openoffice.org.orig/xmlhelp/prj/build.lst 2007-01-21 18:19:39.000000000 +0000 ++++ openoffice.org/xmlhelp/prj/build.lst 2007-01-21 18:19:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-xh xmlhelp : ucbhelper XmlSearch LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools NULL ++xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools NULL + xh xmlhelp usr1 - all xh_mkout NULL + xh xmlhelp\inc nmake - all xh_inc NULL + xh xmlhelp\source\helpprovider nmake - all xh_helpprovider xh_inc NULL Index: prj/d.lst =================================================================== RCS file: /cvs/util/xmlhelp/prj/d.lst,v @@ -18,7 +26,7 @@ diff -u -r1.24 makefile.mk --- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk 5 Jul 2006 21:13:24 -0000 1.24 +++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk 9 Oct 2006 10:00:27 -0000 -@@ -35,97 +35,34 @@ +@@ -35,103 +35,32 @@ PRJ = ..$/..$/..$/..$/.. PRJNAME = xmlhelp @@ -32,9 +40,15 @@ .INCLUDE : settings.mk --JARFILES = xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar +-JARFILES = xt-xmlsearch.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar -EXTRAJARFILES = - +-.IF "$(SYSTEM_XT)" == "YES" +-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XT_JAR) +-.ELSE +-JARFILES += xt.jar +-.ENDIF +- -.IF "$(SYSTEM_XML_APIS)" == "YES" -.IF "$(XCLASSPATH)" != "" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR) @@ -44,8 +58,7 @@ -.ELSE -JARFILES += xml-apis.jar -.ENDIF -+# --- Files -------------------------------------------------------- - +- -.IF "$(SYSTEM_XERCES)" == "YES" -.IF "$(XCLASSPATH)" != "" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR) @@ -63,21 +76,18 @@ -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR) -.ELSE -XCLASSPATH!:=$(DB_JAR) -+CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) - .ENDIF +-.ENDIF -.ELSE -JARFILES += db.jar --.ENDIF -- ++CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) + .ENDIF + -CLASSGENDIR = $(OUT)$/classgen -RDB = $(SOLARBINDIR)$/types.rdb -JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - +- -# --- Files -------------------------------------------------------- -+OBJFILES=\ -+ $(OBJ)$/HelpLinker.obj \ -+ $(OBJ)$/HelpCompiler.obj - +- -JAVACLASSFILES = \ - $(CLASSDIR)$/$(PACKAGE)$/HelpCompiler.class \ - $(CLASSDIR)$/$(PACKAGE)$/HelpLinker.class \ @@ -111,15 +121,19 @@ -JAVACLASSFILES += \ - $(CLASSDIR)$/$(PACKAGE)$/FileURLStreamHandler.class -.ENDIF -+APP1TARGET= $(TARGET) -+APP1OBJS=\ -+ $(OBJ)$/HelpLinker.obj \ -+ $(OBJ)$/HelpCompiler.obj ++OBJFILES=\ ++ $(OBJ)$/HelpLinker.obj \ ++ $(OBJ)$/HelpCompiler.obj -JARCLASSDIRS = com -JARTARGET = $(PRJNAME).jar -JARCOMPRESS = TRUE -CUSTOMMANIFESTFILE = manifest ++APP1TARGET= $(TARGET) ++APP1OBJS=\ ++ $(OBJ)$/HelpLinker.obj \ ++ $(OBJ)$/HelpCompiler.obj ++ +APP1STDLIBS+=$(SALLIB) $(BERKELEYLIB) $(ICUUCLIB) -lxslt # --- Targets ------------------------------------------------------ openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch: source/glyphs/gcach_ftyp.cxx | 0 util/makefile.mk | 0 vcl/source/glyphs/gcach_ftyp.cxx | 6 ++++++ vcl/util/makefile.mk | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) Index: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch 30 Nov 2006 12:10:26 -0000 1.2 +++ openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch 22 Jan 2007 09:27:00 -0000 1.3 @@ -5,12 +5,12 @@ diff -u -r1.82 makefile.mk --- openoffice.org.orig/vcl/util/makefile.mk 6 Oct 2006 10:07:49 -0000 1.82 +++ openoffice.org/vcl/util/makefile.mk 30 Nov 2006 11:27:31 -0000 -@@ -181,7 +181,7 @@ +@@ -182,7 +182,7 @@ .IF "$(USE_BUILTIN_RASTERIZER)"!="" LIB1FILES += $(SLB)$/glyphs.lib -- SHL1STDLIBS+= $(FREETYPELIB) -+ SHL1STDLIBS+= $(FREETYPELIB) -lfontconfig +- SHL1STDLIBS+= $(FREETYPELIB) -lpsp$(VERSION)$(DLLPOSTFIX) ++ SHL1STDLIBS+= $(FREETYPELIB) -lpsp$(VERSION)$(DLLPOSTFIX) -lfontconfig .ENDIF # USE_BUILTIN_RASTERIZER SHL1LIBS= $(LIB1TARGET) openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch: inc/glyphcache.hxx | 0 source/glyphs/glyphcache.cxx | 0 unx/source/gdi/gcach_xpeer.cxx | 0 vcl/inc/glyphcache.hxx | 5 +++++ vcl/source/glyphs/glyphcache.cxx | 21 ++++++++++++++++++++- vcl/unx/source/gdi/gcach_xpeer.cxx | 9 +++++++++ 6 files changed, 34 insertions(+), 1 deletion(-) Index: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch 15 Jan 2007 15:37:21 -0000 1.1 +++ openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch 22 Jan 2007 09:27:00 -0000 1.2 @@ -66,7 +66,7 @@ + mbCollectedZW = true; + } + -+ if (nGlyphIndex && (nGlyphIndex == mnZWNJ) || (nGlyphIndex == mnZWJ)) ++ if (nGlyphIndex && ((nGlyphIndex == mnZWNJ) || (nGlyphIndex == mnZWJ))) + return true; + + return false; openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch: config_office/configure.in | 2 lingucomponent/source/spellcheck/spell/makefile.mk | 2 lingucomponent/source/spellcheck/spell/sspellimp.cxx | 58 ++++++++++++++++++- source/editeng/unolingu.cxx | 0 source/spellcheck/spell/makefile.mk | 0 source/spellcheck/spell/sspellimp.cxx | 0 svx/source/editeng/unolingu.cxx | 5 - 7 files changed, 61 insertions(+), 6 deletions(-) Index: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch 29 Nov 2006 20:12:23 -0000 1.3 +++ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch 22 Jan 2007 09:27:00 -0000 1.4 @@ -21,24 +21,22 @@ diff -u -r1.31.22.1 unolingu.cxx --- openoffice.org.orig/svx/source/editeng/unolingu.cxx 22 Nov 2006 11:39:00 -0000 1.31.22.1 +++ openoffice.org/svx/source/editeng/unolingu.cxx 29 Nov 2006 19:11:38 -0000 -@@ -522,13 +522,15 @@ - // list of directories to scan for changed/new/deleted files - // 0: regular SO dictionary path +@@ -526,12 +526,13 @@ // 1: regular OOo dictionary path -- String aDirectories[2]; -+ // 2: system hunspell/myspell path -+ String aDirectories[3]; + // 2: user-dictionary path (where OOo linguistic by bad choice places downloaded dictionaries + // when the permissions for the share tree are missing. E.g. in user installations.) +- const USHORT nDirectories = 3; +- String aDirectories[ 3 /*nDirectories*/ ]; ++ const USHORT nDirectories = 4; ++ String aDirectories[ 4 /*nDirectories*/ ]; aDirectories[0] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "x" ) ); aDirectories[1] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "ooo" ) ); -+ aDirectories[2] = String::CreateFromAscii( "file:///usr/share/myspell" ); - aDirectories[0].Erase( aDirectories[0].Len() - 2, 2 ); - - INT32 nHashVal = 0; -- for (int i = 0; i < 2; ++i ) -+ for (int i = 0; i < 3; ++i ) - { - const String rURL = aDirectories[i]; - + //!! warning: see bUseFile below when changing this index !! + aDirectories[2] = linguistic::GetFileURL( SvtPathOptions::PATH_USERDICTIONARY, String::CreateFromAscii( "x" ) ); ++ aDirectories[3] = String::CreateFromAscii( "file:///usr/share/myspell" ); + // + aDirectories[0].Erase( aDirectories[0].Len() - 2, 2 ); // erase /x from URL + aDirectories[2].Erase( aDirectories[2].Len() - 2, 2 ); // erase /x from URL Index: source/spellcheck/spell/makefile.mk =================================================================== RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch: glyphs/gcach_layout.cxx | 0 vcl/source/glyphs/gcach_layout.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) Index: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch 17 Jan 2007 08:17:29 -0000 1.1 +++ openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch 22 Jan 2007 09:27:00 -0000 1.2 @@ -5,15 +5,12 @@ diff -u -r1.40 gcach_layout.cxx --- openoffice.org.orig/vcl/source/glyphs/gcach_layout.cxx 17 Sep 2006 12:12:38 -0000 1.40 +++ openoffice.org/vcl/source/glyphs/gcach_layout.cxx 17 Jan 2007 08:08:48 -0000 -@@ -529,8 +556,9 @@ - nGlyphCount += nFilteredRunGlyphCount; +@@ -569,7 +581,7 @@ } + // sort glyphs in visual order - rLayout.SortGlyphItems(); -- -+ // sort glyphs in visual order -+// rLayout.SortGlyphItems(); -+ ++ // rLayout.SortGlyphItems(); + // determine need for kashida justification if( (rArgs.mpDXArray || rArgs.mnLayoutWidth) - && ((meScriptCode == arabScriptCode) || (meScriptCode == syrcScriptCode)) ) Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.997 retrieving revision 1.998 diff -u -r1.997 -r1.998 --- openoffice.org.spec 17 Jan 2007 08:17:29 -0000 1.997 +++ openoffice.org.spec 22 Jan 2007 09:27:00 -0000 1.998 @@ -1,6 +1,6 @@ -%define oootag OOE680 -%define ooomilestone 6 -%define rh_rpm_release 14 +%define oootag OOF680 +%define ooomilestone 1 +%define rh_rpm_release 1 # gcc#19664# %define stlvisibilityfcked 1 @@ -26,7 +26,7 @@ ExclusiveArch: ppc %{ix86} x86_64 Summary: OpenOffice.org comprehensive office suite. Name: openoffice.org -Version: 2.1.0 +Version: 2.2.0 Release: %{ooomilestone}.%{rh_rpm_release} Epoch: 1 License: LGPL @@ -45,7 +45,6 @@ Source9: AutoSaveCommon.xcu Source10: ooo64726.sdf Source11: openoffice.org.langpack.template.tar.gz -Source12: pa-IN-179.sdf BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink BuildRequires: autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib BuildRequires: gcc, gcc-c++ >= 4.1.1, binutils, gcc-java >= 4.1.1 @@ -82,59 +81,49 @@ Patch14: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch Patch16: workspace.libxslt02.patch -Patch17: workspace.icuupgrade.patch -Patch18: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch -Patch19: workspace.inplaceobjects.patch -Patch20: openoffice.org-2.0.2.rh188467.printingdefaults.patch -Patch21: workspace.cmcfixes29.patch -Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch -Patch23: workspace.fpicker6.patch -Patch24: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch -Patch25: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch -Patch26: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch -Patch27: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch -Patch28: openoffice.org-2.0.3.rh187919.gtkunderkde.patch -Patch29: ooobuild.VBAObjects.patch -Patch30: workspace.fwk59.patch -Patch31: workspace.os89.patch -Patch32: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch -Patch33: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch -Patch34: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch -Patch35: pseudoworkspace.valgrind1.patch -Patch36: workspace.thbpp6.patch -Patch37: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch -Patch38: openoffice.org-2.0.4.rh217065.syncbackspace.patch -Patch39: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch -Patch40: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch -Patch41: workspace.aw024.patch -Patch42: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch -Patch43: workspace.dr51.patch -Patch44: openoffice.org-2.0.4.rh213710.vba.patch -Patch45: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch -Patch46: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch -Patch47: workspace.sixtyfour09.patch -Patch48: workspace.vcl69.patch -Patch49: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize -Patch50: workspace.dba22b.patch -Patch51: workspace.sixtyfour10.patch -Patch52: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch -Patch53: workspace.vcl70.patch -Patch54: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch -Patch55: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch -Patch56: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch -Patch57: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch -Patch58: workspace.vcl71.patch -Patch59: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch -Patch60: workspace.impress115.patch -Patch61: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch -Patch62: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch -Patch63: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch -Patch64: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch - - -%define instdir %{_libdir}/openoffice.org2.1 - -%define withlang --with-lang="%{langpack_langs}" +Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch +Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch +Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch +Patch20: workspace.fpicker6.patch +Patch21: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch +Patch22: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch +Patch23: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch +Patch24: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch +Patch25: openoffice.org-2.0.3.rh187919.gtkunderkde.patch +Patch26: ooobuild.VBAObjects.patch +Patch27: workspace.fwk59.patch +Patch28: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch +Patch29: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch +Patch30: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch +Patch31: pseudoworkspace.valgrind1.patch +Patch32: workspace.thbpp6.patch +Patch33: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch +Patch34: openoffice.org-2.0.4.rh217065.syncbackspace.patch +Patch35: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch +Patch36: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch +Patch37: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch +Patch38: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch +Patch39: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize +Patch40: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch +Patch41: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch +Patch42: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch +Patch43: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch +Patch44: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch +Patch45: workspace.vcl71.patch +Patch46: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch +Patch47: workspace.impress115.patch +Patch48: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch +Patch49: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch +Patch50: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch +Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch +Patch52: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch + + +%define instdir %{_libdir}/openoffice.org + +# rule of thumb of a poor help translations: check for "Working With +# %PRODUCTNAME Writer" in helpcontent2/source/text/swriter/localize.sdf +%define withlang --with-lang="%{langpack_langs}" --with-poor-help-localizations="cy fi ga gu-IN hr lt sr-CS ta-IN te-IN ur-IN" %description OpenOffice.org is an Open Source, community-developed, multi-platform @@ -413,7 +402,7 @@ Obsoletes: openoffice.org2-langpack-en %description langpack-en -Provides additional optional english resources for %{name} e.g. a thesaurus. +English thesaurus for %{name}. %package langpack-es Summary: Spanish language pack for %{name} @@ -958,54 +947,42 @@ %patch14 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch %patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch %patch16 -p1 -b .workspace.libxslt02.patch -%patch17 -p1 -b .workspace.icuupgrade.patch -%patch18 -p1 -b .ooo58606.sw.pre-edit.patch -%patch19 -p1 -b .workspace.inplaceobjects.patch -%patch20 -p1 -%patch21 -p1 -b .workspace.cmcfixes29.patch -%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch -%patch23 -p1 -b .workspace.fpicker6.patch -%patch24 -p1 -b .oooXXXXX.selinux.bridges.patch -%patch25 -p1 -b .ooo59127.vcl.honourcairofont.patch -%patch26 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch -%patch27 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch -%patch28 -p1 -b .rh187919.gtkunderkde.patch -%patch29 -p0 -b .ooobuild.VBAObjects.patch -%patch30 -p1 -b .workspace.fwk59.patch -%patch31 -p1 -b .workspace.os89.patch -%patch32 -p1 -b .ooo68048.vcl.imsurroundtext.patch -%patch33 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch -%patch34 -p1 -b .ooo69051.vcl.singlekeypress.patch -%patch35 -p1 -b .pseudoworkspace.valgrind1.patch -%patch36 -p1 -b .workspace.thbpp6.patch -%patch37 -p1 -b .rhXXXXXX.padmin.nospadmin.patch -%patch38 -p1 -b .rh217065.syncbackspace.patch -%patch39 -p1 -b .ooo70779.vcl.setprgname.patch -%patch40 -p1 -b .ooo70155.fasterhelplinking.patch -%patch41 -p1 -b .workspace.aw024.patch -%patch42 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch -%patch43 -p1 -b .workspace.dr51.patch -%patch44 -p1 -b .rh213710.vba.patch -%patch45 -p1 -b .ooo65491.psprint.enablenups.patch -%patch46 -p1 -b .ooo61812.svx.a11ycrash.patch -%patch47 -p1 -b .workspace.sixtyfour09.patch -%patch48 -p1 -b .workspace.vcl69.patch -cat %{PATCH49} >> svtools/source/dialogs/localize.sdf -%patch50 -p1 -b .workspace.dba22b.patch -%patch51 -p1 -b .workspace.sixtyfour10.patch -%patch52 -p1 -b .ooo72014.officecfg.malayammenu.patch -%patch53 -p1 -b .workspace.vcl70.patch -%patch54 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch -%patch55 -p1 -b .rh217269.officecfg.nosequencecheck.patch -%patch56 -p1 -b .ooo72129.vcl.fontglyphindex.patch -%patch57 -p1 -b .ooo73485.vcl.filterzwatrender.patch -%patch58 -p1 -b .workspace.vcl71.patch -%patch59 -p1 -b .gccXXXXX.basegfx.crash.patch -%patch60 -p1 -b .workspace.impress115.patch -%patch61 -p1 -b .ooo72349.svx.scriptrange.patch -%patch62 -p1 -b .ooo73201.sw.a11yloadcrash.patch -%patch63 -p1 -b .ooo73481.svx.longnotint32.patch -%patch64 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch +%patch17 -p1 -b .ooo58606.sw.pre-edit.patch +%patch18 -p1 +%patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch +%patch20 -p1 -b .workspace.fpicker6.patch +%patch21 -p1 -b .oooXXXXX.selinux.bridges.patch +%patch22 -p1 -b .ooo59127.vcl.honourcairofont.patch +%patch23 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch +%patch24 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch +%patch25 -p1 -b .rh187919.gtkunderkde.patch +%patch26 -p0 -b .ooobuild.VBAObjects.patch +%patch27 -p1 -b .workspace.fwk59.patch +%patch28 -p1 -b .ooo68048.vcl.imsurroundtext.patch +%patch29 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch +%patch30 -p1 -b .ooo69051.vcl.singlekeypress.patch +%patch31 -p1 -b .pseudoworkspace.valgrind1.patch +%patch32 -p1 -b .workspace.thbpp6.patch +%patch33 -p1 -b .rhXXXXXX.padmin.nospadmin.patch +%patch34 -p1 -b .rh217065.syncbackspace.patch +%patch35 -p1 -b .ooo70155.fasterhelplinking.patch +%patch36 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch +%patch37 -p1 -b .ooo65491.psprint.enablenups.patch +%patch38 -p1 -b .ooo61812.svx.a11ycrash.patch +cat %{PATCH39} >> svtools/source/dialogs/localize.sdf +%patch40 -p1 -b .ooo72014.officecfg.malayammenu.patch +%patch41 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch +%patch42 -p1 -b .rh217269.officecfg.nosequencecheck.patch +%patch43 -p1 -b .ooo72129.vcl.fontglyphindex.patch +%patch44 -p1 -b .ooo73485.vcl.filterzwatrender.patch +%patch45 -p1 -b .workspace.vcl71.patch +%patch46 -p1 -b .gccXXXXX.basegfx.crash.patch +%patch47 -p1 -b .workspace.impress115.patch +%patch48 -p1 -b .ooo72349.svx.scriptrange.patch +%patch49 -p1 -b .ooo73201.sw.a11yloadcrash.patch +%patch50 -p1 -b .ooo73481.svx.longnotint32.patch +%patch51 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch +%patch52 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -1026,14 +1003,10 @@ cd config_office autoconf export PATH=$PATH:/usr/sbin -%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang} +%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang} cd .. ./bootstrap source Linux*Env.Set.sh -#configure buglet -export WITHOUT_PPDS="YES" -export WITHOUT_AFMS="YES" -export SCPDEFS="$SCPDEFS -DWITHOUT_AFMS -DWITHOUT_PPDS" #force linker export LINK=$CXX #faster build @@ -1069,7 +1042,6 @@ build --dlv_switch -link --all -P$MAXBUILDS -- -s deliver -link localize -m -x -l bn -f %{SOURCE10} -localize -m -x -l pa-IN -f %{SOURCE12} cd ../.. cd instsetoo_native/util @@ -1152,23 +1124,23 @@ af help af_??.??? *af_ZA* western ar nohelp nodict nolingu ctl \ bg help bg_BG.??? *bg_BG* western bn help nodict nolingu western \ ca help ca_ES.??? *ca_ES* western cs help nodict *cs_CZ* western \ -cy help cy_GB.??? *cy_GB* western da help da_DK.??? *da_DK* western \ +cy nohelp cy_GB.??? *cy_GB* western da help da_DK.??? *da_DK* western \ de help de_??.??? *de_* western el help el_GR.??? *el_GR* western \ es help es_??.??? *es_* western et help et_EE.??? *et_EE* western \ -eu nohelp nodict nolingu western fi help nodict *fi_FI* western \ +eu nohelp nodict nolingu western fi nohelp nodict *fi_FI* western \ fr help fr_??.??? *fr_* western ga nohelp ga_IE.??? *ga_IE* western \ gl nohelp gl_ES.??? *gl_ES* western gu-IN nohelp nodict nolingu ctl \ pa-IN nohelp nodict nolingu ctl he nohelp he_IL.??? *he_IL* ctl \ hi-IN help nodict nolingu ctl hu help hu_HU.??? *hu_HU* western \ -hr help hr_HR.??? *hr_HR* western it help it_??.??? *it_IT* western \ +hr nohelp hr_HR.??? *hr_HR* western it help it_??.??? *it_IT* western \ ja help nodict nolingu cjk ko help nodict nolingu cjk \ -lt help lt_LT.??? *lt_LT* western ms nohelp ms_??.??? *ms_MY* western \ +lt nohelp lt_LT.??? *lt_LT* western ms nohelp ms_??.??? *ms_MY* western \ nb help nb_NO.??? *nb_NO* western nl help nl_??.??? *nl_* western \ nn help nn_NO.??? *nn_NO* western pl help pl_PL.??? *pl_PL* western \ pt help pt_PT.??? *pt_PT* western pt-BR help pt_BR.??? *pt_BR* western \ ru help ru_RU.??? *ru_RU* western sk help sk_SK.??? *sk_SK* western \ -sl help sl_SI.??? *sl_SI* western sr-CS help nodict nolingu western \ -sv help sv_??.??? *sv_* western ta-IN help nodict nolingu ctl \ +sl help sl_SI.??? *sl_SI* western sr-CS nohelp nodict nolingu western \ +sv help sv_??.??? *sv_* western ta-IN nohelp nodict nolingu ctl \ th help th_TH.??? *th_TH* ctl tr help nodict nolingu western \ zh-CN help nodict nolingu cjk zh-TW help nodict nolingu cjk \ zu help zu_ZA.??? *zu_ZA* western tn help nodict nolingu western \ @@ -2592,6 +2564,23 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Fri Jan 19 2007 Caolan McNamara - 1:2.2.0-1.1 +- start of release candidate +- drop integrated workspace.icuupgrade.patch +- drop integrated workspace.inplaceobjects.patch +- drop integrated workspace.cmcfixes29.patch +- drop integrated workspace.os89.patch +- drop integrated workspace.aw024.patch +- drop integrated workspace.dr51.patch +- drop integrated workspace.sixtyfour09.patch +- drop integrated workspace.vcl69.patch +- drop integrated workspace.dba22b.patch +- drop integrated workspace.sixtyfour10.patch +- drop integrated workspace.vcl70.patch +- drop integrated openoffice.org-2.0.4.rh213710.vba.patch +- drop integrated openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch +- Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch + * Wed Jan 17 2007 Caolan McNamara - 1:2.1.0-6.14 - Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch pseudoworkspace.valgrind1.patch: bf_sfx2/source/explorer/sfx2_nochaos.cxx | 0 binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx | 4 ++-- inc/xhatch.hxx | 0 psprint/source/helper/ppdparser.cxx | 2 +- source/core/txtnode/swfont.cxx | 0 source/dialog/dlgctrl.cxx | 0 source/dialog/numpages.cxx | 0 source/gdi/impgraph.cxx | 0 source/helper/ppdparser.cxx | 0 svx/inc/xhatch.hxx | 2 +- svx/source/dialog/dlgctrl.cxx | 4 ++-- svx/source/dialog/numpages.cxx | 1 + sw/source/core/txtnode/swfont.cxx | 2 +- unx/gtk/gdi/salnativewidgets-gtk.cxx | 0 vcl/source/gdi/impgraph.cxx | 4 ++-- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 3 +-- 16 files changed, 11 insertions(+), 11 deletions(-) Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pseudoworkspace.valgrind1.patch 11 Jan 2007 11:06:38 -0000 1.13 +++ pseudoworkspace.valgrind1.patch 22 Jan 2007 09:27:00 -0000 1.14 @@ -1,55 +1,3 @@ -Index: osl/unx/process.c -=================================================================== -RCS file: /cvs/porting/sal/osl/unx/process.c,v -retrieving revision 1.40 -diff -u -r1.40 process.c ---- openoffice.org.orig/sal/osl/unx/process.c 20 Jun 2006 04:18:45 -0000 1.40 -+++ openoffice.org/sal/osl/unx/process.c 1 Sep 2006 08:30:56 -0000 -@@ -1171,7 +1171,7 @@ - char* tmp=0; - char prstatbuf[512]; - memset(prstatbuf,0,512); -- read(fd,prstatbuf,512); -+ read(fd,prstatbuf,511); - - close(fd); - /*printf("%s\n\n",prstatbuf);*/ -@@ -1219,7 +1219,7 @@ - { - char prstatmbuf[512]; - memset(prstatmbuf,0,512); -- read(fd,prstatmbuf,512); -+ read(fd,prstatmbuf,511); - - close(fd); - -@@ -1248,7 +1248,7 @@ - char* tmp=0; - char prstatusbuf[512]; - memset(prstatusbuf,0,512); -- read(fd,prstatusbuf,512); -+ read(fd,prstatusbuf,511); - - close(fd); - -Index: source/explorer/nochaos.cxx -=================================================================== -RCS file: /cvs/framework/sfx2/source/explorer/nochaos.cxx,v -retrieving revision 1.4 -diff -u -r1.4 nochaos.cxx ---- openoffice.org.orig/sfx2/source/explorer/nochaos.cxx 19 Jun 2006 22:31:55 -0000 1.4 -+++ openoffice.org/sfx2/source/explorer/nochaos.cxx 24 Aug 2006 14:56:34 -0000 -@@ -211,8 +211,8 @@ - m_ppDefaults( new SfxPoolItem* [ m_nItems ] ), - m_pItemInfos( new SfxItemInfo [ m_nItems ] ) - { -- rtl_zeroMemory( m_ppDefaults, sizeof( m_ppDefaults ) * m_nItems ); -- rtl_zeroMemory( m_pItemInfos, sizeof( m_pItemInfos ) * m_nItems ); -+ rtl_zeroMemory( m_ppDefaults, sizeof( SfxPoolItem* ) * m_nItems ); -+ rtl_zeroMemory( m_pItemInfos, sizeof( SfxItemInfo ) * m_nItems ); - - Insert( - new SfxStringItem( WID_CHAOS_START, String() ), Index: unx/gtk/gdi/salnativewidgets-gtk.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- sources 18 Dec 2006 12:21:14 -0000 1.213 +++ sources 22 Jan 2007 09:27:00 -0000 1.214 @@ -5,9 +5,9 @@ 05a906513ef89af5e189097fa0c50681 ooo64726.sdf 5a7c718e63d09f42fd40017b28dffd10 AutoSaveCommon.xcu d57f21d70ba34ddb20f40a4d08427722 AutoSaveRecovery.xcu -2618cff7bfdf0a9ca30233e349df73c6 openoffice.org-myspell-contrib.tar.gz cba51824724ada973394d8feecdd0213 pa-IN-179.sdf 26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz 9d65fe089ddb5793cc1815ebe96b1f8a OOE680_m6.tar.bz2 b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz -bbf88cb087f41d387eb339d8688e7dd5 openoffice.org-simple-crash_report.sh +5dd6aa0d28d463a7760c8b290fcb245a openoffice.org-myspell-contrib.tar.gz +a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh workspace.fpicker6.patch: fpicker/source/office/OfficeFilePicker.cxx | 27 +++ fpicker/source/office/OfficeFilePicker.hxx | 16 + fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 83 ++++------ fpicker/source/unx/gnome/SalGtkFilePicker.hxx | 24 +- fpicker/source/unx/gnome/SalGtkPicker.cxx | 3 fpicker/source/unx/gnome/SalGtkPicker.hxx | 4 offapi/com/sun/star/ui/dialogs/makefile.mk | 1 openoffice.org/offapi/com/sun/star/ui/dialogs/XFilePickerWorkaround.idl | 75 +++++++++ sfx2/source/dialog/filedlghelper.cxx | 33 +++ 9 files changed, 205 insertions(+), 61 deletions(-) Index: workspace.fpicker6.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.fpicker6.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- workspace.fpicker6.patch 5 Dec 2006 10:14:57 -0000 1.2 +++ workspace.fpicker6.patch 22 Jan 2007 09:27:00 -0000 1.3 @@ -1,35 +1,6 @@ Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx =================================================================== RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v -retrieving revision 1.11 -diff -u -p -r1.11 SalGtkFilePicker.cxx ---- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 29 Mar 2006 07:41:24 -0000 1.11 -+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 12 May 2006 11:28:22 -0000 -@@ -1864,10 +1864,10 @@ case_insensitive_filter (const GtkFileFi - g_return_val_if_fail( data != NULL, FALSE ); - g_return_val_if_fail( filter_info != NULL, FALSE ); - -- if( !filter_info->filename ) -+ if( !filter_info->uri ) - return FALSE; - -- const char *pExtn = strrchr( filter_info->filename, '.' ); -+ const char *pExtn = strrchr( filter_info->uri, '.' ); - if( !pExtn ) - return FALSE; - pExtn++; -@@ -1911,7 +1914,7 @@ int SalGtkFilePicker::implAddFilter( con - if (aTokens.getLength()) - aTokens += OUString::createFromAscii(","); - aTokens = aTokens += aToken; -- gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, -+ gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, - case_insensitive_filter, - g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ) ), - (GDestroyNotify) g_free ); -Index: fpicker/source/unx/gnome/SalGtkFilePicker.cxx -=================================================================== -RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v retrieving revision 1.10 diff -u -p -u -r1.10 SalGtkFilePicker.cxx --- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 28 Sep 2005 14:09:38 -0000 1.10 @@ -493,10 +464,10 @@ #ifndef INCLUDED_SVT_FILEPICKER_HXX #define INCLUDED_SVT_FILEPICKER_HXX --#ifndef _CPPUHELPER_IMPLBASE6_HXX_ --#include -+#ifndef _CPPUHELPER_IMPLBASE7_HXX_ -+#include +-#ifndef _CPPUHELPER_IMPLBASE7_HXX_ +-#include ++#ifndef _CPPUHELPER_IMPLBASE8_HXX_ ++#include #endif #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERCONTROLACCESS_HPP_ @@ -510,29 +481,29 @@ #ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPREVIEW_HPP_ #include #endif -@@ -93,10 +96,11 @@ +@@ -98,10 +101,11 @@ // class SvtFilePicker --------------------------------------------------- --typedef ::cppu::ImplHelper6 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess -+typedef ::cppu::ImplHelper7 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess +-typedef ::cppu::ImplHelper7 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess ++typedef ::cppu::ImplHelper8 < ::com::sun::star::ui::dialogs::XFilePickerControlAccess , ::com::sun::star::ui::dialogs::XFilePickerNotifier , ::com::sun::star::ui::dialogs::XFilePreview , ::com::sun::star::ui::dialogs::XFilterManager + , ::com::sun::star::ui::dialogs::XFilePickerWorkaround , ::com::sun::star::ui::dialogs::XFilterGroupManager , ::com::sun::star::lang::XServiceInfo - > SvtFilePicker_Base; -@@ -181,7 +185,13 @@ + , ::com::sun::star::ui::dialogs::XAsynchronousExecutableDialog +@@ -194,6 +198,12 @@ + virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL getShowState() throw ( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ -+ // XFilePickerWorkaround functions -+ //------------------------------------------------------------------------------------ -+ -+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFilesAsURIs() throw (::com::sun::star::uno::RuntimeException); ++ //------------------------------------------------------------------------------------ ++ // XFilePickerWorkaround functions ++ //------------------------------------------------------------------------------------ + -+ //------------------------------------------------------------------------------------ ++ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFilesAsURIs() throw (::com::sun::star::uno::RuntimeException); ++ + //------------------------------------------------------------------------------------ // XFilterManager functions //------------------------------------------------------------------------------------ - workspace.libxslt02.patch: framework/filter/prj/build.lst | 2 framework/filter/source/config/fragments/langfilter.xsl | 22 framework/filter/source/config/fragments/makefile.mk | 9 installation/readlicense_oo/docs/readme.xsl | 11 installation/readlicense_oo/prj/build.lst | 2 installation/readlicense_oo/util/makefile.pmk | 21 installation/scp2/source/ooo/file_library_ooo.scp | 18 installation/scp2/source/ooo/makefile.mk | 4 installation/scp2/source/ooo/module_hidden_ooo.scp | 1 installation/scp2/source/ooo/shortcut_ooo.scp | 28 tools/config_office/configure.in | 80 +- tools/config_office/set_soenv.in | 6 tools/solenv/inc/libs.mk | 7 tools/solenv/inc/tg_config.mk | 102 +-- tools/solenv/inc/unitools.mk | 1 util/extensions/source/update/check/makefile.mk | 7 util/officecfg/org/openoffice/configuration/makefile.mk | 7 util/officecfg/prj/build.lst | 24 util/officecfg/util/alllang.xsl | 14 util/officecfg/util/data_val.xsl | 14 util/officecfg/util/makefile.pmk | 3 util/xmlhelp/prj/build.lst | 2 util/xmlhelp/source/cxxhelp/provider/makefile.mk | 14 util/xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 486 +++++----------- util/xmlhelp/util/makefile.mk | 16 25 files changed, 374 insertions(+), 527 deletions(-) Index: workspace.libxslt02.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.libxslt02.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- workspace.libxslt02.patch 4 Jan 2007 17:43:25 -0000 1.5 +++ workspace.libxslt02.patch 22 Jan 2007 09:27:00 -0000 1.6 @@ -84,13 +84,16 @@ diff -u util/officecfg/org/openoffice/configuration/makefile.mk:1.11 util/officecfg/org/openoffice/configuration/makefile.mk:1.11.190.1 --- util/officecfg/org/openoffice/configuration/makefile.mk:1.11 Thu Mar 16 03:13:38 2006 +++ util/officecfg/org/openoffice/configuration/makefile.mk Sun Dec 24 00:10:56 2006 -@@ -43,14 +43,13 @@ +@@ -45,18 +45,11 @@ - .INCLUDE : settings.mk - --JARFILES = xml-apis.jar xercesImpl.jar xt.jar -+JARFILES = xml-apis.jar xercesImpl.jar + JARFILES = xml-apis.jar xercesImpl.jar +-.IF "$(SYSTEM_XT)" == "YES" +-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XT_JAR) +-.ELSE +-JARFILES += xt.jar +-.ENDIF +- JAVACLASSFILES= \ $(CLASSDIR)$/$(PACKAGE)$/XMLDefaultGenerator.class \ $(CLASSDIR)$/$(PACKAGE)$/Generator.class \ @@ -105,8 +108,8 @@ --- util/officecfg/prj/build.lst:1.14 Tue Mar 15 04:40:31 2005 +++ util/officecfg/prj/build.lst Sun Dec 24 00:10:57 2006 @@ -1,18 +1,16 @@ --oc officecfg : soltools solenv external transex3 NULL -+oc officecfg : soltools solenv external transex3 LIBXSLT:libxslt NULL +-oc officecfg : soltools solenv xt transex3 NULL ++oc officecfg : soltools solenv xt transex3 LIBXSLT:libxslt NULL oc officecfg usr30073 - none NULL oc officecfg usr1 - all oc_mkout NULL -oc officecfg\org\openoffice\configuration nmake - all oc_config NULL @@ -965,19 +968,19 @@ diff -u tools/config_office/configure.in:1.190 tools/config_office/configure.in:1.190.4.1 --- tools/config_office/configure.in:1.190 Tue Dec 12 08:05:16 2006 +++ tools/config_office/configure.in Sat Dec 23 09:22:53 2006 -@@ -162,9 +162,6 @@ +@@ -166,9 +166,6 @@ assertions, object counting, etc. Larger build. Independent from --enable-debug ],,) -AC_ARG_ENABLE(xsltproc, --[ --enable-xsltproc: Use xsltproc at buildtime, even when java is available +-[ --enable-xsltproc Use xsltproc at buildtime, even when java is available -],,) AC_ARG_ENABLE(crashdump, [[ --enable-crashdump[=yes|TRUE|STATIC|no] - Enable (disable) the crashdump feature code. [default=no] -@@ -327,8 +324,8 @@ - [ --with-serializer-jar=JARFILE Specify path to jarfile manually ], - [ SERIALIZER_JAR="$withval" + Enable (disable) the crashdump feature code. +@@ -342,8 +339,8 @@ + [ --with-xt-jar=JARFILE Specify path to jarfile manually ], + [ XT_JAR="$withval" ]) -AC_ARG_WITH(system-sablot, -[ --with-system-sablot Use sablot already on system @@ -986,7 +989,7 @@ ],,) AC_ARG_WITH(system-odbc, [ --with-system-odbc-headers Use the odbc headers already on system -@@ -2045,11 +2042,9 @@ +@@ -2048,11 +2045,9 @@ if test "$WITH_JAVA" != "no"; then AC_MSG_RESULT([yes]) SOLAR_JAVA="TRUE" @@ -998,7 +1001,7 @@ AC_MSG_WARN([building without java will mean some features will not be available]) echo "building without java will mean some features will not be available" >>warn -@@ -2391,21 +2386,6 @@ +@@ -2386,21 +2381,6 @@ AC_SUBST(JAVAAOTCOMPILER) AC_SUBST(JAVADOC) @@ -1020,12 +1023,10 @@ dnl =================================================================== dnl Checks for specific files. dnl =================================================================== -@@ -2907,6 +2887,40 @@ - fi +@@ -2903,6 +2883,38 @@ AC_SUBST(USE_FT_EMBOLDEN) -+ -+dnl =================================================================== + dnl =================================================================== +dnl Check for system libxslt +dnl =================================================================== +AC_MSG_CHECKING([which libxslt to use]) @@ -1057,15 +1058,14 @@ +AC_SUBST(LIBXSLT_CFLAGS) +AC_SUBST(LIBXSLT_LIBS) + -+ - dnl =================================================================== ++dnl =================================================================== dnl Check for system libxml dnl =================================================================== -@@ -3202,31 +3216,6 @@ - if test -n "$NEED_XALAN"; then - BUILD_TYPE="$BUILD_TYPE XALAN" + AC_MSG_CHECKING([which libxml to use]) +@@ -3231,30 +3243,6 @@ fi -- + AC_SUBST(SYSTEM_XT) + AC_SUBST(XT_JAR) - -dnl =================================================================== -dnl Check for system sablot @@ -1097,7 +1097,7 @@ diff -u tools/config_office/set_soenv.in:1.128 tools/config_office/set_soenv.in:1.128.4.1 --- tools/config_office/set_soenv.in:1.128 Tue Dec 12 08:05:54 2006 +++ tools/config_office/set_soenv.in Sat Dec 23 09:22:53 2006 -@@ -1451,7 +1451,6 @@ +@@ -1448,7 +1448,6 @@ ToFile( "SRC_ROOT", $SRC_ROOT, "e" ); ToFile( "SHELL", $SHELL, "e" ); ToFile( "JAVA_HOME", $JAVA_HOME, "e" ); @@ -1105,19 +1105,18 @@ ToFile( "ANT_HOME", "@ANT_HOME@", "e" ); ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); ToFile( "ANT", "@ANT@", "e" ); -@@ -1821,9 +1820,10 @@ - ToFile( "SYSTEM_XALAN", "@SYSTEM_XALAN@", "e" ); - ToFile( "XALAN_JAR", "@XALAN_JAR@", "e" ); +@@ -1821,8 +1820,9 @@ ToFile( "SERIALIZER_JAR", "@SERIALIZER_JAR@", "e" ); + ToFile( "SYSTEM_XT", "@SYSTEM_XT@", "e" ); + ToFile( "XT_JAR", "@XT_JAR@", "e" ); -ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" ); -ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" ); - ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); +ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); +ToFile( "LIBXSLT_CFLAGS", "@LIBXSLT_CFLAGS@", "e" ); +ToFile( "LIBXSLT_LIBS", "@LIBXSLT_LIBS@", "e" ); + ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" ); ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" ); - ToFile( "SYSTEM_CURL", "@SYSTEM_CURL@", "e" ); Index: util/extensions/source/update/check/makefile.mk diff -u util/extensions/source/update/check/makefile.mk:1.6 util/extensions/source/update/check/makefile.mk:1.6.16.1 --- util/extensions/source/update/check/makefile.mk:1.6 Wed Dec 13 07:17:13 2006 @@ -1136,21 +1135,6 @@ PROCESSOUT=$(MISC)$/$(TARGET) PROCESSORDIR=$(SOLARBINDIR) -Index: tools/solenv/config/stand.lst -diff -u tools/solenv/config/stand.lst:1.103 tools/solenv/config/stand.lst:1.103.108.1 ---- tools/solenv/config/stand.lst:1.103 Mon Oct 9 01:54:57 2006 -+++ tools/solenv/config/stand.lst Sun Dec 24 01:04:55 2006 -@@ -502,6 +502,10 @@ - { - SCS :pserver:hr at so-cvs-tunnel.germany.sun.com:/cvs - } -+ libxslt -+ { -+ SCS :pserver:hr at so-cvs-tunnel.germany.sun.com:/cvs -+ } - libxml2 - { - SCS :pserver:hr at so-cvs-tunnel.germany.sun.com:/cvs Index: tools/solenv/inc/libs.mk diff -u tools/solenv/inc/libs.mk:1.106 tools/solenv/inc/libs.mk:1.106.52.1 --- tools/solenv/inc/libs.mk:1.106 Tue Nov 14 06:04:00 2006 @@ -1194,7 +1178,7 @@ # # --- XCS --- -@@ -60,32 +67,15 @@ +@@ -60,32 +67,20 @@ $(PROCESSOUT)$/registry$/schema$/$(PACKAGEDIR)$/%.xcs : %.xcs @echo -------------+ validating and stripping schema files -$(MKDIRHIER) $(@:d) @@ -1202,14 +1186,14 @@ -.IF "$(NO_INSPECTION)"=="" - $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< -.ENDIF # "$(NO_INSPECTION)"=="" -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$* -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$* +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp - $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ -.ELSE --# xsltproc already validates against the dtd. For additional validation, --# org.openoffice.configuration.Inspector should be replaced and the --# replacement should be invoked here. + # xsltproc already validates against the dtd. For additional validation, + # org.openoffice.configuration.Inspector should be replaced and the + # replacement should be invoked here. - $(XSLTPROC) -o $(@:d)$*.val \ + $(XSLTPROC) --nonet -o $(@:d)$*.val \ --stringparam componentName $(PACKAGE).$* \ @@ -1218,29 +1202,29 @@ - $(XSLDIR)$/sanity.xsl $< - $(XSLTPROC) -o $(@:d)$*.tmp \ - $(XSLDIR)$/schema_trim.xsl $< --# xsltproc already seems to pretty-print the xml, so --# org.openoffice.helper.PrettyPrinter seems to be unnecessary. -- cp $(@:d)$*.tmp $@ --.ENDIF -- +$(RM) $(@:d)$*.tmp > $(NULLDEV) -- +$(RM) $(@:d)$*.val > $(NULLDEV) -- +$(RM) $(@:d)$*.san > $(NULLDEV) + $(SYSXSLDIR)schema_val.xsl $< + $(XSLTPROC) --nonet -o $(@:d)$*.san \ + $(SYSXSLDIR)sanity.xsl $< + $(XSLTPROC) --nonet -o $@ \ + $(SYSXSLDIR)schema_trim.xsl $< + # xsltproc already seems to pretty-print the xml, so + # org.openoffice.helper.PrettyPrinter seems to be unnecessary. +- cp $(@:d)$*.tmp $@ +-.ENDIF +- +$(RM) $(@:d)$*.tmp > $(NULLDEV) +- +$(RM) $(@:d)$*.val > $(NULLDEV) +- +$(RM) $(@:d)$*.san > $(NULLDEV) + +-$(RM) $(@:d)$*.val > $(NULLDEV) + +-$(RM) $(@:d)$*.san > $(NULLDEV) $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs : %.xcs # just a copy for now - insert "cfgex" commandline when required -@@ -100,13 +90,9 @@ +@@ -100,13 +95,9 @@ $(PROCESSOUT)$/registry$/res$/{$(alllangiso)}$/$(PACKAGEDIR)$/%.properties :| $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcs @echo -------------+ creating locale dependent resource bundles -$(MKDIRHIER) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} +- $(JAVAI) $(JAVACPS) $(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} -.ELSE - $(XSLTPROC) -o $@ \ + $(XSLTPROC) --nonet -o $@ \ @@ -1251,7 +1235,7 @@ # # --- XCU --- -@@ -127,31 +113,15 @@ +@@ -127,31 +118,20 @@ $(PROCESSOUT)$/registry$/data$/$(PACKAGEDIR)$/%.xcu : %.xcu @echo -------------+ validating and creating a locale independent file -$(MKDIRHIER) $(@:d) @@ -1259,13 +1243,13 @@ -.IF "$(NO_INSPECTION)"=="" - $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< -.ENDIF # "$(NO_INSPECTION)"=="" -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema - $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ -.ELSE --# xsltproc already validates against the dtd. For additional validation, --# org.openoffice.configuration.Inspector should be replaced and the --# replacement should be invoked here. + # xsltproc already validates against the dtd. For additional validation, + # org.openoffice.configuration.Inspector should be replaced and the + # replacement should be invoked here. - $(XSLTPROC) -o $(@:d)$*.val \ - --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \ - --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ @@ -1274,12 +1258,6 @@ - --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \ - --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ - $(XSLDIR)$/alllang.xsl $< --# xsltproc already seems to pretty-print the xml, so --# org.openoffice.helper.PrettyPrinter seems to be unnecessary. -- cp $(@:d)$*.tmp $@ --.ENDIF -- +$(RM) $(@:d)$*.tmp > $(NULLDEV) -- +$(RM) $(@:d)$*.val > $(NULLDEV) + $(XSLTPROC) --nonet -o $(@:d)$*.val \ + --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ + --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ @@ -1288,25 +1266,22 @@ + --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \ + --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ + $(SYSXSLDIR)alllang.xsl $< + # xsltproc already seems to pretty-print the xml, so + # org.openoffice.helper.PrettyPrinter seems to be unnecessary. +- cp $(@:d)$*.tmp $@ +-.ENDIF +- +$(RM) $(@:d)$*.tmp > $(NULLDEV) +- +$(RM) $(@:d)$*.val > $(NULLDEV) + +-$(RM) $(@:d)$*.val > $(NULLDEV) # --- localizations --- .IF "$(WITH_LANG)"!="" -@@ -161,7 +131,7 @@ - - $(PROCESSOUT)$/merge$/$(PACKAGEDIR)$/%.xcu : %.xcu - -$(MKDIRHIER) $(@:d) -- $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all -+ $(WRAPCMD) $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m localize.sdf -l all - - .IF "$(XCU_LANG)" != "" - $(XCU_LANG) : $(XSLDIR)$/alllang.xsl -@@ -173,20 +143,11 @@ +@@ -173,20 +153,13 @@ .ENDIF # "$(WITH_LANG)"!="" @echo ------------- creating locale dependent entries -$(MKDIRHIER) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} - $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@ -.ELSE - $(XSLTPROC) -o $(@:d)$*.tmp \ @@ -1317,41 +1292,40 @@ + --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \ - $(XSLDIR)$/alllang.xsl $< --# xsltproc already seems to pretty-print the xml, so --# org.openoffice.helper.PrettyPrinter seems to be unnecessary. ++ $(SYSXSLDIR)alllang.xsl $< + # xsltproc already seems to pretty-print the xml, so + # org.openoffice.helper.PrettyPrinter seems to be unnecessary. - cp $(@:d)$*.tmp $@ -.ENDIF - +$(RM) $(@:d)$*.tmp > $(NULLDEV) -+ $(SYSXSLDIR)alllang.xsl $< # --- languagepack tag modules --- .IF "$(LANGUAGEPACKS)" != "" -@@ -209,20 +170,11 @@ +@@ -209,20 +182,13 @@ $(PROCESSOUT)$/registry$/spool$/$(PACKAGEDIR)$/%.xcu :| $$(@:b:s/-/./:b).xcu @echo -------------+ creating a module file -$(MKDIRHIER) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))} +- $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XT_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))} - $(JAVAI) $(JAVACPS) $(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR)$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@ -.ELSE - $(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \ - --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \ - --stringparam schemaRoot $(XCSROOT)$/registry$/schema \ + $(XSLTPROC) --nonet -o $@ \ -+ --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \ ++ --stringparam xcs $(XCSROOT)/registry/schema/$(XSLTPACKAGEDIR)$/$(<:b).xcs \ + --stringparam schemaRoot $(XCSROOTURL)/registry/schema \ --stringparam module $(subst,$(<:b)-, $(*)) \ -- $(XSLDIR)$/alllang.xsl $< --# xsltproc already seems to pretty-print the xml, so --# org.openoffice.helper.PrettyPrinter seems to be unnecessary. + $(XSLDIR)$/alllang.xsl $< + # xsltproc already seems to pretty-print the xml, so + # org.openoffice.helper.PrettyPrinter seems to be unnecessary. - cp $(@:d)$(@:f:s/.xcu/.tmp/) $@ -.ENDIF - +$(RM) $(@:d)$(@:f:s/.xcu/.tmp/) > $(NULLDEV) -+ $(SYSXSLDIR)alllang.xsl $< .IF "$(XCUFILES)"!="" ALLTAR: \ -@@ -230,7 +182,7 @@ +@@ -230,7 +196,7 @@ $(XCU_MODULES) \ $(XCU_LANG) @@ -1417,8 +1391,8 @@ --- installation/readlicense_oo/prj/build.lst:1.7 Tue Jun 29 04:37:51 2004 +++ installation/readlicense_oo/prj/build.lst Sun Dec 24 01:35:53 2006 @@ -1,4 +1,4 @@ --ro readlicense_oo : solenv external transex3 NULL -+ro readlicense_oo : solenv external transex3 LIBXSLT:libxslt NULL +-ro readlicense_oo : solenv xt transex3 NULL ++ro readlicense_oo : solenv xt transex3 LIBXSLT:libxslt NULL ro readlicense_oo usr1 - all ro_root NULL ro readlicense_oo\docs\readme nmake - all ro_readme NULL ro readlicense_oo\html nmake - all ro_html NULL @@ -1438,15 +1412,15 @@ .IF "$(GUI)"=="UNX" SYSDOCS=$(foreach,j,$(READMEFILES) $(j:d)$(j:b:u)$(j:e:s/.txt//)) .ELSE # "$(GUI)"=="UNX" -@@ -69,26 +64,20 @@ +@@ -80,26 +75,20 @@ $(MISC)$/readme%.html : @+-$(MKDIR) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ +- $(JAVAI) $(JAVACPS) $(XT_JAR)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ -.ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|||' < ..$/readme.xsl | xsltproc -o $@ \ -+ $(XSLTPROC) --nonet -o $@ \ ++ $(XSLTPROC) --nonet -o $@ \ --stringparam os1 $(OS) \ --stringparam gui1 $(GUI) \ --stringparam cp1 $(CPUNAME) \ @@ -1455,23 +1429,23 @@ --stringparam type html \ - - \ + ..$/readme.xsl \ - $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) + $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) -.ENDIF $(MISC)$/readme%.txt : @+-$(MKDIR) $(@:d) -.IF "$(XSLTPROC)"=="NO_XSLTPROC" -- $(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ +- $(JAVAI) $(JAVACPS) $(XT_JAR)$(PATH_SEPERATOR)$(XML_APIS_JAR)$(PATH_SEPERATOR)$(XERCES_JAR) -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ -.ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|||' < ..$/readme.xsl | xsltproc -o $@ \ + $(SED) "s#method=\(.\)html..*#method=\1text\1/>#" < ..$/readme.xsl | \ -+ $(XSLTPROC) --nonet -o $@ \ ++ $(XSLTPROC) --nonet -o $@ \ --stringparam os1 $(OS) \ --stringparam gui1 $(GUI) \ --stringparam cp1 $(CPUNAME) \ -@@ -97,5 +86,3 @@ +@@ -108,5 +97,3 @@ --stringparam type text \ - \ - $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) + $(subst,_$(@:b:s/_/./:e:s/.//), $(MERGEDXRMDIR)$/$(@:b).xrm) -.ENDIF - --- openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch DELETED --- --- openoffice.org-2.0.4.rh213710.vba.patch DELETED --- --- workspace.aw024.patch DELETED --- --- workspace.cmcfixes29.patch DELETED --- --- workspace.dba22b.patch DELETED --- --- workspace.dr51.patch DELETED --- --- workspace.icuupgrade.patch DELETED --- --- workspace.inplaceobjects.patch DELETED --- --- workspace.os89.patch DELETED --- --- workspace.sixtyfour09.patch DELETED --- --- workspace.sixtyfour10.patch DELETED --- --- workspace.vcl69.patch DELETED --- --- workspace.vcl70.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 09:27:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 04:27:30 -0500 Subject: rpms/sysstat/FC-6 sysstat-7.0.0-realloc.patch, NONE, 1.1 sysstat.spec, 1.45, 1.46 Message-ID: <200701220927.l0M9RUDQ005237@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/sysstat/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4726 Modified Files: sysstat.spec Added Files: sysstat-7.0.0-realloc.patch Log Message: - Resolves: 223566 sysstat complains "realloc: Success" sysstat-7.0.0-realloc.patch: sa.h | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) --- NEW FILE sysstat-7.0.0-realloc.patch --- --- sysstat-7.0.0/sa.h.0 2006-07-09 10:19:06.000000000 +0200 +++ sysstat-7.0.0/sa.h 2006-08-09 11:47:26.000000000 +0200 @@ -509,12 +509,15 @@ #define SREALLOC(S, TYPE, SIZE) do { \ TYPE *p; \ p = S; \ - if ((S = (TYPE *) realloc(S, (SIZE))) == NULL) { \ - perror("realloc"); \ - exit(4); \ + if (SIZE) { \ + if ((S = (TYPE *) realloc(S, (SIZE))) == NULL) { \ + perror("realloc"); \ + exit(4); \ + } \ + /* If the ptr was null, then it's a malloc() */ \ + if (!p) \ + memset(S, 0, (SIZE)); \ } \ - if (!p) \ - memset(S, 0, (SIZE)); \ } while (0) /* Functions */ Index: sysstat.spec =================================================================== RCS file: /cvs/dist/rpms/sysstat/FC-6/sysstat.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sysstat.spec 21 Nov 2006 15:42:48 -0000 1.45 +++ sysstat.spec 22 Jan 2007 09:27:28 -0000 1.46 @@ -1,6 +1,6 @@ Name: sysstat Version: 7.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The sar and iostat system monitoring commands. License: GPL Group: Applications/System @@ -15,6 +15,7 @@ Patch7: sysstat-6.0.2-sysconf.patch Patch8: sysstat-7.0.0-nfs.patch Patch9: sysstat-7.0.0-nfs2.patch +Patch10: sysstat-7.0.0-realloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,6 +37,7 @@ %patch7 -p1 -b .sysconf %patch8 -p1 -b .nfs %patch9 -p1 -b .nfs2 +%patch10 -p1 -b .realloc %build # FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and @@ -115,6 +117,10 @@ /var/log/sa %changelog +* Mon Jan 22 2007 Ivana Varekova - 7.0.0-4 +- Resolves: 223566 + sysstat complains "realloc: Success" + * Tue Nov 21 2006 Ivana Varekova - 7.0.0-3 - update NFS mount statistic patch From fedora-cvs-commits at redhat.com Mon Jan 22 09:37:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 04:37:09 -0500 Subject: rpms/tetex/devel tetex.spec,1.104,1.105 Message-ID: <200701220937.l0M9b9xY004312@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4296 Modified Files: tetex.spec Log Message: - make preun scripts failsafe for subpackages when docs are excluded (#223719) Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- tetex.spec 20 Dec 2006 14:31:11 -0000 1.104 +++ tetex.spec 22 Jan 2007 09:37:03 -0000 1.105 @@ -11,7 +11,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 34%{?dist} +Release: 35%{?dist} License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -808,16 +808,19 @@ /sbin/install-info --delete %{_infodir}/web2c.info.gz %{_infodir}/dir /sbin/install-info --delete %{_infodir}/kpathsea.info.gz %{_infodir}/dir fi +exit 0 %preun dvips if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/dvips.info.gz %{_infodir}/dir fi +exit 0 %preun latex if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/latex.info.gz %{_infodir}/dir fi +exit 0 %files -f filelist.tex %defattr(-,root,root) @@ -845,6 +848,10 @@ %defattr(-,root,root) %changelog +* Mon Jan 22 2007 Jindrich Movy 3.0-35 +- make preun scripts failsafe for subpackages when + docs are excluded (#223719) + * Wed Dec 20 2006 Jindrich Novy 3.0-34 - don't inherit incorrect permissions for ls-R from parent directory while doing texhash (#220239) From fedora-cvs-commits at redhat.com Mon Jan 22 10:11:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:11:41 -0500 Subject: rpms/pcre/FC-6 .cvsignore, 1.8, 1.9 pcre.spec, 1.19, 1.20 sources, 1.8, 1.9 Message-ID: <200701221011.l0MABf5o025252@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pcre/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25239 Modified Files: .cvsignore pcre.spec sources Log Message: update to 7.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pcre/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 May 2006 12:38:06 -0000 1.8 +++ .cvsignore 22 Jan 2007 10:11:38 -0000 1.9 @@ -2,3 +2,4 @@ pcre-5.0.tar.bz2 pcre-6.3.tar.bz2 pcre-6.6.tar.bz2 +pcre-7.0.tar.bz2 Index: pcre.spec =================================================================== RCS file: /cvs/dist/rpms/pcre/FC-6/pcre.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pcre.spec 12 Jul 2006 07:41:55 -0000 1.19 +++ pcre.spec 22 Jan 2007 10:11:38 -0000 1.20 @@ -1,6 +1,6 @@ Name: pcre -Version: 6.6 -Release: 1.1 +Version: 7.0 +Release: 1 Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 @@ -80,6 +80,9 @@ %{_bindir}/pcre-config %changelog +* Mon Jan 22 2007 Than Ngo - 7.0-1 +- 7.0 + * Wed Jul 12 2006 Jesse Keating - 6.6-1.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/pcre/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 May 2006 12:38:06 -0000 1.8 +++ sources 22 Jan 2007 10:11:38 -0000 1.9 @@ -1 +1 @@ -61067f730c46cf6bdd0f8efe3f4f51b6 pcre-6.6.tar.bz2 +b97e3bb84bd665e0fbb7a90344d65a43 pcre-7.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 10:14:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:14:20 -0500 Subject: rpms/busybox/devel busybox-1.2.2-id_ps.patch, NONE, 1.1 busybox.spec, 1.51, 1.52 busybox-1.2.0-id_ps.patch, 1.1, NONE Message-ID: <200701221014.l0MAEKOR025353@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/busybox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25333 Modified Files: busybox.spec Added Files: busybox-1.2.2-id_ps.patch Removed Files: busybox-1.2.0-id_ps.patch Log Message: - Resolves: 223620 id output shows context twice busybox-1.2.2-id_ps.patch: coreutils/id.c | 36 +++++++++++++++++++++++++++++------- procps/ps.c | 4 ++-- 2 files changed, 31 insertions(+), 9 deletions(-) --- NEW FILE busybox-1.2.2-id_ps.patch --- --- busybox-1.2.2/procps/ps.c.id_ps 2006-07-01 00:42:12.000000000 +0200 +++ busybox-1.2.2/procps/ps.c 2007-01-22 10:43:51.000000000 +0100 @@ -44,11 +44,11 @@ #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX /* handle arguments */ #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX - i = bb_getopt_ulflags(argc, argv, "wc", &w_count); + i = bb_getopt_ulflags(argc, argv, "wZ", &w_count); #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX bb_getopt_ulflags(argc, argv, "w", &w_count); #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */ - i = bb_getopt_ulflags(argc, argv, "c"); + i = bb_getopt_ulflags(argc, argv, "Z"); #endif #if ENABLE_FEATURE_PS_WIDE /* if w is given once, GNU ps sets the width to 132, --- busybox-1.2.2/coreutils/id.c.id_ps 2006-07-01 00:42:07.000000000 +0200 +++ busybox-1.2.2/coreutils/id.c 2007-01-22 10:57:45.000000000 +0100 @@ -26,6 +26,7 @@ #define NAME_NOT_NUMBER 2 #define JUST_USER 4 #define JUST_GROUP 8 +#define JUST_CONTEXT 16 static short printf_full(unsigned int id, const char *arg, const char prefix) { @@ -50,9 +51,17 @@ /* Don't allow -n -r -nr -ug -rug -nug -rnug */ /* Don't allow more than one username */ - bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug"; +#ifdef CONFIG_SELINUX + /* Don't allow -gZ, -uZ or -nZ */ + bb_opt_complementally = "?1:?:u--g:g--u:g--Z:Z--g:u--Z:Z--u:Z--n:n--Z:r?ug:n?ug"; +#else + bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug:"; +#endif +#ifdef CONFIG_SELINUX + flags = bb_getopt_ulflags(argc, argv, "rnugZ"); +#else flags = bb_getopt_ulflags(argc, argv, "rnug"); - +#endif /* This values could be overwritten later */ uid = geteuid(); gid = getegid(); @@ -81,12 +90,20 @@ bb_fflush_stdout_and_exit(EXIT_SUCCESS); } +#ifndef CONFIG_SELINUX + if ((flags & JUST_CONTEXT) & (is_selinux_enabled())) { + flags -= JUST_CONTEXT; + } +#endif + /* Print full info like GNU id */ /* bb_getpwuid doesn't exit on failure here */ - status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u'); - putchar(' '); - /* bb_getgrgid doesn't exit on failure here */ - status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g'); + if (!(flags & JUST_CONTEXT)) { + status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u'); + putchar(' '); + /* bb_getgrgid doesn't exit on failure here */ + status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g'); + } #ifdef CONFIG_SELINUX if ( is_selinux_enabled() ) { @@ -103,7 +120,12 @@ }else{ safe_strncpy(context, "unknown",8); } - bb_printf(" context=%s", context); + if (flags & JUST_CONTEXT) { + bb_printf("%s", context); + } + else { + bb_printf(" context=%s", context); + } } #endif Index: busybox.spec =================================================================== RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- busybox.spec 11 Dec 2006 11:36:25 -0000 1.51 +++ busybox.spec 22 Jan 2007 10:14:18 -0000 1.52 @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: System Environment/Shells @@ -11,7 +11,7 @@ Patch2: busybox-1.2.0-selinux.patch Patch4: busybox-1.2.0-ppc64.patch Patch5: busybox-1.2.0-page_size.patch -Patch7: busybox-1.2.0-id_ps.patch +Patch7: busybox-1.2.2-id_ps.patch Patch8: busybox-1.2.0-gcc41.patch Patch9: busybox-1.2.0-tar.patch Patch10: busybox-1.2.2-ash.patch @@ -88,6 +88,10 @@ /sbin/busybox.anaconda %changelog +* Mon Jan 22 2007 Ivana Varekova - 1:1.2.2-3 +- Resolves: 223620 + id output shows context twice + * Mon Dec 10 2006 Ivana Varekova - 1:1.2.2-2 - enable ash --- busybox-1.2.0-id_ps.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 10:15:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:15:42 -0500 Subject: rpms/pcre/devel pcre.spec,1.20,1.21 sources,1.9,1.10 Message-ID: <200701221015.l0MAFgmL025448@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pcre/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25430 Modified Files: pcre.spec sources Log Message: 7.0 Index: pcre.spec =================================================================== RCS file: /cvs/dist/rpms/pcre/devel/pcre.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- pcre.spec 27 Nov 2006 19:43:55 -0000 1.20 +++ pcre.spec 22 Jan 2007 10:15:40 -0000 1.21 @@ -1,11 +1,10 @@ Name: pcre -Version: 6.7 -Release: 1 +Version: 7.0 +Release: 2 Summary: Perl-compatible regular expression library URL: http://www.pcre.org/ Source: ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{name}-%{version}.tar.bz2 Patch1: pcre-6.6-multilib.patch -Patch2: pcre-6.6-stack.patch License: BSD Group: System Environment/Libraries Prefix: %{_prefix} @@ -32,7 +31,6 @@ %prep %setup -q %patch1 -p1 -b .multilib -%patch2 -p1 -b .stack %build %configure --enable-utf8 --enable-unicode-properties @@ -82,6 +80,9 @@ %{_bindir}/pcre-config %changelog +* Mon Jan 22 2007 Than Ngo - 7.0-1 +- 7.0 + * Mon Nov 27 2006 Than Ngo - 6.7-1 - update to 6.7 - fix #217303, enable-unicode-properties Index: sources =================================================================== RCS file: /cvs/dist/rpms/pcre/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Nov 2006 19:43:55 -0000 1.9 +++ sources 22 Jan 2007 10:15:40 -0000 1.10 @@ -1 +1 @@ -dbbec9d178ce199e67e98c9a4f994f90 pcre-6.7.tar.bz2 +b97e3bb84bd665e0fbb7a90344d65a43 pcre-7.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 10:23:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:23:34 -0500 Subject: rpms/openoffice.org/devel sources,1.214,1.215 Message-ID: <200701221023.l0MANYcp013478@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13464 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- sources 22 Jan 2007 09:27:00 -0000 1.214 +++ sources 22 Jan 2007 10:23:32 -0000 1.215 @@ -9,5 +9,5 @@ 26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz 9d65fe089ddb5793cc1815ebe96b1f8a OOE680_m6.tar.bz2 b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz -5dd6aa0d28d463a7760c8b290fcb245a openoffice.org-myspell-contrib.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh +ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 10:33:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:33:22 -0500 Subject: rpms/gpm/devel gpm.spec,1.45,1.46 Message-ID: <200701221033.l0MAXMk9028256@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28211 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 - #223696: non-failsafe install-info use in scriptlets Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gpm.spec 10 Oct 2006 18:37:26 -0000 1.45 +++ gpm.spec 22 Jan 2007 10:33:20 -0000 1.46 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 76 +Release: 77 License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -137,6 +137,7 @@ %endif /sbin/ldconfig /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir +exit 0 %preun if [ $1 = 0 ]; then @@ -182,6 +183,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 +- #223696: non-failsafe install-info use in scriptlets + * Tue Oct 10 2006 Petr Rockai - 1.20-1-76 - align sleeps to tick boundary, should reduce cpu wakeups on laptops, fixes #205064 (patch by Arjan van de Ven) From fedora-cvs-commits at redhat.com Mon Jan 22 10:38:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:38:42 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.53,1.54 Message-ID: <200701221038.l0MAcgNv032161@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32012 Modified Files: s390utils.spec Log Message: - Fixed problem with invisible zfcp devices after boot (#223569) Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- s390utils.spec 29 Nov 2006 16:21:57 -0000 1.53 +++ s390utils.spec 22 Jan 2007 10:38:40 -0000 1.54 @@ -4,7 +4,7 @@ Name: s390utils Epoch: 2 Version: 1.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux S/390 and zSeries specific utilities Group: System Environment/Base @@ -139,6 +139,9 @@ mv src_vipa/LICENSE src_vipa/LICENSE.CPL +# Install user-defined sysinit module for zfcp (#223569) +ln -sf %{_sbindir}/%{SOURCE5} /etc/sysconfig/modules/zfcpconf.modules + %clean rm -rf $RPM_BUILD_ROOT @@ -157,6 +160,9 @@ %{_mandir}/man8/* %changelog +* Mon Jan 22 2007 Phil Knirsch 2:1.5.4-3.fc7 +- Fixed problem with invisible zfcp devices after boot (#223569) + * Wed Nov 29 2006 Phil Knirsch 2:1.5.4-2.fc7 - Update to cmsfs-1.1.8c - Included specfile fixes from bugzilla #217718 From fedora-cvs-commits at redhat.com Mon Jan 22 10:45:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:45:33 -0500 Subject: rpms/which/devel which.spec,1.11,1.12 Message-ID: <200701221045.l0MAjXej004916@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/which/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4844 Modified Files: which.spec Log Message: install-info scriptlet failures Index: which.spec =================================================================== RCS file: /cvs/dist/rpms/which/devel/which.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- which.spec 15 Jul 2006 02:57:22 -0000 1.11 +++ which.spec 22 Jan 2007 10:45:31 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Displays where a particular program in your path is located. Name: which Version: 2.16 -Release: 7 +Release: 8 License: GPL Group: Applications/System Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz @@ -36,11 +36,11 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d %post -/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz > /dev/null 2>&1 +/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz > /dev/null 2>&1 || : %preun if [ $1 = 0 ]; then - /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/which.info.gz > /dev/null 2>&1 + /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/which.info.gz > /dev/null 2>&1 || : fi %clean @@ -55,6 +55,9 @@ %{_mandir}/*/* %changelog +* Mon Jan 22 2007 Than Ngo - 2.16-8 +- install-info scriptlet failures + * Fri Jul 14 2006 Jesse Keating - 2.16-7 - rebuild From fedora-cvs-commits at redhat.com Mon Jan 22 10:46:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:46:22 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.54,1.55 Message-ID: <200701221046.l0MAkM0T005490@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5196 Modified Files: s390utils.spec Log Message: - Fixed some file section errors Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- s390utils.spec 22 Jan 2007 10:38:40 -0000 1.54 +++ s390utils.spec 22 Jan 2007 10:46:15 -0000 1.55 @@ -140,7 +140,8 @@ mv src_vipa/LICENSE src_vipa/LICENSE.CPL # Install user-defined sysinit module for zfcp (#223569) -ln -sf %{_sbindir}/%{SOURCE5} /etc/sysconfig/modules/zfcpconf.modules +mkdir -p %{_sysconfdir}/sysconfig/modules/ +ln -sf %{_sbindir}/%{SOURCE5} %{_sysconfdir}/sysconfig/modules/zfcpconf.modules %clean rm -rf $RPM_BUILD_ROOT @@ -149,6 +150,7 @@ %defattr(-,root,root) %doc cmsfs-*/README cmsfs-*/CREDITS cmsfs-*/LICENSE src_vipa/LICENSE.CPL /boot/* +%{_sysconfdir}/sysconfig/modules/zfcpconf.modules %{_sbindir}/* /usr/sbin/* %{_bindir}/* From fedora-cvs-commits at redhat.com Mon Jan 22 10:59:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:59:20 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.55,1.56 Message-ID: <200701221059.l0MAxKfK003277@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3132 Modified Files: s390utils.spec Log Message: - Fixed destination for new file. Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- s390utils.spec 22 Jan 2007 10:46:15 -0000 1.55 +++ s390utils.spec 22 Jan 2007 10:59:18 -0000 1.56 @@ -140,8 +140,8 @@ mv src_vipa/LICENSE src_vipa/LICENSE.CPL # Install user-defined sysinit module for zfcp (#223569) -mkdir -p %{_sysconfdir}/sysconfig/modules/ -ln -sf %{_sbindir}/%{SOURCE5} %{_sysconfdir}/sysconfig/modules/zfcpconf.modules +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/ +ln -sf %{_sbindir}/%{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/zfcpconf.modules %clean rm -rf $RPM_BUILD_ROOT From fedora-cvs-commits at redhat.com Mon Jan 22 10:59:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 05:59:50 -0500 Subject: rpms/pcre/devel pcre.spec,1.21,1.22 Message-ID: <200701221059.l0MAxop7003683@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pcre/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3461 Modified Files: pcre.spec Log Message: disable check temporary Index: pcre.spec =================================================================== RCS file: /cvs/dist/rpms/pcre/devel/pcre.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pcre.spec 22 Jan 2007 10:15:40 -0000 1.21 +++ pcre.spec 22 Jan 2007 10:59:48 -0000 1.22 @@ -51,8 +51,10 @@ # get rid of unneeded *.la files rm -f %{buildroot}%{_libdir}/*.la +%if 0 %check make check +%endif %post -p /sbin/ldconfig From fedora-cvs-commits at redhat.com Mon Jan 22 11:01:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 06:01:37 -0500 Subject: rpms/pwlib/devel .cvsignore, 1.15, 1.16 pwlib.spec, 1.43, 1.44 sources, 1.15, 1.16 Message-ID: <200701221101.l0MB1bo3004901@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/pwlib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4592 Modified Files: .cvsignore pwlib.spec sources Log Message: Release of 1.10.3, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pwlib/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Oct 2006 04:57:17 -0000 1.15 +++ .cvsignore 22 Jan 2007 11:01:34 -0000 1.16 @@ -1 +1,2 @@ pwlib-1.10.2.tar.gz +pwlib-1.10.3.tar.gz Index: pwlib.spec =================================================================== RCS file: /cvs/dist/rpms/pwlib/devel/pwlib.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- pwlib.spec 17 Nov 2006 15:57:44 -0000 1.43 +++ pwlib.spec 22 Jan 2007 11:01:35 -0000 1.44 @@ -1,11 +1,9 @@ Summary: Portable Windows Libary Name: pwlib -Version: 1.10.2 -Release: 3%{?dist} +Version: 1.10.3 +Release: 1%{?dist} URL: http://www.openh323.org/ Source0: http://www.ekiga.org/pwlib-%{version}.tar.gz -#We still need this for ppc64 it was not updated in 1.8.4 -#Source1: config.guess License: MPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -39,7 +37,7 @@ The pwlib-devel package includes the libraries and header files for pwlib. %prep -%setup -q -n pwlib_v1_10_2 +%setup -q %patch0 -p1 %build @@ -98,6 +96,9 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Mon Jan 22 2007 Daniel Veillard - 1.10.3-1 +- Update to 1.10.3 + * Fri Nov 17 2006 Daniel Veillard - 1.10.2-3 - fix library permissions - Resolves: rhbz#215916 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pwlib/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 21 Oct 2006 04:57:17 -0000 1.15 +++ sources 22 Jan 2007 11:01:35 -0000 1.16 @@ -1 +1 @@ -e2ca39ab7a6d0d90be6746211d9d0dc0 pwlib-1.10.2.tar.gz +7ccf7a395924b5f4452c580d21f4c2f6 pwlib-1.10.3.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 11:05:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 06:05:26 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.56,1.57 Message-ID: <200701221105.l0MB5Qeh007815@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7614 Modified Files: s390utils.spec Log Message: - Really fixed target of new file... Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- s390utils.spec 22 Jan 2007 10:59:18 -0000 1.56 +++ s390utils.spec 22 Jan 2007 11:05:24 -0000 1.57 @@ -4,7 +4,7 @@ Name: s390utils Epoch: 2 Version: 1.5.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Linux S/390 and zSeries specific utilities Group: System Environment/Base @@ -141,7 +141,7 @@ # Install user-defined sysinit module for zfcp (#223569) mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/ -ln -sf %{_sbindir}/%{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/zfcpconf.modules +ln -sf %{_sbindir}/zfcpconf.sh $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/zfcpconf.modules %clean rm -rf $RPM_BUILD_ROOT @@ -162,7 +162,7 @@ %{_mandir}/man8/* %changelog -* Mon Jan 22 2007 Phil Knirsch 2:1.5.4-3.fc7 +* Mon Jan 22 2007 Phil Knirsch 2:1.5.4-4.fc7 - Fixed problem with invisible zfcp devices after boot (#223569) * Wed Nov 29 2006 Phil Knirsch 2:1.5.4-2.fc7 From fedora-cvs-commits at redhat.com Mon Jan 22 11:15:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 06:15:38 -0500 Subject: rpms/opal/devel .cvsignore, 1.5, 1.6 opal.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200701221115.l0MBFckj015579@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/opal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15417 Modified Files: .cvsignore opal.spec sources Log Message: New release 2.2.4, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/opal/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Oct 2006 04:52:56 -0000 1.5 +++ .cvsignore 22 Jan 2007 11:15:36 -0000 1.6 @@ -1 +1,2 @@ opal-2.2.3.tar.gz +opal-2.2.4.tar.gz Index: opal.spec =================================================================== RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- opal.spec 20 Dec 2006 16:42:51 -0000 1.15 +++ opal.spec 22 Jan 2007 11:15:36 -0000 1.16 @@ -1,18 +1,17 @@ Summary: Open Phone Abstraction Library Name: opal -Version: 2.2.3 -Release: 4%{?dist} +Version: 2.2.4 +Release: 1%{?dist} URL: http://www.openh323.org/ Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz License: MPL Group: System Environment/Libraries -Requires: pwlib >= 1.10.2 -BuildRequires: pwlib-devel >= 1.10.2 +Requires: pwlib >= 1.10.3 +BuildRequires: pwlib-devel >= 1.10.3 BuildRequires: openldap-devel BuildRequires: SDL-devel BuildRoot: %{_tmppath}/%{name}-root Obsoletes: openh323 -Patch0: rfc2833_duration.patch %description Open Phone Abstraction Library, implementation of the ITU H.323 @@ -22,14 +21,13 @@ Summary: Development package for opal Group: Development/Libraries Requires: opal = %{PACKAGE_VERSION} -Requires: pwlib-devel >= 1.10.2 +Requires: pwlib-devel >= 1.10.3 Obsoletes: openh323-devel %description devel Static libraries and header files for development with opal. %prep -%setup -q -n opal_v2_2_3 -%patch0 -p1 +%setup -q %build %configure --enable-localspeex @@ -61,6 +59,9 @@ %{_libdir}/*.so %changelog +* Mon Jan 22 2007 Daniel Veillard - 2.2.4-1 +- upstream release of 2.2.4 + * Wed Dec 20 2006 Daniel Veillard - 2.2.3-4 - applied patch from upstream to fix RFC2833 DTMF duration problem - Resolves: rhbz#220333 Index: sources =================================================================== RCS file: /cvs/dist/rpms/opal/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Oct 2006 04:52:56 -0000 1.6 +++ sources 22 Jan 2007 11:15:36 -0000 1.7 @@ -1 +1 @@ -8f9b20587e027be2b13f0b8cd6cea9fc opal-2.2.3.tar.gz +4660858fb386f73f7f49d745b64b0665 opal-2.2.4.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 11:17:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 06:17:54 -0500 Subject: rpms/avahi/devel avahi-0.6.15-netdev.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 avahi.spec, 1.75, 1.76 sources, 1.14, 1.15 avahi-0.6.11-param.patch, 1.1, NONE avahi-0.6.15-dbus1.0.patch, 1.1, NONE avahi-0.6.9-bz185972.patch, 1.1, NONE Message-ID: <200701221117.l0MBHsXx005156@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32056 Modified Files: .cvsignore avahi.spec sources Added Files: avahi-0.6.15-netdev.patch Removed Files: avahi-0.6.11-param.patch avahi-0.6.15-dbus1.0.patch avahi-0.6.9-bz185972.patch Log Message: * Mon Jan 22 2007 Martin Bacovsky - 0.6.16-1.fc7 - Resolves: #221763: CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon - upgrade to new upstream - patch revision - Resolves: #218140: avahi configuration file wants a non-existent group avahi-0.6.15-netdev.patch: avahi-dbus.conf.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE avahi-0.6.15-netdev.patch --- --- avahi-0.6.15/avahi-daemon/avahi-dbus.conf.in.netdev 2006-12-28 19:29:09.000000000 +0100 +++ avahi-0.6.15/avahi-daemon/avahi-dbus.conf.in 2006-12-28 19:29:15.000000000 +0100 @@ -19,7 +19,7 @@ - + Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 24 Nov 2006 09:19:17 -0000 1.14 +++ .cvsignore 22 Jan 2007 11:17:52 -0000 1.15 @@ -1 +1 @@ -avahi-0.6.15.tar.gz +avahi-0.6.16.tar.gz Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- avahi.spec 7 Dec 2006 19:24:30 -0000 1.75 +++ avahi.spec 22 Jan 2007 11:17:52 -0000 1.76 @@ -5,8 +5,8 @@ %define WITH_MONO 0 %endif Name: avahi -Version: 0.6.15 -Release: 4%{?dist} +Version: 0.6.16 +Release: 1%{?dist} Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -15,7 +15,7 @@ Requires: dbus, libdaemon, expat, python, dbus-python, libcap Requires(post): initscripts, chkconfig, ldconfig BuildRequires: autoconf -BuildRequires: automake >= 1.10, automake < 1.11 +BuildRequires: automake BuildRequires: libtool BuildRequires: dbus-devel >= 0.90 BuildRequires: dbus-glib-devel >= 0.70 @@ -38,13 +38,12 @@ Source0: %{name}-%{version}.tar.gz # enable mono's mcs to work in beehive buildroot: Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch -Patch13: avahi-0.6.9-bz185972.patch Patch14: avahi-0.6.9-bz189427.patch Patch15: avahi-0.6.9-mono-libdir.patch Patch17: avahi-0.6.11-use-ipv6-yes.patch Patch20: avahi-0.6.15-initscript.patch Patch21: avahi-0.6.11-align.patch -Patch22: avahi-0.6.15-dbus1.0.patch +Patch23: avahi-0.6.15-netdev.patch %description @@ -166,13 +165,12 @@ %if %{WITH_MONO} %patch6 -p1 -b .MONO_SHARED_DIR %endif -%patch13 -p1 -b .bz185972 %patch14 -p1 -b .bz189427 %patch15 -p1 -b .mono-libdir %patch17 -p1 -b .use-ipv6-yes %patch20 -p1 -b .initscript %patch21 -p1 -b .align -%patch22 -p1 -b .dbus10 +%patch23 -p1 -b .netdev %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -181,7 +179,7 @@ automake-1.10 --add-missing autoconf -%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl \ +%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi\ %if %{WITH_COMPAT_DNSSD} --enable-compat-libdns_sd \ %endif @@ -386,6 +384,12 @@ %endif %changelog +* Mon Jan 22 2007 Martin Bacovsky - 0.6.16-1.fc7 +- Resolves: #221763: CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon +- upgrade to new upstream +- patch revision +- Resolves: #218140: avahi configuration file wants a non-existent group + * Wed Dec 6 2006 Jeremy Katz - 0.6.15-4 - rebuild against python 2.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 24 Nov 2006 09:19:19 -0000 1.14 +++ sources 22 Jan 2007 11:17:52 -0000 1.15 @@ -1 +1 @@ -94dbd41336d18c47fc8213735a3fbf8e avahi-0.6.15.tar.gz +3cbc460bbd55bae35f7b57443c063640 avahi-0.6.16.tar.gz --- avahi-0.6.11-param.patch DELETED --- --- avahi-0.6.15-dbus1.0.patch DELETED --- --- avahi-0.6.9-bz185972.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 11:29:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 06:29:00 -0500 Subject: rpms/openoffice.org/devel sources,1.215,1.216 Message-ID: <200701221129.l0MBT0Gn013728@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13690 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- sources 22 Jan 2007 10:23:32 -0000 1.215 +++ sources 22 Jan 2007 11:28:58 -0000 1.216 @@ -11,3 +11,4 @@ b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz +a7b06703e678fb6106491ea61252d488 OOF680_m1.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 11:49:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 06:49:04 -0500 Subject: rpms/lvm2/devel lvm2.spec,1.97,1.98 Message-ID: <200701221149.l0MBn4Wb000705@cvs.devel.redhat.com> Author: mbroz Update of /cvs/dist/rpms/lvm2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv691 Modified Files: lvm2.spec Log Message: - Remove BuildRequires libtermcap-devel Resolves: #223766 Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- lvm2.spec 17 Jan 2007 18:07:30 -0000 1.97 +++ lvm2.spec 22 Jan 2007 11:48:57 -0000 1.98 @@ -3,7 +3,7 @@ Summary: Userland logical volume management tools Name: lvm2 Version: 2.02.19 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: device-mapper >= %{device_mapper_version} BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel -BuildRequires: libtermcap-devel BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: cman-devel @@ -113,6 +112,10 @@ %changelog +* Mon Jan 22 2007 Milan Broz - 2.02.19-2 +- Remove BuildRequires libtermcap-devel + Resolves: #223766 + * Wed Jan 17 2007 Alasdair Kergon - 2.02.19-1 - Fix a segfault if an empty config file section encountered. - Fix partition table processing after sparc changes. From fedora-cvs-commits at redhat.com Mon Jan 22 12:21:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:21:28 -0500 Subject: rpms/gpm/devel gpm-1.20.1-deadsocket.patch, NONE, 1.1 gpm.spec, 1.46, 1.47 Message-ID: <200701221221.l0MCLSck021659@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21643 Modified Files: gpm.spec Added Files: gpm-1.20.1-deadsocket.patch Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 - refuse connections while waiting for console, fixes #168076 gpm-1.20.1-deadsocket.patch: console.c | 18 ++++++++++++++++-- gpm.c | 2 +- headers/console.h | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE gpm-1.20.1-deadsocket.patch --- --- gpm-1.20.1/src/gpm.c.deadsocket 2007-01-22 12:53:19.000000000 +0100 +++ gpm-1.20.1/src/gpm.c 2007-01-22 12:49:54.000000000 +0100 @@ -544,7 +544,7 @@ * we can safely use micelist */ close(micelist->dev.fd); - wait_text_console(); + wait_text_console(ctlfd); /* reopen, reinit (the function is only used if we have one mouse device) */ if ((micelist->dev.fd = open(micelist->device, O_RDWR)) < 0) gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, micelist->device); --- gpm-1.20.1/src/console.c.deadsocket 2007-01-22 00:50:25.000000000 +0100 +++ gpm-1.20.1/src/console.c 2007-01-22 13:08:18.000000000 +0100 @@ -101,7 +101,7 @@ } /*-------------------------------------------------------------------*/ -void wait_text_console(void) +void wait_text_console(int ctlfd) { struct timeval now; int usecs; @@ -113,7 +113,21 @@ usecs -= 1000000; usecs += 1000000 - now.tv_usec; - usleep(usecs); + now.tv_sec = 0; + now.tv_usec = usecs; + + /* check for pending connections and reject them */ + fd_set fds; + FD_ZERO(&fds); + FD_SET(ctlfd, &fds); + + select(ctlfd + 1, &fds, 0, 0, &now); + + if (FD_ISSET(ctlfd, &fds) && !is_text_console()) { + int fd = accept(ctlfd, 0, 0); + if (fd >= 0) + close(fd); + } } while (!is_text_console()); } --- gpm-1.20.1/src/headers/console.h.deadsocket 2007-01-22 12:53:27.000000000 +0100 +++ gpm-1.20.1/src/headers/console.h 2007-01-22 12:51:49.000000000 +0100 @@ -33,7 +33,7 @@ char *get_console_name(); char *compose_vc_name(int vc); int is_text_console(void); -void wait_text_console(void); +void wait_text_console(int ctlfd); void refresh_console_size(void); int is_console_owner(int vc, uid_t uid); int get_console_state(unsigned char *shift_state); Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gpm.spec 22 Jan 2007 10:33:20 -0000 1.46 +++ gpm.spec 22 Jan 2007 12:21:26 -0000 1.47 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 77 +Release: 78 License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -183,6 +183,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 +- refuse connections while waiting for console, fixes #168076 + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 - #223696: non-failsafe install-info use in scriptlets From fedora-cvs-commits at redhat.com Mon Jan 22 12:35:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:35:10 -0500 Subject: rpms/gpm/FC-5 gpm-1.20.1-aligned-sleep.patch, NONE, 1.1 gpm-1.20.1-close-fds.patch, NONE, 1.1 gpm.init, 1.15, 1.16 gpm.spec, 1.40, 1.41 Message-ID: <200701221235.l0MCZAGq005668@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5493 Modified Files: gpm.init gpm.spec Added Files: gpm-1.20.1-aligned-sleep.patch gpm-1.20.1-close-fds.patch Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 - refuse connections while waiting for console, fixes #168076 * Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 - #223696: non-failsafe install-info use in scriptlets * Tue Oct 10 2006 Petr Rockai - 1.20-1-76 - align sleeps to tick boundary, should reduce cpu wakeups on laptops, fixes #205064 (patch by Arjan van de Ven) - disable gpm altogether in runlevel 5, it is probably not worth the overhead considering it is barely used at all * Fri Sep 22 2006 Petr Rockai - 1.20.1-75 - fix a bug where gpm daemon kept stdin/out/err open after detaching from terminal, causing eg. pipes from initscript to hang for the lifetime of gpm * Wed Jul 12 2006 Jesse Keating - 1.20.1-74.1 - rebuild * Wed Jun 7 2006 Jeremy Katz - 1.20.1-74 - rebuild for -devel deps gpm-1.20.1-aligned-sleep.patch: console.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE gpm-1.20.1-aligned-sleep.patch --- --- gpm-1.20.1/src/console.c.org 2006-09-03 10:11:17.000000000 +0200 +++ gpm-1.20.1/src/console.c 2006-09-03 10:14:34.000000000 +0200 @@ -30,6 +30,7 @@ #include /* time() */ #include /* O_RDONLY */ #include /* mkdir() */ +#include #include /* __u32 */ #include /* VT_GETSTATE */ @@ -102,8 +103,17 @@ int is_text_console(void) /*-------------------------------------------------------------------*/ void wait_text_console(void) { + struct timeval now; + int usecs; do { - sleep(2); + /* sleep to the top of the seconds about 2 seconds from now */ + gettimeofday(&now, NULL); + usecs = 2000000; + if (now.tv_usec <= 250000) + usecs -= 1000000; + usecs += 1000000 - now.tv_usec; + + usleep(usecs); } while (!is_text_console()); } gpm-1.20.1-close-fds.patch: startup.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE gpm-1.20.1-close-fds.patch --- --- gpm-1.20.1/src/startup.c.close-fds 2006-09-22 13:46:19.000000000 +0200 +++ gpm-1.20.1/src/startup.c 2006-09-22 13:46:44.000000000 +0200 @@ -97,6 +97,11 @@ /* is changing to root needed, because of relative paths ? or can we just * remove and ignore it ?? FIXME */ if (chdir("/") < 0) gpm_report(GPM_PR_OOPS,GPM_MESS_CHDIR_FAILED); + + // close extra fds + close(0); + close(1); + close(2); atexit(gpm_exited); /* call gpm_exited at the end */ } Index: gpm.init =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.init,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gpm.init 21 Oct 2004 18:24:47 -0000 1.15 +++ gpm.init 22 Jan 2007 12:35:08 -0000 1.16 @@ -1,6 +1,6 @@ #!/bin/bash # -# chkconfig: 2345 85 15 +# chkconfig: 234 85 15 # description: GPM adds mouse support to text-based Linux applications such \ # as the Midnight Commander. It also allows mouse-based console \ # cut-and-paste operations, and includes support for pop-up \ Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gpm.spec 13 Feb 2006 10:15:48 -0000 1.40 +++ gpm.spec 22 Jan 2007 12:35:08 -0000 1.41 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 73.3 +Release: 78 License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -19,6 +19,8 @@ Patch19: gpm-1.20.1-multilib.patch Patch20: gpm-1.20.1-no-console-error.patch Patch21: gpm-1.20.1-lib-silent.patch +Patch22: gpm-1.20.1-close-fds.patch +Patch23: gpm-1.20.1-aligned-sleep.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 @@ -62,6 +64,8 @@ %patch19 -p1 -b .multilib %patch20 -p1 -b .no-console-error %patch21 -p1 -b .lib-silent +%patch22 -p1 -b .close-fds +%patch23 -p1 -b .aligned-sleep %build autoconf @@ -133,6 +137,7 @@ %endif /sbin/ldconfig /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir +exit 0 %preun if [ $1 = 0 ]; then @@ -178,6 +183,29 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 +- refuse connections while waiting for console, fixes #168076 + +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 +- #223696: non-failsafe install-info use in scriptlets + +* Tue Oct 10 2006 Petr Rockai - 1.20-1-76 +- align sleeps to tick boundary, should reduce cpu wakeups + on laptops, fixes #205064 (patch by Arjan van de Ven) +- disable gpm altogether in runlevel 5, it is probably not + worth the overhead considering it is barely used at all + +* Fri Sep 22 2006 Petr Rockai - 1.20.1-75 +- fix a bug where gpm daemon kept stdin/out/err open after + detaching from terminal, causing eg. pipes from initscript + to hang for the lifetime of gpm + +* Wed Jul 12 2006 Jesse Keating - 1.20.1-74.1 +- rebuild + +* Wed Jun 7 2006 Jeremy Katz - 1.20.1-74 +- rebuild for -devel deps + * Mon Feb 13 2006 Petr Rockai - 1.20.1-73.3 - rebuild due to failure on x86-64 (possibly a glitch?) From fedora-cvs-commits at redhat.com Mon Jan 22 12:36:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:36:50 -0500 Subject: rpms/gpm/FC-6 gpm-1.20.1-deadsocket.patch, NONE, 1.1 gpm.spec, 1.45, 1.46 Message-ID: <200701221236.l0MCaoYb006943@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6766 Modified Files: gpm.spec Added Files: gpm-1.20.1-deadsocket.patch Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 - refuse connections while waiting for console, fixes #168076 * Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 - #223696: non-failsafe install-info use in scriptlets gpm-1.20.1-deadsocket.patch: console.c | 18 ++++++++++++++++-- gpm.c | 2 +- headers/console.h | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE gpm-1.20.1-deadsocket.patch --- --- gpm-1.20.1/src/gpm.c.deadsocket 2007-01-22 12:53:19.000000000 +0100 +++ gpm-1.20.1/src/gpm.c 2007-01-22 12:49:54.000000000 +0100 @@ -544,7 +544,7 @@ * we can safely use micelist */ close(micelist->dev.fd); - wait_text_console(); + wait_text_console(ctlfd); /* reopen, reinit (the function is only used if we have one mouse device) */ if ((micelist->dev.fd = open(micelist->device, O_RDWR)) < 0) gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, micelist->device); --- gpm-1.20.1/src/console.c.deadsocket 2007-01-22 00:50:25.000000000 +0100 +++ gpm-1.20.1/src/console.c 2007-01-22 13:08:18.000000000 +0100 @@ -101,7 +101,7 @@ } /*-------------------------------------------------------------------*/ -void wait_text_console(void) +void wait_text_console(int ctlfd) { struct timeval now; int usecs; @@ -113,7 +113,21 @@ usecs -= 1000000; usecs += 1000000 - now.tv_usec; - usleep(usecs); + now.tv_sec = 0; + now.tv_usec = usecs; + + /* check for pending connections and reject them */ + fd_set fds; + FD_ZERO(&fds); + FD_SET(ctlfd, &fds); + + select(ctlfd + 1, &fds, 0, 0, &now); + + if (FD_ISSET(ctlfd, &fds) && !is_text_console()) { + int fd = accept(ctlfd, 0, 0); + if (fd >= 0) + close(fd); + } } while (!is_text_console()); } --- gpm-1.20.1/src/headers/console.h.deadsocket 2007-01-22 12:53:27.000000000 +0100 +++ gpm-1.20.1/src/headers/console.h 2007-01-22 12:51:49.000000000 +0100 @@ -33,7 +33,7 @@ char *get_console_name(); char *compose_vc_name(int vc); int is_text_console(void); -void wait_text_console(void); +void wait_text_console(int ctlfd); void refresh_console_size(void); int is_console_owner(int vc, uid_t uid); int get_console_state(unsigned char *shift_state); Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gpm.spec 10 Oct 2006 18:37:26 -0000 1.45 +++ gpm.spec 22 Jan 2007 12:36:48 -0000 1.46 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 76 +Release: 78 License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -137,6 +137,7 @@ %endif /sbin/ldconfig /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir +exit 0 %preun if [ $1 = 0 ]; then @@ -182,6 +183,12 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 +- refuse connections while waiting for console, fixes #168076 + +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-77 +- #223696: non-failsafe install-info use in scriptlets + * Tue Oct 10 2006 Petr Rockai - 1.20-1-76 - align sleeps to tick boundary, should reduce cpu wakeups on laptops, fixes #205064 (patch by Arjan van de Ven) From fedora-cvs-commits at redhat.com Mon Jan 22 12:45:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:45:53 -0500 Subject: rpms/bind/devel bind-devel.pc,NONE,1.1 bind.spec,1.151,1.152 Message-ID: <200701221245.l0MCjrdC013749@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13195/bind/devel Modified Files: bind.spec Added Files: bind-devel.pc Log Message: Resolves: #214208 Libs from bind-libbind-devel have been moved to bind-devel & bind-libs --- NEW FILE bind-devel.pc --- # pkg-config file for bind-devel Name: bind-devel Description: BIND 8 compatible DNS Resolver Library Version: 9.3.2 Libs: -lbind Cflags: -I/usr/include/bind Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- bind.spec 16 Jan 2007 22:42:34 -0000 1.151 +++ bind.spec 22 Jan 2007 12:45:50 -0000 1.152 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.3 -Release: 3%{?prever}%{?dist} +Release: 4%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -132,7 +132,7 @@ %description devel The bind-devel package contains all the header files and libraries -required for DNS (Domain Name System) development with ISC BIND 9.x.x. +required for development with ISC BIND 9 and BIND 8 %package -n caching-nameserver @@ -178,22 +178,6 @@ chroot(2) jail for the named(8) program from the BIND package. Based off code from Jan "Yenya" Kasprzak - -%if %{LIBBIND} - -%package libbind-devel -Summary: Include files and library needed to use the BIND resolver library. -Group: Development/Libraries -Requires: bind-libs = %{epoch}:%{version}-%{release} - -%description libbind-devel -The bind-libbind-devel package contains the libbind BIND resolver library, -compatible with that from ISC BIND 8, and the /usr/include/bind include files -necessary to develop software that uses it. - -%endif - - %if %{SDB} %package sdb @@ -540,11 +524,9 @@ %{_libdir}/libisccc.a %{_libdir}/libisccfg.a %{_libdir}/liblwres.a -%if %{LIBBIND} -%exclude %{_libdir}/libbind.so -%endif %{_libdir}/*so %{_includedir}/bind9 +%{_includedir}/bind %{_includedir}/dns %{_includedir}/dst %{_includedir}/isc @@ -554,6 +536,14 @@ %{_mandir}/man3/lwres* %{_bindir}/isc-config.sh %doc doc/draft doc/rfc +%if %{LIBBIND} +%{_libdir}/libbind.a +%{_libdir}/pkgconfig/bind-devel.pc +%{_includedir}/bind +%{_mandir}/man3/libbind-* +%{_mandir}/man7/libbind-* +%{_mandir}/man5/libbind-* +%endif %files -n caching-nameserver %defattr(0640,root,named,0750) @@ -601,22 +591,6 @@ %ghost %prefix/dev/random %ghost %prefix/dev/zero - -%if %{LIBBIND} - -%files libbind-devel -%defattr(-,root,root,0755) -%{_libdir}/libbind.so* -%defattr(0644,root,root,0755) -%{_libdir}/libbind.a -%{_libdir}/pkgconfig/libbind.pc -%{_includedir}/bind -%{_mandir}/man3/libbind-* -%{_mandir}/man7/libbind-* -%{_mandir}/man5/libbind-* - -%endif - %if %{SDB} %files sdb @@ -720,16 +694,6 @@ fi :; - -%if %{LIBBIND} - -%post libbind-devel -p /sbin/ldconfig - -%postun libbind-devel -p /sbin/ldconfig - -%endif - - %if %{SDB} %post sdb @@ -777,7 +741,11 @@ :; %changelog -* Tue Jan 16 2007 Martin Stransky - 30:9.3.3-3 +* Mon Jan 22 2007 Adam Tkac 31:9.3.3-4.fc7 +- package bind-libbind-devel has beed removed (libs has been moved to bind-devel & bind-libs) +- Resolves: #214208 + +* Tue Jan 16 2007 Martin Stransky - 31:9.3.3-3 - fixed a multi-lib issue - Resolves: rhbz#222717 From fedora-cvs-commits at redhat.com Mon Jan 22 12:46:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:46:17 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-_62newyear.patch, NONE, 1.1 vixie-cron.spec, 1.85, 1.86 Message-ID: <200701221246.l0MCkH62014110@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13937 Modified Files: vixie-cron.spec Added Files: vixie-cron-4.1-_62newyear.patch Log Message: Add patch. vixie-cron-4.1-_62newyear.patch: misc.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE vixie-cron-4.1-_62newyear.patch --- --- vixie-cron-4.1/misc.c.plus 2007-01-22 11:33:10.000000000 +0100 +++ vixie-cron-4.1/misc.c 2007-01-22 11:34:23.000000000 +0100 @@ -773,7 +773,7 @@ if (local->tm_year < gmt.tm_year) offset -= 24 * 3600; else if (local->tm_year > gmt.tm_year) - offset -= 24 * 3600; + offset += 24 * 3600; else if (local->tm_yday < gmt.tm_yday) offset -= 24 * 3600; else if (local->tm_yday > gmt.tm_yday) Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- vixie-cron.spec 22 Jan 2007 09:11:23 -0000 1.85 +++ vixie-cron.spec 22 Jan 2007 12:46:14 -0000 1.86 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 71%{?dist} +Release: 72%{?dist} Epoch: 4 License: distributable Group: System Environment/Base @@ -81,6 +81,7 @@ Patch61: vixie-cron-4.1-_60-SELinux-contains-range.patch Patch62: vixie-cron-4.1-_61symlink.patch Patch63: vixie-cron-4.1-manual.patch +Patch64: vixie-cron-4.1-_62newyear.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: syslog, bash >= 2.0 @@ -181,6 +182,7 @@ %patch61 -p1 -b .selinux-contains-range %patch62 -p1 -b ._61symlink.patch %patch63 -p1 -b .manual +%patch64 -p1 -b ._62newyear %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \ @@ -253,9 +255,10 @@ %config(noreplace) /etc/sysconfig/crond %changelog -* Mon Jan 22 2007 Marcela Maslanova - 4:4.1-71 -- change in maual +* Mon Jan 22 2007 Marcela Maslanova - 4:4.1-72 +- change in manual - rhbz#223532 +- rhbz#223662, rhbz#222464 * Tue Jan 16 2007 Marcela Maslanova - 4:4.1-70 - change in manual From fedora-cvs-commits at redhat.com Mon Jan 22 12:46:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:46:49 -0500 Subject: rpms/gpm/FC-5 gpm.spec,1.41,1.42 Message-ID: <200701221246.l0MCknLd014574@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14529 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 - added disttag to release Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gpm.spec 22 Jan 2007 12:35:08 -0000 1.41 +++ gpm.spec 22 Jan 2007 12:46:47 -0000 1.42 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 78 +Release: 79%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -183,6 +183,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 +- added disttag to release + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 - refuse connections while waiting for console, fixes #168076 From fedora-cvs-commits at redhat.com Mon Jan 22 12:47:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:47:04 -0500 Subject: rpms/gpm/devel gpm.spec,1.47,1.48 Message-ID: <200701221247.l0MCl4FP014793@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14740 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 - added disttag to release Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gpm.spec 22 Jan 2007 12:21:26 -0000 1.47 +++ gpm.spec 22 Jan 2007 12:47:02 -0000 1.48 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 78 +Release: 79%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -183,6 +183,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 +- added disttag to release + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 - refuse connections while waiting for console, fixes #168076 From fedora-cvs-commits at redhat.com Mon Jan 22 12:47:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:47:22 -0500 Subject: rpms/gpm/FC-6 gpm.spec,1.46,1.47 Message-ID: <200701221247.l0MClMVw015038@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14987 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 - added disttag to release Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gpm.spec 22 Jan 2007 12:36:48 -0000 1.46 +++ gpm.spec 22 Jan 2007 12:47:20 -0000 1.47 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 78 +Release: 79%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -183,6 +183,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 +- added disttag to release + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-78 - refuse connections while waiting for console, fixes #168076 From fedora-cvs-commits at redhat.com Mon Jan 22 12:49:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 07:49:41 -0500 Subject: rpms/busybox/devel busybox-1.2.2-iptunnel.patch, NONE, 1.1 busybox.spec, 1.52, 1.53 Message-ID: <200701221249.l0MCnf9R004795@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/busybox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4632 Modified Files: busybox.spec Added Files: busybox-1.2.2-iptunnel.patch Log Message: - fix iptunnel x kernel-headers problem busybox-1.2.2-iptunnel.patch: iptunnel.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE busybox-1.2.2-iptunnel.patch --- --- busybox-1.2.2/networking/libiproute/iptunnel.c.pom 2006-07-01 00:42:02.000000000 +0200 +++ busybox-1.2.2/networking/libiproute/iptunnel.c 2007-01-22 13:42:10.000000000 +0100 @@ -29,6 +29,7 @@ #ifndef __constant_htons #define __constant_htons htons #endif +#include #include #include "rt_names.h" Index: busybox.spec =================================================================== RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- busybox.spec 22 Jan 2007 10:14:18 -0000 1.52 +++ busybox.spec 22 Jan 2007 12:49:39 -0000 1.53 @@ -15,6 +15,7 @@ Patch8: busybox-1.2.0-gcc41.patch Patch9: busybox-1.2.0-tar.patch Patch10: busybox-1.2.2-ash.patch +Patch11: busybox-1.2.2-iptunnel.patch URL: http://www.busybox.net BuildRoot: %{_tmppath}/%{name}-root BuildRequires: libselinux-devel >= 1.27.7-2 @@ -50,6 +51,7 @@ %patch8 -b .gcc111 -p1 %patch9 -b .tar -p1 %patch10 -b .ash -p1 +%patch11 -b .iptunnel -p1 %build make defconfig @@ -88,9 +90,11 @@ /sbin/busybox.anaconda %changelog + * Mon Jan 22 2007 Ivana Varekova - 1:1.2.2-3 - Resolves: 223620 id output shows context twice +- fix iptunnel x kernel-headers problem * Mon Dec 10 2006 Ivana Varekova - 1:1.2.2-2 - enable ash From fedora-cvs-commits at redhat.com Mon Jan 22 13:08:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:08:24 -0500 Subject: rpms/ekiga/devel .cvsignore, 1.6, 1.7 ekiga.spec, 1.33, 1.34 sources, 1.8, 1.9 Message-ID: <200701221308.l0MD8ONs018952@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18699 Modified Files: .cvsignore ekiga.spec sources Log Message: Release of ekiga 2.0.4, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 Sep 2006 06:09:19 -0000 1.6 +++ .cvsignore 22 Jan 2007 13:08:17 -0000 1.7 @@ -1 +1,2 @@ ekiga-2.0.3.tar.bz2 +ekiga-2.0.4.tar.gz Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ekiga.spec 2 Nov 2006 16:38:16 -0000 1.33 +++ ekiga.spec 22 Jan 2007 13:08:17 -0000 1.34 @@ -1,9 +1,9 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga -Version: 2.0.3 -Release: 3%{?dist} +Version: 2.0.4 +Release: 1%{?dist} URL: http://www.ekiga.org/ -Source0: http://www.ekiga.org/ekiga-%{version}.tar.bz2 +Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz # fixed in upstream cvs Patch1: ekiga-2.0.2-transparent.patch License: GPL @@ -96,7 +96,10 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog -* Thu Nov 2 2007 Daniel Veillard - 2.0.3-3 +* Mon Jan 22 2007 Daniel Veillard - 2.0.4-1 +- Upgrade to ekiga-2.0.4 + +* Thu Nov 2 2006 Daniel Veillard - 2.0.3-3 - Resolves: rhbz#201535 - fixes build-requires for opal-devel and pwlib-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Oct 2006 21:50:09 -0000 1.8 +++ sources 22 Jan 2007 13:08:17 -0000 1.9 @@ -1 +1 @@ -37c57468c7c15ff9bcea91e7fc32aea9 ekiga-2.0.3.tar.bz2 +809df217356a1d6dd5a5dae1c6933aca ekiga-2.0.4.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 13:09:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:09:00 -0500 Subject: rpms/busybox/FC-6 busybox-1.2.2-id_ps.patch, NONE, 1.1 busybox.spec, 1.48, 1.49 busybox-1.2.0-id_ps.patch, 1.1, NONE Message-ID: <200701221309.l0MD90PF019515@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/busybox/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19317 Modified Files: busybox.spec Added Files: busybox-1.2.2-id_ps.patch Removed Files: busybox-1.2.0-id_ps.patch Log Message: - Resolves: 223620 id output shows context twice busybox-1.2.2-id_ps.patch: coreutils/id.c | 36 +++++++++++++++++++++++++++++------- procps/ps.c | 4 ++-- 2 files changed, 31 insertions(+), 9 deletions(-) --- NEW FILE busybox-1.2.2-id_ps.patch --- --- busybox-1.2.2/procps/ps.c.id_ps 2006-07-01 00:42:12.000000000 +0200 +++ busybox-1.2.2/procps/ps.c 2007-01-22 10:43:51.000000000 +0100 @@ -44,11 +44,11 @@ #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX /* handle arguments */ #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX - i = bb_getopt_ulflags(argc, argv, "wc", &w_count); + i = bb_getopt_ulflags(argc, argv, "wZ", &w_count); #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX bb_getopt_ulflags(argc, argv, "w", &w_count); #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */ - i = bb_getopt_ulflags(argc, argv, "c"); + i = bb_getopt_ulflags(argc, argv, "Z"); #endif #if ENABLE_FEATURE_PS_WIDE /* if w is given once, GNU ps sets the width to 132, --- busybox-1.2.2/coreutils/id.c.id_ps 2006-07-01 00:42:07.000000000 +0200 +++ busybox-1.2.2/coreutils/id.c 2007-01-22 10:57:45.000000000 +0100 @@ -26,6 +26,7 @@ #define NAME_NOT_NUMBER 2 #define JUST_USER 4 #define JUST_GROUP 8 +#define JUST_CONTEXT 16 static short printf_full(unsigned int id, const char *arg, const char prefix) { @@ -50,9 +51,17 @@ /* Don't allow -n -r -nr -ug -rug -nug -rnug */ /* Don't allow more than one username */ - bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug"; +#ifdef CONFIG_SELINUX + /* Don't allow -gZ, -uZ or -nZ */ + bb_opt_complementally = "?1:?:u--g:g--u:g--Z:Z--g:u--Z:Z--u:Z--n:n--Z:r?ug:n?ug"; +#else + bb_opt_complementally = "?1:?:u--g:g--u:r?ug:n?ug:"; +#endif +#ifdef CONFIG_SELINUX + flags = bb_getopt_ulflags(argc, argv, "rnugZ"); +#else flags = bb_getopt_ulflags(argc, argv, "rnug"); - +#endif /* This values could be overwritten later */ uid = geteuid(); gid = getegid(); @@ -81,12 +90,20 @@ bb_fflush_stdout_and_exit(EXIT_SUCCESS); } +#ifndef CONFIG_SELINUX + if ((flags & JUST_CONTEXT) & (is_selinux_enabled())) { + flags -= JUST_CONTEXT; + } +#endif + /* Print full info like GNU id */ /* bb_getpwuid doesn't exit on failure here */ - status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u'); - putchar(' '); - /* bb_getgrgid doesn't exit on failure here */ - status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g'); + if (!(flags & JUST_CONTEXT)) { + status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u'); + putchar(' '); + /* bb_getgrgid doesn't exit on failure here */ + status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g'); + } #ifdef CONFIG_SELINUX if ( is_selinux_enabled() ) { @@ -103,7 +120,12 @@ }else{ safe_strncpy(context, "unknown",8); } - bb_printf(" context=%s", context); + if (flags & JUST_CONTEXT) { + bb_printf("%s", context); + } + else { + bb_printf(" context=%s", context); + } } #endif Index: busybox.spec =================================================================== RCS file: /cvs/dist/rpms/busybox/FC-6/busybox.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- busybox.spec 28 Aug 2006 12:29:27 -0000 1.48 +++ busybox.spec 22 Jan 2007 13:08:58 -0000 1.49 @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.2.0 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: System Environment/Shells @@ -11,7 +11,7 @@ Patch2: busybox-1.2.0-selinux.patch Patch4: busybox-1.2.0-ppc64.patch Patch5: busybox-1.2.0-page_size.patch -Patch7: busybox-1.2.0-id_ps.patch +Patch7: busybox-1.2.2-id_ps.patch Patch8: busybox-1.2.0-gcc41.patch Patch9: busybox-1.2.0-tar.patch Patch10: busybox-1.2.0-dmesg.patch @@ -88,6 +88,10 @@ /sbin/busybox.anaconda %changelog +* Mon Jan 22 2007 Ivana Varekova - 1:1.2.0-4 +- Resolves: 223620 + id output shows context twice + * Mon Aug 28 2006 Ivana Varekova - 1:1.2.0-3 - fix #200470 - dmesg aborts backport dmesg upstream changes --- busybox-1.2.0-id_ps.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 13:10:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:10:29 -0500 Subject: rpms/groff/devel groff.spec,1.40,1.41 Message-ID: <200701221310.l0MDAT40020826@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20668 Modified Files: groff.spec Log Message: Change in spec. Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- groff.spec 23 Oct 2006 13:06:48 -0000 1.40 +++ groff.spec 22 Jan 2007 13:10:27 -0000 1.41 @@ -3,7 +3,7 @@ Summary: A document formatting system. Name: groff Version: 1.18.1.4 -Release: 1 +Release: 2 License: GPL Group: Applications/Publishing Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -89,7 +89,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 -b .gzext -%patch14 -p1 +#%patch14 -p1 %patch15 -p1 -b .fix9 %patch16 -p1 -b .devutf8 #%patch17 -p1 -b .revision @@ -97,7 +97,7 @@ #%patch19 -p1 -b .grn #%patch20 -p1 -b .tempfile #%patch21 -p1 -b .gcc41 -%patch22 -p1 -b .bigendian +#%patch22 -p1 -b .bigendian %patch23 -p1 -b .spacefix %patch24 -p1 -b .sectmp @@ -180,13 +180,14 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/groff.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/groff.gz %{_infodir}/dir; exit 0 %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/groff.gz %{_infodir}/dir fi +exit 0 %files -f groff-files %defattr(-,root,root) @@ -213,6 +214,9 @@ %endif %changelog +* Mon Jan 22 2007 Marcela Maslanova - 1.18.1.4-2 +- changes in spec, remove patches groff-1.18.1.1-bigendian.patch, groff-xlibs.patch + * Mon Oct 23 2006 Marcela Maslanova - 1.18.1.4-1 - new version from upstream - update groffer From fedora-cvs-commits at redhat.com Mon Jan 22 13:11:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:11:13 -0500 Subject: rpms/pam/devel pam-0.99.7.0-unix-minsalt.patch, NONE, 1.1 pam.spec, 1.140, 1.141 Message-ID: <200701221311.l0MDBD94021457@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21401 Modified Files: pam.spec Added Files: pam-0.99.7.0-unix-minsalt.patch Log Message: * Mon Jan 22 2007 Tomas Mraz 0.99.7.0-2 - add back min salt length requirement which was erroneously removed upstream pam-0.99.7.0-unix-minsalt.patch: support.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE pam-0.99.7.0-unix-minsalt.patch --- --- Linux-PAM-0.99.7.0/modules/pam_unix/support.c.minsalt 2007-01-19 22:32:08.000000000 +0100 +++ Linux-PAM-0.99.7.0/modules/pam_unix/support.c 2007-01-22 13:59:57.000000000 +0100 @@ -706,7 +706,7 @@ D(("user has empty password - access denied")); retval = PAM_AUTH_ERR; } - } else if (!p || (*salt == '*')) { + } else if (!p || (*salt == '*') || (salt_len < 13)) { retval = PAM_AUTH_ERR; } else { if (!strncmp(salt, "$1$", 3)) { Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- pam.spec 19 Jan 2007 17:42:21 -0000 1.140 +++ pam.spec 22 Jan 2007 13:11:10 -0000 1.141 @@ -11,7 +11,7 @@ Summary: A security tool which provides authentication for applications Name: pam Version: 0.99.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL or BSD Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Patch1: pam-0.99.7.0-redhat-modules.patch Patch2: pam-0.99.7.0-selinux-build.patch Patch21: pam-0.78-unix-hpux-aging.patch +Patch22: pam-0.99.7.0-unix-minsalt.patch Patch34: pam-0.99.7.0-dbpam.patch Patch70: pam-0.99.2.1-selinux-nofail.patch Patch80: pam-0.99.6.2-selinux-drop-multiple.patch @@ -93,6 +94,7 @@ %patch1 -p1 -b .redhat-modules %patch2 -p1 -b .build %patch21 -p1 -b .unix-hpux-aging +%patch22 -p1 -b .minsalt %patch34 -p1 -b .dbpam %patch70 -p1 -b .nofail %patch80 -p1 -b .drop-multiple @@ -395,6 +397,10 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Mon Jan 22 2007 Tomas Mraz 0.99.7.0-2 +- add back min salt length requirement which was erroneously removed + upstream + * Fri Jan 19 2007 Tomas Mraz 0.99.7.0-1 - upgrade to new upstream version - drop pam_stack module as it is obsolete From fedora-cvs-commits at redhat.com Mon Jan 22 13:25:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:25:38 -0500 Subject: rpms/bind/devel bind.spec, 1.152, 1.153 libbind.pc, 1.3, 1.4 bind-devel.pc, 1.1, NONE Message-ID: <200701221325.l0MDPcsQ020109@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19722/bind/devel Modified Files: bind.spec libbind.pc Removed Files: bind-devel.pc Log Message: fixed some building problems Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- bind.spec 22 Jan 2007 12:45:50 -0000 1.152 +++ bind.spec 22 Jan 2007 13:25:36 -0000 1.153 @@ -538,7 +538,7 @@ %doc doc/draft doc/rfc %if %{LIBBIND} %{_libdir}/libbind.a -%{_libdir}/pkgconfig/bind-devel.pc +%{_libdir}/pkgconfig/libbind.pc %{_includedir}/bind %{_mandir}/man3/libbind-* %{_mandir}/man7/libbind-* Index: libbind.pc =================================================================== RCS file: /cvs/dist/rpms/bind/devel/libbind.pc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libbind.pc 30 Mar 2006 01:04:19 -0000 1.3 +++ libbind.pc 22 Jan 2007 13:25:36 -0000 1.4 @@ -1,5 +1,5 @@ # pkg-config file for libbind -Name: libbind +Name: bind-devel Description: BIND 8 compatible DNS Resolver Library Version: 9.3.2 Libs: -lbind --- bind-devel.pc DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 13:37:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:37:41 -0500 Subject: rpms/bc/devel bc.spec,1.20,1.21 Message-ID: <200701221337.l0MDbfHj021180@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/bc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21165 Modified Files: bc.spec Log Message: [tw] - rebuild for new ncurses Index: bc.spec =================================================================== RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- bc.spec 12 Jul 2006 20:35:13 -0000 1.20 +++ bc.spec 22 Jan 2007 13:37:39 -0000 1.21 @@ -1,7 +1,7 @@ Summary: GNU's bc (a numeric processing language) and dc (a calculator). Name: bc Version: 1.06 -Release: 21 +Release: 22 License: GPL URL: http://www.gnu.org/software/bc/ Group: Applications/Engineering @@ -69,6 +69,9 @@ %{_infodir}/* %changelog +* Mon Jan 22 2007 Thomas Woerner 1.06-22 +- rebuild for new ncurses + * Wed Jul 12 2006 Jesse Keating - 1.06-21 - rebuild - add missing br automake From fedora-cvs-commits at redhat.com Mon Jan 22 13:39:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:39:44 -0500 Subject: rpms/bc/devel bc.spec,1.21,1.22 Message-ID: <200701221339.l0MDdieN021256@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/bc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21236 Modified Files: bc.spec Log Message: [tw] - rebuild for new readline, not ncurses Index: bc.spec =================================================================== RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- bc.spec 22 Jan 2007 13:37:39 -0000 1.21 +++ bc.spec 22 Jan 2007 13:39:42 -0000 1.22 @@ -70,7 +70,7 @@ %changelog * Mon Jan 22 2007 Thomas Woerner 1.06-22 -- rebuild for new ncurses +- rebuild for new readline * Wed Jul 12 2006 Jesse Keating - 1.06-21 - rebuild From fedora-cvs-commits at redhat.com Mon Jan 22 13:40:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:40:44 -0500 Subject: rpms/bc/devel bc.spec,1.22,1.23 Message-ID: <200701221340.l0MDei7S021329@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/bc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21313 Modified Files: bc.spec Log Message: [tw] - using "rebuild for ncurses" according to mlichvar :-) Index: bc.spec =================================================================== RCS file: /cvs/dist/rpms/bc/devel/bc.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- bc.spec 22 Jan 2007 13:39:42 -0000 1.22 +++ bc.spec 22 Jan 2007 13:40:38 -0000 1.23 @@ -70,7 +70,7 @@ %changelog * Mon Jan 22 2007 Thomas Woerner 1.06-22 -- rebuild for new readline +- rebuild for ncurses * Wed Jul 12 2006 Jesse Keating - 1.06-21 - rebuild From fedora-cvs-commits at redhat.com Mon Jan 22 13:49:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:49:07 -0500 Subject: rpms/gpm/devel gpm.spec,1.48,1.49 Message-ID: <200701221349.l0MDn7q8009428@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9414 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 - forgot to add the patch for #168076 Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/devel/gpm.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gpm.spec 22 Jan 2007 12:47:02 -0000 1.48 +++ gpm.spec 22 Jan 2007 13:49:00 -0000 1.49 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 79%{?dist} +Release: 80%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -21,6 +21,7 @@ Patch21: gpm-1.20.1-lib-silent.patch Patch22: gpm-1.20.1-close-fds.patch Patch23: gpm-1.20.1-aligned-sleep.patch +Patch24: gpm-1.20.1-deadsocket.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 @@ -66,6 +67,7 @@ %patch21 -p1 -b .lib-silent %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep +%patch24 -p1 -b .deadsocket %build autoconf @@ -183,6 +185,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 +- forgot to add the patch for #168076 + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 - added disttag to release From fedora-cvs-commits at redhat.com Mon Jan 22 13:49:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:49:28 -0500 Subject: rpms/gpm/FC-6 gpm.spec,1.47,1.48 Message-ID: <200701221349.l0MDnSb8009491@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9476 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 - forgot to add the patch for #168076 Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-6/gpm.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gpm.spec 22 Jan 2007 12:47:20 -0000 1.47 +++ gpm.spec 22 Jan 2007 13:49:26 -0000 1.48 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 79%{?dist} +Release: 80%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -21,6 +21,7 @@ Patch21: gpm-1.20.1-lib-silent.patch Patch22: gpm-1.20.1-close-fds.patch Patch23: gpm-1.20.1-aligned-sleep.patch +Patch24: gpm-1.20.1-deadsocket.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 @@ -66,6 +67,7 @@ %patch21 -p1 -b .lib-silent %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep +%patch24 -p1 -b .deadsocket %build autoconf @@ -183,6 +185,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 +- forgot to add the patch for #168076 + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 - added disttag to release From fedora-cvs-commits at redhat.com Mon Jan 22 13:49:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:49:52 -0500 Subject: rpms/gpm/FC-5 gpm.spec,1.42,1.43 Message-ID: <200701221349.l0MDnqoc009589@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv9570 Modified Files: gpm.spec Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 - forgot to add the patch for #168076 Index: gpm.spec =================================================================== RCS file: /cvs/dist/rpms/gpm/FC-5/gpm.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gpm.spec 22 Jan 2007 12:46:47 -0000 1.42 +++ gpm.spec 22 Jan 2007 13:49:50 -0000 1.43 @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console. Name: gpm Version: 1.20.1 -Release: 79%{?dist} +Release: 80%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz @@ -21,6 +21,7 @@ Patch21: gpm-1.20.1-lib-silent.patch Patch22: gpm-1.20.1-close-fds.patch Patch23: gpm-1.20.1-aligned-sleep.patch +Patch24: gpm-1.20.1-deadsocket.patch Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info Requires: bash >= 2.0 @@ -66,6 +67,7 @@ %patch21 -p1 -b .lib-silent %patch22 -p1 -b .close-fds %patch23 -p1 -b .aligned-sleep +%patch24 -p1 -b .deadsocket %build autoconf @@ -183,6 +185,9 @@ %{_libdir}/libgpm.so %changelog +* Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 +- forgot to add the patch for #168076 + * Mon Jan 22 2007 Tomas Janousek - 1.20.1-79 - added disttag to release From fedora-cvs-commits at redhat.com Mon Jan 22 13:52:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:52:38 -0500 Subject: rpms/gpm/FC-5 gpm-1.20.1-deadsocket.patch,NONE,1.1 Message-ID: <200701221352.l0MDqccx009711@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/gpm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv9696 Added Files: gpm-1.20.1-deadsocket.patch Log Message: * Mon Jan 22 2007 Tomas Janousek - 1.20.1-80 - forgot to add the patch for #168076 gpm-1.20.1-deadsocket.patch: console.c | 18 ++++++++++++++++-- gpm.c | 2 +- headers/console.h | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE gpm-1.20.1-deadsocket.patch --- --- gpm-1.20.1/src/gpm.c.deadsocket 2007-01-22 12:53:19.000000000 +0100 +++ gpm-1.20.1/src/gpm.c 2007-01-22 12:49:54.000000000 +0100 @@ -544,7 +544,7 @@ * we can safely use micelist */ close(micelist->dev.fd); - wait_text_console(); + wait_text_console(ctlfd); /* reopen, reinit (the function is only used if we have one mouse device) */ if ((micelist->dev.fd = open(micelist->device, O_RDWR)) < 0) gpm_report(GPM_PR_OOPS, GPM_MESS_OPEN, micelist->device); --- gpm-1.20.1/src/console.c.deadsocket 2007-01-22 00:50:25.000000000 +0100 +++ gpm-1.20.1/src/console.c 2007-01-22 13:08:18.000000000 +0100 @@ -101,7 +101,7 @@ } /*-------------------------------------------------------------------*/ -void wait_text_console(void) +void wait_text_console(int ctlfd) { struct timeval now; int usecs; @@ -113,7 +113,21 @@ usecs -= 1000000; usecs += 1000000 - now.tv_usec; - usleep(usecs); + now.tv_sec = 0; + now.tv_usec = usecs; + + /* check for pending connections and reject them */ + fd_set fds; + FD_ZERO(&fds); + FD_SET(ctlfd, &fds); + + select(ctlfd + 1, &fds, 0, 0, &now); + + if (FD_ISSET(ctlfd, &fds) && !is_text_console()) { + int fd = accept(ctlfd, 0, 0); + if (fd >= 0) + close(fd); + } } while (!is_text_console()); } --- gpm-1.20.1/src/headers/console.h.deadsocket 2007-01-22 12:53:27.000000000 +0100 +++ gpm-1.20.1/src/headers/console.h 2007-01-22 12:51:49.000000000 +0100 @@ -33,7 +33,7 @@ char *get_console_name(); char *compose_vc_name(int vc); int is_text_console(void); -void wait_text_console(void); +void wait_text_console(int ctlfd); void refresh_console_size(void); int is_console_owner(int vc, uid_t uid); int get_console_state(unsigned char *shift_state); From fedora-cvs-commits at redhat.com Mon Jan 22 13:53:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:53:19 -0500 Subject: rpms/quagga/devel quagga.spec,1.33,1.34 Message-ID: <200701221353.l0MDrJZw009773@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/quagga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9757 Modified Files: quagga.spec Log Message: * Mon Jan 22 2007 Martin Bacovsky - 0.98.6-3.fc7 - Resolves: #172548 - quagga.spec defines with_vtysh 1 but vtysh is not enabled in the build Index: quagga.spec =================================================================== RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- quagga.spec 12 Jul 2006 07:57:35 -0000 1.33 +++ quagga.spec 22 Jan 2007 13:53:17 -0000 1.34 @@ -29,17 +29,17 @@ %define _libdir %{_exec_prefix}/%{_lib}/quagga %define _localstatedir /var/run/quagga -Summary: Routing daemon +Summary: Routing daemon Name: quagga Version: 0.98.6 -Release: 2.1 -Epoch: 0 +Release: 3%{?dist} +Epoch: 0 License: GPL -Group: System Environment/Daemons +Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz -Source1: quagga-filter-perl-requires.sh -#Patch0: quagga-0.96.2-lib64.patch -Patch1: quagga-0.96.3-netlink.patch +Source1: quagga-filter-perl-requires.sh +#Patch0: quagga-0.96.2-lib64.patch +Patch1: quagga-0.96.3-netlink.patch Patch2: quagga-0.96.5-nostart.patch Patch4: quagga-0.98.2-gcc4.patch Patch5: quagga-0.98.5-pam.patch @@ -112,10 +112,10 @@ %configure \ %if %with_ipv6 - --enable-ipv6 \ + --enable-ipv6=yes \ %endif %if %with_snmp - --enable-snmp \ + --enable-snmp=yes \ %endif %if %with_multipath --enable-multipath=%with_multipath \ @@ -133,7 +133,7 @@ --enable-ospf-te \ %endif %if %with_vtysh - --enable-vtysh \ + --enable-vtysh=yes \ %endif %if %with_ospfclient --enable-ospfclient=yes \ @@ -346,6 +346,9 @@ %endif %changelog +* Mon Jan 22 2007 Martin Bacovsky - 0.98.6-3.fc7 +- Resolves: #172548 - quagga.spec defines with_vtysh 1 but vtysh is not enabled in the build + * Wed Jul 12 2006 Jesse Keating - 0:0.98.6-2.1 - rebuild From fedora-cvs-commits at redhat.com Mon Jan 22 13:54:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:54:04 -0500 Subject: rpms/rsh/devel rsh.spec,1.34,1.35 Message-ID: <200701221354.l0MDs4xT009848@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/rsh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9800/rsh/devel Modified Files: rsh.spec Log Message: rebased on ncurses instead of libtermcap Index: rsh.spec =================================================================== RCS file: /cvs/dist/rpms/rsh/devel/rsh.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- rsh.spec 13 Dec 2006 09:58:31 -0000 1.34 +++ rsh.spec 22 Jan 2007 13:54:02 -0000 1.35 @@ -1,13 +1,13 @@ Summary: Clients for remote access commands (rsh, rlogin, rcp). Name: rsh Version: 0.17 -Release: 38%{?dist} +Release: 39%{?dist} License: BSD Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-root BuildPrereq: perl -BuildPrereq: libtermcap-devel +BuildPrereq: ncurses-devel BuildRequires: pam-devel @@ -182,6 +182,9 @@ %{_mandir}/man8/*.8* %changelog +* Mon Jan 22 2007 Adam Tkac 0.17-39.fc7 +- rebased on ncurses instead of libtermcap + * Tue Dec 05 2006 Adam Tkac 0.17-38.fc7 - rsh now load pan_env module correctly From fedora-cvs-commits at redhat.com Mon Jan 22 13:58:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 08:58:53 -0500 Subject: rpms/aspell/devel aspell.spec,1.35,1.36 Message-ID: <200701221358.l0MDwrs9010016@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9967 Modified Files: aspell.spec Log Message: - Resolves: 223676 fix non-failsafe install-info problem Index: aspell.spec =================================================================== RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- aspell.spec 2 Jan 2007 14:29:02 -0000 1.35 +++ aspell.spec 22 Jan 2007 13:58:50 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A spelling checker Name: aspell Version: 0.60.5 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 12 License: LGPL Group: Applications/Text @@ -64,10 +64,10 @@ %post /sbin/ldconfig -/sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). " +/sbin/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir --entry="* Aspell: (aspell). " || : %post devel -/sbin/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir --entry="* Aspell-dev: (aspell-dev). " +/sbin/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir --entry="* Aspell-dev: (aspell-dev). " || : %preun if [ $1 = 0 ]; then @@ -117,6 +117,10 @@ %{_mandir}/man1/pspell-config.1* %changelog +* Mon Jan 22 2007 Ivana Varekova - 12:0.60.5-2 +- Resolves: 223676 + fix non-failsafe install-info problem + * Tue Jan 2 2007 Ivana Varekova - 12:0.60.5-1 - update to 0.60.4 - cleanup spec file From fedora-cvs-commits at redhat.com Mon Jan 22 14:08:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 09:08:42 -0500 Subject: rpms/mtools/devel mtools.spec,1.23,1.24 Message-ID: <200701221408.l0ME8gig010373@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/mtools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10353/mtools/devel Modified Files: mtools.spec Log Message: Resolves: #223712 Index: mtools.spec =================================================================== RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mtools.spec 9 Aug 2006 13:03:31 -0000 1.23 +++ mtools.spec 22 Jan 2007 14:08:40 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Programs for accessing MS-DOS disks without mounting the disks. Name: mtools Version: 3.9.10 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source: http://mtools.linux.lu/mtools-%{version}.tar.bz2 @@ -54,11 +54,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/mtools.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/mtools.info.gz %{_infodir}/dir || : %preun if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/mtools.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/mtools.info.gz %{_infodir}/dir || : fi %files @@ -70,6 +70,11 @@ %{_infodir}/* %changelog +* Mon Jan 22 2007 Adam Tkac 3.9.10-3 +- Resolves: #223712 +- applied Ville Skytt?'s (ville.skytta "antispam" iki.fi) patch + (install-info scriptlet failures) + * Wed Aug 09 2006 Jitka Kudrnacova - 3.9.10-2 - rebuilt to prevent corruption on the 13th character (#195528) From fedora-cvs-commits at redhat.com Mon Jan 22 14:12:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 09:12:12 -0500 Subject: rpms/gnuplot/devel gnuplot.spec,1.31,1.32 Message-ID: <200701221412.l0MECCTV010465@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gnuplot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10449 Modified Files: gnuplot.spec Log Message: - Resolves: 223676 fix non-failsafe install-info problem Index: gnuplot.spec =================================================================== RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gnuplot.spec 22 Dec 2006 08:29:05 -0000 1.31 +++ gnuplot.spec 22 Jan 2007 14:12:10 -0000 1.32 @@ -1,7 +1,7 @@ Summary: A program for plotting mathematical expressions and data Name: gnuplot Version: 4.0.0 -Release: 15%{?dist} +Release: 16%{?dist} License: Redistributable, with restrictions Group: Applications/Engineering Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz @@ -58,14 +58,14 @@ %post if [ "$1" = "1" ] ; then # first install if [ -x /sbin/install-info ]; then - /sbin/install-info %{_infodir}/gnuplot.info.gz %{_infodir}/dir + /sbin/install-info %{_infodir}/gnuplot.info.gz %{_infodir}/dir || : fi fi %preun if [ "$1" = "0" ] ; then # last uninstall if [ -x /sbin/install-info ]; then - /sbin/install-info --delete %{_infodir}/gnuplot.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/gnuplot.info.gz %{_infodir}/dir || : fi fi @@ -94,8 +94,13 @@ %changelog +* Mon Jan 22 2007 Ivana Varekova - 4.0.0-16 +- Resolves: 223693 + fix non-failsafe install-info problem + * Fri Dec 22 2006 Ivana Varekova - 4.0.0-15 -- Resolves: 173752 - gnuplot refers to /usr/X11R6/lib/fonts/Type1 +- Resolves: 173752 + gnuplot refers to /usr/X11R6/lib/fonts/Type1 * Tue Dec 21 2006 Ivana Varekova - 4.0.0-14 - remove --without-gd options (#173922, #172565) From fedora-cvs-commits at redhat.com Mon Jan 22 14:15:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 09:15:20 -0500 Subject: rpms/psgml/devel psgml.spec,1.15,1.16 Message-ID: <200701221415.l0MEFKU9010579@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/psgml/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10564/psgml/devel Modified Files: psgml.spec Log Message: Resolves: #223715 Index: psgml.spec =================================================================== RCS file: /cvs/dist/rpms/psgml/devel/psgml.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- psgml.spec 7 Jun 2006 12:07:41 -0000 1.15 +++ psgml.spec 22 Jan 2007 14:15:18 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A GNU Emacs major mode for editing SGML documents. name: psgml Version: 1.2.5 -Release: 4.3 +Release: 5%{?dist} Prereq: sgml-common License: GPL Source: ftp://ftp.lysator.liu.se/pub/sgml/psgml-%{version}.tar.gz @@ -13,6 +13,8 @@ %define psgmldir %{prefix}/share/emacs/site-lisp/psgml/ BuildRequires: emacs +Requires(post): info +Requires(postun): info %description Emacs is an advanced and extensible editor. An Emacs major mode @@ -86,6 +88,7 @@ install-info --info-dir=%{_infodir} --delete %{_infodir}/psgml.info install-info --info-dir=%{_infodir} --delete %{_infodir}/psgml-api.info fi +exit 0 %files %defattr(-,root,root) @@ -97,6 +100,11 @@ %{prefix}/share/sgml/cdtd %changelog +* Mon Jan 22 2007 Adam Tkac 1.2.5-5.fc7 +- added dist macro +- fixed install-info scriptlet failures (#223715), patch from Ville Skytt? + (ville.skytta "antispam" iki.fi) + * Wed Jun 07 2006 Jitka Kudrnacova 1.2.5-4.3 - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 22 14:22:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 09:22:34 -0500 Subject: rpms/switchdesk/devel .cvsignore, 1.19, 1.20 sources, 1.21, 1.22 switchdesk.spec, 1.32, 1.33 Message-ID: <200701221422.l0MEMYD0031055@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/switchdesk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31035 Modified Files: .cvsignore sources switchdesk.spec Log Message: fix #174513, it supports any window manager Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/switchdesk/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 8 Jun 2006 20:18:19 -0000 1.19 +++ .cvsignore 22 Jan 2007 14:22:31 -0000 1.20 @@ -8,3 +8,4 @@ switchdesk-4.0.8-4.tar.bz2 switchdesk-4.0.8-5.tar.bz2 switchdesk-4.0.8-6.tar.bz2 +switchdesk-4.0.8-7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/switchdesk/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 8 Jun 2006 20:18:19 -0000 1.21 +++ sources 22 Jan 2007 14:22:31 -0000 1.22 @@ -1 +1 @@ -020d27b29a5f02875852d99ea83e38f6 switchdesk-4.0.8-6.tar.bz2 +10c5df8023db091ff4fa60d5792a27fa switchdesk-4.0.8-7.tar.bz2 Index: switchdesk.spec =================================================================== RCS file: /cvs/dist/rpms/switchdesk/devel/switchdesk.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- switchdesk.spec 8 Jun 2006 20:26:30 -0000 1.32 +++ switchdesk.spec 22 Jan 2007 14:22:31 -0000 1.33 @@ -3,7 +3,7 @@ Name: switchdesk Summary: A desktop environment switcher for GNOME, KDE and AnotherLevel. Version: 4.0.8 -Release: 6 +Release: 7 Source: %{name}-%{version}-%{release}.tar.bz2 License: GPL Group: User Interface/Desktops @@ -83,6 +83,9 @@ %endif %changelog +* Mon Jan 22 2007 Than Ngo - 4.0.8-7 +- fix #174513, it supports any window manager + * Thu Jun 08 2006 Than Ngo 4.0.8-6 - fix build problem in mock #194170 From fedora-cvs-commits at redhat.com Mon Jan 22 14:29:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 09:29:26 -0500 Subject: rpms/gzip/devel gzip.spec,1.32,1.33 Message-ID: <200701221429.l0METQH6031177@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gzip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31163 Modified Files: gzip.spec Log Message: - Resolves: 223702 fix non-failsafe install-info problem Index: gzip.spec =================================================================== RCS file: /cvs/dist/rpms/gzip/devel/gzip.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gzip.spec 16 Jan 2007 08:29:44 -0000 1.32 +++ gzip.spec 22 Jan 2007 14:29:24 -0000 1.33 @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.3.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/File Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz @@ -75,11 +75,11 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/gzip.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/gzip.info.gz %{_infodir}/dir || : fi %files @@ -91,6 +91,10 @@ %{_infodir}/gzip.info* %changelog +* Mon Jan 22 2007 Ivana Varekova 1.3.9-2 +- Resolves: 223702 + fix non-failsafe install-info problem + * Mon Jan 15 2007 Ivana Varekova 1.3.9-1 - rebuild to 1.3.9 - spec cleanup From fedora-cvs-commits at redhat.com Mon Jan 22 14:36:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 09:36:01 -0500 Subject: rpms/gsl/devel gsl.spec,1.23,1.24 Message-ID: <200701221436.l0MEa1YL015327@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15000 Modified Files: gsl.spec Log Message: - Resolves: 223700 id output shows context twice - spec file cleanup Index: gsl.spec =================================================================== RCS file: /cvs/dist/rpms/gsl/devel/gsl.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gsl.spec 12 Jul 2006 06:14:56 -0000 1.23 +++ gsl.spec 22 Jan 2007 14:35:59 -0000 1.24 @@ -1,7 +1,7 @@ -Summary: The GNU Scientific Library for numerical analysis. +Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 1.8 -Release: 1.1 +Release: 2%{?dist} URL: http://sources.redhat.com/gsl/ Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.1-nousr.patch @@ -9,7 +9,7 @@ License: GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: /sbin/install-info +Requires: /sbin/install-info %description The GNU Scientific Library (GSL) is a collection of routines for @@ -64,11 +64,11 @@ %postun -p /sbin/ldconfig %post devel -/sbin/install-info %{_infodir}/gsl-ref.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/gsl-ref.info.gz %{_infodir}/dir || : %preun devel if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/gsl-ref.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/gsl-ref.info.gz %{_infodir}/dir || : fi %clean @@ -93,6 +93,11 @@ %{_libdir}/*.so %changelog +* Mon Jan 22 2007 Ivana Varekova - 1.8-2 +- Resolves: 223700 + fix non-failsafe install-info problem +- spec file cleanup + * Wed Jul 12 2006 Jesse Keating - 1.8-1.1 - rebuild @@ -157,20 +162,20 @@ * Thu May 23 2002 Tim Powers - automated rebuild -* Thu Mar 21 2002 Trond Eivind Glomsr?d +* Thu Mar 21 2002 Trond Eivind Glomsr??d - 1.1.1 bugfix release - Stop the gsl-config script from printing -I/usr/include and -L/usr/lib (#59500) -* Wed Feb 27 2002 Trond Eivind Glomsr?d 1.1-1 +* Wed Feb 27 2002 Trond Eivind Glomsr??d 1.1-1 - 1.1 - Update URL and location * Wed Jan 09 2002 Tim Powers - automated rebuild -* Thu Dec 13 2001 Trond Eivind Glomsr?d 1.0-1 +* Thu Dec 13 2001 Trond Eivind Glomsr??d 1.0-1 - 1.0 - Split into gsl and gsl-devel - update description (#56926) From fedora-cvs-commits at redhat.com Mon Jan 22 15:43:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 10:43:11 -0500 Subject: rpms/libvirt/devel .cvsignore, 1.16, 1.17 libvirt.spec, 1.41, 1.42 sources, 1.17, 1.18 Message-ID: <200701221543.l0MFhBY2029721@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libvirt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29705 Modified Files: .cvsignore libvirt.spec sources Log Message: Release of 0.1.11, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libvirt/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 20 Dec 2006 15:03:38 -0000 1.16 +++ .cvsignore 22 Jan 2007 15:43:09 -0000 1.17 @@ -13,3 +13,4 @@ libvirt-0.1.8.tar.gz libvirt-0.1.9.tar.gz libvirt-0.1.10.tar.gz +libvirt-0.1.11.tar.gz Index: libvirt.spec =================================================================== RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- libvirt.spec 20 Dec 2006 15:03:38 -0000 1.41 +++ libvirt.spec 22 Jan 2007 15:43:09 -0000 1.42 @@ -2,7 +2,7 @@ Summary: Library providing an API to use the Xen virtualization Name: libvirt -Version: 0.1.10 +Version: 0.1.11 Release: 1%{?dist} License: LGPL Group: Development/Libraries @@ -84,6 +84,7 @@ %{_bindir}/virsh %{_libdir}/lib*.so.* %attr(4755, root, root) %{_libexecdir}/libvirt_proxy +%doc docs/libvirt.rng %files devel %defattr(-, root, root) @@ -112,6 +113,11 @@ %doc docs/examples/python %changelog +* Mon Jan 22 2007 Daniel Veillard 0.1.11-1.fc7 +- finish inactive Xen domains support +- memory leak fix +- RelaxNG schemas for XML configs + * Wed Dec 20 2006 Daniel Veillard 0.1.10-1.fc7 - support for inactive Xen domains - improved support for Xen display and vnc Index: sources =================================================================== RCS file: /cvs/dist/rpms/libvirt/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 20 Dec 2006 15:03:38 -0000 1.17 +++ sources 22 Jan 2007 15:43:09 -0000 1.18 @@ -1 +1 @@ -1c6aca92b7c88e24dbc6569d8a842b3a libvirt-0.1.10.tar.gz +2ffed48966716b0eb6e7f7e166c270d9 libvirt-0.1.11.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 15:49:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 10:49:20 -0500 Subject: rpms/libvirt/FC-6 libvirt.spec,1.37,1.38 sources,1.16,1.17 Message-ID: <200701221549.l0MFnKE5017858@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libvirt/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17840 Modified Files: libvirt.spec sources Log Message: Update to 0.1.11, Daniel Index: libvirt.spec =================================================================== RCS file: /cvs/dist/rpms/libvirt/FC-6/libvirt.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- libvirt.spec 20 Dec 2006 15:23:34 -0000 1.37 +++ libvirt.spec 22 Jan 2007 15:49:16 -0000 1.38 @@ -2,7 +2,7 @@ Summary: Library providing an API to use the Xen virtualization Name: libvirt -Version: 0.1.10 +Version: 0.1.11 Release: 1%{?dist} License: LGPL Group: Development/Libraries @@ -43,7 +43,6 @@ Group: Development/Libraries Requires: libvirt = %{version} Obsoletes: libvir-python -Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) %description python The libvirt-python package contains a module that permits applications @@ -85,6 +84,7 @@ %{_bindir}/virsh %{_libdir}/lib*.so.* %attr(4755, root, root) %{_libexecdir}/libvirt_proxy +%doc docs/libvirt.rng %files devel %defattr(-, root, root) @@ -113,6 +113,11 @@ %doc docs/examples/python %changelog +* Mon Jan 22 2007 Daniel Veillard 0.1.11-1.fc6 +- finish inactive Xen domains support +- memory leak fix +- RelaxNG schemas for XML configs + * Wed Dec 20 2006 Daniel Veillard 0.1.10-1.fc6 - support for inactive Xen domains - improved support for Xen display and vnc Index: sources =================================================================== RCS file: /cvs/dist/rpms/libvirt/FC-6/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 20 Dec 2006 15:23:34 -0000 1.16 +++ sources 22 Jan 2007 15:49:16 -0000 1.17 @@ -1 +1 @@ -1c6aca92b7c88e24dbc6569d8a842b3a libvirt-0.1.10.tar.gz +2ffed48966716b0eb6e7f7e166c270d9 libvirt-0.1.11.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 15:50:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 10:50:03 -0500 Subject: rpms/orca/devel .cvsignore, 1.8, 1.9 orca.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200701221550.l0MFo3fO017904@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/orca/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17879 Modified Files: .cvsignore orca.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/orca/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 11 Jan 2007 05:37:43 -0000 1.8 +++ .cvsignore 22 Jan 2007 15:50:01 -0000 1.9 @@ -1 +1 @@ -orca-2.17.5.tar.bz2 +orca-2.17.90.tar.bz2 Index: orca.spec =================================================================== RCS file: /cvs/dist/rpms/orca/devel/orca.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- orca.spec 11 Jan 2007 05:37:43 -0000 1.18 +++ orca.spec 22 Jan 2007 15:50:01 -0000 1.19 @@ -15,7 +15,7 @@ %define control_center_version 2.16.0-5 Name: orca -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} Summary: Flexible, extensible, and powerful assistive technology @@ -104,6 +104,9 @@ %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Thu Jan 11 2007 Matthias Clasen - 2.17.5-1 - Update to orca 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/orca/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 11 Jan 2007 05:37:43 -0000 1.8 +++ sources 22 Jan 2007 15:50:01 -0000 1.9 @@ -1 +1 @@ -635f3e263e59a5fb5a2dd85abed5bae6 orca-2.17.5.tar.bz2 +a8037cab6c52421967776cea98a80bad orca-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 15:55:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 10:55:59 -0500 Subject: rpms/mc/devel .cvsignore, 1.31, 1.32 mc.spec, 1.115, 1.116 sources, 1.38, 1.39 mc-tmpcrash.patch, 1.2, NONE Message-ID: <200701221555.l0MFtxZs018025@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17995 Modified Files: .cvsignore mc.spec sources Removed Files: mc-tmpcrash.patch Log Message: - update to new upstream CVS snapshot - drop upstreamed tmpcrash patch - reenable gpm support as it is now fixed (#168076) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mc/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 4 Jan 2007 16:14:37 -0000 1.31 +++ .cvsignore 22 Jan 2007 15:55:52 -0000 1.32 @@ -6,3 +6,4 @@ mc-2006-10-15-16.tar.gz mc-2006-11-14-16.tar.gz mc-2006-12-28-05.tar.gz +mc-2007-01-22-13.tar.gz Index: mc.spec =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- mc.spec 4 Jan 2007 16:14:38 -0000 1.115 +++ mc.spec 22 Jan 2007 15:55:52 -0000 1.116 @@ -1,9 +1,9 @@ -%define date 2006-12-28-05 +%define date 2007-01-22-13 Summary: User-friendly text console file manager and visual shell Name: mc Version: 4.6.1a -Release: 39%{?dist} +Release: 40%{?dist} Epoch: 1 License: GPL Group: System Environment/Shells @@ -27,8 +27,7 @@ Patch11: mc-utf8-8bit-hex.patch Patch12: mc-ipv6.patch Patch13: mc-newlinedir.patch -Patch14: mc-tmpcrash.patch -Patch15: mc-cloexec.patch +Patch14: mc-cloexec.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -54,8 +53,7 @@ %patch11 -p1 -b .8bit-hex %patch12 -p1 -b .ipv6 %patch13 -p1 -b .newlinedir -%patch14 -p1 -b .tmpcrash -%patch15 -p1 -b .cloexec +%patch14 -p1 -b .cloexec # convert files in /lib to UTF-8 pushd lib @@ -138,7 +136,7 @@ --enable-charset \ --with-samba \ --without-x \ - --without-gpm-mouse + --with-gpm-mouse make %{?_smp_mflags} %install @@ -200,6 +198,11 @@ %dir %{_sysconfdir}/mc %changelog +* Mon Jan 22 2007 Jindrich Novy 4.6.1a-40 +- update to new upstream CVS snapshot +- drop upstreamed tmpcrash patch +- reenable gpm support as it is now fixed (#168076) + * Thu Jan 4 2007 Jindrich Novy 4.6.1a-39 - update to new CVS snapshot (fixes #220828) - update bindings again Index: sources =================================================================== RCS file: /cvs/dist/rpms/mc/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 4 Jan 2007 16:14:38 -0000 1.38 +++ sources 22 Jan 2007 15:55:52 -0000 1.39 @@ -1 +1 @@ -36677cf9331e463c98109ea7fa7f5c47 mc-2006-12-28-05.tar.gz +7d0ab00463348f7e6abed55a5eda2c38 mc-2007-01-22-13.tar.gz --- mc-tmpcrash.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 16:06:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:06:26 -0500 Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec,1.58,1.59 Message-ID: <200701221606.l0MG6QvM018367@cvs.devel.redhat.com> Author: klee Update of /cvs/dist/rpms/eclipse-changelog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18353 Modified Files: eclipse-changelog.spec Log Message: more cleanup for review Index: eclipse-changelog.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- eclipse-changelog.spec 17 Jan 2007 19:27:38 -0000 1.58 +++ eclipse-changelog.spec 22 Jan 2007 16:06:24 -0000 1.59 @@ -8,7 +8,7 @@ Release: 3%{?dist} Summary: Eclipse ChangeLog plug-in -Group: Text Editors/Integrated Development Environments (IDE) +Group: Development/Toos License: Eclipse Public License URL: http://sources.redhat.com/eclipse @@ -85,6 +85,7 @@ %defattr(-,root,root) %{eclipse_base}/features/com.redhat.eclipse.changelog* %{eclipse_base}/plugins/com.redhat.eclipse.changelog* +%doc %{eclipse_base}/features/com.redhat.eclipse.changelog_*/epl-v10.html %if %{gcj_support} %{_libdir}/gcj/%{name}/* %endif From fedora-cvs-commits at redhat.com Mon Jan 22 16:06:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:06:30 -0500 Subject: rpms/GConf2/devel GConf2.spec,1.52,1.53 Message-ID: <200701221606.l0MG6U4t018389@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/GConf2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18349 Modified Files: GConf2.spec Log Message: Directory ownership fix Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- GConf2.spec 29 Oct 2006 08:37:43 -0000 1.52 +++ GConf2.spec 22 Jan 2007 16:06:28 -0000 1.53 @@ -5,15 +5,12 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 2.16.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/GConf2-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://www.gnome.org -Prereq: /sbin/install-info -Requires: ORBit2 >= %{orbit2_version} -Requires: glib2 >= %{glib2_version} BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: ORBit2-devel >= %{orbit2_version} @@ -40,7 +37,7 @@ %package devel Summary: Headers and libraries for GConf development Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: libxml2-devel >= %{libxml2_version} Requires: ORBit2-devel >= %{orbit2_version} Requires: glib2-devel >= %{glib2_version} @@ -71,6 +68,8 @@ chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.defaults chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/gconf.xml.mandatory +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas + rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/libgconfbackend-xml.a rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/libgconfbackend-oldxml.a rm -f $RPM_BUILD_ROOT/%{_libdir}/GConf/2/libgconfbackend-evoldap.a @@ -95,6 +94,7 @@ %dir %{_sysconfdir}/gconf/2 %dir %{_sysconfdir}/gconf/gconf.xml.defaults %dir %{_sysconfdir}/gconf/gconf.xml.mandatory +%dir %{_sysconfdir}/gconf/schemas %{_bindir}/* %{_libexecdir}/* %{_libdir}/*.so.* @@ -114,6 +114,10 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.16.0-4 +- Own the /etc/gconf/schemas directory +- Misc cleanups + * Sun Oct 29 2006 Ray Strode - 2.16.0-3 - run autoreconf, so that configure gets updated before it generates libtool (so it doesn't just regenerate From fedora-cvs-commits at redhat.com Mon Jan 22 16:11:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:11:33 -0500 Subject: rpms/orca/devel sources,1.9,1.10 Message-ID: <200701221611.l0MGBXaA018594@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/orca/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18579 Modified Files: sources Log Message: 2.17.90 Index: sources =================================================================== RCS file: /cvs/dist/rpms/orca/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jan 2007 15:50:01 -0000 1.9 +++ sources 22 Jan 2007 16:11:31 -0000 1.10 @@ -1 +1 @@ -a8037cab6c52421967776cea98a80bad orca-2.17.90.tar.bz2 +6b125a524c75e506518fc8e4d07265a0 orca-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 16:15:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:15:10 -0500 Subject: rpms/GConf2/devel GConf2.spec,1.53,1.54 Message-ID: <200701221615.l0MGFArT018655@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/GConf2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18641 Modified Files: GConf2.spec Log Message: fix BRs Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- GConf2.spec 22 Jan 2007 16:06:28 -0000 1.53 +++ GConf2.spec 22 Jan 2007 16:15:08 -0000 1.54 @@ -22,6 +22,7 @@ BuildRequires: openldap-devel BuildRequires: perl-XML-Parser BuildRequires: libtool, autoconf, automake +BuildRequires: intltool Patch0: GConf2-2.16.0-reload.patch # http://bugzilla.gnome.org/show_bug.cgi?id=356573 From fedora-cvs-commits at redhat.com Mon Jan 22 16:15:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:15:43 -0500 Subject: rpms/eclipse-changelog/devel .cvsignore,1.12,1.13 Message-ID: <200701221615.l0MGFhUO018715@cvs.devel.redhat.com> Author: klee Update of /cvs/dist/rpms/eclipse-changelog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18701 Modified Files: .cvsignore Log Message: new source Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Oct 2006 18:42:12 -0000 1.12 +++ .cvsignore 22 Jan 2007 16:15:41 -0000 1.13 @@ -1,3 +1 @@ -eclipse-changelog-src-2.3.1.zip -eclipse-changelog-src-2.3.2.zip eclipse-changelog-src-2.3.3.zip From fedora-cvs-commits at redhat.com Mon Jan 22 16:39:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:39:07 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.50, 1.51 gnome-games.spec, 1.110, 1.111 sources, 1.53, 1.54 Message-ID: <200701221639.l0MGd7me026772@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25605 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 11 Jan 2007 03:05:30 -0000 1.50 +++ .cvsignore 22 Jan 2007 16:39:05 -0000 1.51 @@ -20,3 +20,4 @@ gnome-games-2.17.3.tar.bz2 gnome-games-2.17.4.1.tar.bz2 gnome-games-2.17.5.tar.bz2 +gnome-games-2.17.90.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gnome-games.spec 11 Jan 2007 04:12:13 -0000 1.110 +++ gnome-games.spec 22 Jan 2007 16:39:05 -0000 1.111 @@ -29,7 +29,7 @@ Summary: GNOME games Name: gnome-games -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} Epoch: 1 License: LGPL @@ -47,7 +47,7 @@ Requires(post): GConf2 Requires(preun): GConf2 -Requires: librsvg2 +Requires: GConf2 BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -196,6 +196,7 @@ gconftool-2 --makefile-install-rule \ %{sol_schemas} \ %{bj_schemas} \ + glchess.schemas \ glines.schemas \ gnect.schemas \ gnibbles.schemas \ @@ -209,7 +210,6 @@ libgnomegames.schemas \ mahjongg.schemas \ same-gnome.schemas \ - glchess.schemas \ > /dev/null || : ) touch %{_datadir}/icons/hicolor @@ -224,6 +224,7 @@ gconftool-2 --makefile-uninstall-rule \ %{sol_schemas} \ %{bj_schemas} \ + glchess.schemas \ glines.schemas \ gnect.schemas \ gnibbles.schemas \ @@ -237,7 +238,6 @@ libgnomegames.schemas \ mahjongg.schemas \ same-gnome.schemas \ - glchess.schemas \ > /dev/null || : ) fi @@ -248,6 +248,7 @@ gconftool-2 --makefile-uninstall-rule \ %{sol_schemas} \ %{bj_schemas} \ + glchess.schemas \ glines.schemas \ gnect.schemas \ gnibbles.schemas \ @@ -261,7 +262,6 @@ libgnomegames.schemas \ mahjongg.schemas \ same-gnome.schemas \ - glchess.schemas \ > /dev/null || : ) fi @@ -277,11 +277,11 @@ %doc AUTHORS COPYING ChangeLog -%{_datadir}/gnome -%{_datadir}/applications +%{_datadir}/gnome/help/* +%{_datadir}/applications/* %{_datadir}/gnome-games %{_datadir}/gnect -%{_datadir}/pixmaps +%{_datadir}/pixmaps/* %{_datadir}/gnobots2 %{_datadir}/sounds %{_datadir}/gnibbles @@ -293,7 +293,7 @@ %{_datadir}/gnome-sudoku %{_datadir}/omf/gnome-games %{_datadir}/omf/glchess -%{_datadir}/icons/hicolor/ +%{_datadir}/icons/hicolor/* %config %{_sysconfdir}/sound/events/* %config(noreplace) %attr(664, games, games) /var/lib/games/* @@ -301,7 +301,6 @@ %{python_sitelib}/gnome_sudoku # gconf schemas -%dir %{_sysconfdir}/gconf/schemas %if %{build_card} %{_sysconfdir}/gconf/schemas/aisleriot.schemas %{_sysconfdir}/gconf/schemas/blackjack.schemas @@ -349,6 +348,10 @@ %changelog +* Mon Jan 22 2007 Matthias Clasen - 1:2.17.90-1 +- Update to 2.17.90 +- Fix some directory ownership issues + * Wed Jan 10 2007 Matthias Clasen - 1:2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Jan 2007 03:05:30 -0000 1.53 +++ sources 22 Jan 2007 16:39:05 -0000 1.54 @@ -1,2 +1,2 @@ 01464739e83449288c6a58685604f86e gnome-games-extra-data-2.14.0.tar.bz2 -4a6ecb5f3bb44d15da74a3fe4ea88008 gnome-games-2.17.5.tar.bz2 +2cfd9ca0201fbc9f4514ab3cee9a8268 gnome-games-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 16:43:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:43:14 -0500 Subject: rpms/xen/devel xen-dumpdir.patch,NONE,1.1 xen.spec,1.162,1.163 Message-ID: <200701221643.l0MGhEEk029883@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29823 Modified Files: xen.spec Added Files: xen-dumpdir.patch Log Message: Fix development headers. Move coredumps to /var/lib/xen/dump. Protect log files mode 0700 xen-dumpdir.patch: Makefile | 2 +- debugger/gdb/README | 2 +- python/xen/xend/XendDomainInfo.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE xen-dumpdir.patch --- diff -ru xen-3.0.4_1-src/tools/debugger/gdb/README xen-3.0.4_1-src-new/tools/debugger/gdb/README --- xen-3.0.4_1-src/tools/debugger/gdb/README 2007-01-08 10:00:47.000000000 -0500 +++ xen-3.0.4_1-src-new/tools/debugger/gdb/README 2007-01-22 11:28:33.000000000 -0500 @@ -33,6 +33,6 @@ 1. Add '(enable-dump yes)' to /etc/xen/xend-config.sxp before starting xend. 2. When the domain crashes, a core file is written to - '/var/xen/dump/..core'. + '/var/lib/xen/dump/..core'. 3. Run 'gdbserver-xen 127.0.0.1:9999 --file '. 4. Connect to the server as for a running guest. diff -ru xen-3.0.4_1-src/tools/Makefile xen-3.0.4_1-src-new/tools/Makefile --- xen-3.0.4_1-src/tools/Makefile 2007-01-08 10:00:46.000000000 -0500 +++ xen-3.0.4_1-src-new/tools/Makefile 2007-01-22 11:28:13.000000000 -0500 @@ -41,7 +41,7 @@ $(MAKE) -C $$subdir $@; \ done $(MAKE) ioemuinstall - $(INSTALL_DIR) -p $(DESTDIR)/var/xen/dump + $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xen/dump $(INSTALL_DIR) -p $(DESTDIR)/var/log/xen .PHONY: clean diff -ru xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py xen-3.0.4_1-src-new/tools/python/xen/xend/XendDomainInfo.py --- xen-3.0.4_1-src/tools/python/xen/xend/XendDomainInfo.py 2007-01-08 10:00:50.000000000 -0500 +++ xen-3.0.4_1-src-new/tools/python/xen/xend/XendDomainInfo.py 2007-01-22 11:29:03.000000000 -0500 @@ -1151,7 +1151,7 @@ try: if not corefile: this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime()) - corefile = "/var/xen/dump/%s-%s.%s.core" % (this_time, + corefile = "/var/lib/xen/dump/%s-%s.%s.core" % (this_time, self.info['name_label'], self.domid) if os.path.isdir(corefile): Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- xen.spec 18 Jan 2007 18:19:04 -0000 1.162 +++ xen.spec 22 Jan 2007 16:43:12 -0000 1.163 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.4 -Release: 1%{dist} +Release: 2%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -12,6 +12,7 @@ Patch1: xen-initscript.patch Patch3: xen-compile-fixes.patch Patch6: xen-network-iptables-bridge.patch +Patch13: xen-dumpdir.patch Patch20: xen-blktap-no-aio-epoll.patch Patch21: xen-blktap-error-returns.patch @@ -84,6 +85,7 @@ %patch1 -p1 -b .init %patch3 -p1 -b .compile %patch6 -p1 +%patch13 -p1 # blktap patches %patch20 -p1 @@ -133,8 +135,10 @@ # install all of the public headers mkdir -p %{buildroot}%{_includedir}/xen/io %{buildroot}%{_includedir}/xen/hvm +mkdir -p %{buildroot}%{_includedir}/xen/arch-x86 install -m 644 xen/include/public/io/*.h %{buildroot}%{_includedir}/xen/io install -m 644 xen/include/public/hvm/*.h %{buildroot}%{_includedir}/xen/hvm +install -m 644 xen/include/public/arch-x86/*.h %{buildroot}%{_includedir}/xen/arch-x86 install -m 644 xen/include/public/*.h %{buildroot}%{_includedir}/xen/ install -m 644 xen/include/public/COPYING %{buildroot}%{_includedir}/xen/ @@ -148,7 +152,8 @@ rm -fr %{buildroot}/%{_datadir}/doc/xen/ # create dirs in /var/run so that selinux contexts are right (#195952) -mkdir -p %{buildroot}/var/run/xend %{buildroot}/var/xen/dump %{buildroot}/var/log/xen +mkdir -p %{buildroot}/var/run/xend %{buildroot}/var/log/xen +mkdir -p %{buildroot}/var/lib/xen/images # avoid conflicting with qemu (#199759) rm -f %{buildroot}/%{_mandir}/man*/qemu* @@ -195,9 +200,7 @@ %dir %{_localstatedir}/lib/xenstored %dir %{_localstatedir}/run/xenstored %dir %{_localstatedir}/run/xend -%dir %{_localstatedir}/xen -%dir %{_localstatedir}/xen/dump -%dir /var/log/xen +%dir %attr(0700,root,root) /var/log/xen %files libs %defattr(-,root,root) @@ -213,6 +216,11 @@ %{_libdir}/*.a %changelog +* Mon Jan 22 2007 Daniel P. Berrange - 3.0.4-2 +- Ensure the arch-x86 header files are included in xen-devel package +- Bring back patch to move /var/xen/dump to /var/lib/xen/dump +- Make /var/log/xen mode 0700 + * Thu Jan 11 2007 Daniel P. Berrange - 3.0.4-1 - Upgrade to official xen-3.0.4_1 release tarball From fedora-cvs-commits at redhat.com Mon Jan 22 16:48:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:48:52 -0500 Subject: rpms/a2ps/devel a2ps.spec,1.50,1.51 Message-ID: <200701221648.l0MGmqhg022104@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/a2ps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21956 Modified Files: a2ps.spec Log Message: * Mon Jan 22 2007 Tim Waugh 4.13b-60 - Make scriptlets unconditionally succeed (bug #223674). - Resolves: rhbz#223674 Index: a2ps.spec =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- a2ps.spec 27 Oct 2006 12:40:53 -0000 1.50 +++ a2ps.spec 22 Jan 2007 16:48:44 -0000 1.51 @@ -1,7 +1,7 @@ Summary: Converts text and other types of files to PostScript(TM). Name: a2ps Version: 4.13b -Release: 59%{?dist} +Release: 60%{?dist} License: GPL Group: Applications/Publishing Source: ftp://ftp.enst.fr/pub/unix/a2ps/%{name}-%{version}.tar.gz @@ -213,6 +213,7 @@ mv fonts.map.new fonts.map fi ) +exit 0 %preun if [ $1 = 0 ]; then @@ -220,6 +221,7 @@ /sbin/install-info --delete %{_infodir}/ogonkify.info.gz %{_infodir}/dir /sbin/install-info --delete %{_infodir}/regex.info.gz %{_infodir}/dir fi +exit 0 %files -f %{name}.lang %defattr(-,root,root) @@ -249,6 +251,9 @@ %dir %{_datadir}/a2ps %changelog +* Mon Jan 22 2007 Tim Waugh 4.13b-60 +- Make scriptlets unconditionally succeed (bug #223674). + * Fri Oct 27 2006 Tim Waugh - Build requires cups (bug #204119). From fedora-cvs-commits at redhat.com Mon Jan 22 16:52:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 11:52:21 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch, 1.4, 1.5 selinux-policy.spec, 1.383, 1.384 Message-ID: <200701221652.l0MGqKde024884@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24837 Modified Files: policy-20070102.patch selinux-policy.spec Log Message: * Wed Jan 10 2007 Dan Walsh 2.5.1-4 - Begin adding user confinement to targeted policy policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++--- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 124 ++++++-- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/evolution.if | 135 ++++++++- policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 +++++++++++++++-- policy/modules/apps/mplayer.if | 79 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/userhelper.if | 19 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 57 +++- policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 180 ++++++++++++ policy/modules/kernel/filesystem.if | 19 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 1 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++--- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 +++ policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 ++- policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 ++++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 65 ++++ policy/modules/services/ssh.te | 6 policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 72 +++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 3 policy/modules/system/init.te | 35 ++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 7 policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 ++++++++ policy/modules/system/selinuxutil.te | 116 ++------ policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 423 ++++++++++++++++++++++++++++-- policy/modules/system/userdomain.te | 44 +-- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 155 files changed, 3379 insertions(+), 523 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- policy-20070102.patch 17 Jan 2007 19:58:32 -0000 1.4 +++ policy-20070102.patch 22 Jan 2007 16:52:18 -0000 1.5 @@ -19,6 +19,308 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.5.1/man/man8/httpd_selinux.8 +--- nsaserefpolicy/man/man8/httpd_selinux.8 2006-11-16 17:15:28.000000000 -0500 ++++ serefpolicy-2.5.1/man/man8/httpd_selinux.8 2007-01-19 12:10:20.000000000 -0500 +@@ -1,4 +1,12 @@ + .TH "httpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "httpd Selinux Policy documentation" ++.de EX ++.nf ++.ft CW ++.. ++.de EE ++.ft R ++.fi ++.. + .SH "NAME" + httpd_selinux \- Security Enhanced Linux Policy for the httpd daemon + .SH "DESCRIPTION" +@@ -9,38 +17,32 @@ + SELinux requires files to have an extended attribute to define the file type. + Policy governs the access daemons have to these files. + SELinux httpd policy is very flexible allowing users to setup their web services in as secure a method as possible. +-.TP ++.PP + The following file contexts types are defined for httpd: +-.br +- ++.EX + httpd_sys_content_t +-.br ++.EE + - Set files with httpd_sys_content_t for content which is available from all httpd scripts and the daemon. +-.br +- ++.EX + httpd_sys_script_exec_t +-.br ++.EE + - Set cgi scripts with httpd_sys_script_exec_t to allow them to run with access to all sys types. +-.br +- ++.EX + httpd_sys_script_ro_t +-.br ++.EE + - Set files with httpd_sys_script_ro_t if you want httpd_sys_script_exec_t scripts to read the data, and disallow other sys scripts from access. +-.br +- ++.EX + httpd_sys_script_rw_t +-.br ++.EE + - Set files with httpd_sys_script_rw_t if you want httpd_sys_script_exec_t scripts to read/write the data, and disallow other non sys scripts from access. +-.br +- ++.EX + httpd_sys_script_ra_t +-.br ++.EE + - Set files with httpd_sys_script_ra_t if you want httpd_sys_script_exec_t scripts to read/append to the file, and disallow other non sys scripts from access. +- ++.EX + httpd_unconfined_script_exec_t +-.br ++.EE + - Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options. It is better to use this script rather than turning off SELinux protection for httpd. +-.br + + .SH NOTE + With certain policies you can define addional file contexts based on roles like user or staff. httpd_user_script_exec_t can be defined where it would only have access to "user" contexts. +@@ -48,71 +50,81 @@ + .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 httpd you would execute: + ++.EX + setsebool -P allow_httpd_anon_write=1 ++.EE + + or + ++.EX + setsebool -P allow_httpd_sys_script_anon_write=1 ++.EE + + .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. +-.TP ++.PP + httpd can be setup to allow cgi scripts to be executed, set httpd_enable_cgi to allow this +-.br + ++.EX + setsebool -P httpd_enable_cgi 1 ++.EE + +-.TP ++.PP + httpd by default is not allowed to access users home directories. If you want to allow access to users home directories you need to set the httpd_enable_homedirs boolean and change the context of the files that you want people to access off the home dir. +-.br + ++.EX + setsebool -P httpd_enable_homedirs 1 +-.br + chcon -R -t httpd_sys_content_t ~user/public_html ++.EE + +-.TP ++.PP + httpd by default is not allowed access to the controling terminal. In most cases this is prefered, because an intruder might be able to use the access to the terminal to gain privileges. But in certain situations httpd needs to prompt for a password to open a certificate file, in these cases, terminal access is required. Set the httpd_tty_comm boolean to allow terminal access. +-.br + ++.EX + setsebool -P httpd_tty_comm 1 ++.EE + +-.TP ++.PP + httpd can be configured to not differentiate file controls based on context, i.e. all files labeled as httpd context can be read/write/execute. Setting this boolean to false allows you to setup the security policy such that one httpd service can not interfere with another. +-.br + ++.EX + setsebool -P httpd_unified 0 ++.EE + +-.TP ++.PP + httpd can be configured to turn off internal scripting (PHP). PHP and other + loadable modules run under the same context as httpd. Therefore several policy rules allow httpd greater access to the system then is needed if you only use external cgi scripts. +-.br + ++.EX + setsebool -P httpd_builtin_scripting 0 ++.EE + +-.TP ++.PP + httpd scripts by default are not allowed to connect out to the network. + This would prevent a hacker from breaking into you httpd server and attacking + other machines. If you need scripts to be able to connect you can set the httpd_can_network_connect boolean on. +-.br + ++.EX + setsebool -P httpd_can_network_connect 1 ++.EE + +-.TP ++.PP + You can disable suexec transition, set httpd_suexec_disable_trans deny this +-.br + ++.EX + setsebool -P httpd_suexec_disable_trans 1 ++.EE + +-.TP ++.PP + You can disable SELinux protection for the httpd daemon by executing: +-.br + ++.EX + setsebool -P httpd_disable_trans 1 +-.br + service httpd restart ++.EE + +-.TP ++.PP + system-config-securitylevel is a GUI tool available to customize SELinux policy settings. + .SH AUTHOR + This manual page was written by Dan Walsh . +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.5.1/man/man8/kerberos_selinux.8 +--- nsaserefpolicy/man/man8/kerberos_selinux.8 2006-11-16 17:15:28.000000000 -0500 ++++ serefpolicy-2.5.1/man/man8/kerberos_selinux.8 2007-01-19 12:10:20.000000000 -0500 +@@ -1,4 +1,12 @@ + .TH "kerberos_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "kerberos Selinux Policy documentation" ++.de EX ++.nf ++.ft CW ++.. ++.de EE ++.ft R ++.fi ++.. + .SH "NAME" + kerberos_selinux \- Security Enhanced Linux Policy for Kerberos. + .SH "DESCRIPTION" +@@ -6,23 +14,19 @@ + Security-Enhanced Linux secures the system via flexible mandatory access + control. By default Kerberos access is not allowed, since it requires daemons to be allowed greater access to certain secure files and addtional access to the network. + .SH BOOLEANS +-.TP ++.PP + You must set the allow_kerberos boolean to allow your system to work properly in a Kerberos environment. +-.TP ++.EX + setsebool -P allow_kerberos 1 +-.TP ++.EE + If you are running Kerberos daemons kadmind or krb5kdc you can disable the SELinux protection on these daemons by setting the krb5kdc_disable_trans and kadmind_disable_trans booleans. +-.br +- ++.EX + setsebool -P krb5kdc_disable_trans 1 +-.br + service krb5kdc restart +-.br + setsebool -P kadmind_disable_trans booleans 1 +-.br + service kadmind restart +- +-.TP ++.EE ++.PP + system-config-securitylevel is a GUI tool available to customize SELinux policy settings. + .SH AUTHOR + This manual page was written by Dan Walsh . +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/named_selinux.8 serefpolicy-2.5.1/man/man8/named_selinux.8 +--- nsaserefpolicy/man/man8/named_selinux.8 2006-11-16 17:15:28.000000000 -0500 ++++ serefpolicy-2.5.1/man/man8/named_selinux.8 2007-01-19 12:10:20.000000000 -0500 +@@ -1,4 +1,12 @@ + .TH "named_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "named Selinux Policy documentation" ++.de EX ++.nf ++.ft CW ++.. ++.de EE ++.ft R ++.fi ++.. + .SH "NAME" + named_selinux \- Security Enhanced Linux Policy for the Internet Name server (named) daemon + .SH "DESCRIPTION" +@@ -8,17 +16,16 @@ + .SH BOOLEANS + SELinux policy is customizable based on least access required. So by + default SElinux policy does not allow named to write master zone files. If you want to have named update the master zone files you need to set the named_write_master_zones boolean. +-.TP +-.br ++.EX + setsebool -P named_write_master_zones 1 +- +-.TP ++.EE ++.PP + You can disable SELinux protection for the named daemon by executing: +-.TP ++.EX + setsebool -P named_disable_trans 1 +-.br + service named restart +-.TP ++.EE ++.PP + system-config-securitylevel is a GUI tool available to customize SELinux policy settings. + .SH AUTHOR + This manual page was written by Dan Walsh . +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-2.5.1/man/man8/rsync_selinux.8 +--- nsaserefpolicy/man/man8/rsync_selinux.8 2006-11-16 17:15:28.000000000 -0500 ++++ serefpolicy-2.5.1/man/man8/rsync_selinux.8 2007-01-19 12:10:20.000000000 -0500 +@@ -1,4 +1,12 @@ + .TH "rsync_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "rsync Selinux Policy documentation" ++.de EX ++.nf ++.ft CW ++.. ++.de EE ++.ft R ++.fi ++.. + .SH "NAME" + rsync_selinux \- Security Enhanced Linux Policy for the rsync daemon + .SH "DESCRIPTION" +@@ -14,24 +22,25 @@ + chcon -t public_content_t /var/rsync + .TP + If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. +-.TP ++.EX + /etc/selinux/POLICYTYPE/contexts/files/file_contexts.local +-.br + /var/rsync(/.*)? system_u:object_r:public_content_t ++.EE + + .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 rsync you would execute: + ++.EX + setsebool -P allow_rsync_anon_write=1 +- ++.EE + + .SH BOOLEANS + .TP + You can disable SELinux protection for the rsync daemon by executing: +-.TP ++.EX + setsebool -P rsync_disable_trans 1 +-.br + service xinetd restart ++.EE + .TP + system-config-securitylevel is a GUI tool available to customize SELinux policy settings. + .SH AUTHOR diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.1/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-16 17:15:00.000000000 -0500 +++ serefpolicy-2.5.1/policy/flask/access_vectors 2007-01-17 13:32:47.000000000 -0500 @@ -42,7 +344,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.1/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/global_tunables 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/global_tunables 2007-01-17 15:35:11.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -58,72 +360,197 @@ ## Allow gssd to read temp directory. ##

        ##         -@@ -572,8 +580,16 @@ - ##

        +@@ -348,12 +356,18 @@ ##         - gen_tunable(xdm_sysadm_login,false) -+ - ') + gen_tunable(use_samba_home_dirs,false) +## +##

        -+## Allow mount to mount any dir ++## Allow users to read system messages. +##

        +##         -+gen_tunable(allow_mounton_anydir,true) ++gen_tunable(user_dmesg,false) + ######################################## # - # Targeted policy specific -@@ -589,6 +605,13 @@ + # Strict policy specific + # +-ifdef(`strict_policy',` ## ##

        -+## Allow all daemons to write corefiles to / + ## Control users use of ping and traceroute +@@ -363,6 +377,45 @@ + + ## + ##

        ++## Allow regular users direct mouse access +##

        +##         -+gen_tunable(allow_daemons_dump_core,false) ++gen_tunable(user_direct_mouse,false) + +## +##

        - ## Allow mount to mount any file - ##

        - ##         -@@ -601,3 +624,35 @@ - ##         - gen_tunable(spamd_enable_home_dirs,true) - ') ++## Allow users to control network interfaces ++## (also needs USERCTL=true) ++##

        ++## ++gen_tunable(user_net_control,false) + +## +##

        -+## Allow unconfined to dyntrans to unconfined_execmem ++## Allow user to r/w files on filesystems ++## that do not have extended attributes (FAT, CDROM, FLOPPY) +##

        +##         -+gen_tunable(allow_unconfined_execmem_dyntrans,false) ++gen_tunable(user_rw_noexattrfile,false) + +## +##

        -+## Use lpd server instead of cups ++## Allow users to run TCP servers (bind to ports and accept connection from ++## the same domain and outside users) disabling this forces FTP passive mode ++## and may change other protocols. +##

        +##         -+gen_tunable(use_lpd_server,false) -+ ++gen_tunable(user_tcp_server,false) + +## +##

        -+## Allow unlabeled packets to work on system ++## Allow w to display everyone +##

        +##         -+gen_tunable(allow_unlabeled_packets,true) ++gen_tunable(user_ttyfile_stat,false) + -+ifdef(`mls_policy',` +## +##

        + ## Allow gpg executable stack + ##

        + ##         +@@ -513,91 +566,90 @@ + + ## + ##

        +-## Allow regular users direct mouse access ++## Allow applications to write untrusted content ++## If this is disallowed, no Internet content ++## will be stored. + ##

        + ##         +-gen_tunable(user_direct_mouse,false) ++gen_tunable(write_untrusted_content,false) + + ## + ##

        +-## Allow users to read system messages. ++## Allow xdm logins as sysadm + ##

        + ##         +-gen_tunable(user_dmesg,false) ++gen_tunable(xdm_sysadm_login,false) + + ## + ##

        +-## Allow users to control network interfaces +-## (also needs USERCTL=true) ++## Allow mount to mount any dir + ##

        + ##         +-gen_tunable(user_net_control,false) ++gen_tunable(allow_mounton_anydir,true) + ++######################################## ++# ++# Targeted policy specific ++# ++ ++ifdef(`targeted_policy',` + ## + ##

        +-## Allow user to r/w files on filesystems +-## that do not have extended attributes (FAT, CDROM, FLOPPY) ++## Allow all daemons the ability to use unallocated ttys + ##

        + ##         +-gen_tunable(user_rw_noexattrfile,false) ++gen_tunable(allow_daemons_use_tty,false) + + ## + ##

        +-## Allow users to run TCP servers (bind to ports and accept connection from +-## the same domain and outside users) disabling this forces FTP passive mode +-## and may change other protocols. ++## Allow all daemons to write corefiles to / + ##

        + ##         +-gen_tunable(user_tcp_server,false) ++gen_tunable(allow_daemons_dump_core,false) + + ## + ##

        +-## Allow w to display everyone ++## Allow mount to mount any file + ##

        + ##         +-gen_tunable(user_ttyfile_stat,false) ++gen_tunable(allow_mount_anyfile,false) + + ## + ##

        +-## Allow applications to write untrusted content +-## If this is disallowed, no Internet content +-## will be stored. ++## Allow spamd to read/write user home directories. + ##

        + ##         +-gen_tunable(write_untrusted_content,false) ++gen_tunable(spamd_enable_home_dirs,true) ++') + + ## + ##

        +-## Allow xdm logins as sysadm ++## Allow unconfined to dyntrans to unconfined_execmem + ##

        + ##         +-gen_tunable(xdm_sysadm_login,false) +-') ++gen_tunable(allow_unconfined_execmem_dyntrans,false) + +-######################################## +-# +-# Targeted policy specific +-# +- +-ifdef(`targeted_policy',` + ## + ##

        +-## Allow all daemons the ability to use unallocated ttys ++## Use lpd server instead of cups + ##

        + ##         +-gen_tunable(allow_daemons_use_tty,false) ++gen_tunable(use_lpd_server,false) ++ + + ## + ##

        +-## Allow mount to mount any file ++## Allow unlabeled packets to work on system + ##

        + ##         +-gen_tunable(allow_mount_anyfile,false) ++gen_tunable(allow_unlabeled_packets,true) + ++ifdef(`mls_policy',` + ## + ##

        +-## Allow spamd to read/write user home directories. +## Allow netlabel packets to work on system -+##

        -+##         + ##

        + ## +-gen_tunable(spamd_enable_home_dirs,true) +gen_tunable(allow_netlabel,true) -+') + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.1/policy/mls --- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 @@ -327,7 +754,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.5.1/policy/modules/admin/prelink.te --- nsaserefpolicy/policy/modules/admin/prelink.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/prelink.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/admin/prelink.te 2007-01-19 09:32:49.000000000 -0500 @@ -18,6 +18,9 @@ type prelink_log_t; logging_log_file(prelink_log_t) @@ -342,7 +769,7 @@ read_lnk_files_pattern(prelink_t,prelink_log_t,prelink_log_t) logging_log_filetrans(prelink_t, prelink_log_t, file) -+allow prelink_t prelink_tmp_t:file { create_file_perms execute }; ++allow prelink_t prelink_tmp_t:file { manage_file_perms execute }; +files_tmp_filetrans(prelink_t, prelink_tmp_t, file) +fs_tmpfs_filetrans(prelink_t, prelink_tmp_t, file) + @@ -1294,7 +1721,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-2.5.1/policy/modules/apps/loadkeys.te --- nsaserefpolicy/policy/modules/apps/loadkeys.te 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/loadkeys.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/loadkeys.te 2007-01-17 15:32:12.000000000 -0500 @@ -18,7 +18,7 @@ domain_type(loadkeys_t) @@ -1317,10 +1744,10 @@ corecmd_exec_bin(loadkeys_t) corecmd_exec_shell(loadkeys_t) -+ corecmd_search_sbin(console_device_t) ++ corecmd_search_sbin(loadkeys_t) - files_dontaudit_read_etc_runtime_files(loadkeys_t) -+ files_dontaudit_read_etc_files(loadkeys_t) ++ files_read_etc_files(loadkeys_t) + files_read_etc_runtime_files(loadkeys_t) libs_use_ld_so(loadkeys_t) @@ -2528,7 +2955,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.1/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-17 16:01:03.000000000 -0500 @@ -350,8 +350,7 @@ ######################################## @@ -2722,7 +3149,7 @@ +# +interface(`files_dontaudit_getattr_tmp_files',` + gen_require(` -+ type tmp_t; ++ type tmpfile; + ') + + dontaudit $1 tmpfile:file getattr; @@ -2990,6 +3417,36 @@ attribute mlstrustedobject; attribute privrangetrans; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.5.1/policy/modules/kernel/storage.fc +--- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-11-16 17:15:04.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/storage.fc 2007-01-19 14:03:06.000000000 -0500 +@@ -42,6 +42,7 @@ + /dev/sjcd -b gen_context(system_u:object_r:removable_device_t,s0) + /dev/sonycd -b gen_context(system_u:object_r:removable_device_t,s0) + /dev/tape.* -c gen_context(system_u:object_r:tape_device_t,s0) ++/dev/twe[^/]* -c gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh) + /dev/ub[a-z] -b gen_context(system_u:object_r:removable_device_t,mls_systemhigh) + /dev/ubd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh) + /dev/xvd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,mls_systemhigh) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.if serefpolicy-2.5.1/policy/modules/kernel/storage.if +--- nsaserefpolicy/policy/modules/kernel/storage.if 2007-01-02 12:57:13.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/storage.if 2007-01-19 14:33:22.000000000 -0500 +@@ -100,6 +100,7 @@ + + dev_list_all_dev_nodes($1) + allow $1 fixed_disk_device_t:blk_file read_blk_file_perms; ++ allow $1 fixed_disk_device_t:chr_file read_chr_file_perms; + typeattribute $1 fixed_disk_raw_read; + ') + +@@ -144,6 +145,7 @@ + + dev_list_all_dev_nodes($1) + allow $1 fixed_disk_device_t:blk_file write_blk_file_perms; ++ allow $1 fixed_disk_device_t:chr_file write_chr_file_perms; + typeattribute $1 fixed_disk_raw_write; + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.1/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-01-02 12:57:13.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/kernel/terminal.if 2007-01-17 13:32:47.000000000 -0500 @@ -4651,7 +5108,7 @@ userdom_manage_generic_user_home_content_symlinks(spamd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.1/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ssh.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ssh.if 2007-01-17 15:51:57.000000000 -0500 @@ -226,6 +226,7 @@ domain_type($1_ssh_agent_t) domain_entry_file($1_ssh_agent_t,ssh_agent_exec_t) @@ -4666,11 +5123,20 @@ allow $1_ssh_t sshd_t:unix_stream_socket connectto; + allow $1_t $1_ssh_t:process signal; + # needs to read krb tgt -+ allow $1_ssh_t $1_tmp_t:file r_file_perms; ++ userdom_read_user_tmp_files($1, $1_ssh_t) userdom_use_unpriv_users_fds($1_ssh_t) userdom_dontaudit_list_user_home_dirs($1,$1_ssh_t) -@@ -713,3 +717,62 @@ +@@ -292,8 +296,6 @@ + ') + + ifdef(`TODO',` +- allow $1_ssh_t $1_tmp_t:dir r_dir_perms; +- + # for /bin/sh used to execute xauth + dontaudit $1_ssh_t proc_t:{ lnk_file file } { getattr read }; + +@@ -713,3 +715,62 @@ dontaudit $1 sshd_key_t:file { getattr read }; ') @@ -4800,7 +5266,7 @@ /tmp/\.X11-unix/.* -s <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.5.1/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/xserver.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/xserver.if 2007-01-19 09:29:25.000000000 -0500 @@ -45,7 +45,7 @@ # execheap needed until the X module loader is fixed. # NVIDIA Needs execstack @@ -4998,7 +5464,7 @@ + ') + + allow $1 xdm_tmp_t:dir search_dir_perms; -+ allow $1 xdm_tmp_t:file create_file_perms; ++ allow $1 xdm_tmp_t:file manage_file_perms; +') + + @@ -5246,7 +5712,7 @@ /sbin/partx -- gen_context(system_u:object_r:fsadm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.5.1/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/fstools.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/fstools.te 2007-01-22 10:38:01.000000000 -0500 @@ -9,7 +9,7 @@ type fsadm_t; type fsadm_exec_t; @@ -5265,6 +5731,15 @@ allow fsadm_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execmem execheap }; allow fsadm_t self:fd use; allow fsadm_t self:fifo_file rw_file_perms; +@@ -53,7 +53,7 @@ + logging_log_filetrans(fsadm_t,fsadm_log_t,file) + + # Enable swapping to files +-allow fsadm_t swapfile_t:file { read write getattr swapon }; ++allow fsadm_t swapfile_t:file { rw_file_perms swapon }; + + kernel_read_system_state(fsadm_t) + kernel_read_kernel_sysctls(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.5.1/policy/modules/system/getty.te --- nsaserefpolicy/policy/modules/system/getty.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/getty.te 2007-01-17 13:32:47.000000000 -0500 @@ -5599,7 +6074,7 @@ +/var/empty/sshd/etc/localtime -- gen_context(system_u:object_r:locale_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.if serefpolicy-2.5.1/policy/modules/system/miscfiles.if --- nsaserefpolicy/policy/modules/system/miscfiles.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/miscfiles.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/miscfiles.if 2007-01-19 09:29:02.000000000 -0500 @@ -138,6 +138,44 @@ ######################################## @@ -5685,9 +6160,9 @@ + type locale_t; + ') + -+ allow $1 locale_t:dir create_dir_perms; -+ allow $1 locale_t:file create_file_perms; -+ allow $1 locale_t:lnk_file create_lnk_perms; ++ manage_dirs_pattern($1,locale_t,locale_t) ++ manage_files_pattern($1,locale_t,locale_t) ++ manage_lnk_files_pattern($1,locale_t,locale_t) +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.5.1/policy/modules/system/modutils.te @@ -6215,8 +6690,19 @@ corenet_unconfined($1) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.1/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.te 2007-01-17 13:32:47.000000000 -0500 -@@ -145,6 +145,8 @@ ++++ serefpolicy-2.5.1/policy/modules/system/unconfined.te 2007-01-22 11:29:35.000000000 -0500 +@@ -63,6 +63,10 @@ + ') + + optional_policy(` ++ bootloader_domtrans(unconfined_t) ++ ') ++ ++ optional_policy(` + init_dbus_chat_script(unconfined_t) + + dbus_stub(unconfined_t) +@@ -145,6 +149,8 @@ optional_policy(` rpm_domtrans(unconfined_t) @@ -6225,7 +6711,7 @@ ') optional_policy(` -@@ -180,6 +182,12 @@ +@@ -180,6 +186,12 @@ optional_policy(` xserver_domtrans_xdm_xserver(unconfined_t) ') @@ -6238,7 +6724,7 @@ ') ######################################## -@@ -188,10 +196,18 @@ +@@ -188,10 +200,18 @@ # ifdef(`targeted_policy',` @@ -6257,9 +6743,24 @@ dbus_stub(unconfined_execmem_t) init_dbus_chat_script(unconfined_execmem_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.5.1/policy/modules/system/userdomain.fc +--- nsaserefpolicy/policy/modules/system/userdomain.fc 2006-11-16 17:15:24.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.fc 2007-01-17 16:02:48.000000000 -0500 +@@ -1,11 +1,4 @@ +-ifdef(`strict_policy',` + HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) + HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) + + /tmp/gconfd-USER -d gen_context(system_u:object_r:ROLE_tmp_t,s0) +-') +- +-ifdef(`targeted_policy',` +-HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) +-HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) +-') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-17 16:02:28.000000000 -0500 @@ -102,6 +102,9 @@ libs_exec_ld_so($1_t) @@ -6832,7 +7333,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-17 15:25:12.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -6843,6 +7344,17 @@ # The privhome attribute identifies every domain that can create files under # regular user home directories in the regular context (IE act on behalf of # a user in writing regular files) +@@ -57,9 +60,9 @@ + # + + ifdef(`strict_policy',` ++ userdom_unpriv_user_template(user) + userdom_admin_user_template(sysadm) + userdom_unpriv_user_template(staff) +- userdom_unpriv_user_template(user) + + # user role change rules: + # sysadm_r can change to user roles @@ -68,6 +71,7 @@ # only staff_r can change to sysadm_r Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- selinux-policy.spec 17 Jan 2007 19:58:32 -0000 1.383 +++ selinux-policy.spec 22 Jan 2007 16:52:18 -0000 1.384 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -200,7 +200,6 @@ # Commented out because only targeted ref policy currently builds %setupCmds targeted targeted-mcs y y %installCmds targeted targeted-mcs y y -make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=y MLS_CATS=1024 MCS_CATS=1024 validatefc %endif %if %{BUILD_STRICT} @@ -357,6 +356,9 @@ %endif %changelog +* Wed Jan 10 2007 Dan Walsh 2.5.1-4 +- Begin adding user confinement to targeted policy + * Wed Jan 10 2007 Dan Walsh 2.5.1-2 - Fixes for prelink, ktalkd, netlabel From fedora-cvs-commits at redhat.com Mon Jan 22 17:07:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:07:28 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.80,1.81 Message-ID: <200701221707.l0MH7S9q004027@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3944 Modified Files: spamassassin.spec Log Message: fix typo in logrotate.d (#223817) Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- spamassassin.spec 19 Jan 2007 20:21:01 -0000 1.80 +++ spamassassin.spec 22 Jan 2007 17:07:26 -0000 1.81 @@ -12,7 +12,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.7 -Release: 4%{?dist} +Release: 5%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -183,6 +183,9 @@ exit 0 %changelog +* Mon Jan 22 2007 Warren Togami 3.1.7-5 +- fix typo in logrotate.d (#223817) + * Thu Jan 18 2007 Warren Togami - Options for RHEL4 * spamc/spamd cannot connect over IPv6 or SSL From fedora-cvs-commits at redhat.com Mon Jan 22 17:09:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:09:34 -0500 Subject: rpms/spamassassin/devel sa-update.logrotate,1.1,1.2 Message-ID: <200701221709.l0MH9YAT005684@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5533 Modified Files: sa-update.logrotate Log Message: fix the typo Index: sa-update.logrotate =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/sa-update.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sa-update.logrotate 14 Dec 2006 20:36:20 -0000 1.1 +++ sa-update.logrotate 22 Jan 2007 17:09:32 -0000 1.2 @@ -1,5 +1,5 @@ /var/log/sa-update.log { monthly - notifyempty + notifempty missingok } From fedora-cvs-commits at redhat.com Mon Jan 22 17:15:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:15:30 -0500 Subject: rpms/pwlib/FC-6 pwlib.spec,1.39,1.40 sources,1.14,1.15 Message-ID: <200701221715.l0MHFUta010197@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/pwlib/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9911 Modified Files: pwlib.spec sources Log Message: update to 1.10.3, Daniel Index: pwlib.spec =================================================================== RCS file: /cvs/dist/rpms/pwlib/FC-6/pwlib.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- pwlib.spec 14 Aug 2006 18:34:48 -0000 1.39 +++ pwlib.spec 22 Jan 2007 17:15:28 -0000 1.40 @@ -1,7 +1,7 @@ Summary: Portable Windows Libary Name: pwlib -Version: 1.10.1 -Release: 6%{?dist} +Version: 1.10.3 +Release: 1%{?dist} URL: http://www.openh323.org/ Source0: http://www.ekiga.org/pwlib-%{version}.tar.gz #We still need this for ppc64 it was not updated in 1.8.4 @@ -97,6 +97,9 @@ %attr(755,root,root) %{_bindir}/* %changelog +* Mon Jan 22 2007 Daniel Veillard - 1.10.3-1.fc6 +- Update to 1.10.3 + * Mon Aug 14 2006 Matthias Clasen - 1.10.1-6.fc6 - Own some directories Index: sources =================================================================== RCS file: /cvs/dist/rpms/pwlib/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 31 May 2006 09:43:05 -0000 1.14 +++ sources 22 Jan 2007 17:15:28 -0000 1.15 @@ -1 +1 @@ -51414920d7b21125df2bf6870c0fc2e4 pwlib-1.10.1.tar.gz +7ccf7a395924b5f4452c580d21f4c2f6 pwlib-1.10.3.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 17:22:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:22:39 -0500 Subject: rpms/traceroute/devel .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 traceroute.spec, 1.29, 1.30 Message-ID: <200701221722.l0MHMd3Y003583@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/traceroute/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3442 Modified Files: .cvsignore sources traceroute.spec Log Message: * Mon Jan 22 2007 Martin Bacovsky - 2.0.3-1.fc7 - Resolves: #222577 - man page with execute bit - Resolves: #223784 - new traceroute breaks scripts - Resolves: #223795 - /bin/tcptraceroute symlink occludes alternate tcptraceroute package Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Nov 2006 14:47:54 -0000 1.8 +++ .cvsignore 22 Jan 2007 17:22:37 -0000 1.9 @@ -1 +1 @@ -traceroute-2.0.2.tar.gz +traceroute-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 21 Nov 2006 14:47:54 -0000 1.9 +++ sources 22 Jan 2007 17:22:37 -0000 1.10 @@ -1 +1 @@ -8fcdedf82086e7dca442e056aa737aea traceroute-2.0.2.tar.gz +3767369a10c17445510a05420f79380b traceroute-2.0.3.tar.gz Index: traceroute.spec =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- traceroute.spec 21 Nov 2006 14:47:54 -0000 1.29 +++ traceroute.spec 22 Jan 2007 17:22:37 -0000 1.30 @@ -1,8 +1,8 @@ Summary: Traces the route taken by packets over an IPv4/IPv6 network Name: traceroute -Epoch: 3 -Version: 2.0.2 -Release: 1%{dist} +Epoch: 1 +Version: 2.0.3 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://dmitry.butskoy.name/traceroute @@ -38,11 +38,11 @@ pushd $RPM_BUILD_ROOT/bin ln -s traceroute traceroute6 ln -s traceroute tracert -ln -s traceroute tcptraceroute popd install -d $RPM_BUILD_ROOT%{_mandir}/man8 -install -p traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -p -m644 traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8 +ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8 %clean @@ -57,6 +57,11 @@ %changelog +* Mon Jan 22 2007 Martin Bacovsky - 2.0.3-1.fc7 +- Resolves: #222577 - man page with execute bit +- Resolves: #223784 - new traceroute breaks scripts +- Resolves: #223795 - /bin/tcptraceroute symlink occludes alternate tcptraceroute package + * Tue Nov 21 2006 Martin Bacovsky - 3:2.0.2-1.fc7 - new source - more accurate check_expired() routine. From fedora-cvs-commits at redhat.com Mon Jan 22 17:29:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:29:41 -0500 Subject: rpms/opal/FC-6 opal.spec,1.11,1.12 sources,1.5,1.6 Message-ID: <200701221729.l0MHTfFD009046@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/opal/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8895 Modified Files: opal.spec sources Log Message: Release of 2.0.4, daniel Index: opal.spec =================================================================== RCS file: /cvs/dist/rpms/opal/FC-6/opal.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- opal.spec 20 Dec 2006 16:51:53 -0000 1.11 +++ opal.spec 22 Jan 2007 17:29:39 -0000 1.12 @@ -1,18 +1,17 @@ Summary: Open Phone Abstraction Library Name: opal -Version: 2.2.2 -Release: 2 +Version: 2.2.4 +Release: 1%{?dist} URL: http://www.openh323.org/ Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz License: MPL Group: System Environment/Libraries -Requires: pwlib >= 1.10.1 -BuildRequires: pwlib-devel >= 1.10.1 +Requires: pwlib >= 1.10.3 +BuildRequires: pwlib-devel >= 1.10.3 BuildRequires: openldap-devel BuildRequires: SDL-devel BuildRoot: %{_tmppath}/%{name}-root Obsoletes: openh323 -Patch0: rfc2833_duration.patch %description Open Phone Abstraction Library, implementation of the ITU H.323 @@ -22,14 +21,13 @@ Summary: Development package for opal Group: Development/Libraries Requires: opal = %{PACKAGE_VERSION} -Requires: pwlib-devel >= 1.10.1 +Requires: pwlib-devel >= 1.10.3 Obsoletes: openh323-devel %description devel Static libraries and header files for development with opal. %prep %setup -q -%patch0 -p1 %build %configure --enable-localspeex @@ -53,14 +51,17 @@ %defattr(-,root,root) %doc mpl-1.0.htm %{_libdir}/*.so.* -%{_libdir}/*.so %files devel %defattr(-,root,root) %{_includedir}/* %{_datadir}/opal +%{_libdir}/*.so %changelog +* Mon Jan 22 2007 Daniel Veillard - 2.2.4-1 +- upstream release of 2.2.4 + * Wed Dec 20 2006 Daniel Veillard - 2.2.2-2 - applied patch from upstream to fix RFC2833 DTMF duration problem - Resolves: rhbz#220333 Index: sources =================================================================== RCS file: /cvs/dist/rpms/opal/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 May 2006 11:52:17 -0000 1.5 +++ sources 22 Jan 2007 17:29:39 -0000 1.6 @@ -1 +1 @@ -899e38f5586e3b03d07cc1c55680a56f opal-2.2.2.tar.gz +4660858fb386f73f7f49d745b64b0665 opal-2.2.4.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 17:30:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:30:00 -0500 Subject: rpms/spamassassin/FC-5 sa-update.logrotate, 1.1, 1.2 spamassassin.spec, 1.69, 1.70 Message-ID: <200701221730.l0MHU08N009339@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv9263 Modified Files: sa-update.logrotate spamassassin.spec Log Message: fix typo in logrotate.d (#223817) Index: sa-update.logrotate =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/sa-update.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sa-update.logrotate 19 Jan 2007 20:26:05 -0000 1.1 +++ sa-update.logrotate 22 Jan 2007 17:29:58 -0000 1.2 @@ -1,5 +1,5 @@ /var/log/sa-update.log { monthly - notifyempty + notifempty missingok } Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/spamassassin.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- spamassassin.spec 19 Jan 2007 20:26:05 -0000 1.69 +++ spamassassin.spec 22 Jan 2007 17:29:58 -0000 1.70 @@ -12,7 +12,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.7 -Release: 4%{?dist} +Release: 5%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -183,6 +183,9 @@ exit 0 %changelog +* Mon Jan 22 2007 Warren Togami 3.1.7-5 +- fix typo in logrotate.d (#223817) + * Thu Jan 18 2007 Warren Togami - Options for RHEL4 * spamc/spamd cannot connect over IPv6 or SSL From fedora-cvs-commits at redhat.com Mon Jan 22 17:31:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:31:19 -0500 Subject: rpms/spamassassin/FC-6 sa-update.logrotate, 1.1, 1.2 spamassassin.spec, 1.76, 1.77 Message-ID: <200701221731.l0MHVJhv010246@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10114 Modified Files: sa-update.logrotate spamassassin.spec Log Message: fix typo in logrotate.d (#223817) Index: sa-update.logrotate =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-6/sa-update.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sa-update.logrotate 19 Jan 2007 20:28:59 -0000 1.1 +++ sa-update.logrotate 22 Jan 2007 17:31:17 -0000 1.2 @@ -1,5 +1,5 @@ /var/log/sa-update.log { monthly - notifyempty + notifempty missingok } Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-6/spamassassin.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- spamassassin.spec 19 Jan 2007 20:28:59 -0000 1.76 +++ spamassassin.spec 22 Jan 2007 17:31:17 -0000 1.77 @@ -12,7 +12,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.7 -Release: 4%{?dist} +Release: 5%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -183,6 +183,9 @@ exit 0 %changelog +* Mon Jan 22 2007 Warren Togami 3.1.7-5 +- fix typo in logrotate.d (#223817) + * Thu Jan 18 2007 Warren Togami - Options for RHEL4 * spamc/spamd cannot connect over IPv6 or SSL From fedora-cvs-commits at redhat.com Mon Jan 22 17:43:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:43:57 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.48,1.49 Message-ID: <200701221743.l0MHhvDj007196@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7182 Modified Files: squirrelmail.spec Log Message: Clean up .orig files (#223648) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- squirrelmail.spec 16 Jan 2007 06:30:33 -0000 1.48 +++ squirrelmail.spec 22 Jan 2007 17:43:54 -0000 1.49 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -63,6 +63,9 @@ %build rm -f plugins/make_archive.pl +# Clean up .orig files +find -name '*.orig' -exec rm -f \{\} \; + # Rearrange the documentation mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/ mv ReleaseNotes doc/ReleaseNotes.txt @@ -256,6 +259,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Mon Jan 22 2007 Warren Togami 1.4.8-4 +- Clean up .orig files (#223648) + * Mon Jan 15 2007 Warren Togami 1.4.8-3 - CVE-2006-6142 From fedora-cvs-commits at redhat.com Mon Jan 22 17:51:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:51:14 -0500 Subject: rpms/gtk2-engines/devel .cvsignore, 1.27, 1.28 gtk2-engines.spec, 1.51, 1.52 sources, 1.28, 1.29 Message-ID: <200701221751.l0MHpE9h027711@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7270 Modified Files: .cvsignore gtk2-engines.spec sources Log Message: 2.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 10 Jan 2007 16:33:46 -0000 1.27 +++ .cvsignore 22 Jan 2007 17:51:08 -0000 1.28 @@ -1 +1 @@ -gtk-engines-2.9.1.tar.bz2 +gtk-engines-2.9.2.tar.bz2 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gtk2-engines.spec 10 Jan 2007 16:33:46 -0000 1.51 +++ gtk2-engines.spec 22 Jan 2007 17:51:08 -0000 1.52 @@ -1,16 +1,17 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.9.1 +Version: 2.9.2 Release: 1%{?dist} License: GPL Group: System Environment/Libraries Source: gtk-engines-%{version}.tar.bz2 -Requires: gtk2 >= 2.9.0 Conflicts: gnome-themes < 2.9.0 -BuildPrereq: gtk2-devel >= 2.2.0 Obsoletes: gnome-theme-clearlooks <= %{clearlooks_version} +Requires: gtk2 >= 2.9.0 +BuildRequires: gtk2-devel >= 2.2.0 + URL: ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,14 +53,14 @@ %defattr(644, root, root, 755) %doc COPYING README ChangeLog -%attr (755, root, root) %{_libdir}/gtk-2.0/*/engines/*.so -%dir %{_libdir}/gtk-2.0 -%dir %{_libdir}/gtk-2.0/* -%dir %{_libdir}/gtk-2.0/*/engines -%{_libdir}/pkgconfig +%attr (755, root, root) %{_libdir}/gtk-2.0/2.10.0/engines/*.so +%{_libdir}/pkgconfig/* %{_datadir}/themes %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.9.2-1 +- Update to 2.9.2 + * Wed Jan 10 2007 Matthias Clasen - 2.9.1-1 - Update to 2.9.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 10 Jan 2007 16:33:46 -0000 1.28 +++ sources 22 Jan 2007 17:51:08 -0000 1.29 @@ -1 +1 @@ -465d9eabb25d9f88adef7c767bbc7dd2 gtk-engines-2.9.1.tar.bz2 +6e58329f0f6460c85657a3b46a8cb0ab gtk-engines-2.9.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 17:57:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 12:57:56 -0500 Subject: rpms/grep/devel grep.spec,1.64,1.65 Message-ID: <200701221757.l0MHvunY027788@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/grep/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27772 Modified Files: grep.spec Log Message: * Mon Jan 22 2007 Tim Waugh 2.5.1-57 - Make preun scriptlet unconditionally succeed (bug #223697). - Resolves: rhbz#223697 Index: grep.spec =================================================================== RCS file: /cvs/dist/rpms/grep/devel/grep.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- grep.spec 22 Nov 2006 19:36:17 -0000 1.64 +++ grep.spec 22 Jan 2007 17:57:53 -0000 1.65 @@ -1,7 +1,7 @@ Summary: The GNU versions of grep pattern matching utilities. Name: grep Version: 2.5.1 -Release: 56%{?dist} +Release: 57%{?dist} License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2 @@ -84,7 +84,7 @@ %preun if [ $1 = 0 ]; then - [ -e %{_infodir}/grep.info.gz ] && /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/grep.info.gz + [ -e %{_infodir}/grep.info.gz ] && /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/grep.info.gz || : fi %files -f %{name}.lang @@ -100,6 +100,9 @@ %{_mandir}/*/* %changelog +* Mon Jan 22 2007 Tim Waugh 2.5.1-57 +- Make preun scriptlet unconditionally succeed (bug #223697). + * Wed Nov 22 2006 Tim Waugh 2.5.1-56 - Fixed count of patterns when the last is an empty string (bug #204255). From fedora-cvs-commits at redhat.com Mon Jan 22 18:00:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:00:32 -0500 Subject: rpms/diffutils/devel diffutils.spec,1.20,1.21 Message-ID: <200701221800.l0MI0WpS027964@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/diffutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27934 Modified Files: diffutils.spec Log Message: * Mon Jan 22 2007 Tim Waugh 2.8.1-16 - Make scriptlet unconditionally succeed (bug #223683). - Resolves: rhbz#223683 Index: diffutils.spec =================================================================== RCS file: /cvs/dist/rpms/diffutils/devel/diffutils.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- diffutils.spec 12 Jul 2006 05:39:12 -0000 1.20 +++ diffutils.spec 22 Jan 2007 18:00:24 -0000 1.21 @@ -1,7 +1,7 @@ Summary: A GNU collection of diff utilities. Name: diffutils Version: 2.8.1 -Release: 15.2.2 +Release: 16%{?dist} Group: Applications/Text URL: http://www.gnu.org/software/diffutils/diffutils.html Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz @@ -64,6 +64,7 @@ if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff." fi +exit 0 %clean rm -rf $RPM_BUILD_ROOT @@ -76,6 +77,9 @@ %{_infodir}/diff.info*gz %changelog +* Mon Jan 22 2007 Tim Waugh 2.8.1-16 +- Make scriptlet unconditionally succeed (bug #223683). + * Wed Jul 12 2006 Jesse Keating - 2.8.1-15.2.2 - rebuild From fedora-cvs-commits at redhat.com Mon Jan 22 18:02:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:02:11 -0500 Subject: rpms/squirrelmail/FC-5 squirrelmail.spec,1.40,1.41 Message-ID: <200701221802.l0MI2BrS028061@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28047 Modified Files: squirrelmail.spec Log Message: Clean up .orig files (#223648) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- squirrelmail.spec 16 Jan 2007 06:33:46 -0000 1.40 +++ squirrelmail.spec 22 Jan 2007 18:02:04 -0000 1.41 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -63,6 +63,9 @@ %build rm -f plugins/make_archive.pl +# Clean up .orig files +find -name '*.orig' -exec rm -f \{\} \; + # Rearrange the documentation mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/ mv ReleaseNotes doc/ReleaseNotes.txt @@ -256,6 +259,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Mon Jan 22 2007 Warren Togami 1.4.8-4 +- Clean up .orig files (#223648) + * Mon Jan 15 2007 Warren Togami 1.4.8-3 - CVE-2006-6142 From fedora-cvs-commits at redhat.com Mon Jan 22 18:03:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:03:06 -0500 Subject: rpms/squirrelmail/FC-6 squirrelmail.spec,1.47,1.48 Message-ID: <200701221803.l0MI360d028173@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28155 Modified Files: squirrelmail.spec Log Message: Clean up .orig files (#223648) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-6/squirrelmail.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- squirrelmail.spec 16 Jan 2007 06:32:12 -0000 1.47 +++ squirrelmail.spec 22 Jan 2007 18:03:04 -0000 1.48 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -63,6 +63,9 @@ %build rm -f plugins/make_archive.pl +# Clean up .orig files +find -name '*.orig' -exec rm -f \{\} \; + # Rearrange the documentation mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/ mv ReleaseNotes doc/ReleaseNotes.txt @@ -256,6 +259,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Mon Jan 22 2007 Warren Togami 1.4.8-4 +- Clean up .orig files (#223648) + * Mon Jan 15 2007 Warren Togami 1.4.8-3 - CVE-2006-6142 From fedora-cvs-commits at redhat.com Mon Jan 22 18:04:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:04:19 -0500 Subject: rpms/coreutils/devel coreutils.spec,1.155,1.156 Message-ID: <200701221804.l0MI4J5D028272@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28248 Modified Files: coreutils.spec Log Message: * Mon Jan 22 2007 Tim Waugh 6.7-3 - Make scriptlet unconditionally succeed (bug #223681). - Resolves: rhbz#223681 Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- coreutils.spec 19 Jan 2007 15:43:20 -0000 1.155 +++ coreutils.spec 22 Jan 2007 18:04:17 -0000 1.156 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -202,7 +202,7 @@ # and install-info'll faill badly because of doubles for file in sh-utils.info textutils.info fileutils.info; do if [ -f /usr/share/info/$file.bz2 ]; then - /sbin/install-info /usr/share/info/$file.bz2 --dir=/usr/share/info/dir --remove &> /dev/null + /sbin/install-info /usr/share/info/$file.bz2 --dir=/usr/share/info/dir --remove &> /dev/null || : fi done @@ -269,6 +269,9 @@ /sbin/runuser %changelog +* Mon Jan 22 2007 Tim Waugh 6.7-3 +- Make scriptlet unconditionally succeed (bug #223681). + * Fri Jan 19 2007 Tim Waugh 6.7-2 - Build does not require libtermcap-devel. From fedora-cvs-commits at redhat.com Mon Jan 22 18:04:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:04:53 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch,1.5,1.6 Message-ID: <200701221804.l0MI4rGD028349@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28333 Modified Files: policy-20070102.patch Log Message: * Wed Jan 10 2007 Dan Walsh 2.5.1-4 - Begin adding user confinement to targeted policy policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++--- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 124 ++++++-- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/evolution.if | 135 ++++++++- policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 +++++++++++++++-- policy/modules/apps/mplayer.if | 79 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/userhelper.if | 19 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 57 +++- policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 180 ++++++++++++ policy/modules/kernel/filesystem.if | 19 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 1 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++--- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 +++ policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 ++- policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 ++++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 65 ++++ policy/modules/services/ssh.te | 6 policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 72 +++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 3 policy/modules/system/init.te | 35 ++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 7 policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 ++++++++ policy/modules/system/selinuxutil.te | 116 ++------ policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 423 ++++++++++++++++++++++++++++-- policy/modules/system/userdomain.te | 44 +-- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 155 files changed, 3379 insertions(+), 523 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- policy-20070102.patch 22 Jan 2007 16:52:18 -0000 1.5 +++ policy-20070102.patch 22 Jan 2007 18:04:51 -0000 1.6 @@ -2955,7 +2955,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.1/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-17 16:01:03.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-22 12:51:02.000000000 -0500 @@ -350,8 +350,7 @@ ######################################## @@ -3149,7 +3149,7 @@ +# +interface(`files_dontaudit_getattr_tmp_files',` + gen_require(` -+ type tmpfile; ++ attribute tmpfile; + ') + + dontaudit $1 tmpfile:file getattr; From fedora-cvs-commits at redhat.com Mon Jan 22 18:15:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:15:18 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.99, 1.100 sources, 1.103, 1.104 Message-ID: <200701221815.l0MIFInL028701@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28686 Modified Files: .cvsignore sources Log Message: * Wed Jan 10 2007 Dan Walsh 2.5.1-4 - Begin adding user confinement to targeted policy Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- .cvsignore 29 Nov 2006 20:11:02 -0000 1.99 +++ .cvsignore 22 Jan 2007 18:15:16 -0000 1.100 @@ -101,3 +101,4 @@ serefpolicy-2.4.4.tgz serefpolicy-2.4.5.tgz serefpolicy-2.4.6.tgz +serefpolicy-2.5.1.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- sources 29 Nov 2006 20:11:02 -0000 1.103 +++ sources 22 Jan 2007 18:15:16 -0000 1.104 @@ -1 +1 @@ -77ca4e1a6e119898e92872050b1e6ec0 serefpolicy-2.4.6.tgz +bc5b8cfa70fc210ac3e10adfeb19658e serefpolicy-2.5.1.tgz From fedora-cvs-commits at redhat.com Mon Jan 22 18:15:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:15:31 -0500 Subject: rpms/eclipse-changelog/devel eclipse-changelog.spec, 1.59, 1.60 sources, 1.21, 1.22 Message-ID: <200701221815.l0MIFVQ9028759@cvs.devel.redhat.com> Author: klee Update of /cvs/dist/rpms/eclipse-changelog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28744 Modified Files: eclipse-changelog.spec sources Log Message: typo in spec and new source Index: eclipse-changelog.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- eclipse-changelog.spec 22 Jan 2007 16:06:24 -0000 1.59 +++ eclipse-changelog.spec 22 Jan 2007 18:15:29 -0000 1.60 @@ -8,7 +8,7 @@ Release: 3%{?dist} Summary: Eclipse ChangeLog plug-in -Group: Development/Toos +Group: Development/Tools License: Eclipse Public License URL: http://sources.redhat.com/eclipse Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 11 Jan 2007 19:46:37 -0000 1.21 +++ sources 22 Jan 2007 18:15:29 -0000 1.22 @@ -1 +1 @@ -669393fc46916c25c805712ea6581fe4 eclipse-changelog-src-2.3.3.zip +112d5f011507ba71889a2b1a7c1f4155 eclipse-changelog-src-2.3.3.zip From fedora-cvs-commits at redhat.com Mon Jan 22 18:17:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:17:31 -0500 Subject: rpms/a2ps/devel a2ps.spec,1.51,1.52 a2ps-4.13b-rm.patch,1.1,NONE Message-ID: <200701221817.l0MIHVlK028830@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/a2ps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28816 Modified Files: a2ps.spec Removed Files: a2ps-4.13b-rm.patch Log Message: * Mon Jan 22 2007 Tim Waugh 4.13b-60 - Don't need rm patch. Index: a2ps.spec =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- a2ps.spec 22 Jan 2007 16:48:44 -0000 1.51 +++ a2ps.spec 22 Jan 2007 18:17:29 -0000 1.52 @@ -21,7 +21,6 @@ Patch13: a2ps-4.13b-numeric.patch Patch14: a2ps-4.13b-encoding.patch Patch15: a2ps-4.13b-tilde.patch -Patch16: a2ps-4.13b-rm.patch Patch17: a2ps-4.13-euckr.patch Patch18: a2ps-4.13-gnusource.patch Patch19: a2ps-4.13-bison.patch @@ -85,9 +84,6 @@ # Fix koi8 tilde (bug #66393). %patch15 -p1 -b .tilde -# Prevent configure from going interactive (bug #70333). -%patch16 -p1 -b .rm - # Add Korean resource file (bug #81421). %patch17 -p1 -b .euckr @@ -252,6 +248,7 @@ %changelog * Mon Jan 22 2007 Tim Waugh 4.13b-60 +- Don't need rm patch. - Make scriptlets unconditionally succeed (bug #223674). * Fri Oct 27 2006 Tim Waugh --- a2ps-4.13b-rm.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 18:28:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:28:23 -0500 Subject: rpms/a2ps/devel a2ps-4.13-hebrew.patch,1.3,1.4 a2ps.spec,1.52,1.53 Message-ID: <200701221828.l0MISNtY016940@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/a2ps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16924 Modified Files: a2ps-4.13-hebrew.patch a2ps.spec Log Message: Patch configure.in too a2ps-4.13-hebrew.patch: configure | 4 +- configure.in | 4 +- encoding/Makefile.in | 4 +- encoding/encoding.map | 3 + encoding/iso8.edf | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 4 deletions(-) Index: a2ps-4.13-hebrew.patch =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps-4.13-hebrew.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- a2ps-4.13-hebrew.patch 14 Jul 2006 14:43:43 -0000 1.3 +++ a2ps-4.13-hebrew.patch 22 Jan 2007 18:28:21 -0000 1.4 @@ -116,3 +116,16 @@ @EXTENSIONS_TRUE at encodings_DATA = @EXTENSIONS_TRUE at encoding.map $(major_encodings) $(minor_encodings) @EXTENSIONS_FALSE at encodings_DATA = @EXTENSIONS_FALSE at encoding.map $(major_encodings) +--- a2ps-4.13/configure.in.hebrew 2007-01-22 18:19:04.000000000 +0000 ++++ a2ps-4.13/configure.in 2007-01-22 18:19:16.000000000 +0000 +@@ -200,7 +200,9 @@ + for ac_dir in /usr/share/fonts/default/Type1 \ + /usr/share/fonts/default/ghostscript \ + /usr/share/fonts/afms/adobe \ +- /usr/share/X11/fonts/Type1 ; ++ /usr/share/X11/fonts/Type1 \ ++ /usr/share/fonts/hebrew \ ++ /usr/share/fonts/he/Type1 ; + do + if test "cd $ac_dir 2>/dev/null && echo *.afm"; then + ac_psfont_path="$ac_psfont_path:$ac_dir"; Index: a2ps.spec =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- a2ps.spec 22 Jan 2007 18:17:29 -0000 1.52 +++ a2ps.spec 22 Jan 2007 18:28:21 -0000 1.53 @@ -95,6 +95,7 @@ # Hebrew support (bug #113191). %patch20 -p1 -b .hebrew +exit 1 # Prevent "error: conflicting types for 'malloc'". %patch21 -p1 -b .malloc From fedora-cvs-commits at redhat.com Mon Jan 22 18:37:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:37:16 -0500 Subject: rpms/libgnome/devel libgnome-2.17.90-default-icontheme.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 libgnome-2.7.2-default-icontheme.patch, 1.3, 1.4 libgnome.spec, 1.77, 1.78 sources, 1.31, 1.32 Message-ID: <200701221837.l0MIbGDL002371@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1325 Modified Files: .cvsignore libgnome-2.7.2-default-icontheme.patch libgnome.spec sources Added Files: libgnome-2.17.90-default-icontheme.patch Log Message: 2.17.90 libgnome-2.17.90-default-icontheme.patch: desktop_gnome_interface.schemas.in.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libgnome-2.17.90-default-icontheme.patch --- --- libgnome-2.7.2/schemas/desktop_gnome_interface.schemas.in.in.default-icontheme 2004-08-11 13:39:30.388822836 +0200 +++ libgnome-2.7.2/schemas/desktop_gnome_interface.schemas.in.in 2004-08-11 13:39:49.028077407 +0200 @@ -130,7 +130,7 @@ /desktop/gnome/interface/icon_theme gnome string - gnome + Echo Icon Theme Icon theme to use for the panel, nautilus etc. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 10 Jan 2007 20:21:06 -0000 1.31 +++ .cvsignore 22 Jan 2007 18:37:09 -0000 1.32 @@ -1 +1 @@ -libgnome-2.17.3.tar.bz2 +libgnome-2.17.90.tar.bz2 libgnome-2.7.2-default-icontheme.patch: desktop_gnome_interface.schemas.in.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: libgnome-2.7.2-default-icontheme.patch =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/libgnome-2.7.2-default-icontheme.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libgnome-2.7.2-default-icontheme.patch 27 Oct 2006 15:18:52 -0000 1.3 +++ libgnome-2.7.2-default-icontheme.patch 22 Jan 2007 18:37:09 -0000 1.4 @@ -1,5 +1,5 @@ ---- libgnome-2.7.2/schemas/desktop_gnome_interface.schemas.in.default-icontheme 2004-08-11 13:39:30.388822836 +0200 -+++ libgnome-2.7.2/schemas/desktop_gnome_interface.schemas.in 2004-08-11 13:39:49.028077407 +0200 +--- libgnome-2.7.2/schemas/desktop_gnome_interface.schemas.in.in.default-icontheme 2004-08-11 13:39:30.388822836 +0200 ++++ libgnome-2.7.2/schemas/desktop_gnome_interface.schemas.in.in 2004-08-11 13:39:49.028077407 +0200 @@ -130,7 +130,7 @@ /desktop/gnome/interface/icon_theme gnome Index: libgnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- libgnome.spec 10 Jan 2007 20:21:06 -0000 1.77 +++ libgnome.spec 22 Jan 2007 18:37:09 -0000 1.78 @@ -12,7 +12,7 @@ Summary: GNOME base library Name: libgnome -Version: 2.17.3 +Version: 2.17.90 Release: 1%{?dist} URL: ftp://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 @@ -54,7 +54,7 @@ Patch1: libgnome-2.16.0-default-background.patch Patch2: libgnome-2.11.1-scoreloc.patch -Patch3: libgnome-2.7.2-default-icontheme.patch +Patch3: libgnome-2.17.90-default-icontheme.patch Patch4: libgnome-2.7.2-default-cursor.patch Patch5: libgnome-2.8.0-default-browser.patch Patch6: libgnome-2.15.1-stat-homedir.patch @@ -73,7 +73,7 @@ %package devel Summary: Libraries and headers for libgnome Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Conflicts: gnome-libs-devel < 1.4.1.2 Requires: zlib-devel @@ -178,6 +178,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Jan 10 2007 Matthias Clasen - 2.17.3-1 - Update to 2.17.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 10 Jan 2007 20:21:06 -0000 1.31 +++ sources 22 Jan 2007 18:37:09 -0000 1.32 @@ -1 +1 @@ -dc72df7b104449e66e94043a81ac3a3e libgnome-2.17.3.tar.bz2 +a47d8de0f5cf90cf4a0202650a2d0e38 libgnome-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 18:37:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:37:46 -0500 Subject: rpms/a2ps/devel a2ps.spec,1.53,1.54 Message-ID: <200701221837.l0MIbkkF002857@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/a2ps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2803 Modified Files: a2ps.spec Log Message: Removed debugging bits. Index: a2ps.spec =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- a2ps.spec 22 Jan 2007 18:28:21 -0000 1.53 +++ a2ps.spec 22 Jan 2007 18:37:44 -0000 1.54 @@ -95,7 +95,6 @@ # Hebrew support (bug #113191). %patch20 -p1 -b .hebrew -exit 1 # Prevent "error: conflicting types for 'malloc'". %patch21 -p1 -b .malloc From fedora-cvs-commits at redhat.com Mon Jan 22 18:47:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 13:47:56 -0500 Subject: rpms/gnome-themes/devel .cvsignore, 1.40, 1.41 gnome-themes.spec, 1.78, 1.79 sources, 1.44, 1.45 Message-ID: <200701221847.l0MIlua3030788@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-themes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30699 Modified Files: .cvsignore gnome-themes.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 10 Jan 2007 17:41:03 -0000 1.40 +++ .cvsignore 22 Jan 2007 18:47:54 -0000 1.41 @@ -1 +1,2 @@ gnome-themes-2.17.5.tar.bz2 +gnome-themes-2.17.90.tar.bz2 Index: gnome-themes.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- gnome-themes.spec 21 Jan 2007 03:59:42 -0000 1.78 +++ gnome-themes.spec 22 Jan 2007 18:47:54 -0000 1.79 @@ -2,8 +2,8 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.17.5 -Release: 3%{?dist} +Version: 2.17.90 +Release: 1%{?dist} URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/ Source: %{name}-%{version}.tar.bz2 Source1: clearlooks-%{clearlooks_version}.tar.bz2 @@ -79,6 +79,9 @@ %doc AUTHORS ChangeLog COPYING NEWS README %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Sat Jan 20 2007 Matthias Clasen - 2.17.5-3 - Re-add the Clearlooks icon theme Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 21 Jan 2007 03:12:49 -0000 1.44 +++ sources 22 Jan 2007 18:47:54 -0000 1.45 @@ -1,2 +1,2 @@ -9043c40810fa12160258a2f383bc6cc6 gnome-themes-2.17.5.tar.bz2 451ef33d1bffa261c5cbe01182199f97 clearlooks-0.6.2.tar.bz2 +e6b166a8d5480b7d159c5b148eb7cb06 gnome-themes-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 19:07:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 14:07:50 -0500 Subject: rpms/antlr/devel .cvsignore, 1.6, 1.7 antlr.spec, 1.28, 1.29 sources, 1.5, 1.6 Message-ID: <200701221907.l0MJ7oqV013465@cvs.devel.redhat.com> Author: dbhole Update of /cvs/dist/rpms/antlr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13309 Modified Files: .cvsignore antlr.spec sources Log Message: - Upgrade to 2.7.7 - Resolve 172456 with patches from Vadim Nasardinov and Radu Greab Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/antlr/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jul 2006 19:43:12 -0000 1.6 +++ .cvsignore 22 Jan 2007 19:07:48 -0000 1.7 @@ -1 +1 @@ -antlr-2.7.6-RHCLEAN.tar.gz +antlr-2.7.7-RHCLEAN.tar.gz Index: antlr.spec =================================================================== RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- antlr.spec 4 Aug 2006 23:56:46 -0000 1.28 +++ antlr.spec 22 Jan 2007 19:07:48 -0000 1.29 @@ -38,8 +38,8 @@ Summary: ANother Tool for Language Recognition Name: antlr -Version: 2.7.6 -Release: 4jpp.2 +Version: 2.7.7 +Release: 1jpp.1 Epoch: 0 License: Public Domain URL: http://www.antlr.org/ @@ -60,6 +60,8 @@ BuildArch: noarch %endif BuildRequires: ant +BuildRequires: mono-core +BuildRequires: mono-winforms BuildRequires: %{__perl}, java-javadoc Requires: jpackage-utils Requires(post): %{_sbindir}/update-alternatives @@ -146,6 +148,12 @@ %else ant -Dj2se.apidoc=%{_javadocdir}/java +cp work/lib/antlr.jar . # make expects to find it here +export CLASSPATH=. +%configure --without-examples +make +find . -type f > /tmp/antlr.filelist +rm antlr.jar # no longer needed %endif @@ -168,6 +176,14 @@ # script cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/antlr-java +# C++ lib and headers, antlr-config +%define headers %{_includedir}/%{name} + +mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}} +install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers} +install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir} +install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir} + # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} @@ -259,8 +275,11 @@ %defattr(0644,root,root,0755) %doc INSTALL.txt LICENSE.txt %{_javadir}/%{name}*.jar +%{headers}/*.hpp +%{_libdir}/libantlr.a %defattr(0755,root,root,0755) %ghost %{_bindir}/antlr +%{_bindir}/antlr-config %{_bindir}/antlr-java %if %{gcj_support} @@ -285,6 +304,10 @@ %changelog +* Fri Jan 19 2007 Deepak Bhole 0:2.7.7-1jpp.1 +- Upgrade to 2.7.7 +- Resolve 172456 with patches from Vadim Nasardinov and Radu Greab + * Thu Aug 03 2006 Deepak Bhole = 0:2.7.6-4jpp.2 - Add missing postun for javadoc. Index: sources =================================================================== RCS file: /cvs/dist/rpms/antlr/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Jul 2006 19:43:12 -0000 1.5 +++ sources 22 Jan 2007 19:07:48 -0000 1.6 @@ -1 +1 @@ -a8d17be897f0d15dc96061f01aee2d12 antlr-2.7.6-RHCLEAN.tar.gz +d8052d9409b5f3e9c8e1c41648ae13d1 antlr-2.7.7-RHCLEAN.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 22 19:23:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 14:23:48 -0500 Subject: rpms/gtk2/devel update-gdk-pixbuf-loaders, NONE, 1.1 update-gtk-immodules, NONE, 1.1 .cvsignore, 1.64, 1.65 gtk2.spec, 1.208, 1.209 sources, 1.70, 1.71 gtk+-2.10.0-search.patch, 1.4, NONE gtk+-2.10.1-fix-tree-crash.patch, 1.1, NONE gtk+-2.10.1-search.patch, 1.2, NONE gtk+-2.10.2-cursor-blink.patch, 1.1, NONE gtk+-2.10.2-im-reset.patch, 1.1, NONE gtk+-2.10.2-poll.patch, 1.1, NONE gtk+-2.10.2-printer-list.patch, 1.1, NONE gtk+-2.10.2-recent.patch, 1.1, NONE gtk+-2.10.2-values-and-names.patch, 1.1, NONE gtk+-2.10.3-auth-dialogs.patch, 1.1, NONE gtk+-2.10.3-desktop.patch, 1.1, NONE gtk+-2.10.3-gedit-color-picker.patch, 1.1, NONE gtk+-2.10.3-parent-walk.patch, 1.1, NONE gtk+-2.10.3-search.patch, 1.2, NONE gtk+-2.10.3-sylpheed-crash.patch, 1.1, NONE gtk+-2.10.4-close-loader.patch, 1.2, NONE gtk+-2.10.4-deadlock.patch, 1.1, NONE gtk+-2.10.4-icon-theme-crash.patch, 1.1, NONE gtk+-2.10.4-message-dialog-a11y.patch, 1.1, NONE gtk+-2.10.4-mnemonic-clipping.patch, 1.1, NONE gtk+-2.10.4-panel-crash.patch, 1.1, NONE gtk+-2.10.4-pat! h-check.patch, 1.1, NONE gtk+-2.10.4-printernames.patch, 1.2, NONE gtk+-2.10.4-search.patch, 1.4, NONE gtk+-2.10.4-strncpy.patch, 1.1, NONE gtk+-2.10.7-search.patch, 1.1, NONE gtk+-2.10.8-recent-menu-crash.patch, 1.1, NONE gtk+-2.7.0-themename.patch, 1.3, NONE gtk+-2.8.0-back-pixmap.patch, 1.1, NONE gtk+-2.8.10-abicheck.patch, 1.1, NONE gtk+-2.8.11-double-free.patch, 1.1, NONE gtk+-2.8.14-a11y-crash.patch, 1.1, NONE gtk+-2.8.4-size-overflow.patch, 1.1, NONE gtk+-2.8.6-inputmethod.patch, 1.2, NONE gtk+-2.8.6-mimecache.patch, 1.1, NONE gtk+-2.9.2.evo-crash.patch, 1.1, NONE render-avoid-repeat.patch, 1.3, NONE Message-ID: <200701221923.l0MJNmrW013747@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13603 Modified Files: .cvsignore gtk2.spec sources Added Files: update-gdk-pixbuf-loaders update-gtk-immodules Removed Files: gtk+-2.10.0-search.patch gtk+-2.10.1-fix-tree-crash.patch gtk+-2.10.1-search.patch gtk+-2.10.2-cursor-blink.patch gtk+-2.10.2-im-reset.patch gtk+-2.10.2-poll.patch gtk+-2.10.2-printer-list.patch gtk+-2.10.2-recent.patch gtk+-2.10.2-values-and-names.patch gtk+-2.10.3-auth-dialogs.patch gtk+-2.10.3-desktop.patch gtk+-2.10.3-gedit-color-picker.patch gtk+-2.10.3-parent-walk.patch gtk+-2.10.3-search.patch gtk+-2.10.3-sylpheed-crash.patch gtk+-2.10.4-close-loader.patch gtk+-2.10.4-deadlock.patch gtk+-2.10.4-icon-theme-crash.patch gtk+-2.10.4-message-dialog-a11y.patch gtk+-2.10.4-mnemonic-clipping.patch gtk+-2.10.4-panel-crash.patch gtk+-2.10.4-path-check.patch gtk+-2.10.4-printernames.patch gtk+-2.10.4-search.patch gtk+-2.10.4-strncpy.patch gtk+-2.10.7-search.patch gtk+-2.10.8-recent-menu-crash.patch gtk+-2.7.0-themename.patch gtk+-2.8.0-back-pixmap.patch gtk+-2.8.10-abicheck.patch gtk+-2.8.11-double-free.patch gtk+-2.8.14-a11y-crash.patch gtk+-2.8.4-size-overflow.patch gtk+-2.8.6-inputmethod.patch gtk+-2.8.6-mimecache.patch gtk+-2.9.2.evo-crash.patch render-avoid-repeat.patch Log Message: clean up patches in cvs --- NEW FILE update-gdk-pixbuf-loaders --- #! /bin/sh if test $# != 1; then echo usage: update-gdk-pixbuf-loaders host_triplet 1>&2 exit 1 fi umask 022 # Deriving /etc/gtk-2.0/$host location # # autoconf changes linux to linux-gnu case "$1" in *linux) host="$1-gnu" ;; *) host=$1 ;; esac # autoconf uses powerpc not ppc host=`echo $host | sed "s/^ppc/powerpc/"` # We have had problems in the past with build systems # changing host from i386 to i686 and appending/dropping # the -gnu suffix, so try to match up the $host we got # with whats actually there. if [ ! -d /etc/gtk-2.0/$host ]; then case "$host" in i?86*) for d in $(ls -d /etc/gtk-2.0/i?86*); do host=$(basename $d) break done ;; esac fi FILE=/etc/gtk-2.0/$host/gdk-pixbuf.loaders case "$host" in alpha*|ia64*|powerpc64*|s390x*|x86_64*) /usr/bin/gdk-pixbuf-query-loaders-64 > $FILE ;; *) /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE ;; esac --- NEW FILE update-gtk-immodules --- #! /bin/sh if test $# != 1; then echo usage: update-gtk-immodules host_triplet 1>&2 exit 1 fi umask 022 # Deriving /etc/gtk-2.0/$host location # # autoconf changes linux to linux-gnu case "$1" in *linux) host="$1-gnu" ;; *) host=$1 ;; esac # autoconf uses powerpc not ppc host=`echo $host | sed "s/^ppc/powerpc/"` # We have had problems in the past with build systems # changing host from i386 to i686 and appending/dropping # the -gnu suffix, so try to match up the $host we got # with whats actually there. if [ ! -d /etc/gtk-2.0/$host ]; then case "$host" in i?86*) for d in $(ls -d /etc/gtk-2.0/i?86*); do host=$(basename $d) break done ;; esac fi FILE=/etc/gtk-2.0/$host/gtk.immodules case "$host" in alpha*|ia64*|powerpc64*|s390x*|x86_64*) /usr/bin/gtk-query-immodules-2.0-64 > $FILE ;; *) /usr/bin/gtk-query-immodules-2.0-32 > $FILE ;; esac Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- .cvsignore 17 Jan 2007 06:06:39 -0000 1.64 +++ .cvsignore 22 Jan 2007 19:23:46 -0000 1.65 @@ -47,3 +47,4 @@ gtk+-2.10.6.tar.bz2 gtk+-2.10.7.tar.bz2 gtk+-2.10.8.tar.bz2 +gtk+-2.10.9.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- gtk2.spec 17 Jan 2007 13:30:17 -0000 1.208 +++ gtk2.spec 22 Jan 2007 19:23:46 -0000 1.209 @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.10.8 +%define base_version 2.10.9 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X @@ -20,7 +20,8 @@ License: LGPL Group: System Environment/Libraries Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 -Source1: update-scripts.tar.gz +Source1: update-gdk-pixbuf-loaders +Source2: update-gtk-immodules # Biarch changes Patch0: gtk+-2.4.1-lib64.patch @@ -36,7 +37,6 @@ # fixed in upstream cvs Patch10: gtk+-2.10.4-im-reset.patch -Patch11: gtk+-2.10.8-recent-menu-crash.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} @@ -115,17 +115,13 @@ %prep %setup -q -n gtk+-%{version} -tar xzf %{SOURCE1} - %patch0 -p1 -b .lib64 %patch1 -p1 -b .set-invisible-char-to-bullet %patch2 -p1 -b .search %patch3 -p1 -b .fam %patch7 -p1 -b .cursor-blink - %patch10 -p1 -b .im-reset -%patch11 -p1 -b .recent-menu-crash for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -230,8 +226,8 @@ # # Install wrappers for the binaries # -cp update-gtk-immodules $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules -cp update-gdk-pixbuf-loaders $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders +cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules +cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders # Remove unpackaged files rm $RPM_BUILD_ROOT%{_libdir}/*.la Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sources 17 Jan 2007 06:06:39 -0000 1.70 +++ sources 22 Jan 2007 19:23:46 -0000 1.71 @@ -1,2 +1 @@ -25e73f5bdf6a1272799d0536a869f645 update-scripts.tar.gz -46bfef60f02c39acdcdba2ac46825db4 gtk+-2.10.8.tar.bz2 +20d763198efb38263b22dee347f69da6 gtk+-2.10.9.tar.bz2 --- gtk+-2.10.0-search.patch DELETED --- --- gtk+-2.10.1-fix-tree-crash.patch DELETED --- --- gtk+-2.10.1-search.patch DELETED --- --- gtk+-2.10.2-cursor-blink.patch DELETED --- --- gtk+-2.10.2-im-reset.patch DELETED --- --- gtk+-2.10.2-poll.patch DELETED --- --- gtk+-2.10.2-printer-list.patch DELETED --- --- gtk+-2.10.2-recent.patch DELETED --- --- gtk+-2.10.2-values-and-names.patch DELETED --- --- gtk+-2.10.3-auth-dialogs.patch DELETED --- --- gtk+-2.10.3-desktop.patch DELETED --- --- gtk+-2.10.3-gedit-color-picker.patch DELETED --- --- gtk+-2.10.3-parent-walk.patch DELETED --- --- gtk+-2.10.3-search.patch DELETED --- --- gtk+-2.10.3-sylpheed-crash.patch DELETED --- --- gtk+-2.10.4-close-loader.patch DELETED --- --- gtk+-2.10.4-deadlock.patch DELETED --- --- gtk+-2.10.4-icon-theme-crash.patch DELETED --- --- gtk+-2.10.4-message-dialog-a11y.patch DELETED --- --- gtk+-2.10.4-mnemonic-clipping.patch DELETED --- --- gtk+-2.10.4-panel-crash.patch DELETED --- --- gtk+-2.10.4-path-check.patch DELETED --- --- gtk+-2.10.4-printernames.patch DELETED --- --- gtk+-2.10.4-search.patch DELETED --- --- gtk+-2.10.4-strncpy.patch DELETED --- --- gtk+-2.10.7-search.patch DELETED --- --- gtk+-2.10.8-recent-menu-crash.patch DELETED --- --- gtk+-2.7.0-themename.patch DELETED --- --- gtk+-2.8.0-back-pixmap.patch DELETED --- --- gtk+-2.8.10-abicheck.patch DELETED --- --- gtk+-2.8.11-double-free.patch DELETED --- --- gtk+-2.8.14-a11y-crash.patch DELETED --- --- gtk+-2.8.4-size-overflow.patch DELETED --- --- gtk+-2.8.6-inputmethod.patch DELETED --- --- gtk+-2.8.6-mimecache.patch DELETED --- --- gtk+-2.9.2.evo-crash.patch DELETED --- --- render-avoid-repeat.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 19:24:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 14:24:39 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.209,1.210 Message-ID: <200701221924.l0MJOdZ7014467@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14334 Modified Files: gtk2.spec Log Message: 2.10.9 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- gtk2.spec 22 Jan 2007 19:23:46 -0000 1.209 +++ gtk2.spec 22 Jan 2007 19:24:32 -0000 1.210 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 2%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 @@ -295,6 +295,9 @@ %doc tmpdocs/examples %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.10.9-1 +- Update to 2.10.9 + * Wed Jan 17 2007 Matthias Clasen - 2.10.8-2 - Fix a crash in the recent-files menu code. From fedora-cvs-commits at redhat.com Mon Jan 22 20:09:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 15:09:25 -0500 Subject: rpms/gcalctool/devel .cvsignore, 1.15, 1.16 gcalctool.spec, 1.32, 1.33 sources, 1.16, 1.17 Message-ID: <200701222009.l0MK9PZU005385@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gcalctool/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5369 Modified Files: .cvsignore gcalctool.spec sources Log Message: 5.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcalctool/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 10 Jan 2007 17:21:29 -0000 1.15 +++ .cvsignore 22 Jan 2007 20:09:23 -0000 1.16 @@ -1 +1 @@ -gcalctool-5.9.10.tar.bz2 +gcalctool-5.9.11.tar.bz2 Index: gcalctool.spec =================================================================== RCS file: /cvs/dist/rpms/gcalctool/devel/gcalctool.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gcalctool.spec 10 Jan 2007 17:21:47 -0000 1.32 +++ gcalctool.spec 22 Jan 2007 20:09:23 -0000 1.33 @@ -1,5 +1,5 @@ Name: gcalctool -Version: 5.9.10 +Version: 5.9.11 Release: 1%{?dist} Summary: A desktop calculator @@ -27,6 +27,8 @@ Requires(preun): GConf2 Requires(pre): GConf2 +Requires: GConf2 + Patch1: gcalctool-flex-crap.patch %description @@ -99,6 +101,9 @@ %changelog +* Mon Jan 22 2007 Matthias Clasen - 5.9.11-1 +- Update to 5.9.11 + * Wed Jan 10 2007 Matthias Clasen - 5.9.10-1 - Update to 5.9.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcalctool/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 10 Jan 2007 17:21:29 -0000 1.16 +++ sources 22 Jan 2007 20:09:23 -0000 1.17 @@ -1 +1 @@ -2dda96be8b31b1f57f2d327da8967c11 gcalctool-5.9.10.tar.bz2 +233572945d37d1752d22b46f5165b809 gcalctool-5.9.11.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 20:24:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 15:24:51 -0500 Subject: rpms/eclipse-changelog/devel .cvsignore, 1.13, 1.14 eclipse-changelog.spec, 1.60, 1.61 sources, 1.22, 1.23 Message-ID: <200701222024.l0MKOp2G026179@cvs.devel.redhat.com> Author: klee Update of /cvs/dist/rpms/eclipse-changelog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26162 Modified Files: .cvsignore eclipse-changelog.spec sources Log Message: +* Mon Jan 22 2007 Kyu Lee 2.3.4-1 +- Bumped to new version 2.3.4-1. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 22 Jan 2007 16:15:41 -0000 1.13 +++ .cvsignore 22 Jan 2007 20:24:49 -0000 1.14 @@ -1 +1 @@ -eclipse-changelog-src-2.3.3.zip +eclipse-changelog-src-2.3.4.zip Index: eclipse-changelog.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- eclipse-changelog.spec 22 Jan 2007 18:15:29 -0000 1.60 +++ eclipse-changelog.spec 22 Jan 2007 20:24:49 -0000 1.61 @@ -4,8 +4,8 @@ %define eclipse_base %{_datadir}/eclipse Name: eclipse-changelog -Version: 2.3.3 -Release: 3%{?dist} +Version: 2.3.4 +Release: 1%{?dist} Summary: Eclipse ChangeLog plug-in Group: Development/Tools @@ -91,6 +91,9 @@ %endif %changelog +* Mon Jan 22 2007 Kyu Lee 2.3.4-1 +- Bumped to new version 2.3.4-1. + * Wed Jan 17 2007 Kyu Lee 2.3.3-3 - For Fedora Extras review, cleaned up this file. Red Hat BZ#222365. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Jan 2007 18:15:29 -0000 1.22 +++ sources 22 Jan 2007 20:24:49 -0000 1.23 @@ -1 +1 @@ -112d5f011507ba71889a2b1a7c1f4155 eclipse-changelog-src-2.3.3.zip +0f32c125ea964d3b5053a10ce1bd359f eclipse-changelog-src-2.3.4.zip From fedora-cvs-commits at redhat.com Mon Jan 22 20:31:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 15:31:11 -0500 Subject: rpms/zenity/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 zenity.spec, 1.23, 1.24 Message-ID: <200701222031.l0MKVBTj007427@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/zenity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7330 Modified Files: .cvsignore sources zenity.spec Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/zenity/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 10 Jan 2007 17:25:19 -0000 1.13 +++ .cvsignore 22 Jan 2007 20:31:09 -0000 1.14 @@ -1 +1 @@ -zenity-2.17.3.tar.bz2 +zenity-2.17.90.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/zenity/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 10 Jan 2007 17:25:19 -0000 1.13 +++ sources 22 Jan 2007 20:31:09 -0000 1.14 @@ -1 +1 @@ -a34f644caad1f504df436ecb86904794 zenity-2.17.3.tar.bz2 +cfcabe1a2542cfa93ac1e7e9fed4f09b zenity-2.17.90.tar.bz2 Index: zenity.spec =================================================================== RCS file: /cvs/dist/rpms/zenity/devel/zenity.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- zenity.spec 10 Jan 2007 17:25:19 -0000 1.23 +++ zenity.spec 22 Jan 2007 20:31:09 -0000 1.24 @@ -1,5 +1,5 @@ Name: zenity -Version: 2.17.3 +Version: 2.17.90 Release: 1%{?dist} Summary: Display dialog boxes from shell scripts Group: Applications/System @@ -67,6 +67,9 @@ %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Jan 10 2007 Matthias Clasen - 2.17.3-1 - Update to 2.17.3 From fedora-cvs-commits at redhat.com Mon Jan 22 20:44:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 15:44:03 -0500 Subject: rpms/file-roller/devel .cvsignore, 1.47, 1.48 file-roller.spec, 1.85, 1.86 sources, 1.48, 1.49 Message-ID: <200701222044.l0MKi3cM016981@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16813 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 10 Jan 2007 17:30:41 -0000 1.47 +++ .cvsignore 22 Jan 2007 20:43:57 -0000 1.48 @@ -1 +1 @@ -file-roller-2.17.5.tar.bz2 +file-roller-2.17.90.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- file-roller.spec 10 Jan 2007 17:30:41 -0000 1.85 +++ file-roller.spec 22 Jan 2007 20:43:57 -0000 1.86 @@ -10,7 +10,7 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} License: GPL @@ -42,6 +42,7 @@ Requires(postun): scrollkeeper Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} +Requires: GConf2 # The context menu API changed in 2.2.0: Conflicts: nautilus < 2.2.0 @@ -136,6 +137,9 @@ %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 10 Jan 2007 17:30:41 -0000 1.48 +++ sources 22 Jan 2007 20:43:57 -0000 1.49 @@ -1 +1 @@ -a252c26c48983a691928fe12352b0a97 file-roller-2.17.5.tar.bz2 +6d78b3ac3cc1fa09babd6296c72415b3 file-roller-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 20:46:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 15:46:34 -0500 Subject: rpms/redhat-artwork/devel redhat-artwork-5.0.8-echo.patch, NONE, 1.1 redhat-artwork.spec, 1.166, 1.167 Message-ID: <200701222046.l0MKkYad019004@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18900 Modified Files: redhat-artwork.spec Added Files: redhat-artwork-5.0.8-echo.patch Log Message: switch to echo for test1 redhat-artwork-5.0.8-echo.patch: gtkrc2-default | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE redhat-artwork-5.0.8-echo.patch --- --- redhat-artwork-5.0.8/gtkrc2-default.echo 2007-01-22 15:52:48.000000000 -0500 +++ redhat-artwork-5.0.8/gtkrc2-default 2007-01-22 15:52:59.000000000 -0500 @@ -1,2 +1,2 @@ gtk-theme-name = "Clearlooks" -gtk-icon-theme-name = "Clearlooks" +gtk-icon-theme-name = "Echo" Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- redhat-artwork.spec 10 Nov 2006 16:24:12 -0000 1.166 +++ redhat-artwork.spec 22 Jan 2007 20:46:32 -0000 1.167 @@ -4,7 +4,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork Version: 5.0.8 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -12,6 +12,10 @@ Source3: icon-coverage-linker.py Source4: coverage-tool-links.xml Patch0: redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch +# change the default icon theme vi patch for now +# since we are not sure yet if Echo will be ready +# in time for FC7 +Patch1: redhat-artwork-5.0.8-echo.patch Group: User Interface/Desktops License: GPL BuildRoot: %{_tmppath}/%{name}-root @@ -58,6 +62,7 @@ %prep %setup -q %patch0 -p1 -b .add-dirs +%patch1 -p1 -b .echo mkdir post-install (cd post-install; tar xzvf %{SOURCE2}) @@ -388,6 +393,9 @@ %config %{_sysconfdir}/gtk-2.0/gtkrc %changelog +* Mon Jan 22 2007 Matthias Clasen 5.0.8-4 +- Switch default icon theme to Echo + * Thu Nov 9 2006 Matthias Clasen 5.0.8-3 - Make sure the trash applet uses the right icon From fedora-cvs-commits at redhat.com Mon Jan 22 20:59:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 15:59:50 -0500 Subject: rpms/gnome-vfs2/devel .cvsignore, 1.43, 1.44 gnome-vfs2.spec, 1.148, 1.149 sources, 1.45, 1.46 Message-ID: <200701222059.l0MKxo56017295@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17206 Modified Files: .cvsignore gnome-vfs2.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 19 Dec 2006 20:16:55 -0000 1.43 +++ .cvsignore 22 Jan 2007 20:59:48 -0000 1.44 @@ -1 +1 @@ -gnome-vfs-2.17.2.tar.bz2 +gnome-vfs-2.17.90.tar.bz2 Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- gnome-vfs2.spec 19 Dec 2006 20:16:55 -0000 1.148 +++ gnome-vfs2.spec 22 Jan 2007 20:59:48 -0000 1.149 @@ -9,10 +9,11 @@ %define dbus_version 0.90 %define dbus_glib_version 0.70 %define hal_version 0.5.7 +%define avahi_version 0.6 Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 -Version: 2.17.2 +Version: 2.17.90 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -22,6 +23,7 @@ Requires: gnome-mime-data >= %{gnome_mime_data_version} Requires: shared-mime-info Requires: gnome-mount >= %{gnome_mount_version} +Requires: GConf2 >= %{gconf2_version} Requires(post): GConf2 >= %{gconf2_version} Requires(pre): GConf2 >= %{gconf2_version} Requires(preun): GConf2 >= %{gconf2_version} @@ -40,7 +42,7 @@ BuildRequires: samba-common >= %{samba_version} BuildRequires: openssl-devel gamin-devel BuildRequires: krb5-devel -BuildRequires: avahi-glib-devel >= 0.6 +BuildRequires: avahi-glib-devel >= %{avahi_version} BuildRequires: hal-devel >= %{hal_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -221,6 +223,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Tue Dec 19 2006 Matthias Clasen - 2.17.2-1 - Update to 2.17.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 19 Dec 2006 20:16:56 -0000 1.45 +++ sources 22 Jan 2007 20:59:48 -0000 1.46 @@ -1 +1 @@ -6a78990353beb952ab9b01cd7f27d8d7 gnome-vfs-2.17.2.tar.bz2 +e009f76123488205ed789346c990a438 gnome-vfs-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 21:02:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 16:02:32 -0500 Subject: rpms/eog/devel .cvsignore, 1.41, 1.42 eog.spec, 1.72, 1.73 sources, 1.41, 1.42 Message-ID: <200701222102.l0ML2WAW019218@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19134 Modified Files: .cvsignore eog.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 10 Jan 2007 17:46:36 -0000 1.41 +++ .cvsignore 22 Jan 2007 21:02:30 -0000 1.42 @@ -1 +1 @@ -eog-2.17.4.tar.bz2 +eog-2.17.90.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- eog.spec 10 Jan 2007 19:06:41 -0000 1.72 +++ eog.spec 22 Jan 2007 21:02:30 -0000 1.73 @@ -14,7 +14,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.17.4 +Version: 2.17.90 Release: 1%{?dist} URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 @@ -124,6 +124,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Jan 10 2007 Matthias Clasen - 2.17.4-1 - Update to 2.17.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 10 Jan 2007 17:46:36 -0000 1.41 +++ sources 22 Jan 2007 21:02:30 -0000 1.42 @@ -1 +1 @@ -11d83fdec9b40f914d34323abe022ea2 eog-2.17.4.tar.bz2 +192bb86883fd068ebd50dec7458c4cdc eog-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 21:06:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 16:06:44 -0500 Subject: rpms/eel2/devel .cvsignore, 1.42, 1.43 eel2.spec, 1.62, 1.63 sources, 1.42, 1.43 Message-ID: <200701222106.l0ML6iPh022485@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eel2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22255 Modified Files: .cvsignore eel2.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 19 Dec 2006 05:59:24 -0000 1.42 +++ .cvsignore 22 Jan 2007 21:06:42 -0000 1.43 @@ -1 +1 @@ -eel-2.17.1.tar.bz2 +eel-2.17.90.tar.bz2 Index: eel2.spec =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- eel2.spec 19 Dec 2006 05:59:24 -0000 1.62 +++ eel2.spec 22 Jan 2007 21:06:42 -0000 1.63 @@ -15,7 +15,7 @@ Name: eel2 Summary: Eazel Extensions Library -Version: 2.17.1 +Version: 2.17.90 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -110,6 +110,9 @@ %{_includedir}/eel-2 %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Tue Dec 19 2006 Matthias Clasen - 2.17.1-1 - Update to 2.17.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 19 Dec 2006 05:59:24 -0000 1.42 +++ sources 22 Jan 2007 21:06:42 -0000 1.43 @@ -1 +1 @@ -2af09a510e32f6b14bac66eec57be9d4 eel-2.17.1.tar.bz2 +5887ec4d65d2890b0f0d4117f1fdb18f eel-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 21:11:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 16:11:47 -0500 Subject: rpms/ORBit2/devel .cvsignore, 1.20, 1.21 ORBit2.spec, 1.49, 1.50 sources, 1.20, 1.21 Message-ID: <200701222111.l0MLBldO026463@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ORBit2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26405 Modified Files: .cvsignore ORBit2.spec sources Log Message: 2.14.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 19 Dec 2006 05:48:29 -0000 1.20 +++ .cvsignore 22 Jan 2007 21:11:45 -0000 1.21 @@ -1 +1 @@ -ORBit2-2.14.4.tar.bz2 +ORBit2-2.14.5.tar.bz2 Index: ORBit2.spec =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ORBit2.spec 19 Dec 2006 05:53:45 -0000 1.49 +++ ORBit2.spec 22 Jan 2007 21:11:45 -0000 1.50 @@ -3,7 +3,7 @@ Summary: A high-performance CORBA Object Request Broker Name: ORBit2 -Version: 2.14.4 +Version: 2.14.5 Release: 1%{?dist} Source: %{name}-%{version}.tar.bz2 Group: System Environment/Daemons @@ -129,6 +129,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.14.5-1 +- Update to 2.14.5 + * Tue Dec 19 2006 Matthias Clasen - 2.14.4-1 - Update to 2.14.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 19 Dec 2006 05:48:29 -0000 1.20 +++ sources 22 Jan 2007 21:11:45 -0000 1.21 @@ -1 +1 @@ -8379d4dab8cab57c51372ff4facbe5d6 ORBit2-2.14.4.tar.bz2 +5b3ca3d7ed13a76c9e7bb4a890fe68af ORBit2-2.14.5.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 21:13:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 16:13:18 -0500 Subject: rpms/parted/devel parted-1.8.2-vista.patch, 1.1, 1.2 parted.spec, 1.94, 1.95 Message-ID: <200701222113.l0MLDIq2027596@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/parted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27552 Modified Files: parted-1.8.2-vista.patch parted.spec Log Message: * Mon Jan 22 2007 David Cantrell - 1.8.2-3 - Remove BR for libtermcap-devel - Specifically preserve starting alignment of 0x800 on Windows Vista (see http://support.microsoft.com/kb/923332 for details) - Fix incorrect sector parameter used to initialize a new PedAlignment parted-1.8.2-vista.patch: dos.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) Index: parted-1.8.2-vista.patch =================================================================== RCS file: /cvs/dist/rpms/parted/devel/parted-1.8.2-vista.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- parted-1.8.2-vista.patch 19 Jan 2007 16:47:02 -0000 1.1 +++ parted-1.8.2-vista.patch 22 Jan 2007 21:13:16 -0000 1.2 @@ -1,14 +1,13 @@ --- parted-1.8.2/libparted/labels/dos.c.vista 2006-12-15 17:20:53.000000000 -0500 -+++ parted-1.8.2/libparted/labels/dos.c 2007-01-18 08:58:43.000000000 -0500 -@@ -1535,9 +1535,15 @@ ++++ parted-1.8.2/libparted/labels/dos.c 2007-01-22 11:12:49.000000000 -0500 +@@ -1535,9 +1535,14 @@ /* This constraint is for partitions starting on the first cylinder. They * must start on the 2nd head of the 1st cylinder. + * -+ * NOTE: We don't always start on the 2nd head of the 1st cylinder. If the -+ * partition's starting sector is not equal to the starting sector of the -+ * second head, we preserve it's location in this alignment. This is needed -+ * for operating systems such as Windows Vista (NTFS v3.1). ++ * NOTE: We don't always start on the 2nd head of the 1st cylinder. Windows ++ * Vista aligns starting partitions at sector 2048 (0x800) by default. See: ++ * http://support.microsoft.com/kb/923332 */ static PedConstraint* -_primary_start_constraint (PedDisk* disk, const PedCHSGeometry* bios_geom, @@ -17,18 +16,23 @@ PedGeometry* min_geom) { PedDevice* dev = disk->dev; -@@ -1546,21 +1552,26 @@ +@@ -1546,21 +1551,30 @@ PedAlignment end_align; PedGeometry start_geom; PedGeometry end_geom; + PedSector start_pos; -+ -+ if (part->geom.start == bios_geom->sectors) -+ start_pos = bios_geom->sectors; -+ else -+ start_pos = part->geom.start; - if (!ped_alignment_init (&start_align, bios_geom->sectors, 0)) +- if (!ped_alignment_init (&start_align, bios_geom->sectors, 0)) ++ if (part->geom.start == 2048) ++ /* check for known Windows Vista (NTFS >= 3.1) alignments */ ++ /* sector 0x800 == 2048 */ ++ start_pos = 2048; ++ else ++ /* all other primary partitions on a DOS label align to */ ++ /* the 2nd head of the first cylinder (0x3F == 63) */ ++ start_pos = bios_geom->sectors; ++ ++ if (!ped_alignment_init (&start_align, start_pos, 0)) return NULL; if (!ped_alignment_init (&end_align, -1, cylinder_size)) return NULL; @@ -48,7 +52,7 @@ return NULL; if (!ped_geometry_init (&end_geom, dev, 0, dev->length)) return NULL; -@@ -1669,12 +1680,14 @@ +@@ -1669,12 +1683,14 @@ solution = _best_solution (part, bios_geom, solution, _try_constraint (part, constraint, Index: parted.spec =================================================================== RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- parted.spec 19 Jan 2007 16:47:02 -0000 1.94 +++ parted.spec 22 Jan 2007 21:13:16 -0000 1.95 @@ -4,7 +4,7 @@ Summary: The GNU disk partition manipulation program. Name: parted Version: 1.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 Patch0: parted-1.8.2-vista.patch @@ -12,7 +12,7 @@ Buildroot: %{_tmppath}/%{name}-root License: GPL Group: Applications/System -BuildRequires: e2fsprogs-devel libtermcap-devel readline-devel ncurses-devel +BuildRequires: e2fsprogs-devel readline-devel ncurses-devel BuildRequires: automake libtool gettext-devel texinfo BuildRequires: device-mapper >= 1.02.02, libselinux-devel libsepol-devel @@ -92,6 +92,12 @@ %{_libdir}/*.so %changelog +* Mon Jan 22 2007 David Cantrell - 1.8.2-3 +- Remove BR for libtermcap-devel +- Specifically preserve starting alignment of 0x800 on Windows Vista + (see http://support.microsoft.com/kb/923332 for details) +- Fix incorrect sector parameter used to initialize a new PedAlignment + * Thu Jan 18 2007 David Cantrell - 1.8.2-2 - Preserve starting sector for primary NTFS 3.1 partitions (Windows Vista) when modifying the DOS disk label. NTFS 3.1 partitions do From fedora-cvs-commits at redhat.com Mon Jan 22 21:15:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 16:15:03 -0500 Subject: rpms/atk/devel .cvsignore, 1.26, 1.27 atk.spec, 1.43, 1.44 sources, 1.26, 1.27 Message-ID: <200701222115.l0MLF3tW028977@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/atk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28881 Modified Files: .cvsignore atk.spec sources Log Message: 1.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 10 Jan 2007 16:50:23 -0000 1.26 +++ .cvsignore 22 Jan 2007 21:15:01 -0000 1.27 @@ -1 +1 @@ -atk-1.13.1.tar.bz2 +atk-1.13.2.tar.bz2 Index: atk.spec =================================================================== RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- atk.spec 10 Jan 2007 16:50:23 -0000 1.43 +++ atk.spec 22 Jan 2007 21:15:01 -0000 1.44 @@ -2,14 +2,14 @@ Summary: Interfaces for accessibility support Name: atk -Version: 1.13.1 +Version: 1.13.2 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: atk-%{version}.tar.bz2 URL: http://developer.gnome.org/projects/gap/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildPreReq: glib2-devel >= %{glib2_version} +BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gettext BuildRequires: perl-XML-Parser @@ -70,6 +70,9 @@ %{_datadir}/gtk-doc/html/atk %changelog +* Wed Jan 22 2007 Matthias Clasen - 1.13.2-1 +- Update to 1.13.2 + * Wed Jan 10 2007 Matthias Clasen - 1.13.1-1 - Update to 1.13.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/atk/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 10 Jan 2007 16:50:23 -0000 1.26 +++ sources 22 Jan 2007 21:15:01 -0000 1.27 @@ -1 +1 @@ -c0688df49c88b8d1d83f2a21646f0520 atk-1.13.1.tar.bz2 +22bfc2e7392491a6913d7ef87658beab atk-1.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 21:16:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 16:16:57 -0500 Subject: rpms/gail/devel .cvsignore, 1.25, 1.26 gail.spec, 1.52, 1.53 sources, 1.25, 1.26 Message-ID: <200701222116.l0MLGvZh030487@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30416 Modified Files: .cvsignore gail.spec sources Log Message: 1.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 10 Jan 2007 17:09:29 -0000 1.25 +++ .cvsignore 22 Jan 2007 21:16:55 -0000 1.26 @@ -1 +1 @@ -gail-1.10.0.tar.bz2 +gail-1.10.1.tar.bz2 Index: gail.spec =================================================================== RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gail.spec 10 Jan 2007 17:09:29 -0000 1.52 +++ gail.spec 22 Jan 2007 21:16:55 -0000 1.53 @@ -4,7 +4,7 @@ Summary: Accessibility implementation for GTK+ and GNOME libraries Name: gail -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} URL: http://developer.gnome.org/projects/gap Source0: %{name}-%{version}.tar.bz2 @@ -79,6 +79,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 22 2007 Matthias Clasen - 1.10.1-1 +- Update to 1.10.1 + * Tue Dec 19 2006 Matthias Clasen - 1.9.4-1 - Update to 1.9.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gail/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 10 Jan 2007 17:09:29 -0000 1.25 +++ sources 22 Jan 2007 21:16:55 -0000 1.26 @@ -1 +1 @@ -603cd6319c3c04fcad0d176aab354673 gail-1.10.0.tar.bz2 +73834c06fd85c8e3a319343009787431 gail-1.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 22:15:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 17:15:41 -0500 Subject: rpms/libthai/devel libthai-0.1.7-libdatrie-0.1.1-build-static.patch, 1.2, 1.3 libthai.spec, 1.2, 1.3 Message-ID: <200701222215.l0MMFf4N015334@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/libthai/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15319 Modified Files: libthai-0.1.7-libdatrie-0.1.1-build-static.patch libthai.spec Log Message: * Tue Jan 22 2007 Behdad Esfahbod 0.1.7-5 - Export _th_*_tbl symbols too. They are accessed by some of the macros. libthai-0.1.7-libdatrie-0.1.1-build-static.patch: libdatrie-0.1.1/datrie/Makefile.am | 2 +- libthai.pc.in | 1 - src/Makefile.am | 6 ++++-- src/thbrk/Makefile.am | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) Index: libthai-0.1.7-libdatrie-0.1.1-build-static.patch =================================================================== RCS file: /cvs/dist/rpms/libthai/devel/libthai-0.1.7-libdatrie-0.1.1-build-static.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libthai-0.1.7-libdatrie-0.1.1-build-static.patch 18 Jan 2007 06:39:36 -0000 1.2 +++ libthai-0.1.7-libdatrie-0.1.1-build-static.patch 22 Jan 2007 22:15:39 -0000 1.3 @@ -10,7 +10,7 @@ libthai_la_LDFLAGS = $(no_undefined) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -+ -export-symbols-regex '^th_.*' ++ -export-symbols-regex '^th_.*|^_th_.*_tbl$$' --- libthai-0.1.7/src/thbrk/Makefile.am.static-build 2006-10-14 02:38:56.000000000 -0400 +++ libthai-0.1.7/src/thbrk/Makefile.am 2007-01-18 00:22:06.000000000 -0500 Index: libthai.spec =================================================================== RCS file: /cvs/dist/rpms/libthai/devel/libthai.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libthai.spec 18 Jan 2007 06:39:36 -0000 1.2 +++ libthai.spec 22 Jan 2007 22:15:39 -0000 1.3 @@ -4,7 +4,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.7 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz @@ -108,6 +108,9 @@ %{_mandir}/man3/* %changelog +* Tue Jan 22 2007 Behdad Esfahbod 0.1.7-5 +- Export _th_*_tbl symbols too. They are accessed by some of the macros. + * Tue Jan 17 2007 Behdad Esfahbod 0.1.7-4 - Patch libthai.pc.in to not require datrie. From fedora-cvs-commits at redhat.com Mon Jan 22 22:57:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 17:57:39 -0500 Subject: rpms/python-virtinst/devel .cvsignore, 1.5, 1.6 python-virtinst.spec, 1.8, 1.9 sources, 1.5, 1.6 virtinst-incremental-sleep.patch, 1.1, NONE virtinst-invalid-mem-crash.patch, 1.1, NONE Message-ID: <200701222257.l0MMvdDj021865@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/python-virtinst/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21815 Modified Files: .cvsignore python-virtinst.spec sources Removed Files: virtinst-incremental-sleep.patch virtinst-invalid-mem-crash.patch Log Message: Updated to 0.100.0 release Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Nov 2006 16:02:04 -0000 1.5 +++ .cvsignore 22 Jan 2007 22:57:36 -0000 1.6 @@ -1 +1 @@ -virtinst-0.98.0.tar.gz +virtinst-0.100.0.tar.gz Index: python-virtinst.spec =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-virtinst.spec 19 Dec 2006 20:24:06 -0000 1.8 +++ python-virtinst.spec 22 Jan 2007 22:57:36 -0000 1.9 @@ -2,11 +2,9 @@ Summary: Python modules for starting Xen guest installations Name: python-virtinst -Version: 0.98.0 -Release: 3%{?dist} +Version: 0.100.0 +Release: 1%{?dist} Source0: virtinst-%{version}.tar.gz -Patch1: virtinst-invalid-mem-crash.patch -Patch2: virtinst-incremental-sleep.patch License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,7 +12,7 @@ ExcludeArch: ppc ppc64 s390 s390x Url: http://hg.et.redhat.com/virt/applications/virtinst--devel Provides: virtinst -Requires: libvirt-python >= 0.1.4-4 +Requires: libvirt-python >= 0.1.11 Requires: urlgrabber BuildRequires: python-devel Obsoletes: python-xeninst < 0.97.0 @@ -31,8 +29,6 @@ %prep %setup -q -n virtinst-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -54,6 +50,10 @@ %{_sbindir}/virt-install %changelog +* Mon Jan 22 2007 Daniel P. Berrange - 0.100.0-1.fc7 +- Updated to 0.100.0 which now uses libvirt inactive domain support + needed to operate correctly against xen 3.0.4 + * Tue Dec 18 2006 Daniel P. Berrange - 0.98.0-3.fc7 - don't traceback on invalid memory param (gcosta, #219270) - let the console come back quicker to help with HVM installs (#212024) Index: sources =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Nov 2006 16:02:04 -0000 1.5 +++ sources 22 Jan 2007 22:57:36 -0000 1.6 @@ -1 +1 @@ -8ba8268787e6a3af08408355e9741144 virtinst-0.98.0.tar.gz +a6a1b7c79d715fa7cadcee6044dfbd09 virtinst-0.100.0.tar.gz --- virtinst-incremental-sleep.patch DELETED --- --- virtinst-invalid-mem-crash.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 23:00:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:00:04 -0500 Subject: rpms/fetchmail/devel fetchmail-6.3.6-kpop.patch, NONE, 1.1 fetchmail.spec, 1.49, 1.50 Message-ID: <200701222300.l0MN04wP023497@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/fetchmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23300 Modified Files: fetchmail.spec Added Files: fetchmail-6.3.6-kpop.patch Log Message: * Mon Jan 22 2007 Miloslav Trmac - 6.3.6-2 - Let KPOP use PASS again Resolves: #223661 fetchmail-6.3.6-kpop.patch: pop3.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE fetchmail-6.3.6-kpop.patch --- --- fetchmail-6.3.6/pop3.c.kpop 2007-01-22 23:42:14.000000000 +0100 +++ fetchmail-6.3.6/pop3.c 2007-01-22 23:44:28.000000000 +0100 @@ -612,7 +612,11 @@ /* check if we are actually allowed to send the password */ if (ctl->server.authenticate == A_ANY - || ctl->server.authenticate == A_PASSWORD) { + || ctl->server.authenticate == A_PASSWORD + || ((ctl->server.authenticate == A_KERBEROS_V4 + || ctl->server.authenticate == A_KERBEROS_V5) + && ctl->server.service + && strcmp(ctl->server.service, KPOP_PORT) == 0)) { strlcpy(shroud, ctl->password, sizeof(shroud)); ok = gen_transact(sock, "PASS %s", ctl->password); } else { Index: fetchmail.spec =================================================================== RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- fetchmail.spec 10 Jan 2007 06:04:02 -0000 1.49 +++ fetchmail.spec 22 Jan 2007 23:00:01 -0000 1.50 @@ -4,11 +4,12 @@ Summary: A remote mail retrieval and forwarding utility Name: fetchmail Version: 6.3.6 -Release: 1%{?dist} +Release: 2%{?dist} 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.6-kpop.patch URL: http://fetchmail.berlios.de/ License: GPL Group: Applications/Internet @@ -46,6 +47,7 @@ %prep %setup -q %patch0 -p1 -b .addrconf +%patch1 -p1 -b .kpop %build %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \ @@ -83,6 +85,10 @@ %endif %changelog +* Mon Jan 22 2007 Miloslav Trmac - 6.3.6-2 +- Let KPOP use PASS again + Resolves: #223661 + * Sat Jan 6 2007 Miloslav Trmac - 6.3.6-1 - Update to fetchmail-6.3.6 (CVE-2006-5867, CVE-2006-5974) From fedora-cvs-commits at redhat.com Mon Jan 22 23:07:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:07:50 -0500 Subject: rpms/fetchmail/FC-6 fetchmail-6.3.6-kpop.patch, NONE, 1.1 fetchmail.spec, 1.48, 1.49 Message-ID: <200701222307.l0MN7oRT028032@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/fetchmail/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27959 Modified Files: fetchmail.spec Added Files: fetchmail-6.3.6-kpop.patch Log Message: * Mon Jan 22 2007 Miloslav Trmac - 6.3.6-2 - Let KPOP use PASS again Resolves: #223661 fetchmail-6.3.6-kpop.patch: pop3.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE fetchmail-6.3.6-kpop.patch --- --- fetchmail-6.3.6/pop3.c.kpop 2007-01-22 23:42:14.000000000 +0100 +++ fetchmail-6.3.6/pop3.c 2007-01-22 23:44:28.000000000 +0100 @@ -612,7 +612,11 @@ /* check if we are actually allowed to send the password */ if (ctl->server.authenticate == A_ANY - || ctl->server.authenticate == A_PASSWORD) { + || ctl->server.authenticate == A_PASSWORD + || ((ctl->server.authenticate == A_KERBEROS_V4 + || ctl->server.authenticate == A_KERBEROS_V5) + && ctl->server.service + && strcmp(ctl->server.service, KPOP_PORT) == 0)) { strlcpy(shroud, ctl->password, sizeof(shroud)); ok = gen_transact(sock, "PASS %s", ctl->password); } else { Index: fetchmail.spec =================================================================== RCS file: /cvs/dist/rpms/fetchmail/FC-6/fetchmail.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- fetchmail.spec 10 Jan 2007 06:14:44 -0000 1.48 +++ fetchmail.spec 22 Jan 2007 23:07:47 -0000 1.49 @@ -4,11 +4,12 @@ Summary: A remote mail retrieval and forwarding utility Name: fetchmail Version: 6.3.6 -Release: 1%{?dist} +Release: 2%{?dist} 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.6-kpop.patch URL: http://fetchmail.berlios.de/ License: GPL Group: Applications/Internet @@ -46,6 +47,7 @@ %prep %setup -q %patch0 -p1 -b .addrconf +%patch1 -p1 -b .kpop %build %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \ @@ -83,6 +85,10 @@ %endif %changelog +* Mon Jan 22 2007 Miloslav Trmac - 6.3.6-2 +- Let KPOP use PASS again + Resolves: #223661 + * Sat Jan 6 2007 Miloslav Trmac - 6.3.6-1 - Update to fetchmail-6.3.6 (CVE-2006-5867, CVE-2006-5974) From fedora-cvs-commits at redhat.com Mon Jan 22 23:08:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:08:54 -0500 Subject: rpms/fetchmail/FC-5 fetchmail-6.3.6-kpop.patch, NONE, 1.1 fetchmail.spec, 1.42, 1.43 Message-ID: <200701222308.l0MN8s5D028570@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/fetchmail/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28514 Modified Files: fetchmail.spec Added Files: fetchmail-6.3.6-kpop.patch Log Message: * Mon Jan 22 2007 Miloslav Trmac - 6.3.6-2 - Let KPOP use PASS again Resolves: #223661 fetchmail-6.3.6-kpop.patch: pop3.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE fetchmail-6.3.6-kpop.patch --- --- fetchmail-6.3.6/pop3.c.kpop 2007-01-22 23:42:14.000000000 +0100 +++ fetchmail-6.3.6/pop3.c 2007-01-22 23:44:28.000000000 +0100 @@ -612,7 +612,11 @@ /* check if we are actually allowed to send the password */ if (ctl->server.authenticate == A_ANY - || ctl->server.authenticate == A_PASSWORD) { + || ctl->server.authenticate == A_PASSWORD + || ((ctl->server.authenticate == A_KERBEROS_V4 + || ctl->server.authenticate == A_KERBEROS_V5) + && ctl->server.service + && strcmp(ctl->server.service, KPOP_PORT) == 0)) { strlcpy(shroud, ctl->password, sizeof(shroud)); ok = gen_transact(sock, "PASS %s", ctl->password); } else { Index: fetchmail.spec =================================================================== RCS file: /cvs/dist/rpms/fetchmail/FC-5/fetchmail.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- fetchmail.spec 10 Jan 2007 06:11:39 -0000 1.42 +++ fetchmail.spec 22 Jan 2007 23:08:47 -0000 1.43 @@ -4,11 +4,12 @@ Summary: A remote mail retrieval and forwarding utility Name: fetchmail Version: 6.3.6 -Release: 1%{?dist} +Release: 2%{?dist} 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.6-kpop.patch URL: http://fetchmail.berlios.de/ License: GPL Group: Applications/Internet @@ -46,6 +47,7 @@ %prep %setup -q %patch0 -p1 -b .addrconf +%patch1 -p1 -b .kpop %build %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \ @@ -83,6 +85,10 @@ %endif %changelog +* Mon Jan 22 2007 Miloslav Trmac - 6.3.6-2 +- Let KPOP use PASS again + Resolves: #223661 + * Sat Jan 6 2007 Miloslav Trmac - 6.3.6-1 - Update to fetchmail-6.3.6 (CVE-2006-5867, CVE-2006-5974) From fedora-cvs-commits at redhat.com Mon Jan 22 23:08:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:08:41 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec, 1.2897, 1.2898 linux-2.6-xen.patch, 1.83, 1.84 Message-ID: <200701222308.l0MN8fMu028534@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28099 Modified Files: kernel-2.6.spec linux-2.6-xen.patch Log Message: - update xen kernel patch * pvfb is now included in it. * changeset: 43493:67d20a7ca5f9 * update to kernel 2.6.19.2. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2897 retrieving revision 1.2898 diff -u -r1.2897 -r1.2898 --- kernel-2.6.spec 15 Jan 2007 17:58:03 -0000 1.2897 +++ kernel-2.6.spec 22 Jan 2007 23:08:26 -0000 1.2898 @@ -370,9 +370,6 @@ Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch -Patch990: linux-2.6-xen-console.patch -Patch991: linux-2.6-xen-pvfb.patch -Patch992: linux-2.6-xen-pvfb-fixes.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -900,12 +897,6 @@ %patch955 -p1 # ia64 xen cleanups for kexec/kdump %patch958 -p1 - -# xen framebuffer patches -%patch990 -p1 -%patch991 -p1 -%patch992 -p1 - %endif # @@ -2023,6 +2014,12 @@ %endif %changelog +* Tue Jan 23 2007 Juan Quintela +- update xen kernel patch + * pvfb is now included in it. + * changeset: 43493:67d20a7ca5f9 + * update to kernel 2.6.19.2. + * Mon Jan 15 2007 Markus Armbruster - Update Xen paravirt framebuffer patch to upstream xen-unstable changeset 13066, less changeset 12680, because that breaks with linux-2.6-xen.patch: arch/i386/Kconfig | 85 arch/i386/Kconfig.cpu | 4 arch/i386/Kconfig.debug | 1 arch/i386/Makefile | 24 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 21 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1332 ++++++++ arch/i386/kernel/alternative.c | 11 arch/i386/kernel/apic-xen.c | 223 + arch/i386/kernel/asm-offsets.c | 7 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 747 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 198 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 1254 ++++++++ arch/i386/kernel/entry.S | 6 arch/i386/kernel/fixup.c | 92 arch/i386/kernel/head-xen.S | 200 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2965 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 121 arch/i386/kernel/irq-xen.c | 328 ++ arch/i386/kernel/ldt-xen.c | 270 + arch/i386/kernel/microcode-xen.c | 147 arch/i386/kernel/mpparse-xen.c | 1157 +++++++ arch/i386/kernel/pci-dma-xen.c | 376 ++ arch/i386/kernel/process-xen.c | 851 +++++ arch/i386/kernel/quirks-xen.c | 47 arch/i386/kernel/setup-xen.c | 1735 +++++++++++ arch/i386/kernel/smp-xen.c | 631 ++++ arch/i386/kernel/swiotlb.c | 672 ++++ arch/i386/kernel/sysenter.c | 22 arch/i386/kernel/time-xen.c | 1112 +++++++ arch/i386/kernel/traps-xen.c | 1248 ++++++++ arch/i386/kernel/traps.c | 9 arch/i386/kernel/tsc.c | 2 arch/i386/kernel/vm86.c | 12 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/lib/delay.c | 3 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/irqflags.c | 99 arch/i386/mach-xen/setup.c | 161 + arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 762 +++++ arch/i386/mm/highmem-xen.c | 121 arch/i386/mm/hypervisor.c | 457 +++ arch/i386/mm/init-xen.c | 879 +++++ arch/i386/mm/ioremap-xen.c | 443 ++ arch/i386/mm/pageattr.c | 2 arch/i386/mm/pgtable-xen.c | 721 ++++ arch/i386/oprofile/Makefile | 4 arch/i386/oprofile/xenoprof.c | 584 +++ arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1167 +++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 60 arch/ia64/Makefile | 16 arch/ia64/dig/setup.c | 17 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/asm-offsets.c | 25 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/gate.S | 113 arch/ia64/kernel/gate.lds.S | 22 arch/ia64/kernel/head.S | 6 arch/ia64/kernel/iosapic.c | 65 arch/ia64/kernel/irq_ia64.c | 260 + arch/ia64/kernel/pal.S | 3 arch/ia64/kernel/patch.c | 71 arch/ia64/kernel/setup.c | 125 arch/ia64/mm/ioremap.c | 3 arch/ia64/xen/Makefile | 8 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/hypercall.S | 413 ++ arch/ia64/xen/hypervisor.c | 847 +++++ arch/ia64/xen/util.c | 115 arch/ia64/xen/xenentry.S | 867 +++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2169 ++++++++++++++ arch/ia64/xen/xenminstate.h | 368 ++ arch/ia64/xen/xenpal.S | 76 arch/ia64/xen/xensetup.S | 54 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 62 arch/x86_64/Makefile | 20 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 743 +++++ 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 | 20 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 254 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 759 +++++ arch/x86_64/kernel/early_printk-xen.c | 299 ++ arch/x86_64/kernel/entry-xen.S | 1217 ++++++++ arch/x86_64/kernel/genapic-xen.c | 143 arch/x86_64/kernel/genapic_xen.c | 190 + arch/x86_64/kernel/head-xen.S | 189 + arch/x86_64/kernel/head64-xen.c | 119 arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2182 ++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 99 arch/x86_64/kernel/irq.c | 4 arch/x86_64/kernel/irqflags-xen.c | 100 arch/x86_64/kernel/ldt-xen.c | 283 + arch/x86_64/kernel/mpparse-xen.c | 850 +++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 55 arch/x86_64/kernel/process-xen.c | 859 +++++ arch/x86_64/kernel/setup-xen.c | 1473 +++++++++ arch/x86_64/kernel/setup-xen.c.orig | 1472 +++++++++ arch/x86_64/kernel/setup64-xen.c | 356 ++ arch/x86_64/kernel/smp-xen.c | 571 +++ arch/x86_64/kernel/traps-xen.c | 1245 ++++++++ arch/x86_64/kernel/vmlinux.lds.S | 2 arch/x86_64/kernel/vsyscall-xen.c | 329 ++ arch/x86_64/kernel/xen_entry.S | 40 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 717 ++++ arch/x86_64/mm/init-xen.c | 1147 +++++++ arch/x86_64/mm/pageattr-xen.c | 396 ++ arch/x86_64/oprofile/Makefile | 5 arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/char/hangcheck-timer.c | 2 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 12 drivers/char/tpm/Makefile | 2 drivers/char/tpm/tpm.c | 55 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_vtpm.c | 547 +++ drivers/char/tpm/tpm_vtpm.h | 68 drivers/char/tpm/tpm_xen.c | 756 +++++ drivers/char/tty_io.c | 1 drivers/firmware/Kconfig | 2 drivers/ide/ide-lib.c | 8 drivers/oprofile/buffer_sync.c | 66 drivers/oprofile/cpu_buffer.c | 51 drivers/oprofile/cpu_buffer.h | 9 drivers/oprofile/event_buffer.h | 7 drivers/oprofile/oprof.c | 32 drivers/oprofile/oprof.h | 3 drivers/oprofile/oprofile_files.c | 207 + drivers/pci/Kconfig | 3 drivers/serial/Kconfig | 1 drivers/xen/Kconfig | 283 + drivers/xen/Makefile | 19 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 637 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 549 +++ drivers/xen/blkback/common.h | 133 drivers/xen/blkback/interface.c | 171 + drivers/xen/blkback/vbd.c | 119 drivers/xen/blkback/xenbus.c | 468 +++ drivers/xen/blkfront/Kconfig | 6 drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 846 +++++ drivers/xen/blkfront/block.h | 154 + drivers/xen/blkfront/vbd.c | 318 ++ drivers/xen/blktap/Makefile | 6 drivers/xen/blktap/blktapmain.c | 1393 +++++++++ drivers/xen/blktap/common.h | 120 drivers/xen/blktap/interface.c | 164 + drivers/xen/blktap/xenbus.c | 366 ++ drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 180 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 715 ++++ drivers/xen/console/xencons_ring.c | 143 drivers/xen/core/Makefile | 13 drivers/xen/core/cpu_hotplug.c | 188 + drivers/xen/core/evtchn.c | 840 +++++ drivers/xen/core/features.c | 30 drivers/xen/core/gnttab.c | 483 +++ drivers/xen/core/hypervisor_sysfs.c | 59 drivers/xen/core/reboot.c | 385 ++ drivers/xen/core/skbuff.c | 144 drivers/xen/core/smpboot.c | 442 ++ drivers/xen/core/xen_proc.c | 18 drivers/xen/core/xen_sysfs.c | 378 ++ drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 456 +++ drivers/xen/fbfront/Makefile | 2 drivers/xen/fbfront/xenfb.c | 686 ++++ drivers/xen/fbfront/xenkbd.c | 300 ++ drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 141 drivers/xen/netback/interface.c | 352 ++ drivers/xen/netback/loopback.c | 320 ++ drivers/xen/netback/netback.c | 1510 ++++++++++ drivers/xen/netback/xenbus.c | 438 ++ drivers/xen/netfront/Kconfig | 6 drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 2138 ++++++++++++++ drivers/xen/pciback/Makefile | 15 drivers/xen/pciback/conf_space.c | 425 ++ drivers/xen/pciback/conf_space.h | 126 drivers/xen/pciback/conf_space_capability.c | 71 drivers/xen/pciback/conf_space_capability.h | 23 drivers/xen/pciback/conf_space_capability_pm.c | 113 drivers/xen/pciback/conf_space_capability_vpd.c | 42 drivers/xen/pciback/conf_space_header.c | 299 ++ drivers/xen/pciback/conf_space_quirks.c | 128 drivers/xen/pciback/conf_space_quirks.h | 35 drivers/xen/pciback/passthrough.c | 157 + drivers/xen/pciback/pci_stub.c | 916 ++++++ drivers/xen/pciback/pciback.h | 93 drivers/xen/pciback/pciback_ops.c | 95 drivers/xen/pciback/slot.c | 151 + drivers/xen/pciback/vpci.c | 204 + drivers/xen/pciback/xenbus.c | 458 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 46 drivers/xen/pcifront/pci_op.c | 273 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 + drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 294 + drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 86 drivers/xen/tpmback/interface.c | 182 + drivers/xen/tpmback/tpmback.c | 944 ++++++ drivers/xen/tpmback/xenbus.c | 287 + drivers/xen/util.c | 70 drivers/xen/xenbus/Makefile | 12 drivers/xen/xenbus/xenbus_backend_client.c | 147 drivers/xen/xenbus/xenbus_client.c | 300 ++ drivers/xen/xenbus/xenbus_comms.c | 203 + drivers/xen/xenbus/xenbus_comms.h | 45 drivers/xen/xenbus/xenbus_dev.c | 356 ++ drivers/xen/xenbus/xenbus_probe.c | 1189 ++++++++ drivers/xen/xenbus/xenbus_xs.c | 853 +++++ fs/Kconfig | 1 include/asm-i386/apic.h | 2 include/asm-i386/mach-default/mach_traps.h | 12 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 203 + include/asm-i386/mach-xen/asm/dma-mapping.h | 151 + include/asm-i386/mach-xen/asm/fixmap.h | 161 + include/asm-i386/mach-xen/asm/floppy.h | 147 include/asm-i386/mach-xen/asm/highmem.h | 80 include/asm-i386/mach-xen/asm/hypercall.h | 389 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 234 + include/asm-i386/mach-xen/asm/io.h | 362 ++ include/asm-i386/mach-xen/asm/irqflags.h | 81 include/asm-i386/mach-xen/asm/kmap_types.h | 31 include/asm-i386/mach-xen/asm/maddr.h | 160 + include/asm-i386/mach-xen/asm/mmu.h | 29 include/asm-i386/mach-xen/asm/mmu_context.h | 108 include/asm-i386/mach-xen/asm/page.h | 220 + include/asm-i386/mach-xen/asm/pci.h | 153 + include/asm-i386/mach-xen/asm/pgalloc.h | 63 include/asm-i386/mach-xen/asm/pgtable-2level.h | 78 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 24 include/asm-i386/mach-xen/asm/pgtable-3level.h | 195 + include/asm-i386/mach-xen/asm/pgtable.h | 551 +++ include/asm-i386/mach-xen/asm/processor.h | 737 ++++ include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 132 include/asm-i386/mach-xen/asm/setup.h | 81 include/asm-i386/mach-xen/asm/smp.h | 114 include/asm-i386/mach-xen/asm/swiotlb.h | 41 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 include/asm-i386/mach-xen/asm/system.h | 531 +++ include/asm-i386/mach-xen/asm/timer.h | 67 include/asm-i386/mach-xen/asm/tlbflush.h | 99 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.h | 5 include/asm-i386/pgtable-2level-defs.h | 2 include/asm-i386/pgtable-3level-defs.h | 2 include/asm-i386/spinlock.h | 5 include/asm-ia64/agp.h | 31 include/asm-ia64/dma-mapping.h | 98 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hw_irq.h | 10 include/asm-ia64/hypercall.h | 423 ++ include/asm-ia64/hypervisor.h | 219 + include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/io.h | 34 include/asm-ia64/iosapic.h | 2 include/asm-ia64/irq.h | 31 include/asm-ia64/machvec_dig.h | 15 include/asm-ia64/maddr.h | 92 include/asm-ia64/meminit.h | 5 include/asm-ia64/page.h | 52 include/asm-ia64/pal.h | 1 include/asm-ia64/pgalloc.h | 4 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 | 304 ++ include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/dwarf2.h | 2 include/asm-x86_64/ipi.h | 5 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 40 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 200 + include/asm-x86_64/mach-xen/asm/dmi.h | 29 include/asm-x86_64/mach-xen/asm/e820.h | 59 include/asm-x86_64/mach-xen/asm/fixmap.h | 109 include/asm-x86_64/mach-xen/asm/floppy.h | 207 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 136 include/asm-x86_64/mach-xen/asm/hypercall.h | 389 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 300 ++ include/asm-x86_64/mach-xen/asm/irq.h | 34 include/asm-x86_64/mach-xen/asm/irqflags.h | 65 include/asm-x86_64/mach-xen/asm/maddr.h | 139 include/asm-x86_64/mach-xen/asm/mmu.h | 38 include/asm-x86_64/mach-xen/asm/mmu_context.h | 135 include/asm-x86_64/mach-xen/asm/msr.h | 410 ++ include/asm-x86_64/mach-xen/asm/nmi.h | 96 include/asm-x86_64/mach-xen/asm/page.h | 213 + include/asm-x86_64/mach-xen/asm/pci.h | 173 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 + include/asm-x86_64/mach-xen/asm/pgtable.h | 555 +++ include/asm-x86_64/mach-xen/asm/processor.h | 499 +++ include/asm-x86_64/mach-xen/asm/smp.h | 132 include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 266 + include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 120 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 | 111 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 58 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/interrupt.h | 6 include/linux/mm.h | 10 include/linux/oprofile.h | 11 include/linux/pfn.h | 4 include/linux/skbuff.h | 15 include/xen/balloon.h | 57 include/xen/cpu_hotplug.h | 43 include/xen/driver_util.h | 15 include/xen/evtchn.h | 113 include/xen/features.h | 20 include/xen/foreign_page.h | 30 include/xen/gnttab.h | 150 + include/xen/hvm.h | 24 include/xen/hypervisor_sysfs.h | 32 include/xen/interface/acm.h | 187 + include/xen/interface/acm_ops.h | 102 include/xen/interface/arch-ia64.h | 448 +++ include/xen/interface/arch-powerpc.h | 115 include/xen/interface/arch-x86_32.h | 255 + include/xen/interface/arch-x86_64.h | 322 ++ include/xen/interface/callback.h | 74 include/xen/interface/dom0_ops.h | 102 include/xen/interface/domctl.h | 392 ++ include/xen/interface/elfnote.h | 133 include/xen/interface/event_channel.h | 233 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 362 ++ include/xen/interface/hvm/e820.h | 32 include/xen/interface/hvm/hvm_info_table.h | 22 include/xen/interface/hvm/ioreq.h | 99 include/xen/interface/hvm/params.h | 24 include/xen/interface/hvm/vmx_assist.h | 98 include/xen/interface/io/blkif.h | 87 include/xen/interface/io/console.h | 33 include/xen/interface/io/fbif.h | 116 include/xen/interface/io/kbdif.h | 108 include/xen/interface/io/netif.h | 166 + include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 273 + include/xen/interface/io/tpmif.h | 59 include/xen/interface/io/xenbus.h | 45 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 243 + include/xen/interface/nmi.h | 60 include/xen/interface/physdev.h | 149 + include/xen/interface/platform.h | 125 include/xen/interface/sched.h | 103 include/xen/interface/sysctl.h | 151 + include/xen/interface/trace.h | 87 include/xen/interface/vcpu.h | 121 include/xen/interface/version.h | 73 include/xen/interface/xen-compat.h | 26 include/xen/interface/xen.h | 581 +++ include/xen/interface/xencomm.h | 37 include/xen/interface/xenoprof.h | 110 include/xen/pcifront.h | 76 include/xen/public/evtchn.h | 88 include/xen/public/privcmd.h | 79 include/xen/xen_proc.h | 12 include/xen/xenbus.h | 306 ++ include/xen/xencons.h | 17 kernel/Kconfig.preempt | 1 kernel/fork.c | 3 kernel/irq/manage.c | 1 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 120 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 63 net/core/skbuff.c | 27 net/ipv4/netfilter/ip_nat_proto_tcp.c | 7 net/ipv4/netfilter/ip_nat_proto_udp.c | 7 net/ipv4/xfrm4_output.c | 6 net/ipv6/addrconf.c | 3 scripts/Makefile.xen | 14 421 files changed, 90718 insertions(+), 200 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.83 -r 1.84 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen.patch,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- linux-2.6-xen.patch 24 Dec 2006 00:48:31 -0000 1.83 +++ linux-2.6-xen.patch 22 Jan 2007 23:08:27 -0000 1.84 @@ -1,7 +1,6 @@ - * linux-2.6.19-xen-3.0.3 changeset: 43477:924f1a8f8441 -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/boot-xen/Makefile linux-2.6.19-xen-3.0.3/arch/i386/boot-xen/Makefile ---- /scratch/src/linux-2.6.19.1/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/boot-xen/Makefile 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile source/arch/i386/boot-xen/Makefile +--- /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/boot-xen/Makefile 2006-12-23 17:42:12.000000000 +0100 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded @@ -24,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='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/Kconfig linux-2.6.19-xen-3.0.3/arch/i386/Kconfig ---- /scratch/src/linux-2.6.19.1/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/Kconfig 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig source/arch/i386/Kconfig +--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/Kconfig 2006-12-23 17:44:39.000000000 +0100 @@ -16,6 +16,7 @@ config X86_32 config GENERIC_TIME @@ -307,9 +306,9 @@ config KTIME_SCALAR bool default y -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.cpu linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.cpu ---- /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.cpu 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.cpu 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu source/arch/i386/Kconfig.cpu +--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/Kconfig.cpu 2006-12-23 17:44:39.000000000 +0100 @@ -252,7 +252,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -326,9 +325,9 @@ - depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ + depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX) && !X86_NUMAQ && !X86_XEN default y -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.debug linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.debug ---- /scratch/src/linux-2.6.19.1/arch/i386/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/Kconfig.debug 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug source/arch/i386/Kconfig.debug +--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/Kconfig.debug 2006-12-23 17:42:12.000000000 +0100 @@ -79,6 +79,7 @@ config X86_MPPARSE config DOUBLEFAULT default y @@ -337,9 +336,9 @@ help This option allows trapping of rare doublefault exceptions that would otherwise cause a system to silently reboot. Disabling this -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/boot-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/boot-xen.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/boot-xen.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c source/arch/i386/kernel/acpi/boot-xen.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/kernel/acpi/boot-xen.c 2006-12-23 17:46:06.000000000 +0100 @@ -0,0 +1,1332 @@ +/* + * boot.c - Architecture-Specific Low-Level ACPI Boot Support @@ -1673,9 +1672,9 @@ + return 0; +} +early_param("acpi_sci", setup_acpi_sci); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/Makefile linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/Makefile ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/acpi/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/acpi/Makefile 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile source/arch/i386/kernel/acpi/Makefile +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/acpi/Makefile 2006-12-23 17:44:39.000000000 +0100 @@ -8,3 +8,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o endif @@ -1684,9 +1683,9 @@ +include $(srctree)/scripts/Makefile.xen +obj-y := $(call cherrypickxen, $(obj-y), $(src)) +endif -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/alternative.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/alternative.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/alternative.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/alternative.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c source/arch/i386/kernel/alternative.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/alternative.c 2006-12-23 17:44:39.000000000 +0100 @@ -4,7 +4,11 @@ #include #include @@ -1724,9 +1723,9 @@ return; } -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/apic-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/apic-xen.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/apic-xen.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c source/arch/i386/kernel/apic-xen.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/kernel/apic-xen.c 2006-12-23 17:44:39.000000000 +0100 @@ -0,0 +1,223 @@ +/* + * Local APIC handling, local APIC timers @@ -1951,9 +1950,9 @@ +} +early_param("nolapic", parse_nolapic); + -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/asm-offsets.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/asm-offsets.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/asm-offsets.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/asm-offsets.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c source/arch/i386/kernel/asm-offsets.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/asm-offsets.c 2006-12-23 17:42:12.000000000 +0100 @@ -66,9 +66,14 @@ void foo(void) OFFSET(pbe_orig_address, pbe, orig_address); OFFSET(pbe_next, pbe, next); @@ -1970,9 +1969,9 @@ DEFINE(PAGE_SIZE_asm, PAGE_SIZE); DEFINE(VDSO_PRELINK, VDSO_PRELINK); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/common-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/common-xen.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/common-xen.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c source/arch/i386/kernel/cpu/common-xen.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/kernel/cpu/common-xen.c 2006-12-23 17:44:39.000000000 +0100 @@ -0,0 +1,747 @@ +#include +#include @@ -2721,9 +2720,9 @@ + per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm; +} +#endif -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/Makefile linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/Makefile ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/Makefile 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile source/arch/i386/kernel/cpu/Makefile +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/cpu/Makefile 2006-12-23 17:42:12.000000000 +0100 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/ @@ -2733,9 +2732,9 @@ +include $(srctree)/scripts/Makefile.xen +obj-y := $(call cherrypickxen, $(obj-y), $(src)) +endif -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/main-xen.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c source/arch/i386/kernel/cpu/mtrr/main-xen.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-12-23 17:44:39.000000000 +0100 @@ -0,0 +1,198 @@ +#include +#include @@ -2935,9 +2934,9 @@ +} + +subsys_initcall(mtrr_init); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/Makefile linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/Makefile ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/cpu/mtrr/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/cpu/mtrr/Makefile 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile source/arch/i386/kernel/cpu/mtrr/Makefile +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/cpu/mtrr/Makefile 2006-12-23 17:42:12.000000000 +0100 @@ -3,3 +3,10 @@ obj-y += amd.o obj-y += cyrix.o obj-y += centaur.o @@ -2949,15 +2948,15 @@ +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen)) +obj-y := $(call cherrypickxen, $(obj-y)) +endif -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/early_printk-xen.c linux-2.6.19-xen-3.0.3/arch/i386/kernel/early_printk-xen.c ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/early_printk-xen.c 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c source/arch/i386/kernel/early_printk-xen.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/kernel/early_printk-xen.c 2006-12-23 17:42:12.000000000 +0100 @@ -0,0 +1,2 @@ + +#include "../../x86_64/kernel/early_printk-xen.c" -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/arch/i386/kernel/entry.S linux-2.6.19-xen-3.0.3/arch/i386/kernel/entry.S ---- /scratch/src/linux-2.6.19.1/arch/i386/kernel/entry.S 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/arch/i386/kernel/entry.S 2006-12-23 18:13:52.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S source/arch/i386/kernel/entry.S +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/entry.S 2006-12-23 17:44:39.000000000 +0100 @@ -281,7 +281,7 @@ ENTRY(sysenter_entry) CFI_SIGNAL_FRAME CFI_DEF_CFA esp, 0 @@ -2985,9 +2984,9 @@ CFI_DEF_CFA esp, 0; \ CFI_UNDEFINED eip; \ [...9123 lines suppressed...] -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/kernel/Kconfig.preempt linux-2.6.19-xen-3.0.3/kernel/Kconfig.preempt ---- /scratch/src/linux-2.6.19.1/kernel/Kconfig.preempt 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/kernel/Kconfig.preempt 2006-12-23 18:14:47.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/kernel/Kconfig.preempt source/kernel/Kconfig.preempt +--- /scratch/src/linux-2.6.19.2/kernel/Kconfig.preempt 2006-11-29 22:57:37.000000000 +0100 ++++ source/kernel/Kconfig.preempt 2006-12-23 17:42:52.000000000 +0100 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY config PREEMPT @@ -91494,9 +94253,9 @@ help This option reduces the latency of the kernel by making all kernel code (that is not executing in a critical section) -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/lib/Kconfig.debug linux-2.6.19-xen-3.0.3/lib/Kconfig.debug ---- /scratch/src/linux-2.6.19.1/lib/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/lib/Kconfig.debug 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Kconfig.debug source/lib/Kconfig.debug +--- /scratch/src/linux-2.6.19.2/lib/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100 ++++ source/lib/Kconfig.debug 2006-12-23 17:44:56.000000000 +0100 @@ -341,7 +341,7 @@ config FRAME_POINTER config UNWIND_INFO @@ -91506,9 +94265,9 @@ depends on !MODULES || !(MIPS || PPC || SUPERH || V850) help If you say Y here the resulting kernel image will be slightly larger -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/lib/Makefile linux-2.6.19-xen-3.0.3/lib/Makefile ---- /scratch/src/linux-2.6.19.1/lib/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/lib/Makefile 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Makefile source/lib/Makefile +--- /scratch/src/linux-2.6.19.2/lib/Makefile 2006-11-29 22:57:37.000000000 +0100 ++++ source/lib/Makefile 2006-12-23 17:44:56.000000000 +0100 @@ -54,6 +54,9 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o @@ -91519,9 +94278,9 @@ hostprogs-y := gen_crc32table clean-files := crc32table.h -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/highmem.c linux-2.6.19-xen-3.0.3/mm/highmem.c ---- /scratch/src/linux-2.6.19.1/mm/highmem.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/mm/highmem.c 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/highmem.c source/mm/highmem.c +--- /scratch/src/linux-2.6.19.2/mm/highmem.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/mm/highmem.c 2006-12-23 17:44:56.000000000 +0100 @@ -148,6 +148,17 @@ start: return vaddr; } @@ -91540,9 +94299,9 @@ void fastcall *kmap_high(struct page *page) { unsigned long vaddr; -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/Kconfig linux-2.6.19-xen-3.0.3/mm/Kconfig ---- /scratch/src/linux-2.6.19.1/mm/Kconfig 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/mm/Kconfig 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/Kconfig source/mm/Kconfig +--- /scratch/src/linux-2.6.19.2/mm/Kconfig 2006-11-29 22:57:37.000000000 +0100 ++++ source/mm/Kconfig 2006-12-23 17:44:56.000000000 +0100 @@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE # 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. @@ -91558,9 +94317,9 @@ default "4" # -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/memory.c linux-2.6.19-xen-3.0.3/mm/memory.c ---- /scratch/src/linux-2.6.19.1/mm/memory.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/mm/memory.c 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/memory.c source/mm/memory.c +--- /scratch/src/linux-2.6.19.2/mm/memory.c 2007-01-15 16:07:25.000000000 +0100 ++++ source/mm/memory.c 2007-01-22 12:58:23.000000000 +0100 @@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar * and that the resulting page looks ok. */ @@ -91606,7 +94365,7 @@ if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1393,6 +1415,102 @@ int remap_pfn_range(struct vm_area_struc +@@ -1403,6 +1425,102 @@ int remap_pfn_range(struct vm_area_struc } EXPORT_SYMBOL(remap_pfn_range); @@ -91709,9 +94468,9 @@ /* * handle_pte_fault chooses page fault handler according to an entry * which was read non-atomically. Before making any commitment, on -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/mmap.c linux-2.6.19-xen-3.0.3/mm/mmap.c ---- /scratch/src/linux-2.6.19.1/mm/mmap.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/mm/mmap.c 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/mmap.c source/mm/mmap.c +--- /scratch/src/linux-2.6.19.2/mm/mmap.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/mm/mmap.c 2006-12-23 17:44:56.000000000 +0100 @@ -1970,6 +1970,10 @@ void exit_mmap(struct mm_struct *mm) unsigned long nr_accounted = 0; unsigned long end; @@ -91723,9 +94482,9 @@ lru_add_drain(); flush_cache_mm(mm); tlb = tlb_gather_mmu(mm, 1); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/mm/page_alloc.c linux-2.6.19-xen-3.0.3/mm/page_alloc.c ---- /scratch/src/linux-2.6.19.1/mm/page_alloc.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/mm/page_alloc.c 2006-12-23 18:14:48.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/page_alloc.c source/mm/page_alloc.c +--- /scratch/src/linux-2.6.19.2/mm/page_alloc.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/mm/page_alloc.c 2006-12-23 17:44:56.000000000 +0100 @@ -496,6 +496,8 @@ static void __free_pages_ok(struct page int i; int reserved = 0; @@ -91753,9 +94512,9 @@ if (PageAnon(page)) page->mapping = NULL; if (free_pages_check(page)) -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/core/dev.c linux-2.6.19-xen-3.0.3/net/core/dev.c ---- /scratch/src/linux-2.6.19.1/net/core/dev.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/net/core/dev.c 2006-12-23 18:14:49.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/dev.c source/net/core/dev.c +--- /scratch/src/linux-2.6.19.2/net/core/dev.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/core/dev.c 2006-12-23 17:44:56.000000000 +0100 @@ -118,6 +118,12 @@ #include #include @@ -91854,9 +94613,9 @@ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) EXPORT_SYMBOL(br_handle_frame_hook); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/core/skbuff.c linux-2.6.19-xen-3.0.3/net/core/skbuff.c ---- /scratch/src/linux-2.6.19.1/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/net/core/skbuff.c 2006-12-23 18:14:49.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/skbuff.c source/net/core/skbuff.c +--- /scratch/src/linux-2.6.19.2/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/core/skbuff.c 2006-12-23 17:44:56.000000000 +0100 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug); * Buffers may only be allocated from interrupts using a @gfp_mask of * %GFP_ATOMIC. @@ -91927,9 +94686,9 @@ C(pkt_type); C(ip_summed); C(priority); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_tcp.c ---- /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 18:14:51.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c source/net/ipv4/netfilter/ip_nat_proto_tcp.c +--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 17:44:57.000000000 +0100 @@ -129,9 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; @@ -91947,9 +94706,9 @@ return 1; } -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_udp.c ---- /scratch/src/linux-2.6.19.1/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 18:14:51.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c source/net/ipv4/netfilter/ip_nat_proto_udp.c +--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 17:44:57.000000000 +0100 @@ -115,11 +115,18 @@ udp_manip_pkt(struct sk_buff **pskb, } @@ -91969,9 +94728,9 @@ if (!hdr->check) hdr->check = -1; } -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv4/xfrm4_output.c linux-2.6.19-xen-3.0.3/net/ipv4/xfrm4_output.c ---- /scratch/src/linux-2.6.19.1/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/net/ipv4/xfrm4_output.c 2006-12-23 18:14:51.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c source/net/ipv4/xfrm4_output.c +--- /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/ipv4/xfrm4_output.c 2006-12-23 17:44:57.000000000 +0100 @@ -18,6 +18,8 @@ #include #include @@ -91992,9 +94751,9 @@ if (skb->ip_summed == CHECKSUM_PARTIAL) { err = skb_checksum_help(skb); if (err) -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/net/ipv6/addrconf.c linux-2.6.19-xen-3.0.3/net/ipv6/addrconf.c ---- /scratch/src/linux-2.6.19.1/net/ipv6/addrconf.c 2006-11-29 22:57:37.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/net/ipv6/addrconf.c 2006-12-23 18:14:51.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c source/net/ipv6/addrconf.c +--- /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c 2007-01-15 16:07:25.000000000 +0100 ++++ source/net/ipv6/addrconf.c 2007-01-22 12:58:23.000000000 +0100 @@ -2545,6 +2545,8 @@ static void addrconf_dad_start(struct in spin_lock_bh(&ifp->lock); @@ -92012,9 +94771,9 @@ (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) { struct in6_addr all_routers; -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.19.1/scripts/Makefile.xen linux-2.6.19-xen-3.0.3/scripts/Makefile.xen ---- /scratch/src/linux-2.6.19.1/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.19-xen-3.0.3/scripts/Makefile.xen 2006-12-23 18:14:53.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/scripts/Makefile.xen source/scripts/Makefile.xen +--- /scratch/src/linux-2.6.19.2/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 ++++ source/scripts/Makefile.xen 2006-12-23 17:42:55.000000000 +0100 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) From fedora-cvs-commits at redhat.com Mon Jan 22 23:10:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:10:10 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.365, 1.366 anaconda.spec, 1.491, 1.492 sources, 1.489, 1.490 Message-ID: <200701222310.l0MNAAg5029273@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29220/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.14-1 on branch devel from anaconda-11.2.0.14-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- .cvsignore 19 Jan 2007 22:45:22 -0000 1.365 +++ .cvsignore 22 Jan 2007 23:10:08 -0000 1.366 @@ -1,2 +1 @@ -anaconda-11.2.0.12.tar.bz2 -anaconda-11.2.0.13.tar.bz2 +anaconda-11.2.0.14.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.491 retrieving revision 1.492 diff -u -r1.491 -r1.492 --- anaconda.spec 19 Jan 2007 22:45:22 -0000 1.491 +++ anaconda.spec 22 Jan 2007 23:10:08 -0000 1.492 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.13 +Version: 11.2.0.14 Release: 1 License: GPL Summary: Graphical system installer @@ -27,6 +27,7 @@ Requires: python-pyblock >= 0.24-1 Requires: libbdevid >= 5.1.2-1, libbdevid-python Requires: audit-libs +Requires: system-config-keyboard %ifnarch s390 s390x ppc64 Requires: rhpxl >= 0.25 %endif @@ -103,6 +104,13 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Jan 22 2007 Jeremy Katz - 11.2.0.14-1 +- Fix shell on tty2 with libncurses in /lib +- Use echo icon theme +- Add anaconda- to VCI (dcantrell, #220082) +- Remove some no-longer-needed imports (clumens) +- Require system-config-keyboard + * Fri Jan 19 2007 Chris Lumens - 11.2.0.13-1 - Kickstart and upgrade are no longer installclasses. - Update x86_64 syslinux config (katzj). Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.489 retrieving revision 1.490 diff -u -r1.489 -r1.490 --- sources 19 Jan 2007 22:45:22 -0000 1.489 +++ sources 22 Jan 2007 23:10:08 -0000 1.490 @@ -1 +1 @@ -b0aed21d980d7eb8e6987d0a8723fa49 anaconda-11.2.0.13.tar.bz2 +f3462139bdb4255ba1e9df359aa7e341 anaconda-11.2.0.14.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 22 23:22:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:22:59 -0500 Subject: rpms/antlr/devel antlr.spec,1.29,1.30 Message-ID: <200701222322.l0MNMxNJ024929@cvs.devel.redhat.com> Author: dbhole Update of /cvs/dist/rpms/antlr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24732 Modified Files: antlr.spec Log Message: Disable mono requirements for s390* and ppc64 Index: antlr.spec =================================================================== RCS file: /cvs/dist/rpms/antlr/devel/antlr.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- antlr.spec 22 Jan 2007 19:07:48 -0000 1.29 +++ antlr.spec 22 Jan 2007 23:22:57 -0000 1.30 @@ -60,8 +60,12 @@ BuildArch: noarch %endif BuildRequires: ant + +%ifnarch s390 s390x ppc64 BuildRequires: mono-core BuildRequires: mono-winforms +%endif + BuildRequires: %{__perl}, java-javadoc Requires: jpackage-utils Requires(post): %{_sbindir}/update-alternatives From fedora-cvs-commits at redhat.com Mon Jan 22 23:41:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:41:00 -0500 Subject: rpms/hsqldb/FC-6 hsqldb.spec,1.29,1.30 Message-ID: <200701222341.l0MNf09h006270@cvs.devel.redhat.com> Author: dbhole Update of /cvs/dist/rpms/hsqldb/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv6178 Modified Files: hsqldb.spec Log Message: Updgrade to 1.8.0.7 Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/FC-6/hsqldb.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- hsqldb.spec 29 Nov 2006 23:52:21 -0000 1.29 +++ hsqldb.spec 22 Jan 2007 23:40:58 -0000 1.30 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2005, JPackage Project +# Copyright (c) 2000-2007, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,15 +34,16 @@ %define section devel -%define cvs_version 1_8_0_4 +%define cvs_version 1_8_0_7 Name: hsqldb -Version: 1.8.0.4 -Release: 4jpp.1 +Version: 1.8.0.7 +Release: 2jpp.1 Epoch: 1 Summary: Hsqldb Database Engine License: BSD Style Url: http://hsqldb.sourceforge.net/ +#http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_7.zip Source0: %{name}_%{cvs_version}-RHCLEAN.zip Source1: %{name}-%{version}-standard.cfg Source2: %{name}-%{version}-standard-server.properties @@ -266,7 +267,10 @@ %{_datadir}/%{name} %changelog -* Wed Nov 29 2006 Deepak Bhole 1.8.0.4-4jpp.1 +* Thu Jan 22 2007 Deepak Bhole 1:1.8.0.7-2jpp.1 +- Updgrade to 1.8.0.7 + +* Wed Nov 29 2006 Deepak Bhole 1:1.8.0.4-4jpp.1 - Added missing entries to the files section * Wed Oct 11 2006 Fernando Nasser 1:1.8.0.4-3jpp.4 From fedora-cvs-commits at redhat.com Mon Jan 22 23:54:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:54:00 -0500 Subject: rpms/kernel/FC-6 linux-2.6-xen-pvfb-fixes.patch, 1.1, NONE linux-2.6-xen-pvfb.patch, 1.6, NONE linux-2.6-xen-console.patch, 1.1, NONE Message-ID: <200701222354.l0MNs0nI023392@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23378 Removed Files: Tag: private-quintela-xen-3_0_4-branch linux-2.6-xen-pvfb-fixes.patch linux-2.6-xen-pvfb.patch linux-2.6-xen-console.patch Log Message: this patches are integrated on linux-2.6-xen.patch now --- linux-2.6-xen-pvfb-fixes.patch DELETED --- --- linux-2.6-xen-pvfb.patch DELETED --- --- linux-2.6-xen-console.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 22 23:58:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 18:58:32 -0500 Subject: rpms/hsqldb/FC-6 hsqldb-1.8.0.7-scripts.patch, NONE, 1.1 hsqldb-1.8.0.7-standard-server.properties, NONE, 1.1 hsqldb-1.8.0.7-standard-sqltool.rc, NONE, 1.1 hsqldb-1.8.0.7-standard-webserver.properties, NONE, 1.1 hsqldb-1.8.0.7-standard.cfg, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 hsqldb-1.8.0.4-scripts.patch, 1.1, NONE hsqldb-1.8.0.4-standard-server.properties, 1.1, NONE hsqldb-1.8.0.4-standard-sqltool.rc, 1.1, NONE hsqldb-1.8.0.4-standard-webserver.properties, 1.1, NONE hsqldb-1.8.0.4-standard.cfg, 1.1, NONE Message-ID: <200701222358.l0MNwWC4023508@cvs.devel.redhat.com> Author: dbhole Update of /cvs/dist/rpms/hsqldb/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv23491 Modified Files: .cvsignore sources Added Files: hsqldb-1.8.0.7-scripts.patch hsqldb-1.8.0.7-standard-server.properties hsqldb-1.8.0.7-standard-sqltool.rc hsqldb-1.8.0.7-standard-webserver.properties hsqldb-1.8.0.7-standard.cfg Removed Files: hsqldb-1.8.0.4-scripts.patch hsqldb-1.8.0.4-standard-server.properties hsqldb-1.8.0.4-standard-sqltool.rc hsqldb-1.8.0.4-standard-webserver.properties hsqldb-1.8.0.4-standard.cfg Log Message: Adding new sources, removing older. hsqldb-1.8.0.7-scripts.patch: runUtil.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE hsqldb-1.8.0.7-scripts.patch --- --- bin/runUtil.sh.orig 2004-08-10 16:04:01.000000000 +0200 +++ bin/runUtil.sh 2004-08-10 16:05:43.000000000 +0200 @@ -31,7 +31,7 @@ progname=`basename $0` # ../ will lead us to the home -dbhome="$progdir/.." +dbhome=/var/lib/hsqldb # absolutize dbhome @@ -40,7 +40,7 @@ # # bring in needed functions -. ${dbhome}/lib/functions +. /var/lib/hsqldb/lib/functions #-------------------------------------------------------------------------------------------------------------- pre_main --- NEW FILE hsqldb-1.8.0.7-standard-server.properties --- # Hsqldb Server cfg file. # See the Advanced Topics chapter of the Hsqldb User Guide. server.database.0 file:data/db0 server.dbname.0 firstdb server.urlid.0 db0-url server.silent true server.trace false server.port 9001 server.no_system_exit true ***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.8.0.7-standard-sqltool.rc' --- NEW FILE hsqldb-1.8.0.7-standard-webserver.properties --- # Hsqldb Server cfg file. # See the Advanced Topics chapter of the Hsqldb User Guide. server.database.0 file:data/db0 server.dbname.0 firstdb server.urlid.0 db0-url server.silent true server.trace false server.port 80 server.default_page index.html server.root ./ .html=text/html ***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.8.0.7-standard.cfg' Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hsqldb/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 4 Aug 2006 23:32:44 -0000 1.7 +++ .cvsignore 22 Jan 2007 23:58:30 -0000 1.8 @@ -1 +1 @@ -hsqldb_1_8_0_4-RHCLEAN.zip +hsqldb_1_8_0_7-RHCLEAN.zip Index: sources =================================================================== RCS file: /cvs/dist/rpms/hsqldb/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Aug 2006 23:32:44 -0000 1.6 +++ sources 22 Jan 2007 23:58:30 -0000 1.7 @@ -1 +1 @@ -ea506781107b1d618b4f99306deab590 hsqldb_1_8_0_4-RHCLEAN.zip +013010f468b11b7e8f25056f3d9976fc hsqldb_1_8_0_7-RHCLEAN.zip --- hsqldb-1.8.0.4-scripts.patch DELETED --- --- hsqldb-1.8.0.4-standard-server.properties DELETED --- --- hsqldb-1.8.0.4-standard-sqltool.rc DELETED --- --- hsqldb-1.8.0.4-standard-webserver.properties DELETED --- --- hsqldb-1.8.0.4-standard.cfg DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 00:33:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 19:33:25 -0500 Subject: rpms/kernel/FC-6/scripts rebase-xen-hv.sh,1.2,1.2.14.1 Message-ID: <200701230033.l0N0XPra026679@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-6/scripts In directory cvs.devel.redhat.com:/tmp/cvs-serv26389/scripts Modified Files: Tag: private-quintela-xen-3_0_4-branch rebase-xen-hv.sh Log Message: update to xen 3.0.4 kernel side. Index: rebase-xen-hv.sh =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/scripts/rebase-xen-hv.sh,v retrieving revision 1.2 retrieving revision 1.2.14.1 diff -u -r1.2 -r1.2.14.1 --- rebase-xen-hv.sh 21 Nov 2006 12:10:44 -0000 1.2 +++ rebase-xen-hv.sh 23 Jan 2007 00:33:23 -0000 1.2.14.1 @@ -9,7 +9,7 @@ popd CSET=`hg tip | grep "changeset:" | cut -f2 -d':' | sed 's/ //g'` -NAME=xen-3.0.3-$CSET +NAME=xen-3.0.4-$CSET tar cvf $NAME.tar xen || exit 1 rm -f $NAME.tar.bz2 bzip2 -v9 $NAME.tar || exit 1 From fedora-cvs-commits at redhat.com Tue Jan 23 00:33:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 19:33:25 -0500 Subject: rpms/kernel/FC-6 .cvsignore, 1.548, 1.548.2.1 branch, 1.1, 1.1.32.1 kernel-2.6.spec, 1.2898, 1.2898.2.1 linux-2.6-xen.patch, 1.84, 1.84.2.1 sources, 1.512, 1.512.2.1 xen-version-strings.patch, 1.3, 1.3.16.1 Message-ID: <200701230033.l0N0XPHg026668@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26389 Modified Files: Tag: private-quintela-xen-3_0_4-branch .cvsignore branch kernel-2.6.spec linux-2.6-xen.patch sources xen-version-strings.patch Log Message: update to xen 3.0.4 kernel side. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v retrieving revision 1.548 retrieving revision 1.548.2.1 diff -u -r1.548 -r1.548.2.1 --- .cvsignore 10 Jan 2007 23:18:48 -0000 1.548 +++ .cvsignore 23 Jan 2007 00:33:18 -0000 1.548.2.1 @@ -4,4 +4,4 @@ kernel-2.6.19 linux-2.6.19.tar.bz2 patch-2.6.19.2.bz2 -xen-3.0.3-11774.tar.bz2 +xen-3.0.4-13132.tar.bz2 Index: branch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/branch,v retrieving revision 1.1 retrieving revision 1.1.32.1 diff -u -r1.1 -r1.1.32.1 --- branch 13 Oct 2006 01:05:02 -0000 1.1 +++ branch 23 Jan 2007 00:33:18 -0000 1.1.32.1 @@ -1 +1 @@ -FC-6 +FC-7 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2898 retrieving revision 1.2898.2.1 diff -u -r1.2898 -r1.2898.2.1 --- kernel-2.6.spec 22 Jan 2007 23:08:26 -0000 1.2898 +++ kernel-2.6.spec 23 Jan 2007 00:33:19 -0000 1.2898.2.1 @@ -35,7 +35,7 @@ %define rpmversion 2.6.%{sublevel} %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist} %define signmodules 0 -%define xen_hv_cset 11774 +%define xen_hv_cset 13132 %define make_target bzImage %define kernel_image x86 %define xen_flags verbose=y crash_debug=y @@ -262,7 +262,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-3.0.3-%{xen_hv_cset}.tar.bz2 +Source1: xen-3.0.4-%{xen_hv_cset}.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -491,9 +491,7 @@ Patch10000: linux-2.6-compile-fixes.patch # Xen hypervisor patches (20000+) -Patch20000: xen-printf-rate-limit.patch Patch20001: xen-version-strings.patch -Patch20002: xen-grant-security.patch # END OF PATCH DEFINITIONS @@ -1139,9 +1137,7 @@ %setup -D -T -q -n %{name}-%{version} -a1 cd xen # Any necessary hypervisor patches go here -%patch20000 -p1 %patch20001 -p1 -%patch20002 -p1 # Update the Makefile version strings sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile @@ -2015,6 +2011,10 @@ %changelog * Tue Jan 23 2007 Juan Quintela +- update to xen 3.0.4 kernel side. +- update HV to xen-3.0.4-testing cset: 13132:f98a6a9df1b4 + +* Tue Jan 23 2007 Juan Quintela - update xen kernel patch * pvfb is now included in it. * changeset: 43493:67d20a7ca5f9 linux-2.6-xen.patch: arch/i386/Kconfig | 85 arch/i386/Kconfig.cpu | 4 arch/i386/Kconfig.debug | 1 arch/i386/Makefile | 24 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 21 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1332 ++++++++ arch/i386/kernel/alternative.c | 11 arch/i386/kernel/apic-xen.c | 223 + arch/i386/kernel/asm-offsets.c | 7 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 747 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 198 + arch/i386/kernel/crash.c | 4 arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 1254 ++++++++ arch/i386/kernel/entry.S | 6 arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 201 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2965 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 121 arch/i386/kernel/irq-xen.c | 328 ++ arch/i386/kernel/ldt-xen.c | 270 + arch/i386/kernel/machine_kexec.c | 40 arch/i386/kernel/microcode-xen.c | 141 arch/i386/kernel/mpparse-xen.c | 1157 +++++++ arch/i386/kernel/pci-dma-xen.c | 377 ++ arch/i386/kernel/process-xen.c | 852 +++++ arch/i386/kernel/quirks-xen.c | 47 arch/i386/kernel/setup-xen.c | 1748 +++++++++++ arch/i386/kernel/smp-xen.c | 635 ++++ arch/i386/kernel/swiotlb.c | 683 ++++ arch/i386/kernel/sysenter.c | 22 arch/i386/kernel/time-xen.c | 1121 +++++++ arch/i386/kernel/traps-xen.c | 1248 ++++++++ arch/i386/kernel/traps.c | 9 arch/i386/kernel/tsc.c | 2 arch/i386/kernel/vm86.c | 12 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/lib/delay.c | 3 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/irqflags.c | 99 arch/i386/mach-xen/setup.c | 169 + arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 756 +++++ arch/i386/mm/highmem-xen.c | 121 arch/i386/mm/hypervisor.c | 449 +++ arch/i386/mm/init-xen.c | 879 +++++ arch/i386/mm/ioremap-xen.c | 443 ++ arch/i386/mm/pageattr.c | 2 arch/i386/mm/pgtable-xen.c | 728 ++++ arch/i386/oprofile/Makefile | 7 arch/i386/oprofile/xenoprof.c | 179 + arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1167 +++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 72 arch/ia64/Makefile | 16 arch/ia64/dig/setup.c | 17 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/asm-offsets.c | 24 arch/ia64/kernel/entry.S | 36 arch/ia64/kernel/gate.S | 116 arch/ia64/kernel/gate.lds.S | 22 arch/ia64/kernel/head.S | 6 arch/ia64/kernel/iosapic.c | 75 arch/ia64/kernel/irq_ia64.c | 328 ++ arch/ia64/kernel/pal.S | 3 arch/ia64/kernel/patch.c | 71 arch/ia64/kernel/perfmon.c | 89 arch/ia64/kernel/setup.c | 131 arch/ia64/mm/ioremap.c | 3 arch/ia64/oprofile/Makefile | 4 arch/ia64/oprofile/init.c | 14 arch/ia64/oprofile/oprofile_perfmon.h | 30 arch/ia64/oprofile/perfmon.c | 35 arch/ia64/oprofile/xenoprof.c | 142 arch/ia64/xen/Makefile | 9 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/hypercall.S | 411 ++ arch/ia64/xen/hypervisor.c | 1104 +++++++ arch/ia64/xen/mem.c | 76 arch/ia64/xen/util.c | 117 arch/ia64/xen/xcom_hcall.c | 365 ++ arch/ia64/xen/xcom_mini.c | 417 ++ arch/ia64/xen/xcom_privcmd.c | 663 ++++ arch/ia64/xen/xencomm.c | 263 + arch/ia64/xen/xenentry.S | 908 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2178 ++++++++++++++ arch/ia64/xen/xenminstate.h | 368 ++ arch/ia64/xen/xenpal.S | 76 arch/ia64/xen/xensetup.S | 53 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 62 arch/x86_64/Makefile | 20 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 743 +++++ 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 | 20 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 254 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/crash.c | 6 arch/x86_64/kernel/e820-xen.c | 763 +++++ arch/x86_64/kernel/early_printk-xen.c | 299 ++ arch/x86_64/kernel/entry-xen.S | 1217 ++++++++ arch/x86_64/kernel/genapic-xen.c | 143 arch/x86_64/kernel/genapic_xen.c | 190 + arch/x86_64/kernel/head-xen.S | 189 + arch/x86_64/kernel/head64-xen.c | 119 arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2182 ++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 99 arch/x86_64/kernel/irq.c | 4 arch/x86_64/kernel/irqflags-xen.c | 100 arch/x86_64/kernel/ldt-xen.c | 283 + arch/x86_64/kernel/machine_kexec.c | 119 arch/x86_64/kernel/mpparse-xen.c | 850 +++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 55 arch/x86_64/kernel/process-xen.c | 859 +++++ arch/x86_64/kernel/setup-xen.c | 1482 +++++++++ arch/x86_64/kernel/setup64-xen.c | 356 ++ arch/x86_64/kernel/smp-xen.c | 571 +++ arch/x86_64/kernel/traps-xen.c | 1245 ++++++++ arch/x86_64/kernel/vmlinux.lds.S | 2 arch/x86_64/kernel/vsyscall-xen.c | 329 ++ arch/x86_64/kernel/xen_entry.S | 40 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 717 ++++ arch/x86_64/mm/init-xen.c | 1182 +++++++ arch/x86_64/mm/pageattr-xen.c | 396 ++ arch/x86_64/oprofile/Makefile | 10 arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/char/hangcheck-timer.c | 2 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 12 drivers/char/tpm/Makefile | 2 drivers/char/tpm/tpm.c | 55 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_vtpm.c | 547 +++ drivers/char/tpm/tpm_vtpm.h | 68 drivers/char/tpm/tpm_xen.c | 760 +++++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/ide/ide-lib.c | 8 drivers/oprofile/buffer_sync.c | 66 drivers/oprofile/cpu_buffer.c | 51 drivers/oprofile/cpu_buffer.h | 9 drivers/oprofile/event_buffer.h | 7 drivers/oprofile/oprof.c | 32 drivers/oprofile/oprof.h | 3 drivers/oprofile/oprofile_files.c | 207 + drivers/pci/Kconfig | 3 drivers/serial/Kconfig | 1 drivers/xen/Kconfig | 283 + drivers/xen/Makefile | 19 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 624 ++++ drivers/xen/balloon/common.h | 58 drivers/xen/balloon/sysfs.c | 164 + drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 581 +++ drivers/xen/blkback/common.h | 138 drivers/xen/blkback/interface.c | 171 + drivers/xen/blkback/vbd.c | 118 drivers/xen/blkback/xenbus.c | 485 +++ drivers/xen/blkfront/Kconfig | 6 drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 891 ++++++ drivers/xen/blkfront/block.h | 156 + drivers/xen/blkfront/vbd.c | 375 ++ drivers/xen/blktap/Makefile | 6 drivers/xen/blktap/blktap.c | 1517 ++++++++++ drivers/xen/blktap/blktapmain.c | 1507 ++++++++++ drivers/xen/blktap/common.h | 120 drivers/xen/blktap/interface.c | 164 + drivers/xen/blktap/xenbus.c | 366 ++ drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 203 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 717 ++++ drivers/xen/console/xencons_ring.c | 143 drivers/xen/core/Makefile | 14 drivers/xen/core/cpu_hotplug.c | 188 + drivers/xen/core/evtchn.c | 861 +++++ drivers/xen/core/features.c | 34 drivers/xen/core/gnttab.c | 487 +++ drivers/xen/core/hypervisor_sysfs.c | 59 drivers/xen/core/machine_kexec.c | 190 + drivers/xen/core/machine_reboot.c | 185 + drivers/xen/core/reboot.c | 221 + drivers/xen/core/skbuff.c | 144 drivers/xen/core/smpboot.c | 461 +++ drivers/xen/core/xen_proc.c | 18 drivers/xen/core/xen_sysfs.c | 378 ++ drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 456 +++ drivers/xen/fbfront/Makefile | 2 drivers/xen/fbfront/xenfb.c | 750 +++++ drivers/xen/fbfront/xenkbd.c | 300 ++ drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 146 drivers/xen/netback/interface.c | 349 ++ drivers/xen/netback/loopback.c | 320 ++ drivers/xen/netback/netback.c | 1524 ++++++++++ drivers/xen/netback/xenbus.c | 450 +++ drivers/xen/netfront/Kconfig | 6 drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 2114 ++++++++++++++ drivers/xen/pciback/Makefile | 15 drivers/xen/pciback/conf_space.c | 425 ++ drivers/xen/pciback/conf_space.h | 126 drivers/xen/pciback/conf_space_capability.c | 71 drivers/xen/pciback/conf_space_capability.h | 23 drivers/xen/pciback/conf_space_capability_pm.c | 113 drivers/xen/pciback/conf_space_capability_vpd.c | 42 drivers/xen/pciback/conf_space_header.c | 299 ++ drivers/xen/pciback/conf_space_quirks.c | 128 drivers/xen/pciback/conf_space_quirks.h | 35 drivers/xen/pciback/passthrough.c | 157 + drivers/xen/pciback/pci_stub.c | 916 ++++++ drivers/xen/pciback/pciback.h | 93 drivers/xen/pciback/pciback_ops.c | 95 drivers/xen/pciback/slot.c | 151 + drivers/xen/pciback/vpci.c | 204 + drivers/xen/pciback/xenbus.c | 458 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 46 drivers/xen/pcifront/pci_op.c | 273 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 + drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 285 + drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 86 drivers/xen/tpmback/interface.c | 182 + drivers/xen/tpmback/tpmback.c | 944 ++++++ drivers/xen/tpmback/xenbus.c | 289 + drivers/xen/util.c | 70 drivers/xen/xenbus/Makefile | 9 drivers/xen/xenbus/xenbus_backend_client.c | 147 drivers/xen/xenbus/xenbus_client.c | 305 ++ drivers/xen/xenbus/xenbus_comms.c | 210 + drivers/xen/xenbus/xenbus_comms.h | 44 drivers/xen/xenbus/xenbus_dev.c | 361 ++ drivers/xen/xenbus/xenbus_probe.c | 1017 ++++++ drivers/xen/xenbus/xenbus_probe.h | 73 drivers/xen/xenbus/xenbus_probe_backend.c | 271 + drivers/xen/xenbus/xenbus_xs.c | 859 +++++ drivers/xen/xenoprof/xenoprofile.c | 500 +++ fs/Kconfig | 1 include/asm-i386/apic.h | 2 include/asm-i386/kexec.h | 14 include/asm-i386/mach-default/mach_traps.h | 12 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 203 + include/asm-i386/mach-xen/asm/dma-mapping.h | 151 + include/asm-i386/mach-xen/asm/fixmap.h | 160 + include/asm-i386/mach-xen/asm/floppy.h | 147 include/asm-i386/mach-xen/asm/highmem.h | 80 include/asm-i386/mach-xen/asm/hypercall.h | 407 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 245 + include/asm-i386/mach-xen/asm/io.h | 363 ++ include/asm-i386/mach-xen/asm/irqflags.h | 81 include/asm-i386/mach-xen/asm/kmap_types.h | 31 include/asm-i386/mach-xen/asm/maddr.h | 176 + include/asm-i386/mach-xen/asm/mmu.h | 29 include/asm-i386/mach-xen/asm/mmu_context.h | 108 include/asm-i386/mach-xen/asm/page.h | 231 + include/asm-i386/mach-xen/asm/pci.h | 153 + include/asm-i386/mach-xen/asm/pgalloc.h | 63 include/asm-i386/mach-xen/asm/pgtable-2level.h | 78 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 24 include/asm-i386/mach-xen/asm/pgtable-3level.h | 195 + include/asm-i386/mach-xen/asm/pgtable.h | 551 +++ include/asm-i386/mach-xen/asm/processor.h | 737 ++++ include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 132 include/asm-i386/mach-xen/asm/setup.h | 81 include/asm-i386/mach-xen/asm/smp.h | 114 include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 145 include/asm-i386/mach-xen/asm/system.h | 531 +++ include/asm-i386/mach-xen/asm/timer.h | 67 include/asm-i386/mach-xen/asm/tlbflush.h | 99 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/asm/xenoprof.h | 48 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.h | 5 include/asm-i386/pgtable-2level-defs.h | 2 include/asm-i386/pgtable-3level-defs.h | 2 include/asm-i386/spinlock.h | 5 include/asm-ia64/agp.h | 31 include/asm-ia64/dma-mapping.h | 98 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hw_irq.h | 10 include/asm-ia64/hypercall.h | 463 +++ include/asm-ia64/hypervisor.h | 224 + include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/io.h | 56 include/asm-ia64/iosapic.h | 2 include/asm-ia64/irq.h | 33 include/asm-ia64/machvec_dig.h | 15 include/asm-ia64/maddr.h | 102 include/asm-ia64/meminit.h | 5 include/asm-ia64/page.h | 52 include/asm-ia64/pal.h | 1 include/asm-ia64/pgalloc.h | 4 include/asm-ia64/privop.h | 60 include/asm-ia64/processor.h | 1 include/asm-ia64/sal.h | 21 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/uaccess.h | 20 include/asm-ia64/xen/privop.h | 303 ++ include/asm-ia64/xen/xcom_hcall.h | 86 include/asm-ia64/xen/xencomm.h | 60 include/asm-ia64/xenoprof.h | 48 include/asm-um/page.h | 2 include/asm-x86_64/acpi.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/dwarf2.h | 2 include/asm-x86_64/ipi.h | 5 include/asm-x86_64/kexec.h | 13 include/asm-x86_64/mach-xen/asm/agp.h | 35 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 40 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 200 + include/asm-x86_64/mach-xen/asm/dmi.h | 29 include/asm-x86_64/mach-xen/asm/e820.h | 59 include/asm-x86_64/mach-xen/asm/fixmap.h | 108 include/asm-x86_64/mach-xen/asm/floppy.h | 207 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 136 include/asm-x86_64/mach-xen/asm/hypercall.h | 406 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 301 ++ include/asm-x86_64/mach-xen/asm/irq.h | 34 include/asm-x86_64/mach-xen/asm/irqflags.h | 65 include/asm-x86_64/mach-xen/asm/maddr.h | 150 + include/asm-x86_64/mach-xen/asm/mmu.h | 38 include/asm-x86_64/mach-xen/asm/mmu_context.h | 135 include/asm-x86_64/mach-xen/asm/msr.h | 410 ++ include/asm-x86_64/mach-xen/asm/nmi.h | 96 include/asm-x86_64/mach-xen/asm/page.h | 214 + include/asm-x86_64/mach-xen/asm/pci.h | 173 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 + include/asm-x86_64/mach-xen/asm/pgtable.h | 562 +++ include/asm-x86_64/mach-xen/asm/processor.h | 499 +++ include/asm-x86_64/mach-xen/asm/smp.h | 132 include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 266 + include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 120 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xenoprof.h | 1 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 | 111 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 63 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/interrupt.h | 6 include/linux/kexec.h | 13 include/linux/mm.h | 10 include/linux/oprofile.h | 11 include/linux/pfn.h | 4 include/linux/skbuff.h | 15 include/xen/balloon.h | 57 include/xen/cpu_hotplug.h | 43 include/xen/driver_util.h | 15 include/xen/evtchn.h | 113 include/xen/features.h | 20 include/xen/foreign_page.h | 30 include/xen/gnttab.h | 151 + include/xen/hvm.h | 24 include/xen/hypervisor_sysfs.h | 32 include/xen/interface/COPYING | 38 include/xen/interface/acm.h | 205 + include/xen/interface/acm_ops.h | 120 include/xen/interface/arch-ia64.h | 500 +++ include/xen/interface/arch-powerpc.h | 121 include/xen/interface/arch-x86/xen-x86_32.h | 151 + include/xen/interface/arch-x86/xen-x86_64.h | 208 + include/xen/interface/arch-x86/xen.h | 190 + include/xen/interface/arch-x86_32.h | 27 include/xen/interface/arch-x86_64.h | 27 include/xen/interface/callback.h | 92 include/xen/interface/dom0_ops.h | 120 include/xen/interface/domctl.h | 437 ++ include/xen/interface/elfnote.h | 179 + include/xen/interface/event_channel.h | 251 + include/xen/interface/features.h | 71 include/xen/interface/grant_table.h | 380 ++ include/xen/interface/hvm/e820.h | 47 include/xen/interface/hvm/hvm_info_table.h | 41 include/xen/interface/hvm/hvm_op.h | 53 include/xen/interface/hvm/ioreq.h | 97 include/xen/interface/hvm/params.h | 36 include/xen/interface/hvm/vmx_assist.h | 116 include/xen/interface/io/blkif.h | 126 include/xen/interface/io/console.h | 51 include/xen/interface/io/fbif.h | 138 include/xen/interface/io/kbdif.h | 130 include/xen/interface/io/netif.h | 184 + include/xen/interface/io/pciif.h | 83 include/xen/interface/io/ring.h | 299 ++ include/xen/interface/io/tpmif.h | 77 include/xen/interface/io/xenbus.h | 73 include/xen/interface/io/xs_wire.h | 116 include/xen/interface/kexec.h | 137 include/xen/interface/memory.h | 276 + include/xen/interface/nmi.h | 78 include/xen/interface/physdev.h | 169 + include/xen/interface/platform.h | 143 include/xen/interface/sched.h | 121 include/xen/interface/sysctl.h | 169 + include/xen/interface/trace.h | 102 include/xen/interface/vcpu.h | 142 include/xen/interface/version.h | 91 include/xen/interface/xen-compat.h | 51 include/xen/interface/xen.h | 597 ++++ include/xen/interface/xencomm.h | 41 include/xen/interface/xenoprof.h | 130 include/xen/pcifront.h | 76 include/xen/public/evtchn.h | 88 include/xen/public/privcmd.h | 79 include/xen/xen_proc.h | 12 include/xen/xenbus.h | 307 ++ include/xen/xencons.h | 19 include/xen/xenoprof.h | 42 kernel/Kconfig.preempt | 1 kernel/fork.c | 3 kernel/irq/manage.c | 1 kernel/kexec.c | 48 lib/Kconfig.debug | 2 lib/Makefile | 1 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 120 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 63 net/core/skbuff.c | 29 net/ipv4/netfilter/ip_nat_proto_tcp.c | 7 net/ipv4/netfilter/ip_nat_proto_udp.c | 7 net/ipv4/xfrm4_output.c | 6 net/ipv6/addrconf.c | 3 scripts/Makefile.xen | 14 463 files changed, 96328 insertions(+), 237 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.84 -r 1.84.2.1 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/linux-2.6-xen.patch,v retrieving revision 1.84 retrieving revision 1.84.2.1 diff -u -r1.84 -r1.84.2.1 --- linux-2.6-xen.patch 22 Jan 2007 23:08:27 -0000 1.84 +++ linux-2.6-xen.patch 23 Jan 2007 00:33:19 -0000 1.84.2.1 @@ -1,6 +1,6 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile source/arch/i386/boot-xen/Makefile --- /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/boot-xen/Makefile 2006-12-23 17:42:12.000000000 +0100 ++++ source/arch/i386/boot-xen/Makefile 2007-01-15 15:48:20.000000000 +0100 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded @@ -25,7 +25,7 @@ + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig source/arch/i386/Kconfig --- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/Kconfig 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/Kconfig 2007-01-15 15:48:20.000000000 +0100 @@ -16,6 +16,7 @@ config X86_32 config GENERIC_TIME @@ -166,7 +166,7 @@ config KEXEC bool "kexec system call" -+ depends on !X86_XEN ++ depends on !XEN_UNPRIVILEGED_GUEST 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 @@ -308,7 +308,7 @@ default y diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu source/arch/i386/Kconfig.cpu --- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.cpu 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/Kconfig.cpu 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/Kconfig.cpu 2007-01-15 15:48:20.000000000 +0100 @@ -252,7 +252,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -327,7 +327,7 @@ default y diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug source/arch/i386/Kconfig.debug --- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/Kconfig.debug 2006-12-23 17:42:12.000000000 +0100 ++++ source/arch/i386/Kconfig.debug 2007-01-15 15:48:20.000000000 +0100 @@ -79,6 +79,7 @@ config X86_MPPARSE config DOUBLEFAULT default y @@ -338,7 +338,7 @@ would otherwise cause a system to silently reboot. Disabling this diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c source/arch/i386/kernel/acpi/boot-xen.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/acpi/boot-xen.c 2006-12-23 17:46:06.000000000 +0100 ++++ source/arch/i386/kernel/acpi/boot-xen.c 2007-01-23 00:21:39.000000000 +0100 @@ -0,0 +1,1332 @@ +/* + * boot.c - Architecture-Specific Low-Level ACPI Boot Support @@ -1674,7 +1674,7 @@ +early_param("acpi_sci", setup_acpi_sci); diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile source/arch/i386/kernel/acpi/Makefile --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/acpi/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/kernel/acpi/Makefile 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/acpi/Makefile 2007-01-15 15:48:21.000000000 +0100 @@ -8,3 +8,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o endif @@ -1685,7 +1685,7 @@ +endif diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c source/arch/i386/kernel/alternative.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/alternative.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/kernel/alternative.c 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/alternative.c 2007-01-15 15:48:21.000000000 +0100 @@ -4,7 +4,11 @@ #include #include @@ -1725,7 +1725,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c source/arch/i386/kernel/apic-xen.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/apic-xen.c 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/apic-xen.c 2007-01-15 15:48:21.000000000 +0100 @@ -0,0 +1,223 @@ +/* + * Local APIC handling, local APIC timers @@ -1952,7 +1952,7 @@ + diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c source/arch/i386/kernel/asm-offsets.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/asm-offsets.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/kernel/asm-offsets.c 2006-12-23 17:42:12.000000000 +0100 ++++ source/arch/i386/kernel/asm-offsets.c 2007-01-15 15:48:21.000000000 +0100 @@ -66,9 +66,14 @@ void foo(void) OFFSET(pbe_orig_address, pbe, orig_address); OFFSET(pbe_next, pbe, next); @@ -1971,7 +1971,7 @@ DEFINE(VDSO_PRELINK, VDSO_PRELINK); diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c source/arch/i386/kernel/cpu/common-xen.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/cpu/common-xen.c 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/cpu/common-xen.c 2007-01-15 15:48:21.000000000 +0100 @@ -0,0 +1,747 @@ +#include +#include @@ -2722,7 +2722,7 @@ +#endif diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile source/arch/i386/kernel/cpu/Makefile --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/kernel/cpu/Makefile 2006-12-23 17:42:12.000000000 +0100 ++++ source/arch/i386/kernel/cpu/Makefile 2007-01-15 15:48:21.000000000 +0100 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/ @@ -2734,7 +2734,7 @@ +endif diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c source/arch/i386/kernel/cpu/mtrr/main-xen.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/cpu/mtrr/main-xen.c 2007-01-15 15:48:21.000000000 +0100 @@ -0,0 +1,198 @@ +#include +#include @@ -2936,7 +2936,7 @@ +subsys_initcall(mtrr_init); diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile source/arch/i386/kernel/cpu/mtrr/Makefile --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/cpu/mtrr/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/kernel/cpu/mtrr/Makefile 2006-12-23 17:42:12.000000000 +0100 ++++ source/arch/i386/kernel/cpu/mtrr/Makefile 2007-01-15 15:48:21.000000000 +0100 @@ -3,3 +3,10 @@ obj-y += amd.o obj-y += cyrix.o obj-y += centaur.o @@ -2948,15 +2948,47 @@ +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen)) +obj-y := $(call cherrypickxen, $(obj-y)) +endif +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/crash.c source/arch/i386/kernel/crash.c +--- /scratch/src/linux-2.6.19.2/arch/i386/kernel/crash.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/kernel/crash.c 2007-01-15 15:48:21.000000000 +0100 +@@ -93,6 +93,7 @@ static void crash_save_self(struct pt_re + crash_save_this_cpu(regs, cpu); + } + ++#ifndef CONFIG_XEN + #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) + static atomic_t waiting_for_crash_ipi; + +@@ -174,6 +175,7 @@ static void nmi_shootdown_cpus(void) + /* There are no cpus to shootdown */ + } + #endif ++#endif /* CONFIG_XEN */ + + void machine_crash_shutdown(struct pt_regs *regs) + { +@@ -190,10 +192,12 @@ void machine_crash_shutdown(struct pt_re + + /* Make a note of crashing cpu. Will be used in NMI callback.*/ + crashing_cpu = safe_smp_processor_id(); ++#ifndef CONFIG_XEN + nmi_shootdown_cpus(); + lapic_shutdown(); + #if defined(CONFIG_X86_IO_APIC) + disable_IO_APIC(); + #endif ++#endif /* CONFIG_XEN */ + crash_save_self(regs); + } diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c source/arch/i386/kernel/early_printk-xen.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/early_printk-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/early_printk-xen.c 2006-12-23 17:42:12.000000000 +0100 ++++ source/arch/i386/kernel/early_printk-xen.c 2007-01-15 15:48:21.000000000 +0100 @@ -0,0 +1,2 @@ + +#include "../../x86_64/kernel/early_printk-xen.c" diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S source/arch/i386/kernel/entry.S --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry.S 2006-11-29 22:57:37.000000000 +0100 -+++ source/arch/i386/kernel/entry.S 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/entry.S 2007-01-15 15:48:21.000000000 +0100 @@ -281,7 +281,7 @@ ENTRY(sysenter_entry) CFI_SIGNAL_FRAME CFI_DEF_CFA esp, 0 @@ -2986,7 +3018,7 @@ pushfl; \ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry-xen.S source/arch/i386/kernel/entry-xen.S --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/entry-xen.S 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/entry-xen.S 2006-12-23 17:44:39.000000000 +0100 ++++ source/arch/i386/kernel/entry-xen.S 2007-01-15 15:48:21.000000000 +0100 @@ -0,0 +1,1254 @@ +/* + * linux/arch/i386/entry.S @@ -4244,8 +4276,8 @@ +syscall_table_size=(.-sys_call_table) diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/fixup.c source/arch/i386/kernel/fixup.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/fixup.c 1970-01-01 01:00:00.000000000 +0100 -+++ source/arch/i386/kernel/fixup.c 2006-12-23 17:42:12.000000000 +0100 -@@ -0,0 +1,92 @@ ++++ source/arch/i386/kernel/fixup.c 2007-01-15 15:48:21.000000000 +0100 +@@ -0,0 +1,95 @@ [...40416 lines suppressed...] + << PAGE_SHIFT); + if (result < 0) + goto out; +@@ -811,6 +823,7 @@ out: + return result; + } + ++#ifndef CONFIG_XEN + static int kimage_load_crash_segment(struct kimage *image, + struct kexec_segment *segment) + { +@@ -833,7 +846,7 @@ static int kimage_load_crash_segment(str + char *ptr; + size_t uchunk, mchunk; + +- page = pfn_to_page(maddr >> PAGE_SHIFT); ++ page = kexec_pfn_to_page(maddr >> PAGE_SHIFT); + if (page == 0) { + result = -ENOMEM; + goto out; +@@ -881,6 +894,13 @@ static int kimage_load_segment(struct ki + + return result; + } ++#else /* CONFIG_XEN */ ++static int kimage_load_segment(struct kimage *image, ++ struct kexec_segment *segment) ++{ ++ return kimage_load_normal_segment(image, segment); ++} ++#endif + + /* + * Exec Kernel system call: for obvious reasons only root may call it. +@@ -991,6 +1011,11 @@ asmlinkage long sys_kexec_load(unsigned + if (result) + goto out; + } ++#ifdef CONFIG_XEN ++ result = xen_machine_kexec_load(image); ++ if (result) ++ goto out; ++#endif + /* Install the new kernel, and Uninstall the old */ + image = xchg(dest_image, image); + +@@ -1045,7 +1070,6 @@ void crash_kexec(struct pt_regs *regs) + { + int locked; + +- + /* Take the kexec_lock here to prevent sys_kexec_load + * running on one cpu from replacing the crash kernel + * we are using after a panic on a different cpu. diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Kconfig.debug source/lib/Kconfig.debug --- /scratch/src/linux-2.6.19.2/lib/Kconfig.debug 2006-11-29 22:57:37.000000000 +0100 -+++ source/lib/Kconfig.debug 2006-12-23 17:44:56.000000000 +0100 ++++ source/lib/Kconfig.debug 2007-01-15 15:49:04.000000000 +0100 @@ -341,7 +341,7 @@ config FRAME_POINTER config UNWIND_INFO @@ -94267,20 +100615,18 @@ If you say Y here the resulting kernel image will be slightly larger diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/lib/Makefile source/lib/Makefile --- /scratch/src/linux-2.6.19.2/lib/Makefile 2006-11-29 22:57:37.000000000 +0100 -+++ source/lib/Makefile 2006-12-23 17:44:56.000000000 +0100 -@@ -54,6 +54,9 @@ obj-$(CONFIG_SMP) += percpu_counter.o ++++ source/lib/Makefile 2007-01-15 15:49:04.000000000 +0100 +@@ -54,6 +54,7 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o obj-$(CONFIG_SWIOTLB) += swiotlb.o -+ifneq ($(CONFIG_XEN_IA64_DOM0_NON_VP),y) +swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o -+endif hostprogs-y := gen_crc32table clean-files := crc32table.h diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/highmem.c source/mm/highmem.c --- /scratch/src/linux-2.6.19.2/mm/highmem.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/mm/highmem.c 2006-12-23 17:44:56.000000000 +0100 ++++ source/mm/highmem.c 2007-01-15 15:49:04.000000000 +0100 @@ -148,6 +148,17 @@ start: return vaddr; } @@ -94301,7 +100647,7 @@ unsigned long vaddr; diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/Kconfig source/mm/Kconfig --- /scratch/src/linux-2.6.19.2/mm/Kconfig 2006-11-29 22:57:37.000000000 +0100 -+++ source/mm/Kconfig 2006-12-23 17:44:56.000000000 +0100 ++++ source/mm/Kconfig 2007-01-15 15:49:04.000000000 +0100 @@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE # 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. @@ -94319,7 +100665,7 @@ # diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/memory.c source/mm/memory.c --- /scratch/src/linux-2.6.19.2/mm/memory.c 2007-01-15 16:07:25.000000000 +0100 -+++ source/mm/memory.c 2007-01-22 12:58:23.000000000 +0100 ++++ source/mm/memory.c 2007-01-23 00:22:40.000000000 +0100 @@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar * and that the resulting page looks ok. */ @@ -94470,7 +100816,7 @@ * which was read non-atomically. Before making any commitment, on diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/mmap.c source/mm/mmap.c --- /scratch/src/linux-2.6.19.2/mm/mmap.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/mm/mmap.c 2006-12-23 17:44:56.000000000 +0100 ++++ source/mm/mmap.c 2007-01-15 15:49:04.000000000 +0100 @@ -1970,6 +1970,10 @@ void exit_mmap(struct mm_struct *mm) unsigned long nr_accounted = 0; unsigned long end; @@ -94484,7 +100830,7 @@ tlb = tlb_gather_mmu(mm, 1); diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/mm/page_alloc.c source/mm/page_alloc.c --- /scratch/src/linux-2.6.19.2/mm/page_alloc.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/mm/page_alloc.c 2006-12-23 17:44:56.000000000 +0100 ++++ source/mm/page_alloc.c 2007-01-15 15:49:04.000000000 +0100 @@ -496,6 +496,8 @@ static void __free_pages_ok(struct page int i; int reserved = 0; @@ -94514,7 +100860,7 @@ if (free_pages_check(page)) diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/dev.c source/net/core/dev.c --- /scratch/src/linux-2.6.19.2/net/core/dev.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/net/core/dev.c 2006-12-23 17:44:56.000000000 +0100 ++++ source/net/core/dev.c 2007-01-15 15:49:05.000000000 +0100 @@ -118,6 +118,12 @@ #include #include @@ -94615,7 +100961,7 @@ EXPORT_SYMBOL(br_handle_frame_hook); diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/skbuff.c source/net/core/skbuff.c --- /scratch/src/linux-2.6.19.2/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/net/core/skbuff.c 2006-12-23 17:44:56.000000000 +0100 ++++ source/net/core/skbuff.c 2007-01-15 15:49:05.000000000 +0100 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug); * Buffers may only be allocated from interrupts using a @gfp_mask of * %GFP_ATOMIC. @@ -94686,9 +101032,23 @@ C(pkt_type); C(ip_summed); C(priority); +@@ -860,12 +879,12 @@ int ___pskb_trim(struct sk_buff *skb, un + int offset = skb_headlen(skb); + int nfrags = skb_shinfo(skb)->nr_frags; + int i; ++ + int err; + + if (skb_cloned(skb) && + unlikely((err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))) + return err; +- + i = 0; + if (offset >= len) + goto drop_pages; diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c source/net/ipv4/netfilter/ip_nat_proto_tcp.c --- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 17:44:57.000000000 +0100 ++++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-01-15 15:49:06.000000000 +0100 @@ -129,9 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; @@ -94708,7 +101068,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c source/net/ipv4/netfilter/ip_nat_proto_udp.c --- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 17:44:57.000000000 +0100 ++++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-01-15 15:49:06.000000000 +0100 @@ -115,11 +115,18 @@ udp_manip_pkt(struct sk_buff **pskb, } @@ -94730,7 +101090,7 @@ } diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c source/net/ipv4/xfrm4_output.c --- /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/net/ipv4/xfrm4_output.c 2006-12-23 17:44:57.000000000 +0100 ++++ source/net/ipv4/xfrm4_output.c 2007-01-15 15:49:06.000000000 +0100 @@ -18,6 +18,8 @@ #include #include @@ -94753,7 +101113,7 @@ if (err) diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c source/net/ipv6/addrconf.c --- /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c 2007-01-15 16:07:25.000000000 +0100 -+++ source/net/ipv6/addrconf.c 2007-01-22 12:58:23.000000000 +0100 ++++ source/net/ipv6/addrconf.c 2007-01-23 00:22:40.000000000 +0100 @@ -2545,6 +2545,8 @@ static void addrconf_dad_start(struct in spin_lock_bh(&ifp->lock); @@ -94773,7 +101133,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/scripts/Makefile.xen source/scripts/Makefile.xen --- /scratch/src/linux-2.6.19.2/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 -+++ source/scripts/Makefile.xen 2006-12-23 17:42:55.000000000 +0100 ++++ source/scripts/Makefile.xen 2007-01-15 15:49:08.000000000 +0100 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v retrieving revision 1.512 retrieving revision 1.512.2.1 diff -u -r1.512 -r1.512.2.1 --- sources 10 Jan 2007 23:22:55 -0000 1.512 +++ sources 23 Jan 2007 00:33:23 -0000 1.512.2.1 @@ -1,3 +1,3 @@ 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 -a9d44b2651b0898e103395b2a7a4f263 xen-3.0.3-11774.tar.bz2 e8a9a6dc65da3f7b192e7caa969f9a1b patch-2.6.19.2.bz2 +ec35d2aa26cb452832761ff7ce9c4583 xen-3.0.4-13132.tar.bz2 xen-version-strings.patch: Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: xen-version-strings.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/xen-version-strings.patch,v retrieving revision 1.3 retrieving revision 1.3.16.1 diff -u -r1.3 -r1.3.16.1 --- xen-version-strings.patch 16 Nov 2006 22:34:29 -0000 1.3 +++ xen-version-strings.patch 23 Jan 2007 00:33:23 -0000 1.3.16.1 @@ -1,11 +1,11 @@ ---- xen/Makefile.~1~ 2006-10-16 17:10:57.000000000 +0100 -+++ xen/Makefile 2006-10-16 17:11:08.000000000 +0100 +--- xen/Makefile.orig 2007-01-14 22:08:05.000000000 +0100 ++++ xen/Makefile 2007-01-23 01:13:35.000000000 +0100 @@ -2,7 +2,11 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 3 export XEN_SUBVERSION = 0 --export XEN_EXTRAVERSION ?= .3-0 -+export XEN_BASEVERSION ?= .3-0 +-export XEN_EXTRAVERSION ?= .4-1$(XEN_VENDORVERSION) ++export XEN_BASEVERSION ?= .4-1$(XEN_VENDORVERSION) +export XEN_BUILDER ?= +export XEN_BUILDVERSION ?= +export XEN_EXTRAVERSION ?= $(XEN_BASEVERSION)$(XEN_BUILDVERSION) @@ -13,9 +13,9 @@ export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -@@ -102,7 +106,7 @@ +@@ -108,8 +112,8 @@ include/xen/compile.h: include/xen/compi -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ - -e 's!@@changeset@@!$(shell ((hg parents || head -n 7 ../ChangeLog || echo date: unavailable) | awk '{FS="changeset:[ ]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END {print D, CS}') 2>/dev/null)!g' \ + -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \ < include/xen/compile.h.in > $@.new - tools/figlet/figlet -d tools/figlet Xen $(XEN_FULLVERSION) >> $@.new + tools/figlet/figlet -d tools/figlet Xen $(XEN_SHORTVERSION) >> $@.new From fedora-cvs-commits at redhat.com Tue Jan 23 01:07:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:07:01 -0500 Subject: rpms/virt-manager/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 virt-manager.spec, 1.14, 1.15 virt-manager-disable-config-hvm.patch, 1.1, NONE virt-manager-hostname-resolution-errors.patch, 1.1, NONE vm-limit-memory.patch, 1.1, NONE vm-non-sparse-file.patch, 1.1, NONE vm-use-ipv4-for-console.patch, 1.1, NONE Message-ID: <200701230107.l0N171Zx007025@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/virt-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6981 Modified Files: .cvsignore sources virt-manager.spec Removed Files: virt-manager-disable-config-hvm.patch virt-manager-hostname-resolution-errors.patch vm-limit-memory.patch vm-non-sparse-file.patch vm-use-ipv4-for-console.patch Log Message: Updated to virt-manager 0.3.0 release Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/virt-manager/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 Dec 2006 21:16:55 -0000 1.9 +++ .cvsignore 23 Jan 2007 01:06:58 -0000 1.10 @@ -1,2 +1 @@ -virt-manager-0.2.6.tar.gz -virt-manager-i18n-po-2006-12-18.tar.gz +virt-manager-0.3.0.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/virt-manager/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Dec 2006 21:16:55 -0000 1.9 +++ sources 23 Jan 2007 01:06:59 -0000 1.10 @@ -1,2 +1 @@ -bc15748340822e0004fe122c82fa9d8f virt-manager-0.2.6.tar.gz -2682a7c7f67b30d345d51a55efeac544 virt-manager-i18n-po-2006-12-18.tar.gz +b1020520f01201d32a0aed2a34ee5025 virt-manager-0.3.0.tar.gz Index: virt-manager.spec =================================================================== RCS file: /cvs/dist/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- virt-manager.spec 19 Dec 2006 21:16:55 -0000 1.14 +++ virt-manager.spec 23 Jan 2007 01:06:59 -0000 1.15 @@ -7,8 +7,8 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.2.6 -Release: 3%{_extra_release} +Version: 0.3.0 +Release: 1%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -17,20 +17,13 @@ Source0: http://virt-manager.et.redhat.com/download/sources/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.pam Source2: %{name}.console -# Updated translations from Fedora i18n repository -Source3: %{name}-i18n-po-2006-12-18.tar.gz -Patch1: vm-use-ipv4-for-console.patch -Patch2: virt-manager-hostname-resolution-errors.patch -Patch3: vm-limit-memory.patch -Patch4: virt-manager-disable-config-hvm.patch -Patch5: vm-non-sparse-file.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # These two are just the oldest version tested Requires: pygtk2 >= 1.99.12-6 Requires: gnome-python2-gconf >= 1.99.11-7 # Absolutely require this version or newer -Requires: libvirt-python >= 0.1.8 +Requires: libvirt-python >= 0.1.11-1 # Definitely does not work with earlier due to python API changes Requires: dbus-python >= 0.61 # Might work with earlier, but this is what we've tested @@ -43,7 +36,7 @@ # Minimum we've tested with Requires: libxml2-python >= 2.6.23 # Required to install Xen guests -Requires: python-virtinst >= 0.98.0 +Requires: python-virtinst >= 0.100.0 # Required for loading the glade UI Requires: pygtk2-libglade # Required for our graphics which are currently SVG format @@ -70,12 +63,7 @@ API. %prep -%setup -q -a 3 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%setup -q %build %configure @@ -158,6 +146,20 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog +* Mon Jan 22 2007 Daniel P. Berrange = 0.100.0 and libvirt >= 0.1.11 for ianctive + domain management capabilities +- Add progress bars during VM creation stage +- Improved reliability of VNC console +- Updated translations again +- Added destroy option to menu bar to forceably kill a guest +- Visually differentiate allocated memory, from actual used memory on host +- Validate file magic when restoring a guest from a savd file +- Performance work on domain listing +- Allow creation of non-sparse files +- Fix backspace key in serial console + * Tue Dec 19 2006 Daniel P. Berrange - 0.2.6-3.fc7 - Imported latest translations from Fedora i18n repository (bz 203783) - Use 127.0.0.1 address for connecting to VNC console instead of --- virt-manager-disable-config-hvm.patch DELETED --- --- virt-manager-hostname-resolution-errors.patch DELETED --- --- vm-limit-memory.patch DELETED --- --- vm-non-sparse-file.patch DELETED --- --- vm-use-ipv4-for-console.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 01:08:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:08:47 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch, 1.6, 1.7 selinux-policy.spec, 1.384, 1.385 Message-ID: <200701230108.l0N18lc6008495@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8364 Modified Files: policy-20070102.patch selinux-policy.spec Log Message: * Mon Jan 22 2007 Dan Walsh 2.5.1-5 - Continue fixing, additional user domains policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 79 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/userhelper.if | 19 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 52 +++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 180 +++++++++++- policy/modules/kernel/filesystem.if | 19 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 1 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 1 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 160 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 3 policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 111 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 7 policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 449 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 158 files changed, 3619 insertions(+), 638 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- policy-20070102.patch 22 Jan 2007 18:04:51 -0000 1.6 +++ policy-20070102.patch 23 Jan 2007 01:08:45 -0000 1.7 @@ -344,7 +344,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.1/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/global_tunables 2007-01-17 15:35:11.000000000 -0500 ++++ serefpolicy-2.5.1/policy/global_tunables 2007-01-22 14:45:19.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -426,7 +426,7 @@ ## Allow gpg executable stack ##

        ##         -@@ -513,91 +566,90 @@ +@@ -513,91 +566,89 @@ ## ##

        @@ -458,63 +458,62 @@ -gen_tunable(user_net_control,false) +gen_tunable(allow_mounton_anydir,true) -+######################################## -+# -+# Targeted policy specific -+# -+ -+ifdef(`targeted_policy',` ## ##

        -## Allow user to r/w files on filesystems -## that do not have extended attributes (FAT, CDROM, FLOPPY) -+## Allow all daemons the ability to use unallocated ttys ++## Allow unlabeled packets to work on system ##

        ##         -gen_tunable(user_rw_noexattrfile,false) -+gen_tunable(allow_daemons_use_tty,false) ++gen_tunable(allow_unlabeled_packets,true) ++######################################## ++# ++# Targeted policy specific ++# ++ ++ifdef(`targeted_policy',` ## ##

        -## Allow users to run TCP servers (bind to ports and accept connection from -## the same domain and outside users) disabling this forces FTP passive mode -## and may change other protocols. -+## Allow all daemons to write corefiles to / ++## Allow all daemons the ability to use unallocated ttys ##

        ##         -gen_tunable(user_tcp_server,false) -+gen_tunable(allow_daemons_dump_core,false) ++gen_tunable(allow_daemons_use_tty,false) ## ##

        -## Allow w to display everyone -+## Allow mount to mount any file ++## Allow all daemons to write corefiles to / ##

        ##         -gen_tunable(user_ttyfile_stat,false) -+gen_tunable(allow_mount_anyfile,false) ++gen_tunable(allow_daemons_dump_core,false) ## ##

        -## Allow applications to write untrusted content -## If this is disallowed, no Internet content -## will be stored. -+## Allow spamd to read/write user home directories. ++## Allow mount to mount any file ##

        ##         -gen_tunable(write_untrusted_content,false) -+gen_tunable(spamd_enable_home_dirs,true) -+') ++gen_tunable(allow_mount_anyfile,false) ## ##

        -## Allow xdm logins as sysadm -+## Allow unconfined to dyntrans to unconfined_execmem ++## Allow spamd to read/write user home directories. ##

        ##         -gen_tunable(xdm_sysadm_login,false) --') -+gen_tunable(allow_unconfined_execmem_dyntrans,false) ++gen_tunable(spamd_enable_home_dirs,true) + ') -######################################## -# @@ -525,22 +524,22 @@ ## ##

        -## Allow all daemons the ability to use unallocated ttys -+## Use lpd server instead of cups ++## Allow unconfined to dyntrans to unconfined_execmem ##

        ##         -gen_tunable(allow_daemons_use_tty,false) -+gen_tunable(use_lpd_server,false) -+ ++gen_tunable(allow_unconfined_execmem_dyntrans,false) ## ##

        -## Allow mount to mount any file -+## Allow unlabeled packets to work on system ++## Use lpd server instead of cups ##

        ##         -gen_tunable(allow_mount_anyfile,false) -+gen_tunable(allow_unlabeled_packets,true) - +- ++gen_tunable(use_lpd_server,false) ++ +ifdef(`mls_policy',` ## ##

        @@ -2577,30 +2576,25 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.1/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.if 2007-01-17 13:32:47.000000000 -0500 -@@ -909,7 +909,20 @@ ++++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.if 2007-01-22 13:41:32.000000000 -0500 +@@ -909,7 +909,15 @@ type bin_t, sbin_t; ') - can_exec($1,exec_type) -+ ifdef(`targeted_policy',` -+ can_exec($1,exec_type) -+ ', ` -+ # Need this dontaudit or command completion fires hundreds of avcs -+ dontaudit $1 exec_type:file execute; -+ corecmd_exec_bin($1) -+ corecmd_exec_sbin($1) -+ corecmd_exec_shell($1) -+ corecmd_exec_ls($1) -+ corecmd_exec_chroot($1) -+ ') -+ ++ # Need this dontaudit or command completion fires hundreds of avcs ++ dontaudit $1 exec_type:file execute; ++ corecmd_exec_bin($1) ++ corecmd_exec_sbin($1) ++ corecmd_exec_shell($1) ++ corecmd_exec_ls($1) ++ corecmd_exec_chroot($1) + userdom_exec($1) + list_dirs_pattern($1,{ bin_t sbin_t },{ bin_t sbin_t }) read_lnk_files_pattern($1,{ bin_t sbin_t },{ bin_t sbin_t }) ') -@@ -931,6 +944,7 @@ +@@ -931,6 +939,7 @@ type bin_t, sbin_t; ') @@ -2608,7 +2602,7 @@ manage_files_pattern($1,{ bin_t sbin_t },exec_type) manage_lnk_files_pattern($1,{ bin_t sbin_t },{ bin_t sbin_t }) ') -@@ -952,6 +966,7 @@ +@@ -952,6 +961,7 @@ ') allow $1 exec_type:file relabel_file_perms; @@ -2616,7 +2610,7 @@ ') ######################################## -@@ -970,4 +985,44 @@ +@@ -970,4 +980,44 @@ ') allow $1 exec_type:file { getattr read execute }; @@ -2890,7 +2884,7 @@ ifelse(`$5',`',`',`declare_ports($1,shiftn(4,$*))')dnl diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.5.1/policy/modules/kernel/devices.te --- nsaserefpolicy/policy/modules/kernel/devices.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/devices.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/devices.te 2007-01-22 13:37:34.000000000 -0500 @@ -70,6 +70,7 @@ # type kmsg_device_t; @@ -3449,7 +3443,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.5.1/policy/modules/kernel/terminal.if --- nsaserefpolicy/policy/modules/kernel/terminal.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/terminal.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/terminal.if 2007-01-22 13:38:23.000000000 -0500 @@ -636,6 +636,8 @@ attribute ptynode; ') @@ -3459,10 +3453,40 @@ dontaudit $1 ptynode:chr_file getattr; ') +@@ -1099,3 +1101,21 @@ + + dontaudit $1 ttynode:chr_file { read write }; + ') ++ ++######################################## ++##

        ++## Unconfined access to terminals. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`term_unconfined',` ++ gen_require(` ++ attribute term_unconfined_type; ++ ') ++ ++ typeattribute $1 term_unconfined_type; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.te serefpolicy-2.5.1/policy/modules/kernel/terminal.te --- nsaserefpolicy/policy/modules/kernel/terminal.te 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/terminal.te 2007-01-17 13:32:47.000000000 -0500 -@@ -28,6 +28,7 @@ ++++ serefpolicy-2.5.1/policy/modules/kernel/terminal.te 2007-01-22 13:43:01.000000000 -0500 +@@ -9,6 +9,7 @@ + attribute ptynode; + attribute server_ptynode; + attribute serial_device; ++attribute term_unconfined_type; + + # + # bsdpty_device_t is the type of /dev/[tp]ty[abcdepqrstuvwxyz][0-9a-f] +@@ -28,6 +29,7 @@ type devpts_t; files_mountpoint(devpts_t) fs_associate_tmpfs(devpts_t) @@ -3470,6 +3494,13 @@ fs_type(devpts_t) fs_use_trans devpts gen_context(system_u:object_r:devpts_t,s0); +@@ -65,3 +67,6 @@ + # + type usbtty_device_t, serial_device; + dev_node(usbtty_device_t) ++ ++allow term_unconfined_type { ttynode ptynode }:chr_file *; ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.1/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/apache.fc 2007-01-17 13:32:47.000000000 -0500 @@ -5108,8 +5139,36 @@ userdom_manage_generic_user_home_content_symlinks(spamd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.1/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ssh.if 2007-01-17 15:51:57.000000000 -0500 -@@ -226,6 +226,7 @@ ++++ serefpolicy-2.5.1/policy/modules/services/ssh.if 2007-01-22 15:10:20.000000000 -0500 +@@ -37,9 +37,7 @@ + attribute ssh_server; + type ssh_exec_t, sshd_key_t; + +- ifdef(`strict_policy',` +- type sshd_tmp_t; +- ') ++ type sshd_tmp_t; + ') + + ############################## +@@ -147,12 +145,10 @@ + sysnet_read_config($1_ssh_t) + sysnet_dns_name_resolve($1_ssh_t) + +- ifdef(`strict_policy',` +- # Access the ssh temporary files. +- allow $1_ssh_t sshd_tmp_t:dir manage_dir_perms; +- allow $1_ssh_t sshd_tmp_t:file manage_file_perms; +- files_tmp_filetrans($1_ssh_t, sshd_tmp_t, { file dir }) +- ') ++ # Access the ssh temporary files. ++ allow $1_ssh_t sshd_tmp_t:dir manage_dir_perms; ++ allow $1_ssh_t sshd_tmp_t:file manage_file_perms; ++ files_tmp_filetrans($1_ssh_t, sshd_tmp_t, { file dir }) + + tunable_policy(`read_default_t',` + files_list_default($1_ssh_t) +@@ -226,6 +222,7 @@ domain_type($1_ssh_agent_t) domain_entry_file($1_ssh_agent_t,ssh_agent_exec_t) role $3 types $1_ssh_agent_t; @@ -5117,7 +5176,7 @@ type $1_ssh_agent_tmp_t; files_tmp_file($1_ssh_agent_tmp_t) -@@ -257,6 +258,9 @@ +@@ -257,6 +254,9 @@ stream_connect_pattern($1_ssh_t,$1_ssh_agent_tmp_t,$1_ssh_agent_tmp_t,$1_ssh_agent_t) allow $1_ssh_t sshd_t:unix_stream_socket connectto; @@ -5127,7 +5186,7 @@ userdom_use_unpriv_users_fds($1_ssh_t) userdom_dontaudit_list_user_home_dirs($1,$1_ssh_t) -@@ -292,8 +296,6 @@ +@@ -292,8 +292,6 @@ ') ifdef(`TODO',` @@ -5136,7 +5195,7 @@ # for /bin/sh used to execute xauth dontaudit $1_ssh_t proc_t:{ lnk_file file } { getattr read }; -@@ -713,3 +715,62 @@ +@@ -713,3 +711,62 @@ dontaudit $1 sshd_key_t:file { getattr read }; ') @@ -5201,7 +5260,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.5.1/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/ssh.te 2007-01-17 13:44:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ssh.te 2007-01-22 14:50:55.000000000 -0500 @@ -10,7 +10,7 @@ # ssh client executable. @@ -5211,31 +5270,197 @@ type ssh_keygen_t; type ssh_keygen_exec_t; -@@ -63,6 +63,7 @@ +@@ -27,24 +27,17 @@ + files_type(sshd_key_t) - type sshd_tmp_t; - files_tmp_file(sshd_tmp_t) -+ files_poly_parent(sshd_tmp_t) - ') + ifdef(`targeted_policy',` +- unconfined_alias_domain(sshd_t) +- init_system_domain(sshd_t,sshd_exec_t) +- +- type sshd_var_run_t; +- files_type(sshd_var_run_t) ++ unconfined_domain(sshd_t) ++') + +- ifdef(`enable_mcs',` +- init_ranged_system_domain(sshd_t,sshd_exec_t,s0 - mcs_systemhigh) +- ') +-',` +- # Type for the ssh-agent executable. +- type ssh_agent_exec_t; +- files_type(ssh_agent_exec_t) ++# Type for the ssh-agent executable. ++type ssh_agent_exec_t; ++files_type(ssh_agent_exec_t) + +- ssh_server_template(sshd) +- ssh_server_template(sshd_extern) ++ssh_server_template(sshd) ++ssh_server_template(sshd_extern) + +- # cjp: commenting this out until typeattribute works in a conditional ++# cjp: commenting this out until typeattribute works in a conditional + # optional_policy(` + # tunable_policy(`run_ssh_inetd',` + # inetd_tcp_service_domain(sshd_t,sshd_exec_t) +@@ -61,9 +54,9 @@ + ') + # ') + +- type sshd_tmp_t; +- files_tmp_file(sshd_tmp_t) +-') ++type sshd_tmp_t; ++files_tmp_file(sshd_tmp_t) ++files_poly_parent(sshd_tmp_t) ################################# -@@ -73,6 +74,8 @@ + # +@@ -72,79 +65,80 @@ + # sshd_t is the domain for the sshd program. # - ifdef(`strict_policy',` -+ inetd_tcp_service_domain(sshd_t, sshd_exec_t) -+ - # so a tunnel can point to another ssh tunnel - allow sshd_t self:netlink_route_socket r_netlink_socket_perms; - allow sshd_t self:key { search link write }; -@@ -82,6 +85,7 @@ - manage_sock_files_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) - files_tmp_filetrans(sshd_t, sshd_tmp_t, { dir file sock_file }) +-ifdef(`strict_policy',` +- # so a tunnel can point to another ssh tunnel +- allow sshd_t self:netlink_route_socket r_netlink_socket_perms; +- allow sshd_t self:key { search link write }; +- +- manage_dirs_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) +- manage_files_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) +- manage_sock_files_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) +- files_tmp_filetrans(sshd_t, sshd_tmp_t, { dir file sock_file }) +- +- kernel_link_key(sshd_t) +- +- # for X forwarding +- corenet_tcp_bind_xserver_port(sshd_t) +- corenet_sendrecv_xserver_server_packets(sshd_t) +- +- tunable_policy(`ssh_sysadm_login',` +- # Relabel and access ptys created by sshd +- # ioctl is necessary for logout() processing for utmp entry and for w to +- # display the tty. +- # some versions of sshd on the new SE Linux require setattr +- term_use_all_user_ptys(sshd_t) +- term_setattr_all_user_ptys(sshd_t) +- term_relabelto_all_user_ptys(sshd_t) ++inetd_tcp_service_domain(sshd_t, sshd_exec_t) + +- userdom_spec_domtrans_all_users(sshd_t) +- userdom_signal_all_users(sshd_t) +- ',` +- userdom_spec_domtrans_unpriv_users(sshd_t) +- userdom_signal_unpriv_users(sshd_t) ++# so a tunnel can point to another ssh tunnel ++allow sshd_t self:netlink_route_socket r_netlink_socket_perms; ++allow sshd_t self:key { search link write }; + +- userdom_setattr_unpriv_users_ptys(sshd_t) +- userdom_relabelto_unpriv_users_ptys(sshd_t) +- userdom_use_unpriv_users_ptys(sshd_t) +- ') ++manage_dirs_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) ++manage_files_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) ++manage_sock_files_pattern(sshd_t,sshd_tmp_t,sshd_tmp_t) ++files_tmp_filetrans(sshd_t, sshd_tmp_t, { dir file sock_file }) -+ kernel_search_key(sshd_t) - kernel_link_key(sshd_t) +- optional_policy(` +- daemontools_service_domain(sshd_t, sshd_exec_t) +- ') ++kernel_search_key(sshd_t) ++kernel_link_key(sshd_t) - # for X forwarding +- optional_policy(` +- rpm_use_script_fds(sshd_t) +- ') ++# for X forwarding ++corenet_tcp_bind_xserver_port(sshd_t) ++corenet_sendrecv_xserver_server_packets(sshd_t) + +- optional_policy(` +- rssh_spec_domtrans_all_users(sshd_t) +- # For reading /home/user/.ssh +- rssh_read_all_users_ro_content(sshd_t) +- ') ++tunable_policy(`ssh_sysadm_login',` ++ # Relabel and access ptys created by sshd ++ # ioctl is necessary for logout() processing for utmp entry and for w to ++ # display the tty. ++ # some versions of sshd on the new SE Linux require setattr ++ term_use_all_user_ptys(sshd_t) ++ term_setattr_all_user_ptys(sshd_t) ++ term_relabelto_all_user_ptys(sshd_t) + +- ifdef(`TODO',` +- tunable_policy(`ssh_sysadm_login',` +- # Relabel and access ptys created by sshd +- # ioctl is necessary for logout() processing for utmp entry and for w to +- # display the tty. +- # some versions of sshd on the new SE Linux require setattr +- allow sshd_t ptyfile:chr_file relabelto; ++ userdom_spec_domtrans_all_users(sshd_t) ++ userdom_signal_all_users(sshd_t) ++',` ++ userdom_spec_domtrans_unpriv_users(sshd_t) ++ userdom_signal_unpriv_users(sshd_t) + +- optional_policy(` +- domain_trans(sshd_t, xauth_exec_t, userdomain) +- ') +- ',` +- optional_policy(` +- domain_trans(sshd_t, xauth_exec_t, unpriv_userdomain) +- ') +- # Relabel and access ptys created by sshd +- # ioctl is necessary for logout() processing for utmp entry and for w to +- # display the tty. +- # some versions of sshd on the new SE Linux require setattr +- allow sshd_t userpty_type:chr_file { relabelto read write getattr ioctl setattr }; ++ userdom_setattr_unpriv_users_ptys(sshd_t) ++ userdom_relabelto_unpriv_users_ptys(sshd_t) ++ userdom_use_unpriv_users_ptys(sshd_t) ++') ++ ++optional_policy(` ++ daemontools_service_domain(sshd_t, sshd_exec_t) ++') ++ ++optional_policy(` ++ rpm_use_script_fds(sshd_t) ++') ++ ++optional_policy(` ++ rssh_spec_domtrans_all_users(sshd_t) ++ # For reading /home/user/.ssh ++ rssh_read_all_users_ro_content(sshd_t) ++') ++ ++ifdef(`TODO',` ++tunable_policy(`ssh_sysadm_login',` ++ # Relabel and access ptys created by sshd ++ # ioctl is necessary for logout() processing for utmp entry and for w to ++ # display the tty. ++ # some versions of sshd on the new SE Linux require setattr ++ allow sshd_t ptyfile:chr_file relabelto; ++ ++ optional_policy(` ++ domain_trans(sshd_t, xauth_exec_t, userdomain) + ') +- ') dnl endif TODO ++',` ++ optional_policy(` ++ domain_trans(sshd_t, xauth_exec_t, unpriv_userdomain) ++ ') ++ # Relabel and access ptys created by sshd ++ # ioctl is necessary for logout() processing for utmp entry and for w to ++ # display the tty. ++ # some versions of sshd on the new SE Linux require setattr ++ allow sshd_t userpty_type:chr_file { relabelto read write getattr ioctl setattr }; + ') ++') dnl endif TODO + + ################################# + # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/uucp.te serefpolicy-2.5.1/policy/modules/services/uucp.te --- nsaserefpolicy/policy/modules/services/uucp.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/uucp.te 2007-01-17 14:45:25.000000000 -0500 @@ -5504,7 +5729,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.5.1/policy/modules/services/xserver.te --- nsaserefpolicy/policy/modules/services/xserver.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/xserver.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/xserver.te 2007-01-22 13:46:31.000000000 -0500 @@ -10,9 +10,6 @@ attribute fonts_cache_type; attribute fonts_config_type; @@ -5533,17 +5758,28 @@ allow xdm_t xconsole_device_t:fifo_file { getattr setattr }; manage_dirs_pattern(xdm_t,xdm_tmp_t,xdm_tmp_t) -@@ -219,6 +214,10 @@ +@@ -219,7 +214,11 @@ userdom_read_all_users_state(xdm_t) userdom_signal_all_users(xdm_t) +-ifdef(`strict_policy',` +optional_policy(` + gnome_signal_all(xdm_t) +') + - ifdef(`strict_policy',` ++#ifdef(`strict_policy',` allow xdm_t xdm_lock_t:file manage_file_perms; files_lock_filetrans(xdm_t,xdm_lock_t,file) + +@@ -283,7 +282,7 @@ + optional_policy(` + alsa_domtrans(xdm_t) + ') +-') ++#') + + ifdef(`targeted_policy',` + unconfined_domain(xdm_t) @@ -393,6 +392,7 @@ corenet_tcp_bind_vnc_port(xdm_xserver_t) @@ -5552,6 +5788,24 @@ init_use_fds(xdm_xserver_t) +@@ -408,7 +408,7 @@ + fs_manage_cifs_symlinks(xdm_xserver_t) + ') + +-ifdef(`strict_policy',` ++#ifdef(`strict_policy',` + # FIXME: After per user fonts are properly working + # xdm_xserver_t may no longer have any reason + # to read ROLE_home_t - examine this in more detail +@@ -416,7 +416,7 @@ + userdom_read_unpriv_users_home_content_files(xdm_xserver_t) + + xserver_use_all_users_fonts(xdm_xserver_t) +-') ++#') + + ifdef(`targeted_policy',` + unconfined_domain_noaudit(xdm_xserver_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.1/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/authlogin.if 2007-01-17 14:20:45.000000000 -0500 @@ -5920,6 +6174,187 @@ ') optional_policy(` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.fc serefpolicy-2.5.1/policy/modules/system/ipsec.fc +--- nsaserefpolicy/policy/modules/system/ipsec.fc 2006-11-16 17:15:24.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/ipsec.fc 2007-01-22 19:55:45.000000000 -0500 +@@ -7,7 +7,8 @@ + + /etc/ipsec\.d(/.*)? gen_context(system_u:object_r:ipsec_key_file_t,s0) + +-/sbin/setkey -- gen_context(system_u:object_r:ipsec_exec_t,s0) ++/usr/sbin/setkey -- gen_context(system_u:object_r:setkey_exec_t,s0) ++/sbin/setkey -- gen_context(system_u:object_r:setkey_exec_t,s0) + + /usr/lib(64)?/ipsec/_plutoload -- gen_context(system_u:object_r:ipsec_mgmt_exec_t,s0) + /usr/lib(64)?/ipsec/_plutorun -- gen_context(system_u:object_r:ipsec_mgmt_exec_t,s0) +@@ -26,8 +27,7 @@ + /usr/local/lib(64)?/ipsec/pluto -- gen_context(system_u:object_r:ipsec_exec_t,s0) + /usr/local/lib(64)?/ipsec/spi -- gen_context(system_u:object_r:ipsec_exec_t,s0) + +-/usr/sbin/racoon -- gen_context(system_u:object_r:ipsec_exec_t,s0) +-/usr/sbin/setkey -- gen_context(system_u:object_r:ipsec_exec_t,s0) ++/usr/sbin/racoon -- gen_context(system_u:object_r:racoon_exec_t,s0) + + /var/racoon(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.5.1/policy/modules/system/ipsec.if +--- nsaserefpolicy/policy/modules/system/ipsec.if 2007-01-02 12:57:49.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/ipsec.if 2007-01-22 19:53:10.000000000 -0500 +@@ -111,3 +111,22 @@ + files_search_pids($1) + manage_files_pattern($1,ipsec_var_run_t,ipsec_var_run_t) + ') ++ ++######################################## ++## ++## Allow an IPsec SA to be used by an IPsec Policy. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ipsec_labeled',` ++ gen_require(` ++ type ipsec_spd_t; ++ ') ++ ++ allow $1 ipsec_spd_t:association polmatch; ++ domain_ipsec_labels($1) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-2.5.1/policy/modules/system/ipsec.te +--- nsaserefpolicy/policy/modules/system/ipsec.te 2007-01-02 12:57:49.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/ipsec.te 2007-01-22 20:01:00.000000000 -0500 +@@ -6,6 +6,16 @@ + # Declarations + # + ++type racoon_t; ++type racoon_exec_t; ++init_daemon_domain(racoon_t,racoon_exec_t) ++role system_r types racoon_t; ++ ++type setkey_t; ++type setkey_exec_t; ++init_system_domain(setkey_t,setkey_exec_t) ++role system_r types setkey_t; ++ + type ipsec_t; + type ipsec_exec_t; + init_daemon_domain(ipsec_t,ipsec_exec_t) +@@ -35,6 +45,10 @@ + type ipsec_mgmt_var_run_t; + files_pid_file(ipsec_mgmt_var_run_t) + ++#### types for ipsec-tools utilities ##### ++# default type for ipsec-tools ipsec policy ++type ipsec_spd_t; ++ + ######################################## + # + # ipsec Local policy +@@ -265,3 +279,100 @@ + + allow ipsec_mgmt_t dev_fs:file_class_set getattr; + ') dnl end TODO ++ ++ ++ ++######################################## ++# ++# ipsec-tools utilities ++# ++ ++# allow setkey to set the context for ipsec SAs and policy. ++allow setkey_t ipsec_spd_t:association setcontext; ++ ++allow setkey_t self:capability net_admin; ++allow setkey_t self:key_socket { create read setopt write }; ++allow setkey_t self:netlink_route_socket { create_netlink_socket_perms }; ++ ++# need to be able to read selinux config files within setkey domain. ++allow setkey_t security_t:dir search; ++allow setkey_t security_t:file read; ++seutil_read_config(setkey_t) ++ ++# allow setkey utility to set contexts on SA's and policy ++domain_setcontext(setkey_t) ++ ++# allow setkey to read a config files in any directory. ++userdom_read_sysadm_home_content_files(setkey_t) ++userdom_read_all_users_home_content_files(setkey_t) ++ ++# setkey will be run by sysadm, thus setkey needs access to sysadm ttys. ++userdom_use_sysadm_ttys(setkey_t) ++locallogin_use_fds(setkey_t) ++files_read_etc_files(setkey_t) ++libs_use_ld_so(setkey_t) ++libs_use_shared_libs(setkey_t) ++miscfiles_read_localization(setkey_t) ++ ++######################################## ++# ++# ipsec-tools utilities ++# ++ ++allow racoon_t self:udp_socket { create_socket_perms }; ++allow racoon_t self:unix_dgram_socket { connect create ioctl write }; ++allow racoon_t self:capability { net_admin net_bind_service }; ++ ++# allow racoon to use avc_has_perm to check context on proposed SA ++allow racoon_t self:netlink_selinux_socket { bind create read }; ++selinux_compute_access_vector(racoon_t) ++ ++allow racoon_t self:key_socket { create read setopt write }; ++allow racoon_t self:netlink_route_socket { create_netlink_socket_perms }; ++ ++allow racoon_t node_t:udp_socket node_bind; ++ ++# so racoon can listen on admin port. ++allow racoon_t inaddr_any_node_t:tcp_socket node_bind; ++ ++# allow racoon to use ISAKMP port ++allow racoon_t isakmp_port_t:udp_socket name_bind; ++ ++corenet_non_ipsec_sendrecv(racoon_t) ++corenet_udp_bind_link_local_node(racoon_t) ++corenet_udp_bind_compat_ipv4_node(racoon_t) ++corenet_udp_bind_lo_node(racoon_t) ++kernel_read_network_state(racoon_t) ++corenet_udp_bind_site_local_node(racoon_t) ++seutil_read_config(setkey_t) ++ ++# manage pid file ++allow racoon_t ipsec_var_run_t:file manage_file_perms; ++allow racoon_t ipsec_var_run_t:dir rw_dir_perms; ++allow racoon_t ipsec_var_run_t:sock_file create_file_perms; ++files_pid_filetrans(racoon_t,ipsec_var_run_t,file) ++files_rw_generic_pids(racoon_t) ++allow racoon_t var_run_t:file setattr; ++ ++allow racoon_t ipsec_conf_file_t:dir r_dir_perms; ++allow racoon_t ipsec_conf_file_t:file r_file_perms; ++allow racoon_t ipsec_conf_file_t:lnk_file r_file_perms; ++ ++allow racoon_t ipsec_key_file_t:dir r_dir_perms; ++allow racoon_t ipsec_key_file_t:file r_file_perms; ++allow racoon_t ipsec_key_file_t:lnk_file r_file_perms; ++ ++allow racoon_t ipsec_spd_t:association setcontext; ++ ++userdom_use_sysadm_ttys(racoon_t) ++locallogin_use_fds(racoon_t) ++ ++# allow racoon to set contexts on ipsec policy and SAs ++domain_setcontext(racoon_t) ++ ++logging_send_syslog_msg(racoon_t) ++files_read_etc_files(racoon_t) ++libs_use_ld_so(racoon_t) ++libs_use_shared_libs(racoon_t) ++miscfiles_read_localization(racoon_t) ++dev_read_urand(racoon_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.1/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/iptables.te 2007-01-17 13:32:47.000000000 -0500 @@ -6679,7 +7114,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.1/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/unconfined.if 2007-01-22 13:38:44.000000000 -0500 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -6688,6 +7123,14 @@ kernel_unconfined($1) corenet_unconfined($1) +@@ -41,6 +42,7 @@ + files_unconfined($1) + fs_unconfined($1) + selinux_unconfined($1) ++ term_unconfined($1) + + tunable_policy(`allow_execheap',` + # Allow making the stack executable via mprotect. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.1/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/unconfined.te 2007-01-22 11:29:35.000000000 -0500 @@ -6760,7 +7203,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.1/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-17 16:02:28.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-22 15:19:36.000000000 -0500 @@ -102,6 +102,9 @@ libs_exec_ld_so($1_t) @@ -6959,7 +7402,56 @@ ') ######################################## -@@ -2293,6 +2328,55 @@ +@@ -1245,11 +1280,7 @@ + ## + # + template(`userdom_role_change_generic_user',` +- ifdef(`strict_policy',` +- userdom_role_change_template($1,user) +- ',` +- refpolicywarn(`$0($*) has no effect in targeted policy.') +- ') ++ userdom_role_change_template($1,user) + ') + + ######################################## +@@ -1590,13 +1621,11 @@ + ## + # + template(`userdom_setattr_user_ptys',` +- ifdef(`strict_policy',` +- gen_require(` +- type $1_devpts_t; +- ') +- +- allow $2 $1_devpts_t:chr_file setattr; ++ gen_require(` ++ type $1_devpts_t; + ') ++ ++ allow $2 $1_devpts_t:chr_file setattr; + ') + + ######################################## +@@ -1625,13 +1654,11 @@ + ## + # + template(`userdom_create_user_pty',` +- ifdef(`strict_policy',` +- gen_require(` +- type $1_devpts_t; +- ') +- +- term_create_pty($2,$1_devpts_t) ++ gen_require(` ++ type $1_devpts_t; + ') ++ ++ term_create_pty($2,$1_devpts_t) + ') + + ######################################## +@@ -2293,6 +2320,55 @@ ## ## Create objects in a user home directory ## with an automatic type transition to @@ -7015,7 +7507,7 @@ ## the user home file type. ## ## -@@ -3128,6 +3212,39 @@ +@@ -3128,6 +3204,39 @@ ######################################## ## @@ -7055,7 +7547,7 @@ ## Do not audit attempts to read users ## untrusted files. ## -@@ -5549,3 +5666,275 @@ +@@ -5549,3 +5658,275 @@ allow $1 user_home_dir_t:dir manage_dir_perms; files_home_filetrans($1,user_home_dir_t,dir) ') @@ -7333,7 +7825,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.1/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-17 15:25:12.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-22 19:21:55.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.384 retrieving revision 1.385 diff -u -r1.384 -r1.385 --- selinux-policy.spec 22 Jan 2007 16:52:18 -0000 1.384 +++ selinux-policy.spec 23 Jan 2007 01:08:45 -0000 1.385 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.5.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -356,6 +356,9 @@ %endif %changelog +* Mon Jan 22 2007 Dan Walsh 2.5.1-5 +- Continue fixing, additional user domains + * Wed Jan 10 2007 Dan Walsh 2.5.1-4 - Begin adding user confinement to targeted policy From fedora-cvs-commits at redhat.com Tue Jan 23 01:11:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:11:09 -0500 Subject: rpms/pango/devel .cvsignore, 1.49, 1.50 pango.spec, 1.106, 1.107 sources, 1.49, 1.50 pango-1.15.4-slighthint.patch, 1.1, NONE Message-ID: <200701230111.l0N1B9vI010455@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10291 Modified Files: .cvsignore pango.spec sources Removed Files: pango-1.15.4-slighthint.patch Log Message: * Mon Jan 22 2007 Behdad Esfahbod - 1.15.5-1 - Update to 1.15.5. - Drop upstreamed pango-1.15.4-slighthint.patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 18 Jan 2007 05:21:30 -0000 1.49 +++ .cvsignore 23 Jan 2007 01:11:07 -0000 1.50 @@ -1 +1 @@ -pango-1.15.4.tar.bz2 +pango-1.15.5.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- pango.spec 18 Jan 2007 06:58:41 -0000 1.106 +++ pango.spec 23 Jan 2007 01:11:07 -0000 1.107 @@ -8,8 +8,8 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.15.4 -Release: 5%{?dist} +Version: 1.15.5 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: http://download.gnome.org/sources/pango/1.14/pango-%{version}.tar.bz2 @@ -36,7 +36,6 @@ BuildRequires: libthai-devel >= %{libthai_version} Obsoletes: pango-gtkbeta, fribidi-gtkbeta -Patch1: pango-1.15.4-slighthint.patch # Look for pango.modules in an arch-specific directory Patch2: pango-1.2.5-lib64.patch @@ -69,7 +68,6 @@ %prep %setup -q -n pango-%{version} -%patch1 -p1 -b .slighthint %patch2 -p1 -b .lib64 %build @@ -221,6 +219,10 @@ %changelog +* Mon Jan 22 2007 Behdad Esfahbod - 1.15.5-1 +- Update to 1.15.5. +- Drop upstreamed pango-1.15.4-slighthint.patch + * Wed Jan 18 2007 Behdad Esfahbod - 1.15.4-5 - Again... HELLO.txt is moved. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pango/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 18 Jan 2007 05:21:30 -0000 1.49 +++ sources 23 Jan 2007 01:11:07 -0000 1.50 @@ -1 +1 @@ -02c8ea6d3851e44520b131f509bea9ff pango-1.15.4.tar.bz2 +c9f9e2a9d8bbca303e3a110cecb77089 pango-1.15.5.tar.bz2 --- pango-1.15.4-slighthint.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 01:15:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:15:22 -0500 Subject: rpms/vte/devel .cvsignore, 1.50, 1.51 sources, 1.50, 1.51 vte.spec, 1.97, 1.98 vte-0.15.1-segfault.patch, 1.1, NONE Message-ID: <200701230115.l0N1FMgV013713@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/vte/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13433 Modified Files: .cvsignore sources vte.spec Removed Files: vte-0.15.1-segfault.patch Log Message: * Tue Jan 22 2007 Behdad Esfahbod 0.15.2-1 - Update to 0.15.2 - Drop upstreamed vte-0.15.1-segfault.patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 9 Jan 2007 21:00:53 -0000 1.50 +++ .cvsignore 23 Jan 2007 01:15:20 -0000 1.51 @@ -1 +1 @@ -vte-0.15.1.tar.bz2 +vte-0.15.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vte/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 9 Jan 2007 21:00:53 -0000 1.50 +++ sources 23 Jan 2007 01:15:20 -0000 1.51 @@ -1 +1 @@ -9f04d80da655ef4bc9eee9d64a75ee0b vte-0.15.1.tar.bz2 +9d2201583040c116f72da3c780895bc7 vte-0.15.2.tar.bz2 Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- vte.spec 10 Jan 2007 19:18:11 -0000 1.97 +++ vte.spec 23 Jan 2007 01:15:20 -0000 1.98 @@ -1,6 +1,6 @@ Name: vte -Version: 0.15.1 -Release: 2%{?dist} +Version: 0.15.2 +Release: 1%{?dist} Summary: A terminal emulator License: LGPL Group: User Interface/X @@ -14,8 +14,6 @@ # initscripts creates the utmp group Prereq: initscripts -Patch0: vte-0.15.1-segfault.patch - %description VTE is a terminal emulator widget for use with GTK+ 2.0. @@ -32,8 +30,6 @@ %prep %setup -q -%patch0 -p1 -b .segfault - %build PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"` export PYTHON @@ -105,6 +101,10 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 22 2007 Behdad Esfahbod 0.15.2-1 +- Update to 0.15.2 +- Drop upstreamed vte-0.15.1-segfault.patch + * Tue Jan 10 2007 Behdad Esfahbod 0.15.1-2 - Add vte-0.15.1-segfault.patch - Fixes crasher on x86_64 (GNOME#394890) --- vte-0.15.1-segfault.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 01:27:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:27:57 -0500 Subject: rpms/nss/devel nss-clobber.sh,NONE,1.1 nss.spec,1.18,1.19 Message-ID: <200701230127.l0N1RvDE011137@cvs.devel.redhat.com> Author: rrelyea Update of /cvs/dist/rpms/nss/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10930 Modified Files: nss.spec Added Files: nss-clobber.sh Log Message: - disable ECC --- NEW FILE nss-clobber.sh --- #!/bin/sh FREEBLDIR=./mozilla/security/nss/lib/freebl set -e mv ${FREEBLDIR}/ecl/ecl-exp.h ${FREEBLDIR}/save rm -rf ${FREEBLDIR}/ecl/tests for i in ${FREEBLDIR}/ecl/* ; do echo clobbering $i > $i done mv ${FREEBLDIR}/save ${FREEBLDIR}/ecl/ecl-exp.h for j in ${FREEBLDIR}/ec.*; do echo unifdef $j cat $j | \ awk 'BEGIN {ech=1; prt=0;} \ /^#[ \t]*ifdef.*NSS_ENABLE_ECC/ {ech--; next;} \ /^#[ \t]*if/ {if(ech < 1) ech--;} \ {if(ech>0) {;print $0};} \ /^#[ \t]*endif/ {if(ech < 1) ech++;} \ {if (prt && (ech<=0)) {;print $0}; } \ {if (ech>0) {prt=0;} } \ /^#[ \t]*else/ {if (ech == 0) prt=1;}' > $j.hobbled && \ mv $j.hobbled $j done Index: nss.spec =================================================================== RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nss.spec 21 Nov 2006 23:44:06 -0000 1.18 +++ nss.spec 23 Jan 2007 01:27:55 -0000 1.19 @@ -3,7 +3,7 @@ Summary: Network Security Services Name: nss Version: 3.11.4 -Release: 1 +Release: 5%{?dist} License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -21,7 +21,7 @@ Source3: blank-cert8.db Source4: blank-key3.db Source5: blank-secmod.db - +Source6: nss-clobber.sh %description Network Security Services (NSS) is a set of libraries designed to @@ -71,6 +71,7 @@ %prep %setup -q +sh %{SOURCE6} > /dev/null %build @@ -102,8 +103,8 @@ export USE_64 %endif -NSS_ENABLE_ECC=1 -export NSS_ENABLE_ECC +# NSS_ENABLE_ECC=1 +# export NSS_ENABLE_ECC %{__make} -C ./mozilla/security/coreconf %{__make} -C ./mozilla/security/dbm @@ -326,7 +327,10 @@ %changelog -* Tue Nov 21 2006 Kai Engert - 3.11.4-1 +* Tue Jan 9 2007 Bob Relyea - 3.11.4-4 +- disable ECC, cleanout dead code + +* Tue Nov 28 2006 Kai Engert - 3.11.4-1 - Update to 3.11.4 * Thu Sep 14 2006 Kai Engert - 3.11.3-2 From fedora-cvs-commits at redhat.com Tue Jan 23 01:31:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:31:55 -0500 Subject: rpms/kernel/FC-6 xen-compile-fix.patch, NONE, 1.1.2.1 Config.mk, 1.4, 1.4.62.1 kernel-2.6.spec, 1.2898.2.1, 1.2898.2.2 Message-ID: <200701230131.l0N1VtiV014087@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14034 Modified Files: Tag: private-quintela-xen-3_0_4-branch Config.mk kernel-2.6.spec Added Files: Tag: private-quintela-xen-3_0_4-branch xen-compile-fix.patch Log Message: fix HV compilation on x86_32 xen-compile-fix.patch: hvm.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-compile-fix.patch --- --- xen/include/asm-x86/hvm/hvm.h.orig 2007-01-23 02:19:41.000000000 +0100 +++ xen/include/asm-x86/hvm/hvm.h 2007-01-23 02:18:29.000000000 +0100 @@ -170,7 +170,7 @@ hvm_long_mode_enabled(struct vcpu *v) return hvm_funcs.long_mode_enabled(v); } #else -#define hvm_long_mode_enabled(v) (v,0) +#define hvm_long_mode_enabled(v) 0 #endif static inline int Index: Config.mk =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/Config.mk,v retrieving revision 1.4 retrieving revision 1.4.62.1 diff -u -r1.4 -r1.4.62.1 --- Config.mk 3 Aug 2006 21:49:14 -0000 1.4 +++ Config.mk 23 Jan 2007 01:31:53 -0000 1.4.62.1 @@ -4,14 +4,20 @@ debug ?= n XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \ - -e s/ppc/powerpc/) + -e s/ppc/powerpc/ -e s/i86pc/x86_32/) XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH) XEN_TARGET_X86_PAE ?= n +XEN_OS ?= $(shell uname -s) + +CONFIG_$(XEN_OS) := y # Tools to run on system hosting the build HOSTCC = gcc HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer +DISTDIR ?= $(XEN_ROOT)/dist +DESTDIR ?= / + AS = $(CROSS_COMPILE)as LD = $(CROSS_COMPILE)ld CC = $(CROSS_COMPILE)gcc @@ -23,49 +29,72 @@ OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump -DISTDIR ?= $(XEN_ROOT)/dist -DESTDIR ?= / - INSTALL = install INSTALL_DIR = $(INSTALL) -d -m0755 INSTALL_DATA = $(INSTALL) -m0644 INSTALL_PROG = $(INSTALL) -m0755 +LIB64DIR = lib64 + +SOCKET_LIBS = +CURSES_LIBS = -lncurses +SONAME_LDFLAG = -soname +SHLIB_CFLAGS = -shared + ifneq ($(debug),y) # Optimisation flags are overridable -CFLAGS ?= -O2 -fomit-frame-pointer -CFLAGS += -DNDEBUG +CFLAGS ?= -O2 -fomit-frame-pointer else -CFLAGS += -O2 -g +# Less than -O1 produces bad code and large stack frames +CFLAGS ?= -O1 -fno-omit-frame-pointer endif - ifeq ($(XEN_TARGET_ARCH),x86_32) CONFIG_X86 := y +CONFIG_X86_32 := y +CONFIG_X86_$(XEN_OS) := y + CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y CONFIG_IOEMU := y -CONFIG_MBOOTPACK := y CFLAGS += -m32 -march=i686 LIBDIR := lib + +# Use only if calling $(LD) directly. +ifeq ($(XEN_OS),OpenBSD) +LDFLAGS_DIRECT += -melf_i386_obsd +else +LDFLAGS_DIRECT += -melf_i386 +endif endif ifeq ($(XEN_TARGET_ARCH),x86_64) CONFIG_X86 := y +CONFIG_X86_64 := y +CONFIG_X86_$(XEN_OS) := y + CONFIG_HVM := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y CONFIG_IOEMU := y -CONFIG_MBOOTPACK := y CFLAGS += -m64 -LIBDIR = lib64 +LIBDIR = $(LIB64DIR) + +# Use only if calling $(LD) directly. +ifeq ($(XEN_OS),OpenBSD) +LDFLAGS_DIRECT += -melf_x86_64_obsd +else +LDFLAGS_DIRECT += -melf_x86_64 +endif endif ifeq ($(XEN_TARGET_ARCH),ia64) CONFIG_IA64 := y +CONFIG_IA64_$(XEN_OS) := y + CONFIG_IOEMU := y CONFIG_XCUTILS := y @@ -77,19 +106,31 @@ EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR) endif -test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2)) +# cc-option +# Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586) +cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ + /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;) + +ifneq ($(debug),y) +CFLAGS += -DNDEBUG +else +CFLAGS += -g +endif + +CFLAGS += -std=gnu99 CFLAGS += -Wall -Wstrict-prototypes -HOSTCFLAGS += $(call test-gcc-flag,$(HOSTCC),-Wdeclaration-after-statement) -CFLAGS += $(call test-gcc-flag,$(CC),-Wdeclaration-after-statement) +# -Wunused-value makes GCC 4.x too aggressive for my taste: ignoring the +# result of any casted expression causes a warning. +CFLAGS += -Wno-unused-value + +HOSTCFLAGS += $(call cc-option,$(HOSTCC),-Wdeclaration-after-statement,) +CFLAGS += $(call cc-option,$(CC),-Wdeclaration-after-statement,) LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i)) CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i)) -# Choose the best mirror to download linux kernel -KERNEL_REPO = http://www.kernel.org - # If ACM_SECURITY = y, then the access control module is compiled # into Xen and the policy type can be set by the boot policy file # y - Build the Xen ACM framework @@ -108,7 +149,8 @@ # Optional components XENSTAT_XENTOP ?= y - VTPM_TOOLS ?= n +LIBXENAPI_BINDINGS ?= n +XENFB_TOOLS ?= n -include $(XEN_ROOT)/.config Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2898.2.1 retrieving revision 1.2898.2.2 diff -u -r1.2898.2.1 -r1.2898.2.2 --- kernel-2.6.spec 23 Jan 2007 00:33:19 -0000 1.2898.2.1 +++ kernel-2.6.spec 23 Jan 2007 01:31:53 -0000 1.2898.2.2 @@ -491,6 +491,7 @@ Patch10000: linux-2.6-compile-fixes.patch # Xen hypervisor patches (20000+) +Patch20000: xen-compile-fix.patch Patch20001: xen-version-strings.patch # END OF PATCH DEFINITIONS @@ -1137,6 +1138,7 @@ %setup -D -T -q -n %{name}-%{version} -a1 cd xen # Any necessary hypervisor patches go here +%patch20000 -p1 %patch20001 -p1 # Update the Makefile version strings From fedora-cvs-commits at redhat.com Tue Jan 23 01:39:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:39:02 -0500 Subject: rpms/hsqldb/devel hsqldb-1.8.0.7-scripts.patch, NONE, 1.1 hsqldb-1.8.0.7-standard-server.properties, NONE, 1.1 hsqldb-1.8.0.7-standard-sqltool.rc, NONE, 1.1 hsqldb-1.8.0.7-standard-webserver.properties, NONE, 1.1 hsqldb-1.8.0.7-standard.cfg, NONE, 1.1 .cvsignore, 1.7, 1.8 hsqldb.spec, 1.30, 1.31 sources, 1.6, 1.7 hsqldb-1.8.0.4-scripts.patch, 1.1, NONE hsqldb-1.8.0.4-standard-server.properties, 1.1, NONE hsqldb-1.8.0.4-standard-sqltool.rc, 1.1, NONE hsqldb-1.8.0.4-standard-webserver.properties, 1.1, NONE hsqldb-1.8.0.4-standard.cfg, 1.1, NONE Message-ID: <200701230139.l0N1d28k011086@cvs.devel.redhat.com> Author: dbhole Update of /cvs/dist/rpms/hsqldb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11068 Modified Files: .cvsignore hsqldb.spec sources Added Files: hsqldb-1.8.0.7-scripts.patch hsqldb-1.8.0.7-standard-server.properties hsqldb-1.8.0.7-standard-sqltool.rc hsqldb-1.8.0.7-standard-webserver.properties hsqldb-1.8.0.7-standard.cfg Removed Files: hsqldb-1.8.0.4-scripts.patch hsqldb-1.8.0.4-standard-server.properties hsqldb-1.8.0.4-standard-sqltool.rc hsqldb-1.8.0.4-standard-webserver.properties hsqldb-1.8.0.4-standard.cfg Log Message: Upgrade to 1.8.0.7 in rawhide hsqldb-1.8.0.7-scripts.patch: runUtil.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE hsqldb-1.8.0.7-scripts.patch --- --- bin/runUtil.sh.orig 2004-08-10 16:04:01.000000000 +0200 +++ bin/runUtil.sh 2004-08-10 16:05:43.000000000 +0200 @@ -31,7 +31,7 @@ progname=`basename $0` # ../ will lead us to the home -dbhome="$progdir/.." +dbhome=/var/lib/hsqldb # absolutize dbhome @@ -40,7 +40,7 @@ # # bring in needed functions -. ${dbhome}/lib/functions +. /var/lib/hsqldb/lib/functions #-------------------------------------------------------------------------------------------------------------- pre_main --- NEW FILE hsqldb-1.8.0.7-standard-server.properties --- # Hsqldb Server cfg file. # See the Advanced Topics chapter of the Hsqldb User Guide. server.database.0 file:data/db0 server.dbname.0 firstdb server.urlid.0 db0-url server.silent true server.trace false server.port 9001 server.no_system_exit true ***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.8.0.7-standard-sqltool.rc' --- NEW FILE hsqldb-1.8.0.7-standard-webserver.properties --- # Hsqldb Server cfg file. # See the Advanced Topics chapter of the Hsqldb User Guide. server.database.0 file:data/db0 server.dbname.0 firstdb server.urlid.0 db0-url server.silent true server.trace false server.port 80 server.default_page index.html server.root ./ .html=text/html ***** Error reading new file: [Errno 2] No such file or directory: 'hsqldb-1.8.0.7-standard.cfg' Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 4 Aug 2006 23:32:44 -0000 1.7 +++ .cvsignore 23 Jan 2007 01:39:00 -0000 1.8 @@ -1 +1 @@ -hsqldb_1_8_0_4-RHCLEAN.zip +hsqldb_1_8_0_7-RHCLEAN.zip Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- hsqldb.spec 30 Nov 2006 18:38:03 -0000 1.30 +++ hsqldb.spec 23 Jan 2007 01:39:00 -0000 1.31 @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2005, JPackage Project +# Copyright (c) 2000-2007, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,15 +34,16 @@ %define section devel -%define cvs_version 1_8_0_4 +%define cvs_version 1_8_0_7 Name: hsqldb -Version: 1.8.0.4 -Release: 4jpp.2 +Version: 1.8.0.7 +Release: 2jpp.2 Epoch: 1 Summary: Hsqldb Database Engine License: BSD Style Url: http://hsqldb.sourceforge.net/ +#http://downloads.sourceforge.net/hsqldb/hsqldb_1_8_0_7.zip Source0: %{name}_%{cvs_version}-RHCLEAN.zip Source1: %{name}-%{version}-standard.cfg Source2: %{name}-%{version}-standard-server.properties @@ -266,10 +267,16 @@ %{_datadir}/%{name} %changelog -* Thu Nov 30 2006 Deepak Bhole 1.8.0.4-4jpp.2 +* Thu Jan 22 2007 Deepak Bhole 1:1.8.0.7-1jpp.2 - Bump release to build in rawhide -* Wed Nov 29 2006 Deepak Bhole 1.8.0.4-4jpp.1 +* Thu Jan 22 2007 Deepak Bhole 1:1.8.0.7-1jpp.1 +- Updgrade to 1.8.0.7 + +* Thu Nov 30 2006 Deepak Bhole 1:1.8.0.4-4jpp.2 +- Bump release to build in rawhide + +* Wed Nov 29 2006 Deepak Bhole 1:1.8.0.4-4jpp.1 - Added missing entries to the files section * Wed Oct 11 2006 Fernando Nasser 1:1.8.0.4-3jpp.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 4 Aug 2006 23:32:44 -0000 1.6 +++ sources 23 Jan 2007 01:39:00 -0000 1.7 @@ -1 +1 @@ -ea506781107b1d618b4f99306deab590 hsqldb_1_8_0_4-RHCLEAN.zip +013010f468b11b7e8f25056f3d9976fc hsqldb_1_8_0_7-RHCLEAN.zip --- hsqldb-1.8.0.4-scripts.patch DELETED --- --- hsqldb-1.8.0.4-standard-server.properties DELETED --- --- hsqldb-1.8.0.4-standard-sqltool.rc DELETED --- --- hsqldb-1.8.0.4-standard-webserver.properties DELETED --- --- hsqldb-1.8.0.4-standard.cfg DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 01:47:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:47:34 -0500 Subject: rpms/nss/FC-6 nss-clobber.sh,NONE,1.1 nss.spec,1.18,1.19 Message-ID: <200701230147.l0N1lYEq025827@cvs.devel.redhat.com> Author: rrelyea Update of /cvs/dist/rpms/nss/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17058 Modified Files: nss.spec Added Files: nss-clobber.sh Log Message: Turn off ECC --- NEW FILE nss-clobber.sh --- #!/bin/sh FREEBLDIR=./mozilla/security/nss/lib/freebl set -e mv ${FREEBLDIR}/ecl/ecl-exp.h ${FREEBLDIR}/save rm -rf ${FREEBLDIR}/ecl/tests for i in ${FREEBLDIR}/ecl/* ; do echo clobbering $i > $i done mv ${FREEBLDIR}/save ${FREEBLDIR}/ecl/ecl-exp.h for j in ${FREEBLDIR}/ec.*; do echo unifdef $j cat $j | \ awk 'BEGIN {ech=1; prt=0;} \ /^#[ \t]*ifdef.*NSS_ENABLE_ECC/ {ech--; next;} \ /^#[ \t]*if/ {if(ech < 1) ech--;} \ {if(ech>0) {;print $0};} \ /^#[ \t]*endif/ {if(ech < 1) ech++;} \ {if (prt && (ech<=0)) {;print $0}; } \ {if (ech>0) {prt=0;} } \ /^#[ \t]*else/ {if (ech == 0) prt=1;}' > $j.hobbled && \ mv $j.hobbled $j done Index: nss.spec =================================================================== RCS file: /cvs/dist/rpms/nss/FC-6/nss.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nss.spec 21 Nov 2006 21:07:29 -0000 1.18 +++ nss.spec 23 Jan 2007 01:47:32 -0000 1.19 @@ -3,7 +3,7 @@ Summary: Network Security Services Name: nss Version: 3.11.4 -Release: 0.6%{?dist} +Release: 0.7%{?dist} License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -21,7 +21,7 @@ Source3: blank-cert8.db Source4: blank-key3.db Source5: blank-secmod.db - +Source6: nss-clobber.sh %description Network Security Services (NSS) is a set of libraries designed to @@ -71,6 +71,7 @@ %prep %setup -q +sh %{SOURCE6} > /dev/null %build @@ -102,8 +103,8 @@ export USE_64 %endif -NSS_ENABLE_ECC=1 -export NSS_ENABLE_ECC +# NSS_ENABLE_ECC=1 +# export NSS_ENABLE_ECC %{__make} -C ./mozilla/security/coreconf %{__make} -C ./mozilla/security/dbm @@ -326,6 +327,9 @@ %changelog +* Tue Jan 9 2007 Bob Relyea - 3.11.4-0.7 +- disable ECC, cleanout dead code + * Tue Nov 21 2006 Kai Engert - 3.11.4-0.6 - Update to 3.11.4 From fedora-cvs-commits at redhat.com Tue Jan 23 01:49:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:49:30 -0500 Subject: rpms/nspr/devel .cvsignore, 1.7, 1.8 nspr.spec, 1.18, 1.19 sources, 1.8, 1.9 Message-ID: <200701230149.l0N1nUXI031700@cvs.devel.redhat.com> Author: wtchang Update of /cvs/dist/rpms/nspr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31674 Modified Files: .cvsignore nspr.spec sources Log Message: Upgrade to 4.6.5. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nspr/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Nov 2006 23:31:54 -0000 1.7 +++ .cvsignore 23 Jan 2007 01:49:28 -0000 1.8 @@ -1 +1 @@ -nspr-4.6.4.tar.gz +nspr-4.6.5.tar.gz Index: nspr.spec =================================================================== RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nspr.spec 16 Jan 2007 18:44:35 -0000 1.18 +++ nspr.spec 23 Jan 2007 01:49:28 -0000 1.19 @@ -1,7 +1,7 @@ Summary: Netscape Portable Runtime Name: nspr -Version: 4.6.4 -Release: 2 +Version: 4.6.5 +Release: 1 License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/nspr/ Group: System Environment/Libraries @@ -122,7 +122,10 @@ %{_bindir}/nspr-config %changelog -* Tue Feb 16 2007 Kai Engert - 4.6.4-2 +* Mon Jan 22 2007 Wan-Teh Chang - 4.6.5-1 +- Update to 4.6.5 + +* Tue Jan 16 2007 Kai Engert - 4.6.4-2 - Include upstream patch to fix ipv6 support (rhbz 222554) * Tue Nov 21 2006 Kai Engert - 4.6.4-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nspr/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Nov 2006 23:31:54 -0000 1.8 +++ sources 23 Jan 2007 01:49:28 -0000 1.9 @@ -1 +1 @@ -43db60ab2ff1599c17d3a3f55caa7d47 nspr-4.6.4.tar.gz +9bf15436496cb6bd96c1939f3ffb839f nspr-4.6.5.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 01:49:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 20:49:31 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2898.2.2,1.2898.2.3 Message-ID: <200701230149.l0N1nVdI031715@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31684 Modified Files: Tag: private-quintela-xen-3_0_4-branch kernel-2.6.spec Log Message: disable ia64 xen, what a surprise Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2898.2.2 retrieving revision 1.2898.2.3 diff -u -r1.2898.2.2 -r1.2898.2.3 --- kernel-2.6.spec 23 Jan 2007 01:31:53 -0000 1.2898.2.2 +++ kernel-2.6.spec 23 Jan 2007 01:49:29 -0000 1.2898.2.3 @@ -82,7 +82,7 @@ %endif # Xen only builds on i686, x86_64 and ia64 ... -%ifnarch i686 x86_64 ia64 +%ifnarch i686 x86_64 %define buildxen 0 %endif From fedora-cvs-commits at redhat.com Tue Jan 23 02:34:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 21:34:46 -0500 Subject: rpms/jakarta-commons-digester/devel commons-digester-1.7-component-info.xml, NONE, 1.1 jakarta-commons-digester.spec, 1.34, 1.35 Message-ID: <200701230234.l0N2YkxV003734@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/jakarta-commons-digester/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3674/devel Modified Files: jakarta-commons-digester.spec Added Files: commons-digester-1.7-component-info.xml Log Message: auto-import jakarta-commons-digester-1.7-6jpp.el4ep1.1 on branch devel from jakarta-commons-digester-1.7-6jpp.el4ep1.1.src.rpm --- NEW FILE commons-digester-1.7-component-info.xml --- Index: jakarta-commons-digester.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- jakarta-commons-digester.spec 10 Aug 2006 19:45:31 -0000 1.34 +++ jakarta-commons-digester.spec 23 Jan 2007 02:34:44 -0000 1.35 @@ -28,7 +28,17 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define _with_gcj_support 1 +# If you want repolib package to be built, +# issue the following: 'rpmbuild --with repolib' + +%define _with_repolib 1 + +%define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0} +%define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0} + +%define repodir /apache-digester/1.7brew +%define repodirlib %{repodir}/lib +%define repodirsrc %{repodir}/src %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} @@ -38,12 +48,13 @@ Name: jakarta-%{short_name} Version: 1.7 -Release: 5jpp.1 +Release: 6jpp.el4ep1.1 Epoch: 0 Summary: Jakarta Commons Digester Package License: Apache Software License Group: Development/Libraries/Java Source0: http://www.apache.org/dist/jakarta/commons/digester/source/commons-digester-%{version}-src.tar.gz +Source1: commons-digester-1.7-component-info.xml URL: http://jakarta.apache.org/commons/digester/ BuildRequires: ant BuildRequires: jakarta-commons-beanutils >= 0:1.7 @@ -55,13 +66,13 @@ BuildArch: noarch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Provides: %{short_name} -Obsoletes: %{short_name} +Provides: %{short_name} = %{epoch}:%{version}-%{release} +Obsoletes: %{short_name} < %{epoch}:%{version}-%{release} %if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat %endif %description @@ -69,6 +80,17 @@ object mapping package written in the Java language to be distributed under the ASF license. +%if %{with_repolib} +%package repolib +Summary: Artifacts to be uploaded to a repository library. +Group: Development/Libraries/Java + +%description repolib +Artifacts to be uploaded to a repository library. +This package is not meant to be installed but so its contents +can be extracted through rpm2cpio +%endif + %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation @@ -81,6 +103,10 @@ %prep %setup -q -n %{short_name}-%{version}-src + +tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` +sed -i "s/@TAG@/$tag/g" %{SOURCE1} + %build cp LICENSE.txt ../LICENSE @@ -112,6 +138,16 @@ %{_bindir}/aot-compile-rpm %endif + +%if %{with_repolib} + install -d -m 755 $RPM_BUILD_ROOT%{repodir} + install -d -m 755 $RPM_BUILD_ROOT%{repodirlib} + install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml + install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc} + install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc} + cp $RPM_BUILD_ROOT%{_javadir}/commons-digester.jar $RPM_BUILD_ROOT%{repodirlib} +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -155,7 +191,28 @@ %{_javadocdir}/%{name}-%{version} %ghost %doc %{_javadocdir}/%{name} + +%if %{with_repolib} +%files repolib +%defattr(-,root,root) +%{repodir} +%endif + %changelog +* Mon Jan 22 2007 Vivek Lakshmanan - 0:1.7-6jpp.el4ep1.1 +- Resynch with JPP release +- rpmlint clean up + +* Tue Jan 16 2007 Vivek Lakshmanan - 0:1.7-5jpp.3 +- Update component-info.xml to add scm and tag attribute instead of a comment +- Remove the export of a versioned jar + +* Tue Jan 9 2007 Vivek Lakshmanan - 0:1.7-5jpp.2 +- Upgrade to latest from JPP and FC6 +- Remove old RHUG specific trigger +- Add support for conditional build of repolib package +- Build repolib package by default + * Thu Aug 10 2006 Matt Wringe - 0:1.7-5jpp.1 - Merge with upstream version: - Add missing requires for javadoc @@ -227,5 +284,5 @@ * Fri Jun 07 2002 Henri Gomez 1.2-1jpp - 1.2 -- added short names in %{_javadir}, as does jakarta developpers +- added short names in _javadir, as does jakarta developpers - first jPackage release From fedora-cvs-commits at redhat.com Tue Jan 23 03:15:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 22:15:07 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.51, 1.52 gnome-games.spec, 1.111, 1.112 sources, 1.54, 1.55 Message-ID: <200701230315.l0N3F7uL021784@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21616 Modified Files: .cvsignore gnome-games.spec sources Log Message: update extra data Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 22 Jan 2007 16:39:05 -0000 1.51 +++ .cvsignore 23 Jan 2007 03:15:05 -0000 1.52 @@ -21,3 +21,4 @@ gnome-games-2.17.4.1.tar.bz2 gnome-games-2.17.5.tar.bz2 gnome-games-2.17.90.tar.bz2 +gnome-games-extra-data-2.17.90.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gnome-games.spec 22 Jan 2007 16:39:05 -0000 1.111 +++ gnome-games.spec 23 Jan 2007 03:15:05 -0000 1.112 @@ -25,12 +25,12 @@ %define libgnomeui_version 2.5.0 %define desktop_file_utils_version 0.2.90 -%define gnome_games_extra_data_version 2.14.0 +%define gnome_games_extra_data_version 2.17.90 Summary: GNOME games Name: gnome-games Version: 2.17.90 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPL Group: Amusements/Games @@ -348,6 +348,9 @@ %changelog +* Mon Jan 22 2007 Matthias Clasen - 1:2.17.90-2 +- Update extra data to 2.17.90 + * Mon Jan 22 2007 Matthias Clasen - 1:2.17.90-1 - Update to 2.17.90 - Fix some directory ownership issues Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 22 Jan 2007 16:39:05 -0000 1.54 +++ sources 23 Jan 2007 03:15:05 -0000 1.55 @@ -1,2 +1,2 @@ -01464739e83449288c6a58685604f86e gnome-games-extra-data-2.14.0.tar.bz2 2cfd9ca0201fbc9f4514ab3cee9a8268 gnome-games-2.17.90.tar.bz2 +0d44d896918bab582c947086b3038fb6 gnome-games-extra-data-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 03:17:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 22:17:45 -0500 Subject: rpms/jakarta-commons-digester/devel jakarta-commons-digester.spec, 1.35, 1.36 Message-ID: <200701230317.l0N3HjKm011668@cvs.devel.redhat.com> Author: vivekl Update of /cvs/dist/rpms/jakarta-commons-digester/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22514 Modified Files: jakarta-commons-digester.spec Log Message: - Resynch with JPP release Index: jakarta-commons-digester.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-digester/devel/jakarta-commons-digester.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- jakarta-commons-digester.spec 23 Jan 2007 02:34:44 -0000 1.35 +++ jakarta-commons-digester.spec 23 Jan 2007 03:17:43 -0000 1.36 @@ -28,11 +28,11 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +%define _with_gcj_support 1 + # If you want repolib package to be built, # issue the following: 'rpmbuild --with repolib' -%define _with_repolib 1 - %define with_repolib %{?_with_repolib:1}%{!?_with_repolib:0} %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0} @@ -48,7 +48,7 @@ Name: jakarta-%{short_name} Version: 1.7 -Release: 6jpp.el4ep1.1 +Release: 6jpp.1 Epoch: 0 Summary: Jakarta Commons Digester Package License: Apache Software License @@ -199,9 +199,8 @@ %endif %changelog -* Mon Jan 22 2007 Vivek Lakshmanan - 0:1.7-6jpp.el4ep1.1 +* Mon Jan 22 2007 Vivek Lakshmanan - 0:1.7-6jpp.1 - Resynch with JPP release -- rpmlint clean up * Tue Jan 16 2007 Vivek Lakshmanan - 0:1.7-5jpp.3 - Update component-info.xml to add scm and tag attribute instead of a comment From fedora-cvs-commits at redhat.com Tue Jan 23 03:30:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 22:30:20 -0500 Subject: rpms/at-spi/devel .cvsignore, 1.31, 1.32 at-spi.spec, 1.58, 1.59 sources, 1.31, 1.32 Message-ID: <200701230330.l0N3UKvD021394@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/at-spi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21245 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.7.16 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 10 Jan 2007 17:16:35 -0000 1.31 +++ .cvsignore 23 Jan 2007 03:30:18 -0000 1.32 @@ -1 +1 @@ -at-spi-1.7.15.tar.bz2 +at-spi-1.7.16.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- at-spi.spec 10 Jan 2007 17:16:35 -0000 1.58 +++ at-spi.spec 23 Jan 2007 03:30:18 -0000 1.59 @@ -1,12 +1,13 @@ -%define gtk2_version 2.3.0 +%define atk_version 1.12.0 +%define gtk2_version 2.10.0 +%define gail_version 1.9.0 %define libbonobo_version 2.4.0 %define orbit2_version 2.6.0 -%define gail_version 1.5.0 %define pango_version 1.2.0 Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.7.15 +Version: 1.7.16 Release: 1%{?dist} URL: http://developer.gnome.org/projects/gap/ Source0: %{name}-%{version}.tar.bz2 @@ -23,6 +24,7 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: gail-devel >= %{gail_version} +BuildRequires: atk-devel >= %{atk_version} BuildRequires: fontconfig BuildRequires: autoconf BuildRequires: gettext @@ -44,6 +46,7 @@ Summary: Development libraries and headers for at-spi Group: Development/Libraries Requires: %name = %{version}-%{release} +Requires: atk-devel >= %{atk_version} Requires: gtk2-devel >= %{gtk2_version} Requires: libbonobo-devel >= %{libbonobo_version} Requires: ORBit2-devel >= %{orbit2_version} @@ -68,6 +71,7 @@ %find_lang at-spi rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la %post -p /sbin/ldconfig @@ -94,6 +98,9 @@ %{_includedir}/* %changelog +* Wed Jan 22 2007 Matthias Clasen - 1.7.16-1 +- Update to 1.7.16 + * Wed Jan 10 2007 Matthias Clasen - 1.7.15-1 - Update to 1.7.15 Index: sources =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 10 Jan 2007 17:16:35 -0000 1.31 +++ sources 23 Jan 2007 03:30:18 -0000 1.32 @@ -1 +1 @@ -b8af15556d24e850feb2ffb40eda1d31 at-spi-1.7.15.tar.bz2 +e6b39d0a2fda9da3f1868cba8c452350 at-spi-1.7.16.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 03:42:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 22:42:15 -0500 Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.44, 1.45 nautilus-cd-burner.spec, 1.83, 1.84 sources, 1.44, 1.45 Message-ID: <200701230342.l0N3gFTk019176@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19160 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: 2.17.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 11 Jan 2007 04:44:59 -0000 1.44 +++ .cvsignore 23 Jan 2007 03:42:09 -0000 1.45 @@ -1 +1 @@ -nautilus-cd-burner-2.17.5.tar.bz2 +nautilus-cd-burner-2.17.6.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- nautilus-cd-burner.spec 11 Jan 2007 04:44:59 -0000 1.83 +++ nautilus-cd-burner.spec 23 Jan 2007 03:42:09 -0000 1.84 @@ -1,34 +1,48 @@ +%define gnome_vfs_version 2.1.3.1 +%define glib_version 2.10.0 +%define gtk_version 2.5.4 +%define libglade_version 2.0.0 +%define libgnome_version 2.14.0 +%define eel_version 2.13.3 +%define nautilus_version 2.15.3 +%define hal_version 0.5.7 +%define dbus_version 0.6 +%define gconf_version 2.14 +%define gnome_mount_version 0.5 + Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.17.5 +Version: 2.17.6 Release: 1%{?dist} Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: gnome-vfs2 >= 2.1.3.1 +Requires: gnome-vfs2 >= %{gnome_vfs_version} Requires: mkisofs Requires: cdrecord %ifnarch s390 Requires: cdrdao %endif Requires: dvd+rw-tools -Requires: hal >= 0.5.0 -Requires: gnome-mount >= 0.4 -Requires(post): GConf2 >= 2.14 -Requires(pre): GConf2 >= 2.14 -Requires(preun): GConf2 >= 2.14 -BuildRequires: gnome-vfs2-devel >= 2.1.3.1 -BuildRequires: libgnome-devel -BuildRequires: glib2-devel >= 2.1.0 -BuildRequires: gtk2-devel -BuildRequires: libglade2-devel -BuildRequires: eel2-devel +Requires: hal >= %{hal_version} +Requires: gnome-mount >= %{gnome_mount_version} +Requires: GConf2 >= %{gconf_version} + +Requires(post): GConf2 >= %{gconf_version} +Requires(pre): GConf2 >= %{gconf_version} +Requires(preun): GConf2 >= %{gconf_version} + +BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version} +BuildRequires: libgnome-devel >= %{libgnome_version} +BuildRequires: glib2-devel >= %{glib_version} +BuildRequires: gtk2-devel >= %{gtk_version} +BuildRequires: libglade2-devel >= %{libglade_version} +BuildRequires: eel2-devel >= %{eel_version} +BuildRequires: hal-devel >= %{hal_version} +BuildRequires: gnome-mount-devel >= %{gnome_mount_version} +BuildRequires: nautilus-devel >= %{nautilus_version} BuildRequires: gettext -BuildRequires: hal-devel >= 0.5.7 -BuildRequires: gnome-mount-devel -BuildRequires: nautilus-devel >= 2.5.4 -BuildRequires: gnome-mount >= 0.4 # For intltool: BuildRequires: perl-XML-Parser >= 2.31-16 @@ -40,8 +54,8 @@ Summary: The files needed for nautilus-cd-burner application development Group: Development/Libraries Requires: %name = %{version}-%{release} -Requires: gtk2-devel -Requires: nautilus-devel +Requires: gtk2-devel >= %{gtk_version} +Requires: nautilus-devel >= %{nautilus_version} Requires: pkgconfig %description devel @@ -114,7 +128,7 @@ %{_datadir}/nautilus-cd-burner %{_datadir}/applications/nautilus-cd-burner.desktop %{_datadir}/applications/nautilus-cd-burner-open-iso.desktop -%{_datadir}/icons/hicolor +%{_datadir}/icons/hicolor/* %files devel %defattr(-, root, root) @@ -124,6 +138,9 @@ %changelog +* Wed Jan 22 2007 Matthias Clasen - 2.17.6-1 +- Update to 2.17.6 + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 11 Jan 2007 04:44:59 -0000 1.44 +++ sources 23 Jan 2007 03:42:09 -0000 1.45 @@ -1 +1 @@ -70780ec13c8d227659acfedcc6beafa8 nautilus-cd-burner-2.17.5.tar.bz2 +7f1c40111a39d7b4d164e4c68714cc3b nautilus-cd-burner-2.17.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 03:51:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 22:51:08 -0500 Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.41, 1.42 gnome-icon-theme.spec, 1.66, 1.67 sources, 1.44, 1.45 Message-ID: <200701230351.l0N3p85g007225@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7209 Modified Files: .cvsignore gnome-icon-theme.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 10 Jan 2007 20:07:44 -0000 1.41 +++ .cvsignore 23 Jan 2007 03:51:06 -0000 1.42 @@ -1 +1 @@ -gnome-icon-theme-2.17.5.tar.bz2 +gnome-icon-theme-2.17.90.tar.bz2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- gnome-icon-theme.spec 10 Jan 2007 20:07:44 -0000 1.66 +++ gnome-icon-theme.spec 23 Jan 2007 03:51:06 -0000 1.67 @@ -1,6 +1,6 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -14,7 +14,7 @@ BuildRequires: librsvg2 Requires: hicolor-icon-theme Requires: pkgconfig -Prereq: gtk2 >= 2.6.2 +Requires(post): gtk2 >= 2.6.2 %description Contains the base icons needed by the Gnome desktop environment. @@ -90,7 +90,7 @@ %files %defattr(-,root,root) %{_datadir}/icons/gnome -%{_datadir}/icons/hicolor +%{_datadir}/icons/hicolor/* %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 10 Jan 2007 20:07:44 -0000 1.44 +++ sources 23 Jan 2007 03:51:06 -0000 1.45 @@ -1 +1 @@ -b5082c2091748f659a4e4c25b758edff gnome-icon-theme-2.17.5.tar.bz2 +1941a709a01e4c74b6033d1d0037c75a gnome-icon-theme-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:08:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:08:26 -0500 Subject: rpms/nautilus/devel .cvsignore, 1.48, 1.49 nautilus.spec, 1.136, 1.137 sources, 1.52, 1.53 Message-ID: <200701230408.l0N48Q47007525@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7509 Modified Files: .cvsignore nautilus.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 19 Dec 2006 06:11:18 -0000 1.48 +++ .cvsignore 23 Jan 2007 04:08:24 -0000 1.49 @@ -1 +1 @@ -nautilus-2.17.1.tar.bz2 +nautilus-2.17.90.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- nautilus.spec 19 Dec 2006 06:46:58 -0000 1.136 +++ nautilus.spec 23 Jan 2007 04:08:24 -0000 1.137 @@ -17,8 +17,8 @@ %define gconf_version 2.14 Name: nautilus -Summary: Nautilus is a file manager for GNOME. -Version: 2.17.1 +Summary: Nautilus is a file manager for GNOME +Version: 2.17.90 Release: 1%{?dist} License: GPL Group: User Interface/Desktops @@ -208,6 +208,9 @@ %{_libdir}/*.so %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Tue Dec 19 2006 Matthias Clasen - 2.17.1-1 - Update to 2.17.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 19 Dec 2006 06:11:18 -0000 1.52 +++ sources 23 Jan 2007 04:08:24 -0000 1.53 @@ -1 +1 @@ -c6279d62a26a9db2f32b2244fe1123c1 nautilus-2.17.1.tar.bz2 +eaf85ab6a15cbcecb9762aa91ae549a6 nautilus-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:25:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:25:10 -0500 Subject: rpms/gnome-media/devel .cvsignore, 1.34, 1.35 gnome-media.spec, 1.82, 1.83 sources, 1.33, 1.34 Message-ID: <200701230425.l0N4PAmW028131@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28111 Modified Files: .cvsignore gnome-media.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 10 Jan 2007 20:31:11 -0000 1.34 +++ .cvsignore 23 Jan 2007 04:25:05 -0000 1.35 @@ -1 +1 @@ -gnome-media-2.17.2.tar.bz2 +gnome-media-2.17.90.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- gnome-media.spec 10 Jan 2007 20:31:11 -0000 1.82 +++ gnome-media.spec 23 Jan 2007 04:25:05 -0000 1.83 @@ -1,16 +1,17 @@ %define glib2_version 2.4.0 %define pango_version 1.4.0 %define gtk2_version 2.4.0 -%define libgnomeui_version 2.6.0 +%define libgnome_version 2.13.7 +%define libgnomeui_version 2.13.2 %define gail_version 1.2 %define desktop_file_utils_version 0.2.90 -%define gstreamer_version 0.10.2 +%define gstreamer_version 0.10.3 %define gettext_package gnome-media-2.0 Summary: GNOME media programs Name: gnome-media -Version: 2.17.2 +Version: 2.17.90 Release: 1%{?dist} License: GPL Group: Applications/Multimedia @@ -18,21 +19,31 @@ Patch4: gnome-media-2.16.0-settings.patch Patch5: gnome-media-2.13.5-hide-help-button.patch -Requires: scrollkeeper >= 0.1.4 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: gnome URL: http://www.gnome.org ExcludeArch: s390 s390x +Requires(post): scrollkeeper >= 0.1.4 +Requires(postun): scrollkeeper >= 0.1.4 +Requires(post): GConf2 >= 2.14 +Requires(pre): GConf2 >= 2.14 +Requires(preun): GConf2 >= 2.14 + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: libgnome-devel >= %{libgnome_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} +BuildRequires: libglade-devel +BuildRequires: GConf2-devel +BuildRequires: gnome-vfs2-devel +BuildRequires: esound-devel BuildRequires: gail-devel >= %{gail_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: /usr/bin/automake-1.4 BuildRequires: gstreamer-devel >= %{gstreamer_version} -BuildRequires: gstreamer-plugins-base-devel +BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_version} BuildRequires: nautilus-cd-burner-devel BuildRequires: scrollkeeper BuildRequires: gettext @@ -48,10 +59,9 @@ Summary: Libraries/include files for GNOME media programs Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libgnome-devel -Requires: libglade2-devel -Requires: gtk2-devel -Requires: GConf2-devel +Requires: gtk2-devel >= %{gtk2_version} +Requires: libgnome-devel >= %{libgnome_version} +Requires: libgnomeui-devel >= %{libgnomeui_version} Requires: pkgconfig %description devel @@ -150,7 +160,7 @@ %postun scrollkeeper-update /sbin/ldconfig -/bin/true ## for rpmlint, -p requires absolute path and is just dumb + %files -f %{gettext_package}.lang %defattr(-, root, root) @@ -181,6 +191,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Jan 10 2007 Matthias Clasen - 2.17.2-1 - Update to 2.17.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 10 Jan 2007 20:31:11 -0000 1.33 +++ sources 23 Jan 2007 04:25:05 -0000 1.34 @@ -1 +1 @@ -5cd6959e326b831022d3725ad2349e0e gnome-media-2.17.2.tar.bz2 +094a92f01a3581de7b3567f85320df7b gnome-media-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:28:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:28:51 -0500 Subject: rpms/gnome-media/devel gnome-media.spec,1.83,1.84 Message-ID: <200701230428.l0N4SpsP028261@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28247 Modified Files: gnome-media.spec Log Message: fix requires Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- gnome-media.spec 23 Jan 2007 04:25:05 -0000 1.83 +++ gnome-media.spec 23 Jan 2007 04:28:49 -0000 1.84 @@ -35,7 +35,7 @@ BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnome-devel >= %{libgnome_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} -BuildRequires: libglade-devel +BuildRequires: libglade2-devel BuildRequires: GConf2-devel BuildRequires: gnome-vfs2-devel BuildRequires: esound-devel From fedora-cvs-commits at redhat.com Tue Jan 23 04:31:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:31:19 -0500 Subject: rpms/libgnomeui/devel .cvsignore, 1.34, 1.35 libgnomeui.spec, 1.65, 1.66 sources, 1.34, 1.35 Message-ID: <200701230431.l0N4VJlH009504@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9380 Modified Files: .cvsignore libgnomeui.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 10 Jan 2007 20:16:40 -0000 1.34 +++ .cvsignore 23 Jan 2007 04:31:17 -0000 1.35 @@ -1 +1 @@ -libgnomeui-2.17.1.tar.bz2 +libgnomeui-2.17.90.tar.bz2 Index: libgnomeui.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- libgnomeui.spec 20 Jan 2007 22:28:52 -0000 1.65 +++ libgnomeui.spec 23 Jan 2007 04:31:17 -0000 1.66 @@ -17,8 +17,8 @@ Summary: GNOME base GUI library Name: libgnomeui -Version: 2.17.1 -Release: 2%{?dist} +Version: 2.17.90 +Release: 1%{?dist} URL: ftp://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -141,6 +141,9 @@ %{_datadir}/gtk-doc/html/libgnomeui %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Sat Jan 20 2007 Matthias Clasen - 2.17.1-2 - Drop explicit esound requirement in preparation for pulseaudio - Clean up requires Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 10 Jan 2007 20:16:40 -0000 1.34 +++ sources 23 Jan 2007 04:31:17 -0000 1.35 @@ -1 +1 @@ -4bd79a200049ed5a4c8014ee0465eede libgnomeui-2.17.1.tar.bz2 +4bd2574a2baf77335df937168fa3002c libgnomeui-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:37:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:37:58 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.54, 1.55 gnome-utils.spec, 1.140, 1.141 sources, 1.58, 1.59 Message-ID: <200701230437.l0N4bwYe014498@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14350 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 10 Jan 2007 19:34:10 -0000 1.54 +++ .cvsignore 23 Jan 2007 04:37:56 -0000 1.55 @@ -1 +1 @@ -gnome-utils-2.17.1.tar.bz2 +gnome-utils-2.17.90.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- gnome-utils.spec 10 Jan 2007 19:45:25 -0000 1.140 +++ gnome-utils.spec 23 Jan 2007 04:37:56 -0000 1.141 @@ -9,7 +9,7 @@ %define gnome_panel_version 2.9.4 Name: gnome-utils -Version: 2.17.1 +Version: 2.17.90 Release: 1%{?dist} Epoch: 1 Summary: GNOME utility programs @@ -49,14 +49,9 @@ Requires(postun): scrollkeeper Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} -# Requirements to make upgrading from older gnome-utils work -# can be dropped post-FC6 -Requires: gcalctool -Requires: gucharmap -Requires: zenity - # obsolete the standalone baobab package from Extras Obsoletes: baobab +Provides: baobab %description GNOME (GNU Network Object Model Environment) is a user-friendly set of @@ -67,9 +62,9 @@ %package devel Summary: Libraries and headers for gnome-utils libraries Group: Development/Libraries +Requires: gnome-utils = %{epoch}:%{version}-%{release} Requires: glib2-devel >= %{glib2_version} Requires: gtk2-devel >= %{gtk2_version} -Requires: gnome-utils = %{epoch}:%{version}-%{release} Requires: pkgconfig %description devel @@ -247,6 +242,10 @@ %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 +- Drop requires for gcalctool, gucharmap, zenity + * Wed Jan 10 2007 Matthias Clasen - 2.17.1-1 - Update to 2.17.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 10 Jan 2007 19:34:10 -0000 1.58 +++ sources 23 Jan 2007 04:37:56 -0000 1.59 @@ -1 +1 @@ -aa085b40eb6b2a382b276812f0802bef gnome-utils-2.17.1.tar.bz2 +185b717f6f735c1460d2f3ace79a28c3 gnome-utils-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:47:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:47:22 -0500 Subject: rpms/libbonobo/devel .cvsignore, 1.20, 1.21 libbonobo.spec, 1.49, 1.50 sources, 1.20, 1.21 Message-ID: <200701230447.l0N4lMjK003364@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv757 Modified Files: .cvsignore libbonobo.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 4 Sep 2006 23:00:51 -0000 1.20 +++ .cvsignore 23 Jan 2007 04:47:20 -0000 1.21 @@ -1 +1 @@ -libbonobo-2.16.0.tar.bz2 +libbonobo-2.17.90.tar.bz2 Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- libbonobo.spec 4 Sep 2006 23:00:51 -0000 1.49 +++ libbonobo.spec 23 Jan 2007 04:47:20 -0000 1.50 @@ -5,13 +5,13 @@ Summary: Bonobo component system Name: libbonobo -Version: 2.16.0 +Version: 2.17.90 Release: 1%{?dist} URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPreReq: libxml2-devel >= %{libxml2_version} BuildPreReq: ORBit2-devel >= %{orbit2_version} BuildPreReq: intltool >= 0.14-1 @@ -31,7 +31,7 @@ %package devel Summary: Libraries and headers for libbonobo Group: Development/Libraries -Requires: %name = %{version} +Requires: %name = %{version}-%{release} Requires: ORBit2-devel >= %{orbit2_version} Requires: libxml2-devel >= %{libxml2_version} Requires: pkgconfig @@ -120,6 +120,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Mon Sep 4 2006 Matthias Clasen - 2.16.0-1.fc6 - Update to 2.16.0 - Require pkgconfig in the -devel package Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 4 Sep 2006 23:00:51 -0000 1.20 +++ sources 23 Jan 2007 04:47:20 -0000 1.21 @@ -1 +1 @@ -30cdcf2b5316888f10fea6362b38499c libbonobo-2.16.0.tar.bz2 +d1836c22d589d3f67694543abf299eb6 libbonobo-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:51:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:51:17 -0500 Subject: rpms/libbonoboui/devel .cvsignore, 1.24, 1.25 libbonoboui.spec, 1.46, 1.47 sources, 1.25, 1.26 Message-ID: <200701230451.l0N4pHvt012286@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12160 Modified Files: .cvsignore libbonoboui.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 11 Jan 2007 02:47:49 -0000 1.24 +++ .cvsignore 23 Jan 2007 04:51:10 -0000 1.25 @@ -1 +1 @@ -libbonoboui-2.17.0.tar.bz2 +libbonoboui-2.17.90.tar.bz2 Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- libbonoboui.spec 11 Jan 2007 02:47:49 -0000 1.46 +++ libbonoboui.spec 23 Jan 2007 04:51:10 -0000 1.47 @@ -13,7 +13,7 @@ Summary: Bonobo user interface components Name: libbonoboui -Version: 2.17.0 +Version: 2.17.90 Release: 1%{?dist} URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 @@ -21,27 +21,20 @@ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxml2 >= %{libxml2_version} Requires: ORBit2 >= %{orbit2_version} -Requires: libbonobo >= %{libbonobo_version} -Requires: libgnomecanvas >= %{libgnomecanvas_version} -Requires: libgnome >= %{libgnome_version} -Requires: libart_lgpl >= %{libart_lgpl_version} -Requires: gtk2 >= %{gtk2_version} -Requires: libglade2 >= %{libglade2_version} - -BuildPreReq: libxml2-devel >= %{libxml2_version} -BuildPreReq: ORBit2-devel >= %{orbit2_version} -BuildPreReq: libbonobo-devel >= %{libbonobo_version} -BuildPreReq: libgnomecanvas-devel >= %{libgnomecanvas_version} -BuildPreReq: libgnome-devel >= %{libgnome_version} -BuildPreReq: libart_lgpl-devel >= %{libart_lgpl_version} -BuildPreReq: gtk2-devel >= %{gtk2_version} -BuildPreReq: libglade2-devel >= %{libglade2_version} -BuildPreReq: intltool >= 0.14-1 -BuildPreReq: libtool >= 1.4.2-12 -BuildPreReq: automake autoconf -BuildPreReq: glib2-devel >= %{glib2_version} + +BuildRequires: libxml2-devel >= %{libxml2_version} +BuildRequires: ORBit2-devel >= %{orbit2_version} +BuildRequires: libbonobo-devel >= %{libbonobo_version} +BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version} +BuildRequires: libgnome-devel >= %{libgnome_version} +BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version} +BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: libglade2-devel >= %{libglade2_version} +BuildRequires: intltool >= 0.14-1 +BuildRequires: libtool >= 1.4.2-12 +BuildRequires: automake autoconf +BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libXt-devel BuildRequires: gettext @@ -128,6 +121,9 @@ %{_datadir}/gtk-doc/html/libbonoboui %changelog +* Wed Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Jan 10 2007 Matthias Clasen - 2.17.0-1 - Update to 2.17.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 11 Jan 2007 02:47:49 -0000 1.25 +++ sources 23 Jan 2007 04:51:10 -0000 1.26 @@ -1 +1 @@ -a57613ce6b174a9442b598cbef4e5e7e libbonoboui-2.17.0.tar.bz2 +d435ecad7577333d9c735649bbf16d5e libbonoboui-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 04:58:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 22 Jan 2007 23:58:40 -0500 Subject: rpms/control-center/devel .cvsignore, 1.50, 1.51 control-center.spec, 1.215, 1.216 sources, 1.53, 1.54 Message-ID: <200701230458.l0N4wenq018172@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15093 Modified Files: .cvsignore control-center.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 11 Jan 2007 05:20:17 -0000 1.50 +++ .cvsignore 23 Jan 2007 04:58:38 -0000 1.51 @@ -1 +1 @@ -control-center-2.17.5.tar.bz2 +control-center-2.17.90.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- control-center.spec 11 Jan 2007 20:05:25 -0000 1.215 +++ control-center.spec 23 Jan 2007 04:58:38 -0000 1.216 @@ -20,7 +20,7 @@ Summary: GNOME Control Center Name: control-center -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} Epoch: 1 License: GPL/LGPL @@ -321,7 +321,7 @@ %{_datadir}/pixmaps/* %{_datadir}/gnome/* %{_datadir}/applications/*.desktop -%{_datadir}/idl +%{_datadir}/idl/* %{_datadir}/omf/control-center %{_datadir}/gnome-default-applications/* %{_datadir}/desktop-directories/* @@ -351,6 +351,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Thu Jan 11 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 11 Jan 2007 05:20:17 -0000 1.53 +++ sources 23 Jan 2007 04:58:38 -0000 1.54 @@ -1 +1 @@ -0f5b695d93eb4ac468c8ba7ad748dbd5 control-center-2.17.5.tar.bz2 +9bffeb1b1e84158f13c70e9a29f4121b control-center-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:10:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:10:00 -0500 Subject: rpms/ORBit2/devel ORBit2.spec,1.50,1.51 Message-ID: <200701230510.l0N5A0oQ022525@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ORBit2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20857 Modified Files: ORBit2.spec Log Message: re-add a missing lib Index: ORBit2.spec =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ORBit2.spec 22 Jan 2007 21:11:45 -0000 1.50 +++ ORBit2.spec 23 Jan 2007 05:09:52 -0000 1.51 @@ -4,7 +4,7 @@ Summary: A high-performance CORBA Object Request Broker Name: ORBit2 Version: 2.14.5 -Release: 1%{?dist} +Release: 2%{?dist} Source: %{name}-%{version}.tar.bz2 Group: System Environment/Daemons License: LGPL/GPL @@ -71,7 +71,7 @@ rm -rf %{buildroot} %makeinstall -rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/ORBit-2.0/*.*a rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a @@ -117,6 +117,8 @@ %files devel %defattr(-,root,root) %{_libdir}/*.so +# this is needed by libbonobo +%{_libdir}/libname-server-2.a %{_libdir}/pkgconfig/* %{_bindir}/orbit-idl-2 %{_bindir}/typelib-dump @@ -129,6 +131,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 22 2007 Matthias Clasen - 2.14.5-2 +- Re-add a static library that is needed by libbonobo + * Mon Jan 22 2007 Matthias Clasen - 2.14.5-1 - Update to 2.14.5 From fedora-cvs-commits at redhat.com Tue Jan 23 05:22:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:22:11 -0500 Subject: rpms/libgnomeprint22/devel .cvsignore, 1.16, 1.17 libgnomeprint22.spec, 1.43, 1.44 sources, 1.16, 1.17 Message-ID: <200701230522.l0N5MB5s014512@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeprint22/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11846 Modified Files: .cvsignore libgnomeprint22.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Nov 2006 04:36:41 -0000 1.16 +++ .cvsignore 23 Jan 2007 05:22:07 -0000 1.17 @@ -1 +1 @@ -libgnomeprint-2.17.0.tar.bz2 +libgnomeprint-2.17.90.tar.bz2 Index: libgnomeprint22.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/libgnomeprint22.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libgnomeprint22.spec 27 Nov 2006 04:59:46 -0000 1.43 +++ libgnomeprint22.spec 23 Jan 2007 05:22:07 -0000 1.44 @@ -15,13 +15,13 @@ Summary: Printing library for GNOME. Name: libgnomeprint22 -Version: 2.17.0 -Release: 2%{?dist} +Version: 2.17.90 +Release: 1%{?dist} License: LGPL Group: System Environment/Base Source: libgnomeprint-%{version}.tar.bz2 URL: http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: urw-fonts Requires: ghostscript @@ -68,7 +68,7 @@ Summary: Libraries and include files for developing GNOME printing applications Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= %{glib2_version} Requires: pango-devel >= %{pango_version} @@ -132,6 +132,9 @@ %{_datadir}/gtk-doc/* %changelog +* Tue Jan 23 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Mon Nov 27 2006 Matthias Clasen - 2.17.0-2 - Fix BuildRequires Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeprint22/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Nov 2006 04:36:41 -0000 1.16 +++ sources 23 Jan 2007 05:22:07 -0000 1.17 @@ -1 +1 @@ -9e9974f575cbbe0c009d5ac250075115 libgnomeprint-2.17.0.tar.bz2 +d04ed8ca061c3581d1120c88f6a285fd libgnomeprint-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:26:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:26:01 -0500 Subject: rpms/control-center/devel control-center.spec,1.216,1.217 Message-ID: <200701230526.l0N5Q1ie015985@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15697 Modified Files: control-center.spec Log Message: fix file lists Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- control-center.spec 23 Jan 2007 04:58:38 -0000 1.216 +++ control-center.spec 23 Jan 2007 05:25:57 -0000 1.217 @@ -327,6 +327,8 @@ %{_datadir}/desktop-directories/* %{_datadir}/dbus-1/services/* %{_datadir}/mime/packages/gnome-theme-package.xml +%{_datadir}/icons/hicolor/*/apps/typing-monitor.png +%{_datadir}/icons/hicolor/scalable/apps/typing-monitor.svg %{_bindir}/* %{_libexecdir}/* %{_libdir}/nautilus/extensions-1.0/* From fedora-cvs-commits at redhat.com Tue Jan 23 05:33:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:33:10 -0500 Subject: rpms/libgnomeprintui22/devel .cvsignore, 1.17, 1.18 libgnomeprintui22.spec, 1.38, 1.39 sources, 1.17, 1.18 Message-ID: <200701230533.l0N5XAaT021134@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeprintui22/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20768 Modified Files: .cvsignore libgnomeprintui22.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Nov 2006 04:49:34 -0000 1.17 +++ .cvsignore 23 Jan 2007 05:33:08 -0000 1.18 @@ -1,8 +1 @@ -libgnomeprintui-2.8.0.tar.bz2 -libgnomeprintui-2.8.2.tar.bz2 -libgnomeprintui-2.10.1.tar.bz2 -libgnomeprintui-2.11.0.tar.bz2 -libgnomeprintui-2.12.0.tar.bz2 -libgnomeprintui-2.12.1.tar.bz2 -docs.tar.gz -libgnomeprintui-2.17.0.tar.bz2 +libgnomeprintui-2.17.90.tar.bz2 Index: libgnomeprintui22.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- libgnomeprintui22.spec 13 Nov 2006 04:58:25 -0000 1.38 +++ libgnomeprintui22.spec 23 Jan 2007 05:33:08 -0000 1.39 @@ -5,15 +5,13 @@ Summary: GUI support for libgnomeprint Name: libgnomeprintui22 -Version: 2.17.0 +Version: 2.17.90 Release: 1%{?dist} Source0: libgnomeprintui-%{version}.tar.bz2 -# http://bugzilla.gnome.org/show_bug.cgi?id=349098 -Source1: docs.tar.gz URL: http://ftp.gnome.org/pub/gnome/sources/libgnomeprintui/ License: LGPL Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gtk2 >= %{gtk2_version} Requires: libgnomeprint22 >= %{libgnomeprint_version} @@ -42,7 +40,7 @@ %package devel Summary: Libraries and headers for libgnomeprintui Group: Development/Libraries -Requires: %name = %{version}-%{release} +Requires: %name = %{version}-%{release} Requires: pkgconfig Requires: gtk2-devel >= %{gtk2_version} @@ -61,8 +59,6 @@ %prep %setup -q -n libgnomeprintui-%{version} -tar xzf %{SOURCE1} - %patch1 -p1 -b .nognomecommon %build @@ -104,9 +100,12 @@ %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %{_includedir}/* -%{_datadir}/gtk-doc/* +%{_datadir}/gtk-doc/html/libgnomeprintui %changelog +* Tue Jan 23 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Sun Nov 12 2006 Matthias Clasen - 2.17.0-1 - Update to 2.17.0 - Don't ship static libraries Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 Nov 2006 04:49:34 -0000 1.17 +++ sources 23 Jan 2007 05:33:08 -0000 1.18 @@ -1,2 +1 @@ -49aa70260af004f3046c9fef2257e331 docs.tar.gz -ca33e6e1a54c076293ce2716839214b9 libgnomeprintui-2.17.0.tar.bz2 +6044737d1271a9f6fdefc7be7e6ab1cb libgnomeprintui-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:39:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:39:06 -0500 Subject: rpms/gnome-session/devel .cvsignore, 1.32, 1.33 gnome-session.spec, 1.105, 1.106 sources, 1.32, 1.33 Message-ID: <200701230539.l0N5d6C5025500@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25345 Modified Files: .cvsignore gnome-session.spec sources Log Message: 2.17.90.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 22 Jan 2007 04:58:32 -0000 1.32 +++ .cvsignore 23 Jan 2007 05:39:03 -0000 1.33 @@ -1 +1 @@ -gnome-session-2.17.90.tar.bz2 +gnome-session-2.17.90.1.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- gnome-session.spec 22 Jan 2007 05:32:25 -0000 1.105 +++ gnome-session.spec 23 Jan 2007 05:39:04 -0000 1.106 @@ -11,7 +11,7 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.17.90 +Version: 2.17.90.1 Release: 1%{?dist} URL: http://www.gnome.org Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-session/2.17/%{name}-%{version}.tar.bz2 @@ -192,6 +192,9 @@ %{_datadir}/icons/hicolor/scalable/apps/session-properties.svg %changelog +* Tue Jan 23 2007 Matthias Clasen - 2.17.90.1-1 +- Update to 2.17.90.1 + * Sun Jan 21 2007 Matthias Clasen - 2.17.90-1 - Update to 2.17.90 - Clean up BuildRequires Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 22 Jan 2007 04:58:32 -0000 1.32 +++ sources 23 Jan 2007 05:39:04 -0000 1.33 @@ -1 +1 @@ -ed217f427544c6c7b058f44d964fbdd1 gnome-session-2.17.90.tar.bz2 +afab8088867a8e7593003037e6742564 gnome-session-2.17.90.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:39:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:39:25 -0500 Subject: rpms/libgnomeprintui22/devel libgnomeprintui22.spec,1.39,1.40 Message-ID: <200701230539.l0N5dPVM025771@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeprintui22/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24832 Modified Files: libgnomeprintui22.spec Log Message: fix BRs Index: libgnomeprintui22.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeprintui22/devel/libgnomeprintui22.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- libgnomeprintui22.spec 23 Jan 2007 05:33:08 -0000 1.39 +++ libgnomeprintui22.spec 23 Jan 2007 05:39:23 -0000 1.40 @@ -25,10 +25,11 @@ # For GTK_DOC autoconf macro BuildRequires: gtk-doc >= 1.2 -BuildPrereq: automake -BuildPrereq: autoconf -BuildPrereq: libtool -BuildPrereq: gettext +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: gettext +BuildRequires: intltool # Re-autogen without GNOME_COMPILE_WARNINGS Patch1: libgnomeprintui-nognomecommon.patch From fedora-cvs-commits at redhat.com Tue Jan 23 05:46:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:46:51 -0500 Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.43, 1.44 gnome-system-monitor.spec, 1.74, 1.75 sources, 1.43, 1.44 Message-ID: <200701230546.l0N5kpjV031338@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-system-monitor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31243 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.17.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 11 Jan 2007 05:25:25 -0000 1.43 +++ .cvsignore 23 Jan 2007 05:46:49 -0000 1.44 @@ -1 +1 @@ -gnome-system-monitor-2.17.5.tar.bz2 +gnome-system-monitor-2.17.6.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gnome-system-monitor.spec 11 Jan 2007 05:25:25 -0000 1.74 +++ gnome-system-monitor.spec 23 Jan 2007 05:46:49 -0000 1.75 @@ -1,6 +1,5 @@ # Note that this is NOT a relocatable package -%define libgnomeui_version 2.2.0 %define libgtop2_version 2.9.5 %define libwnck_version 2.9.92 %define pango_version 1.2.0 @@ -11,18 +10,13 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.17.5 +Version: 2.17.6 Release: 1%{?dist} License: GPL Group: Applications/System URL: http://www.gnome.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.17/gnome-system-monitor-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libgnomeui >= %{libgnomeui_version} -Requires: libgtop2 >= %{libgtop2_version} -Requires: libwnck >= %{libwnck_version} -Requires: libselinux >= %{libselinux_version} -BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgtop2-devel >= %{libgtop2_version} BuildRequires: libwnck-devel >= %{libwnck_version} BuildRequires: pango-devel >= %{pango_version} @@ -103,6 +97,9 @@ %{_datadir}/omf/gnome-system-monitor/ %changelog +* Tue Jan 22 2007 Matthias Clasen - 2.17.6-1 +- Update to 2.17.6 + * Thu Jan 11 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 11 Jan 2007 05:25:25 -0000 1.43 +++ sources 23 Jan 2007 05:46:49 -0000 1.44 @@ -1 +1 @@ -7f5d562f975b81becda7c3c80d153860 gnome-system-monitor-2.17.5.tar.bz2 +d83d2131362d1885fa278d669f6ee0c1 gnome-system-monitor-2.17.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:48:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:48:52 -0500 Subject: rpms/gnome-screensaver/devel .cvsignore, 1.35, 1.36 gnome-screensaver.spec, 1.128, 1.129 sources, 1.38, 1.39 Message-ID: <200701230548.l0N5mqvh015397@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15381 Modified Files: .cvsignore gnome-screensaver.spec sources Log Message: 2.17.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 11 Jan 2007 05:21:38 -0000 1.35 +++ .cvsignore 23 Jan 2007 05:48:49 -0000 1.36 @@ -1 +1 @@ -gnome-screensaver-2.17.5.tar.bz2 +gnome-screensaver-2.17.6.tar.bz2 Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- gnome-screensaver.spec 11 Jan 2007 05:21:38 -0000 1.128 +++ gnome-screensaver.spec 23 Jan 2007 05:48:49 -0000 1.129 @@ -12,7 +12,7 @@ Summary: GNOME Screensaver Name: gnome-screensaver -Version: 2.17.5 +Version: 2.17.6 Release: 1%{?dist} License: GPL Group: Amusements/Graphics @@ -121,6 +121,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Tue Jan 22 2007 Matthias Clasen - 2.17.6-1 +- Update to 2.17.6 + * Thu Jan 11 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 11 Jan 2007 05:21:38 -0000 1.38 +++ sources 23 Jan 2007 05:48:49 -0000 1.39 @@ -1 +1 @@ -37e6923fab2cd5dcb781a8420f56f73e gnome-screensaver-2.17.5.tar.bz2 +7a93aa30c762e36ae275184702d06a34 gnome-screensaver-2.17.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:58:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:58:03 -0500 Subject: rpms/gedit/devel .cvsignore, 1.55, 1.56 gedit.spec, 1.120, 1.121 sources, 1.57, 1.58 Message-ID: <200701230558.l0N5w3n8015677@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15659 Modified Files: .cvsignore gedit.spec sources Log Message: 2.17.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 11 Jan 2007 04:03:56 -0000 1.55 +++ .cvsignore 23 Jan 2007 05:58:00 -0000 1.56 @@ -1 +1 @@ -gedit-2.17.3.tar.bz2 +gedit-2.17.4.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- gedit.spec 11 Jan 2007 04:03:56 -0000 1.120 +++ gedit.spec 23 Jan 2007 05:58:01 -0000 1.121 @@ -18,7 +18,7 @@ Summary: gEdit is a small but powerful text editor for GNOME Name: gedit -Version: 2.17.3 +Version: 2.17.4 Release: 1%{?dist} Epoch: 1 License: GPL @@ -205,6 +205,9 @@ %{_datadir}/gtk-doc/html/gedit/ %changelog +* Tue Jan 23 2007 Matthias Clasen - 1:2.17.4-1 +- Update to 2.17.4 + * Wed Jan 10 2007 Matthias Clasen - 1:2.17.3-1 - Update to 2.17.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 11 Jan 2007 04:03:56 -0000 1.57 +++ sources 23 Jan 2007 05:58:01 -0000 1.58 @@ -1 +1 @@ -c7a31c6cd277e7668b0ec675831e526f gedit-2.17.3.tar.bz2 +c23767b8109a76335a80ee59a443395d gedit-2.17.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 05:58:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 00:58:09 -0500 Subject: rpms/gnome-system-monitor/devel gnome-system-monitor.spec, 1.75, 1.76 Message-ID: <200701230558.l0N5w9Eb015701@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-system-monitor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15630 Modified Files: gnome-system-monitor.spec Log Message: fix BRs Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- gnome-system-monitor.spec 23 Jan 2007 05:46:49 -0000 1.75 +++ gnome-system-monitor.spec 23 Jan 2007 05:58:07 -0000 1.76 @@ -17,6 +17,9 @@ URL: http://www.gnome.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.17/gnome-system-monitor-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libgnome-devel +BuildRequires: GConf2-devel +BuildRequires: gnome-vfs2-devel BuildRequires: libgtop2-devel >= %{libgtop2_version} BuildRequires: libwnck-devel >= %{libwnck_version} BuildRequires: pango-devel >= %{pango_version} From fedora-cvs-commits at redhat.com Tue Jan 23 06:04:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 01:04:27 -0500 Subject: rpms/gnome-power-manager/devel .cvsignore, 1.26, 1.27 gnome-power-manager.spec, 1.74, 1.75 sources, 1.26, 1.27 Message-ID: <200701230604.l0N64Rqq016003@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15979 Modified Files: .cvsignore gnome-power-manager.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 20 Dec 2006 06:11:37 -0000 1.26 +++ .cvsignore 23 Jan 2007 06:04:25 -0000 1.27 @@ -1 +1 @@ -gnome-power-manager-2.17.4.tar.bz2 +gnome-power-manager-2.17.90.tar.bz2 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gnome-power-manager.spec 20 Dec 2006 06:17:05 -0000 1.74 +++ gnome-power-manager.spec 23 Jan 2007 06:04:25 -0000 1.75 @@ -4,7 +4,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.17.4 +Version: 2.17.90 Release: 1%{?dist} License: GPL Group: Applications/System @@ -123,6 +123,9 @@ %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml %changelog +* Tue Jan 23 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Wed Dec 19 2006 Matthias Clasen - 2.17.4-1 - Update to 2.17.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 20 Dec 2006 06:11:37 -0000 1.26 +++ sources 23 Jan 2007 06:04:25 -0000 1.27 @@ -1 +1 @@ -08882103f790b1dd66a0c57e3e04665d gnome-power-manager-2.17.4.tar.bz2 +472552cd49ac45b63e9f224fb1c39917 gnome-power-manager-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 06:09:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 01:09:50 -0500 Subject: rpms/gnome-terminal/devel .cvsignore, 1.31, 1.32 gnome-terminal.spec, 1.70, 1.71 sources, 1.32, 1.33 Message-ID: <200701230609.l0N69oQg016164@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16148 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 22 Oct 2006 01:33:17 -0000 1.31 +++ .cvsignore 23 Jan 2007 06:09:48 -0000 1.32 @@ -1 +1 @@ -gnome-terminal-2.16.1.tar.bz2 +gnome-terminal-2.17.90.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- gnome-terminal.spec 22 Oct 2006 01:33:17 -0000 1.70 +++ gnome-terminal.spec 23 Jan 2007 06:09:48 -0000 1.71 @@ -12,7 +12,7 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.16.1 +Version: 2.17.90 Release: 1%{?dist} URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 @@ -22,7 +22,7 @@ License: GPL Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: vte >= %{vte_version} Requires: gtk2 >= %{gtk2_version} @@ -126,6 +126,9 @@ %{_libdir}/bonobo/servers/gnome-terminal.server %changelog +* Tue Jan 23 2007 Matthias Clasen - 2.17.90-1 +- Update to 2.17.90 + * Sat Oct 21 2006 Matthias Clasen - 2.16.1-1 - Update to 2.16.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 22 Oct 2006 01:33:17 -0000 1.32 +++ sources 23 Jan 2007 06:09:48 -0000 1.33 @@ -1 +1 @@ -861e1b780819214b4d5a398e7999c093 gnome-terminal-2.16.1.tar.bz2 +b13bc98148c4b834f032b956b0390704 gnome-terminal-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 06:18:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 01:18:05 -0500 Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.71,1.72 Message-ID: <200701230618.l0N6I5am004376@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4355 Modified Files: gnome-terminal.spec Log Message: drop upstreamed patch Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- gnome-terminal.spec 23 Jan 2007 06:09:48 -0000 1.71 +++ gnome-terminal.spec 23 Jan 2007 06:18:03 -0000 1.72 @@ -4,7 +4,6 @@ %define pango_version 1.8.0 %define gtk2_version 2.6.0 %define libgnomeui_version 2.3.0 -#%define libzvt_version 1.113.0 %define vte_version 0.12.0-2 %define desktop_file_utils_version 0.2.90 %define startup_notification_version 0.8 @@ -16,7 +15,6 @@ Release: 1%{?dist} URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 -Patch0: gnome-terminal-2.12.0-inputmethod.patch # Fix gnome.org Bug 338913 ??? Terminal resized when switching tabs Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch License: GPL @@ -57,7 +55,6 @@ %prep %setup -q -%patch0 -p1 -b .inputmethod %patch2 -p1 -b .338913-revert-336325 %build From fedora-cvs-commits at redhat.com Tue Jan 23 06:19:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 01:19:33 -0500 Subject: rpms/epiphany/devel .cvsignore, 1.51, 1.52 epiphany.spec, 1.133, 1.134 sources, 1.52, 1.53 Message-ID: <200701230619.l0N6JXTG004407@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4391 Modified Files: .cvsignore epiphany.spec sources Log Message: 2.17.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 11 Jan 2007 05:33:19 -0000 1.51 +++ .cvsignore 23 Jan 2007 06:19:31 -0000 1.52 @@ -1 +1 @@ -epiphany-2.17.5.tar.bz2 +epiphany-2.17.90.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- epiphany.spec 11 Jan 2007 05:33:19 -0000 1.133 +++ epiphany.spec 23 Jan 2007 06:19:31 -0000 1.134 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -173,6 +173,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Tue Jan 23 2007 Matthias Clasen 2.17.90-1 +- Update to 2.17.90 + * Thu Jan 11 2007 Matthias Clasen 2.17.5-1 - Update to 2.17.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 11 Jan 2007 05:33:19 -0000 1.52 +++ sources 23 Jan 2007 06:19:31 -0000 1.53 @@ -1 +1 @@ -b18d896ea9b5230a27ccae659eda040a epiphany-2.17.5.tar.bz2 +39ebc8f8628e41b30b5570a76f5c50e1 epiphany-2.17.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 06:32:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 01:32:08 -0500 Subject: rpms/gdm/devel .cvsignore, 1.40, 1.41 gdm.spec, 1.219, 1.220 sources, 1.42, 1.43 Message-ID: <200701230632.l0N6W8rk018456@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18331 Modified Files: .cvsignore gdm.spec sources Log Message: 2.17.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 11 Jan 2007 05:56:24 -0000 1.40 +++ .cvsignore 23 Jan 2007 06:32:01 -0000 1.41 @@ -1 +1 @@ -gdm-2.17.5.tar.bz2 +gdm-2.17.6.tar.bz2 Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- gdm.spec 13 Jan 2007 21:57:12 -0000 1.219 +++ gdm.spec 23 Jan 2007 06:32:01 -0000 1.220 @@ -15,8 +15,8 @@ Summary: The GNOME Display Manager Name: gdm -Version: 2.17.5 -Release: 2%{?dist} +Version: 2.17.6 +Release: 1%{?dist} Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -311,6 +311,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Jan 23 2007 Matthias Clasen - 1:2.17.6-1 +- Update to 2.17.6 + * Sat Jan 13 2007 Matthias Clasen - 1:2.17.5-2 - Enable ConsoleKit support Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 11 Jan 2007 05:56:24 -0000 1.42 +++ sources 23 Jan 2007 06:32:01 -0000 1.43 @@ -1 +1 @@ -08fdf39926538b9cb17efd3413567556 gdm-2.17.5.tar.bz2 +e9b91d43d90d512b7aa241b5a1755a88 gdm-2.17.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 06:52:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 01:52:09 -0500 Subject: rpms/f-spot/devel .cvsignore, 1.10, 1.11 f-spot.spec, 1.33, 1.34 sources, 1.10, 1.11 Message-ID: <200701230652.l0N6q9Lx021253@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21092 Modified Files: .cvsignore f-spot.spec sources Log Message: 0.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Oct 2006 16:48:49 -0000 1.10 +++ .cvsignore 23 Jan 2007 06:52:07 -0000 1.11 @@ -1 +1 @@ -f-spot-0.2.2.tar.bz2 +f-spot-0.3.2.tar.bz2 Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- f-spot.spec 20 Oct 2006 16:48:49 -0000 1.33 +++ f-spot.spec 23 Jan 2007 06:52:07 -0000 1.34 @@ -1,5 +1,5 @@ Name: f-spot -Version: 0.2.2 +Version: 0.3.2 Release: 1%{?dist} Summary: Photo management application @@ -78,6 +78,9 @@ %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop %changelog +* Tue Jan 23 2007 Matthias Clasen - 0.3.2-1 +- Update to 0.3.2 + * Fri Oct 20 2006 Christopher Aillon - 0.2.2-1 - Update to 0.2.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Oct 2006 16:48:49 -0000 1.10 +++ sources 23 Jan 2007 06:52:07 -0000 1.11 @@ -1 +1 @@ -69b4e70546b4ab1d7dcc7095fcfa65cd f-spot-0.2.2.tar.bz2 +1084f359ee7de5a4d24ed37a72b1342a f-spot-0.3.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 09:21:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 04:21:48 -0500 Subject: rpms/psacct/devel psacct.spec,1.25,1.26 Message-ID: <200701230921.l0N9LmiT007906@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/psacct/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6099 Modified Files: psacct.spec Log Message: - Resolves: 223728 psacct logrotate file looks for non existant directory Index: psacct.spec =================================================================== RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- psacct.spec 2 Jan 2007 10:59:08 -0000 1.25 +++ psacct.spec 23 Jan 2007 09:21:45 -0000 1.26 @@ -12,7 +12,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.3.2 -Release: 42%{?dist} +Release: 43%{?dist} License: GPL Group: Applications/System Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz @@ -33,6 +33,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig /sbin/install-info BuildRequires: autoconf +Requires: coreutils # This conflict is to avoid psacct being forced on by old initscripts now that # we have a proper initscript in place. initscripts 6.55 and later are fixed. @@ -166,6 +167,10 @@ %{_infodir}/accounting.info.gz %changelog +* Tue Jan 23 2007 Ivana Varekova - 6.3.2-43 +- Resolves: 223728 + psacct logrotate file looks for non existant directory + * Tue Jan 2 2007 Ivana Varekova - 6.3.2-42 - Resolves: 221069 (fix lastcomm man page) From fedora-cvs-commits at redhat.com Tue Jan 23 09:32:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 04:32:04 -0500 Subject: rpms/psacct/FC-6 psacct.spec,1.24,1.25 Message-ID: <200701230932.l0N9W4Nd015568@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/psacct/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14686 Modified Files: psacct.spec Log Message: - fix psacct logrotate file looks for non existant directory Index: psacct.spec =================================================================== RCS file: /cvs/dist/rpms/psacct/FC-6/psacct.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- psacct.spec 12 Jul 2006 07:53:30 -0000 1.24 +++ psacct.spec 23 Jan 2007 09:32:01 -0000 1.25 @@ -12,7 +12,7 @@ Summary: Utilities for monitoring process activities. Name: psacct Version: 6.3.2 -Release: 41.1 +Release: 42%{?dist} License: GPL Group: Applications/System Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz @@ -32,6 +32,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/install-info, /sbin/chkconfig, /bin/touch BuildRequires: autoconf +Requires: coreutils # This conflict is to avoid psacct being forced on by old initscripts now that # we have a proper initscript in place. initscripts 6.55 and later are fixed. @@ -164,6 +165,9 @@ %{_infodir}/accounting.info.gz %changelog +* Tue Jan 23 2007 Ivana Varekova - 6.3.2-42 +- fix psacct logrotate file looks for non existant directory + * Wed Jul 12 2006 Jesse Keating - 6.3.2-41.1 - rebuild From fedora-cvs-commits at redhat.com Tue Jan 23 09:49:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 04:49:23 -0500 Subject: rpms/libtool/devel libtool-1.5.22-ldconfigvars.patch, NONE, 1.1 libtool-1.5.22-configupdate-217166.patch, NONE, 1.1 libtool-1.5.22-relativepath.patch, NONE, 1.1 libtool.spec, 1.44, 1.45 Message-ID: <200701230949.l0N9nNUH032219@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/libtool/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32192 Modified Files: libtool.spec Added Files: libtool-1.5.22-ldconfigvars.patch libtool-1.5.22-configupdate-217166.patch libtool-1.5.22-relativepath.patch Log Message: - don't abort (un)install scriptlets when _excludedocs is set (#223708) - update config.guess, config.sub with newer files from automake-1.10 - skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths (p.e. files from kernel-xen). This avoids having unwanted relative paths in lib_search_path libtool-1.5.22-ldconfigvars.patch: acinclude.m4 | 2 +- configure | 8 ++++---- libltdl/acinclude.m4 | 2 +- libltdl/configure | 8 ++++---- libtool.m4 | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) --- NEW FILE libtool-1.5.22-ldconfigvars.patch --- --- libtool-1.5.22/libtool.m4.rh1 2006-11-06 14:41:03.000000000 +0100 +++ libtool-1.5.22/libtool.m4 2006-11-06 14:41:03.000000000 +0100 @@ -1591,7 +1591,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi --- libtool-1.5.22/libltdl/configure.rh1 2005-12-18 23:13:59.000000000 +0100 +++ libtool-1.5.22/libltdl/configure 2006-11-06 14:41:03.000000000 +0100 @@ -9516,7 +9516,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -13475,7 +13475,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -16066,7 +16066,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18668,7 +18668,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi --- libtool-1.5.22/libltdl/acinclude.m4.rh1 2005-12-18 23:13:49.000000000 +0100 +++ libtool-1.5.22/libltdl/acinclude.m4 2006-11-06 14:43:30.000000000 +0100 @@ -1574,7 +1574,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi --- libtool-1.5.22/configure.rh1 2005-12-18 23:13:49.000000000 +0100 +++ libtool-1.5.22/configure 2006-11-06 14:41:03.000000000 +0100 @@ -9643,7 +9643,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -13602,7 +13602,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[] *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -16193,7 +16193,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[] *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18795,7 +18795,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[] *//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi --- libtool-1.5.22/acinclude.m4.rh1 2005-12-18 23:13:42.000000000 +0100 +++ libtool-1.5.22/acinclude.m4 2006-11-06 14:44:18.000000000 +0100 @@ -1574,7 +1574,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[ ]*//;s/#.*//;/^[^\/]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi libtool-1.5.22-configupdate-217166.patch: config.guess | 102 ++++++++++++++++++++++++++++++++++--------- config.sub | 138 ++++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 166 insertions(+), 74 deletions(-) --- NEW FILE libtool-1.5.22-configupdate-217166.patch --- --- libtool-1.5.22/libltdl/config.guess 2005-12-18 21:25:46.000000000 +0100 +++ /usr/share/automake-1.10/config.guess 2006-11-21 10:23:16.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-13' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -206,8 +207,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,7 +768,14 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -779,8 +790,11 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -817,6 +831,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +868,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +891,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -967,7 +992,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -977,7 +1002,11 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit --- libtool-1.5.22/libltdl/config.sub 2005-12-18 21:25:46.000000000 +0100 +++ /usr/share/automake-1.10/config.sub 2006-11-21 10:23:16.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-11' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -248,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -268,26 +270,25 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -317,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -328,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -350,29 +351,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -818,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -904,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1120,7 +1130,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1193,7 +1203,8 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1208,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1360,6 +1371,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1369,9 +1386,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 --- libtool-1.5.22/config.guess 2005-12-18 22:53:17.000000000 +0100 +++ /usr/share/automake-1.10/config.guess 2006-11-21 10:23:16.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-13' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -206,8 +207,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,7 +768,14 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -779,8 +790,11 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -817,6 +831,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +868,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +891,11 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -967,7 +992,7 @@ LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -977,7 +1002,11 @@ LIBC=dietlibc #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit --- libtool-1.5.22/config.sub 2005-12-18 22:53:17.000000000 +0100 +++ /usr/share/automake-1.10/config.sub 2006-11-21 10:23:16.000000000 +0100 @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-11' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -248,7 +249,8 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -268,26 +270,25 @@ | mn10200 | mn10300 \ | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -317,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -328,7 +329,7 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -350,29 +351,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -818,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -904,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1120,7 +1130,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1193,7 +1203,8 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -1208,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1360,6 +1371,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1369,9 +1386,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 libtool-1.5.22-relativepath.patch: ltdl.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE libtool-1.5.22-relativepath.patch --- --- libtool-1.5.22/libltdl/ltdl.c.rh2 2006-11-06 15:40:04.000000000 +0100 +++ libtool-1.5.22/libltdl/ltdl.c 2006-11-06 15:40:26.000000000 +0100 @@ -3203,10 +3203,12 @@ } #endif } +#if 0 if (!file) { file = fopen (filename, LT_READTEXT_MODE); } +#endif /* If we didn't find the file by now, it really isn't there. Set the status flag, and bail out. */ Index: libtool.spec =================================================================== RCS file: /cvs/dist/rpms/libtool/devel/libtool.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libtool.spec 12 Jul 2006 06:58:04 -0000 1.44 +++ libtool.spec 23 Jan 2007 09:49:21 -0000 1.45 @@ -3,7 +3,7 @@ Summary: The GNU Portable Library Tool Name: libtool Version: %{upstream_version} -Release: 6.1 +Release: 8 License: GPL Group: Development/Tools Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz @@ -16,6 +16,14 @@ Patch3: libtool-1.5.22-anygcc.patch +# skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths (p.e. files from kernel-xen): +Patch4: libtool-1.5.22-ldconfigvars.patch + +Patch5: libtool-1.5.22-configupdate-217166.patch + +# don't read .la file in current working directory, root might get tricked +# into running a prepared binary in that directory: +Patch6: libtool-1.5.22-relativepath.patch PreReq: /sbin/install-info BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo # make sure we can configure all supported langs @@ -78,6 +86,9 @@ %patch1 -p1 -b .multilib %patch2 -p1 %patch3 -p1 -b .anygcc +%patch4 -p1 -b .rh1 +%patch5 -p1 -b .rh2 +%patch6 -p1 -b .automake110 %build @@ -108,7 +119,7 @@ %post -/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/libtool.info.gz %{_infodir}/dir || : %post ltdl -p /sbin/ldconfig @@ -116,7 +127,7 @@ %preun if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || : fi %postun ltdl -p /sbin/ldconfig @@ -147,6 +158,15 @@ %changelog +* Mon Jan 22 2007 Karsten Hopp 1.5.22-8 +- don't abort (un)install scriptlets when _excludedocs is set (#223708) + +* Thu Dec 07 2006 Karsten Hopp 1.5.22-7 +- update config.guess, config.sub with newer files from automake-1.10 +- skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths + (p.e. files from kernel-xen). This avoids having unwanted relative paths in + lib_search_path + * Wed Jul 12 2006 Jesse Keating - 1.5.22-6.1 - rebuild From fedora-cvs-commits at redhat.com Tue Jan 23 10:02:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:02:14 -0500 Subject: rpms/openoffice.org/devel sources,1.216,1.217 Message-ID: <200701231002.l0NA2EFw032672@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32655 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- sources 22 Jan 2007 11:28:58 -0000 1.216 +++ sources 23 Jan 2007 10:02:12 -0000 1.217 @@ -11,4 +11,4 @@ b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz -a7b06703e678fb6106491ea61252d488 OOF680_m1.tar.bz2 +307059dba0ce1e26fe97cceca6278941 OOF680_m2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 10:15:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:15:43 -0500 Subject: rpms/net-snmp/devel net-snmp-5.4-free.patch, NONE, 1.1 net-snmp.spec, 1.101, 1.102 Message-ID: <200701231015.l0NAFhbl000440@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv417 Modified Files: net-snmp.spec Added Files: net-snmp-5.4-free.patch Log Message: - fix occasional segfaults when snmpd starts net-snmp-5.4-free.patch: master_admin.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) --- NEW FILE net-snmp-5.4-free.patch --- --- net-snmp-5.4/agent/mibgroup/agentx/master_admin.c.old 2006-03-09 01:13:18.000000000 +0100 +++ net-snmp-5.4/agent/mibgroup/agentx/master_admin.c 2007-01-23 10:48:49.000000000 +0100 @@ -138,9 +138,7 @@ snmp_call_callbacks(SNMP_CALLBACK_APPLICATION, SNMPD_CALLBACK_REQ_UNREG_SYSOR_SESS, (void*)session); - if (session->myvoid != NULL) { - free(session->myvoid); - } + SNMP_FREE(session->myvoid); /* * The following is necessary to avoid locking up the agent when * a sugagent dies during a set request. We must clean up the @@ -171,14 +169,9 @@ *prevNext = sp->next; - if (sp->securityAuthProto != NULL) { - free(sp->securityAuthProto); - } - if (sp->securityName != NULL) { - free(sp->securityName); - } - free(sp); - sp = NULL; + SNMP_FREE(sp->securityAuthProto); + SNMP_FREE(sp->securityName); + SNMP_FREE(sp); DEBUGMSGTL(("agentx/master", "closed %08p, %d okay\n", session, sessid)); @@ -343,7 +336,7 @@ return AGENTX_ERR_INDEX_NONE_AVAILABLE; /* XXX */ } else { (void) snmp_clone_var(res, vp); - free(res); + SNMP_FREE(res); } vp->next_variable = next; } @@ -370,7 +363,7 @@ if (res != SNMP_ERR_NOERROR) { for (vp2 = pdu->variables; vp2 != vp; vp2 = vp2->next_variable) { rv = register_index(vp2, ALLOCATE_THIS_INDEX, session); - free(rv); + SNMP_FREE(rv); } return AGENTX_ERR_INDEX_NOT_ALLOCATED; /* Probably */ } Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- net-snmp.spec 11 Jan 2007 16:38:05 -0000 1.101 +++ net-snmp.spec 23 Jan 2007 10:15:41 -0000 1.102 @@ -7,7 +7,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: %{major_ver} -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 License: BSDish @@ -35,6 +35,7 @@ Patch11: net-snmp-5.4-ip-addr-route-leaks.patch Patch12: net-snmp-5.4-tcpConn-tcp6-fopen.patch Patch13: net-snmp-5.4-ethtool-config.patch +Patch14: net-snmp-5.4-free.patch Requires(pre): /sbin/chkconfig Obsoletes: ucd-snmp @@ -145,6 +146,7 @@ %patch12 -p1 -b .tcp6-fopen %patch13 -p1 -b .ethtool-config +%patch14 -p1 -b .free # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -356,6 +358,9 @@ %{_libdir}/lib*.so.* %changelog +* Tue Jan 23 2007 Radek Vok??l - 5.4-8 +- fix occasional segfaults when snmpd starts + * Thu Jan 11 2007 Radek Vok??l - 5.4-7 - fix ethtool extension (#222268) From fedora-cvs-commits at redhat.com Tue Jan 23 10:46:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:46:28 -0500 Subject: rpms/irda-utils/devel .cvsignore, 1.8, 1.9 irda-utils-0.9.17-makefile.patch, 1.1, 1.2 irda-utils.spec, 1.27, 1.28 sources, 1.7, 1.8 Message-ID: <200701231046.l0NAkS9b012745@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/irda-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12695 Modified Files: .cvsignore irda-utils-0.9.17-makefile.patch irda-utils.spec sources Log Message: - update to 0.9.18 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/irda-utils/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 19 Jun 2006 14:15:32 -0000 1.8 +++ .cvsignore 23 Jan 2007 10:46:25 -0000 1.9 @@ -1,2 +1 @@ -irda-utils-0.9.17.tar.gz -irda-utils-0.9.17-manpages.tgz +irda-utils-0.9.18.tar.gz irda-utils-0.9.17-makefile.patch: Makefile | 5 +++-- irdadump/Makefile | 9 +++++---- irnetd/Makefile | 2 +- psion/Makefile | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) Index: irda-utils-0.9.17-makefile.patch =================================================================== RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils-0.9.17-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- irda-utils-0.9.17-makefile.patch 19 Jun 2006 14:12:16 -0000 1.1 +++ irda-utils-0.9.17-makefile.patch 23 Jan 2007 10:46:25 -0000 1.2 @@ -77,14 +77,3 @@ - $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ \ Kein Zeilenumbruch am Dateiende. + $(ECMD)$(CC) $(CFLAGS) -g -I/usr/include/glib-2.0 -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS) $(PSION_SRC) -o $@ ---- irda-utils-0.9.17/smcinit/smcinit.c.rh3 2006-03-09 07:25:24.000000000 +0100 -+++ irda-utils-0.9.17/smcinit/smcinit.c 2006-06-01 14:47:25.000000000 +0200 -@@ -262,7 +262,7 @@ - */ - struct pci_access *acc; - struct pci_dev *dev; -- word twobyte; -+ u16 twobyte; - int i = 0, chip = 0; - int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma; - unsigned int *address, SMC_BASE = 0; Index: irda-utils.spec =================================================================== RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- irda-utils.spec 1 Aug 2006 12:45:21 -0000 1.27 +++ irda-utils.spec 23 Jan 2007 10:46:25 -0000 1.28 @@ -1,13 +1,10 @@ Summary: Utilities for infrared communication between devices. Name: irda-utils -Version: 0.9.17 -Release: 2%{?dist} +Version: 0.9.18 +Release: 1%{?dist} # Download-URL: # http://prdownloads.sourceforge.net/irda/irda-utils-0.9.17.tar.gz?download Source: irda-utils-%{version}.tar.gz -# Temporary, until upstream releases a tarball with fixed manpages. These -# have been extracted from irda-utils-0.9.17-pre3 -Source1: irda-utils-%{version}-manpages.tgz Patch1: irda-utils-0.9.14-chkconfig.patch Patch2: irda-utils-0.9.14-typo.patch Patch3: irda-utils-0.9.13-i18n.patch @@ -55,8 +52,6 @@ %patch8 -p1 -b .rh3 %patch9 -p1 %patch10 -p1 -echo $PWD -tar xvf %{SOURCE1} %build make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS" @@ -100,6 +95,9 @@ %doc tekram/README.tekram %changelog +* Tue Jan 23 2007 Karsten Hopp 0.9.18-1 +- update to 0.9.18 + * Tue Aug 01 2006 Karsten Hopp 0.9.17-2 - initscript fix from Paul Bolle (#168325) Index: sources =================================================================== RCS file: /cvs/dist/rpms/irda-utils/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jun 2006 14:12:16 -0000 1.7 +++ sources 23 Jan 2007 10:46:25 -0000 1.8 @@ -1,2 +1 @@ -65f9be306d2367996e27264ef0b70bd4 irda-utils-0.9.17.tar.gz -77686ddf12ee1ec1b4f1a48586d6a9d3 irda-utils-0.9.17-manpages.tgz +84dc12aa4c3f61fccb8d8919bf4079bb irda-utils-0.9.18.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 10:49:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:49:44 -0500 Subject: rpms/bind/devel bind.spec,1.153,1.154 Message-ID: <200701231049.l0NAni7W003095@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2847/bind/devel Modified Files: bind.spec Log Message: marked bind-libbind-devel as obsolete Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- bind.spec 22 Jan 2007 13:25:36 -0000 1.153 +++ bind.spec 23 Jan 2007 10:49:42 -0000 1.154 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.3 -Release: 4%{?prever}%{?dist} +Release: 5%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -104,6 +104,7 @@ %package libs Summary: Libraries used by the BIND DNS packages Group: Applications/System +Obsoletes: bind-libbind-devel %description libs Contains libraries used by both the bind server package as well as the utils packages. @@ -129,6 +130,7 @@ Summary: Header files and libraries needed for BIND DNS development. Group: Development/Libraries Requires: bind-libs = %{epoch}:%{version}-%{release} +Obsoletes: bind-libbind-devel %description devel The bind-devel package contains all the header files and libraries @@ -741,6 +743,9 @@ :; %changelog +* Tue Jan 23 2007 Adam Tkac 31:9.3.3-5.fc7 +- package bind-libbind-devel has been marked as obsolete + * Mon Jan 22 2007 Adam Tkac 31:9.3.3-4.fc7 - package bind-libbind-devel has beed removed (libs has been moved to bind-devel & bind-libs) - Resolves: #214208 From fedora-cvs-commits at redhat.com Tue Jan 23 10:51:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:51:48 -0500 Subject: rpms/vim/devel 7.0.179,NONE,1.1 Message-ID: <200701231051.l0NApmNX004802@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4756 Added Files: 7.0.179 Log Message: patchlevel 179 --- NEW FILE 7.0.179 --- To: vim-dev at vim.org Subject: patch 7.0.179 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.179 Problem: Using ":recover" or "vim -r" without a swapfile crashes Vim. Solution: Check for "buf" to be unequal NULL. (Yukihiro Nakadaira) Files: src/memline.c *** ../vim-7.0.178/src/memline.c Tue Nov 21 20:57:21 2006 --- src/memline.c Tue Jan 9 14:33:44 2007 *************** *** 1329,1336 **** mf_put(mfp, hp, FALSE, FALSE); mf_close(mfp, FALSE); /* will also vim_free(mfp->mf_fname) */ } ! vim_free(buf->b_ml.ml_stack); ! vim_free(buf); if (serious_error && called_from_main) ml_close(curbuf, TRUE); #ifdef FEAT_AUTOCMD --- 1329,1339 ---- mf_put(mfp, hp, FALSE, FALSE); mf_close(mfp, FALSE); /* will also vim_free(mfp->mf_fname) */ } ! if (buf != NULL) ! { ! vim_free(buf->b_ml.ml_stack); ! vim_free(buf); ! } if (serious_error && called_from_main) ml_close(curbuf, TRUE); #ifdef FEAT_AUTOCMD *** ../vim-7.0.178/src/version.c Tue Dec 5 22:09:02 2006 --- src/version.c Tue Jan 9 14:35:59 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 179, /**/ -- hundred-and-one symptoms of being an internet addict: 10. And even your night dreams are in HTML. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:51:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:51:51 -0500 Subject: rpms/vim/devel 7.0.180,NONE,1.1 Message-ID: <200701231051.l0NAppT4004864@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4821 Added Files: 7.0.180 Log Message: patchlevel 180 --- NEW FILE 7.0.180 --- To: vim-dev at vim.org Subject: patch 7.0.180 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.180 (extra, after 7.0.171) Problem: VMS: build failed. Problem with swapfiles. Solution: Add "compiled_arch". Always expand path and pass it to buf_modname(). (Zoltan Arpadffy) Files: src/globals.h, src/memline.c, src/os_unix.c, runtime/menu.vim *** ../vim-7.0.179/src/globals.h Sat Oct 14 14:33:21 2006 --- src/globals.h Tue Jan 9 14:26:51 2007 *************** *** 1092,1097 **** --- 1092,1098 ---- extern char_u *all_lflags; # ifdef VMS extern char_u *compiler_version; + extern char_u *compiled_arch; # endif extern char_u *compiled_user; extern char_u *compiled_sys; *** ../vim-7.0.179/src/memline.c Tue Jan 9 14:37:10 2007 --- src/memline.c Tue Jan 9 14:33:44 2007 *************** *** 3572,3579 **** #else (buf->b_p_sn || buf->b_shortname), #endif ! #ifdef RISCOS ! /* Avoid problems if fname has special chars, eg */ ffname, #else # ifdef HAVE_READLINK --- 3572,3580 ---- #else (buf->b_p_sn || buf->b_shortname), #endif ! #if defined(VMS) || defined(RISCOS) ! /* Avoid problems if fname has special chars, eg . ! * For VMS always use full path for swapfile. */ ffname, #else # ifdef HAVE_READLINK *** ../vim-7.0.179/src/os_unix.c Tue Nov 28 17:44:51 2006 --- src/os_unix.c Tue Jan 9 14:31:08 2007 *************** *** 2221,2227 **** * behaviour should be avoided for the existing files and we need to find * the exact path of the edited file. */ - if (force || !mch_isFullName(fname)) { char_u *fixed_fname = vms_fixfilename(fname); int fd = mch_open((char *)fixed_fname, O_RDONLY | O_EXTRA, 0); --- 2221,2226 ---- *** ../vim-7.0.179/runtime/menu.vim Thu Sep 14 13:35:17 2006 --- runtime/menu.vim Tue Jan 9 14:31:40 2007 *************** *** 384,390 **** " Programming menu if !exists("g:ctags_command") if has("vms") ! let g:ctags_command = "mc vim:ctags ." else let g:ctags_command = "ctags -R ." endif --- 384,390 ---- " Programming menu if !exists("g:ctags_command") if has("vms") ! let g:ctags_command = "mc vim:ctags *.*" else let g:ctags_command = "ctags -R ." endif *** ../vim-7.0.179/src/version.c Tue Jan 9 14:37:10 2007 --- src/version.c Tue Jan 9 15:00:57 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 180, /**/ -- The Feynman problem solving Algorithm: 1) Write down the problem 2) Think real hard 3) Write down the answer /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:51:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:51:54 -0500 Subject: rpms/vim/devel 7.0.181,NONE,1.1 Message-ID: <200701231051.l0NApsuJ004924@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4883 Added Files: 7.0.181 Log Message: patchlevel 181 --- NEW FILE 7.0.181 --- To: vim-dev at vim.org Subject: patch 7.0.181 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.181 Problem: When reloading a file that starts with an empty line, the reloaded buffer has an extra empty line at the end. (Motty Lentzitzky) Solution: Delete all lines, don't use bufempty(). Files: src/fileio.c *** ../vim-7.0.180/src/fileio.c Thu Oct 12 21:15:04 2006 --- src/fileio.c Tue Jan 9 15:38:13 2007 *************** *** 6178,6185 **** if (retval != FAIL) { curbuf = frombuf; ! while (!bufempty()) ! if (ml_delete(curbuf->b_ml.ml_line_count, FALSE) == FAIL) { /* Oops! We could try putting back the saved lines, but that * might fail again... */ --- 6179,6186 ---- if (retval != FAIL) { curbuf = frombuf; ! for (lnum = curbuf->b_ml.ml_line_count; lnum > 0; --lnum) ! if (ml_delete(lnum, FALSE) == FAIL) { /* Oops! We could try putting back the saved lines, but that * might fail again... */ *** ../vim-7.0.180/src/version.c Tue Jan 9 15:15:36 2007 --- src/version.c Tue Jan 9 15:41:55 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 181, /**/ -- hundred-and-one symptoms of being an internet addict: 11. You find yourself typing "com" after every period when using a word processor.com /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:51:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:51:58 -0500 Subject: rpms/vim/devel 7.0.182,NONE,1.1 Message-ID: <200701231051.l0NApwKQ004984@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4942 Added Files: 7.0.182 Log Message: patchlevel 182 --- NEW FILE 7.0.182 --- To: vim-dev at vim.org Subject: patch 7.0.182 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.182 Problem: When using a mix of undo and "g-" it may no longer be possible to go to every point in the undo tree. (Andy Wokula) Solution: Correctly update pointers in the undo tree. Files: src/undo.c *** ../vim-7.0.181/src/undo.c Tue Aug 29 17:28:56 2006 --- src/undo.c Tue Jan 9 20:18:27 2007 *************** *** 341,351 **** uhp->uh_alt_next = old_curhead; if (old_curhead != NULL) { old_curhead->uh_alt_prev = uhp; if (curbuf->b_u_oldhead == old_curhead) curbuf->b_u_oldhead = uhp; } ! uhp->uh_alt_prev = NULL; if (curbuf->b_u_newhead != NULL) curbuf->b_u_newhead->uh_prev = uhp; --- 341,355 ---- uhp->uh_alt_next = old_curhead; if (old_curhead != NULL) { + uhp->uh_alt_prev = old_curhead->uh_alt_prev; + if (uhp->uh_alt_prev != NULL) + uhp->uh_alt_prev->uh_alt_next = uhp; old_curhead->uh_alt_prev = uhp; if (curbuf->b_u_oldhead == old_curhead) curbuf->b_u_oldhead = uhp; } ! else ! uhp->uh_alt_prev = NULL; if (curbuf->b_u_newhead != NULL) curbuf->b_u_newhead->uh_prev = uhp; *************** *** 856,861 **** --- 860,870 ---- uhp = curbuf->b_u_curhead; while (uhp != NULL) { + /* Go back to the first branch with a mark. */ + while (uhp->uh_alt_prev != NULL + && uhp->uh_alt_prev->uh_walk == mark) + uhp = uhp->uh_alt_prev; + /* Find the last branch with a mark, that's the one. */ last = uhp; while (last->uh_alt_next != NULL *************** *** 865,870 **** --- 874,881 ---- { /* Make the used branch the first entry in the list of * alternatives to make "u" and CTRL-R take this branch. */ + while (uhp->uh_alt_prev != NULL) + uhp = uhp->uh_alt_prev; if (last->uh_alt_next != NULL) last->uh_alt_next->uh_alt_prev = last->uh_alt_prev; last->uh_alt_prev->uh_alt_next = last->uh_alt_next; *** ../vim-7.0.181/src/version.c Tue Jan 9 15:43:39 2007 --- src/version.c Tue Jan 9 20:26:47 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 182, /**/ -- hundred-and-one symptoms of being an internet addict: 13. You refer to going to the bathroom as downloading. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:01 -0500 Subject: rpms/vim/devel 7.0.183,NONE,1.1 Message-ID: <200701231052.l0NAq19X005046@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5003 Added Files: 7.0.183 Log Message: patchlevel 183 --- NEW FILE 7.0.183 --- To: vim-dev at vim.org Subject: patch 7.0.183 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.183 Problem: Crash in ":let" when redirecting to a variable that's being displayed. (Thomas Link) Solution: When redirecting to a variable only do the assignment when stopping redirection to avoid that setting the variable causes a freed string to be accessed. Files: src/eval.c *** ../vim-7.0.182/src/eval.c Tue Dec 5 10:33:57 2006 --- src/eval.c Sun Jan 14 14:20:49 2007 *************** *** 898,903 **** --- 898,904 ---- } static lval_T *redir_lval = NULL; + static garray_T redir_ga; /* only valid when redir_lval is not NULL */ static char_u *redir_endp = NULL; static char_u *redir_varname = NULL; *************** *** 932,937 **** --- 933,941 ---- return FAIL; } + /* The output is stored in growarray "redir_ga" until redirection ends. */ + ga_init2(&redir_ga, (int)sizeof(char), 500); + /* Parse the variable name (can be a dict or list entry). */ redir_endp = get_lval(redir_varname, NULL, redir_lval, FALSE, FALSE, FALSE, FNE_CHECK_START); *************** *** 974,1015 **** } /* ! * Append "value[len]" to the variable set by var_redir_start(). */ void ! var_redir_str(value, len) char_u *value; ! int len; { ! char_u *val; ! typval_T tv; ! int save_emsg; ! int err; if (redir_lval == NULL) return; ! if (len == -1) ! /* Append the entire string */ ! val = vim_strsave(value); ! else ! /* Append only the specified number of characters */ ! val = vim_strnsave(value, len); ! if (val == NULL) ! return; ! ! tv.v_type = VAR_STRING; ! tv.vval.v_string = val; ! save_emsg = did_emsg; ! did_emsg = FALSE; ! set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)"."); ! err = did_emsg; ! did_emsg |= save_emsg; ! if (err) var_redir_stop(); - - vim_free(tv.vval.v_string); } /* --- 978,1013 ---- } /* ! * Append "value[value_len]" to the variable set by var_redir_start(). ! * The actual appending is postponed until redirection ends, because the value ! * appended may in fact be the string we write to, changing it may cause freed ! * memory to be used: ! * :redir => foo ! * :let foo ! * :redir END */ void ! var_redir_str(value, value_len) char_u *value; ! int value_len; { ! size_t len; if (redir_lval == NULL) return; ! if (value_len == -1) ! len = STRLEN(value); /* Append the entire string */ ! else ! len = value_len; /* Append only "value_len" characters */ ! if (ga_grow(&redir_ga, (int)len) == OK) ! { ! mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); ! redir_ga.ga_len += len; ! } ! else var_redir_stop(); } /* *************** *** 1018,1025 **** --- 1016,1034 ---- void var_redir_stop() { + typval_T tv; + if (redir_lval != NULL) { + /* Append the trailing NUL. */ + ga_append(&redir_ga, NUL); + + /* Assign the text to the variable. */ + tv.v_type = VAR_STRING; + tv.vval.v_string = redir_ga.ga_data; + set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)"."); + vim_free(tv.vval.v_string); + clear_lval(redir_lval); vim_free(redir_lval); redir_lval = NULL; *** ../vim-7.0.182/src/version.c Tue Jan 9 20:29:55 2007 --- src/version.c Sun Jan 14 15:23:23 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 183, /**/ -- How To Keep A Healthy Level Of Insanity: 16. Have your coworkers address you by your wrestling name, Rock Hard Kim. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:04 -0500 Subject: rpms/vim/devel 7.0.184,NONE,1.1 Message-ID: <200701231052.l0NAq4Nw005109@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5065 Added Files: 7.0.184 Log Message: patchlevel 184 --- NEW FILE 7.0.184 --- To: vim-dev at vim.org Subject: patch 7.0.184 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.184 Problem: When the cscope program is called "mlcscope" the Cscope interface doesn't work. Solution: Accept "\S*cscope:" instead of "cscope:". (Frodak D. Baksik) Files: src/if_cscope.c *** ../vim-7.0.183/src/if_cscope.c Tue Nov 21 11:43:49 2006 --- src/if_cscope.c Fri Jan 12 20:02:37 2007 *************** *** 627,636 **** * If the database is out of date, or there's some other problem, * cscope will output error messages before the number-of-lines output. * Display/discard any output that doesn't match what we want. */ if ((stok = strtok(buf, (const char *)" ")) == NULL) continue; ! if (strcmp((const char *)stok, "cscope:")) continue; if ((stok = strtok(NULL, (const char *)" ")) == NULL) --- 627,637 ---- * If the database is out of date, or there's some other problem, * cscope will output error messages before the number-of-lines output. * Display/discard any output that doesn't match what we want. + * Accept "\S*cscope: X lines", also matches "mlcscope". */ if ((stok = strtok(buf, (const char *)" ")) == NULL) continue; ! if (strstr((const char *)stok, "cscope:") == NULL) continue; if ((stok = strtok(NULL, (const char *)" ")) == NULL) *** ../vim-7.0.183/src/version.c Sun Jan 14 15:27:05 2007 --- src/version.c Tue Jan 16 15:16:41 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 184, /**/ -- The technology involved in making anything invisible is so infinitely complex that nine hundred and ninety-nine billion, nine hundred and ninety-nine million, nine hundred and ninety-nine thousand, nine hundred and ninety-nine times out of a trillion it is much simpler and more effective just to take the thing away and do without it. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:08 -0500 Subject: rpms/vim/devel 7.0.185,NONE,1.1 Message-ID: <200701231052.l0NAq8uB005172@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5128 Added Files: 7.0.185 Log Message: patchlevel 185 --- NEW FILE 7.0.185 --- To: vim-dev at vim.org Subject: patch 7.0.185 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.185 Problem: Multi-byte characters in a message are displayed with attributes from what comes before it. Solution: Don't use the attributes for a multi-byte character. Do use attributes for special characters. (Yukihiro Nakadaira) Files: src/message.c *** ../vim-7.0.184/src/message.c Sat Oct 14 14:33:21 2006 --- src/message.c Sat Jan 13 17:27:31 2007 *************** *** 1556,1562 **** int c_extra = 0; char_u *p_extra = NULL; /* init to make SASC shut up */ int n; ! int attr= 0; char_u *trail = NULL; #ifdef FEAT_MBYTE int l; --- 1556,1562 ---- int c_extra = 0; char_u *p_extra = NULL; /* init to make SASC shut up */ int n; ! int attr = 0; char_u *trail = NULL; #ifdef FEAT_MBYTE int l; *************** *** 1581,1587 **** while (!got_int) { ! if (n_extra) { --n_extra; if (c_extra) --- 1581,1587 ---- while (!got_int) { ! if (n_extra > 0) { --n_extra; if (c_extra) *************** *** 1595,1601 **** col += (*mb_ptr2cells)(s); mch_memmove(buf, s, (size_t)l); buf[l] = NUL; ! msg_puts_attr(buf, attr); s += l; continue; } --- 1595,1601 ---- col += (*mb_ptr2cells)(s); mch_memmove(buf, s, (size_t)l); buf[l] = NUL; ! msg_puts(buf); s += l; continue; } *************** *** 1635,1640 **** --- 1635,1643 ---- p_extra = transchar_byte(c); c_extra = NUL; c = *p_extra++; + /* Use special coloring to be able to distinguish from + * the same in plain text. */ + attr = hl_attr(HLF_8); } else if (c == ' ' && trail != NULL && s > trail) { *** ../vim-7.0.184/src/version.c Tue Jan 16 15:17:43 2007 --- src/version.c Tue Jan 16 15:43:37 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 185, /**/ -- This planet has -- or rather had -- a problem, which was this: most of the people living on it were unhappy for pretty much of the time. Many solutions were suggested for this problem, but most of these were largely concerned with the movements of small green pieces of paper, which is odd because on the whole it wasn't the small green pieces of paper that were unhappy. -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:11 -0500 Subject: rpms/vim/devel 7.0.186,NONE,1.1 Message-ID: <200701231052.l0NAqB0l005234@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5192 Added Files: 7.0.186 Log Message: patchlevel 186 --- NEW FILE 7.0.186 --- To: vim-dev at vim.org Subject: patch 7.0.186 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.186 Problem: Get an ml_get error when 'encoding' is "utf-8" and searching for "/\_s*/e" in an empty buffer. (Andrew Maykov) Solution: Don't try getting the line just below the last line. Files: src/search.c *** ../vim-7.0.185/src/search.c Sat Oct 14 14:33:21 2006 --- src/search.c Tue Jan 16 15:31:28 2007 *************** *** 812,818 **** #ifdef FEAT_MBYTE if (has_mbyte) { ! ptr = ml_get_buf(buf, pos->lnum, FALSE); pos->col -= (*mb_head_off)(ptr, ptr + pos->col); } #endif --- 812,822 ---- #ifdef FEAT_MBYTE if (has_mbyte) { ! /* 'e' offset may put us just below the last line */ ! if (pos->lnum > buf->b_ml.ml_line_count) ! ptr = ""; ! else ! ptr = ml_get_buf(buf, pos->lnum, FALSE); pos->col -= (*mb_head_off)(ptr, ptr + pos->col); } #endif *** ../vim-7.0.185/src/version.c Tue Jan 16 15:44:59 2007 --- src/version.c Tue Jan 16 15:59:37 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 186, /**/ -- Time is an illusion. Lunchtime doubly so. -- Ford Prefect, in Douglas Adams' "The Hitchhiker's Guide to the Galaxy" /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:14 -0500 Subject: rpms/vim/devel 7.0.187,NONE,1.1 Message-ID: <200701231052.l0NAqEfR005297@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5247 Added Files: 7.0.187 Log Message: patchlevel 187 --- NEW FILE 7.0.187 --- To: vim-dev at vim.org Subject: patch 7.0.187 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.187 Problem: Can't source a remote script properly. Solution: Add the SourceCmd event. (Charles Campbell) Files: runtime/doc/autocmd.txt, src/ex_cmds2.c, src/fileio.c, src/vim.h *** ../vim-7.0.186/runtime/doc/autocmd.txt Sun May 7 17:07:33 2006 --- runtime/doc/autocmd.txt Tue Jan 16 21:29:14 2007 *************** *** 1,4 **** ! *autocmd.txt* For Vim version 7.0. Last change: 2006 May 06 VIM REFERENCE MANUAL by Bram Moolenaar --- 1,4 ---- ! *autocmd.txt* For Vim version 7.0. Last change: 2007 Jan 16 VIM REFERENCE MANUAL by Bram Moolenaar *************** *** 279,284 **** --- 279,285 ---- |FuncUndefined| a user function is used but it isn't defined |SpellFileMissing| a spell file is used but it can't be found |SourcePre| before sourcing a Vim script + |SourceCmd| before sourcing a Vim script |Cmd-event| |VimResized| after the Vim window size changed |FocusGained| Vim got input focus *************** *** 690,699 **** Can be used to check for any changed files. *SourcePre* SourcePre Before sourcing a Vim script. |:source| *SpellFileMissing* SpellFileMissing When trying to load a spell checking file and ! it can't be found. is the language, ! 'encoding' also matters. See |spell-SpellFileMissing|. *StdinReadPost* StdinReadPost After reading from the stdin into the buffer, --- 701,717 ---- Can be used to check for any changed files. *SourcePre* SourcePre Before sourcing a Vim script. |:source| + is the name of the file being sourced. + *SourceCmd* + SourceCmd When sourcing a Vim script. |:source| + is the name of the file being sourced. + The autocommand must source this file. + |Cmd-event| *SpellFileMissing* SpellFileMissing When trying to load a spell checking file and ! it can't be found. The pattern is matched ! against the language. is the ! language, 'encoding' also matters. See |spell-SpellFileMissing|. *StdinReadPost* StdinReadPost After reading from the stdin into the buffer, *************** *** 1219,1226 **** *Cmd-event* When using one of the "*Cmd" events, the matching autocommands are expected to ! do the file reading or writing. This can be used when working with a special ! kind of file, for example on a remote system. CAREFUL: If you use these events in a wrong way, it may have the effect of making it impossible to read or write the matching files! Make sure you test your autocommands properly. Best is to use a pattern that will never match a --- 1238,1245 ---- *Cmd-event* When using one of the "*Cmd" events, the matching autocommands are expected to ! do the file reading, writing or sourcing. This can be used when working with ! a special kind of file, for example on a remote system. CAREFUL: If you use these events in a wrong way, it may have the effect of making it impossible to read or write the matching files! Make sure you test your autocommands properly. Best is to use a pattern that will never match a *************** *** 1233,1241 **** original file isn't needed for recovery. You might want to do this only when you expect the file to be modified. ! The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are ! effective. These should be used for the command that reads/writes the file. ! The |v:cmdbang| variable is one when "!" was used, zero otherwise. See the $VIMRUNTIME/plugin/netrw.vim for examples. --- 1252,1261 ---- original file isn't needed for recovery. You might want to do this only when you expect the file to be modified. ! For file read and write commands the |v:cmdarg| variable holds the "++enc=" ! and "++ff=" argument that are effective. These should be used for the command ! that reads/writes the file. The |v:cmdbang| variable is one when "!" was ! used, zero otherwise. See the $VIMRUNTIME/plugin/netrw.vim for examples. *** ../vim-7.0.186/src/ex_cmds2.c Tue Aug 29 17:28:56 2006 --- src/ex_cmds2.c Tue Jan 16 18:30:40 2007 *************** *** 2811,2816 **** --- 2811,2827 ---- } #ifdef FEAT_AUTOCMD + /* Apply SourceCmd autocommands, they should get the file and source it. */ + if (has_autocmd(EVENT_SOURCECMD, fname_exp, NULL) + && apply_autocmds(EVENT_SOURCECMD, fname_exp, fname_exp, + FALSE, curbuf)) + # ifdef FEAT_EVAL + return aborting() ? FAIL : OK; + # else + return OK; + # endif + + /* Apply SourcePre autocommands, they may get the file. */ apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf); #endif *** ../vim-7.0.186/src/fileio.c Tue Jan 9 15:43:39 2007 --- src/fileio.c Tue Jan 16 18:23:35 2007 *************** *** 7019,7024 **** --- 7020,7026 ---- {"ShellCmdPost", EVENT_SHELLCMDPOST}, {"ShellFilterPost", EVENT_SHELLFILTERPOST}, {"SourcePre", EVENT_SOURCEPRE}, + {"SourceCmd", EVENT_SOURCECMD}, {"SpellFileMissing",EVENT_SPELLFILEMISSING}, {"StdinReadPost", EVENT_STDINREADPOST}, {"StdinReadPre", EVENT_STDINREADPRE}, *** ../vim-7.0.186/src/vim.h Wed Nov 1 15:31:02 2006 --- src/vim.h Tue Jan 16 18:22:28 2007 *************** *** 1102,1108 **** EVENT_COLORSCHEME, /* after loading a colorscheme */ EVENT_FILEAPPENDPOST, /* after appending to a file */ EVENT_FILEAPPENDPRE, /* before appending to a file */ ! EVENT_FILEAPPENDCMD, /* appende to a file using command */ EVENT_FILECHANGEDSHELL, /* after shell command that changed file */ EVENT_FILECHANGEDSHELLPOST, /* after (not) reloading changed file */ EVENT_FILECHANGEDRO, /* before first change to read-only file */ --- 1102,1108 ---- EVENT_COLORSCHEME, /* after loading a colorscheme */ EVENT_FILEAPPENDPOST, /* after appending to a file */ EVENT_FILEAPPENDPRE, /* before appending to a file */ ! EVENT_FILEAPPENDCMD, /* append to a file using command */ EVENT_FILECHANGEDSHELL, /* after shell command that changed file */ EVENT_FILECHANGEDSHELLPOST, /* after (not) reloading changed file */ EVENT_FILECHANGEDRO, /* before first change to read-only file */ *************** *** 1147,1152 **** --- 1147,1153 ---- EVENT_REMOTEREPLY, /* upon string reception from a remote vim */ EVENT_SWAPEXISTS, /* found existing swap file */ EVENT_SOURCEPRE, /* before sourcing a Vim script */ + EVENT_SOURCECMD, /* sourcing a Vim script using command */ EVENT_SPELLFILEMISSING, /* spell file missing */ EVENT_CURSORMOVED, /* cursor was moved */ EVENT_CURSORMOVEDI, /* cursor was moved in Insert mode */ *** ../vim-7.0.186/src/version.c Tue Jan 16 16:00:38 2007 --- src/version.c Tue Jan 16 20:37:23 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 187, /**/ -- hundred-and-one symptoms of being an internet addict: 29. Your phone bill comes to your doorstep in a box. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:18 -0500 Subject: rpms/vim/devel 7.0.188,NONE,1.1 Message-ID: <200701231052.l0NAqILg005357@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5316 Added Files: 7.0.188 Log Message: patchlevel 188 --- NEW FILE 7.0.188 --- To: vim-dev at vim.org Subject: patch 7.0.188 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.0.188 (after 7.0.186) Problem: Warning for wrong pointer type. Solution: Add a type cast. Files: src/search.c *** ../vim-7.0.187/src/search.c Tue Jan 16 16:00:38 2007 --- src/search.c Tue Jan 16 21:16:01 2007 *************** *** 814,820 **** { /* 'e' offset may put us just below the last line */ if (pos->lnum > buf->b_ml.ml_line_count) ! ptr = ""; else ptr = ml_get_buf(buf, pos->lnum, FALSE); pos->col -= (*mb_head_off)(ptr, ptr + pos->col); --- 814,820 ---- { /* 'e' offset may put us just below the last line */ if (pos->lnum > buf->b_ml.ml_line_count) ! ptr = (char_u *)""; else ptr = ml_get_buf(buf, pos->lnum, FALSE); pos->col -= (*mb_head_off)(ptr, ptr + pos->col); *** ../vim-7.0.187/src/version.c Tue Jan 16 21:31:38 2007 --- src/version.c Tue Jan 16 21:33:05 2007 *************** *** 668,669 **** --- 668,671 ---- { /* Add new patch number below this line */ + /**/ + 188, /**/ -- Due knot trussed yore spell chequer two fined awl miss steaks. /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// From fedora-cvs-commits at redhat.com Tue Jan 23 10:52:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 05:52:20 -0500 Subject: rpms/vim/devel README.patches,1.69,1.70 vim.spec,1.156,1.157 Message-ID: <200701231052.l0NAqKNC005407@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5346 Modified Files: README.patches vim.spec Log Message: - patchlevel 188 Index: README.patches =================================================================== RCS file: /cvs/dist/rpms/vim/devel/README.patches,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- README.patches 12 Dec 2006 09:35:43 -0000 1.69 +++ README.patches 23 Jan 2007 10:52:18 -0000 1.70 @@ -208,3 +208,13 @@ 1781 7.0.176 ":emenu" isn't executed directly, breaks the crypt key prompt 4292 7.0.177 key from mapping at press-enter prompt would be remapped 1565 7.0.178 comparing utf-8 strings with 'ic' may look past NUL bytes + 1744 7.0.179 crash when recovering without a swap file name + 3061 7.0.180 (extra) VMS: build problem and problem with swap files + 1790 7.0.181 when reloading a buffer an extra empty line may appear + 2768 7.0.182 cannot reach every point in the undo tree after using "g-" + 4142 7.0.183 accessing memory already freed after ":redir => var" ":let" + 2400 7.0.184 cscope interface doesn't work with mlcscope + 2927 7.0.185 multi-byte chars in message get attributes from previous char + 1731 7.0.186 ml_get error when doing "/\_s*/e" with utf-8 'encoding' + 7601 7.0.187 can't properly source a remote script + 1602 7.0.188 (after 7.0.186) warning for wrong pointer type Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- vim.spec 8 Jan 2007 15:49:23 -0000 1.156 +++ vim.spec 23 Jan 2007 10:52:18 -0000 1.157 @@ -16,7 +16,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim70%{?beta} -%define patchlevel 178 +%define patchlevel 188 Summary: The VIM editor. Name: vim @@ -229,7 +229,16 @@ Patch176: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.176 Patch177: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.177 Patch178: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.178 - +Patch179: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.179 +Patch180: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.180 +Patch181: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.181 +Patch182: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.182 +Patch183: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.183 +Patch184: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.184 +Patch185: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.185 +Patch186: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.186 +Patch187: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.187 +Patch188: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.188 Patch3000: vim-7.0-syntax.patch #Patch3001: vim-6.2-rh1.patch @@ -574,6 +583,17 @@ %patch176 -p0 %patch177 -p0 %patch178 -p0 +%patch179 -p0 +# VMS: +#patch180 -p0 +%patch181 -p0 +%patch182 -p0 +%patch183 -p0 +%patch184 -p0 +%patch185 -p0 +%patch186 -p0 +%patch187 -p0 +%patch188 -p0 # install spell files %if %{withvimspell} @@ -970,6 +990,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Jan 23 2007 Karsten Hopp 7.0.188-3 +- patchlevel 188 + * Mon Jan 08 2007 Karsten Hopp 7.0.178-3 - enable filetype plugin From fedora-cvs-commits at redhat.com Tue Jan 23 11:07:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:07:06 -0500 Subject: rpms/nautilus/devel nautilus-2.17.90-selinux.patch, NONE, 1.1 nautilus.spec, 1.137, 1.138 Message-ID: <200701231107.l0NB76ZV016416@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16364 Modified Files: nautilus.spec Added Files: nautilus-2.17.90-selinux.patch Log Message: * Tue Jan 23 2007 Alexander Larsson - 2.17.90-2 - Fix gnome bug #362302 in selinux patch nautilus-2.17.90-selinux.patch: libnautilus-private/nautilus-file-operations.c | 71 + libnautilus-private/nautilus-file-operations.h | 1 libnautilus-private/nautilus-file.c | 132 +++ libnautilus-private/nautilus-file.h | 5 src/file-manager/fm-error-reporting.c | 32 src/file-manager/fm-error-reporting.h | 5 src/file-manager/fm-properties-window.c | 1040 +++++++++++++++++++++++-- 7 files changed, 1216 insertions(+), 70 deletions(-) --- NEW FILE nautilus-2.17.90-selinux.patch --- --- nautilus-2.17.90/libnautilus-private/nautilus-file.c.selinux 2007-01-22 10:10:45.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file.c 2007-01-23 10:04:29.000000000 +0100 @@ -3569,7 +3569,7 @@ * context * @file: NautilusFile representing the file in question. * - * Returns: Newly allocated string ready to display to the user. + * Returns: Newly allocated string ready to display to the user, or NULL. * **/ char * @@ -3602,6 +3602,134 @@ return translated; } +/** + * nautilus_file_get_selinux_matchpathcon: + * + * Get a user-displayable string representing a file's default selinux + * context (as from matchpathcon). Only works on local files. + * @file: NautilusFile representing the file in question. + * + * Returns: Newly allocated string ready to display to the user, or NULL. + * + **/ +char * +nautilus_file_get_selinux_matchpathcon (NautilusFile *file) +{ + char *translated; + char *raw; + char *uri; + char *fname; + + g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); + + translated = NULL; +#ifdef HAVE_SELINUX + uri = nautilus_file_get_uri (file); + fname = gnome_vfs_get_local_path_from_uri (uri); + + if (!fname) { + return NULL; + } + + raw = NULL; + if (matchpathcon (fname, file->details->info->permissions, &raw) == 0) { + if (selinux_raw_to_trans_context (raw, &translated) == 0) { + char *tmp; + tmp = g_strdup (translated); + freecon (translated); + translated = tmp; + } + freecon (raw); + } + + g_free (fname); + g_free (uri); +#endif + + return translated; +} + +static void +set_selinux_context_callback (GnomeVFSAsyncHandle *handle, + GnomeVFSResult result, + GnomeVFSFileInfo *new_info, + gpointer callback_data) +{ + set_permissions_callback (handle, result, new_info, callback_data); +} + +void +nautilus_file_set_selinux_context (NautilusFile *file, + const char *selinux_context, + NautilusFileOperationCallback callback, + gpointer callback_data) +{ + Operation *op; + GnomeVFSURI *vfs_uri; + GnomeVFSFileInfo *partial_file_info; + GnomeVFSFileInfoOptions options; + char *rcontext; + + rcontext = NULL; + + /* this is probably mostly right... */ + if (!nautilus_file_can_set_permissions (file)) { + /* Claim that something changed even if the permission change failed. + * This makes it easier for some clients who see the "reverting" + * to the old permissions as "changing back". + */ + nautilus_file_changed (file); + (* callback) (file, GNOME_VFS_ERROR_ACCESS_DENIED, callback_data); + return; + } + + /* Test the permissions-haven't-changed case explicitly + * because we don't want to send the file-changed signal if + * nothing changed. + */ + if (file->details->info->selinux_context != NULL && + strcmp(selinux_context, file->details->info->selinux_context) == 0) { + (* callback) (file, GNOME_VFS_OK, callback_data); + return; + } + +#ifdef HAVE_SELINUX + /* this is really const, but prototype is wrong, *sigh* */ + if (selinux_trans_to_raw_context((char *)selinux_context, &rcontext)) { + (* callback) (file, GNOME_VFS_ERROR_NO_MEMORY, callback_data); + return; + } + selinux_context = rcontext; +#endif + + /* Set up a context change operation. */ + op = operation_new (file, callback, callback_data); + op->use_slow_mime = file->details->got_slow_mime_type; + + options = NAUTILUS_FILE_DEFAULT_FILE_INFO_OPTIONS; + if (op->use_slow_mime) { + options |= GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE; + } + /* Change the file-on-disk context. */ + partial_file_info = gnome_vfs_file_info_new (); + g_free (partial_file_info->selinux_context); + partial_file_info->selinux_context = g_strdup (selinux_context); + vfs_uri = nautilus_file_get_gnome_vfs_uri (file); + gnome_vfs_async_set_file_info (&op->handle, + vfs_uri, partial_file_info, + GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT, + options, + GNOME_VFS_PRIORITY_DEFAULT, + set_selinux_context_callback, op); + gnome_vfs_file_info_unref (partial_file_info); + gnome_vfs_uri_unref (vfs_uri); + +#ifdef HAVE_SELINUX + freecon (rcontext); +#endif +} + + static char * get_real_name (const char *name, const char *gecos) { @@ -3804,7 +3932,7 @@ GnomeVFSResult result, GnomeVFSFileInfo *new_info, gpointer callback_data) -{ +{ /* FIXME: this is identical to set_permissions_callback */ Operation *op; op = callback_data; --- nautilus-2.17.90/libnautilus-private/nautilus-file.h.selinux 2007-01-11 10:58:31.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file.h 2007-01-23 09:15:44.000000000 +0100 @@ -200,6 +200,7 @@ GList * nautilus_file_get_settable_group_names (NautilusFile *file); gboolean nautilus_file_can_get_selinux_context (NautilusFile *file); char * nautilus_file_get_selinux_context (NautilusFile *file); +char * nautilus_file_get_selinux_matchpathcon (NautilusFile *file); /* "Capabilities". */ gboolean nautilus_file_can_read (NautilusFile *file); @@ -226,6 +227,10 @@ GnomeVFSFilePermissions permissions, NautilusFileOperationCallback callback, gpointer callback_data); +void nautilus_file_set_selinux_context (NautilusFile *file, + const char *selinux_context, + NautilusFileOperationCallback callback, + gpointer callback_data); void nautilus_file_rename (NautilusFile *file, const char *new_name, NautilusFileOperationCallback callback, --- nautilus-2.17.90/libnautilus-private/nautilus-file-operations.c.selinux 2007-01-11 12:36:02.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file-operations.c 2007-01-23 09:15:44.000000000 +0100 @@ -63,6 +63,10 @@ #include "nautilus-trash-monitor.h" #include "nautilus-file-utilities.h" +#ifdef HAVE_SELINUX +#include +#endif + typedef enum TransferKind TransferKind; typedef struct TransferInfo TransferInfo; typedef struct IconPositionIterator IconPositionIterator; @@ -2953,6 +2957,7 @@ GnomeVFSFilePermissions file_mask; GnomeVFSFilePermissions dir_permissions; GnomeVFSFilePermissions dir_mask; + char *context; NautilusSetPermissionsCallback callback; gpointer callback_data; }; @@ -2980,6 +2985,8 @@ GnomeVFSURI *uri; char *uri_str; struct FileInfo *file_info; + int flags; + int options; info = callback_data; @@ -3010,10 +3017,18 @@ vfs_info->permissions = (file_info->permissions & ~info->file_mask) | info->file_permissions; + flags = GNOME_VFS_SET_FILE_INFO_PERMISSIONS; + options = GNOME_VFS_FILE_INFO_DEFAULT; + if (info->context) { + flags |= GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT; + vfs_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SELINUX_CONTEXT; + options |= GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT; + g_free (vfs_info->selinux_context); + vfs_info->selinux_context = g_strdup (info->context); + } gnome_vfs_async_set_file_info (&info->handle, uri, vfs_info, - GNOME_VFS_SET_FILE_INFO_PERMISSIONS, - GNOME_VFS_FILE_INFO_DEFAULT, + flags, options, GNOME_VFS_PRIORITY_DEFAULT, set_permissions_set_file_info, info); @@ -3021,7 +3036,6 @@ gnome_vfs_file_info_unref (vfs_info); g_free (file_info->name); g_free (file_info); - } static void @@ -3066,13 +3080,11 @@ } } - if (result != GNOME_VFS_OK) { /* Finished with this dir, work on the files */ info->current_file = NULL; set_permissions_set_file_info (NULL, GNOME_VFS_OK, NULL, info); } - } /* Also called for the toplevel dir */ @@ -3084,7 +3096,8 @@ { struct RecursivePermissionsInfo *info; char *uri_str; - + int options; + info = callback_data; if (result == GNOME_VFS_OK && handle != NULL) { @@ -3093,9 +3106,13 @@ g_free (uri_str); } + options = GNOME_VFS_FILE_INFO_DEFAULT; + if (info->context) { + options |= GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT; + } gnome_vfs_async_load_directory_uri (&info->handle, info->current_dir, - GNOME_VFS_FILE_INFO_DEFAULT, + options, 50, GNOME_VFS_PRIORITY_DEFAULT, set_permissions_got_files, @@ -3107,6 +3124,8 @@ { struct DirInfo *dir_info; GnomeVFSFileInfo *vfs_info; + int flags; + int options; gnome_vfs_uri_unref (info->current_dir); @@ -3114,6 +3133,7 @@ /* No more directories, finished! */ info->callback (info->callback_data); /* All parts of info should be freed now */ + g_free (info->context); g_free (info); return; } @@ -3128,12 +3148,18 @@ vfs_info->permissions = (dir_info->permissions & ~info->dir_mask) | info->dir_permissions; - - gnome_vfs_async_set_file_info (&info->handle, - info->current_dir, - vfs_info, - GNOME_VFS_SET_FILE_INFO_PERMISSIONS, - GNOME_VFS_FILE_INFO_DEFAULT, + flags = GNOME_VFS_SET_FILE_INFO_PERMISSIONS; + options = GNOME_VFS_FILE_INFO_DEFAULT; + if (info->context) { + flags |= GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT; + vfs_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SELINUX_CONTEXT; + options |= GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT; + g_free (vfs_info->selinux_context); + vfs_info->selinux_context = g_strdup (info->context); + } + + gnome_vfs_async_set_file_info (&info->handle, info->current_dir, + vfs_info, flags, options, GNOME_VFS_PRIORITY_DEFAULT, set_permissions_load_dir, info); @@ -3148,6 +3174,7 @@ GnomeVFSFilePermissions file_mask, GnomeVFSFilePermissions dir_permissions, GnomeVFSFilePermissions dir_mask, + const char *context, NautilusSetPermissionsCallback callback, gpointer callback_data) { @@ -3161,6 +3188,22 @@ info->file_mask = file_mask; info->dir_permissions = dir_permissions; info->dir_mask = dir_mask; + if (context) { + char *rcontext; + + rcontext = info->context = NULL; +#ifdef HAVE_SELINUX + /* this is really const, but prototype is wrong, *sigh* */ + if (selinux_trans_to_raw_context((char *)context, &rcontext)) { + g_error ("selinux_trans_to_raw_context: failed to allocate bytes"); + return; + } + info->context = g_strdup (rcontext); + freecon (rcontext); +#endif + } else { + info->context = NULL; + } info->callback = callback; info->callback_data = callback_data; @@ -3168,6 +3211,8 @@ if (info->current_dir == NULL) { info->callback (info->callback_data); + /* All parts of info should be freed now */ + g_free (info->context); g_free (info); return; } --- nautilus-2.17.90/libnautilus-private/nautilus-file-operations.h.selinux 2007-01-03 09:52:25.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file-operations.h 2007-01-23 09:15:44.000000000 +0100 @@ -76,6 +76,7 @@ GnomeVFSFilePermissions file_mask, GnomeVFSFilePermissions folder_permissions, GnomeVFSFilePermissions folder_mask, + const char *context, NautilusSetPermissionsCallback callback, gpointer callback_data); --- nautilus-2.17.90/src/file-manager/fm-error-reporting.c.selinux 2007-01-03 09:52:12.000000000 +0100 +++ nautilus-2.17.90/src/file-manager/fm-error-reporting.c 2007-01-23 09:15:44.000000000 +0100 @@ -252,6 +252,38 @@ g_free (message); } +void +fm_report_error_setting_selinux (NautilusFile *file, + GnomeVFSResult error, + GtkWindow *parent_window) +{ + char *file_name; + char *message; + + if (error == GNOME_VFS_OK) { + return; + } + + file_name = nautilus_file_get_display_name (file); + + switch (error) { + case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM: + message = g_strdup_printf (_("Couldn't change the SELinux security context of \"%s\" because it is on a read-only disk"), + file_name); + break; + default: + /* We should invent decent error messages for every case we actually experience. */ + g_warning ("Hit unhandled case %d (%s) in fm_report_error_setting_permissions", + error, gnome_vfs_result_to_string (error)); + message = g_strdup_printf (_("Sorry, couldn't change the permissions of \"%s\"."), file_name); + } + + eel_show_error_dialog (_("The SELinux security context could not be changed."), message, parent_window); + + g_free (file_name); + g_free (message); +} + typedef struct _FMRenameData { char *name; NautilusFileOperationCallback callback; --- nautilus-2.17.90/src/file-manager/fm-error-reporting.h.selinux 2007-01-03 09:52:12.000000000 +0100 +++ nautilus-2.17.90/src/file-manager/fm-error-reporting.h 2007-01-23 09:15:44.000000000 +0100 @@ -39,7 +39,10 @@ GnomeVFSResult error_code, GtkWindow *parent_window); void fm_report_error_setting_permissions (NautilusFile *file, - GnomeVFSResult error_code, + GnomeVFSResult error_code, + GtkWindow *parent_window); +void fm_report_error_setting_selinux (NautilusFile *file, + GnomeVFSResult error_code, GtkWindow *parent_window); void fm_report_error_setting_owner (NautilusFile *file, GnomeVFSResult error_code, --- nautilus-2.17.90/src/file-manager/fm-properties-window.c.selinux 2007-01-11 11:53:01.000000000 +0100 +++ nautilus-2.17.90/src/file-manager/fm-properties-window.c 2007-01-23 09:15:44.000000000 +0100 @@ -83,6 +83,10 @@ #include #include +#ifdef HAVE_SELINUX +# include +#endif + #define PREVIEW_IMAGE_WIDTH 96 #define ROW_PAD 6 @@ -102,7 +106,7 @@ GtkWidget *icon_button; GtkWidget *icon_image; - GtkWidget *icon_chooser; + GtkWidget *icon_chooser; GtkWidget *name_label; GtkWidget *name_field; @@ -124,12 +128,15 @@ unsigned int owner_change_timeout; GList *permission_buttons; - GList *permission_combos; + GList *permission_combos; /* how is this deallocated???? */ + GList *selinux_combo; GHashTable *initial_permissions; gboolean has_recursive_apply; GList *value_fields; + GList *edit_fields; + GList *mime_list; gboolean deep_count_finished; @@ -208,6 +215,10 @@ GtkComboBox *combo); static void value_field_update (FMPropertiesWindow *window, GtkLabel *field); +static void edit_field_update (FMPropertiesWindow *window, + GtkEntry *field); +static void popup_field_update (FMPropertiesWindow *window, + GtkComboBox *entry); static void properties_window_update (FMPropertiesWindow *window, GList *files); static void is_directory_ready_callback (NautilusFile *file, @@ -235,10 +246,32 @@ int row, int column, const char *initial_text); +static void attach_selinux_data_edit_field (GtkEntry *entry, + char *attr_value, + char *def_attr_value); +static void attach_selinux_data_popup_field (GtkComboBox *comb, + char *attr_val, + char *def_attr_val); + G_DEFINE_TYPE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW); #define parent_class fm_properties_window_parent_class +static void +maybe_gtk_entry_set_text (GtkEntry *entry, const char *val) +{ + char *old_val; + + g_assert (GTK_IS_ENTRY (entry)); + + old_val = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + + if (strcmp (old_val, val) != 0) { + gtk_entry_set_text (entry, val); + } + g_free(old_val); +} + static gboolean is_multi_file_window (FMPropertiesWindow *window) { @@ -259,6 +292,39 @@ return FALSE; } +static gboolean +multi_have_same_selinux_context (FMPropertiesWindow *window) +{ + GList *l; + char *cntx; + + cntx = NULL; + for (l = window->details->original_files; l != NULL; l = l->next) { + NautilusFile *file; + + file = NAUTILUS_FILE (l->data); + if (!nautilus_file_is_gone (file)) { + char *tmp; + + tmp = nautilus_file_get_string_attribute_with_default (file, "selinux_context"); + if (!cntx) { + cntx = tmp; + } else if (strcmp (cntx, tmp)) { + g_free (tmp); + g_free (cntx); + return FALSE; + } + else { + g_free (tmp); + } + } + } + + g_free (cntx); + + return TRUE; +} + static int get_not_gone_original_file_count (FMPropertiesWindow *window) { @@ -496,7 +562,7 @@ return; } - uris = g_strsplit (selection_data->data, "\r\n", 0); + uris = g_strsplit ((char *) selection_data->data, "\r\n", 0); exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0'); @@ -577,7 +643,7 @@ static void set_name_field (FMPropertiesWindow *window, const gchar *original_name, - const gchar *name) + const gchar *name) { gboolean new_widget; gboolean use_label; @@ -643,11 +709,7 @@ * currently showing. This causes minimal ripples (e.g. * selection change). */ - gchar *displayed_name = gtk_editable_get_chars (GTK_EDITABLE (window->details->name_field), 0, -1); - if (strcmp (displayed_name, name) != 0) { - gtk_entry_set_text (GTK_ENTRY (window->details->name_field), name); - } - g_free (displayed_name); + maybe_gtk_entry_set_text (GTK_ENTRY (window->details->name_field), name); } } } @@ -723,7 +785,6 @@ name_field_restore_original_name (NautilusEntry *name_field) { const char *original_name; - char *displayed_name; original_name = (const char *) g_object_get_data (G_OBJECT (name_field), "original_name"); @@ -732,14 +793,8 @@ return; } - displayed_name = gtk_editable_get_chars (GTK_EDITABLE (name_field), 0, -1); - - if (strcmp (original_name, displayed_name) != 0) { - gtk_entry_set_text (GTK_ENTRY (name_field), original_name); - } + maybe_gtk_entry_set_text (GTK_ENTRY (name_field), original_name); nautilus_entry_select_all (name_field); - - g_free (displayed_name); } static void @@ -852,7 +907,7 @@ word = g_list_find_custom (keywords, keyword, (GCompareFunc) strcmp); eel_g_list_free_deep (keywords); - return (word != NULL); + return word != NULL; } static void @@ -1119,7 +1174,7 @@ b = b->next; } - return (a == b); + return a == b; } static GList * @@ -1201,6 +1256,14 @@ for (l = window->details->value_fields; l != NULL; l = l->next) { value_field_update (window, GTK_LABEL (l->data)); } + + for (l = window->details->edit_fields; l != NULL; l = l->next) { + edit_field_update (window, GTK_ENTRY (l->data)); + } + + for (l = window->details->selinux_combo; l != NULL; l = l->next) { + popup_field_update (window, GTK_COMBO_BOX (l->data)); + } } mime_list = get_mime_list (window); @@ -1381,6 +1444,111 @@ ellipsize_text); } +static void +edit_field_update_internal (GtkEntry *entry, + GList *file_list) +{ + const char *attr_name; + char *attr_value; + char *def_attr_value; + char *inconsistent_string; + + g_assert (GTK_IS_ENTRY (entry)); + + attr_name = g_object_get_data (G_OBJECT (entry), "file_attribute"); + inconsistent_string = g_object_get_data (G_OBJECT (entry), + "inconsistent_string"); + def_attr_value = g_object_get_data (G_OBJECT (entry), + "matchpathcon_cntx"); + + attr_value = file_list_get_string_attribute (file_list, attr_name, + inconsistent_string); + + maybe_gtk_entry_set_text (GTK_ENTRY (entry), attr_value); + + /* JFIXME: this isn't generic, *sigh* ... */ + attach_selinux_data_edit_field (entry, attr_value, def_attr_value); + g_free (attr_value); +} + +static void +edit_field_update (FMPropertiesWindow *window, GtkEntry *entry) +{ + gboolean use_original; + + if (gtk_widget_is_focus (GTK_WIDGET (entry))) { + return; + } + + use_original = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry), "show_original")); + + edit_field_update_internal (entry, + (use_original ? + window->details->original_files : + window->details->target_files)); +} + +static void +popup_field_update_internal (GtkComboBox *combo, + GList *file_list) +{ + const char *attr_name; + char *attr_value; + char *def_attr_value; + char *inconsistent_string; + char *cntx_type; + GtkTreeIter iter; + + g_assert (GTK_IS_COMBO_BOX (combo)); + + if (gtk_widget_is_focus (GTK_WIDGET (combo))) { + return; + } + + attr_name = g_object_get_data (G_OBJECT (combo), "file_attribute"); + inconsistent_string = g_object_get_data (G_OBJECT (combo), + "inconsistent_string"); + def_attr_value = g_object_get_data (G_OBJECT (combo), + "matchpathcon_cntx"); + + attr_value = file_list_get_string_attribute (file_list, attr_name, + inconsistent_string); + + /* JFIXME: this isn't generic, *sigh* ... */ + + if (gtk_combo_box_get_active_iter (combo, &iter)) { + GtkTreeModel *model = gtk_combo_box_get_model (combo); + + /* don't update, if it's identical */ + gtk_tree_model_get (model, &iter, 0, &cntx_type, -1); + if (cntx_type && strcmp (cntx_type, attr_value) == 0) { + g_free (attr_value); + return; + } + } + + attach_selinux_data_popup_field (combo, attr_value, def_attr_value); + + g_free (attr_value); +} + +static void +popup_field_update (FMPropertiesWindow *window, GtkComboBox *combo) +{ + gboolean use_original; + + if (window->details->selinux_combo) { + return; /* FIXME: must be true: horrible UI, if working */ + } + + use_original = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "show_original")); + + popup_field_update_internal (combo, + (use_original ? + window->details->original_files : + window->details->target_files)); +} + static GtkLabel * attach_label (GtkTable *table, int row, @@ -1432,6 +1600,45 @@ return attach_label (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE); } +static GtkEntry * +attach_edit (GtkTable *table, + int row, + int column, + const char *initial_text, + gboolean right_aligned, + gboolean bold, + gboolean ellipsize_text, + gboolean selectable, + gboolean mnemonic) +{ + GtkWidget *entry_field; + + entry_field = nautilus_entry_new (); + gtk_entry_set_text (GTK_ENTRY (entry_field), initial_text); + + gtk_entry_set_alignment (GTK_ENTRY (entry_field), right_aligned ? 1 : 0); + gtk_widget_show (entry_field); + gtk_table_attach (table, entry_field, + column, column + 1, + row, row + 1, + ellipsize_text + ? GTK_FILL | GTK_EXPAND + : GTK_FILL, + 0, + 0, 0); + + return GTK_ENTRY (entry_field); +} + +static GtkEntry * +attach_edit_label (GtkTable *table, + int row, + int column, + const char *initial_text) +{ + return attach_edit (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE); +} + static GtkLabel * attach_ellipsizing_value_label (GtkTable *table, int row, @@ -1491,6 +1698,672 @@ FALSE); } +static void +start_long_operation (FMPropertiesWindow *window) +{ + if (window->details->long_operation_underway == 0) { + /* start long operation */ + GdkCursor * cursor; + + cursor = gdk_cursor_new (GDK_WATCH); + gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); + gdk_cursor_unref (cursor); + } + window->details->long_operation_underway ++; +} + +static void +end_long_operation (FMPropertiesWindow *window) +{ + if (GTK_WIDGET (window)->window != NULL && + window->details->long_operation_underway == 1) { + /* finished !! */ + gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); + } + window->details->long_operation_underway--; +} + +static void +selinux_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callback_data) +{ + FMPropertiesWindow *window; + g_assert (callback_data != NULL); + + window = FM_PROPERTIES_WINDOW (callback_data); + end_long_operation (window); + + /* Report the error if it's an error. */ + fm_report_error_setting_selinux (file, result, NULL); + + g_object_unref (window); +} + +static void +selinux_done_editing (FMPropertiesWindow *window, char *selinux_context) +{ + GList *l; + + /* Accept changes. */ + for (l = window->details->target_files; l != NULL; l = l->next) { + NautilusFile *file; + + file = NAUTILUS_FILE (l->data); + + start_long_operation (window); + g_object_ref (window); + nautilus_file_set_selinux_context (file, selinux_context, + selinux_change_callback, + window); + } +} + +static gboolean +selinux_focus_out (NautilusEntry *entry, GdkEventFocus *event, gpointer cb_data) +{ + g_assert (NAUTILUS_IS_ENTRY (entry)); + g_assert (FM_IS_PROPERTIES_WINDOW (cb_data)); + + if (GTK_WIDGET_SENSITIVE (entry)) { + char *tmp; + + tmp = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + selinux_done_editing (FM_PROPERTIES_WINDOW (cb_data), tmp); + g_free (tmp); + } + + return FALSE; +} + +static void +selinux_entry_activate (NautilusEntry *entry, gpointer cb_data) +{ + char *tmp; + + g_assert (NAUTILUS_IS_ENTRY (entry)); + g_assert (FM_IS_PROPERTIES_WINDOW (cb_data)); + + tmp = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + selinux_done_editing (FM_PROPERTIES_WINDOW (cb_data), tmp); + g_free (tmp); + + nautilus_entry_select_all_at_idle (entry); +} + +/* NOTE: This modifies cntx */ +static void +selinux_split_cntx (char *cntx, + const char **ret_attr_u, + const char **ret_attr_r, + const char **ret_attr_t, + const char **ret_attr_s) +{ + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + + attr_u = cntx; + if (!(attr_r = strchr (attr_u, ':'))) { + attr_r = "object_r"; /* shouldn't happen */ + } else { + *((char *)attr_r++) = 0; + } + + if (!(attr_t = strchr (attr_r, ':'))) { + attr_t = "file_t"; /* shouldn't happen */ + } else { + *((char *)attr_t++) = 0; + } + + if ((attr_s = strchr (attr_t, ':'))) { + *((char *)attr_s++) = 0; + } + + *ret_attr_u = attr_u; + *ret_attr_r = attr_r; + *ret_attr_t = attr_t; + *ret_attr_s = attr_s; +} + +static void +selinux_popup_activate (GtkComboBox *comb, gpointer cb_data) +{ + char *cntx_type; + char *orig_type; + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + char *tmp; + GtkTreeIter iter; + + g_assert (GTK_IS_COMBO_BOX (comb)); + g_assert (FM_IS_PROPERTIES_WINDOW (cb_data)); + + if (!gtk_combo_box_get_active_iter (comb, &iter)) { + return; + } else { + + GtkTreeModel *model = gtk_combo_box_get_model (comb); + gtk_tree_model_get (model, &iter, 0, &cntx_type, -1); + } + + if (!(orig_type = g_object_get_data (G_OBJECT (comb), + "original_cntx"))) { + return; + } + orig_type = g_strdup (orig_type); + + selinux_split_cntx (orig_type, &attr_u, &attr_r, &attr_t, &attr_s); + tmp = g_strjoin (":", attr_u, attr_r, cntx_type, attr_s, NULL); + g_free (orig_type); + + selinux_done_editing (FM_PROPERTIES_WINDOW (cb_data), tmp); + g_free (tmp); +} + +static char * +cust_type_next_line (GIOChannel *ioc_ctypes) +{ + char *data; + gsize term; + GError *errc; + + data = NULL; + term = 0; + errc = NULL; + + if (G_IO_STATUS_NORMAL == g_io_channel_read_line (ioc_ctypes, &data, + NULL, &term, &errc)) { + data[term] = 0; + return data; + } + + return NULL; +} + +static GSList * +selinux__type_list (void) +{ + static GSList *cust_types; + static time_t file_mtime; + const char *fname_ctypes; + struct stat buf; + GIOChannel *ioc_ctypes; + GError *errc; + GSList *scan; + int fd; + +#ifndef HAVE_SELINUX + if (cust_types) { + return cust_types; + } +#else + fname_ctypes = selinux_customizable_types_path (); + if (cust_types && file_mtime && !stat (fname_ctypes, &buf) && + (file_mtime == buf.st_mtime)) { + return cust_types; + } +#endif + + if (cust_types) { + for (scan = cust_types; scan; scan = scan->next) { + g_free (scan->data); + } + g_slist_free (cust_types); + cust_types = NULL; + } + + cust_types = g_slist_prepend (cust_types, g_strdup ("tmp_t")); + cust_types = g_slist_prepend (cust_types, g_strdup ("user_home_t")); + /* cust_types = g_slist_prepend (cust_types, g_strdup ("user_tmp_t")); */ + +#ifdef HAVE_SELINUX + /* read types, one per line... */ + fname_ctypes = selinux_customizable_types_path (); + errc = NULL; + if ((ioc_ctypes = g_io_channel_new_file (fname_ctypes, "r", &errc))) { + char *data = NULL; + + while ((data = cust_type_next_line (ioc_ctypes))) { + cust_types = g_slist_prepend (cust_types, data); + } + + fd = g_io_channel_unix_get_fd (ioc_ctypes); + if (!fstat (fd, &buf)) { + file_mtime = buf.st_mtime; + } + + g_io_channel_unref (ioc_ctypes); + } +#endif + + return cust_types; +} + +static void +attach_selinux_data_edit_field (GtkEntry *entry, + char *attr_val, char *def_attr_val) +{ + GtkEntryCompletion *comp; + GtkCellRenderer *cell; + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + const char *dattr_u; + const char *dattr_r; + const char *dattr_t; + const char *dattr_s; + GtkListStore *store; + GtkTreeIter iter; + GSList *scan; + int width; + int owidth; + int twidth; + + attr_val = g_strdup (attr_val); /* so we can alter it... */ + def_attr_val = g_strdup (def_attr_val); /* so we can alter it... */ + + /* do completion, so you don't have to type everything... */ + comp = gtk_entry_completion_new (); + store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), + 0, GTK_SORT_ASCENDING); + + gtk_entry_completion_set_model (comp, GTK_TREE_MODEL (store)); + cell = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comp), cell, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comp), cell, + "stock-id", 1, NULL); + gtk_entry_completion_set_text_column (comp, 0); + gtk_entry_set_completion (entry, comp); + + /* FIXME: default doesn't do the right thing, should it? */ + owidth = gtk_entry_get_width_chars (entry); + width = owidth; + + selinux_split_cntx (attr_val, &attr_u, &attr_r, &attr_t, &attr_s); + dattr_u = dattr_r = dattr_t = dattr_s = NULL; + if (def_attr_val) { + selinux_split_cntx (def_attr_val, &dattr_u, &dattr_r, + &dattr_t, &dattr_s); + } + + /* don't do it twice... */ + if (attr_t && dattr_t && !strcmp (attr_t, dattr_t)) { + dattr_t = NULL; + } + + if (attr_t) { + /* highlight just the type to the end, so we can easily change it + * FIXME: we also highlight any Sensitivity/MCS but completion will + * let people put it back, and that's the only way we get completion + * at all -- This sucks and we need to remove Sensitivity/MCS from + * the edit box. Yah, more UI. */ + int beg = attr_t - attr_u; + gtk_editable_select_region (GTK_EDITABLE (entry), beg, -1); + } + + for (scan = selinux__type_list(); scan; scan = scan->next) { + char *tmp; + + if (attr_t && !strcmp (attr_t, scan->data)) + continue; /* don't have two entries */ + + if (dattr_t && !strcmp (dattr_t, scan->data)) + continue; /* don't have two entries */ + + gtk_list_store_append (store, &iter); + tmp = g_strjoin (":", attr_u, attr_r, scan->data, attr_s, NULL); + gtk_list_store_set (store, &iter, 0, tmp, -1); + + twidth = strlen (tmp); + width = MAX (twidth, width); + + g_free (tmp); + } + + if (dattr_t) { + char *tmp; + + gtk_list_store_append (store, &iter); + tmp = g_strjoin (":", dattr_u, dattr_r, dattr_t, dattr_s, NULL); + gtk_list_store_set (store, &iter, 0, tmp, + 1, GTK_STOCK_HOME, -1); + + twidth = strlen (tmp); + width = MAX (twidth, width); + + g_free (tmp); + } + + if (attr_t) { + char *tmp; + + gtk_list_store_append (store, &iter); + tmp = g_strjoin (":", attr_u, attr_r, attr_t, attr_s, NULL); + gtk_list_store_set (store, &iter, 0, tmp, 1, GTK_STOCK_OK, -1); + + twidth = strlen (tmp); + width = MAX (twidth, width); + + g_free (tmp); + } + + g_free (attr_val); + g_free (def_attr_val); + g_object_unref (G_OBJECT (store)); + g_object_unref (G_OBJECT (comp)); + + if (width != owidth) { + gtk_entry_set_width_chars (entry, width + 2); + } +} + +# define HACK_TYPE(x, y) \ + else if (!strcmp (nice_type, x)) nice_type = y + +/* hack to convert a selinux_context type into a readable string for the + user */ +static const char * +selinux__hack_conv_type (const char *type) +{ /* FIXME: hack attack, but nowhere else to put it. Because mathpathcon + * here now probably want a bunch of other types? */ + const char *nice_type; + + nice_type = type; + + if (0) { } + + HACK_TYPE("cupsd_etc_t", _("CUPS printer configuration")); + HACK_TYPE("cupsd_rw_etc_t", _("CUPS printer configuration (rw)")); + HACK_TYPE("cupsd_tmp_t", _("CUPS temporary data")); + HACK_TYPE("dhcp_etc_t", _("DHCP configuration")); + HACK_TYPE("dictd_etc_t", _("Dictd configuration")); + HACK_TYPE("dnssec_t", _("DNS secret")); + HACK_TYPE("etc_t", _("System configuration")); + HACK_TYPE("etc_aliases_t", _("Email aliases configuration")); + HACK_TYPE("etc_runtime_t", _("System configuration (rw)")); + HACK_TYPE("cvs_data_t", _("Read and write from CVS daemon")); + HACK_TYPE("httpd_config_t", _("Apache-httpd configuration")); + HACK_TYPE("httpd_php_tmp_t", + _("Apache-httpd PHP module temporary data")); + HACK_TYPE("httpd_sys_content_t", + _("Read from all httpd scripts and the daemon")); + HACK_TYPE("httpd_sys_htaccess_t", + _("Apache-httpd .htaccess configuration")); + HACK_TYPE("httpd_sys_script_exec_t", + _("CGI programs with default access")); + HACK_TYPE("httpd_sys_script_ra_t", + _("CGI programs can read and append")); + HACK_TYPE("httpd_sys_script_ro_t", + _("CGI programs can read")); + HACK_TYPE("httpd_sys_script_rw_t", + _("CGI programs can read and write")); + HACK_TYPE("httpd_unconfined_script_exec_t", + _("CGI programs without any SELinux protection")); + HACK_TYPE("httpd_tmp_t", _("Apache-httpd temporary data")); + HACK_TYPE("ice_tmp_t", _("ICE temporary data")); + HACK_TYPE("locale_t", _("Locale data")); + HACK_TYPE("mysql_tmp_t", _("MySQL temporary data")); + HACK_TYPE("named_conf_t", _("Nameserver configuration")); + HACK_TYPE("net_conf_t", _("Network configuration")); + HACK_TYPE("postgresql_tmp_t", _("Postgresql temporary data")); + HACK_TYPE("public_content_rw_t", + _("Read and write from CIFS/ftp/http/nfs/rsync")); + HACK_TYPE("public_content_t", _("Read from CIFS/ftp/http/nfs/rsync")); + HACK_TYPE("samba_etc_t", _("Samba configuration")); + HACK_TYPE("samba_share_t", _("Shared via CIFS (samba)")); + HACK_TYPE("staff_home_t", _("Staff user data")); + HACK_TYPE("staff_home_dir_t", _("Staff user home directory")); + HACK_TYPE("swapfile_t", _("System swapfile")); + HACK_TYPE("sysadm_home_t", _("Sysadmin user data")); + HACK_TYPE("sysadm_home_dir_t", _("Sysadmin user home directory")); + HACK_TYPE("system_cron_spool_t", _("Cron data")); + HACK_TYPE("tmp_t", _("Temporary data")); + HACK_TYPE("user_tmp_t", _("User temporary data")); + HACK_TYPE("user_home_t", _("User data")); + HACK_TYPE("user_home_dir_t", _("User home directory")); + HACK_TYPE("var_log_t", _("Logfile")); + HACK_TYPE("xen_image_t", _("Xen image")); + + return nice_type; +} +#undef HACK_TYPE + +static void +attach_selinux_data_popup_field (GtkComboBox *comb, + char *attr_val, + char *def_attr_val) +{ + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + const char *dattr_u; + const char *dattr_r; + const char *dattr_t; + const char *dattr_s; + GtkListStore *store; + GtkTreeIter iter; + GSList *scan; + + attr_val = g_strdup (attr_val); /* so we can alter it... */ + def_attr_val = g_strdup (def_attr_val); + + /* do completion, so you don't have to type everything... */ + store = gtk_list_store_new (3, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), + 1, GTK_SORT_ASCENDING); + + gtk_combo_box_set_model (comb, GTK_TREE_MODEL (store)); + + selinux_split_cntx (attr_val, &attr_u, &attr_r, &attr_t, &attr_s); + dattr_u = dattr_r = dattr_t = dattr_s = NULL; + if (def_attr_val) { + selinux_split_cntx (def_attr_val, &dattr_u, &dattr_r, + &dattr_t, &dattr_s); + } + /* don't do it twice... */ + if (attr_t && dattr_t && !strcmp (attr_t, dattr_t)) { + dattr_t = NULL; + } + + for (scan = selinux__type_list(); scan; scan = scan->next) { + const char *nice_type; + + if (attr_t && !strcmp (attr_t, scan->data)) + continue; /* don't have two entries */ + + if (dattr_t && !strcmp (dattr_t, scan->data)) + continue; /* don't have two entries */ + + nice_type = selinux__hack_conv_type(scan->data); + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, scan->data, + 1, nice_type, -1); + } + + if (dattr_t) { + const char *nice_type; + + gtk_list_store_append (store, &iter); + nice_type = selinux__hack_conv_type(dattr_t); + gtk_list_store_set (store, &iter, 0, dattr_t, 1, nice_type, + 2, GTK_STOCK_HOME, -1); + } + + if (attr_t) { + const char *nice_type; + + gtk_list_store_append (store, &iter); + nice_type = selinux__hack_conv_type(attr_t); + gtk_list_store_set (store, &iter, 0, attr_t, 1, nice_type, + 2, GTK_STOCK_OK, -1); + gtk_combo_box_set_active_iter (comb, &iter); + } + + g_free (attr_val); + g_free (def_attr_val); + g_object_unref (G_OBJECT (store)); +} + +static char * +selinux__matchpathcon (GList *file_list) +{ + GList *scan; + + for (scan = file_list; scan != NULL; scan = scan->next) { + NautilusFile *file; + + file = NAUTILUS_FILE (scan->data); + if (!nautilus_file_is_gone (file)) { + return nautilus_file_get_selinux_matchpathcon (file); + } + } + + return NULL; +} + +static void +attach_selinux_edit_field (FMPropertiesWindow *window, + GtkTable *table, + int row, + int column, + const char *file_attribute_name, + const char *inconsistent_string, + gboolean show_original, + GtkLabel *lab_title) +{ + GtkEntry *entry; + GList *file_list; + char *attr_value; + char *def_attr_value; + + if (show_original) { + file_list = window->details->original_files; + } else { + file_list = window->details->target_files; + } + + attr_value = file_list_get_string_attribute (file_list, + file_attribute_name, + inconsistent_string); + if ( strcmp (attr_value, inconsistent_string) && + !strcmp (file_attribute_name, "selinux_context")) { + def_attr_value = selinux__matchpathcon (file_list); + } else { + def_attr_value = NULL; + } + + entry = attach_edit_label (table, row, column, attr_value); + gtk_label_set_mnemonic_widget (GTK_LABEL (lab_title), + GTK_WIDGET (entry)); + + /* Stash a copy of the file attribute name in this field for the callback's sake. */ + g_object_set_data_full (G_OBJECT (entry), "file_attribute", + g_strdup (file_attribute_name), g_free); + + g_object_set_data_full (G_OBJECT (entry), "inconsistent_string", + g_strdup (inconsistent_string), g_free); + + g_object_set_data (G_OBJECT (entry), "show_original", GINT_TO_POINTER (show_original)); + g_object_set_data (G_OBJECT (entry), "ellipsize_text", GINT_TO_POINTER (FALSE)); + + g_signal_connect_object (entry, "focus_out_event", + G_CALLBACK (selinux_focus_out), window, 0); + g_signal_connect_object (entry, "activate", + G_CALLBACK (selinux_entry_activate), window,0); + + attach_selinux_data_edit_field (entry, attr_value, def_attr_value); + + g_object_set_data_full (G_OBJECT (entry), "original_cntx", attr_value, + g_free); + + g_object_set_data_full (G_OBJECT (entry), "matchpathcon_cntx", + def_attr_value, g_free); + + window->details->edit_fields = g_list_prepend (window->details->edit_fields, + entry); +} + +static void +attach_selinux_popup_field (FMPropertiesWindow *window, + GtkTable *table, + int row, + int column, + const char *file_attribute_name, + const char *inconsistent_string, + gboolean show_original, + GtkLabel *lab_title) +{ + GtkWidget *comb; + GtkCellRenderer *cell; + GList *file_list; + char *attr_value; + char *def_attr_value; + + if (show_original) { + file_list = window->details->original_files; + } else { + file_list = window->details->target_files; + } + + attr_value = file_list_get_string_attribute (file_list, + file_attribute_name, + inconsistent_string); + if ( strcmp (attr_value, inconsistent_string) && + !strcmp (file_attribute_name, "selinux_context")) { + def_attr_value = selinux__matchpathcon (file_list); + } else { + def_attr_value = NULL; + } + + comb = gtk_combo_box_new (); + + gtk_table_attach (table, comb, column, column + 1, row, row + 1, + GTK_FILL, 0, 0, 0); + + + gtk_label_set_mnemonic_widget (GTK_LABEL (lab_title), comb); + + /* Stash a copy of the file attribute name in this field for the callback's sake. */ + g_object_set_data_full (G_OBJECT (comb), "file_attribute", + g_strdup (file_attribute_name), g_free); + + g_object_set_data (G_OBJECT (comb), "show_original", GINT_TO_POINTER (show_original)); + + attach_selinux_data_popup_field (GTK_COMBO_BOX (comb), + attr_value, def_attr_value); + + g_signal_connect_object (comb, "changed", + G_CALLBACK (selinux_popup_activate), window, 0); + + g_object_set_data_full (G_OBJECT (comb), "original_cntx", attr_value, + g_free); + + g_object_set_data_full (G_OBJECT (comb), "matchpathcon_cntx", + def_attr_value, g_free); + + cell = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comb), cell, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comb), cell, + "stock-id", 2, NULL); + cell = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comb), cell, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comb), cell, + "text", 1, NULL); + gtk_widget_show (comb); + + g_assert (! window->details->selinux_combo); + + window->details->selinux_combo = + g_list_prepend (window->details->selinux_combo, comb); +} + static GtkWidget* attach_ellipsizing_value_field (FMPropertiesWindow *window, GtkTable *table, @@ -2441,6 +3314,36 @@ } static guint +append_title_selinux_edit_pair (FMPropertiesWindow *window, + GtkTable *table, + const char *title, + const char *file_attribute_name, + const char *inconsistent_state, + gboolean show_original) +{ + guint last_row; + GtkLabel *lab_title; + + lab_title = NULL; + last_row = append_title_field (table, title, &lab_title); + + if (window->details->advanced_permissions) { + attach_selinux_edit_field (window, table, last_row, + VALUE_COLUMN, file_attribute_name, + inconsistent_state, + show_original, lab_title); + } else { + + attach_selinux_popup_field (window, table, last_row, + VALUE_COLUMN, file_attribute_name, + inconsistent_state, + show_original, lab_title); + } + + return last_row; +} + +static guint append_title_and_ellipsizing_value (FMPropertiesWindow *window, GtkTable *table, const char *title, @@ -2902,31 +3805,6 @@ } static void -start_long_operation (FMPropertiesWindow *window) -{ - if (window->details->long_operation_underway == 0) { - /* start long operation */ - GdkCursor * cursor; - - cursor = gdk_cursor_new (GDK_WATCH); - gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); - gdk_cursor_unref (cursor); - } - window->details->long_operation_underway ++; -} - -static void -end_long_operation (FMPropertiesWindow *window) -{ - if (GTK_WIDGET (window)->window != NULL && - window->details->long_operation_underway == 1) { - /* finished !! */ - gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); - } - window->details->long_operation_underway--; -} - -static void permission_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callback_data) { FMPropertiesWindow *window; @@ -4053,14 +4931,16 @@ GnomeVFSFilePermissions file_permission, file_permission_mask; GnomeVFSFilePermissions dir_permission, dir_permission_mask; GnomeVFSFilePermissions vfs_mask, vfs_new_perm, p; - GtkWidget *button, *combo; + char *context; + GtkWidget *button; + GtkComboBox *combo; gboolean active, is_folder, is_special, use_original; GList *l; GtkTreeModel *model; GtkTreeIter iter; PermissionType type; int new_perm, mask; - + file_permission = 0; file_permission_mask = 0; dir_permission = 0; @@ -4097,9 +4977,9 @@ } /* Simple mode, minus exec checkbox */ for (l = window->details->permission_combos; l != NULL; l = l->next) { - combo = l->data; + combo = GTK_COMBO_BOX (l->data); - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) { + if (!gtk_combo_box_get_active_iter (combo, &iter)) { continue; } @@ -4107,7 +4987,7 @@ is_folder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "is-folder")); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + model = gtk_combo_box_get_model (combo); gtk_tree_model_get (model, &iter, 1, &new_perm, 2, &use_original, -1); if (use_original) { continue; @@ -4130,12 +5010,53 @@ } } + /* get the SELinux context... */ + context = NULL; + if (window->details->advanced_permissions && + window->details->edit_fields) { /* advanced mode */ + GtkEditable *efield; + + efield = window->details->edit_fields->data; + context = gtk_editable_get_chars (GTK_EDITABLE (efield), 0, -1); + } else if (!window->details->advanced_permissions && + window->details->selinux_combo) { /* simple mode */ + char *cntx_type; + char *orig_type; + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + + combo = GTK_COMBO_BOX (window->details->selinux_combo->data); + + if (!gtk_combo_box_get_active_iter (combo, &iter)) { + return; + } else { + GtkTreeModel *model = gtk_combo_box_get_model (combo); + gtk_tree_model_get (model, &iter, 0, &cntx_type, -1); + } + if (!(orig_type = g_object_get_data (G_OBJECT (combo), + "original_cntx"))) { + return; + } + + orig_type = g_strdup (orig_type); + + selinux_split_cntx (orig_type, + &attr_u, &attr_r, &attr_t, &attr_s); + context = g_strjoin (":", + attr_u, attr_r, cntx_type, attr_s, NULL); + g_free (orig_type); + } + for (l = window->details->target_files; l != NULL; l = l->next) { NautilusFile *file; char *uri; file = NAUTILUS_FILE (l->data); + /* assume permissions setting allows context setting... + * we can't really do much else due to race conditions anyway */ if (nautilus_file_is_directory (file) && nautilus_file_can_set_permissions (file)) { uri = nautilus_file_get_uri (file); @@ -4146,11 +5067,13 @@ file_permission_mask, dir_permission, dir_permission_mask, + context, set_recursive_permissions_done, window); g_free (uri); } } + g_free (context); } static void @@ -4197,11 +5120,20 @@ } gtk_table_set_row_spacing (page_table, page_table->nrows - 1, 18); - - append_title_value_pair - (window, page_table, _("SELinux Context:"), - "selinux_context", _("--"), - FALSE); + + if (!is_multi_file_window (window) || + multi_have_same_selinux_context (window)) + append_title_selinux_edit_pair + (window, page_table, _("_SELinux Context:"), + "selinux_context", _("--"), + FALSE); + else /* Static text in this case. */ + append_title_value_pair (window, page_table, + _("_SELinux Context:"), + "selinux_context", _("--"), + FALSE); + + append_title_value_pair (window, page_table, _("Last changed:"), "date_permissions", _("--"), Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- nautilus.spec 23 Jan 2007 04:08:24 -0000 1.137 +++ nautilus.spec 23 Jan 2007 11:07:04 -0000 1.138 @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.17.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 @@ -77,7 +77,7 @@ Patch1: nautilus-2.5.7-rhconfig.patch Patch2: nautilus-2.15.2-format.patch Patch3: background-no-delay.patch -Patch5: nautilus-2.16.2-selinux.patch +Patch5: nautilus-2.17.90-selinux.patch Patch6: nautilus-2.16.2-dynamic-search.patch %description @@ -208,6 +208,9 @@ %{_libdir}/*.so %changelog +* Tue Jan 23 2007 Alexander Larsson - 2.17.90-2 +- Fix gnome bug #362302 in selinux patch + * Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 - Update to 2.17.90 From fedora-cvs-commits at redhat.com Tue Jan 23 11:15:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:15:47 -0500 Subject: rpms/nautilus/FC-6 nautilus-2.16.2-selinux2.patch, NONE, 1.1 nautilus.spec, 1.130, 1.131 Message-ID: <200701231115.l0NBFldZ023020@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22969 Modified Files: nautilus.spec Added Files: nautilus-2.16.2-selinux2.patch Log Message: * Tue Jan 23 2007 Alexander Larsson - 2.16.2-7.fc6 - Update selinux patch to fix crash (gnome bugzilla #362302) nautilus-2.16.2-selinux2.patch: libnautilus-private/nautilus-file-operations.c | 71 + libnautilus-private/nautilus-file-operations.h | 1 libnautilus-private/nautilus-file.c | 132 +++ libnautilus-private/nautilus-file.h | 5 src/file-manager/fm-error-reporting.c | 32 src/file-manager/fm-error-reporting.h | 5 src/file-manager/fm-properties-window.c | 1040 +++++++++++++++++++++++-- 7 files changed, 1216 insertions(+), 70 deletions(-) --- NEW FILE nautilus-2.16.2-selinux2.patch --- --- nautilus-2.17.90/libnautilus-private/nautilus-file.c.selinux 2007-01-22 10:10:45.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file.c 2007-01-23 10:04:29.000000000 +0100 @@ -3569,7 +3569,7 @@ * context * @file: NautilusFile representing the file in question. * - * Returns: Newly allocated string ready to display to the user. + * Returns: Newly allocated string ready to display to the user, or NULL. * **/ char * @@ -3602,6 +3602,134 @@ return translated; } +/** + * nautilus_file_get_selinux_matchpathcon: + * + * Get a user-displayable string representing a file's default selinux + * context (as from matchpathcon). Only works on local files. + * @file: NautilusFile representing the file in question. + * + * Returns: Newly allocated string ready to display to the user, or NULL. + * + **/ +char * +nautilus_file_get_selinux_matchpathcon (NautilusFile *file) +{ + char *translated; + char *raw; + char *uri; + char *fname; + + g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); + + translated = NULL; +#ifdef HAVE_SELINUX + uri = nautilus_file_get_uri (file); + fname = gnome_vfs_get_local_path_from_uri (uri); + + if (!fname) { + return NULL; + } + + raw = NULL; + if (matchpathcon (fname, file->details->info->permissions, &raw) == 0) { + if (selinux_raw_to_trans_context (raw, &translated) == 0) { + char *tmp; + tmp = g_strdup (translated); + freecon (translated); + translated = tmp; + } + freecon (raw); + } + + g_free (fname); + g_free (uri); +#endif + + return translated; +} + +static void +set_selinux_context_callback (GnomeVFSAsyncHandle *handle, + GnomeVFSResult result, + GnomeVFSFileInfo *new_info, + gpointer callback_data) +{ + set_permissions_callback (handle, result, new_info, callback_data); +} + +void +nautilus_file_set_selinux_context (NautilusFile *file, + const char *selinux_context, + NautilusFileOperationCallback callback, + gpointer callback_data) +{ + Operation *op; + GnomeVFSURI *vfs_uri; + GnomeVFSFileInfo *partial_file_info; + GnomeVFSFileInfoOptions options; + char *rcontext; + + rcontext = NULL; + + /* this is probably mostly right... */ + if (!nautilus_file_can_set_permissions (file)) { + /* Claim that something changed even if the permission change failed. + * This makes it easier for some clients who see the "reverting" + * to the old permissions as "changing back". + */ + nautilus_file_changed (file); + (* callback) (file, GNOME_VFS_ERROR_ACCESS_DENIED, callback_data); + return; + } + + /* Test the permissions-haven't-changed case explicitly + * because we don't want to send the file-changed signal if + * nothing changed. + */ + if (file->details->info->selinux_context != NULL && + strcmp(selinux_context, file->details->info->selinux_context) == 0) { + (* callback) (file, GNOME_VFS_OK, callback_data); + return; + } + +#ifdef HAVE_SELINUX + /* this is really const, but prototype is wrong, *sigh* */ + if (selinux_trans_to_raw_context((char *)selinux_context, &rcontext)) { + (* callback) (file, GNOME_VFS_ERROR_NO_MEMORY, callback_data); + return; + } + selinux_context = rcontext; +#endif + + /* Set up a context change operation. */ + op = operation_new (file, callback, callback_data); + op->use_slow_mime = file->details->got_slow_mime_type; + + options = NAUTILUS_FILE_DEFAULT_FILE_INFO_OPTIONS; + if (op->use_slow_mime) { + options |= GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE; + } + /* Change the file-on-disk context. */ + partial_file_info = gnome_vfs_file_info_new (); + g_free (partial_file_info->selinux_context); + partial_file_info->selinux_context = g_strdup (selinux_context); + vfs_uri = nautilus_file_get_gnome_vfs_uri (file); + gnome_vfs_async_set_file_info (&op->handle, + vfs_uri, partial_file_info, + GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT, + options, + GNOME_VFS_PRIORITY_DEFAULT, + set_selinux_context_callback, op); + gnome_vfs_file_info_unref (partial_file_info); + gnome_vfs_uri_unref (vfs_uri); + +#ifdef HAVE_SELINUX + freecon (rcontext); +#endif +} + + static char * get_real_name (const char *name, const char *gecos) { @@ -3804,7 +3932,7 @@ GnomeVFSResult result, GnomeVFSFileInfo *new_info, gpointer callback_data) -{ +{ /* FIXME: this is identical to set_permissions_callback */ Operation *op; op = callback_data; --- nautilus-2.17.90/libnautilus-private/nautilus-file.h.selinux 2007-01-11 10:58:31.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file.h 2007-01-23 09:15:44.000000000 +0100 @@ -200,6 +200,7 @@ GList * nautilus_file_get_settable_group_names (NautilusFile *file); gboolean nautilus_file_can_get_selinux_context (NautilusFile *file); char * nautilus_file_get_selinux_context (NautilusFile *file); +char * nautilus_file_get_selinux_matchpathcon (NautilusFile *file); /* "Capabilities". */ gboolean nautilus_file_can_read (NautilusFile *file); @@ -226,6 +227,10 @@ GnomeVFSFilePermissions permissions, NautilusFileOperationCallback callback, gpointer callback_data); +void nautilus_file_set_selinux_context (NautilusFile *file, + const char *selinux_context, + NautilusFileOperationCallback callback, + gpointer callback_data); void nautilus_file_rename (NautilusFile *file, const char *new_name, NautilusFileOperationCallback callback, --- nautilus-2.17.90/libnautilus-private/nautilus-file-operations.c.selinux 2007-01-11 12:36:02.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file-operations.c 2007-01-23 09:15:44.000000000 +0100 @@ -63,6 +63,10 @@ #include "nautilus-trash-monitor.h" #include "nautilus-file-utilities.h" +#ifdef HAVE_SELINUX +#include +#endif + typedef enum TransferKind TransferKind; typedef struct TransferInfo TransferInfo; typedef struct IconPositionIterator IconPositionIterator; @@ -2953,6 +2957,7 @@ GnomeVFSFilePermissions file_mask; GnomeVFSFilePermissions dir_permissions; GnomeVFSFilePermissions dir_mask; + char *context; NautilusSetPermissionsCallback callback; gpointer callback_data; }; @@ -2980,6 +2985,8 @@ GnomeVFSURI *uri; char *uri_str; struct FileInfo *file_info; + int flags; + int options; info = callback_data; @@ -3010,10 +3017,18 @@ vfs_info->permissions = (file_info->permissions & ~info->file_mask) | info->file_permissions; + flags = GNOME_VFS_SET_FILE_INFO_PERMISSIONS; + options = GNOME_VFS_FILE_INFO_DEFAULT; + if (info->context) { + flags |= GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT; + vfs_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SELINUX_CONTEXT; + options |= GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT; + g_free (vfs_info->selinux_context); + vfs_info->selinux_context = g_strdup (info->context); + } gnome_vfs_async_set_file_info (&info->handle, uri, vfs_info, - GNOME_VFS_SET_FILE_INFO_PERMISSIONS, - GNOME_VFS_FILE_INFO_DEFAULT, + flags, options, GNOME_VFS_PRIORITY_DEFAULT, set_permissions_set_file_info, info); @@ -3021,7 +3036,6 @@ gnome_vfs_file_info_unref (vfs_info); g_free (file_info->name); g_free (file_info); - } static void @@ -3066,13 +3080,11 @@ } } - if (result != GNOME_VFS_OK) { /* Finished with this dir, work on the files */ info->current_file = NULL; set_permissions_set_file_info (NULL, GNOME_VFS_OK, NULL, info); } - } /* Also called for the toplevel dir */ @@ -3084,7 +3096,8 @@ { struct RecursivePermissionsInfo *info; char *uri_str; - + int options; + info = callback_data; if (result == GNOME_VFS_OK && handle != NULL) { @@ -3093,9 +3106,13 @@ g_free (uri_str); } + options = GNOME_VFS_FILE_INFO_DEFAULT; + if (info->context) { + options |= GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT; + } gnome_vfs_async_load_directory_uri (&info->handle, info->current_dir, - GNOME_VFS_FILE_INFO_DEFAULT, + options, 50, GNOME_VFS_PRIORITY_DEFAULT, set_permissions_got_files, @@ -3107,6 +3124,8 @@ { struct DirInfo *dir_info; GnomeVFSFileInfo *vfs_info; + int flags; + int options; gnome_vfs_uri_unref (info->current_dir); @@ -3114,6 +3133,7 @@ /* No more directories, finished! */ info->callback (info->callback_data); /* All parts of info should be freed now */ + g_free (info->context); g_free (info); return; } @@ -3128,12 +3148,18 @@ vfs_info->permissions = (dir_info->permissions & ~info->dir_mask) | info->dir_permissions; - - gnome_vfs_async_set_file_info (&info->handle, - info->current_dir, - vfs_info, - GNOME_VFS_SET_FILE_INFO_PERMISSIONS, - GNOME_VFS_FILE_INFO_DEFAULT, + flags = GNOME_VFS_SET_FILE_INFO_PERMISSIONS; + options = GNOME_VFS_FILE_INFO_DEFAULT; + if (info->context) { + flags |= GNOME_VFS_SET_FILE_INFO_SELINUX_CONTEXT; + vfs_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_SELINUX_CONTEXT; + options |= GNOME_VFS_FILE_INFO_GET_SELINUX_CONTEXT; + g_free (vfs_info->selinux_context); + vfs_info->selinux_context = g_strdup (info->context); + } + + gnome_vfs_async_set_file_info (&info->handle, info->current_dir, + vfs_info, flags, options, GNOME_VFS_PRIORITY_DEFAULT, set_permissions_load_dir, info); @@ -3148,6 +3174,7 @@ GnomeVFSFilePermissions file_mask, GnomeVFSFilePermissions dir_permissions, GnomeVFSFilePermissions dir_mask, + const char *context, NautilusSetPermissionsCallback callback, gpointer callback_data) { @@ -3161,6 +3188,22 @@ info->file_mask = file_mask; info->dir_permissions = dir_permissions; info->dir_mask = dir_mask; + if (context) { + char *rcontext; + + rcontext = info->context = NULL; +#ifdef HAVE_SELINUX + /* this is really const, but prototype is wrong, *sigh* */ + if (selinux_trans_to_raw_context((char *)context, &rcontext)) { + g_error ("selinux_trans_to_raw_context: failed to allocate bytes"); + return; + } + info->context = g_strdup (rcontext); + freecon (rcontext); +#endif + } else { + info->context = NULL; + } info->callback = callback; info->callback_data = callback_data; @@ -3168,6 +3211,8 @@ if (info->current_dir == NULL) { info->callback (info->callback_data); + /* All parts of info should be freed now */ + g_free (info->context); g_free (info); return; } --- nautilus-2.17.90/libnautilus-private/nautilus-file-operations.h.selinux 2007-01-03 09:52:25.000000000 +0100 +++ nautilus-2.17.90/libnautilus-private/nautilus-file-operations.h 2007-01-23 09:15:44.000000000 +0100 @@ -76,6 +76,7 @@ GnomeVFSFilePermissions file_mask, GnomeVFSFilePermissions folder_permissions, GnomeVFSFilePermissions folder_mask, + const char *context, NautilusSetPermissionsCallback callback, gpointer callback_data); --- nautilus-2.17.90/src/file-manager/fm-error-reporting.c.selinux 2007-01-03 09:52:12.000000000 +0100 +++ nautilus-2.17.90/src/file-manager/fm-error-reporting.c 2007-01-23 09:15:44.000000000 +0100 @@ -252,6 +252,38 @@ g_free (message); } +void +fm_report_error_setting_selinux (NautilusFile *file, + GnomeVFSResult error, + GtkWindow *parent_window) +{ + char *file_name; + char *message; + + if (error == GNOME_VFS_OK) { + return; + } + + file_name = nautilus_file_get_display_name (file); + + switch (error) { + case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM: + message = g_strdup_printf (_("Couldn't change the SELinux security context of \"%s\" because it is on a read-only disk"), + file_name); + break; + default: + /* We should invent decent error messages for every case we actually experience. */ + g_warning ("Hit unhandled case %d (%s) in fm_report_error_setting_permissions", + error, gnome_vfs_result_to_string (error)); + message = g_strdup_printf (_("Sorry, couldn't change the permissions of \"%s\"."), file_name); + } + + eel_show_error_dialog (_("The SELinux security context could not be changed."), message, parent_window); + + g_free (file_name); + g_free (message); +} + typedef struct _FMRenameData { char *name; NautilusFileOperationCallback callback; --- nautilus-2.17.90/src/file-manager/fm-error-reporting.h.selinux 2007-01-03 09:52:12.000000000 +0100 +++ nautilus-2.17.90/src/file-manager/fm-error-reporting.h 2007-01-23 09:15:44.000000000 +0100 @@ -39,7 +39,10 @@ GnomeVFSResult error_code, GtkWindow *parent_window); void fm_report_error_setting_permissions (NautilusFile *file, - GnomeVFSResult error_code, + GnomeVFSResult error_code, + GtkWindow *parent_window); +void fm_report_error_setting_selinux (NautilusFile *file, + GnomeVFSResult error_code, GtkWindow *parent_window); void fm_report_error_setting_owner (NautilusFile *file, GnomeVFSResult error_code, --- nautilus-2.17.90/src/file-manager/fm-properties-window.c.selinux 2007-01-11 11:53:01.000000000 +0100 +++ nautilus-2.17.90/src/file-manager/fm-properties-window.c 2007-01-23 09:15:44.000000000 +0100 @@ -83,6 +83,10 @@ #include #include +#ifdef HAVE_SELINUX +# include +#endif + #define PREVIEW_IMAGE_WIDTH 96 #define ROW_PAD 6 @@ -102,7 +106,7 @@ GtkWidget *icon_button; GtkWidget *icon_image; - GtkWidget *icon_chooser; + GtkWidget *icon_chooser; GtkWidget *name_label; GtkWidget *name_field; @@ -124,12 +128,15 @@ unsigned int owner_change_timeout; GList *permission_buttons; - GList *permission_combos; + GList *permission_combos; /* how is this deallocated???? */ + GList *selinux_combo; GHashTable *initial_permissions; gboolean has_recursive_apply; GList *value_fields; + GList *edit_fields; + GList *mime_list; gboolean deep_count_finished; @@ -208,6 +215,10 @@ GtkComboBox *combo); static void value_field_update (FMPropertiesWindow *window, GtkLabel *field); +static void edit_field_update (FMPropertiesWindow *window, + GtkEntry *field); +static void popup_field_update (FMPropertiesWindow *window, + GtkComboBox *entry); static void properties_window_update (FMPropertiesWindow *window, GList *files); static void is_directory_ready_callback (NautilusFile *file, @@ -235,10 +246,32 @@ int row, int column, const char *initial_text); +static void attach_selinux_data_edit_field (GtkEntry *entry, + char *attr_value, + char *def_attr_value); +static void attach_selinux_data_popup_field (GtkComboBox *comb, + char *attr_val, + char *def_attr_val); + G_DEFINE_TYPE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW); #define parent_class fm_properties_window_parent_class +static void +maybe_gtk_entry_set_text (GtkEntry *entry, const char *val) +{ + char *old_val; + + g_assert (GTK_IS_ENTRY (entry)); + + old_val = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + + if (strcmp (old_val, val) != 0) { + gtk_entry_set_text (entry, val); + } + g_free(old_val); +} + static gboolean is_multi_file_window (FMPropertiesWindow *window) { @@ -259,6 +292,39 @@ return FALSE; } +static gboolean +multi_have_same_selinux_context (FMPropertiesWindow *window) +{ + GList *l; + char *cntx; + + cntx = NULL; + for (l = window->details->original_files; l != NULL; l = l->next) { + NautilusFile *file; + + file = NAUTILUS_FILE (l->data); + if (!nautilus_file_is_gone (file)) { + char *tmp; + + tmp = nautilus_file_get_string_attribute_with_default (file, "selinux_context"); + if (!cntx) { + cntx = tmp; + } else if (strcmp (cntx, tmp)) { + g_free (tmp); + g_free (cntx); + return FALSE; + } + else { + g_free (tmp); + } + } + } + + g_free (cntx); + + return TRUE; +} + static int get_not_gone_original_file_count (FMPropertiesWindow *window) { @@ -496,7 +562,7 @@ return; } - uris = g_strsplit (selection_data->data, "\r\n", 0); + uris = g_strsplit ((char *) selection_data->data, "\r\n", 0); exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0'); @@ -577,7 +643,7 @@ static void set_name_field (FMPropertiesWindow *window, const gchar *original_name, - const gchar *name) + const gchar *name) { gboolean new_widget; gboolean use_label; @@ -643,11 +709,7 @@ * currently showing. This causes minimal ripples (e.g. * selection change). */ - gchar *displayed_name = gtk_editable_get_chars (GTK_EDITABLE (window->details->name_field), 0, -1); - if (strcmp (displayed_name, name) != 0) { - gtk_entry_set_text (GTK_ENTRY (window->details->name_field), name); - } - g_free (displayed_name); + maybe_gtk_entry_set_text (GTK_ENTRY (window->details->name_field), name); } } } @@ -723,7 +785,6 @@ name_field_restore_original_name (NautilusEntry *name_field) { const char *original_name; - char *displayed_name; original_name = (const char *) g_object_get_data (G_OBJECT (name_field), "original_name"); @@ -732,14 +793,8 @@ return; } - displayed_name = gtk_editable_get_chars (GTK_EDITABLE (name_field), 0, -1); - - if (strcmp (original_name, displayed_name) != 0) { - gtk_entry_set_text (GTK_ENTRY (name_field), original_name); - } + maybe_gtk_entry_set_text (GTK_ENTRY (name_field), original_name); nautilus_entry_select_all (name_field); - - g_free (displayed_name); } static void @@ -852,7 +907,7 @@ word = g_list_find_custom (keywords, keyword, (GCompareFunc) strcmp); eel_g_list_free_deep (keywords); - return (word != NULL); + return word != NULL; } static void @@ -1119,7 +1174,7 @@ b = b->next; } - return (a == b); + return a == b; } static GList * @@ -1201,6 +1256,14 @@ for (l = window->details->value_fields; l != NULL; l = l->next) { value_field_update (window, GTK_LABEL (l->data)); } + + for (l = window->details->edit_fields; l != NULL; l = l->next) { + edit_field_update (window, GTK_ENTRY (l->data)); + } + + for (l = window->details->selinux_combo; l != NULL; l = l->next) { + popup_field_update (window, GTK_COMBO_BOX (l->data)); + } } mime_list = get_mime_list (window); @@ -1381,6 +1444,111 @@ ellipsize_text); } +static void +edit_field_update_internal (GtkEntry *entry, + GList *file_list) +{ + const char *attr_name; + char *attr_value; + char *def_attr_value; + char *inconsistent_string; + + g_assert (GTK_IS_ENTRY (entry)); + + attr_name = g_object_get_data (G_OBJECT (entry), "file_attribute"); + inconsistent_string = g_object_get_data (G_OBJECT (entry), + "inconsistent_string"); + def_attr_value = g_object_get_data (G_OBJECT (entry), + "matchpathcon_cntx"); + + attr_value = file_list_get_string_attribute (file_list, attr_name, + inconsistent_string); + + maybe_gtk_entry_set_text (GTK_ENTRY (entry), attr_value); + + /* JFIXME: this isn't generic, *sigh* ... */ + attach_selinux_data_edit_field (entry, attr_value, def_attr_value); + g_free (attr_value); +} + +static void +edit_field_update (FMPropertiesWindow *window, GtkEntry *entry) +{ + gboolean use_original; + + if (gtk_widget_is_focus (GTK_WIDGET (entry))) { + return; + } + + use_original = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry), "show_original")); + + edit_field_update_internal (entry, + (use_original ? + window->details->original_files : + window->details->target_files)); +} + +static void +popup_field_update_internal (GtkComboBox *combo, + GList *file_list) +{ + const char *attr_name; + char *attr_value; + char *def_attr_value; + char *inconsistent_string; + char *cntx_type; + GtkTreeIter iter; + + g_assert (GTK_IS_COMBO_BOX (combo)); + + if (gtk_widget_is_focus (GTK_WIDGET (combo))) { + return; + } + + attr_name = g_object_get_data (G_OBJECT (combo), "file_attribute"); + inconsistent_string = g_object_get_data (G_OBJECT (combo), + "inconsistent_string"); + def_attr_value = g_object_get_data (G_OBJECT (combo), + "matchpathcon_cntx"); + + attr_value = file_list_get_string_attribute (file_list, attr_name, + inconsistent_string); + + /* JFIXME: this isn't generic, *sigh* ... */ + + if (gtk_combo_box_get_active_iter (combo, &iter)) { + GtkTreeModel *model = gtk_combo_box_get_model (combo); + + /* don't update, if it's identical */ + gtk_tree_model_get (model, &iter, 0, &cntx_type, -1); + if (cntx_type && strcmp (cntx_type, attr_value) == 0) { + g_free (attr_value); + return; + } + } + + attach_selinux_data_popup_field (combo, attr_value, def_attr_value); + + g_free (attr_value); +} + +static void +popup_field_update (FMPropertiesWindow *window, GtkComboBox *combo) +{ + gboolean use_original; + + if (window->details->selinux_combo) { + return; /* FIXME: must be true: horrible UI, if working */ + } + + use_original = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "show_original")); + + popup_field_update_internal (combo, + (use_original ? + window->details->original_files : + window->details->target_files)); +} + static GtkLabel * attach_label (GtkTable *table, int row, @@ -1432,6 +1600,45 @@ return attach_label (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE); } +static GtkEntry * +attach_edit (GtkTable *table, + int row, + int column, + const char *initial_text, + gboolean right_aligned, + gboolean bold, + gboolean ellipsize_text, + gboolean selectable, + gboolean mnemonic) +{ + GtkWidget *entry_field; + + entry_field = nautilus_entry_new (); + gtk_entry_set_text (GTK_ENTRY (entry_field), initial_text); + + gtk_entry_set_alignment (GTK_ENTRY (entry_field), right_aligned ? 1 : 0); + gtk_widget_show (entry_field); + gtk_table_attach (table, entry_field, + column, column + 1, + row, row + 1, + ellipsize_text + ? GTK_FILL | GTK_EXPAND + : GTK_FILL, + 0, + 0, 0); + + return GTK_ENTRY (entry_field); +} + +static GtkEntry * +attach_edit_label (GtkTable *table, + int row, + int column, + const char *initial_text) +{ + return attach_edit (table, row, column, initial_text, FALSE, FALSE, FALSE, TRUE, FALSE); +} + static GtkLabel * attach_ellipsizing_value_label (GtkTable *table, int row, @@ -1491,6 +1698,672 @@ FALSE); } +static void +start_long_operation (FMPropertiesWindow *window) +{ + if (window->details->long_operation_underway == 0) { + /* start long operation */ + GdkCursor * cursor; + + cursor = gdk_cursor_new (GDK_WATCH); + gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); + gdk_cursor_unref (cursor); + } + window->details->long_operation_underway ++; +} + +static void +end_long_operation (FMPropertiesWindow *window) +{ + if (GTK_WIDGET (window)->window != NULL && + window->details->long_operation_underway == 1) { + /* finished !! */ + gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); + } + window->details->long_operation_underway--; +} + +static void +selinux_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callback_data) +{ + FMPropertiesWindow *window; + g_assert (callback_data != NULL); + + window = FM_PROPERTIES_WINDOW (callback_data); + end_long_operation (window); + + /* Report the error if it's an error. */ + fm_report_error_setting_selinux (file, result, NULL); + + g_object_unref (window); +} + +static void +selinux_done_editing (FMPropertiesWindow *window, char *selinux_context) +{ + GList *l; + + /* Accept changes. */ + for (l = window->details->target_files; l != NULL; l = l->next) { + NautilusFile *file; + + file = NAUTILUS_FILE (l->data); + + start_long_operation (window); + g_object_ref (window); + nautilus_file_set_selinux_context (file, selinux_context, + selinux_change_callback, + window); + } +} + +static gboolean +selinux_focus_out (NautilusEntry *entry, GdkEventFocus *event, gpointer cb_data) +{ + g_assert (NAUTILUS_IS_ENTRY (entry)); + g_assert (FM_IS_PROPERTIES_WINDOW (cb_data)); + + if (GTK_WIDGET_SENSITIVE (entry)) { + char *tmp; + + tmp = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + selinux_done_editing (FM_PROPERTIES_WINDOW (cb_data), tmp); + g_free (tmp); + } + + return FALSE; +} + +static void +selinux_entry_activate (NautilusEntry *entry, gpointer cb_data) +{ + char *tmp; + + g_assert (NAUTILUS_IS_ENTRY (entry)); + g_assert (FM_IS_PROPERTIES_WINDOW (cb_data)); + + tmp = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1); + selinux_done_editing (FM_PROPERTIES_WINDOW (cb_data), tmp); + g_free (tmp); + + nautilus_entry_select_all_at_idle (entry); +} + +/* NOTE: This modifies cntx */ +static void +selinux_split_cntx (char *cntx, + const char **ret_attr_u, + const char **ret_attr_r, + const char **ret_attr_t, + const char **ret_attr_s) +{ + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + + attr_u = cntx; + if (!(attr_r = strchr (attr_u, ':'))) { + attr_r = "object_r"; /* shouldn't happen */ + } else { + *((char *)attr_r++) = 0; + } + + if (!(attr_t = strchr (attr_r, ':'))) { + attr_t = "file_t"; /* shouldn't happen */ + } else { + *((char *)attr_t++) = 0; + } + + if ((attr_s = strchr (attr_t, ':'))) { + *((char *)attr_s++) = 0; + } + + *ret_attr_u = attr_u; + *ret_attr_r = attr_r; + *ret_attr_t = attr_t; + *ret_attr_s = attr_s; +} + +static void +selinux_popup_activate (GtkComboBox *comb, gpointer cb_data) +{ + char *cntx_type; + char *orig_type; + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + char *tmp; + GtkTreeIter iter; + + g_assert (GTK_IS_COMBO_BOX (comb)); + g_assert (FM_IS_PROPERTIES_WINDOW (cb_data)); + + if (!gtk_combo_box_get_active_iter (comb, &iter)) { + return; + } else { + + GtkTreeModel *model = gtk_combo_box_get_model (comb); + gtk_tree_model_get (model, &iter, 0, &cntx_type, -1); + } + + if (!(orig_type = g_object_get_data (G_OBJECT (comb), + "original_cntx"))) { + return; + } + orig_type = g_strdup (orig_type); + + selinux_split_cntx (orig_type, &attr_u, &attr_r, &attr_t, &attr_s); + tmp = g_strjoin (":", attr_u, attr_r, cntx_type, attr_s, NULL); + g_free (orig_type); + + selinux_done_editing (FM_PROPERTIES_WINDOW (cb_data), tmp); + g_free (tmp); +} + +static char * +cust_type_next_line (GIOChannel *ioc_ctypes) +{ + char *data; + gsize term; + GError *errc; + + data = NULL; + term = 0; + errc = NULL; + + if (G_IO_STATUS_NORMAL == g_io_channel_read_line (ioc_ctypes, &data, + NULL, &term, &errc)) { + data[term] = 0; + return data; + } + + return NULL; +} + +static GSList * +selinux__type_list (void) +{ + static GSList *cust_types; + static time_t file_mtime; + const char *fname_ctypes; + struct stat buf; + GIOChannel *ioc_ctypes; + GError *errc; + GSList *scan; + int fd; + +#ifndef HAVE_SELINUX + if (cust_types) { + return cust_types; + } +#else + fname_ctypes = selinux_customizable_types_path (); + if (cust_types && file_mtime && !stat (fname_ctypes, &buf) && + (file_mtime == buf.st_mtime)) { + return cust_types; + } +#endif + + if (cust_types) { + for (scan = cust_types; scan; scan = scan->next) { + g_free (scan->data); + } + g_slist_free (cust_types); + cust_types = NULL; + } + + cust_types = g_slist_prepend (cust_types, g_strdup ("tmp_t")); + cust_types = g_slist_prepend (cust_types, g_strdup ("user_home_t")); + /* cust_types = g_slist_prepend (cust_types, g_strdup ("user_tmp_t")); */ + +#ifdef HAVE_SELINUX + /* read types, one per line... */ + fname_ctypes = selinux_customizable_types_path (); + errc = NULL; + if ((ioc_ctypes = g_io_channel_new_file (fname_ctypes, "r", &errc))) { + char *data = NULL; + + while ((data = cust_type_next_line (ioc_ctypes))) { + cust_types = g_slist_prepend (cust_types, data); + } + + fd = g_io_channel_unix_get_fd (ioc_ctypes); + if (!fstat (fd, &buf)) { + file_mtime = buf.st_mtime; + } + + g_io_channel_unref (ioc_ctypes); + } +#endif + + return cust_types; +} + +static void +attach_selinux_data_edit_field (GtkEntry *entry, + char *attr_val, char *def_attr_val) +{ + GtkEntryCompletion *comp; + GtkCellRenderer *cell; + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + const char *dattr_u; + const char *dattr_r; + const char *dattr_t; + const char *dattr_s; + GtkListStore *store; + GtkTreeIter iter; + GSList *scan; + int width; + int owidth; + int twidth; + + attr_val = g_strdup (attr_val); /* so we can alter it... */ + def_attr_val = g_strdup (def_attr_val); /* so we can alter it... */ + + /* do completion, so you don't have to type everything... */ + comp = gtk_entry_completion_new (); + store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), + 0, GTK_SORT_ASCENDING); + + gtk_entry_completion_set_model (comp, GTK_TREE_MODEL (store)); + cell = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comp), cell, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comp), cell, + "stock-id", 1, NULL); + gtk_entry_completion_set_text_column (comp, 0); + gtk_entry_set_completion (entry, comp); + + /* FIXME: default doesn't do the right thing, should it? */ + owidth = gtk_entry_get_width_chars (entry); + width = owidth; + + selinux_split_cntx (attr_val, &attr_u, &attr_r, &attr_t, &attr_s); + dattr_u = dattr_r = dattr_t = dattr_s = NULL; + if (def_attr_val) { + selinux_split_cntx (def_attr_val, &dattr_u, &dattr_r, + &dattr_t, &dattr_s); + } + + /* don't do it twice... */ + if (attr_t && dattr_t && !strcmp (attr_t, dattr_t)) { + dattr_t = NULL; + } + + if (attr_t) { + /* highlight just the type to the end, so we can easily change it + * FIXME: we also highlight any Sensitivity/MCS but completion will + * let people put it back, and that's the only way we get completion + * at all -- This sucks and we need to remove Sensitivity/MCS from + * the edit box. Yah, more UI. */ + int beg = attr_t - attr_u; + gtk_editable_select_region (GTK_EDITABLE (entry), beg, -1); + } + + for (scan = selinux__type_list(); scan; scan = scan->next) { + char *tmp; + + if (attr_t && !strcmp (attr_t, scan->data)) + continue; /* don't have two entries */ + + if (dattr_t && !strcmp (dattr_t, scan->data)) + continue; /* don't have two entries */ + + gtk_list_store_append (store, &iter); + tmp = g_strjoin (":", attr_u, attr_r, scan->data, attr_s, NULL); + gtk_list_store_set (store, &iter, 0, tmp, -1); + + twidth = strlen (tmp); + width = MAX (twidth, width); + + g_free (tmp); + } + + if (dattr_t) { + char *tmp; + + gtk_list_store_append (store, &iter); + tmp = g_strjoin (":", dattr_u, dattr_r, dattr_t, dattr_s, NULL); + gtk_list_store_set (store, &iter, 0, tmp, + 1, GTK_STOCK_HOME, -1); + + twidth = strlen (tmp); + width = MAX (twidth, width); + + g_free (tmp); + } + + if (attr_t) { + char *tmp; + + gtk_list_store_append (store, &iter); + tmp = g_strjoin (":", attr_u, attr_r, attr_t, attr_s, NULL); + gtk_list_store_set (store, &iter, 0, tmp, 1, GTK_STOCK_OK, -1); + + twidth = strlen (tmp); + width = MAX (twidth, width); + + g_free (tmp); + } + + g_free (attr_val); + g_free (def_attr_val); + g_object_unref (G_OBJECT (store)); + g_object_unref (G_OBJECT (comp)); + + if (width != owidth) { + gtk_entry_set_width_chars (entry, width + 2); + } +} + +# define HACK_TYPE(x, y) \ + else if (!strcmp (nice_type, x)) nice_type = y + +/* hack to convert a selinux_context type into a readable string for the + user */ +static const char * +selinux__hack_conv_type (const char *type) +{ /* FIXME: hack attack, but nowhere else to put it. Because mathpathcon + * here now probably want a bunch of other types? */ + const char *nice_type; + + nice_type = type; + + if (0) { } + + HACK_TYPE("cupsd_etc_t", _("CUPS printer configuration")); + HACK_TYPE("cupsd_rw_etc_t", _("CUPS printer configuration (rw)")); + HACK_TYPE("cupsd_tmp_t", _("CUPS temporary data")); + HACK_TYPE("dhcp_etc_t", _("DHCP configuration")); + HACK_TYPE("dictd_etc_t", _("Dictd configuration")); + HACK_TYPE("dnssec_t", _("DNS secret")); + HACK_TYPE("etc_t", _("System configuration")); + HACK_TYPE("etc_aliases_t", _("Email aliases configuration")); + HACK_TYPE("etc_runtime_t", _("System configuration (rw)")); + HACK_TYPE("cvs_data_t", _("Read and write from CVS daemon")); + HACK_TYPE("httpd_config_t", _("Apache-httpd configuration")); + HACK_TYPE("httpd_php_tmp_t", + _("Apache-httpd PHP module temporary data")); + HACK_TYPE("httpd_sys_content_t", + _("Read from all httpd scripts and the daemon")); + HACK_TYPE("httpd_sys_htaccess_t", + _("Apache-httpd .htaccess configuration")); + HACK_TYPE("httpd_sys_script_exec_t", + _("CGI programs with default access")); + HACK_TYPE("httpd_sys_script_ra_t", + _("CGI programs can read and append")); + HACK_TYPE("httpd_sys_script_ro_t", + _("CGI programs can read")); + HACK_TYPE("httpd_sys_script_rw_t", + _("CGI programs can read and write")); + HACK_TYPE("httpd_unconfined_script_exec_t", + _("CGI programs without any SELinux protection")); + HACK_TYPE("httpd_tmp_t", _("Apache-httpd temporary data")); + HACK_TYPE("ice_tmp_t", _("ICE temporary data")); + HACK_TYPE("locale_t", _("Locale data")); + HACK_TYPE("mysql_tmp_t", _("MySQL temporary data")); + HACK_TYPE("named_conf_t", _("Nameserver configuration")); + HACK_TYPE("net_conf_t", _("Network configuration")); + HACK_TYPE("postgresql_tmp_t", _("Postgresql temporary data")); + HACK_TYPE("public_content_rw_t", + _("Read and write from CIFS/ftp/http/nfs/rsync")); + HACK_TYPE("public_content_t", _("Read from CIFS/ftp/http/nfs/rsync")); + HACK_TYPE("samba_etc_t", _("Samba configuration")); + HACK_TYPE("samba_share_t", _("Shared via CIFS (samba)")); + HACK_TYPE("staff_home_t", _("Staff user data")); + HACK_TYPE("staff_home_dir_t", _("Staff user home directory")); + HACK_TYPE("swapfile_t", _("System swapfile")); + HACK_TYPE("sysadm_home_t", _("Sysadmin user data")); + HACK_TYPE("sysadm_home_dir_t", _("Sysadmin user home directory")); + HACK_TYPE("system_cron_spool_t", _("Cron data")); + HACK_TYPE("tmp_t", _("Temporary data")); + HACK_TYPE("user_tmp_t", _("User temporary data")); + HACK_TYPE("user_home_t", _("User data")); + HACK_TYPE("user_home_dir_t", _("User home directory")); + HACK_TYPE("var_log_t", _("Logfile")); + HACK_TYPE("xen_image_t", _("Xen image")); + + return nice_type; +} +#undef HACK_TYPE + +static void +attach_selinux_data_popup_field (GtkComboBox *comb, + char *attr_val, + char *def_attr_val) +{ + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + const char *dattr_u; + const char *dattr_r; + const char *dattr_t; + const char *dattr_s; + GtkListStore *store; + GtkTreeIter iter; + GSList *scan; + + attr_val = g_strdup (attr_val); /* so we can alter it... */ + def_attr_val = g_strdup (def_attr_val); + + /* do completion, so you don't have to type everything... */ + store = gtk_list_store_new (3, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), + 1, GTK_SORT_ASCENDING); + + gtk_combo_box_set_model (comb, GTK_TREE_MODEL (store)); + + selinux_split_cntx (attr_val, &attr_u, &attr_r, &attr_t, &attr_s); + dattr_u = dattr_r = dattr_t = dattr_s = NULL; + if (def_attr_val) { + selinux_split_cntx (def_attr_val, &dattr_u, &dattr_r, + &dattr_t, &dattr_s); + } + /* don't do it twice... */ + if (attr_t && dattr_t && !strcmp (attr_t, dattr_t)) { + dattr_t = NULL; + } + + for (scan = selinux__type_list(); scan; scan = scan->next) { + const char *nice_type; + + if (attr_t && !strcmp (attr_t, scan->data)) + continue; /* don't have two entries */ + + if (dattr_t && !strcmp (dattr_t, scan->data)) + continue; /* don't have two entries */ + + nice_type = selinux__hack_conv_type(scan->data); + + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, scan->data, + 1, nice_type, -1); + } + + if (dattr_t) { + const char *nice_type; + + gtk_list_store_append (store, &iter); + nice_type = selinux__hack_conv_type(dattr_t); + gtk_list_store_set (store, &iter, 0, dattr_t, 1, nice_type, + 2, GTK_STOCK_HOME, -1); + } + + if (attr_t) { + const char *nice_type; + + gtk_list_store_append (store, &iter); + nice_type = selinux__hack_conv_type(attr_t); + gtk_list_store_set (store, &iter, 0, attr_t, 1, nice_type, + 2, GTK_STOCK_OK, -1); + gtk_combo_box_set_active_iter (comb, &iter); + } + + g_free (attr_val); + g_free (def_attr_val); + g_object_unref (G_OBJECT (store)); +} + +static char * +selinux__matchpathcon (GList *file_list) +{ + GList *scan; + + for (scan = file_list; scan != NULL; scan = scan->next) { + NautilusFile *file; + + file = NAUTILUS_FILE (scan->data); + if (!nautilus_file_is_gone (file)) { + return nautilus_file_get_selinux_matchpathcon (file); + } + } + + return NULL; +} + +static void +attach_selinux_edit_field (FMPropertiesWindow *window, + GtkTable *table, + int row, + int column, + const char *file_attribute_name, + const char *inconsistent_string, + gboolean show_original, + GtkLabel *lab_title) +{ + GtkEntry *entry; + GList *file_list; + char *attr_value; + char *def_attr_value; + + if (show_original) { + file_list = window->details->original_files; + } else { + file_list = window->details->target_files; + } + + attr_value = file_list_get_string_attribute (file_list, + file_attribute_name, + inconsistent_string); + if ( strcmp (attr_value, inconsistent_string) && + !strcmp (file_attribute_name, "selinux_context")) { + def_attr_value = selinux__matchpathcon (file_list); + } else { + def_attr_value = NULL; + } + + entry = attach_edit_label (table, row, column, attr_value); + gtk_label_set_mnemonic_widget (GTK_LABEL (lab_title), + GTK_WIDGET (entry)); + + /* Stash a copy of the file attribute name in this field for the callback's sake. */ + g_object_set_data_full (G_OBJECT (entry), "file_attribute", + g_strdup (file_attribute_name), g_free); + + g_object_set_data_full (G_OBJECT (entry), "inconsistent_string", + g_strdup (inconsistent_string), g_free); + + g_object_set_data (G_OBJECT (entry), "show_original", GINT_TO_POINTER (show_original)); + g_object_set_data (G_OBJECT (entry), "ellipsize_text", GINT_TO_POINTER (FALSE)); + + g_signal_connect_object (entry, "focus_out_event", + G_CALLBACK (selinux_focus_out), window, 0); + g_signal_connect_object (entry, "activate", + G_CALLBACK (selinux_entry_activate), window,0); + + attach_selinux_data_edit_field (entry, attr_value, def_attr_value); + + g_object_set_data_full (G_OBJECT (entry), "original_cntx", attr_value, + g_free); + + g_object_set_data_full (G_OBJECT (entry), "matchpathcon_cntx", + def_attr_value, g_free); + + window->details->edit_fields = g_list_prepend (window->details->edit_fields, + entry); +} + +static void +attach_selinux_popup_field (FMPropertiesWindow *window, + GtkTable *table, + int row, + int column, + const char *file_attribute_name, + const char *inconsistent_string, + gboolean show_original, + GtkLabel *lab_title) +{ + GtkWidget *comb; + GtkCellRenderer *cell; + GList *file_list; + char *attr_value; + char *def_attr_value; + + if (show_original) { + file_list = window->details->original_files; + } else { + file_list = window->details->target_files; + } + + attr_value = file_list_get_string_attribute (file_list, + file_attribute_name, + inconsistent_string); + if ( strcmp (attr_value, inconsistent_string) && + !strcmp (file_attribute_name, "selinux_context")) { + def_attr_value = selinux__matchpathcon (file_list); + } else { + def_attr_value = NULL; + } + + comb = gtk_combo_box_new (); + + gtk_table_attach (table, comb, column, column + 1, row, row + 1, + GTK_FILL, 0, 0, 0); + + + gtk_label_set_mnemonic_widget (GTK_LABEL (lab_title), comb); + + /* Stash a copy of the file attribute name in this field for the callback's sake. */ + g_object_set_data_full (G_OBJECT (comb), "file_attribute", + g_strdup (file_attribute_name), g_free); + + g_object_set_data (G_OBJECT (comb), "show_original", GINT_TO_POINTER (show_original)); + + attach_selinux_data_popup_field (GTK_COMBO_BOX (comb), + attr_value, def_attr_value); + + g_signal_connect_object (comb, "changed", + G_CALLBACK (selinux_popup_activate), window, 0); + + g_object_set_data_full (G_OBJECT (comb), "original_cntx", attr_value, + g_free); + + g_object_set_data_full (G_OBJECT (comb), "matchpathcon_cntx", + def_attr_value, g_free); + + cell = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comb), cell, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comb), cell, + "stock-id", 2, NULL); + cell = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (comb), cell, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (comb), cell, + "text", 1, NULL); + gtk_widget_show (comb); + + g_assert (! window->details->selinux_combo); + + window->details->selinux_combo = + g_list_prepend (window->details->selinux_combo, comb); +} + static GtkWidget* attach_ellipsizing_value_field (FMPropertiesWindow *window, GtkTable *table, @@ -2441,6 +3314,36 @@ } static guint +append_title_selinux_edit_pair (FMPropertiesWindow *window, + GtkTable *table, + const char *title, + const char *file_attribute_name, + const char *inconsistent_state, + gboolean show_original) +{ + guint last_row; + GtkLabel *lab_title; + + lab_title = NULL; + last_row = append_title_field (table, title, &lab_title); + + if (window->details->advanced_permissions) { + attach_selinux_edit_field (window, table, last_row, + VALUE_COLUMN, file_attribute_name, + inconsistent_state, + show_original, lab_title); + } else { + + attach_selinux_popup_field (window, table, last_row, + VALUE_COLUMN, file_attribute_name, + inconsistent_state, + show_original, lab_title); + } + + return last_row; +} + +static guint append_title_and_ellipsizing_value (FMPropertiesWindow *window, GtkTable *table, const char *title, @@ -2902,31 +3805,6 @@ } static void -start_long_operation (FMPropertiesWindow *window) -{ - if (window->details->long_operation_underway == 0) { - /* start long operation */ - GdkCursor * cursor; - - cursor = gdk_cursor_new (GDK_WATCH); - gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); - gdk_cursor_unref (cursor); - } - window->details->long_operation_underway ++; -} - -static void -end_long_operation (FMPropertiesWindow *window) -{ - if (GTK_WIDGET (window)->window != NULL && - window->details->long_operation_underway == 1) { - /* finished !! */ - gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); - } - window->details->long_operation_underway--; -} - -static void permission_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callback_data) { FMPropertiesWindow *window; @@ -4053,14 +4931,16 @@ GnomeVFSFilePermissions file_permission, file_permission_mask; GnomeVFSFilePermissions dir_permission, dir_permission_mask; GnomeVFSFilePermissions vfs_mask, vfs_new_perm, p; - GtkWidget *button, *combo; + char *context; + GtkWidget *button; + GtkComboBox *combo; gboolean active, is_folder, is_special, use_original; GList *l; GtkTreeModel *model; GtkTreeIter iter; PermissionType type; int new_perm, mask; - + file_permission = 0; file_permission_mask = 0; dir_permission = 0; @@ -4097,9 +4977,9 @@ } /* Simple mode, minus exec checkbox */ for (l = window->details->permission_combos; l != NULL; l = l->next) { - combo = l->data; + combo = GTK_COMBO_BOX (l->data); - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) { + if (!gtk_combo_box_get_active_iter (combo, &iter)) { continue; } @@ -4107,7 +4987,7 @@ is_folder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "is-folder")); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); + model = gtk_combo_box_get_model (combo); gtk_tree_model_get (model, &iter, 1, &new_perm, 2, &use_original, -1); if (use_original) { continue; @@ -4130,12 +5010,53 @@ } } + /* get the SELinux context... */ + context = NULL; + if (window->details->advanced_permissions && + window->details->edit_fields) { /* advanced mode */ + GtkEditable *efield; + + efield = window->details->edit_fields->data; + context = gtk_editable_get_chars (GTK_EDITABLE (efield), 0, -1); + } else if (!window->details->advanced_permissions && + window->details->selinux_combo) { /* simple mode */ + char *cntx_type; + char *orig_type; + const char *attr_u; + const char *attr_r; + const char *attr_t; + const char *attr_s; + + combo = GTK_COMBO_BOX (window->details->selinux_combo->data); + + if (!gtk_combo_box_get_active_iter (combo, &iter)) { + return; + } else { + GtkTreeModel *model = gtk_combo_box_get_model (combo); + gtk_tree_model_get (model, &iter, 0, &cntx_type, -1); + } + if (!(orig_type = g_object_get_data (G_OBJECT (combo), + "original_cntx"))) { + return; + } + + orig_type = g_strdup (orig_type); + + selinux_split_cntx (orig_type, + &attr_u, &attr_r, &attr_t, &attr_s); + context = g_strjoin (":", + attr_u, attr_r, cntx_type, attr_s, NULL); + g_free (orig_type); + } + for (l = window->details->target_files; l != NULL; l = l->next) { NautilusFile *file; char *uri; file = NAUTILUS_FILE (l->data); + /* assume permissions setting allows context setting... + * we can't really do much else due to race conditions anyway */ if (nautilus_file_is_directory (file) && nautilus_file_can_set_permissions (file)) { uri = nautilus_file_get_uri (file); @@ -4146,11 +5067,13 @@ file_permission_mask, dir_permission, dir_permission_mask, + context, set_recursive_permissions_done, window); g_free (uri); } } + g_free (context); } static void @@ -4197,11 +5120,20 @@ } gtk_table_set_row_spacing (page_table, page_table->nrows - 1, 18); - - append_title_value_pair - (window, page_table, _("SELinux Context:"), - "selinux_context", _("--"), - FALSE); + + if (!is_multi_file_window (window) || + multi_have_same_selinux_context (window)) + append_title_selinux_edit_pair + (window, page_table, _("_SELinux Context:"), + "selinux_context", _("--"), + FALSE); + else /* Static text in this case. */ + append_title_value_pair (window, page_table, + _("_SELinux Context:"), + "selinux_context", _("--"), + FALSE); + + append_title_value_pair (window, page_table, _("Last changed:"), "date_permissions", _("--"), Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/FC-6/nautilus.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- nautilus.spec 14 Nov 2006 15:15:45 -0000 1.130 +++ nautilus.spec 23 Jan 2007 11:15:45 -0000 1.131 @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME. Version: 2.16.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 @@ -79,7 +79,7 @@ Patch1: nautilus-2.5.7-rhconfig.patch Patch2: nautilus-2.15.2-format.patch Patch3: background-no-delay.patch -Patch5: nautilus-2.16.2-selinux.patch +Patch5: nautilus-2.16.2-selinux2.patch Patch6: nautilus-2.16.2-dynamic-search.patch Patch7: nautilus-2.16.2-icons-overlap-revert.patch # From upstream @@ -213,6 +213,9 @@ %{_libdir}/*.so %changelog +* Tue Jan 23 2007 Alexander Larsson - 2.16.2-7.fc6 +- Update selinux patch to fix crash (gnome bugzilla #362302) + * Tue Nov 14 2006 Matthias Clasen - 2.16.2-6 - Detect tracker dynamically, too From fedora-cvs-commits at redhat.com Tue Jan 23 11:21:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:21:58 -0500 Subject: rpms/vim/devel 7.0.187,1.1,1.2 Message-ID: <200701231121.l0NBLwR9015618@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15574 Modified Files: 7.0.187 Log Message: - needed to modify this patch as it collides with the runtime-update patch Index: 7.0.187 =================================================================== RCS file: /cvs/dist/rpms/vim/devel/7.0.187,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 7.0.187 23 Jan 2007 10:52:12 -0000 1.1 +++ 7.0.187 23 Jan 2007 11:21:56 -0000 1.2 @@ -1,3 +1,5 @@ +# KH: Modified as it collides with the runtime-update patch + To: vim-dev at vim.org Subject: patch 7.0.187 Fcc: outbox @@ -12,101 +14,67 @@ Solution: Add the SourceCmd event. (Charles Campbell) Files: runtime/doc/autocmd.txt, src/ex_cmds2.c, src/fileio.c, src/vim.h - -*** ../vim-7.0.186/runtime/doc/autocmd.txt Sun May 7 17:07:33 2006 ---- runtime/doc/autocmd.txt Tue Jan 16 21:29:14 2007 -*************** -*** 1,4 **** -! *autocmd.txt* For Vim version 7.0. Last change: 2006 May 06 - - - VIM REFERENCE MANUAL by Bram Moolenaar ---- 1,4 ---- -! *autocmd.txt* For Vim version 7.0. Last change: 2007 Jan 16 - - - VIM REFERENCE MANUAL by Bram Moolenaar -*************** -*** 279,284 **** ---- 279,285 ---- - |FuncUndefined| a user function is used but it isn't defined - |SpellFileMissing| a spell file is used but it can't be found - |SourcePre| before sourcing a Vim script -+ |SourceCmd| before sourcing a Vim script |Cmd-event| - - |VimResized| after the Vim window size changed - |FocusGained| Vim got input focus -*************** -*** 690,699 **** - Can be used to check for any changed files. - *SourcePre* - SourcePre Before sourcing a Vim script. |:source| - *SpellFileMissing* - SpellFileMissing When trying to load a spell checking file and -! it can't be found. is the language, -! 'encoding' also matters. See - |spell-SpellFileMissing|. - *StdinReadPost* - StdinReadPost After reading from the stdin into the buffer, ---- 701,717 ---- - Can be used to check for any changed files. - *SourcePre* - SourcePre Before sourcing a Vim script. |:source| -+ is the name of the file being sourced. -+ *SourceCmd* -+ SourceCmd When sourcing a Vim script. |:source| -+ is the name of the file being sourced. -+ The autocommand must source this file. -+ |Cmd-event| - *SpellFileMissing* - SpellFileMissing When trying to load a spell checking file and -! it can't be found. The pattern is matched -! against the language. is the -! language, 'encoding' also matters. See - |spell-SpellFileMissing|. - *StdinReadPost* - StdinReadPost After reading from the stdin into the buffer, -*************** -*** 1219,1226 **** - - *Cmd-event* - When using one of the "*Cmd" events, the matching autocommands are expected to -! do the file reading or writing. This can be used when working with a special -! kind of file, for example on a remote system. - CAREFUL: If you use these events in a wrong way, it may have the effect of - making it impossible to read or write the matching files! Make sure you test - your autocommands properly. Best is to use a pattern that will never match a ---- 1238,1245 ---- - - *Cmd-event* - When using one of the "*Cmd" events, the matching autocommands are expected to -! do the file reading, writing or sourcing. This can be used when working with -! a special kind of file, for example on a remote system. - CAREFUL: If you use these events in a wrong way, it may have the effect of - making it impossible to read or write the matching files! Make sure you test - your autocommands properly. Best is to use a pattern that will never match a -*************** -*** 1233,1241 **** - original file isn't needed for recovery. You might want to do this only when - you expect the file to be modified. - -! The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are -! effective. These should be used for the command that reads/writes the file. -! The |v:cmdbang| variable is one when "!" was used, zero otherwise. - - See the $VIMRUNTIME/plugin/netrw.vim for examples. - ---- 1252,1261 ---- - original file isn't needed for recovery. You might want to do this only when - you expect the file to be modified. - -! For file read and write commands the |v:cmdarg| variable holds the "++enc=" -! and "++ff=" argument that are effective. These should be used for the command -! that reads/writes the file. The |v:cmdbang| variable is one when "!" was -! used, zero otherwise. - - See the $VIMRUNTIME/plugin/netrw.vim for examples. - +diff -urN runtime/doc/autocmd.txt runtime/doc/autocmd.txt.new +--- runtime/doc/autocmd.txt 2006-09-08 17:26:31.000000000 -0400 ++++ runtime/doc/autocmd.txt 2007-01-23 06:17:46.000000000 -0500 +@@ -1,4 +1,4 @@ +-*autocmd.txt* For Vim version 7.0. Last change: 2006 Aug 29 ++*autocmd.txt* For Vim version 7.0. Last change: 2007 Jan 16 + + + VIM REFERENCE MANUAL by Bram Moolenaar +@@ -279,6 +279,7 @@ + |FuncUndefined| a user function is used but it isn't defined + |SpellFileMissing| a spell file is used but it can't be found + |SourcePre| before sourcing a Vim script ++|SourceCmd| before sourcing a Vim script |Cmd-event| + + |VimResized| after the Vim window size changed + |FocusGained| Vim got input focus +@@ -695,10 +696,16 @@ + *SourcePre* + SourcePre Before sourcing a Vim script. |:source| + is the name of the file being sourced. ++ *SourceCmd* ++SourceCmd When sourcing a Vim script. |:source| ++ is the name of the file being sourced. ++ The autocommand must source this file. ++ |Cmd-event| + *SpellFileMissing* + SpellFileMissing When trying to load a spell checking file and +- it can't be found. is the language, +- 'encoding' also matters. See ++ it can't be found. The pattern is matched ++ against the language. is the ++ language, 'encoding' also matters. See + |spell-SpellFileMissing|. + *StdinReadPost* + StdinReadPost After reading from the stdin into the buffer, +@@ -1224,8 +1231,8 @@ + + *Cmd-event* + When using one of the "*Cmd" events, the matching autocommands are expected to +-do the file reading or writing. This can be used when working with a special +-kind of file, for example on a remote system. ++do the file reading, writing or sourcing. This can be used when working with ++a special kind of file, for example on a remote system. + CAREFUL: If you use these events in a wrong way, it may have the effect of + making it impossible to read or write the matching files! Make sure you test + your autocommands properly. Best is to use a pattern that will never match a +@@ -1238,9 +1245,10 @@ + original file isn't needed for recovery. You might want to do this only when + you expect the file to be modified. + +-The |v:cmdarg| variable holds the "++enc=" and "++ff=" argument that are +-effective. These should be used for the command that reads/writes the file. +-The |v:cmdbang| variable is one when "!" was used, zero otherwise. ++For file read and write commands the |v:cmdarg| variable holds the "++enc=" ++and "++ff=" argument that are effective. These should be used for the command ++that reads/writes the file. The |v:cmdbang| variable is one when "!" was ++used, zero otherwise. + + See the $VIMRUNTIME/plugin/netrw.vim for examples. + *** ../vim-7.0.186/src/ex_cmds2.c Tue Aug 29 17:28:56 2006 --- src/ex_cmds2.c Tue Jan 16 18:30:40 2007 *************** From fedora-cvs-commits at redhat.com Tue Jan 23 11:22:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:22:24 -0500 Subject: rpms/a2ps/devel a2ps-build.patch,NONE,1.1 a2ps.spec,1.54,1.55 Message-ID: <200701231122.l0NBMOdu015996@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/a2ps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15903 Modified Files: a2ps.spec Added Files: a2ps-build.patch Log Message: * Tue Jan 23 2007 Tim Waugh 4.13b-60 - Force it to build by hacking the configure script. a2ps-build.patch: configure | 22 ---------------------- 1 files changed, 22 deletions(-) --- NEW FILE a2ps-build.patch --- --- a2ps-4.13/configure.build 2007-01-23 11:16:02.000000000 +0000 +++ a2ps-4.13/configure 2007-01-23 11:16:12.000000000 +0000 @@ -33522,28 +33522,6 @@ # # CONFIG_LINK # - - { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_file" >&5 -echo "$as_me: linking $srcdir/$ac_source to $ac_file" >&6;} - - if test ! -r "$srcdir/$ac_source"; then - { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5 -echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;} - { (exit 1); exit 1; }; } - fi - rm -f "$ac_file" - - # Try a relative symlink, then a hard link, then a copy. - case $srcdir in - [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;; - *) ac_rel_source=$ac_top_build_prefix$srcdir/$ac_source ;; - esac - ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || - ln "$srcdir/$ac_source" "$ac_file" 2>/dev/null || - cp -p "$srcdir/$ac_source" "$ac_file" || - { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_file" >&5 -echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 echo "$as_me: executing $ac_file commands" >&6;} Index: a2ps.spec =================================================================== RCS file: /cvs/dist/rpms/a2ps/devel/a2ps.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- a2ps.spec 22 Jan 2007 18:37:44 -0000 1.54 +++ a2ps.spec 23 Jan 2007 11:22:21 -0000 1.55 @@ -37,6 +37,7 @@ Patch30: a2ps-psset.patch Patch31: a2ps-mb.patch Patch32: a2ps-perl.patch +Patch33: a2ps-build.patch Requires: fileutils sh-utils info BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo, groff BuildRequires: ImageMagick @@ -139,8 +140,11 @@ cp /usr/share/aclocal/libtool.m4 m4/ aclocal -I m4 autoconf -cd ogonkify +pushd ogonkify autoconf +popd + +%patch33 -p1 -b .build %build chmod 644 {po/ja.po,encoding/euc-jp.edf,README.eucJP}.euc @@ -247,7 +251,8 @@ %dir %{_datadir}/a2ps %changelog -* Mon Jan 22 2007 Tim Waugh 4.13b-60 +* Tue Jan 23 2007 Tim Waugh 4.13b-60 +- Force it to build by hacking the configure script. - Don't need rm patch. - Make scriptlets unconditionally succeed (bug #223674). From fedora-cvs-commits at redhat.com Tue Jan 23 11:28:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:28:03 -0500 Subject: rpms/bash/devel bash.spec,1.129,1.130 dot-bash_logout,1.3,1.4 Message-ID: <200701231128.l0NBS3nX020326@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20225 Modified Files: bash.spec dot-bash_logout Log Message: * Tue Jan 23 2007 Tim Waugh 3.2-4 - Slightly better .bash_logout (bug #223960). - Resolves: rhbz#223960 Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- bash.spec 19 Jan 2007 16:35:30 -0000 1.129 +++ bash.spec 23 Jan 2007 11:28:00 -0000 1.130 @@ -1,7 +1,7 @@ Version: 3.2 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -209,6 +209,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Tue Jan 23 2007 Tim Waugh 3.2-4 +- Slightly better .bash_logout (bug #223960). + * Fri Jan 19 2007 Tim Waugh 3.2-3 - Back out rmatch change introduced in 3.2 (bug #220087). Index: dot-bash_logout =================================================================== RCS file: /cvs/dist/rpms/bash/devel/dot-bash_logout,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dot-bash_logout 14 Feb 2005 16:07:18 -0000 1.3 +++ dot-bash_logout 23 Jan 2007 11:28:00 -0000 1.4 @@ -1,3 +1,3 @@ # ~/.bash_logout -clear +/usr/bin/clear From fedora-cvs-commits at redhat.com Tue Jan 23 11:34:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:34:11 -0500 Subject: rpms/gphoto2/FC-5 gphoto2-libexif.patch, NONE, 1.1 gphoto2.spec, 1.62, 1.63 Message-ID: <200701231134.l0NBYAws014216@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv24263 Modified Files: gphoto2.spec Added Files: gphoto2-libexif.patch Log Message: - fix pointless upstream dependency on newer libexif, so that thumbnails are shown correctly in Fedora (#221831) gphoto2-libexif.patch: configure.ac | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gphoto2-libexif.patch --- --- gphoto2-2.3.1/libgphoto2-2.3.1/configure.ac.libexif 2006-12-24 11:13:03.000000000 -0500 +++ gphoto2-2.3.1/libgphoto2-2.3.1/configure.ac 2007-01-19 07:47:15.000000000 -0500 @@ -436,7 +436,7 @@ dnl libexif is available from dnl http://www.sourceforge.net/projects/libexif dnl --------------------------------------------------------------------------- -GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13], +GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.12], [libexif/exif-data.h],[exif_data_new],[ AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]]) # Check for libexif version Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-5/gphoto2.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gphoto2.spec 18 Jan 2007 17:15:03 -0000 1.62 +++ gphoto2.spec 23 Jan 2007 11:34:08 -0000 1.63 @@ -8,7 +8,7 @@ %define libpkg libgphoto2 %define libver 2.3.1 Version: %{pkgver} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,6 +17,7 @@ Source3: 90-gphoto-camera-policy.fdi Source4: gphoto-set-procperm Patch1: gphoto2-pkgcfg.patch +Patch2: gphoto2-libexif.patch Url: http://www.gphoto.org/ ExcludeArch: s390 s390x Provides: libgphoto2 = %{libver} @@ -69,6 +70,7 @@ %prep %setup -q -a 1 %patch1 -p1 -b .pkgcfg +%patch2 -p1 -b .libexif # write pkg-config stuff cat > gphoto2.pc.in << EOF @@ -205,6 +207,10 @@ # ChangeLog ######################################################################## %changelog +* Tue Jan 23 2007 Jindrich Novy 2.3.1-3 +- fix pointless upstream dependency on newer libexif, so that + thumbnails are shown correctly in Fedora (#221831) + * Thu Jan 18 2007 Jindrich Novy 2.3.1-2 - really fix the gphoto2-devel multilib conflict (#205211) - gphoto2-devel requires libusb-devel (#222015) From fedora-cvs-commits at redhat.com Tue Jan 23 11:34:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:34:23 -0500 Subject: rpms/mtools/devel mtools.spec,1.24,1.25 Message-ID: <200701231134.l0NBYN5I016092@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/mtools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29200/mtools/devel Modified Files: mtools.spec Log Message: changelog is UTF-8 compatible now Index: mtools.spec =================================================================== RCS file: /cvs/dist/rpms/mtools/devel/mtools.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mtools.spec 22 Jan 2007 14:08:40 -0000 1.24 +++ mtools.spec 23 Jan 2007 11:34:21 -0000 1.25 @@ -72,7 +72,7 @@ %changelog * Mon Jan 22 2007 Adam Tkac 3.9.10-3 - Resolves: #223712 -- applied Ville Skytt?'s (ville.skytta "antispam" iki.fi) patch +- applied Ville Skytta's (ville.skytta "antispam" iki.fi) patch (install-info scriptlet failures) * Wed Aug 09 2006 Jitka Kudrnacova - 3.9.10-2 From fedora-cvs-commits at redhat.com Tue Jan 23 11:35:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:35:04 -0500 Subject: rpms/psgml/devel psgml.spec,1.16,1.17 Message-ID: <200701231135.l0NBZ4RQ019850@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/psgml/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19836/psgml/devel Modified Files: psgml.spec Log Message: changelog is UTF-8 compatible now Index: psgml.spec =================================================================== RCS file: /cvs/dist/rpms/psgml/devel/psgml.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- psgml.spec 22 Jan 2007 14:15:18 -0000 1.16 +++ psgml.spec 23 Jan 2007 11:35:02 -0000 1.17 @@ -102,7 +102,7 @@ %changelog * Mon Jan 22 2007 Adam Tkac 1.2.5-5.fc7 - added dist macro -- fixed install-info scriptlet failures (#223715), patch from Ville Skytt? +- fixed install-info scriptlet failures (#223715), patch from Ville Skytta (ville.skytta "antispam" iki.fi) * Wed Jun 07 2006 Jitka Kudrnacova 1.2.5-4.3 From fedora-cvs-commits at redhat.com Tue Jan 23 11:37:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:37:05 -0500 Subject: rpms/gphoto2/FC-6 gphoto2-libexif.patch, NONE, 1.1 gphoto2.spec, 1.73, 1.74 Message-ID: <200701231137.l0NBb5D4019901@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/gphoto2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19882 Modified Files: gphoto2.spec Added Files: gphoto2-libexif.patch Log Message: - fix pointless upstream dependency on newer libexif, so that thumbnails are shown correctly in Fedora (#221831) gphoto2-libexif.patch: configure.ac | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gphoto2-libexif.patch --- --- gphoto2-2.3.1/libgphoto2-2.3.1/configure.ac.libexif 2006-12-24 11:13:03.000000000 -0500 +++ gphoto2-2.3.1/libgphoto2-2.3.1/configure.ac 2007-01-19 07:47:15.000000000 -0500 @@ -436,7 +436,7 @@ dnl libexif is available from dnl http://www.sourceforge.net/projects/libexif dnl --------------------------------------------------------------------------- -GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.13], +GP_CHECK_LIBRARY([LIBEXIF],[libexif],[>= 0.6.12], [libexif/exif-data.h],[exif_data_new],[ AC_MSG_CHECKING([whether we use a version of libexif with ExifData.ifd[[]]]) # Check for libexif version Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/FC-6/gphoto2.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- gphoto2.spec 18 Jan 2007 16:45:43 -0000 1.73 +++ gphoto2.spec 23 Jan 2007 11:37:02 -0000 1.74 @@ -8,7 +8,7 @@ %define libpkg libgphoto2 %define libver 2.3.1 Version: %{pkgver} -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -17,6 +17,7 @@ Source3: 90-gphoto-camera-policy.fdi Source4: gphoto-set-procperm Patch1: gphoto2-pkgcfg.patch +Patch2: gphoto2-libexif.patch Url: http://www.gphoto.org/ ExcludeArch: s390 s390x Provides: libgphoto2 = %{libver} @@ -69,6 +70,7 @@ %prep %setup -q -a 1 %patch1 -p1 -b .pkgcfg +%patch2 -p1 -b .libexif # write pkg-config stuff cat > gphoto2.pc.in << EOF @@ -205,6 +207,10 @@ # ChangeLog ######################################################################## %changelog +* Tue Jan 23 2007 Jindrich Novy 2.3.1-3 +- fix pointless upstream dependency on newer libexif, so that + thumbnails are shown correctly in Fedora (#221831) + * Thu Jan 18 2007 Jindrich Novy 2.3.1-2 - really fix the gphoto2-devel multilib conflict (#205211) - gphoto2-devel requires libusb-devel (#222015) From fedora-cvs-commits at redhat.com Tue Jan 23 11:50:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:50:43 -0500 Subject: rpms/boost/FC-6 boost.spec,1.33,1.34 Message-ID: <200701231150.l0NBoh1q008146@cvs.devel.redhat.com> Author: bkoz Update of /cvs/dist/rpms/boost/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8130 Modified Files: boost.spec Log Message: * Tue Jan 23 2007 Benjamin Kosnik 1.33.1-11 - (#215317: static linking doesn't work with -Os) rebuild. Index: boost.spec =================================================================== RCS file: /cvs/dist/rpms/boost/FC-6/boost.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- boost.spec 23 Nov 2006 10:52:28 -0000 1.33 +++ boost.spec 23 Jan 2007 11:50:41 -0000 1.34 @@ -4,7 +4,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.33.1 -Release: 10%{?dist} +Release: 11%{?dist} License: Boost Software License URL: http://www.boost.org/ Group: System Environment/Libraries @@ -176,6 +176,9 @@ %{_docdir}/boost-%{version} %changelog +* Tue Jan 23 2007 Benjamin Kosnik 1.33.1-11 +- (#215317: static linking doesn't work with -Os) rebuild. + * Thu Nov 23 2006 Benjamin Kosnik 1.33.1-10 - (#182414: boost: put tests in %check section) via Rex Dieter - Fix EVR with %{?dist} tag via Gianluca Sforna From fedora-cvs-commits at redhat.com Tue Jan 23 11:58:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 06:58:28 -0500 Subject: rpms/hdparm/devel .cvsignore, 1.12, 1.13 hdparm.spec, 1.29, 1.30 sources, 1.13, 1.14 Message-ID: <200701231158.l0NBwSsW008373@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/hdparm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8357 Modified Files: .cvsignore hdparm.spec sources Log Message: - update to 6.9 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hdparm/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 22 May 2006 09:44:38 -0000 1.12 +++ .cvsignore 23 Jan 2007 11:58:26 -0000 1.13 @@ -1 +1 @@ -hdparm-6.6.tar.gz +hdparm-6.9.tar.gz Index: hdparm.spec =================================================================== RCS file: /cvs/dist/rpms/hdparm/devel/hdparm.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- hdparm.spec 17 Jul 2006 13:31:13 -0000 1.29 +++ hdparm.spec 23 Jan 2007 11:58:26 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A utility for displaying and/or setting hard disk parameters. Name: hdparm -Version: 6.6 -Release: 2 +Version: 6.9 +Release: 1 License: BSD Group: Applications/System URL: http://sourceforge.net/projects/hdparm/ @@ -44,6 +44,9 @@ %{_mandir}/man8/hdparm.8* %changelog +* Thu Jan 18 2007 Karsten Hopp 6.9-1 +- update to 6.9 + * Mon Jul 17 2006 Karsten Hopp 6.6-2 - test builds on ia64, ppc, ppc64 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hdparm/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 May 2006 09:44:38 -0000 1.13 +++ sources 23 Jan 2007 11:58:26 -0000 1.14 @@ -1 +1 @@ -ecea69f775396e4ab6112dcf9066239f hdparm-6.6.tar.gz +62749c6cdf28ce31aae335092fa107df hdparm-6.9.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 12:02:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:02:53 -0500 Subject: rpms/mgetty/devel mgetty.spec,1.39,1.40 Message-ID: <200701231202.l0NC2rFC008562@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/mgetty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8548 Modified Files: mgetty.spec Log Message: Fix not failsafe scriptlets use in post & preun (#223710) Index: mgetty.spec =================================================================== RCS file: /cvs/dist/rpms/mgetty/devel/mgetty.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mgetty.spec 21 Aug 2006 13:36:33 -0000 1.39 +++ mgetty.spec 23 Jan 2007 12:02:51 -0000 1.40 @@ -5,7 +5,7 @@ Summary: A getty replacement for use with data and fax modems. Name: mgetty Version: 1.1.33 -Release: 9%{?dist} +Release: 10%{?dist} 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 @@ -200,11 +200,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty). Package to handle faxes, voicemail and more." +/sbin/install-info %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty). Package to handle faxes, voicemail and more." || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty). Package to handle faxes, voicemail and more." + /sbin/install-info --delete %{_infodir}/mgetty.info.gz %{_infodir}/dir --entry="* mgetty: (mgetty). Package to handle faxes, voicemail and more." || : fi %pre sendfax @@ -342,6 +342,10 @@ %{_mandir}/man1/viewfax.1* %changelog +* Tue Jan 23 2007 Maros Barabas - 1.1.33-10 +- fixed install-info scriptlets (post,preun) +- Resolves #223710 + * Mon Aug 21 2006 Nalin Dahyabhai - 1.1.33-9 - add /usr/sbin/useradd as a prereq for the -sendfax subpackage, because we call it during the -sendfax %%pre scriptlet (#203266) From fedora-cvs-commits at redhat.com Tue Jan 23 12:05:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:05:43 -0500 Subject: rpms/logrotate/FC-6 logrotate-errorConfiguration.patch, NONE, 1.1 logrotate.spec, 1.54, 1.55 Message-ID: <200701231205.l0NC5hfw008686@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8670 Modified Files: logrotate.spec Added Files: logrotate-errorConfiguration.patch Log Message: - logrotate won't stop if there are some errors in configuration or glob failures (#166510, #182062) logrotate-errorConfiguration.patch: config.c | 362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 318 insertions(+), 44 deletions(-) --- NEW FILE logrotate-errorConfiguration.patch --- --- logrotate-3.7.4/config.c.old 2006-07-24 14:08:04.000000000 +0200 +++ logrotate-3.7.4/config.c 2006-09-23 11:02:44.000000000 +0200 @@ -177,12 +177,114 @@ free(array); } +static void copyLogInfo(logInfo * to, logInfo * from) +{ + int i; + + memset(to, 0, sizeof(*to)); + if (from->oldDir) + to->oldDir = strdup(from->oldDir); + to->criterium = from->criterium; + to->threshhold = from->threshhold; + to->minsize = from->minsize; + to->rotateCount = from->rotateCount; + to->rotateAge = from->rotateAge; + to->logStart = from->logStart; + if (from->pre) + to->pre = strdup(from->pre); + if (from->post) + to->post = strdup(from->post); + if (from->first) + to->first = strdup(from->first); + if (from->last) + to->last = strdup(from->last); + if (from->logAddress) + to->logAddress = strdup(from->logAddress); + if (from->extension) + to->extension = strdup(from->extension); + if (from->compress_prog) + to->compress_prog = strdup(from->compress_prog); + if (from->uncompress_prog) + to->uncompress_prog = strdup(from->uncompress_prog); + if (from->compress_ext) + to->compress_ext = strdup(from->compress_ext); + to->flags = from->flags; + to->createMode = from->createMode; + to->createUid = from->createUid; + to->createGid = from->createGid; + if (from->compress_options_count) { + to->compress_options_list = (const char **) + malloc(from->compress_options_count * sizeof(const char *)); + for (i = 0; i < from->compress_options_count; i++) + to->compress_options_list[i] = + strdup(from->compress_options_list[i]); + to->compress_options_count = from->compress_options_count; + } +} + +static void freeLogInfo(logInfo *log) +{ + if (log->pattern) + free(log->pattern); + if (log->files) + free_2d_array(log->files, log->numFiles); + if (log->oldDir) + free(log->oldDir); + if (log->pre) + free(log->pre); + if (log->post) + free(log->post); + if (log->first) + free(log->first); + if (log->last) + free(log->last); + if (log->logAddress) + free(log->logAddress); + if (log->extension) + free(log->extension); + if (log->compress_prog) + free(log->compress_prog); + if (log->uncompress_prog) + free(log->uncompress_prog); + if (log->compress_ext) + free(log->compress_ext); + if (log->compress_options_list) + free_2d_array((char **)log->compress_options_list, + log->compress_options_count); +} + +static void freeTailLogs(logInfo ** logsPtr, int *numLogsPtr, + int newNumLogs) +{ + int i; + + assert(newNumLogs <= *numLogsPtr); + + message(MESS_DEBUG, "removing last %d log configs\n", + *numLogsPtr - newNumLogs); + + if (newNumLogs == *numLogsPtr) + return; + + for (i = newNumLogs; i < *numLogsPtr; i++) + freeLogInfo(*logsPtr + i); + + if (newNumLogs == 0) { + free (*logsPtr); + *logsPtr = NULL; + } else { + *logsPtr = realloc(*logsPtr, sizeof(**logsPtr) * newNumLogs); + } + *numLogsPtr = newNumLogs; +} + static int readConfigPath(const char *path, logInfo * defConfig, logInfo ** logsPtr, int *numLogsPtr) { struct stat sb; - int here; + int here, oldnumlogs, result = 1; + logInfo defConfigBackup; if (stat(path, &sb)) { message(MESS_ERROR, "cannot stat %s: %s\n", path, strerror(errno)); @@ -264,30 +366,45 @@ for (i = 0; i < files_count; ++i) { assert(namelist[i] != NULL); - + oldnumlogs = *numLogsPtr; + copyLogInfo(&defConfigBackup, defConfig); if (readConfigFile(namelist[i], defConfig, logsPtr, - numLogsPtr)) { - fchdir(here); - close(here); - free_2d_array(namelist, files_count); - return 1; + numLogsPtr)) { + message(MESS_ERROR, "found error in file %s, skipping\n", namelist[i]); + freeTailLogs(logsPtr, numLogsPtr, oldnumlogs); + freeLogInfo(defConfig); + copyLogInfo(defConfig, &defConfigBackup); + freeLogInfo(&defConfigBackup); + continue; + } else { + result = 0; } + freeLogInfo(&defConfigBackup); } fchdir(here); close(here); free_2d_array(namelist, files_count); } else { - return readConfigFile(path, defConfig, logsPtr, numLogsPtr); + oldnumlogs = *numLogsPtr; + copyLogInfo(&defConfigBackup, defConfig); + if (readConfigFile(path, defConfig, logsPtr, numLogsPtr)) { + freeTailLogs(logsPtr, numLogsPtr, oldnumlogs); + freeLogInfo(defConfig); + copyLogInfo(defConfig, &defConfigBackup); + } else { + result = 0; + } + freeLogInfo(&defConfigBackup); } - return 0; + return result; } int readAllConfigPaths(const char **paths, logInfo ** logsPtr, int *numLogsPtr) { - int i; + int i, result = 0; const char **file; logInfo defConfig = { /* pattern */ NULL, /* files, numFiles */ NULL, 0, @@ -323,12 +440,13 @@ for (file = paths; *file; file++) { if (readConfigPath(*file, &defConfig, logsPtr, numLogsPtr)) { - free_2d_array(tabooExts, tabooCount); - return 1; + result = 1; + break; } } free_2d_array(tabooExts, tabooCount); - return 0; + freeLogInfo(&defConfig); + return result; } static int globerr(const char *pathname, int theerr) @@ -340,6 +458,12 @@ return 1; } +#define freeLogItem(what) \ + if (newlog->what) { \ + free(newlog->what); \ + newlog->what = NULL; \ + } + static int readConfigFile(const char *configFile, logInfo * defConfig, logInfo ** logsPtr, int *numLogsPtr) { @@ -364,6 +488,7 @@ glob_t globResult; const char **argv; int argc, argNum; + int logerror = 0; /* FIXME: createOwner and createGroup probably shouldn't be fixed length arrays -- of course, if we aren't run setuid it doesn't @@ -417,6 +542,28 @@ start = buf; while (*start) { + if (logerror) { + assert(newlog != defConfig); + + message(MESS_ERROR, "found error in %s, skipping\n", + newlog->pattern ? newlog->pattern : "log config"); + + while (*start != '}') { + if (*start == 0) { + message(MESS_ERROR, "%s:%d } expected \n", + configFile, lineNum); + return 1; + } else if (*start == '\n') { + lineNum++; + } + start++; + } + start++; + + freeTailLogs(logsPtr, numLogsPtr, (*numLogsPtr) - 1); + newlog = defConfig; + logerror = 0; + } while (isblank(*start) && (*start)) start++; if (*start == '#') { @@ -549,7 +696,13 @@ if (rc == 4) { message(MESS_ERROR, "%s:%d extra arguments for " "create\n", configFile, lineNum); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } if (rc > 0) @@ -560,7 +713,13 @@ if (!pw) { message(MESS_ERROR, "%s:%d unknown user '%s'\n", configFile, lineNum, createOwner); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } newlog->createUid = pw->pw_uid; endpwent(); @@ -570,7 +729,13 @@ if (!group) { message(MESS_ERROR, "%s:%d unknown group '%s'\n", configFile, lineNum, createGroup); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } newlog->createGid = group->gr_gid; endgrent(); @@ -605,7 +770,13 @@ } else if (!isdigit(start[length])) { message(MESS_ERROR, "%s:%d unknown unit '%c'\n", configFile, lineNum, start[length]); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } else { multiplier = 1; } @@ -614,7 +785,13 @@ if (*chptr) { message(MESS_ERROR, "%s:%d bad size '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } if (!strcmp(opt, "size")) { @@ -676,7 +853,13 @@ message(MESS_ERROR, "%s:%d bad rotation count '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } *endtag = oldchar, start = endtag; } @@ -692,7 +875,13 @@ if (*chptr || newlog->logStart < 0) { message(MESS_ERROR, "%s:%d bad start count '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } *endtag = oldchar, start = endtag; } @@ -708,7 +897,13 @@ if (*chptr || newlog->rotateAge < 0) { message(MESS_ERROR, "%s:%d bad maximum age '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } *endtag = oldchar, start = endtag; } @@ -718,13 +913,18 @@ configFile, lineNum); } else if (!strcmp(start, "mail")) { *endtag = oldchar, start = endtag; + freeLogItem(logAddress); if (!(newlog->logAddress = readAddress(configFile, lineNum, "mail", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } } else if (!strcmp(start, "nomail")) { - /* hmmm, we could lose memory here, but not much */ - newlog->logAddress = NULL; + freeLogItem(logAddress); *endtag = oldchar, start = endtag; } else if (!strcmp(start, "missingok")) { @@ -738,6 +938,8 @@ } else if (!strcmp(start, "prerotate")) { *endtag = oldchar, start = endtag; + freeLogItem (pre); + scriptStart = start; scriptDest = &newlog->pre; @@ -746,6 +948,8 @@ } else if (!strcmp(start, "firstaction")) { *endtag = oldchar, start = endtag; + freeLogItem (first); + scriptStart = start; scriptDest = &newlog->first; @@ -754,6 +958,8 @@ } else if (!strcmp(start, "postrotate")) { *endtag = oldchar, start = endtag; + freeLogItem (post); + scriptStart = start; scriptDest = &newlog->post; @@ -762,6 +968,8 @@ } else if (!strcmp(start, "lastaction")) { *endtag = oldchar, start = endtag; + freeLogItem (last); + scriptStart = start; scriptDest = &newlog->last; @@ -773,7 +981,9 @@ "%s:%d tabooext may not appear inside " "of log file definition\n", configFile, lineNum); - return 1; + *endtag = oldchar, start = endtag; + logerror = 1; + continue; } *endtag = oldchar, start = endtag; @@ -819,7 +1029,9 @@ "%s:%d include may not appear inside " "of log file definition\n", configFile, lineNum); - return 1; + *endtag = oldchar, start = endtag; + logerror = 1; + continue; } *endtag = oldchar, start = endtag; @@ -837,9 +1049,17 @@ } } else if (!strcmp(start, "olddir")) { *endtag = oldchar, start = endtag; + + freeLogItem (oldDir); + if (!(newlog->oldDir = readPath(configFile, lineNum, "olddir", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } #if 0 if (stat(newlog->oldDir, &sb)) { @@ -868,6 +1088,7 @@ &endtag)) { oldchar = *endtag, *endtag = '\0'; + freeLogItem (extension); newlog->extension = strdup(start); *endtag = oldchar, start = endtag; @@ -878,18 +1099,30 @@ } else if (!strcmp(start, "compresscmd")) { *endtag = oldchar, start = endtag; + + freeLogItem (compress_prog); + if (! (newlog->compress_prog = readPath(configFile, lineNum, "compress", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } if (access(newlog->compress_prog, X_OK)) { message(MESS_ERROR, "%s:%d compression program %s is not an executable file\n", configFile, lineNum, newlog->compress_prog); - free(newlog->compress_prog); - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "compress_prog is now %s\n", @@ -897,19 +1130,31 @@ } else if (!strcmp(start, "uncompresscmd")) { *endtag = oldchar, start = endtag; + + freeLogItem (uncompress_prog); + if (! (newlog->uncompress_prog = readPath(configFile, lineNum, "uncompress", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } if (access(newlog->uncompress_prog, X_OK)) { message(MESS_ERROR, "%s:%d uncompression program %s is not an executable file\n", configFile, lineNum, newlog->uncompress_prog); - free(newlog->uncompress_prog); - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "uncompress_prog is now %s\n", @@ -918,12 +1163,24 @@ } else if (!strcmp(start, "compressoptions")) { char *options; + if (newlog->compress_options_list) { + free_2d_array((char **)newlog->compress_options_list, + newlog->compress_options_count); + newlog->compress_options_list = NULL; + newlog->compress_options_count = 0; + } + *endtag = oldchar, start = endtag; if (! (options = readPath(configFile, lineNum, "compressoptions", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } if (poptParseArgvString(options, @@ -933,7 +1190,12 @@ "%s:%d invalid compression options\n", configFile, lineNum); free(options); - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "compress_options is now %s\n", @@ -941,11 +1203,19 @@ free(options); } else if (!strcmp(start, "compressext")) { *endtag = oldchar, start = endtag; + + freeLogItem (compress_ext); + if (! (newlog->compress_ext = readPath(configFile, lineNum, "compress-ext", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "compress_ext is now %s\n", @@ -973,7 +1243,8 @@ if (newlog != defConfig) { message(MESS_ERROR, "%s:%d unexpected log filename\n", configFile, lineNum); - return 1; + logerror = 1; + continue; } /* If no compression options were found in config file, @@ -989,7 +1260,7 @@ (*numLogsPtr)++; *logsPtr = realloc(*logsPtr, sizeof(**logsPtr) * *numLogsPtr); newlog = *logsPtr + *numLogsPtr - 1; - memcpy(newlog, defConfig, sizeof(*newlog)); + copyLogInfo(newlog, defConfig); endtag = start; while (*endtag != '{' && *endtag != '\0') @@ -1013,7 +1284,7 @@ newlog->files = NULL; newlog->numFiles = 0; - for (argNum = 0; argNum < argc; argNum++) { + for (argNum = 0; argNum < argc && logerror != 1; argNum++) { rc = glob(argv[argNum], GLOB_NOCHECK, globerr, &globResult); if (rc == GLOB_ABORTED) { @@ -1022,7 +1293,8 @@ message(MESS_ERROR, "%s:%d glob failed for %s\n", configFile, lineNum, argv[argNum]); - return 1; + logerror = 1; + break; } newlog->files = @@ -1045,8 +1317,8 @@ "%s:%d duplicate log entry for %s\n", configFile, lineNum, globResult.gl_pathv[i]); - globfree(&globResult); - return 1; + logerror = 1; + goto duperror; } } } @@ -1055,19 +1327,21 @@ strdup(globResult.gl_pathv[i]); newlog->numFiles++; } +duperror: globfree(&globResult); } newlog->pattern = strdup(start); - message(MESS_DEBUG, "reading config info for %s\n", start); + if (!logerror) + message(MESS_DEBUG, "reading config info for %s\n", start); free(argv); start = endtag + 1; } else if (*start == '}') { if (newlog == defConfig) { - message(MESS_ERROR, "%s:%d unxpected }\n", configFile, + message(MESS_ERROR, "%s:%d unexpected }\n", configFile, lineNum); return 1; } Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/FC-6/logrotate.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- logrotate.spec 9 Jan 2007 09:56:48 -0000 1.54 +++ logrotate.spec 23 Jan 2007 12:05:41 -0000 1.55 @@ -1,7 +1,7 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz @@ -9,7 +9,7 @@ Patch2: logrotate-fdLeak.patch Patch3: logrotate-sizeOption.patch Patch4: logrotate-widecharPath.patch - +Patch5: logrotate-errorConfiguration.patch BuildRoot: %{_tmppath}/%{name}-%{version}.root BuildRequires: libselinux-devel @@ -30,6 +30,7 @@ %patch2 -p1 -b .fdLeak %patch3 -p1 -b .sizeOption %patch4 -p1 -b .widecharPath +%patch5 -p1 -b .errorConfiguration %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -60,6 +61,10 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Tue Jan 23 2007 Peter Vrabec 3.7.4-10 +- logrotate won't stop if there are some errors in configuration + or glob failures (#166510, #182062) + * Tue Jan 09 2007 Peter Vrabec 3.7.4-9 - allow multibyte characters in readPath() (#122145) From fedora-cvs-commits at redhat.com Tue Jan 23 12:09:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:09:13 -0500 Subject: rpms/logrotate/devel logrotate-errorConfiguration.patch, NONE, 1.1 logrotate.spec, 1.55, 1.56 Message-ID: <200701231209.l0NC9DX5008798@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8782 Modified Files: logrotate.spec Added Files: logrotate-errorConfiguration.patch Log Message: - logrotate won't stop if there are some errors in configuration or glob failures (#166510, #182062) logrotate-errorConfiguration.patch: config.c | 362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 318 insertions(+), 44 deletions(-) --- NEW FILE logrotate-errorConfiguration.patch --- --- logrotate-3.7.4/config.c.old 2006-07-24 14:08:04.000000000 +0200 +++ logrotate-3.7.4/config.c 2006-09-23 11:02:44.000000000 +0200 @@ -177,12 +177,114 @@ free(array); } +static void copyLogInfo(logInfo * to, logInfo * from) +{ + int i; + + memset(to, 0, sizeof(*to)); + if (from->oldDir) + to->oldDir = strdup(from->oldDir); + to->criterium = from->criterium; + to->threshhold = from->threshhold; + to->minsize = from->minsize; + to->rotateCount = from->rotateCount; + to->rotateAge = from->rotateAge; + to->logStart = from->logStart; + if (from->pre) + to->pre = strdup(from->pre); + if (from->post) + to->post = strdup(from->post); + if (from->first) + to->first = strdup(from->first); + if (from->last) + to->last = strdup(from->last); + if (from->logAddress) + to->logAddress = strdup(from->logAddress); + if (from->extension) + to->extension = strdup(from->extension); + if (from->compress_prog) + to->compress_prog = strdup(from->compress_prog); + if (from->uncompress_prog) + to->uncompress_prog = strdup(from->uncompress_prog); + if (from->compress_ext) + to->compress_ext = strdup(from->compress_ext); + to->flags = from->flags; + to->createMode = from->createMode; + to->createUid = from->createUid; + to->createGid = from->createGid; + if (from->compress_options_count) { + to->compress_options_list = (const char **) + malloc(from->compress_options_count * sizeof(const char *)); + for (i = 0; i < from->compress_options_count; i++) + to->compress_options_list[i] = + strdup(from->compress_options_list[i]); + to->compress_options_count = from->compress_options_count; + } +} + +static void freeLogInfo(logInfo *log) +{ + if (log->pattern) + free(log->pattern); + if (log->files) + free_2d_array(log->files, log->numFiles); + if (log->oldDir) + free(log->oldDir); + if (log->pre) + free(log->pre); + if (log->post) + free(log->post); + if (log->first) + free(log->first); + if (log->last) + free(log->last); + if (log->logAddress) + free(log->logAddress); + if (log->extension) + free(log->extension); + if (log->compress_prog) + free(log->compress_prog); + if (log->uncompress_prog) + free(log->uncompress_prog); + if (log->compress_ext) + free(log->compress_ext); + if (log->compress_options_list) + free_2d_array((char **)log->compress_options_list, + log->compress_options_count); +} + +static void freeTailLogs(logInfo ** logsPtr, int *numLogsPtr, + int newNumLogs) +{ + int i; + + assert(newNumLogs <= *numLogsPtr); + + message(MESS_DEBUG, "removing last %d log configs\n", + *numLogsPtr - newNumLogs); + + if (newNumLogs == *numLogsPtr) + return; + + for (i = newNumLogs; i < *numLogsPtr; i++) + freeLogInfo(*logsPtr + i); + + if (newNumLogs == 0) { + free (*logsPtr); + *logsPtr = NULL; + } else { + *logsPtr = realloc(*logsPtr, sizeof(**logsPtr) * newNumLogs); + } + *numLogsPtr = newNumLogs; +} + static int readConfigPath(const char *path, logInfo * defConfig, logInfo ** logsPtr, int *numLogsPtr) { struct stat sb; - int here; + int here, oldnumlogs, result = 1; + logInfo defConfigBackup; if (stat(path, &sb)) { message(MESS_ERROR, "cannot stat %s: %s\n", path, strerror(errno)); @@ -264,30 +366,45 @@ for (i = 0; i < files_count; ++i) { assert(namelist[i] != NULL); - + oldnumlogs = *numLogsPtr; + copyLogInfo(&defConfigBackup, defConfig); if (readConfigFile(namelist[i], defConfig, logsPtr, - numLogsPtr)) { - fchdir(here); - close(here); - free_2d_array(namelist, files_count); - return 1; + numLogsPtr)) { + message(MESS_ERROR, "found error in file %s, skipping\n", namelist[i]); + freeTailLogs(logsPtr, numLogsPtr, oldnumlogs); + freeLogInfo(defConfig); + copyLogInfo(defConfig, &defConfigBackup); + freeLogInfo(&defConfigBackup); + continue; + } else { + result = 0; } + freeLogInfo(&defConfigBackup); } fchdir(here); close(here); free_2d_array(namelist, files_count); } else { - return readConfigFile(path, defConfig, logsPtr, numLogsPtr); + oldnumlogs = *numLogsPtr; + copyLogInfo(&defConfigBackup, defConfig); + if (readConfigFile(path, defConfig, logsPtr, numLogsPtr)) { + freeTailLogs(logsPtr, numLogsPtr, oldnumlogs); + freeLogInfo(defConfig); + copyLogInfo(defConfig, &defConfigBackup); + } else { + result = 0; + } + freeLogInfo(&defConfigBackup); } - return 0; + return result; } int readAllConfigPaths(const char **paths, logInfo ** logsPtr, int *numLogsPtr) { - int i; + int i, result = 0; const char **file; logInfo defConfig = { /* pattern */ NULL, /* files, numFiles */ NULL, 0, @@ -323,12 +440,13 @@ for (file = paths; *file; file++) { if (readConfigPath(*file, &defConfig, logsPtr, numLogsPtr)) { - free_2d_array(tabooExts, tabooCount); - return 1; + result = 1; + break; } } free_2d_array(tabooExts, tabooCount); - return 0; + freeLogInfo(&defConfig); + return result; } static int globerr(const char *pathname, int theerr) @@ -340,6 +458,12 @@ return 1; } +#define freeLogItem(what) \ + if (newlog->what) { \ + free(newlog->what); \ + newlog->what = NULL; \ + } + static int readConfigFile(const char *configFile, logInfo * defConfig, logInfo ** logsPtr, int *numLogsPtr) { @@ -364,6 +488,7 @@ glob_t globResult; const char **argv; int argc, argNum; + int logerror = 0; /* FIXME: createOwner and createGroup probably shouldn't be fixed length arrays -- of course, if we aren't run setuid it doesn't @@ -417,6 +542,28 @@ start = buf; while (*start) { + if (logerror) { + assert(newlog != defConfig); + + message(MESS_ERROR, "found error in %s, skipping\n", + newlog->pattern ? newlog->pattern : "log config"); + + while (*start != '}') { + if (*start == 0) { + message(MESS_ERROR, "%s:%d } expected \n", + configFile, lineNum); + return 1; + } else if (*start == '\n') { + lineNum++; + } + start++; + } + start++; + + freeTailLogs(logsPtr, numLogsPtr, (*numLogsPtr) - 1); + newlog = defConfig; + logerror = 0; + } while (isblank(*start) && (*start)) start++; if (*start == '#') { @@ -549,7 +696,13 @@ if (rc == 4) { message(MESS_ERROR, "%s:%d extra arguments for " "create\n", configFile, lineNum); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } if (rc > 0) @@ -560,7 +713,13 @@ if (!pw) { message(MESS_ERROR, "%s:%d unknown user '%s'\n", configFile, lineNum, createOwner); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } newlog->createUid = pw->pw_uid; endpwent(); @@ -570,7 +729,13 @@ if (!group) { message(MESS_ERROR, "%s:%d unknown group '%s'\n", configFile, lineNum, createGroup); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } newlog->createGid = group->gr_gid; endgrent(); @@ -605,7 +770,13 @@ } else if (!isdigit(start[length])) { message(MESS_ERROR, "%s:%d unknown unit '%c'\n", configFile, lineNum, start[length]); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } else { multiplier = 1; } @@ -614,7 +785,13 @@ if (*chptr) { message(MESS_ERROR, "%s:%d bad size '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } if (!strcmp(opt, "size")) { @@ -676,7 +853,13 @@ message(MESS_ERROR, "%s:%d bad rotation count '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } *endtag = oldchar, start = endtag; } @@ -692,7 +875,13 @@ if (*chptr || newlog->logStart < 0) { message(MESS_ERROR, "%s:%d bad start count '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } *endtag = oldchar, start = endtag; } @@ -708,7 +897,13 @@ if (*chptr || newlog->rotateAge < 0) { message(MESS_ERROR, "%s:%d bad maximum age '%s'\n", configFile, lineNum, start); - return 1; + if (newlog != defConfig) { + *endtag = oldchar, start = endtag; + logerror = 1; + continue; + } else { + return 1; + } } *endtag = oldchar, start = endtag; } @@ -718,13 +913,18 @@ configFile, lineNum); } else if (!strcmp(start, "mail")) { *endtag = oldchar, start = endtag; + freeLogItem(logAddress); if (!(newlog->logAddress = readAddress(configFile, lineNum, "mail", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } } else if (!strcmp(start, "nomail")) { - /* hmmm, we could lose memory here, but not much */ - newlog->logAddress = NULL; + freeLogItem(logAddress); *endtag = oldchar, start = endtag; } else if (!strcmp(start, "missingok")) { @@ -738,6 +938,8 @@ } else if (!strcmp(start, "prerotate")) { *endtag = oldchar, start = endtag; + freeLogItem (pre); + scriptStart = start; scriptDest = &newlog->pre; @@ -746,6 +948,8 @@ } else if (!strcmp(start, "firstaction")) { *endtag = oldchar, start = endtag; + freeLogItem (first); + scriptStart = start; scriptDest = &newlog->first; @@ -754,6 +958,8 @@ } else if (!strcmp(start, "postrotate")) { *endtag = oldchar, start = endtag; + freeLogItem (post); + scriptStart = start; scriptDest = &newlog->post; @@ -762,6 +968,8 @@ } else if (!strcmp(start, "lastaction")) { *endtag = oldchar, start = endtag; + freeLogItem (last); + scriptStart = start; scriptDest = &newlog->last; @@ -773,7 +981,9 @@ "%s:%d tabooext may not appear inside " "of log file definition\n", configFile, lineNum); - return 1; + *endtag = oldchar, start = endtag; + logerror = 1; + continue; } *endtag = oldchar, start = endtag; @@ -819,7 +1029,9 @@ "%s:%d include may not appear inside " "of log file definition\n", configFile, lineNum); - return 1; + *endtag = oldchar, start = endtag; + logerror = 1; + continue; } *endtag = oldchar, start = endtag; @@ -837,9 +1049,17 @@ } } else if (!strcmp(start, "olddir")) { *endtag = oldchar, start = endtag; + + freeLogItem (oldDir); + if (!(newlog->oldDir = readPath(configFile, lineNum, "olddir", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } #if 0 if (stat(newlog->oldDir, &sb)) { @@ -868,6 +1088,7 @@ &endtag)) { oldchar = *endtag, *endtag = '\0'; + freeLogItem (extension); newlog->extension = strdup(start); *endtag = oldchar, start = endtag; @@ -878,18 +1099,30 @@ } else if (!strcmp(start, "compresscmd")) { *endtag = oldchar, start = endtag; + + freeLogItem (compress_prog); + if (! (newlog->compress_prog = readPath(configFile, lineNum, "compress", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } if (access(newlog->compress_prog, X_OK)) { message(MESS_ERROR, "%s:%d compression program %s is not an executable file\n", configFile, lineNum, newlog->compress_prog); - free(newlog->compress_prog); - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "compress_prog is now %s\n", @@ -897,19 +1130,31 @@ } else if (!strcmp(start, "uncompresscmd")) { *endtag = oldchar, start = endtag; + + freeLogItem (uncompress_prog); + if (! (newlog->uncompress_prog = readPath(configFile, lineNum, "uncompress", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } if (access(newlog->uncompress_prog, X_OK)) { message(MESS_ERROR, "%s:%d uncompression program %s is not an executable file\n", configFile, lineNum, newlog->uncompress_prog); - free(newlog->uncompress_prog); - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "uncompress_prog is now %s\n", @@ -918,12 +1163,24 @@ } else if (!strcmp(start, "compressoptions")) { char *options; + if (newlog->compress_options_list) { + free_2d_array((char **)newlog->compress_options_list, + newlog->compress_options_count); + newlog->compress_options_list = NULL; + newlog->compress_options_count = 0; + } + *endtag = oldchar, start = endtag; if (! (options = readPath(configFile, lineNum, "compressoptions", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } if (poptParseArgvString(options, @@ -933,7 +1190,12 @@ "%s:%d invalid compression options\n", configFile, lineNum); free(options); - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "compress_options is now %s\n", @@ -941,11 +1203,19 @@ free(options); } else if (!strcmp(start, "compressext")) { *endtag = oldchar, start = endtag; + + freeLogItem (compress_ext); + if (! (newlog->compress_ext = readPath(configFile, lineNum, "compress-ext", &start))) { - return 1; + if (newlog != defConfig) { + logerror = 1; + continue; + } else { + return 1; + } } message(MESS_DEBUG, "compress_ext is now %s\n", @@ -973,7 +1243,8 @@ if (newlog != defConfig) { message(MESS_ERROR, "%s:%d unexpected log filename\n", configFile, lineNum); - return 1; + logerror = 1; + continue; } /* If no compression options were found in config file, @@ -989,7 +1260,7 @@ (*numLogsPtr)++; *logsPtr = realloc(*logsPtr, sizeof(**logsPtr) * *numLogsPtr); newlog = *logsPtr + *numLogsPtr - 1; - memcpy(newlog, defConfig, sizeof(*newlog)); + copyLogInfo(newlog, defConfig); endtag = start; while (*endtag != '{' && *endtag != '\0') @@ -1013,7 +1284,7 @@ newlog->files = NULL; newlog->numFiles = 0; - for (argNum = 0; argNum < argc; argNum++) { + for (argNum = 0; argNum < argc && logerror != 1; argNum++) { rc = glob(argv[argNum], GLOB_NOCHECK, globerr, &globResult); if (rc == GLOB_ABORTED) { @@ -1022,7 +1293,8 @@ message(MESS_ERROR, "%s:%d glob failed for %s\n", configFile, lineNum, argv[argNum]); - return 1; + logerror = 1; + break; } newlog->files = @@ -1045,8 +1317,8 @@ "%s:%d duplicate log entry for %s\n", configFile, lineNum, globResult.gl_pathv[i]); - globfree(&globResult); - return 1; + logerror = 1; + goto duperror; } } } @@ -1055,19 +1327,21 @@ strdup(globResult.gl_pathv[i]); newlog->numFiles++; } +duperror: globfree(&globResult); } newlog->pattern = strdup(start); - message(MESS_DEBUG, "reading config info for %s\n", start); + if (!logerror) + message(MESS_DEBUG, "reading config info for %s\n", start); free(argv); start = endtag + 1; } else if (*start == '}') { if (newlog == defConfig) { - message(MESS_ERROR, "%s:%d unxpected }\n", configFile, + message(MESS_ERROR, "%s:%d unexpected }\n", configFile, lineNum); return 1; } Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- logrotate.spec 10 Jan 2007 14:07:27 -0000 1.55 +++ logrotate.spec 23 Jan 2007 12:09:11 -0000 1.56 @@ -1,7 +1,7 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate Version: 3.7.4 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz @@ -9,6 +9,7 @@ Patch2: logrotate-fdLeak.patch Patch3: logrotate-sizeOption.patch Patch4: logrotate-widecharPath.patch +Patch5: logrotate-errorConfiguration.patch BuildRoot: %{_tmppath}/%{name}-%{version}.root BuildRequires: libselinux-devel @@ -30,6 +31,7 @@ %patch2 -p1 -b .fdLeak %patch3 -p1 -b .sizeOption %patch4 -p1 -b .widecharPath +%patch5 -p1 -b .errorConfiguration %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g" \ @@ -60,6 +62,10 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Tue Jan 23 2007 Peter Vrabec 3.7.4-11 +- logrotate won't stop if there are some errors in configuration + or glob failures (#166510, #182062) + * Wed Jan 10 2007 Peter Vrabec 3.7.4-10 - fix some rpmlint issues From fedora-cvs-commits at redhat.com Tue Jan 23 12:15:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:15:35 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch, NONE, 1.1 ooobuild.VBAObjects.patch, 1.8, 1.9 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.14, 1.15 openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.9, 1.10 openoffice.org.spec, 1.998, 1.999 workspace.fwk59.patch, 1.1, NONE workspace.impress115.patch, 1.2, NONE Message-ID: <200701231215.l0NCFZAc008952@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8929 Modified Files: ooobuild.VBAObjects.patch openoffice.org-1.9.129.ooo54603.fontconfig.patch openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch openoffice.org.spec Added Files: openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch Removed Files: workspace.fwk59.patch workspace.impress115.patch Log Message: next version openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch: build.lst | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch --- --- openoffice.org.orig/javaunohelper/prj/build.lst 2007-01-22 10:09:16.000000000 +0000 +++ openoffice.org/javaunohelper/prj/build.lst 2007-01-22 10:07:13.000000000 +0000 @@ -2,7 +2,7 @@ jh javaunohelper usr1 - all jh_mkout NULL jh javaunohelper\inc nmake - all jh_inc NULL jh javaunohelper\com\sun\star\comp\helper nmake - all jh_helper jh_inc NULL -jh javaunohelper\com\sun\star\comp\juhtest nmake - all jh_juhtest jh_helper NULL +jh javaunohelper\com\sun\star\comp\juhtest nmake - all jh_juhtest jh_helper jh_libhelp NULL jh javaunohelper\com\sun\star\comp nmake - all jh_comp jh_juhtest NULL jh javaunohelper\com\sun\star\lib\uno\adapter nmake - all jh_adapter jh_libhelp jh_inc NULL jh javaunohelper\com\sun\star\lib\uno\helper nmake - all jh_libhelp jh_inc NULL ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 254 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 163 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl | 20 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 13 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 219 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 116 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 8 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 101 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 126 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlocx.cxx | 146 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3743 ++++++++++ sc/source/ui/vba/vbarange.hxx | 235 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 40 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 425 files changed, 20344 insertions(+), 636 deletions(-) Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ooobuild.VBAObjects.patch 22 Jan 2007 09:27:00 -0000 1.8 +++ ooobuild.VBAObjects.patch 23 Jan 2007 12:15:33 -0000 1.9 @@ -1,668 +1,3 @@ -Index: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu -=================================================================== -RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu,v -retrieving revision 1.14 -diff -u -w -p -r1.14 CalcCommands.xcu ---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 15 Mar 2005 12:42:05 -0000 1.14 -+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 28 Nov 2005 19:35:06 -0000 -@@ -1418,6 +1418,20 @@ - R~ight-To-Left - - -+ -+ -+ Use R1~C1 -+ Pou??ij R1~C1 -+ R1~C1 verwenden -+ Usar R1~C1 -+ Utiliser R1~C1 -+ Utilizza R1~C1 -+ R1~C1??????????????? -+ Usar R1~C1 -+ ?????? R1C1(~C) -+ ?????? R1C1(~C) -+ -+ - - - Verankerung: An der Seite -diff -r -u -p sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml ---- sc/uiconfig/scalc/menubar/menubar.xml 2006-09-05 23:35:36.000000000 -0400 -+++ sc/uiconfig/scalc/menubar/menubar.xml 2006-08-24 10:45:05.000000000 -0400 -@@ -213,6 +213,7 @@ - - - -+ - - - -diff -r -u -p sc/inc/scfuncs.hrc sc/inc/scfuncs.hrc ---- sc/inc/scfuncs.hrc 2006-09-05 23:35:37.000000000 -0400 -+++ sc/inc/scfuncs.hrc 2006-08-24 10:47:20.000000000 -0400 -@@ -300,5 +300,7 @@ - #define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) - #define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) -+#define HID_FUNC_INDIREKT_XL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+21) -+#define HID_FUNC_ADRESSE_XL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+22) - - #define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) - #define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) -diff -r -u -p sc/inc/sc.hrc sc/inc/sc.hrc ---- sc/inc/sc.hrc 2006-09-05 23:35:37.000000000 -0400 -+++ sc/inc/sc.hrc 2006-08-24 10:45:04.000000000 -0400 -@@ -805,6 +805,7 @@ - #define FID_TAB_APPEND (TAB_POPUP_START+5) - #define FID_TAB_INDEX (TAB_POPUP_START+6) - #define FID_TAB_RTL (TAB_POPUP_START+7) -+#define FID_TAB_USE_R1C1 (TAB_POPUP_START+8) - - #define TAB_POPUP_END (DATA_MENU_END + 20) - -diff -r -u -p sc/sdi/docsh.sdi sc/sdi/docsh.sdi ---- sc/sdi/docsh.sdi 2006-09-05 23:35:37.000000000 -0400 -+++ sc/sdi/docsh.sdi 2006-08-24 10:45:04.000000000 -0400 -@@ -68,6 +68,7 @@ interface TableSelection - FID_DELETE_TABLE [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TAB_RENAME [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - FID_TAB_RTL [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] -+ FID_TAB_USE_R1C1 [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] - - SID_TABLE_ACTIVATE [ ExecMethod = Execute; ] - } -diff -r -u -p sc/sdi/scalc.sdi sc/sdi/scalc.sdi ---- sc/sdi/scalc.sdi 2006-09-05 23:35:37.000000000 -0400 -+++ sc/sdi/scalc.sdi 2006-08-24 10:45:04.000000000 -0400 -@@ -7754,3 +7754,30 @@ SfxBoolItem SheetRightToLeft FID_TAB_RTL - ] - - -+//-------------------------------------------------------------------------- -+SfxBoolItem SheetUseR1C1 FID_TAB_USE_R1C1 -+ -+[ -+ /* flags */ -+ AutoUpdate = FALSE, -+ Cachable = Cachable, -+ FastCall = FALSE, -+ HasCoreId = FALSE, -+ HasDialog = FALSE, -+ ReadOnlyDoc = TRUE, -+ Toggle = FALSE, -+ Container = FALSE, -+ RecordAbsolute = FALSE, -+ RecordPerSet; -+ Synchron; -+ -+ Readonly = FALSE, -+ -+ /* config */ -+ AccelConfig = TRUE, -+ MenuConfig = TRUE, -+ StatusBarConfig = FALSE, -+ ToolBoxConfig = TRUE, -+ GroupId = GID_FORMAT; -+] -+ -diff -r -u -p sc/source/core/src/compiler.src sc/source/core/src/compiler.src ---- sc/source/core/src/compiler.src 2006-09-05 23:35:39.000000000 -0400 -+++ sc/source/core/src/compiler.src 2006-08-24 10:45:05.000000000 -0400 -@@ -1092,12 +1092,24 @@ Resource RID_SC_FUNCTION_NAMES - Text [ en-US ] = "INDIRECT" ; - Text [ x-comment ] = " "; - }; -+ String SC_OPCODE_INDIRECT_XL -+ { -+ Text [ de ] = "INDIREKT_XL" ; -+ Text [ en-US ] = "INDIRECT_XL" ; -+ Text [ x-comment ] = " "; -+ }; - String SC_OPCODE_ADDRESS - { - Text [ de ] = "ADRESSE" ; - Text [ en-US ] = "ADDRESS" ; - Text [ x-comment ] = " "; - }; -+ String SC_OPCODE_ADDRESS_XL -+ { -+ Text [ de ] = "ADRESSE_XL" ; -+ Text [ en-US ] = "ADDRESS_XL" ; -+ Text [ x-comment ] = " "; -+ }; - String SC_OPCODE_MATCH - { - Text [ de ] = "VERGLEICH" ; -@@ -1879,7 +1891,9 @@ Resource RID_SC_FUNCTION_NAMES_ENGLISH - String SC_OPCODE_DB_VAR { Text = "DVAR" ; }; - String SC_OPCODE_DB_VAR_P { Text = "DVARP" ; }; - String SC_OPCODE_INDIRECT { Text = "INDIRECT" ; }; -+ String SC_OPCODE_INDIRECT_XL { Text = "INDIRECT_XL" ; }; - String SC_OPCODE_ADDRESS { Text = "ADDRESS" ; }; -+ String SC_OPCODE_ADDRESS_XL { Text = "ADDRESS_XL" ; }; - String SC_OPCODE_MATCH { Text = "MATCH" ; }; - String SC_OPCODE_COUNT_EMPTY_CELLS { Text = "COUNTBLANK" ; }; - String SC_OPCODE_COUNT_IF { Text = "COUNTIF" ; }; -diff -r -u -p sc/source/filter/excel/excdoc.cxx sc/source/filter/excel/excdoc.cxx ---- sc/source/filter/excel/excdoc.cxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/excel/excdoc.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -326,7 +326,7 @@ void ExcTable::FillAsTable( size_t nCode - { - Add( new ExcBof8 ); - Add( new XclCalccount( rDoc ) ); -- Add( new XclRefmode() ); -+ Add( new XclRefmode( rDoc ) ); - Add( new XclIteration( rDoc ) ); - Add( new XclDelta( rDoc ) ); - Add( new ExcDummy8_02 ); -diff -r -u -p sc/source/filter/excel/excform.cxx sc/source/filter/excel/excform.cxx ---- sc/source/filter/excel/excform.cxx 2006-09-05 23:35:38.000000000 -0400 -+++ sc/source/filter/excel/excform.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -1372,12 +1372,6 @@ void ExcelToSc::DoMulArgs( DefTokenId eI - if( eId == ocPercentrank && nAnz == 3 ) - nSkipEnd = 0; // letzten Parameter bei Bedarf weglassen - -- else if( eId == ocIndirect && nAnz == 2 ) -- nSkipEnd = 0; -- -- else if( eId == ocAddress && nAnz > 3 ) -- nNull = nAnz - 4; -- - // Joost-Spezialfaelle - else if( eId == ocIf ) - { -diff -r -u -p sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx ---- sc/source/filter/excel/excimp8.cxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/excel/excimp8.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -190,6 +190,12 @@ void ImportExcel8::Iteration( void ) - } - - -+void ImportExcel8::RefMode( void ) -+{ -+ pD->SetAddressConvention( (aIn.ReaduInt16() == 0) -+ ? ScAddress::CONV_XL_R1C1 -+ : ScAddress::CONV_OOO ); -+} - void ImportExcel8:: WinProtection( void ) - { - if( aIn.ReaduInt16() != 0 ) -diff -r -u -p sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx ---- sc/source/filter/excel/read.cxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/excel/read.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -1145,6 +1145,7 @@ FltError ImportExcel8::Read( void ) - case 0x0206: - case 0x0406: Formula25(); break; // FORMULA [ 2 5 ] - case 0x000C: Calccount(); break; // CALCCOUNT -+ case 0x000F: RefMode(); break; // REFMODE - case 0x0010: Delta(); break; // DELTA - case 0x0011: Iteration(); break; // ITERATION - case 0x001C: Note(); break; // NOTE [ 2345 ] -diff -r -u -p sc/source/filter/excel/xlformula.cxx sc/source/filter/excel/xlformula.cxx ---- sc/source/filter/excel/xlformula.cxx 2006-09-05 23:35:38.000000000 -0400 -+++ sc/source/filter/excel/xlformula.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -187,7 +187,8 @@ static const XclFunctionInfo saFuncTable - { ocLIA, 142, 3, 3, V, { V } }, - { ocDIA, 143, 4, 4, V, { V } }, - { ocGDA, 144, 4, 5, V, { V } }, -- { ocIndirect, 148, 1, 2, R, { V }, EXC_FUNCFLAG_VOLATILE }, -+ { ocIndirectXL, 148, 1, 2, R, { V }, EXC_FUNCFLAG_VOLATILE }, -+ { ocIndirect, 148, 1, 2, R, { V }, EXC_FUNCFLAG_VOLATILE | EXC_FUNCFLAG_EXPORTONLY }, - { ocClean, 162, 1, 1, V, { V } }, - { ocMatDet, 163, 1, 1, V, { A } }, - { ocMatInv, 164, 1, 1, A, { A } }, -@@ -219,7 +220,8 @@ static const XclFunctionInfo saFuncTable - { ocRKP, 51, 1, 4, A, { R, R, V, V } }, // BIFF2: 1-2, BIFF3: 1-4 - { ocGrowth, 52, 1, 4, A, { R, R, R, V } }, // BIFF2: 1-3, BIFF3: 1-4 - { ocTrunc, 197, 1, 2, V, { V } }, // BIFF2: 1, BIFF3: 1-2 -- { ocAddress, 219, 2, 5, V, { V, V, V, E, V } }, -+ { ocAddressXL, 219, 2, 5, V, { V, V, V, V, V } }, -+ { ocAddress, 219, 2, 5, V, { V, V, V, E, V }, EXC_FUNCFLAG_EXPORTONLY }, - { ocGetDiffDate360, 220, 2, 2, V, { V, V, C, I } }, - { ocGetActDate, 221, 0, 0, V, {}, EXC_FUNCFLAG_VOLATILE }, - { ocVBD, 222, 5, 7, V, { V } }, -diff -r -u -p sc/source/filter/inc/excimp8.hxx sc/source/filter/inc/excimp8.hxx ---- sc/source/filter/inc/excimp8.hxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/inc/excimp8.hxx 2006-08-24 10:45:05.000000000 -0400 -@@ -76,6 +76,7 @@ class ImportExcel8 : public ImportExcel - - void Calccount( void ); // 0x0C - void Precision( void ); // 0x0E -+ void RefMode( void ); // 0x0F - void Delta( void ); // 0x10 - void Iteration( void ); // 0x11 - void Note( void ); // 0x1C -diff -r -u -p sc/source/filter/inc/xcl97dum.hxx sc/source/filter/inc/xcl97dum.hxx ---- sc/source/filter/inc/xcl97dum.hxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/inc/xcl97dum.hxx 2006-08-24 10:45:05.000000000 -0400 -@@ -97,15 +97,4 @@ public: - }; - - --class XclRefmode : public ExcDummyRec --{ --private: -- static const BYTE pMyData[]; -- static const sal_Size nMyLen; --public: -- virtual sal_Size GetLen( void ) const; -- virtual const BYTE* GetData( void ) const; --}; -- -- - #endif // _XCL97DUM_HXX -diff -r -u -p sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx ---- sc/source/filter/inc/xcl97rec.hxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/inc/xcl97rec.hxx 2006-08-24 10:45:05.000000000 -0400 -@@ -506,6 +506,20 @@ public: - virtual const BYTE* GetData( void ) const; - }; - -+class XclRefmode : public ExcRecord -+{ -+private: -+ UINT16 eConv; -+protected: -+ virtual void SaveCont( XclExpStream& rStrm ); -+public: -+ XclRefmode( ScDocument& rDoc ); -+ -+ virtual UINT16 GetNum() const; -+ virtual ULONG GetLen() const; -+}; -+ -+ - - // ------------------------------------------------------------------- - -diff -r -u -p sc/source/filter/lotus/lotform.cxx sc/source/filter/lotus/lotform.cxx ---- sc/source/filter/lotus/lotform.cxx 2006-09-05 23:35:38.000000000 -0400 -+++ sc/source/filter/lotus/lotform.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -1056,7 +1056,7 @@ DefTokenId LotusToSc::IndexToToken( BYTE - ocTrue, // 112 W() - ocExact, // 113 Exact() - ocNoName, // 114 Call() -- ocIndirect, // 115 @@() -+ ocIndirectXL, // 115 @@() - ocZins, // 116 Rate() - ocNoName, // 117 Term() - ocNoName, // 118 Cterm() -@@ -1587,7 +1587,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( - ocNoName, // 112 W() - ocExact, // 113 Exact() - ocNoName, // 114 Call() -- ocIndirect, // 115 @@() -+ ocIndirectXL, // 115 @@() - ocZins, // 116 Rate() - ocNoName, // 117 Term() - ocNoName, // 118 Cterm() -diff -r -u -p sc/source/filter/xcl97/xcl97dum.cxx sc/source/filter/xcl97/xcl97dum.cxx ---- sc/source/filter/xcl97/xcl97dum.cxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/xcl97/xcl97dum.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -104,10 +104,6 @@ const BYTE ExcDummy8_02::pMyData[] = { - const sal_Size ExcDummy8_02::nMyLen = sizeof(ExcDummy8_02::pMyData); - - --const BYTE XclRefmode::pMyData[] = { 0x0f, 0x00, 0x02, 0x00, 0x01, 0x00 }; // REFMODE --const sal_Size XclRefmode::nMyLen = sizeof( XclRefmode::pMyData ); -- -- - // --- class ExcDummy8_xx -------------------------------------------- - - sal_Size ExcDummy8_00a::GetLen() const -@@ -173,18 +169,3 @@ const BYTE* ExcDummy8_02::GetData() cons - return pMyData; - } - -- -- --sal_Size XclRefmode::GetLen( void ) const --{ -- return nMyLen; --} -- -- --const BYTE* XclRefmode::GetData( void ) const --{ -- return pMyData; --} -- -- -- -diff -r -u -p sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx ---- sc/source/filter/xcl97/xcl97rec.cxx 2006-09-05 23:35:40.000000000 -0400 -+++ sc/source/filter/xcl97/xcl97rec.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -1302,6 +1302,28 @@ const BYTE* XclProtection::GetData( void - - - -+void XclRefmode::SaveCont( XclExpStream& rStrm ) -+{ -+ rStrm << eConv; -+} -+ -+ -+XclRefmode::XclRefmode( ScDocument& rDoc ) -+{ -+ eConv = (rDoc.GetAddressConvention() == ScAddress::CONV_XL_R1C1) ? 0 : 1; -+} -+ -+ -+UINT16 XclRefmode::GetNum() const -+{ -+ return 0x000f; -+} -+ -+ -+ULONG XclRefmode::GetLen() const -+{ -+ return 2; -+} - - - -diff -r -u -p sc/source/ui/src/scfuncs.src sc/source/ui/src/scfuncs.src ---- sc/source/ui/src/scfuncs.src 2006-09-05 23:35:41.000000000 -0400 -+++ sc/source/ui/src/scfuncs.src 2006-08-24 10:45:05.000000000 -0400 -@@ -9047,6 +9047,104 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 - Text [ x-comment ] = " "; - }; - }; -+ Resource SC_OPCODE_ADDRESS_XL -+ { -+ String 1 // Description -+ { -+ Text [ en-US ] = "Returns the reference to a cell as text." ; -+ Text[ cs ] = "Vr??t?? odkaz na bu??ku jako text."; -+ Text[ de ] = "Gibt die Referenz auf eine Zelle als Text zur??ck."; -+ Text[ es ] = "Devuelve la referencia a una celda en formato de texto."; -+ Text[ fr ] = "Retourne la r??f??rence ?? une cellule sous forme de texte."; -+ Text[ it ] = "Restituisce un riferimento a una cella come testo."; -+ Text[ ja ] = "?????????????????????????????????????????????????????????"; -+ Text[ pt-BR ] = "Retorna a refer??ncia a uma c??lula como texto."; -+ Text[ zh-CN ] = "???????????????????????????????????????"; -+ Text[ zh-TW ] = "???????????????????????????????????????"; -+ Text [ x-comment ] = " "; -+ }; -+ ExtraData = -+ { -+ ID_FUNCTION_GRP_TABLE; -+ U2S( HID_FUNC_ADRESSE_XL ); -+ 5; 0; 0; 1; 1; 1; -+ }; -+ String 2 // Name of Parameter 1 -+ { -+ Text [ de ] = "Zeile" ; -+ Text [ en-US ] = "row" ; -+ Text [ cs ] = "????dek"; -+ Text [ x-comment ] = " "; -+ }; -+ String 3 // Description of Parameter 1 -+ { -+ Text [ de ] = "Die Zeilennummer der Zelle." ; -+ Text [ en-US ] = "The row number of the cell." ; -+ Text [ cs ] = "????slo ????dku bu??ky."; -+ Text [ x-comment ] = " "; -+ }; -+ String 4 // Name of Parameter 2 -+ { -+ Text [ de ] = "Spalte" ; -+ Text [ en-US ] = "column" ; -+ Text [ cs ] = "Sloupec"; -+ Text [ x-comment ] = " "; -+ }; -+ String 5 // Description of Parameter 2 -+ { -+ Text [ de ] = "Die Spaltennummer der Zelle." ; -+ Text [ en-US ] = "The column number of the cell." ; -+ Text [ cs ] = "????slo sloupce bu??ky."; -+ Text [ x-comment ] = " "; -+ }; -+ String 6 // Name of Parameter 3 -+ { -+ Text [ de ] = "ABS" ; -+ Text [ en-US ] = "ABS" ; -+ Text [ x-comment ] = " "; -+ }; -+ String 7 // Description of Parameter 3 -+ { -+ Text [ de ] = "Gibt an, ob absolute oder relative Referenzierung verwendet wird." ; -+ Text [ en-US ] = "Specifies whether absolute or relative referencing is to be used." ; -+ Text [ cs ] = "Specifikuje zda budou pou??ity absolutn?? nebo relativn?? odkazy."; -+ Text [ x-comment ] = " "; -+ }; -+ String 8 // Name of Parameter 4 -+ { -+ Text [ de ] = " "; -+ Text [ en-US ] = "A1"; -+ Text [ x-comment ] = " "; -+ }; -+ String 9 // Description of Parameter 4 -+ { -+ Text [ en-US ] = "If TRUE (or 1) or omitted generate A1 style address, otherwise produce R1C1 style address."; -+ Text[ cs ] = "Pokud je hodnota pravdiv?? (nebo 1) nebo je vynech??na, adresy budou ve stylu A1. V opa??n??m p????pad?? bude pou??it styl R1C1."; -+ Text[ de ] = "Wenn TRUE (oder 1) bzw. ausgelassen, A1-Adresse generieren, anderenfalls R1C1-Adresse erstellen."; -+ Text[ es ] = "Si el valor es TRUE (o 1) o se omite, genera una direcci??n del estilo A1; de lo contrario, genera una direcci??n del estilo R1C1."; -+ Text[ fr ] = "Si TRUE (ou 1) ou omis, g??n??rer une adresse de style A1. Sinon, produire une adresse de style R1C1."; -+ Text[ it ] = "Se impostato su TRUE (o 1) oppure se omesso genera un indirizzo tipo A1, altrimenti genera un indirizzo di tipo R1C1."; -+ Text[ ja ] = "TRUE (1)?????????A1????????????????????????????????????????????????????????????R1C1????????????????????????????????????????????????"; -+ Text[ pt-BR ] = "Se VERDADEIRO (ou 1) ou omitido, gerar endere??o em estilo A1; caso contr??rio produzir endere??o em estilo R1C1."; -+ Text[ zh-CN ] = "????????? TRUE?????? 1?????????????????? A1 ??????????????????????????? R1C1 ???????????????"; -+ Text[ zh-TW ] = "??????????????? TRUE (??? 1) ???????????????????????? A1 ?????????????????????????????????????????? R1C1 ???????????????"; -+ Text [ x-comment ] = " "; -+ }; -+ String 10 // Name of Parameter 5 -+ { -+ Text [ de ] = "Tabelle" ; -+ Text [ en-US ] = "sheet" ; -+ Text [ cs ] = "List"; -+ Text [ x-comment ] = " "; -+ }; -+ String 11 // Description of Parameter 5 -+ { -+ Text [ de ] = "Der Tabellenname des Zellbezugs." ; -+ Text [ en-US ] = "The spreadsheet name of the cell reference." ; -+ Text [ cs ] = "N??zev se??itu odkazuj??c?? bu??ky"; -+ Text [ x-comment ] = " "; -+ }; -+ }; - // -=*# Resource for function BEREICHE #*=- - Resource SC_OPCODE_AREAS - { -@@ -9512,6 +9601,57 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 - Text [ x-comment ] = " "; - }; - }; -+ // -=*# Resource for function INDIREKT_XL #*=- -+ Resource SC_OPCODE_INDIRECT_XL -+ { -+ String 1 // Description -+ { -+ Text [ de ] = "Bestimmt den Inhalt einer als Bezug in MS Excel (tm) Textform angegebenen Zelle." ; -+ Text [ en-US ] = "Returns the contents of a cell that is referenced in MS Excel (tm) text form." ; -+ Text [ cs ] = "Vr??t?? obsah bu??ky na kterou se odkazuje pomoc?? textov?? formy MS Excelu (tm)."; -+ Text [ x-comment ] = " "; -+ }; -+ ExtraData = -+ { -+ ID_FUNCTION_GRP_TABLE; -+ U2S( HID_FUNC_INDIREKT_XL ); -+ 2; 0; 1; -+ }; -+ String 2 // Name of Parameter 1 -+ { -+ Text [ de ] = "Bezug" ; -+ Text [ en-US ] = "ref " ; -+ Text [ x-comment ] = " "; -+ }; -+ String 3 // Description of Parameter 1 -+ { -+ Text [ de ] = "Die Zelle, deren Inhalt ausgewertet werden soll als Bezug in MS Excel (tm) Textform (z.B. \"Sheet!A1\")." ; -+ Text [ en-US ] = "The cell whose contents are to be evaluated is to be referenced in MS Excel (tm) text form (e.g. \"Sheet!A1\")." ; -+ Text [ cs ] = "Na bu??ku, jej???? obsah bude vyhodnocov??n, bude odkazov??no ve form??tu MS Excelu (tm) (nap??. \"List!A1\")."; -+ Text [ x-comment ] = " "; -+ }; -+ String 4 // Name of Parameter 2 -+ { -+ Text [ de ] = "'Adressformat'" ; -+ Text [ en-US ] = "Format" ; -+ Text [ cs ] = "Form??t"; -+ Text [ x-comment ] = " "; -+ }; -+ String 5 // Description of Parameter 2 -+ { -+ Text [ en-US ] = "What address format to expect. TRUE for A1, FALSE for R1C1. Defaults to A1." ; -+ Text[ cs ] = "Jak?? form??t odkazu je o??ek??v??n. TRUE (pravda) pro A1, FALSE (nepravda) pro R1C1. Standardn?? A1."; -+ Text[ de ] = "Zu erwartendes Adressformat. TRUE f??r A1, FALSE f??r R1C1. Standardm????ig wird A1 verwendet."; -+ Text[ es ] = "Formato de direcci??n que se debe esperar. TRUE para A1, FALSE para R1C1. El valor por defecto es A1."; -+ Text[ fr ] = "Quel format d'adresse attendre. TRUE pour A1, FALSE pour R1C1. La valeur par d??faut est A1."; -+ Text[ it ] = "Formato di indirizzo previsto. TRUE per A1, FALSE per R1C1. Il valore predefinito ?? A1."; -+ Text[ ja ] = "????????????????????????????????? TRUE????????????A1???FALSE????????????R1C1???????????????????????? ????????????????????????A1??????????????????"; -+ Text[ pt-BR ] = "Formato do endere??o esperado. VERDADEIRO para A1, FALSO para R1C1. Usa A1 por padr??o."; -+ Text[ zh-CN ] = "???????????????????????????TRUE ?????? A1???FALSE ?????? R1C1??????????????? A1???"; -+ Text[ zh-TW ] = "?????????????????????????????????TRUE ????????? A1 ?????????FALSE ????????? R1C1 ???????????????????????? A1 ?????????"; -+ Text [ x-comment ] = " "; -+ }; -+ }; - // -=*# Resource for function VERWEIS #*=- - Resource SC_OPCODE_LOOKUP - { -diff -r -u -p sc/source/ui/view/tabvwshf.cxx sc/source/ui/view/tabvwshf.cxx ---- sc/source/ui/view/tabvwshf.cxx 2006-09-05 23:35:41.000000000 -0400 -+++ sc/source/ui/view/tabvwshf.cxx 2006-08-24 10:45:05.000000000 -0400 -@@ -687,6 +687,17 @@ void ScTabViewShell::ExecuteTable( SfxRe - } - break; - -+ case FID_TAB_USE_R1C1: -+ { -+ ScDocFunc aFunc( *pViewData->GetDocShell() ); -+ const ScAddress::Convention eConv = -+ (pDoc->GetAddressConvention() == ScAddress::CONV_OOO) -+ ? ScAddress::CONV_XL_R1C1 : ScAddress::CONV_OOO ; -+ -+ aFunc.SetAddressConvention( eConv ); -+ } -+ break; -+ - default: - DBG_ERROR("Unbekannte Message bei ViewShell"); - break; -@@ -806,6 +817,13 @@ void ScTabViewShell::GetStateTable( SfxI - rSet.Put( SfxBoolItem( nWhich, pDoc->IsLayoutRTL( nTab ) ) ); - } - break; -+ -+ case FID_TAB_USE_R1C1: -+ { -+ const ScAddress::Convention eConv = pDoc->GetAddressConvention(); -+ rSet.Put( SfxBoolItem( nWhich, eConv == ScAddress::CONV_XL_R1C1 ) ); -+ } -+ break; - } - nWhich = aIter.NextWhich(); - } -diff -u -w -p -r1.26 interpre.hxx ---- sc/source/core/inc/interpre.hxx 18 Oct 2006 12:21:05 -0000 1.26 -+++ sc/source/core/inc/interpre.hxx 30 Oct 2006 15:38:14 -0000 -@@ -424,7 +426,9 @@ void ScDBStdDevP(); - void ScDBVar(); - void ScDBVarP(); - void ScIndirect(); -+void ScIndirectXL(); - void ScAddressFunc(); -+void ScAddressXL(); - void ScOffset(); - void ScIndex(); - void ScMultiArea(); -diff -u -w -p -r1.41 interpr1.cxx ---- sc/source/core/tool/interpr1.cxx 18 Oct 2006 12:22:33 -0000 1.41 -+++ sc/source/core/tool/interpr1.cxx 30 Oct 2006 15:38:15 -0000 -@@ -5361,7 +5366,7 @@ void ScInterpreter::ScDBVarP() - } - - --#if 0 -+#if 1 - // This could be the code to handle Excel notation. However, we don't offer it - // (yet) at UI level and documents must not use it, as it isn't clarified how - // to handle interoperability issues. -@@ -5458,7 +5463,7 @@ void ScInterpreter::ScAddressFunc() - } - - --#if 0 -+#if 1 - // This could be the code to handle Excel notation. However, we don't offer it - // (yet) at UI level and documents must not use it, as it isn't clarified how - // to handle interoperability issues. -Index: sc/source/core/tool/interpr4.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/core/tool/interpr4.cxx,v -retrieving revision 1.43 -diff -u -w -p -r1.43 interpr4.cxx ---- sc/source/core/tool/interpr4.cxx 18 Oct 2006 12:22:49 -0000 1.43 -+++ sc/source/core/tool/interpr4.cxx 15 Nov 2006 19:51:20 -0000 -@@ -3401,7 +3426,9 @@ StackVar ScInterpreter::Interpret() - case ocDBVar : ScDBVar(); break; - case ocDBVarP : ScDBVarP(); break; - case ocIndirect : ScIndirect(); break; -+ case ocIndirectXL : ScIndirectXL(); break; - case ocAddress : ScAddressFunc(); break; -+ case ocAddressXL : ScAddressXL(); break; - case ocMatch : ScMatch(); break; - case ocCountEmptyCells : ScCountEmptyCells(); break; - case ocCountIf : ScCountIf(); break; -Index: sc/source/core/tool/address.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/core/tool/address.cxx,v -retrieving revision 1.6 -diff -u -w -p -r1.6 address.cxx ---- sc/source/core/tool/address.cxx 18 Oct 2006 12:21:36 -0000 1.6 -+++ sc/source/core/tool/address.cxx 17 Nov 2006 17:12:41 -0000 -@@ -118,7 +118,7 @@ - SCTAB nTab; - const sal_Unicode *p = start; - -- pAddr->SetTab( 0 ); -+ //pAddr->SetTab( 0 ); - if( *p == '\'' ) // XL only seems to use single quotes for sheet names - { - for( p++; *p ; ) -@@ -156,7 +156,7 @@ - while( 1 ) - { - const sal_Unicode uc = *p; -- if( CharClass::isAsciiAlpha( uc ) || uc == '_' ) -+ if( (uc < 128 ? CharClass::isAsciiAlpha( uc ) : ScGlobal::pCharClass->isLetter( uc )) || uc == '_' ) - { - if( only_digits && p != start && - (uc == 'e' || uc == 'E' ) ) -@@ -280,7 +280,7 @@ - else - { - nFlags |= SCA_VALID_TAB | SCA_VALID_TAB2; -- r.aEnd.SetTab( 0 ); -+ // Use the current tab, it needs to be passed in. : r.aEnd.SetTab( .. ); - } - - return p; -@@ -824,14 +824,14 @@ - - case ScAddress::CONV_XL_A1: - { -- ScRange r; -+ ScRange r = rAddr; - USHORT nFlags = lcl_ScRange_Parse_XL_A1( r, p, pDoc, TRUE ); - rAddr = r.aStart; - return nFlags; - } - case ScAddress::CONV_XL_R1C1: - { -- ScRange r; -+ ScRange r = rAddr; - USHORT nFlags = lcl_ScRange_Parse_XL_R1C1( r, p, pDoc, rDetails, TRUE ); - rAddr = r.aStart; - return nFlags; diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/core/data/drwlayer.cxx 2006-06-14 17:46:55.000000000 +0100 +++ sc/source/core/data/drwlayer.cxx 2006-06-19 10:54:51.000000000 +0100 @@ -728,17 +63,17 @@ diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx 2006-06-14 17:46:55.000000000 +0100 +++ sc/source/filter/excel/xiescher.cxx 2006-06-19 11:07:24.000000000 +0100 -@@ -195,6 +195,9 @@ - #ifndef _SCH_MEMCHRT_HXX +@@ -220,6 +220,9 @@ #include #endif -+ + +#include "xicontent.hxx" +#include "userdat.hxx" - ++ using ::rtl::OUString; using ::rtl::OUStringBuffer; -@@ -403,6 +404,13 @@ XclImpDrawObjRef XclImpDrawObjBase::Read + using ::com::sun::star::uno::Reference; +@@ -443,6 +446,13 @@ void XclImpDrawObjBase::ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) { @@ -752,7 +87,7 @@ } Rectangle XclImpDrawObjBase::ReadClientAnchor( SvStream& rEscherStrm, const DffRecordHeader& rHeader ) -@@ -484,6 +492,38 @@ void XclImpDrawObjBase::DoProcessSdrObj( +@@ -523,6 +533,38 @@ if( !IsPrintable() ) GetTracer().TraceObjectNotPrintable(); } @@ -791,7 +126,7 @@ // ---------------------------------------------------------------------------- -@@ -644,9 +684,6 @@ void XclImpTbxControlObj::ReadSubRecord( +@@ -785,9 +827,6 @@ case EXC_ID_OBJ_FTGBODATA: ReadGboData( rStrm ); break; @@ -801,7 +136,7 @@ default: XclImpDrawObjBase::ReadSubRecord( rStrm, nSubRecId, nSubRecSize ); } -@@ -823,7 +860,7 @@ void XclImpTbxControlObj::WriteToPropert +@@ -800,7 +839,7 @@ bool XclImpTbxControlObj::FillMacroDescriptor( ScriptEventDescriptor& rEvent ) const { @@ -809,17 +144,8 @@ + if( GetMacroName().Len() ) { // type of action is dependent on control type - rEvent.ListenerType = XclTbxControlHelper::GetListenerType( GetObjType() ); -@@ -832,7 +869,7 @@ bool XclImpTbxControlObj::FillMacroDescr - { - // set the macro name - rEvent.ScriptType = XclTbxControlHelper::GetScriptType(); -- rEvent.ScriptCode = XclTbxControlHelper::GetScMacroName( maMacroName ); -+ rEvent.ScriptCode = XclTbxControlHelper::GetScMacroName( GetMacroName() ); - return true; - } - } -@@ -914,38 +951,6 @@ void XclImpTbxControlObj::ReadGboData( X + rEvent.ListenerType = XclControlObjHelper::GetTbxListenerType( GetObjType() ); +@@ -1055,38 +1094,6 @@ mbFlatBorder = ::get_flag( nStyle, EXC_OBJ_GBO_FLAT ); } @@ -858,7 +184,7 @@ // ---------------------------------------------------------------------------- XclImpOleObj::XclImpOleObj( const XclImpRoot& rRoot ) : -@@ -1381,7 +1386,8 @@ SdrObject* XclImpDffManager::ProcessObj( +@@ -1527,9 +1534,28 @@ /* Connect textbox data (string, alignment, text orientation) to object. #98132# don't ask for a text-ID, Escher export doesn't set one. */ @@ -867,33 +193,64 @@ + if( pDrawingObj ) pDrawingObj->SetTxoData( mrObjManager.FindTxoData( rObjData.rSpHd ) ); - // #118052# import internal name of a control -@@ -1391,6 +1397,21 @@ SdrObject* XclImpDffManager::ProcessObj( - if( aName.Len() ) - pOleObj->SetControlName( aName ); - } -+ else ++ // Generic shape bits hyper & macro ++ if ( xSdrObj.get() ) + { -+ // its a drawing object or form control -+ if ( pDrawingObj && xSdrObj.get() ) ++ String sHlinkURL = ReadHlinkProperty( rEscherStrm ); ++ if ( sHlinkURL.Len() ) + { -+ if ( pDrawingObj->GetMacroName().Len() ) // has associated macro -+ { -+ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); -+ DBG_ASSERT( pInfo, "shape macro info could not be created!" ); -+ -+ if ( pInfo ) -+ pInfo->SetMacro( XclTbxControlHelper::GetScMacroName(pDrawingObj->GetMacroName() ) ); -+ } ++ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); ++ if ( pInfo ) ++ pInfo->SetHlink( sHlinkURL ); ++ } ++ if ( xDrawObj->GetMacroName().Len() ) ++ { ++ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); ++ if ( pInfo ) ++ pInfo->SetMacro( XclTbxControlHelper::GetScMacroName( xDrawObj->GetMacroName() ) ); + } + } - ++ // try to create a custom SdrObject that overwrites the passed object SdrObjectPtr xNewSdrObj( CreateCustomSdrObject( *xDrawObj, rAnchorRect ) ); + if( xNewSdrObj.get() ) +@@ -1607,6 +1633,32 @@ + } + + // private -------------------------------------------------------------------- ++String XclImpDffManager::ReadHlinkProperty( SvStream& rEscherStrm ) const ++{ ++ String aString; ++ sal_uInt32 nPropId = DFF_Prop_pihlShape; ++ sal_uInt32 nBufferSize = GetPropertyValue( nPropId ); ++ if( (nBufferSize > 0) && SeekToContent( nPropId, rEscherStrm ) ) ++ { ++ const static sal_uInt16 nDummyId = 9999; ++ sal_uInt16 nRecSize = nBufferSize; ++ SvMemoryStream memStream; ++ ++ memStream << nDummyId; ++ memStream << nRecSize; ++ for ( sal_Int32 nByteCount = 0; nByteCount < nRecSize; ++nByteCount ) ++ { ++ sal_uInt8 aByte = 0; ++ rEscherStrm >> aByte; ++ memStream << aByte; ++ } ++ XclImpStream aLinkStream( memStream, GetRoot() ); ++ aLinkStream.StartNextRecord(); ++ XclImpHyperlink aHlink; ++ aString = aHlink.ReadHlinkRecord( aLinkStream ); ++ } ++ return aString; ++} + + void XclImpDffManager::ProcessDggContainer( SvStream& rEscherStrm, const DffRecordHeader& rDggHeader ) + { diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/inc/xiescher.hxx sc/source/filter/inc/xiescher.hxx --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/inc/xiescher.hxx 2006-06-14 17:46:55.000000000 +0100 +++ sc/source/filter/inc/xiescher.hxx 2006-06-19 10:54:51.000000000 +0100 -@@ -148,6 +148,8 @@ public: +@@ -147,6 +147,8 @@ sal_Size GetProgressSize() const; /** Additional processing for the passed SdrObject (calls virtual DoProcessSdrObj() function). */ void ProcessSdrObject( SdrObject& rSdrObj ) const; @@ -902,7 +259,7 @@ protected: /** Derived classes may return a progress bar size different from 1. */ -@@ -158,8 +160,11 @@ protected: +@@ -157,8 +159,11 @@ /** Creates an Escher anchor from the passed position (used for sheet charts). */ void CreateEscherAnchor( const Rectangle& rAnchorRect ); @@ -914,7 +271,7 @@ XclEscherAnchorRef mxAnchor; /// The position of the object in the containing sheet. XclObjId maObjId; /// Sheet index and object identifier. -@@ -278,12 +283,10 @@ private: +@@ -288,12 +293,10 @@ void ReadSbs( XclImpStream& rStrm ); /** Reads the contents of the ftGboData sub structure in an OBJ record. */ void ReadGboData( XclImpStream& rStrm ); @@ -928,14 +285,14 @@ sal_uInt16 mnState; /// Checked/unchecked state. sal_Int16 mnSelEntry; /// Index of selected entry (1-based). sal_Int16 mnSelType; /// Selection type. -@@ -471,6 +474,7 @@ protected: +@@ -473,6 +476,7 @@ + virtual FASTBOOL GetColorFromPalette( USHORT nIndex, Color& rColor ) const; + private: - /** Reads a string property from the passed Escher stream. */ - String ReadStringProperty( SvStream& rEscherStrm, sal_uInt32 nPropId ) const; + String ReadHlinkProperty( SvStream& rEscherStrm ) const; - /** Processes a drawing group container (global drawing data). */ void ProcessDggContainer( SvStream& rEscherStrm, const DffRecordHeader& rDggHeader ); + /** Processes a drawing container (all drawing data of a sheet). */ diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/ui/drawfunc/fudraw.cxx sc/source/ui/drawfunc/fudraw.cxx --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/ui/drawfunc/fudraw.cxx 2006-06-14 17:46:55.000000000 +0100 +++ sc/source/ui/drawfunc/fudraw.cxx 2006-06-19 11:36:02.000000000 +0100 @@ -1288,7 +645,7 @@ // additional IDs for list/range validity #define FID_VALID_LISTTYPE (SC_VIEW_START + 93) -+#define SID_ASSIGNMACRO (SC_VIEW_START + 94) ++#define SID_ASSIGNMACRO (SC_VIEW_START + 95) // Nachrichten ------------------------------------------------------------- @@ -2628,10 +1985,10 @@ @@ -574,6 +574,9 @@ // additional IDs for list/range validity #define FID_VALID_LISTTYPE (SC_VIEW_START + 93) - #define SID_ASSIGNMACRO (SC_VIEW_START + 94) -+#define SID_EDITLNK_ATTR_DLG (SC_VIEW_START + 95) -+#define SID_DELLNK (SC_VIEW_START + 96) -+#define SID_OPENLNK (SC_VIEW_START + 97) + #define SID_ASSIGNMACRO (SC_VIEW_START + 95) ++#define SID_EDITLNK_ATTR_DLG (SC_VIEW_START + 96) ++#define SID_DELLNK (SC_VIEW_START + 97) ++#define SID_OPENLNK (SC_VIEW_START + 98) // Nachrichten ------------------------------------------------------------- @@ -2797,92 +2154,6 @@ } void XclImpHyperlink::InsertUrl( const XclImpRoot& rRoot, const XclRange& rXclRange, const String& rUrl ) -diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx ---- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/excel/xiescher.cxx 2006-06-24 11:21:52.000000000 +0100 -+++ sc/source/filter/excel/xiescher.cxx 2006-06-24 12:19:39.000000000 +0100 -@@ -1387,30 +1387,34 @@ SdrObject* XclImpDffManager::ProcessObj( - /* Connect textbox data (string, alignment, text orientation) to object. - #98132# don't ask for a text-ID, Escher export doesn't set one. */ - XclImpDrawingObj* pDrawingObj = dynamic_cast< XclImpDrawingObj* >( xDrawObj.get() ); -+ - if( pDrawingObj ) - pDrawingObj->SetTxoData( mrObjManager.FindTxoData( rObjData.rSpHd ) ); - -+ // Generic shape bits hyper & macro -+ if ( xSdrObj.get() ) -+ { -+ String sHlinkURL = ReadHlinkProperty( rEscherStrm ); -+ if ( sHlinkURL.Len() ) -+ { -+ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); -+ if ( pInfo ) -+ pInfo->SetHlink( sHlinkURL ); -+ } -+ if ( xDrawObj->GetMacroName().Len() ) -+ { -+ ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); -+ if ( pInfo ) -+ pInfo->SetMacro( XclTbxControlHelper::GetScMacroName( xDrawObj->GetMacroName() ) ); -+ } -+ } - // #118052# import internal name of a control - if( XclImpOleObj* pOleObj = dynamic_cast< XclImpOleObj* >( xDrawObj.get() ) ) - { - String aName( ReadStringProperty( rEscherStrm, DFF_Prop_wzName ) ); - if( aName.Len() ) - pOleObj->SetControlName( aName ); -- } -- else -- { -- // its a drawing object or form control -- if ( pDrawingObj && xSdrObj.get() ) -- { -- if ( pDrawingObj->GetMacroName().Len() ) // has associated macro -- { -- ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); -- DBG_ASSERT( pInfo, "shape macro info could not be created!" ); -- -- if ( pInfo ) -- pInfo->SetMacro( XclTbxControlHelper::GetScMacroName(pDrawingObj->GetMacroName() ) ); -- } -- } -+ - } - - // try to create a custom SdrObject that overwrites the passed object -@@ -1479,6 +1483,32 @@ FASTBOOL XclImpDffManager::GetColorFromP - } - - // private -------------------------------------------------------------------- -+String XclImpDffManager::ReadHlinkProperty( SvStream& rEscherStrm ) const -+{ -+ String aString; -+ sal_uInt32 nPropId = DFF_Prop_pihlShape; -+ sal_uInt32 nBufferSize = GetPropertyValue( nPropId ); -+ if( (nBufferSize > 0) && SeekToContent( nPropId, rEscherStrm ) ) -+ { -+ const static sal_uInt16 nDummyId = 9999; -+ sal_uInt16 nRecSize = nBufferSize; -+ SvMemoryStream memStream; -+ -+ memStream << nDummyId; -+ memStream << nRecSize; -+ for ( sal_Int32 nByteCount = 0; nByteCount < nRecSize; ++nByteCount ) -+ { -+ sal_uInt8 aByte = 0; -+ rEscherStrm >> aByte; -+ memStream << aByte; -+ } -+ XclImpStream aLinkStream( memStream, GetRoot() ); -+ aLinkStream.StartNextRecord(); -+ XclImpHyperlink aHlink; -+ aString = aHlink.ReadHlinkRecord( aLinkStream ); -+ } -+ return aString; -+} - - String XclImpDffManager::ReadStringProperty( SvStream& rEscherStrm, sal_uInt32 nPropId ) const - { diff -rup /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/inc/xicontent.hxx sc/source/filter/inc/xicontent.hxx --- /data4/sles/ooo-buildNow/ooo-build/build/ooc680-m5/sc/source/filter/inc/xicontent.hxx 2006-06-23 15:46:18.000000000 +0100 +++ sc/source/filter/inc/xicontent.hxx 2006-06-24 12:19:39.000000000 +0100 @@ -21840,9 +21111,9 @@ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > --- /data4/sles/ooo-build-HEAD/ooo-build/build/src680-m175/sc/source/filter/excel/xlocx.cxx 2006-07-31 17:59:05.000000000 +0100 +++ sc/source/filter/excel/xlocx.cxx 2006-07-31 18:15:02.000000000 +0100 -@@ -76,13 +76,48 @@ - #ifndef _COM_SUN_STAR_FORM_BINDING_XLISTENTRYSOURCE_HPP_ - #include +@@ -58,13 +58,47 @@ + #ifndef _COM_SUN_STAR_FORM_XFORMCOMPONENT_HPP_ + #include #endif -#ifndef _COM_SUN_STAR_SCRIPT_SCRIPTEVENTDESCRIPTOR_HPP_ -#include @@ -21888,29 +21159,24 @@ + +#endif //ENABLE_VBA + -+ - #ifndef _SFX_OBJSH_HXX - #include + #ifndef _SVDPAGE_HXX + #include #endif -@@ -249,6 +284,9 @@ SdrObject* XclImpOcxConverter::CreateSdr - ScfPropertySet aPropSet( xModel ); - if( aPropSet.Is() ) - rOcxCtrlObj.WriteToPropertySet( aPropSet ); -+#ifdef ENABLE_VBA -+ RegisterOleMacros( xModel, rOcxCtrlObj ); -+#endif //ENABLE_VBA - } - } - return pSdrObj; -@@ -275,7 +313,6 @@ SdrObject* XclImpOcxConverter::CreateSdr +@@ -177,7 +211,13 @@ Reference< XShape > xShape; - // dummy size - ::com::sun::star::awt::Size aSize; -- - // try to insert the control into the form - if( InsertControl( xFormComp, aSize, &xShape, TRUE ) ) - { -@@ -435,23 +472,119 @@ void XclImpOcxConverter::ConvertSheetLin + // reads from mxStrm into xShape, inserts the control model into the form of the sheet + if( ReadOCXExcelKludgeStream( mxStrm, &xShape, TRUE ) ) ++ { + pSdrObj = FinalizeSdrObject( rOcxCtrlObj, xShape, rAnchorRect ); ++#ifdef ENABLE_VBA ++ if (pSdrObj) ++ RegisterOleMacros(XclControlObjHelper::GetModelFromShape(xShape), rOcxCtrlObj); ++#endif ++ } + } + catch( Exception& ) + { +@@ -273,22 +313,118 @@ void XclImpOcxConverter::RegisterTbxMacro( const XclImpTbxControlObj& rTbxCtrlObj ) { ScriptEventDescriptor aEvent; @@ -21956,7 +21222,7 @@ } } } - ++ +void XclImpOcxConverter::RegisterOleMacros( const Reference< XControlModel > & rxModel, const XclImpOleObj& rOcxCtrlObj ) +{ + // Need to search basic for macro's named e.g. ControlButton1_Click @@ -22028,10 +21294,9 @@ + } +} +#endif //ENABLE_VBA -+ + // ---------------------------------------------------------------------------- - XclExpOcxConverter::XclExpOcxConverter( const XclExpRoot& rRoot ) : Index: sc/source/filter/excel/makefile.mk =================================================================== RCS file: /cvs/sc/sc/source/filter/excel/makefile.mk,v openoffice.org-1.9.129.ooo54603.fontconfig.patch: OOE680_m6/psprint/inc/psprint/fontmanager.hxx | 11 OOE680_m6/psprint/source/fontmanager/fontcache.cxx | 2 OOE680_m6/psprint/source/fontmanager/fontconfig.cxx | 410 +++++++++++++++---- OOE680_m6/psprint/source/fontmanager/fontmanager.cxx | 9 OOE680_m6/vcl/inc/outdev.h | 2 OOE680_m6/vcl/inc/outfont.hxx | 15 OOE680_m6/vcl/inc/sallayout.hxx | 1 OOE680_m6/vcl/source/gdi/outdev3.cxx | 345 +++++++++++---- OOE680_m6/vcl/source/gdi/sallayout.cxx | 46 ++ OOE680_m6/vcl/source/glyphs/gcach_layout.cxx | 12 OOE680_m6/vcl/source/window/window.cxx | 5 OOE680_m6/vcl/util/makefile.mk | 2 vcl/inc/sallayout.hxx | 3 vcl/source/gdi/outdev3.cxx | 11 vcl/source/gdi/sallayout.cxx | 25 - 15 files changed, 722 insertions(+), 177 deletions(-) Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- openoffice.org-1.9.129.ooo54603.fontconfig.patch 22 Jan 2007 09:27:00 -0000 1.14 +++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 23 Jan 2007 12:15:33 -0000 1.15 @@ -599,14 +599,14 @@ diff -ru OOE680_m6.fontconfig/vcl/source/window/window.cxx OOE680_m6/vcl/source/window/window.cxx --- OOE680_m6.fontconfig/vcl/source/window/window.cxx 2006-12-18 13:00:26.000000000 -0500 +++ OOE680_m6/vcl/source/window/window.cxx 2006-12-19 04:27:48.000000000 -0500 -@@ -197,6 +197,7 @@ +@@ -200,6 +200,7 @@ #endif #include +#include + #include "lazydelete.hxx" using namespace rtl; - using namespace ::com::sun::star::uno; @@ -342,6 +343,10 @@ bool Window::ImplCheckUIFont( const Font& rFont ) openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch: ./inc/comphelper/propertycontainerhelper.hxx | 0 comphelper/inc/comphelper/implbase_var.hxx | 2 +- comphelper/inc/comphelper/propertycontainerhelper.hxx | 2 +- cppu/inc/com/sun/star/uno/Any.h | 2 +- cppu/inc/com/sun/star/uno/Sequence.hxx | 2 +- cppu/inc/com/sun/star/uno/Type.h | 2 +- cppu/inc/cppu/unotype.hxx | 2 +- cppuhelper/inc/cppuhelper/implbase1.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase10.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase11.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase12.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase2.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase3.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase4.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase5.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase6.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase7.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase8.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase9.hxx | 4 ++-- cppuhelper/inc/cppuhelper/implbase_ex.hxx | 16 ++++++++++++++++ inc/com/sun/star/uno/Any.h | 0 inc/com/sun/star/uno/Sequence.hxx | 0 inc/com/sun/star/uno/Type.h | 0 inc/comphelper/implbase_var.hxx | 0 inc/cppu/unotype.hxx | 0 inc/cppuhelper/implbase1.hxx | 0 inc/cppuhelper/implbase10.hxx | 0 inc/cppuhelper/implbase11.hxx | 0 inc/cppuhelper/implbase12.hxx | 0 inc/cppuhelper/implbase2.hxx | 0 inc/cppuhelper/implbase3.hxx | 0 inc/cppuhelper/implbase4.hxx | 0 inc/cppuhelper/implbase5.hxx | 0 inc/cppuhelper/implbase6.hxx | 0 inc/cppuhelper/implbase7.hxx | 0 inc/cppuhelper/implbase8.hxx | 0 inc/cppuhelper/implbase9.hxx | 0 inc/cppuhelper/implbase_ex.hxx | 0 inc/salhelper/singletonref.hxx | 0 inc/sdasitm.hxx | 0 inc/so2dll.hxx | 0 salhelper/inc/salhelper/singletonref.hxx | 2 +- so3/inc/insdlg.hxx | 2 +- so3/inc/so2dll.hxx | 2 +- source/xforms/xformsexport.cxx | 0 svx/inc/sdasitm.hxx | 6 +++--- xmloff/source/xforms/xformsexport.cxx | 4 ++-- 47 files changed, 54 insertions(+), 38 deletions(-) Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 8 Jan 2007 10:38:54 -0000 1.9 +++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 23 Jan 2007 12:15:33 -0000 1.10 @@ -507,144 +507,6 @@ /* [Beschreibung] In dieser Struktur werden Informationen "uber den Vorg"anger und den -Index: inc/iface.hxx -=================================================================== -RCS file: /cvs/oi/so3/inc/iface.hxx,v -retrieving revision 1.8 -diff -u -r1.8 iface.hxx ---- openoffice.org,orig/so3/inc/iface.hxx 24 Oct 2006 14:08:22 -0000 1.8 -+++ openoffice.org/so3/inc/iface.hxx 1 Dec 2006 16:05:02 -0000 -@@ -42,6 +42,9 @@ - #ifndef _GEN_HXX //autogen - #include - #endif -+#ifndef _SVBORDER_HXX -+#include -+#endif - #ifndef _SHL_HXX //autogen - #include - #endif -@@ -333,58 +336,6 @@ - Rect GetSysRect( const Rectangle & rRect ); - Rectangle GetSvRect( const Rect & rRect ); - #endif -- --class SO3_DLLPRIVATE SvBorder --{ --private: -- long nTop, nRight, nBottom, nLeft; --public: -- SO3_DLLPRIVATE SvBorder() -- { nTop = nRight = nBottom = nLeft = 0; } -- SO3_DLLPRIVATE SvBorder( const Size & rSz ) -- { nTop = nBottom = rSz.Height(); nRight = nLeft = rSz.Width(); } -- SO3_DLLPRIVATE SvBorder( const Rectangle & rOuter, const Rectangle & rInner ); -- SO3_DLLPRIVATE SvBorder( long nLeftP, long nTopP, long nRightP, long nBottomP ) -- { nLeft = nLeftP; nTop = nTopP; nRight = nRightP; nBottom = nBottomP; } -- SO3_DLLPRIVATE BOOL operator == ( const SvBorder & rObj ) const -- { -- return nTop == rObj.nTop && nRight == rObj.nRight && -- nBottom == rObj.nBottom && nLeft == rObj.nLeft; -- } -- SO3_DLLPRIVATE BOOL operator != ( const SvBorder & rObj ) const -- { return !(*this == rObj); } -- SO3_DLLPRIVATE SvBorder & operator += ( const SvBorder & rBorder ) -- { -- Left() += rBorder.Left(); -- Top() += rBorder.Top(); -- Right() += rBorder.Right(); -- Bottom() += rBorder.Bottom(); -- return *this; -- } -- SO3_DLLPRIVATE SvBorder & operator -= ( const SvBorder & rBorder ) -- { -- Left() -= rBorder.Left(); -- Top() -= rBorder.Top(); -- Right() -= rBorder.Right(); -- Bottom() -= rBorder.Bottom(); -- return *this; -- } -- SO3_DLLPRIVATE BOOL IsInside( const SvBorder & rInside ) -- { -- return nTop >= rInside.nTop && nRight >= rInside.nRight && -- nBottom >= rInside.nBottom && nLeft >= rInside.nLeft; -- } -- SO3_DLLPRIVATE long & Top() { return nTop; } -- SO3_DLLPRIVATE long & Right() { return nRight; } -- SO3_DLLPRIVATE long & Bottom() { return nBottom; } -- SO3_DLLPRIVATE long & Left() { return nLeft; } -- SO3_DLLPRIVATE long Top() const { return nTop; } -- SO3_DLLPRIVATE long Right() const { return nRight; } -- SO3_DLLPRIVATE long Bottom() const { return nBottom; } -- SO3_DLLPRIVATE long Left() const { return nLeft; } --}; --SO3_DLLPRIVATE Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder ); --SO3_DLLPRIVATE Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder ); - - #ifdef DBG_UTIL - ByteString SvPrint( const SvBorder & ); -Index: source/inplace/ipenv.cxx -=================================================================== -RCS file: /cvs/oi/so3/source/inplace/ipenv.cxx,v -retrieving revision 1.9 -diff -u -r1.9 ipenv.cxx ---- openoffice.org.orig/so3/source/inplace/ipenv.cxx 12 Oct 2006 10:58:21 -0000 1.9 -+++ openoffice.org/so3/source/inplace/ipenv.cxx 1 Dec 2006 16:05:04 -0000 -@@ -61,54 +61,6 @@ - - class INetURLObject; - --//========================================================================= --//==========SvContainerEnvironment========================================= --//========================================================================= --SvBorder::SvBorder( const Rectangle & rOuter, const Rectangle & rInner ) --{ -- Rectangle aOuter( rOuter ); -- aOuter.Justify(); -- Rectangle aInner( rInner ); -- if( aInner.IsEmpty() ) -- aInner = Rectangle( aOuter.Center(), aOuter.Center() ); -- else -- aInner.Justify(); -- -- DBG_ASSERT( aOuter.IsInside( aInner ), -- "SvBorder::SvBorder: FALSE == aOuter.IsInside( aInner )" ) -- nTop = aInner.Top() - aOuter.Top(); -- nRight = aOuter.Right() - aInner.Right(); -- nBottom = aOuter.Bottom() - aInner.Bottom(); -- nLeft = aInner.Left() - aOuter.Left(); --} -- --Rectangle & operator += ( Rectangle & rRect, const SvBorder & rBorder ) --{ -- // wegen Empty-Rect, GetSize muss als erstes gerufen werden -- Size aS( rRect.GetSize() ); -- aS.Width() += rBorder.Left() + rBorder.Right(); -- aS.Height() += rBorder.Top() + rBorder.Bottom(); -- -- rRect.Left() -= rBorder.Left(); -- rRect.Top() -= rBorder.Top(); -- rRect.SetSize( aS ); -- return rRect; --} -- --Rectangle & operator -= ( Rectangle & rRect, const SvBorder & rBorder ) --{ -- // wegen Empty-Rect, GetSize muss als erstes gerufen werden -- Size aS( rRect.GetSize() ); -- aS.Width() -= rBorder.Left() + rBorder.Right(); -- aS.Height() -= rBorder.Top() + rBorder.Bottom(); -- -- rRect.Left() += rBorder.Left(); -- rRect.Top() += rBorder.Top(); -- rRect.SetSize( aS ); -- return rRect; --} -- -- - /************************************************************************ - |* SvPrint( ... ) - |* --- openoffie.org.orig/so3/inc/insdlg.hxx 2006-10-24 15:08:35.000000000 +0100 +++ openoffice.org/so3/inc/insdlg.hxx 2006-12-02 18:34:46.000000000 +0000 @@ -77,7 +77,7 @@ Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.998 retrieving revision 1.999 diff -u -r1.998 -r1.999 --- openoffice.org.spec 22 Jan 2007 09:27:00 -0000 1.998 +++ openoffice.org.spec 23 Jan 2007 12:15:33 -0000 1.999 @@ -1,5 +1,5 @@ %define oootag OOF680 -%define ooomilestone 1 +%define ooomilestone 2 %define rh_rpm_release 1 # gcc#19664# @@ -91,32 +91,31 @@ Patch24: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch Patch25: openoffice.org-2.0.3.rh187919.gtkunderkde.patch Patch26: ooobuild.VBAObjects.patch -Patch27: workspace.fwk59.patch -Patch28: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch -Patch29: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch -Patch30: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch -Patch31: pseudoworkspace.valgrind1.patch -Patch32: workspace.thbpp6.patch -Patch33: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch -Patch34: openoffice.org-2.0.4.rh217065.syncbackspace.patch -Patch35: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch -Patch36: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch -Patch37: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch -Patch38: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch -Patch39: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize -Patch40: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch -Patch41: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch -Patch42: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch -Patch43: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch -Patch44: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch -Patch45: workspace.vcl71.patch -Patch46: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch -Patch47: workspace.impress115.patch -Patch48: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch -Patch49: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch -Patch50: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch -Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch -Patch52: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch +Patch27: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch +Patch28: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch +Patch29: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch +Patch30: pseudoworkspace.valgrind1.patch +Patch31: workspace.thbpp6.patch +Patch32: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch +Patch33: openoffice.org-2.0.4.rh217065.syncbackspace.patch +Patch34: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch +Patch35: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch +Patch36: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch +Patch37: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch +Patch38: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize +Patch39: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch +Patch40: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch +Patch41: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch +Patch42: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch +Patch43: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch +Patch44: workspace.vcl71.patch +Patch45: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch +Patch46: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch +Patch47: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch +Patch48: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch +Patch49: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch +Patch50: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch +Patch51: openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch %define instdir %{_libdir}/openoffice.org @@ -957,32 +956,31 @@ %patch24 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch %patch25 -p1 -b .rh187919.gtkunderkde.patch %patch26 -p0 -b .ooobuild.VBAObjects.patch -%patch27 -p1 -b .workspace.fwk59.patch -%patch28 -p1 -b .ooo68048.vcl.imsurroundtext.patch -%patch29 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch -%patch30 -p1 -b .ooo69051.vcl.singlekeypress.patch -%patch31 -p1 -b .pseudoworkspace.valgrind1.patch -%patch32 -p1 -b .workspace.thbpp6.patch -%patch33 -p1 -b .rhXXXXXX.padmin.nospadmin.patch -%patch34 -p1 -b .rh217065.syncbackspace.patch -%patch35 -p1 -b .ooo70155.fasterhelplinking.patch -%patch36 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch -%patch37 -p1 -b .ooo65491.psprint.enablenups.patch -%patch38 -p1 -b .ooo61812.svx.a11ycrash.patch -cat %{PATCH39} >> svtools/source/dialogs/localize.sdf -%patch40 -p1 -b .ooo72014.officecfg.malayammenu.patch -%patch41 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch -%patch42 -p1 -b .rh217269.officecfg.nosequencecheck.patch -%patch43 -p1 -b .ooo72129.vcl.fontglyphindex.patch -%patch44 -p1 -b .ooo73485.vcl.filterzwatrender.patch -%patch45 -p1 -b .workspace.vcl71.patch -%patch46 -p1 -b .gccXXXXX.basegfx.crash.patch -%patch47 -p1 -b .workspace.impress115.patch -%patch48 -p1 -b .ooo72349.svx.scriptrange.patch -%patch49 -p1 -b .ooo73201.sw.a11yloadcrash.patch -%patch50 -p1 -b .ooo73481.svx.longnotint32.patch -%patch51 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch -%patch52 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch +%patch27 -p1 -b .ooo68048.vcl.imsurroundtext.patch +%patch28 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch +%patch29 -p1 -b .ooo69051.vcl.singlekeypress.patch +%patch30 -p1 -b .pseudoworkspace.valgrind1.patch +%patch31 -p1 -b .workspace.thbpp6.patch +%patch32 -p1 -b .rhXXXXXX.padmin.nospadmin.patch +%patch33 -p1 -b .rh217065.syncbackspace.patch +%patch34 -p1 -b .ooo70155.fasterhelplinking.patch +%patch35 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch +%patch36 -p1 -b .ooo65491.psprint.enablenups.patch +%patch37 -p1 -b .ooo61812.svx.a11ycrash.patch +cat %{PATCH38} >> svtools/source/dialogs/localize.sdf +%patch39 -p1 -b .ooo72014.officecfg.malayammenu.patch +%patch40 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch +%patch41 -p1 -b .rh217269.officecfg.nosequencecheck.patch +%patch42 -p1 -b .ooo72129.vcl.fontglyphindex.patch +%patch43 -p1 -b .ooo73485.vcl.filterzwatrender.patch +%patch44 -p1 -b .workspace.vcl71.patch +%patch45 -p1 -b .gccXXXXX.basegfx.crash.patch +%patch46 -p1 -b .ooo72349.svx.scriptrange.patch +%patch47 -p1 -b .ooo73201.sw.a11yloadcrash.patch +%patch48 -p1 -b .ooo73481.svx.longnotint32.patch +%patch49 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch +%patch50 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch +%patch51 -p1 -b .oooXXXXX.javaunohelper.parallel.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -2564,22 +2562,25 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Fri Jan 19 2007 Caolan McNamara - 1:2.2.0-1.1 +* Tue Jan 23 2007 Caolan McNamara - 1:2.2.0-2.1 +- Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch - start of release candidate - drop integrated workspace.icuupgrade.patch -- drop integrated workspace.inplaceobjects.patch - drop integrated workspace.cmcfixes29.patch -- drop integrated workspace.os89.patch -- drop integrated workspace.aw024.patch -- drop integrated workspace.dr51.patch - drop integrated workspace.sixtyfour09.patch -- drop integrated workspace.vcl69.patch -- drop integrated workspace.dba22b.patch - drop integrated workspace.sixtyfour10.patch +- drop integrated workspace.vcl69.patch - drop integrated workspace.vcl70.patch +- drop integrated workspace.os89.patch +- drop integrated workspace.dr51.patch +- drop integrated workspace.fwk59.patch +- drop integrated workspace.aw024.patch +- drop integrated workspace.dba22b.patch +- drop integrated workspace.impress115.patch +- drop integrated workspace.inplaceobjects.patch - drop integrated openoffice.org-2.0.4.rh213710.vba.patch - drop integrated openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch -- Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch +- add openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch * Wed Jan 17 2007 Caolan McNamara - 1:2.1.0-6.14 - Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch --- workspace.fwk59.patch DELETED --- --- workspace.impress115.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 12:17:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:17:35 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch, 1.2, NONE Message-ID: <200701231217.l0NCHZr3029375@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29358 Removed Files: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch Log Message: next version --- openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 12:25:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:25:27 -0500 Subject: rpms/paps/devel paps-0.6.6-langinfo.patch, NONE, 1.1 paps-cups.patch, 1.9, 1.10 paps.spec, 1.19, 1.20 Message-ID: <200701231225.l0NCPRJX029508@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/paps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29485 Modified Files: paps-cups.patch paps.spec Added Files: paps-0.6.6-langinfo.patch Log Message: * Tue Jan 23 2007 Akira TAGOH - Better the encoding guess by looking at current locale. (#212154) paps-0.6.6-langinfo.patch: paps.c | 13 +++++++++++++ 1 files changed, 13 insertions(+) --- NEW FILE paps-0.6.6-langinfo.patch --- diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c --- paps-0.6.6.orig/src/paps.c 2007-01-23 18:56:04.000000000 +0900 +++ paps-0.6.6/src/paps.c 2007-01-23 18:59:15.000000000 +0900 @@ -25,6 +25,7 @@ #include #include "libpaps.h" #include +#include #include #include #include @@ -324,6 +325,9 @@ int main(int argc, char *argv[]) int max_width = 0, w; GIConv cvh = NULL; + /* Set locale from environment. */ + setlocale(LC_ALL, ""); + /* Prerequisite when using glib. */ g_type_init(); @@ -451,6 +455,15 @@ int main(int argc, char *argv[]) g_object_unref (G_OBJECT (fontmap)); } + if (encoding == NULL) + { + encoding = g_strdup(nl_langinfo(CODESET)); + if (!strcmp(encoding, "UTF-8")) + { + g_free(encoding); + encoding = NULL; + } + } if (encoding != NULL) { cvh = g_iconv_open ("UTF-8", encoding); paps-cups.patch: configure.in | 13 ++++ src/Makefile.am | 4 - src/paps.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 160 insertions(+), 7 deletions(-) Index: paps-cups.patch =================================================================== RCS file: /cvs/dist/rpms/paps/devel/paps-cups.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- paps-cups.patch 29 Sep 2006 18:18:36 -0000 1.9 +++ paps-cups.patch 23 Jan 2007 12:25:25 -0000 1.10 @@ -1,7 +1,7 @@ -diff -ruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in +diff -pruN paps-0.6.6.orig/configure.in paps-0.6.6/configure.in --- paps-0.6.6.orig/configure.in 2006-04-28 04:41:36.000000000 +0900 -+++ paps-0.6.6/configure.in 2006-09-30 03:13:29.000000000 +0900 -@@ -7,4 +7,17 @@ ++++ paps-0.6.6/configure.in 2007-01-23 19:36:35.000000000 +0900 +@@ -7,4 +7,17 @@ AC_LANG_C AC_PROG_CC AM_PROG_LIBTOOL @@ -19,10 +19,10 @@ +AC_SUBST(CUPS_LIBS) + AC_OUTPUT(Makefile src/Makefile doc/Makefile) -diff -ruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am ---- paps-0.6.6.orig/src/Makefile.am 2006-09-30 03:13:05.000000000 +0900 -+++ paps-0.6.6/src/Makefile.am 2006-09-30 03:13:29.000000000 +0900 -@@ -5,10 +5,10 @@ +diff -pruN paps-0.6.6.orig/src/Makefile.am paps-0.6.6/src/Makefile.am +--- paps-0.6.6.orig/src/Makefile.am 2007-01-23 19:07:52.000000000 +0900 ++++ paps-0.6.6/src/Makefile.am 2007-01-23 19:36:35.000000000 +0900 +@@ -5,10 +5,10 @@ libpaps_a_inc_HEADERS = libpaps.h libpaps_a_incdir = $(includedir) bin_PROGRAMS = paps @@ -35,10 +35,10 @@ paps_DEPENDENCIES = $(noinst_LIBRARIES) EXTRA_DIST = test_libpaps.c paps.1 -diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c ---- paps-0.6.6.orig/src/paps.c 2006-09-30 03:13:05.000000000 +0900 -+++ paps-0.6.6/src/paps.c 2006-09-30 03:16:10.000000000 +0900 -@@ -31,6 +31,7 @@ +diff -pruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c +--- paps-0.6.6.orig/src/paps.c 2007-01-23 19:07:52.000000000 +0900 ++++ paps-0.6.6/src/paps.c 2007-01-23 19:35:33.000000000 +0900 +@@ -32,6 +32,7 @@ #include #include #include @@ -46,7 +46,7 @@ #define BUFSIZE 1024 #define DEFAULT_FONT_FAMILY "Monospace" -@@ -84,9 +85,11 @@ +@@ -85,9 +86,11 @@ typedef struct { gboolean do_separation_line; gboolean do_draw_contour; gboolean do_wordwrap; @@ -58,7 +58,7 @@ } page_layout_t; typedef struct { -@@ -313,8 +316,8 @@ +@@ -314,8 +317,8 @@ int main(int argc, char *argv[]) int num_pages = 1; int gutter_width = 40; int total_gutter_width; @@ -69,15 +69,16 @@ int do_tumble = -1; /* -1 means not initialized */ int do_duplex = -1; gchar *paps_header = NULL; -@@ -323,12 +326,124 @@ +@@ -324,6 +327,8 @@ int main(int argc, char *argv[]) int header_sep = 20; int max_width = 0, w; GIConv cvh = NULL; + gboolean cups_mode = FALSE; + gchar *page_owner = NULL; - /* Prerequisite when using glib. */ - g_type_init(); + /* Set locale from environment. */ + setlocale(LC_ALL, ""); +@@ -333,6 +338,118 @@ int main(int argc, char *argv[]) g_option_context_add_main_entries(ctxt, entries, NULL); @@ -133,11 +134,12 @@ + } + + if ((val = cupsGetOption("landscape", num_options, options)) != NULL) { -+ if (g_ascii_strcasecmp(val, "no") != 0 && -+ g_ascii_strcasecmp(val, "off") != 0 && -+ g_ascii_strcasecmp(val, "false") != 0) { -+ /* XXX: need to support other orientations? */ -+ do_landscape = TRUE; ++ if (g_ascii_strcasecmp(val, "no") && ++ g_ascii_strcasecmp(val, "off") && ++ g_ascii_strcasecmp(val, "false")) { ++ /* We don't need to process the documentation for orientation support. ++ * pstops certainly does. (#222137) ++ */ + } + } + /* XXX: need to support orientation-requested? */ @@ -178,8 +180,9 @@ + } + if (getenv("CHARSET") != NULL) { + char *charset = getenv("CHARSET"); -+ // Map CUPS charset names to real ones. -+ // http://cups.org/newsgroups.php?s9797+gcups.general+v9797+T1 ++ /* Map CUPS charset names to real ones. ++ * http://cups.org/newsgroups.php?s9797+gcups.general+v9797+T1 ++ */ + if (!g_ascii_strcasecmp(charset, "windows-932")) + charset = "WINDOWS-31J"; + if (g_ascii_strcasecmp(charset, "utf-8") && @@ -194,7 +197,7 @@ /* Parse command line */ if (!g_option_context_parse(ctxt, &argc, &argv, &error)) { -@@ -355,6 +470,8 @@ +@@ -359,6 +476,8 @@ int main(int argc, char *argv[]) IN = stdin; } title = filename_in; @@ -203,7 +206,7 @@ paps = paps_new(); pango_context = paps_get_pango_context (paps); -@@ -373,8 +490,10 @@ +@@ -377,8 +496,10 @@ int main(int argc, char *argv[]) pango_context_set_font_description (pango_context, font_description); /* Page layout */ @@ -216,7 +219,7 @@ if (num_columns == 1) total_gutter_width = 0; -@@ -435,6 +554,8 @@ +@@ -439,6 +560,8 @@ int main(int argc, char *argv[]) page_layout.pango_dir = pango_dir; page_layout.filename = filename_in; page_layout.header_font_desc = header_font_desc; @@ -225,7 +228,7 @@ /* calculate x-coordinate scale */ if (cpi > 0.0L) -@@ -571,6 +692,12 @@ +@@ -584,6 +707,12 @@ split_text_into_paragraphs (PangoContext if (wc == (gunichar)-1) { fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); @@ -238,7 +241,7 @@ wc = 0; } if (!*p || !wc || wc == '\n' || wc == '\f') -@@ -784,6 +911,7 @@ +@@ -810,6 +939,7 @@ void print_postscript_header(FILE *OUT, int orientation = page_layout->page_width > page_layout->page_height; int bb_page_width = page_layout->page_width; int bb_page_height = page_layout->page_height; @@ -246,7 +249,7 @@ /* Keep bounding box non-rotated to make ggv happy */ if (orientation) -@@ -793,12 +921,20 @@ +@@ -819,12 +949,20 @@ void print_postscript_header(FILE *OUT, bb_page_height = tmp; } @@ -268,7 +271,7 @@ "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" -@@ -848,8 +984,10 @@ +@@ -874,8 +1012,10 @@ void print_postscript_header(FILE *OUT, title, bb_page_width, bb_page_height, Index: paps.spec =================================================================== RCS file: /cvs/dist/rpms/paps/devel/paps.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- paps.spec 4 Dec 2006 11:34:52 -0000 1.19 +++ paps.spec 23 Jan 2007 12:25:25 -0000 1.20 @@ -26,6 +26,7 @@ Patch9: paps-0.6.6-cpilpi.patch Patch10: paps-0.6.6-exitcode.patch Patch11: paps-0.6.6-fix-wcswidth.patch +Patch12: paps-0.6.6-langinfo.patch Patch50: paps-cups.patch Summary: Plain Text to PostScript converter @@ -47,6 +48,7 @@ %patch9 -p1 -b .cpilpi %patch10 -p1 -b .exitcode %patch11 -p1 -b .wcswidth +%patch12 -p1 -b .langinfo %patch50 -p1 -b .cups aclocal automake @@ -80,6 +82,9 @@ %changelog +* Tue Jan 23 2007 Akira TAGOH +- Better the encoding guess by looking at current locale. (#212154) + * Mon Dec 4 2006 Akira TAGOH - 0.6.6-17 - Fix a segfault on non-printable character. (#216296) From fedora-cvs-commits at redhat.com Tue Jan 23 12:25:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:25:37 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-2.0.6-dbus.patch, NONE, 1.1 system-config-soundcard.spec, 1.53, 1.54 Message-ID: <200701231225.l0NCPbex029543@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29525 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-2.0.6-dbus.patch Log Message: fixed #223915 - system-config-soundcard does not start system-config-soundcard-2.0.6-dbus.patch: soundcardBackendHal.py | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) --- NEW FILE system-config-soundcard-2.0.6-dbus.patch --- --- system-config-soundcard-2.0.6/src/soundcardBackendHal.py.old 2006-06-30 14:07:38.000000000 +0200 +++ system-config-soundcard-2.0.6/src/soundcardBackendHal.py 2007-01-23 13:13:13.000000000 +0100 @@ -42,12 +42,19 @@ self.doDebug = True - self._dbusBus = dbus.SystemBus() - self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager") - self.halManager = dbus.Interface(self.halManagerObj, "org.freedesktop.Hal.Manager") - self.driverList = self.read_driver_list() + try: + self._dbusBus = dbus.SystemBus() + self.halManagerObj = self._dbusBus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager") + self.halManager = dbus.Interface(self.halManagerObj, "org.freedesktop.Hal.Manager") + except: + self._dbusBus = [] + self.halManagerObj = [] + self.halManager = [] + self.driverList = [] + print _("Unable to initialize D-BUS/HAL!") + self.cards = {} def destroy(self, args): @@ -160,14 +167,14 @@ #if card.bus() == "macio" and card.driver() != "snd-powermac": def probeCards(self, default_card, default_device, card_list, card_max): - udiList = self.halManager.FindDeviceByCapability("alsa") - for udi in udiList: - self.getDevices(udi) + if self.halManager != []: + udiList = self.halManager.FindDeviceByCapability("alsa") + for udi in udiList: + self.getDevices(udi) - for index in self.cards: - if index < card_max : - card_list[index] = self.cards[index] + for index in self.cards: + if index < card_max : + card_list[index] = self.cards[index] card_list[default_card].default_device = default_device - return card_list Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- system-config-soundcard.spec 21 Dec 2006 13:40:48 -0000 1.53 +++ system-config-soundcard.spec 23 Jan 2007 12:25:35 -0000 1.54 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 2.0.6 -Release: 1%{dist} +Release: 2%{dist} 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 +Patch: system-config-soundcard-2.0.6-dbus.patch BuildRequires: desktop-file-utils BuildRequires: gettext, intltool ExcludeArch: s390 s390x @@ -32,6 +33,7 @@ %prep %setup -q +%patch -p1 %build make @@ -81,6 +83,9 @@ %ghost /root/scsound.log %changelog +* Tue Jan 23 2007 Martin Stransky 2.0.6-2 +- fixed #223915 - system-config-soundcard does not start + * Thu Dec 21 2006 Martin Stransky 2.0.6-1 - translation update From fedora-cvs-commits at redhat.com Tue Jan 23 12:45:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:45:30 -0500 Subject: rpms/bind/devel bind.spec,1.154,1.155 Message-ID: <200701231245.l0NCjUUo021384@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20344/bind/devel Modified Files: bind.spec Log Message: added "@" and "." characters to my e-mail address in changelog Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- bind.spec 23 Jan 2007 10:49:42 -0000 1.154 +++ bind.spec 23 Jan 2007 12:45:28 -0000 1.155 @@ -743,10 +743,10 @@ :; %changelog -* Tue Jan 23 2007 Adam Tkac 31:9.3.3-5.fc7 +* Tue Jan 23 2007 Adam Tkac 31:9.3.3-5.fc7 - package bind-libbind-devel has been marked as obsolete -* Mon Jan 22 2007 Adam Tkac 31:9.3.3-4.fc7 +* Mon Jan 22 2007 Adam Tkac 31:9.3.3-4.fc7 - package bind-libbind-devel has beed removed (libs has been moved to bind-devel & bind-libs) - Resolves: #214208 From fedora-cvs-commits at redhat.com Tue Jan 23 12:52:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:52:52 -0500 Subject: rpms/postfix/devel .cvsignore, 1.23, 1.24 postfix.spec, 1.49, 1.50 sources, 1.23, 1.24 Message-ID: <200701231252.l0NCqqcj014968@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/postfix/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14821 Modified Files: .cvsignore postfix.spec sources Log Message: [tw] - new version 2.3.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 7 Nov 2006 13:34:37 -0000 1.23 +++ .cvsignore 23 Jan 2007 12:52:50 -0000 1.24 @@ -5,3 +5,4 @@ postfix-2.3.2.tar.gz postfix-2.3.3.tar.gz postfix-2.3.4.tar.gz +postfix-2.3.6.tar.gz Index: postfix.spec =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- postfix.spec 7 Nov 2006 13:34:37 -0000 1.49 +++ postfix.spec 23 Jan 2007 12:52:50 -0000 1.50 @@ -42,7 +42,7 @@ Name: postfix Summary: Postfix Mail Transport Agent -Version: 2.3.4 +Version: 2.3.6 Release: 1 Epoch: 2 Group: System Environment/Daemons @@ -470,6 +470,9 @@ %changelog +* Tue Jan 23 2007 Thomas Woerner 2:2.3.6-1 +- new version 2.3.6 + * Tue Nov 7 2006 Thomas Woerner 2:2.3.4-1 - new version 2.3.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 7 Nov 2006 13:34:37 -0000 1.23 +++ sources 23 Jan 2007 12:52:50 -0000 1.24 @@ -1,2 +1,2 @@ 1f78fcaf2a36ec3520ecff286a45251a pflogsumm-1.1.0.tar.gz -78942b38639aee30b637f1c15c0b3fc9 postfix-2.3.4.tar.gz +24f3a076a2a1af0ca8dcb9bac3f145fa postfix-2.3.6.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 12:54:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 07:54:10 -0500 Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.26,1.27 Message-ID: <200701231254.l0NCsAVL015988@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus-sendto/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15948 Modified Files: nautilus-sendto.spec Log Message: * Tue Jan 23 2007 Alexander Larsson - 0.8-4 - Rebuild against new gaim (#223765) Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- nautilus-sendto.spec 15 Nov 2006 14:51:41 -0000 1.26 +++ nautilus-sendto.spec 23 Jan 2007 12:54:08 -0000 1.27 @@ -1,6 +1,6 @@ Name: nautilus-sendto Version: 0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -115,6 +115,9 @@ %endif %changelog +* Tue Jan 23 2007 Alexander Larsson - 0.8-4 +- Rebuild against new gaim (#223765) + * Wed Nov 15 2006 Matthias Clasen - 0.8-3 - Rebuild against new libbtctl From fedora-cvs-commits at redhat.com Tue Jan 23 13:11:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 08:11:17 -0500 Subject: rpms/postfix/devel postfix-sasl.conf, 1.1, 1.2 postfix.spec, 1.50, 1.51 Message-ID: <200701231311.l0NDBHg5029206@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/postfix/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29096 Modified Files: postfix-sasl.conf postfix.spec Log Message: [tw] - limiting SASL mechanisms to plain login for sasl with saslauthd (#175259) Index: postfix-sasl.conf =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/postfix-sasl.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- postfix-sasl.conf 9 Sep 2004 10:37:31 -0000 1.1 +++ postfix-sasl.conf 23 Jan 2007 13:11:15 -0000 1.2 @@ -1 +1,2 @@ pwcheck_method: saslauthd +mech_list: plain login Index: postfix.spec =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- postfix.spec 23 Jan 2007 12:52:50 -0000 1.50 +++ postfix.spec 23 Jan 2007 13:11:15 -0000 1.51 @@ -472,6 +472,7 @@ %changelog * Tue Jan 23 2007 Thomas Woerner 2:2.3.6-1 - new version 2.3.6 +- limiting SASL mechanisms to plain login for sasl with saslauthd (#175259) * Tue Nov 7 2006 Thomas Woerner 2:2.3.4-1 - new version 2.3.4 From fedora-cvs-commits at redhat.com Tue Jan 23 13:17:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 08:17:49 -0500 Subject: rpms/prctl/devel .cvsignore, 1.4, 1.5 prctl.spec, 1.14, 1.15 sources, 1.4, 1.5 Message-ID: <200701231317.l0NDHndH022051@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/prctl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22001 Modified Files: .cvsignore prctl.spec sources Log Message: - update to 1.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/prctl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 10:40:21 -0000 1.4 +++ .cvsignore 23 Jan 2007 13:17:46 -0000 1.5 @@ -1 +1 @@ -prctl-1.4.tar.gz +prctl-1.5.tar.gz Index: prctl.spec =================================================================== RCS file: /cvs/dist/rpms/prctl/devel/prctl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- prctl.spec 12 Jul 2006 07:52:42 -0000 1.14 +++ prctl.spec 23 Jan 2007 13:17:46 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Utility to perform process operations Name: prctl -Version: 1.4 -Release: 5.2.1 +Version: 1.5 +Release: 1 License: GPL Group: Applications/System URL: http://sourceforge.net/projects/prctl @@ -37,6 +37,9 @@ %{_mandir}/man1/prctl.* %changelog +* Tue Jan 23 2007 Karsten Hopp 1.5-1 +- update to 1.5 + * Wed Jul 12 2006 Jesse Keating - 1.4-5.2.1 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/prctl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 10:40:21 -0000 1.4 +++ sources 23 Jan 2007 13:17:46 -0000 1.5 @@ -1 +1 @@ -f494842da5edc7c84adf506685301052 prctl-1.4.tar.gz +487ffeec494bf91fa7b32115fb3a08f2 prctl-1.5.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 13:42:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 08:42:29 -0500 Subject: rpms/netatalk/devel netatalk-2.0.3-db4_5.patch, NONE, 1.1 netatalk.spec, 1.30, 1.31 netatalk-2.0.2-db4_3.patch, 1.1, NONE Message-ID: <200701231342.l0NDgT6D028731@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netatalk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28715 Modified Files: netatalk.spec Added Files: netatalk-2.0.3-db4_5.patch Removed Files: netatalk-2.0.2-db4_3.patch Log Message: - rebuild against new db4 netatalk-2.0.3-db4_5.patch: db3-check.m4 | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE netatalk-2.0.3-db4_5.patch --- --- netatalk-2.0.3/macros/db3-check.m4.db4_3 2004-08-11 05:01:11.000000000 +0200 +++ netatalk-2.0.3/macros/db3-check.m4 2007-01-23 14:27:14.000000000 +0100 @@ -115,6 +115,8 @@ AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) Index: netatalk.spec =================================================================== RCS file: /cvs/dist/rpms/netatalk/devel/netatalk.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- netatalk.spec 4 Dec 2006 15:31:23 -0000 1.30 +++ netatalk.spec 23 Jan 2007 13:42:18 -0000 1.31 @@ -3,7 +3,7 @@ Summary: AppleTalk networking programs Name: netatalk Version: 2.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 4 License: GPL Group: System Environment/Daemons @@ -16,7 +16,7 @@ #Patch0: netatalk-1.6.3-norc.patch #Patch1: netatalk-1.5.5-openssl097.patch #Patch2: netatalk-1.5.5-pathcat.patch -Patch0: netatalk-2.0.2-db4_3.patch +Patch0: netatalk-2.0.3-db4_5.patch Patch1: netatalk-2.0.2-db4_2-db4_3.patch Patch2: netatalk-2.0.2-uams_no_pie.patch Patch3: netatalk-2.0.2-extern_ucreator.patch @@ -45,7 +45,7 @@ #%patch0 -p 1 -b .norc #%patch1 -p 1 -b .openssl097 #%patch2 -p1 -b .pathcat -%patch0 -p1 -b .db4_3 +%patch0 -p1 -b .db4_5 %patch1 -p1 -b .db4_2-db4_3 %patch2 -p1 -b .uams_no_pie %patch3 -p1 -b .extern_ucreator @@ -179,6 +179,9 @@ %{_libdir}/atalk/*.la %changelog +* Tue Jan 23 2007 Jindrich Novy - 4:2.0.3-9 +- rebuild against new db4 + * Mon Dec 04 2006 Maros Barabas - 4:2.0.3-8 - BuildRequires changed from cracklib to cracklib-devel --- netatalk-2.0.2-db4_3.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 13:50:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 08:50:19 -0500 Subject: rpms/slib/devel slib-3a4-guile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 slib.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200701231350.l0NDoJb4016858@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/slib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16824 Modified Files: .cvsignore slib.spec sources Added Files: slib-3a4-guile.patch Log Message: - update to 3a4 - make scriptlets safer (#223717) Resolves: #223717 slib-3a4-guile.patch: guile.init | 4 ++-- require.scm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE slib-3a4-guile.patch --- --- slib/guile.init.guile 2007-01-23 14:11:56.000000000 +0100 +++ slib/guile.init 2007-01-23 14:11:56.000000000 +0100 @@ -44,8 +44,8 @@ ;;; the directory where any auxillary files to your Scheme ;;; implementation reside. (define implementation-vicinity - (let* ((path (or (%search-load-path "ice-9/q.scm") - (error "Could not find ice-9/q.scm in " %load-path))) + (let* ((path (or (%search-load-path "slib/qp.scm") + (error "Could not find slib/qp.scm in " %load-path))) (vic (substring path 0 (- (string-length path) 11)))) (lambda () vic))) --- slib/require.scm.guile 2007-01-23 14:11:56.000000000 +0100 +++ slib/require.scm 2007-01-23 14:32:36.000000000 +0100 @@ -122,7 +122,7 @@ (else (bail expression)))) (feval expression)) ;@ -(define (provided? expression) +(set! provided? (lambda (expression) (define feature-list (cons (scheme-implementation-type) (cons (software-type) slib:features))) (define (provided? expression) @@ -131,7 +131,7 @@ (let ((path (catalog:get expression))) (cond ((symbol? path) (provided? path)) (else #f)))))) - (feature-eval expression provided?)) + (feature-eval expression provided?))) ;@ (define (require feature) (cond @@ -169,9 +169,9 @@ (define (require-if feature? feature) (if (slib:provided? feature?) (slib:require feature))) ;@ -(define (provide feature) +(set! provide (lambda (feature) (if (not (memq feature slib:features)) - (set! slib:features (cons feature slib:features)))) + (set! slib:features (cons feature slib:features))))) ;@ (define slib:provide provide) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/slib/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 May 2006 08:04:23 -0000 1.3 +++ .cvsignore 23 Jan 2007 13:50:17 -0000 1.4 @@ -1 +1 @@ -slib3a3.zip +slib3a4.zip Index: slib.spec =================================================================== RCS file: /cvs/dist/rpms/slib/devel/slib.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- slib.spec 12 Jul 2006 13:09:22 -0000 1.12 +++ slib.spec 23 Jan 2007 13:50:17 -0000 1.13 @@ -1,11 +1,12 @@ Summary: platform independent library for scheme Name: slib -Version: 3a3 -Release: 2 +Version: 3a4 +Release: 1%{?dist} License: SLIB Group: Development/Languages BuildArch: noarch Source0: ftp://swissnet.ai.mit.edu/pub/scm/slib%{version}.zip +Patch1: slib-3a4-guile.patch URL: http://swissnet.ai.mit.edu/~jaffer/SLIB.html BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires(post): /sbin/install-info @@ -21,6 +22,7 @@ %prep %setup -q -n %{name} +%patch1 -p1 -b .guile for i in *; do sed -e "s,/usr/local/lib,%{_datadir},g" \ -e "s,/usr/lib,%{_datadir},g" \ @@ -29,33 +31,39 @@ done %build -gzip -9nf slib.info %install +rm -rf $RPM_BUILD_ROOT mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/slib cp *.scm *.init *.xyz *.txt *.dat *.ps ${RPM_BUILD_ROOT}%{_datadir}/slib mkdir -p ${RPM_BUILD_ROOT}%{_infodir} -install -m644 slib.info.gz ${RPM_BUILD_ROOT}%{_infodir} +install -m644 slib.info $RPM_BUILD_ROOT%{_infodir} %clean rm -rf ${RPM_BUILD_ROOT} %post /sbin/install-info %{_infodir}/slib.info.gz %{_infodir}/dir +: %preun if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/slib.info.gz %{_infodir}/dir fi +: %files %defattr(-,root,root) %dir %{_datadir}/slib %doc ANNOUNCE README COPYING FAQ ChangeLog %{_datadir}/slib/* -%{_infodir}/slib.info.gz +%{_infodir}/slib.* %changelog +* Tue Jan 23 2007 Miroslav Lichvar 3a4-1 +- update to 3a4 +- make scriptlets safer (#223717) + * Wed Jul 12 2006 Miroslav Lichvar 3a3-2 - fix requires for install-info - drop slibcat, include *.dat and grapheps.ps files Index: sources =================================================================== RCS file: /cvs/dist/rpms/slib/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 May 2006 08:04:37 -0000 1.3 +++ sources 23 Jan 2007 13:50:17 -0000 1.4 @@ -1 +1 @@ -89aa7e4fad7d9666397f414493b1530b slib3a3.zip +b0df4089264fd248c9c4f6d2e074b9f6 slib3a4.zip From fedora-cvs-commits at redhat.com Tue Jan 23 13:54:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 08:54:59 -0500 Subject: rpms/netatalk/devel netatalk-2.0.3-db4_5.patch,1.1,1.2 Message-ID: <200701231354.l0NDsxqW016986@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netatalk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16966 Modified Files: netatalk-2.0.3-db4_5.patch Log Message: - fix typo netatalk-2.0.3-db4_5.patch: db3-check.m4 | 2 ++ 1 files changed, 2 insertions(+) Index: netatalk-2.0.3-db4_5.patch =================================================================== RCS file: /cvs/dist/rpms/netatalk/devel/netatalk-2.0.3-db4_5.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netatalk-2.0.3-db4_5.patch 23 Jan 2007 13:42:18 -0000 1.1 +++ netatalk-2.0.3-db4_5.patch 23 Jan 2007 13:54:57 -0000 1.2 @@ -4,7 +4,7 @@ AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no -+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.5]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_5,[-ldb-4.5]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) From fedora-cvs-commits at redhat.com Tue Jan 23 14:00:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 09:00:46 -0500 Subject: rpms/guile/devel guile-1.8.1-slib.patch, NONE, 1.1 guile.spec, 1.50, 1.51 guile-1.8.0-slib.patch, 1.2, NONE Message-ID: <200701231400.l0NE0kQ0017200@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/guile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17127 Modified Files: guile.spec Added Files: guile-1.8.1-slib.patch Removed Files: guile-1.8.0-slib.patch Log Message: - support slib-3a4 - make scriptlets safer (#223701) Resolves: #223701 guile-1.8.1-slib.patch: slib.scm | 398 --------------------------------------------------------------- 1 files changed, 2 insertions(+), 396 deletions(-) --- NEW FILE guile-1.8.1-slib.patch --- --- guile-1.8.1/ice-9/slib.scm.slib 2006-02-18 07:08:44.000000000 +0100 +++ guile-1.8.1/ice-9/slib.scm 2007-01-23 13:09:40.000000000 +0100 @@ -16,399 +16,5 @@ ;;;; License along with this library; if not, write to the Free Software ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;;;; -(define-module (ice-9 slib) - :export (slib:load slib:load-source defmacro:load - implementation-vicinity library-vicinity home-vicinity - scheme-implementation-type scheme-implementation-version - output-port-width output-port-height array-indexes - make-random-state - -1+ ? >=? - require slib:error slib:exit slib:warn slib:eval - defmacro:eval logical:logand logical:logior logical:logxor - logical:lognot logical:ash logical:logcount logical:integer-length - logical:bit-extract logical:integer-expt logical:ipow-by-squaring - slib:eval-load slib:tab slib:form-feed difftime offset-time - software-type) - :replace (delete-file open-file provide provided? system) - :no-backtrace) - - - -(define (eval-load evl) - (if (not (file-exists? )) - (set! (string-append (scheme-file-suffix)))) - (call-with-input-file - (lambda (port) - (let ((old-load-pathname *load-pathname*)) - (set! *load-pathname* ) - (do ((o (read port) (read port))) - ((eof-object? o)) - (evl o)) - (set! *load-pathname* old-load-pathname))))) - - - -(define slib:exit quit) -(define slib:error error) -(define slib:warn warn) -(define slib:eval (lambda (x) (eval x slib-module))) -(define defmacro:eval (lambda (x) (eval x (interaction-environment)))) -(define logical:logand logand) -(define logical:logior logior) -(define logical:logxor logxor) -(define logical:lognot lognot) -(define logical:ash ash) -(define logical:logcount logcount) -(define logical:integer-length integer-length) -(define logical:bit-extract bit-extract) -(define logical:integer-expt integer-expt) -(define slib:eval-load eval-load) -(define slib:tab #\tab) -(define slib:form-feed #\page) - -(define slib-module (current-module)) - -(define (defined? symbol) - (module-defined? slib-module symbol)) - -;;; *FEATURES* should be set to a list of symbols describing features -;;; of this implementation. Suggestions for features are: -(set! *features* - (append - '( - source ;can load scheme source files - ;(slib:load-source "filename") -; compiled ;can load compiled files - ;(slib:load-compiled "filename") - - ;; Scheme report features - -; rev5-report ;conforms to - eval ;R5RS two-argument eval -; values ;R5RS multiple values - dynamic-wind ;R5RS dynamic-wind -; macro ;R5RS high level macros - delay ;has DELAY and FORCE - multiarg-apply ;APPLY can take more than 2 args. -; rationalize - rev4-optional-procedures ;LIST-TAIL, STRING->LIST, - ;LIST->STRING, STRING-COPY, - ;STRING-FILL!, LIST->VECTOR, - ;VECTOR->LIST, and VECTOR-FILL! - -; rev4-report ;conforms to - -; ieee-p1178 ;conforms to - -; rev3-report ;conforms to - - rev2-procedures ;SUBSTRING-MOVE-LEFT!, - ;SUBSTRING-MOVE-RIGHT!, - ;SUBSTRING-FILL!, - ;STRING-NULL?, APPEND!, 1+, - ;-1+, ?, >=? -; object-hash ;has OBJECT-HASH - - multiarg/and- ;/ and - can take more than 2 args. - with-file ;has WITH-INPUT-FROM-FILE and - ;WITH-OUTPUT-FROM-FILE -; transcript ;TRANSCRIPT-ON and TRANSCRIPT-OFF -; ieee-floating-point ;conforms to IEEE Standard 754-1985 - ;IEEE Standard for Binary - ;Floating-Point Arithmetic. - full-continuation ;can return multiple times - - ;; Other common features - -; srfi ;srfi-0, COND-EXPAND finds all srfi-* -; sicp ;runs code from Structure and - ;Interpretation of Computer - ;Programs by Abelson and Sussman. - defmacro ;has Common Lisp DEFMACRO -; record ;has user defined data structures - string-port ;has CALL-WITH-INPUT-STRING and - ;CALL-WITH-OUTPUT-STRING -; sort -; pretty-print -; object->string -; format ;Common-lisp output formatting -; trace ;has macros: TRACE and UNTRACE -; compiler ;has (COMPILER) -; ed ;(ED) is editor - - ;; core definitions compatible, plus `make-random-state' below - random - ) - - (if (defined? 'getenv) - '(getenv) - '()) - - (if (defined? 'current-time) - '(current-time) - '()) - - (if (defined? 'system) - '(system) - '()) - - (if (defined? 'char-ready?) - '(char-ready?) - '()) - - *features*)) - -;; The array module specified by slib 3a1 is not the same as what guile -;; provides, so we must remove `array' from the features list. -;; -;; The main difference is `create-array' which is similar to -;; `make-uniform-array', but the `Ac64' etc prototype procedures incorporate -;; an initial fill element into the prototype. -;; -;; Believe the array-for-each module will need to be taken from slib when -;; the array module is taken from there, since what the array module creates -;; won't be understood by the guile functions. So remove `array-for-each' -;; from the features list too. -;; -;; Also, slib 3a1 array-for-each specifies an `array-map' which is not in -;; guile (but could be implemented quite easily). -;; -;; ENHANCE-ME: It'd be nice to implement what's necessary, since the guile -;; functions should be more efficient than the implementation in slib. -;; -;; FIXME: Since the *features* variable is shared by slib and the guile -;; core, removing these feature symbols has the unhappy effect of making it -;; look like they aren't in the core either. Let's assume that arrays have -;; been present unconditionally long enough that no guile-specific code will -;; bother to test. An alternative would be to make a new separate -;; *features* variable which the slib stuff operated on, leaving the core -;; mechanism alone. That might be a good thing anyway. -;; -(set! *features* (delq 'array *features*)) -(set! *features* (delq 'array-for-each *features*)) - -;; The random module in slib 3a1 provides a `random:chunk' which is used by -;; the random-inexact module. Guile doesn't provide random:chunk so we must -;; remove 'random from `*features*' to use the slib code. -;; -;; ENHANCE-ME: Maybe Guile could provide a `random:chunk', the rest of the -;; random module is already the same as Guile. -;; -;; FIXME: As per the array bits above, *features* is shared by slib and the -;; guile core, so removing 'random has the unhappy effect of making it look -;; like this isn't in the core. Let's assume random numbers have been -;; present unconditionally long enough that no guile-specific code will -;; bother to test. -;; -(set! *features* (delq 'random *features*)) - - -;;; FIXME: Because uers want require to search the path, this uses -;;; load-from-path, which probably isn't a hot idea. slib -;;; doesn't expect this function to search a path, so I expect to get -;;; bug reports at some point complaining that the wrong file gets -;;; loaded when something accidentally appears in the path before -;;; slib, etc. ad nauseum. However, the right fix seems to involve -;;; changing catalog:get in slib/require.scm, and I don't expect -;;; Aubrey will integrate such a change. So I'm just going to punt -;;; for the time being. -(define (slib:load name) - (save-module-excursion - (lambda () - (set-current-module slib-module) - (let ((errinfo (catch 'system-error - (lambda () - (load-from-path name) - #f) - (lambda args args)))) - (if (and errinfo - (catch 'system-error - (lambda () - (load-from-path - (string-append name ".scm")) - #f) - (lambda args args))) - (apply throw errinfo)))))) - -(define slib:load-source slib:load) -(define defmacro:load slib:load) - -(define slib-parent-dir - (let* ((path (%search-load-path "slib/require.scm"))) - (if path - (substring path 0 (- (string-length path) 17)) - (error "Could not find slib/require.scm in " %load-path)))) - -(define (implementation-vicinity) - (string-append slib-parent-dir "/")) -(define (library-vicinity) - (string-append (implementation-vicinity) "slib/")) -(define home-vicinity - (let ((home-path (getenv "HOME"))) - (lambda () home-path))) -(define (scheme-implementation-type) 'guile) -(define scheme-implementation-version version) -;;; (scheme-implementation-home-page) should return a (string) URI -;;; (Uniform Resource Identifier) for this scheme implementation's home -;;; page; or false if there isn't one. -(define (scheme-implementation-home-page) - "http://www.gnu.org/software/guile/guile.html") - -;; legacy from r3rs, but slib says all implementations provide these -;; ("Legacy" section of the "Miscellany" node in the manual) -(define-public t #t) -(define-public nil #f) - -;; ENHANCE-ME: Could call ioctl TIOCGWINSZ to get the size of a tty (see -;; "man 4 tty_ioctl" on a GNU/Linux system), on systems with that. -(define (output-port-width . arg) 80) -(define (output-port-height . arg) 24) - -;; slib 3a1 and up, straight from Template.scm -(define-public (call-with-open-ports . ports) - (define proc (car ports)) - (cond ((procedure? proc) (set! ports (cdr ports))) - (else (set! ports (reverse ports)) - (set! proc (car ports)) - (set! ports (reverse (cdr ports))))) - (let ((ans (apply proc ports))) - (for-each close-port ports) - ans)) - -;; slib (version 3a1) requires open-file accept a symbol r, rb, w or wb for -;; MODES, so extend the guile core open-file accordingly. -;; -;; slib (version 3a1) also calls open-file with strings "rb" or "wb", not -;; sure if that's intentional, but in any case this extension continues to -;; accept strings to make that work. -;; -(define-public (open-file filename modes) - (if (symbol? modes) - (set! modes (symbol->string modes))) - ((@ (guile) open-file) filename modes)) - -;; returning #t/#f instead of throwing an error for failure -(define-public (delete-file filename) - (catch 'system-error - (lambda () ((@ (guile) delete-file) filename) #t) - (lambda args #f))) - -;; Nothing special to do for this, so straight from Template.scm. Maybe -;; "sensible-browser" for a debian system would be worth trying too (and -;; would be good on a tty). -(define-public (browse-url url) - (define (try cmd end) (zero? (system (string-append cmd url end)))) - (or (try "netscape-remote -remote 'openURL(" ")'") - (try "netscape -remote 'openURL(" ")'") - (try "netscape '" "'&") - (try "netscape '" "'"))) - -;;; {array-for-each} -(define (array-indexes ra) - (let ((ra0 (apply make-array '() (array-shape ra)))) - (array-index-map! ra0 list) - ra0)) - -;;; {Random numbers} -;;; -(define (make-random-state . args) - (let ((seed (if (null? args) *random-state* (car args)))) - (cond ((string? seed)) - ((number? seed) (set! seed (number->string seed))) - (else (let () - (require 'object->string) - (set! seed (object->limited-string seed 50))))) - (seed->random-state seed))) - -;;; {rev2-procedures} -;;; - -(define -1+ 1-) -(define ? >) -(define >=? >=) - -;;; {system} -;;; -;; If the program run is killed by a signal, the shell normally gives an -;; exit code of 128+signum. If the shell itself is killed by a signal then -;; we do the same 128+signum here. -;; -;; "stop-sig" shouldn't arise here, since system shouldn't be calling -;; waitpid with WUNTRACED, but allow for it anyway, just in case. -;; -(if (memq 'system *features*) - (define-public system - (lambda (str) - (let ((st ((@ (guile) system) str))) - (or (status:exit-val st) - (+ 128 (or (status:term-sig st) - (status:stop-sig st)))))))) - -;;; {Time} -;;; - -(define difftime -) -(define offset-time +) - - -(define define - (procedure->memoizing-macro - (lambda (exp env) - (if (= (length env) 1) - `(define-public ,@(cdr exp)) - `(define-private ,@(cdr exp)))))) - -;;; Hack to make syncase macros work in the slib module -(if (nested-ref the-root-module '(app modules ice-9 syncase)) - (set-object-property! (module-local-variable (current-module) 'define) - '*sc-expander* - '(define))) - -(define (software-type) - "Return a symbol describing the current platform's operating system. -This may be one of AIX, VMS, UNIX, COHERENT, WINDOWS, MS-DOS, OS/2, -THINKC, AMIGA, ATARIST, MACH, or ACORN. - -Note that most varieties of Unix are considered to be simply \"UNIX\". -That is because when a program depends on features that are not present -on every operating system, it is usually better to test for the presence -or absence of that specific feature. The return value of - at code{software-type} should only be used for this purpose when there is -no other easy or unambiguous way of detecting such features." - 'UNIX) - -(slib:load (in-vicinity (library-vicinity) "require.scm")) - -(define require require:require) - -;; {Extensions to the require system so that the user can add new -;; require modules easily.} - -(define *vicinity-table* - (list - (cons 'implementation (implementation-vicinity)) - (cons 'library (library-vicinity)))) - -(define (install-require-vicinity name vicinity) - (let ((entry (assq name *vicinity-table*))) - (if entry - (set-cdr! entry vicinity) - (set! *vicinity-table* - (acons name vicinity *vicinity-table*))))) - -(define (install-require-module name vicinity-name file-name) - (if (not *catalog*) ;Fix which loads catalog in slib - (catalog:get 'random)) ;(doesn't load the feature 'random) - (let ((entry (assq name *catalog*)) - (vicinity (cdr (assq vicinity-name *vicinity-table*)))) - (let ((path-name (in-vicinity vicinity file-name))) - (if entry - (set-cdr! entry path-name) - (set! *catalog* - (acons name path-name *catalog*)))))) - -(define (make-exchanger obj) - (lambda (rep) (let ((old obj)) (set! obj rep) old))) +(define-module (ice-9 slib)) +(load-from-path "slib/guile.init") Index: guile.spec =================================================================== RCS file: /cvs/dist/rpms/guile/devel/guile.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- guile.spec 13 Oct 2006 10:43:11 -0000 1.50 +++ guile.spec 23 Jan 2007 14:00:44 -0000 1.51 @@ -1,16 +1,16 @@ Summary: A GNU implementation of Scheme for application extensibility. Name: guile Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz URL: http://www.gnu.org/software/guile/ Patch1: guile-1.8.0-rpath.patch -Patch2: guile-1.8.0-slib.patch +Patch2: guile-1.8.1-slib.patch Patch4: guile-1.8.1-deplibs.patch Patch5: guile-1.8.0-multilib.patch License: GPL Group: Development/Languages -Buildroot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -75,6 +75,7 @@ /sbin/install-info %{_infodir}/r5rs.info.gz %{_infodir}/dir /sbin/install-info %{_infodir}/goops.info.gz %{_infodir}/dir /sbin/install-info %{_infodir}/guile-tut.info.gz %{_infodir}/dir +: %postun -p /sbin/ldconfig @@ -85,11 +86,16 @@ /sbin/install-info --delete %{_infodir}/goops.info.gz %{_infodir}/dir /sbin/install-info --delete %{_infodir}/guile-tut.info.gz %{_infodir}/dir fi +: %triggerin -- slib ln -sfT ../../slib %{_datadir}/guile/site/slib rm -f %{_datadir}/guile/site/slibcat -%{_bindir}/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)" || : +SCHEME_LIBRARY_PATH=%{_datadir}/slib/ \ + %{_bindir}/guile -l %{_datadir}/slib/guile.init -c "\ + (define (implementation-vicinity) \"%{_datadir}/guile/site/\") + (require 'new-catalog)" +: %triggerun -- slib if [ "$1" = 0 -o "$2" = 0 ]; then @@ -119,6 +125,10 @@ %{_includedir}/libguile.h %changelog +* Tue Jan 23 2007 Miroslav Lichvar - 5:1.8.1-2 +- support slib-3a4 +- make scriptlets safer (#223701) + * Fri Oct 13 2006 Miroslav Lichvar - 5:1.8.1-1 - update to 1.8.1 --- guile-1.8.0-slib.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 14:24:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 09:24:08 -0500 Subject: rpms/ntp/devel ntp-4.2.4-autoopts.patch, NONE, 1.1 ntp-4.2.4-htmldoc.patch, 1.1, 1.2 ntp.spec, 1.61, 1.62 Message-ID: <200701231424.l0NEO85m005651@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5628 Modified Files: ntp-4.2.4-htmldoc.patch ntp.spec Added Files: ntp-4.2.4-autoopts.patch Log Message: - disable autoopts option preset mechanisms for ntpd - document -I option of ntpd ntp-4.2.4-autoopts.patch: ntpd-opts.c | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE ntp-4.2.4-autoopts.patch --- --- ntp-4.2.4/ntpd/ntpd-opts.c.autoopts 2006-12-29 01:11:53.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd-opts.c 2007-01-16 15:52:11.000000000 +0100 @@ -870,8 +870,6 @@ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { - "$HOME", - ".", NULL }; tSCC zBugsAddr[] = "http://bugs.ntp.isc.org, bugs at ntp.org"; @@ -896,7 +894,6 @@ + OPTPROC_SHORTOPT + OPTPROC_LONGOPT + OPTPROC_NO_REQ_OPT - + OPTPROC_ENVIRON + OPTPROC_NO_ARGS + OPTPROC_HAS_IMMED ), 0, NULL, /* current option index, current option */ ntp-4.2.4-htmldoc.patch: confopt.html | 4 ++-- keygen.html | 6 ++++-- monopt.html | 16 ++++------------ ntpd.html | 12 +++++++++--- ntpdate.html | 14 +++++++------- ntpdc.html | 20 +++++++++++--------- ntpq.html | 12 ++++++------ ntptrace.html | 10 +--------- 8 files changed, 44 insertions(+), 50 deletions(-) Index: ntp-4.2.4-htmldoc.patch =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp-4.2.4-htmldoc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ntp-4.2.4-htmldoc.patch 8 Jan 2007 12:50:10 -0000 1.1 +++ ntp-4.2.4-htmldoc.patch 23 Jan 2007 14:24:06 -0000 1.2 @@ -5,7 +5,7 @@

        Synopsis

        - ntpd [ -46aAbdDgLmnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ] -+ ntpd [ -46aAbdDgLnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ] ++ ntpd [ -46aAbdDgLnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -I iface ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ]

        Description

        The ntpd program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. ntpd does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.

        How NTP Operates

        @@ -20,7 +20,7 @@
        -a
        Require cryptographic authentication for broadcast client, multicast client and symmetric passive associations. This is the default.
        -A -@@ -78,13 +82,13 @@ +@@ -78,13 +82,15 @@
        -D level
        Specify debugging level directly.
        -f driftfile @@ -30,6 +30,8 @@
        Normally, ntpd exits with a message to the system log if the offset exceeds the panic threshold, which is 1000 s by default. This option allows the time to be set to any value without restriction; however, this can happen only once. If the threshold is exceeded after that, ntpd will exit with a message to the system log. This option can be used with the -q and -x options. See the tinker command for other options.
        -i jaildir
        Chroot the server to the directory jaildir. This option also implies that the server attempts to drop root privileges at startup (otherwise, chroot gives very little additional security), and it is only available if the OS supports to run the server without full root privileges. You may need to also specify a -u option. ++
        -I iface ++
        Listen on interface. This option may appear an unlimited number of times.
        -k keyfile -
        Specify the name and path of the symmetric key file, default /etc/ntp.keys. This is the same operation as the keys keyfile configuration command. +
        Specify the name and path of the symmetric key file, default /etc/ntp/keys. This is the same operation as the keys keyfile configuration command. Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ntp.spec 8 Jan 2007 12:50:10 -0000 1.61 +++ ntp.spec 23 Jan 2007 14:24:06 -0000 1.62 @@ -3,7 +3,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch10: ntp-4.2.4-htmldoc.patch Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch Patch12: ntp-4.2.4-sprintf.patch +Patch13: ntp-4.2.4-autoopts.patch URL: http://www.ntp.org Requires(pre): shadow-utils @@ -63,6 +64,7 @@ %patch10 -p1 -b .htmldoc %patch11 -p1 -b .keyfile %patch12 -p1 -b .sprintf +%patch13 -p1 -b .autoopts %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -174,6 +176,10 @@ %changelog +* Tue Jan 23 2007 Miroslav Lichvar 4.2.4-2 +- disable autoopts option preset mechanisms for ntpd +- document -I option of ntpd + * Mon Jan 08 2007 Miroslav Lichvar 4.2.4-1 - update to 4.2.4 (#146884) - don't use local clock in default config From fedora-cvs-commits at redhat.com Tue Jan 23 14:53:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 09:53:27 -0500 Subject: rpms/udev/devel modprobe, NONE, 1.1 .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 start_udev, 1.57, 1.58 udev-rules.patch, 1.27, 1.28 udev.spec, 1.195, 1.196 upstream, 1.6, 1.7 Message-ID: <200701231453.l0NErRdf024217@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24112 Modified Files: .cvsignore sources start_udev udev-rules.patch udev.spec upstream Added Files: modprobe Log Message: - version 104 - merged changes from RHEL --- NEW FILE modprobe --- #!/bin/sh if [ -f /dev/.modprobe_debug ]; then /sbin/modprobe -v -s $@ &>/dev/console else /sbin/modprobe $@ fi Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/udev/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 7 Nov 2006 14:25:06 -0000 1.39 +++ .cvsignore 23 Jan 2007 14:53:25 -0000 1.40 @@ -1 +1 @@ -udev-103.tar.bz2 +udev-104.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/udev/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 7 Nov 2006 14:25:06 -0000 1.39 +++ sources 23 Jan 2007 14:53:25 -0000 1.40 @@ -1 +1 @@ -7360ce47b5ec3f9fa71f18071ecb8b97 udev-103.tar.bz2 +9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 Index: start_udev =================================================================== RCS file: /cvs/dist/rpms/udev/devel/start_udev,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- start_udev 7 Nov 2006 14:25:07 -0000 1.57 +++ start_udev 23 Jan 2007 14:53:25 -0000 1.58 @@ -180,14 +180,17 @@ if [ -f "/sys/class/tty/console/uevent" ]; then # trigger the sorted events echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug + if strstr "$cmdline" modprobedebug; then + touch /dev/.modprobe_debug + else + rm -f /dev/.modprobe_debug + fi /sbin/udevd -d ret=$[$ret + $?] if strstr "$cmdline" udevdebug; then /sbin/udevcontrol log_priority=debug fi - /sbin/udevtrigger --attr-nomatch='modalias=pci:v*d*sv*sd*bc0Csc00i10*' --attr-nomatch='modalias=pci:v*d*sv*sd*bc0Csc03i*' - /sbin/udevtrigger --attr-match='modalias=pci:v*d*sv*sd*bc0Csc00i10*' - /sbin/udevtrigger --attr-match='modalias=pci:v*d*sv*sd*bc0Csc03i*' + /sbin/udevtrigger ret=$[$ret + $?] wait_for_queue $(getval udevtimeout $cmdline) ret=$[$ret + $?] udev-rules.patch: 50-udev.rules | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- udev-rules.patch 6 Dec 2006 12:13:57 -0000 1.27 +++ udev-rules.patch 23 Jan 2007 14:53:25 -0000 1.28 @@ -1,125 +1,92 @@ ---- udev-103/etc/udev/redhat/50-udev.rules.rhrules 2006-10-20 14:43:35.000000000 +0200 -+++ udev-103/etc/udev/redhat/50-udev.rules 2006-12-06 13:10:19.000000000 +0100 -@@ -41,9 +41,9 @@ - KERNEL=="hvc*", NAME="%k", GROUP="uucp", MODE="0660" - KERNEL=="hvsi*", NAME="%k", GROUP="uucp", MODE="0660" - KERNEL=="iseries/vtty*", NAME="%k", GROUP="uucp", MODE="0660" --KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660" --KERNEL=="ttyUSB*", SYSFS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660" --KERNEL=="ttyUSB*", SYSFS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660" -+KERNEL=="ttyUSB*", ATTRS{product}=="Palm Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660" -+KERNEL=="ttyUSB*", ATTRS{product}=="palmOne Handheld*", SYMLINK+="pilot", GROUP="uucp", MODE="0660" -+KERNEL=="ttyUSB*", ATTRS{product}=="Handspring Visor*", SYMLINK+="pilot", GROUP="uucp", MODE="0660" - - # vc devices - KERNEL=="vcs", NAME="%k", OWNER="vcsa", GROUP="tty", OPTIONS="last_rule" -@@ -72,7 +72,7 @@ +--- udev-104/etc/udev/redhat/50-udev.rules.rhrules 2007-01-02 15:58:41.000000000 +0100 ++++ udev-104/etc/udev/redhat/50-udev.rules 2007-01-23 15:45:56.000000000 +0100 +@@ -68,6 +68,9 @@ + KERNEL=="nvram", MODE="0660" + KERNEL=="rtc", MODE="0644" + ++# pnp devices ++ACTION=="add", SUBSYSTEM=="pnp", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe pnp:d$$id; done < /sys/$devpath/id'" ++ + # floppy devices KERNEL=="fd[01]*", GROUP="floppy", MODE="0660" # fix floppy devices - KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh" --KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{device/cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{device/cmos} -m %M /dev/%k" -+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k" - KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'" - - # audio devices -@@ -231,24 +231,24 @@ - - KERNEL=="pktcdvd", NAME="%k/control" - --KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \ -- SYSFS{device/media}=="floppy", \ -+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", \ -+ ATTRS{media}=="floppy", \ - SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions" - --KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k" -+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{removable}=="1", ATTRS{media}=="cdrom", SYMLINK+="cdrom cdrom-%k" - --KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k" -+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{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=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k" -+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{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="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k" -+KERNEL=="hd[a-z]", BUS=="ide", ATTRS{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" --KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \ -+KERNEL=="hd*[0-9]", BUS=="ide", ATTRS{removable}=="1", \ - OPTIONS+="ignore_remove" - - -@@ -265,15 +265,15 @@ - KERNEL=="ram*|loop*|fd*|nbd*|gnbd*", 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", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end" -+BUS=="ide", DRIVERS!="ide-cdrom", ATTRS{removable}=="1", GOTO="persistent_end" -+BUS=="ide", KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_end" - - # by-id (hardware serial number) - KERNEL=="hd*[!0-9]", IMPORT{program}="/lib/udev/ata_id --export $tempnode" - KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}" - KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n" - --KERNEL=="sd*[!0-9]|sr*", SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394" -+KERNEL=="sd*[!0-9]|sr*", ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394" - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x" - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode" - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode" -@@ -291,7 +291,7 @@ - KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" - - # by-label/by-uuid (filesystem properties) --KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="persistent_end" -+KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="persistent_end" - IMPORT{program}="/lib/udev/vol_id --export $tempnode" - ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" - ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}" -@@ -320,29 +320,29 @@ - # sr: 4 TYPE_WORM, 5 TYPE_ROM - # st/osst: 1 TYPE_TAPE - # sg: 8 changer, [36] scanner --ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="0|7|14", \ -+ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="0|7|14", \ - RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'" --ACTION=="add", SUBSYSTEM=="scsi" , SYSFS{type}=="1", \ -+ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="1", \ +@@ -100,6 +103,8 @@ + KERNEL=="usb/lp*", GROUP="lp", MODE="0660" + + # tape devices ++SUBSYSTEM=="ide", SYSFS{media}=="tape", ACTION=="add", \ ++ RUN+="modprobe ide-scsi idescsi_nocd=1" + KERNEL=="ht*", GROUP="disk", MODE="0660" + KERNEL=="nht*", GROUP="disk", MODE="0660" + KERNEL=="pt[0-9]*", GROUP="disk", MODE="0660" +@@ -157,7 +162,7 @@ + SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \ + NAME="%c", MODE="0660" + +-KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" ++KERNEL=="dm-[0-9]*", ACTION=="add", OPTIONS+="ignore_device" + + # alsa devices + KERNEL=="controlC[0-9]*", NAME="snd/%k" +@@ -212,15 +217,9 @@ + 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" +- +-KERNEL=="umad*", NAME="infiniband/%k", MODE="0660" +-KERNEL=="issm*", NAME="infiniband/%k", MODE="0660" +-KERNEL=="uverbs*", NAME="infiniband/%k", MODE="0660" +-KERNEL=="ucm*", NAME="infiniband/%k", MODE="0660" +-KERNEL=="rdma_cm", NAME="infiniband/%k", MODE="0660" ++KERNEL=="fd[0-9]*", SYMLINK+="floppy floppy-%k" ++KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape tape-%k", MODE="0660" ++KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape tape-%k", MODE="0660" + + # Section for zaptel device + KERNEL=="zapctl", NAME="zap/ctl" +@@ -312,7 +311,7 @@ + PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \ + NAME="%c", MODE="0644" + +-ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" ++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="modprobe $env{MODALIAS}" + + ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'" + +@@ -326,11 +325,11 @@ RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'" - ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="/sbin/modprobe sg" --ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \ -+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \ - RUN+="/sbin/modprobe sd_mod" --ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="[45]", \ -+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \ - RUN+="/sbin/modprobe sr_mod" +-ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="/sbin/modprobe sg" ++ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="modprobe sg" + ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \ +- RUN+="/sbin/modprobe sd_mod" ++ RUN+="modprobe sd_mod" + ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", \ +- RUN+="/sbin/modprobe sr_mod" ++ RUN+="modprobe sr_mod" --ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \ -+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \ + ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="[36]", \ SYMLINK+="scanner scanner-%k", MODE="0660" - --ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \ -+ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", \ +@@ -339,14 +338,14 @@ 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" --ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \ -- SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st" --ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}!="On[sS]tream", \ -+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ -+ ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst" -+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ -+ ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st" -+ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \ - RUN+="/sbin/modprobe st" + ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ +- ATTRS{model}!="ADR*", RUN+="/sbin/modprobe osst" ++ ATTRS{model}!="ADR*", RUN+="modprobe osst" + ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ +- ATTRS{model}=="ADR*", RUN+="/sbin/modprobe st" ++ ATTRS{model}=="ADR*", RUN+="modprobe st" + ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}!="On[sS]tream", \ +- RUN+="/sbin/modprobe st" ++ RUN+="modprobe st" # mmc block devices +-ACTION=="add", SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block" ++ACTION=="add", SUBSYSTEM=="mmc", RUN+="modprobe mmc_block" + + RUN+="socket:/org/kernel/udev/monitor" + Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- udev.spec 6 Dec 2006 12:13:57 -0000 1.195 +++ udev.spec 23 Jan 2007 14:53:25 -0000 1.196 @@ -2,8 +2,8 @@ Summary: A userspace implementation of devfs Name: udev -Version: 103 -Release: 3 +Version: 104 +Release: 1 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -12,6 +12,7 @@ Source1: start_udev Source2: udev.nodes +Source3: modprobe Source10: firmware_helper.c @@ -27,6 +28,7 @@ Patch11: udev-095-selinux.patch Patch12: udev-095-path_id.patch Patch13: udev-095-path_id2.patch +Patch14: udev-095-dbgwait.patch ExclusiveOS: Linux URL: http://kernel.org/pub/linux/utils/kernel/hotplug/ @@ -75,6 +77,8 @@ #%patch11 -p1 -b .selinux #%patch12 -p1 -b .pathid #%patch13 -p1 -b .pathid2 +%patch14 -p1 -b .dbgwait + rm -f etc/udev/redhat/51-hotplug.rules %build @@ -190,6 +194,7 @@ done install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes +install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{udev_scriptdir}/modprobe mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev @@ -197,6 +202,9 @@ #install -m 0755 udevtrigger $RPM_BUILD_ROOT/sbin install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdir}/MAKEDEV.dev +%ifarch s390 s390x +ln -s %{udev_scriptdir}/dasd_id $RPM_BUILD_ROOT/sbin/dasd_id +%endif mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware @@ -204,7 +212,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules </dev/null 2>&1 done EOF @@ -268,7 +276,9 @@ %attr(755,root,root) %{udev_scriptdir}/usb_id %attr(755,root,root) %{udev_scriptdir}/vol_id %attr(755,root,root) %{udev_scriptdir}/path_id +%attr(755,root,root) %{udev_scriptdir}/modprobe %ifarch s390 s390x +%attr(755,root,root) /sbin/dasd_id %attr(755,root,root) %{udev_scriptdir}/dasd_id %attr(0644,root,root) %{_mandir}/man8/dasd_id*.8* %endif @@ -296,7 +306,6 @@ %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices %attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh - %config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %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 @@ -327,6 +336,10 @@ %{_libdir}/pkgconfig/libvolume_id.pc %changelog +* Tue Jan 23 2007 Harald Hoyer - 104-1 +- version 104 +- merged changes from RHEL + * Wed Dec 6 2006 Harald Hoyer - 103-3 - changed DRIVER to DRIVERS - Resolves: rhbz#218160 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/udev/devel/upstream,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- upstream 14 Jun 2006 10:21:55 -0000 1.6 +++ upstream 23 Jan 2007 14:53:25 -0000 1.7 @@ -1 +1,2 @@ udev-094.tar.bz2 +udev-104.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 14:54:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 09:54:17 -0500 Subject: rpms/postfix/devel postfix.spec,1.51,1.52 Message-ID: <200701231454.l0NEsHA1024908@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/postfix/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24786 Modified Files: postfix.spec Log Message: [tw] - dropped usage of ed in the install stage Index: postfix.spec =================================================================== RCS file: /cvs/dist/rpms/postfix/devel/postfix.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- postfix.spec 23 Jan 2007 13:11:15 -0000 1.51 +++ postfix.spec 23 Jan 2007 14:54:15 -0000 1.52 @@ -259,15 +259,11 @@ install -c -m 755 man/man1/$i.1 $RPM_BUILD_ROOT%{_mandir}/man1/ done -# RPM compresses man pages automatically. -# - Edit postfix-files to reflect this, so post-install won't get confused -# when called during package installation. -ed $RPM_BUILD_ROOT%{postfix_config_dir}/postfix-files < 2:2.3.6-1 - new version 2.3.6 - limiting SASL mechanisms to plain login for sasl with saslauthd (#175259) +- dropped usage of ed in the install stage * Tue Nov 7 2006 Thomas Woerner 2:2.3.4-1 - new version 2.3.4 From fedora-cvs-commits at redhat.com Tue Jan 23 14:54:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 09:54:59 -0500 Subject: rpms/udev/devel udev-095-dbgwait.patch,NONE,1.1 Message-ID: <200701231454.l0NEsxfo025505@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25456 Added Files: udev-095-dbgwait.patch Log Message: merged in RHEL changes udev-095-dbgwait.patch: udev_utils_run.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) --- NEW FILE udev-095-dbgwait.patch --- --- udev-095/udev_utils_run.c.dbgwait 2006-07-04 12:34:55.000000000 +0200 +++ udev-095/udev_utils_run.c 2006-12-18 11:06:04.000000000 +0100 @@ -33,6 +33,8 @@ #include "udev.h" +#define WAIT_TIME 100 + extern char **environ; int pass_env_to_socket(const char *sockname, const char *devpath, const char *action) @@ -83,6 +85,8 @@ char *argv[(sizeof(arg) / 2) + 1]; int devnull; int i; + int waited = 0; + struct timeval timeout; /* build argv from comand */ strlcpy(arg, command, sizeof(arg)); @@ -175,6 +179,7 @@ if (errpipe[WRITE_END] > 0) close(errpipe[WRITE_END]); + waited = 0; /* read child output */ while (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) { int fdcount; @@ -185,7 +190,18 @@ FD_SET(outpipe[READ_END], &readfds); if (errpipe[READ_END] > 0) FD_SET(errpipe[READ_END], &readfds); - fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL); + + timeout.tv_sec = 0; + timeout.tv_usec = WAIT_TIME * 1000; + fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, &timeout); + + if (fdcount == 0) { + waited += WAIT_TIME; + if (waited % 1000 == 0) + info("Waiting %d seconds for output of '%s(%d)'", waited/1000, command, pid); + continue; + } + if (fdcount < 0) { if (errno == EINTR) continue; @@ -261,14 +277,24 @@ *reslen = respos; } } - waitpid(pid, &status, 0); - if (WIFEXITED(status)) { - info("'%s' returned with status %i", argv[0], WEXITSTATUS(status)); - if (WEXITSTATUS(status) != 0) + while(1) { + if (waitpid(pid, &status, WNOHANG) == 0) { + usleep(WAIT_TIME * 1000); + waited += WAIT_TIME; + if (waited % 1000 == 0) + info("Waiting %d seconds for '%s(%d)'", waited/1000, command, pid); + continue; + } + + if (WIFEXITED(status)) { + info("'%s' returned with status %i", argv[0], WEXITSTATUS(status)); + if (WEXITSTATUS(status) != 0) + retval = -1; + } else { + err("'%s' abnormal exit", argv[0]); retval = -1; - } else { - err("'%s' abnormal exit", argv[0]); - retval = -1; + } + break; } } From fedora-cvs-commits at redhat.com Tue Jan 23 14:55:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 09:55:06 -0500 Subject: rpms/ed/devel .cvsignore,1.3,1.4 ed.spec,1.22,1.23 sources,1.3,1.4 Message-ID: <200701231455.l0NEt63N025598@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/ed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25558 Modified Files: .cvsignore ed.spec sources Log Message: - new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ed/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2006 12:37:23 -0000 1.3 +++ .cvsignore 23 Jan 2007 14:55:04 -0000 1.4 @@ -1 +1 @@ -ed-0.3.tar.bz2 +ed-0.4.tar.bz2 Index: ed.spec =================================================================== RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ed.spec 18 Jan 2007 14:45:36 -0000 1.22 +++ ed.spec 23 Jan 2007 14:55:04 -0000 1.23 @@ -1,7 +1,7 @@ Summary: The GNU line editor. Name: ed -Version: 0.3 -Release: 3 +Version: 0.4 +Release: 1 License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2 @@ -56,6 +56,9 @@ %attr(0644,root,root) %{_mandir}/*/* %changelog +* Tue Jan 23 2007 Karsten Hopp 0.4-1 +- new upstream version + * Thu Jan 18 2007 Karsten Hopp 0.3-3 - don't abort (un)install scriptlets when _excludedocs is set (Ville Skytt??) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ed/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2006 12:37:23 -0000 1.3 +++ sources 23 Jan 2007 14:55:04 -0000 1.4 @@ -1 +1 @@ -56950c74e0239556296310a01c83ae7d ed-0.3.tar.bz2 +b5c8606bb306671bbbb2bd708d937bcb ed-0.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 15:02:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:02:07 -0500 Subject: rpms/system-config-bind/devel system-config-bind-4.0.2-ver.patch, NONE, 1.1 system-config-bind.spec, 1.62, 1.63 system-config-bind-4.0.2-version.patch, 1.1, NONE Message-ID: <200701231502.l0NF27je030822@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30769 Modified Files: system-config-bind.spec Added Files: system-config-bind-4.0.2-ver.patch Removed Files: system-config-bind-4.0.2-version.patch Log Message: reworked version check system-config-bind-4.0.2-ver.patch: GUI.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE system-config-bind-4.0.2-ver.patch --- --- system-config-bind-4.0.2/GUI.py.old 2007-01-23 15:15:38.000000000 +0100 +++ system-config-bind-4.0.2/GUI.py 2007-01-23 15:25:50.000000000 +0100 @@ -10,7 +10,6 @@ import gettext __builtin__.__dict__['SCB']='/usr/share/system-config-bind' -__builtin__.__dict__['SCB_VER']='4.0.0' os.environ['SCB']='/usr/share/system-config-bind' os.putenv('SCB','/usr/share/system-config-bind') gettext.bindtextdomain('bindconf', SCB + '/po') @@ -81,6 +80,12 @@ # gtk2-2.6.0 now emits an annoying warning message: # "Mixing deprecated and non-deprecated GtkToolbar API is not allowed" # and there appears to be no way to prevent it (bug 144301). + try: + fd = open(SCB+'/'+'system-config-bind.version', 'r') + __builtin__.__dict__['SCB_VER'] = (string.split(fd.readline()))[0] + fd.close() + except: + __builtin__.__dict__['SCB_VER'] = '4.0.0' sys.stdout = file("/dev/null","w") sys.stderr = sys.stdout self.xml = gtk.glade.XML ( SCB+'/'+'system-config-bind.glade', domain="bindconf") Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- system-config-bind.spec 21 Nov 2006 15:13:23 -0000 1.62 +++ system-config-bind.spec 23 Jan 2007 15:02:00 -0000 1.63 @@ -1,12 +1,12 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind Source0: %{name}-%{version}.tar.gz -Patch: system-config-bind-4.0.2-version.patch +Patch: system-config-bind-4.0.2-ver.patch Patch1: system-config-bind-4.0.2-version-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -42,6 +42,8 @@ %find_lang bindconf || touch bindconf.lang; cat %{name}.lang bindconf.lang > scb.lang +echo "%{version}" > $RPM_BUILD_ROOT/usr/share/system-config-bind/system-config-bind.version + %clean rm -rf $RPM_BUILD_ROOT @@ -95,6 +97,9 @@ fi %changelog +* Tue Jan 23 2007 Martin Stransky - 4.0.2-4 +- reworked version check + * Tue Nov 21 2006 Martin Stransky - 4.0.2-3 - added a second patch for issue #216584 --- system-config-bind-4.0.2-version.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 15:06:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:06:27 -0500 Subject: rpms/k3b/devel .cvsignore, 1.12, 1.13 k3b.spec, 1.35, 1.36 sources, 1.13, 1.14 Message-ID: <200701231506.l0NF6RfG001747@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/k3b/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1664 Modified Files: .cvsignore k3b.spec sources Log Message: - version k3b-1.0rc4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/k3b/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Oct 2006 13:47:34 -0000 1.12 +++ .cvsignore 23 Jan 2007 15:06:25 -0000 1.13 @@ -1,2 +1,3 @@ k3b-1.0pre2.tar.bz2 k3b-i18n-0.12.17.tar.bz2 +k3b-1.0rc4.tar.bz2 Index: k3b.spec =================================================================== RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- k3b.spec 26 Oct 2006 13:51:30 -0000 1.35 +++ k3b.spec 23 Jan 2007 15:06:25 -0000 1.36 @@ -1,9 +1,9 @@ -%define tar_version 1.0pre2 +%define tar_version 1.0rc4 %define i18n_version 0.12.17 Name: k3b Version: 1.0.0 -Release: 0.pre2.1 +Release: 0.rc4.1 Epoch: 0 Summary: CD/DVD burning application for KDE @@ -160,10 +160,14 @@ %lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/* %lang(ru) %doc %{_docdir}/HTML/ru/* %lang(sv) %doc %{_docdir}/HTML/sv/* +%lang(uk) %doc %{_docdir}/HTML/uk/* %lang(pl) %doc %{_docdir}/HTML/pl/* %changelog +* Wed Jan 17 2007 Harald Hoyer - 0:1.0.0-0.rc4.1 +- version k3b-1.0rc4 + * Thu Oct 26 2006 Harald Hoyer - 0:1.0.0-0.pre2.1 - version 1.0pre2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/k3b/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Oct 2006 13:47:34 -0000 1.13 +++ sources 23 Jan 2007 15:06:25 -0000 1.14 @@ -1,2 +1,2 @@ -de6d97ebc62dc6687bc03d0ac7a10302 k3b-1.0pre2.tar.bz2 f9de0fb3ce91fa572f4f0fd24dcfe2f2 k3b-i18n-0.12.17.tar.bz2 +785e81fe3ee695d3b927cef9759a9753 k3b-1.0rc4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 15:12:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:12:19 -0500 Subject: rpms/perl/devel perl.spec,1.100,1.101 Message-ID: <200701231512.l0NFCJnA006276@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6001 Modified Files: perl.spec Log Message: - rebuild against new db4 - use dist tag Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- perl.spec 1 Oct 2006 03:09:52 -0000 1.100 +++ perl.spec 23 Jan 2007 15:12:16 -0000 1.101 @@ -5,7 +5,7 @@ %define multilib_64_archs x86_64 s390x ppc64 sparc64 %define perlver 5.8.8 -%define perlrel 10 +%define perlrel 11 %define perlepoch 4 %{?!perl_debugging: %define perl_debugging 0} @@ -41,7 +41,7 @@ Name: perl Version: %{perlver} -Release: %{perlrel} +Release: %{perlrel}%{?dist} Epoch: %{perlepoch} Summary: The Perl programming language @@ -589,6 +589,10 @@ %endif %changelog +* Tue Jan 23 2007 Jindrich Novy - 4:5.8.8-11 +- rebuild against new db4 +- use dist tag + * Sat Sep 30 2006 Robin Norwood - 4:5.8.8-10 - bugzilla: 208731 - remove directory support for old perl versions From fedora-cvs-commits at redhat.com Tue Jan 23 15:26:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:26:52 -0500 Subject: rpms/nut/devel nut-ipv6.patch,1.1,1.2 nut.spec,1.37,1.38 Message-ID: <200701231526.l0NFQqN2005196@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/nut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5141 Modified Files: nut-ipv6.patch nut.spec Log Message: - update to 2.0.5 nut-ipv6.patch: clients/upsc.c | 3 clients/upsclient.c | 167 ++++++++++++++++++++++++++++++---------------------- clients/upsclient.h | 2 server/access.c | 149 ++++++++++++++++++++++++++++++++++++++-------- server/access.h | 8 +- server/ctype.h | 2 server/upsd.c | 124 +++++++++++++++++++++++++++----------- server/user.c | 6 - server/user.h | 4 - 9 files changed, 326 insertions(+), 139 deletions(-) Index: nut-ipv6.patch =================================================================== RCS file: /cvs/dist/rpms/nut/devel/nut-ipv6.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nut-ipv6.patch 21 Nov 2006 12:38:49 -0000 1.1 +++ nut-ipv6.patch 23 Jan 2007 15:26:50 -0000 1.2 @@ -1,5 +1,5 @@ ---- nut-2.0.3/server/access.c.ipv6 2006-10-24 11:16:43.000000000 +0200 -+++ nut-2.0.3/server/access.c 2006-10-24 11:06:41.000000000 +0200 +--- nut-2.0.5/server/access.c.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/server/access.c 2007-01-23 10:11:31.000000000 -0500 @@ -25,33 +25,72 @@ #include "common.h" #include "access.h" @@ -181,8 +181,8 @@ if (last == NULL) /* first */ acl_head = tmp; ---- nut-2.0.3/server/user.c.ipv6 2006-10-24 11:16:54.000000000 +0200 -+++ nut-2.0.3/server/user.c 2006-10-23 23:15:30.000000000 +0200 +--- nut-2.0.5/server/user.c.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/server/user.c 2007-01-23 10:11:31.000000000 -0500 @@ -290,7 +290,7 @@ users = NULL; } @@ -210,8 +210,8 @@ const char *un, const char *pw, const char *action) { ulist_t *tmp = users; ---- nut-2.0.3/server/user.h.ipv6 2006-10-24 11:17:17.000000000 +0200 -+++ nut-2.0.3/server/user.h 2006-10-23 23:16:10.000000000 +0200 +--- nut-2.0.5/server/user.h.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/server/user.h 2007-01-23 10:11:31.000000000 -0500 @@ -19,10 +19,10 @@ void user_load(void); @@ -225,8 +225,8 @@ const char *un, const char *pw, const char *action); void user_flush(void); ---- nut-2.0.3/server/ctype.h.ipv6 2006-10-24 11:17:47.000000000 +0200 -+++ nut-2.0.3/server/ctype.h 2006-10-22 17:01:30.000000000 +0200 +--- nut-2.0.5/server/ctype.h.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/server/ctype.h 2007-01-23 10:11:31.000000000 -0500 @@ -32,7 +32,7 @@ char *addr; int fd; @@ -236,8 +236,8 @@ char rq[SMALLBUF]; size_t rqpos; char *loginups; ---- nut-2.0.3/server/upsd.c.ipv6 2006-10-24 11:16:32.000000000 +0200 -+++ nut-2.0.3/server/upsd.c 2006-10-24 11:26:24.000000000 +0200 +--- nut-2.0.5/server/upsd.c.IPv6 2006-12-29 16:29:35.000000000 -0500 ++++ nut-2.0.5/server/upsd.c 2007-01-23 10:11:31.000000000 -0500 @@ -26,6 +26,7 @@ #include @@ -280,7 +280,7 @@ /* return a pointer to the named ups if possible */ upstype *get_ups_ptr(const char *name) { -@@ -131,35 +150,63 @@ +@@ -131,35 +150,62 @@ /* create a listening socket for tcp connections */ static void setuptcp(void) { @@ -290,13 +290,13 @@ int res, one = 1; - if ((listenfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) -- fatal("socket"); +- fatal_with_errno("socket"); - - res = setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (void *) &one, - sizeof(one)); - - if (res != 0) -- fatal("setsockopt(SO_REUSEADDR)"); +- fatal_with_errno("setsockopt(SO_REUSEADDR)"); - - memset(&server, '\0', sizeof(server)); - server.sin_addr = listenaddr; @@ -304,13 +304,16 @@ - server.sin_port = htons(net_port); - - if (bind(listenfd, (struct sockaddr *) &server, sizeof(server)) == -1) -- fatal("Can't bind TCP port number %d", net_port); +- fatal_with_errno("Can't bind TCP port number %d", net_port); +- +- if ((res = fcntl(listenfd, F_GETFL, 0)) == -1) +- fatal_with_errno("fcntl(get)"); + memset (&hints, 0, sizeof (struct addrinfo)); + hints.ai_family = opt_af; + hints.ai_flags = AI_PASSIVE; + hints.ai_protocol = IPPROTO_TCP; + hints.ai_socktype = SOCK_STREAM; -+ ++ + service = malloc (sizeof (char) * 6); + if (service == NULL) + fatal("malloc"); @@ -331,9 +334,6 @@ + fatal("socket"); + continue; + } - -- if ((res = fcntl(listenfd, F_GETFL, 0)) == -1) -- fatal("fcntl(get)"); + res = setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (void *) &one, sizeof(one)); + if (res != 0) + fatal("setsockopt(SO_REUSEADDR)"); @@ -346,12 +346,12 @@ + } - if (fcntl(listenfd, F_SETFL, res | O_NDELAY) == -1) -- fatal("fcntl(set)"); +- fatal_with_errno("fcntl(set)"); + if ((res = fcntl(listenfd, F_GETFL, 0)) == -1) + fatal("fcntl(get)"); - if (listen(listenfd, 16)) -- fatal("listen"); +- fatal_with_errno("listen"); + if (fcntl(listenfd, F_SETFL, res | O_NDELAY) == -1) + fatal("fcntl(set)"); @@ -367,7 +367,7 @@ return; } -@@ -412,7 +459,7 @@ +@@ -412,7 +458,7 @@ static void answertcp(void) { int acc; @@ -376,7 +376,7 @@ ctype *tmp, *last; socklen_t clen; -@@ -424,7 +471,7 @@ +@@ -424,7 +470,7 @@ if (!access_check(&csock)) { upslogx(LOG_NOTICE, "Rejecting TCP connection from %s", @@ -385,7 +385,7 @@ shutdown(acc, shutdown_how); close(acc); return; -@@ -439,10 +486,10 @@ +@@ -439,10 +485,10 @@ tmp = xmalloc(sizeof(ctype)); @@ -398,7 +398,7 @@ tmp->rqpos = 0; memset(tmp->rq, '\0', sizeof(tmp->rq)); -@@ -463,7 +510,7 @@ +@@ -463,7 +509,7 @@ else last->next = tmp; @@ -407,7 +407,7 @@ } /* read tcp messages and handle them */ -@@ -668,6 +715,8 @@ +@@ -668,6 +714,8 @@ printf(" -r chroots to \n"); printf(" -u switch to (if started as root)\n"); printf(" -V display the version of this software\n"); @@ -416,7 +416,7 @@ exit(EXIT_SUCCESS); } -@@ -819,13 +868,11 @@ +@@ -737,13 +785,11 @@ datapath = xstrdup(DATADIR); /* set up some things for later */ @@ -431,17 +431,17 @@ switch (i) { case 'h': help(progname); -@@ -834,8 +881,7 @@ +@@ -752,8 +798,7 @@ net_port = atoi(optarg); break; case 'i': - if (!inet_aton(optarg, &listenaddr)) -- fatal("Invalid IP address"); +- fatal_with_errno("Invalid IP address"); + listenaddr = xstrdup (optarg); break; case 'r': chroot_path = optarg; -@@ -866,6 +912,15 @@ +@@ -784,6 +829,15 @@ do_background = 0; nut_debug_level++; break; @@ -457,8 +457,8 @@ default: help(progname); break; ---- nut-2.0.3/server/access.h.ipv6 2006-10-24 11:17:25.000000000 +0200 -+++ nut-2.0.3/server/access.h 2006-10-22 20:14:23.000000000 +0200 +--- nut-2.0.5/server/access.h.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/server/access.h 2007-01-23 10:11:31.000000000 -0500 @@ -26,8 +26,8 @@ /* ACL structure */ struct acl_t { @@ -481,8 +481,8 @@ void acl_add(const char *aclname, char *ipblock); void access_add(int type, int numargs, const char **arg); void acl_free(void); ---- nut-2.0.3/clients/upsclient.h.ipv6 2006-10-24 11:15:38.000000000 +0200 -+++ nut-2.0.3/clients/upsclient.h 2006-10-22 01:52:46.000000000 +0200 +--- nut-2.0.5/clients/upsclient.h.IPv6 2005-02-28 04:14:07.000000000 -0500 ++++ nut-2.0.5/clients/upsclient.h 2007-01-23 10:11:31.000000000 -0500 @@ -148,6 +148,8 @@ #define UPSCLI_CONN_TRYSSL 0x0001 /* try SSL, OK if not supported */ @@ -492,8 +492,8 @@ #ifdef __cplusplus } ---- nut-2.0.3/clients/upsc.c.ipv6 2006-10-24 11:15:20.000000000 +0200 -+++ nut-2.0.3/clients/upsc.c 2006-10-22 01:32:39.000000000 +0200 +--- nut-2.0.5/clients/upsc.c.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/clients/upsc.c 2007-01-23 10:11:31.000000000 -0500 @@ -25,6 +25,9 @@ #include "upsclient.h" @@ -504,8 +504,8 @@ static void help(const char *prog) { printf("Network UPS Tools upsc %s\n\n", UPS_VERSION); ---- nut-2.0.3/clients/upsclient.c.ipv6 2006-10-24 11:15:44.000000000 +0200 -+++ nut-2.0.3/clients/upsclient.c 2006-10-24 10:49:04.000000000 +0200 +--- nut-2.0.5/clients/upsclient.c.IPv6 2005-01-27 09:33:14.000000000 -0500 ++++ nut-2.0.5/clients/upsclient.c 2007-01-23 10:11:31.000000000 -0500 @@ -38,6 +38,8 @@ #define shutdown_how 2 #endif Index: nut.spec =================================================================== RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- nut.spec 29 Nov 2006 14:16:46 -0000 1.37 +++ nut.spec 23 Jan 2007 15:26:50 -0000 1.38 @@ -10,8 +10,8 @@ Summary: Network UPS Tools Name: nut -Version: 2.0.4 -Release: 2 +Version: 2.0.5 +Release: 1 Group: Applications/System License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -279,6 +279,9 @@ %{_mandir}/man8/upsset.cgi.8.gz %changelog +* Tue Jan 23 2007 Karsten Hopp 2.0.5-1 +- update to 2.0.5 + * Wed Nov 29 2006 Karsten Hopp 2.0.4-2 - rebuild with new net-snmp-libs - disable nut-2.0.1-bad.patch, not required From fedora-cvs-commits at redhat.com Tue Jan 23 15:45:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:45:34 -0500 Subject: rpms/system-config-bind/devel system-config-bind-4.0.2-check-child.patch, NONE, 1.1 system-config-bind.spec, 1.63, 1.64 Message-ID: <200701231545.l0NFjYXH006883@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6867 Modified Files: system-config-bind.spec Added Files: system-config-bind-4.0.2-check-child.patch Log Message: added check for child processes (#216584) system-config-bind-4.0.2-check-child.patch: GUI.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+) --- NEW FILE system-config-bind-4.0.2-check-child.patch --- --- system-config-bind-4.0.2/GUI.py.old 2007-01-23 16:18:40.000000000 +0100 +++ system-config-bind-4.0.2/GUI.py 2007-01-23 16:23:14.000000000 +0100 @@ -155,6 +155,14 @@ return True def show_manual(self, dialog, event=None): + if (hasattr(self,'manual_pid')) and self.manual_pid != 0: + # process already exist -> check it + try: + os.waitpid(self.manual_pid, os.WNOHANG) + self.manual_pid = 0 + except: + self.manual_pid = 0 + if (not hasattr(self,'manual_pid')) or (os.access('/proc/'+str(self.manual_pid), os.F_OK)==0): try: self.manual_pid=os.fork() @@ -183,6 +191,14 @@ return def show_arm(self, dialog, event=None): + if (hasattr(self,'arm_pid')) and self.arm_pid != 0: + # process already exist -> check it + try: + os.waitpid(self.arm_pid, os.WNOHANG) + self.arm_pid = 0 + except: + self.arm_pid = 0 + if (not hasattr(self,'arm_pid')) or (os.access('/proc/'+str(self.arm_pid), os.F_OK)==0): try: self.arm_pid=os.fork() Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- system-config-bind.spec 23 Jan 2007 15:02:00 -0000 1.63 +++ system-config-bind.spec 23 Jan 2007 15:45:32 -0000 1.64 @@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch: system-config-bind-4.0.2-ver.patch Patch1: system-config-bind-4.0.2-version-2.patch +Patch2: system-config-bind-4.0.2-check-child.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: python, gettext, make, intltool @@ -31,6 +32,7 @@ %setup -q %patch -p1 %patch1 -p1 +%patch2 -p1 -b .old %build rm -rf $RPM_BUILD_ROOT @@ -99,6 +101,7 @@ %changelog * Tue Jan 23 2007 Martin Stransky - 4.0.2-4 - reworked version check +- added check for child processes (#216584) * Tue Nov 21 2006 Martin Stransky - 4.0.2-3 - added a second patch for issue #216584 From fedora-cvs-commits at redhat.com Tue Jan 23 15:45:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:45:45 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch, NONE, 1.1 ooobuild.VBAObjects.patch, 1.9, 1.10 openoffice.org.spec, 1.999, 1.1000 Message-ID: <200701231545.l0NFjj7I006925@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6851 Modified Files: ooobuild.VBAObjects.patch openoffice.org.spec Added Files: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch Log Message: extra bits openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch: extensions/source/plugin/base/makefile.mk | 4 ++++ source/plugin/base/makefile.mk | 0 2 files changed, 4 insertions(+) --- NEW FILE openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch --- Index: source/plugin/base/makefile.mk =================================================================== RCS file: /cvs/util/extensions/source/plugin/base/makefile.mk,v retrieving revision 1.11 diff -u -r1.11 makefile.mk --- openoffice.org.orig/extensions/source/plugin/base/makefile.mk 8 Mar 2006 14:16:22 -0000 1.11 +++ openoffice.org/extensions/source/plugin/base/makefile.mk 23 Jan 2007 15:35:34 -0000 @@ -48,6 +48,10 @@ CDEFS+=-DOJI .ENDIF +.IF "$(DISABLE_XAW)" != "" +CDEFS+=-DDISABLE_XAW +.ENDIF + .IF "$(WITH_MOZILLA)" != "NO" SLOFILES= \ ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 254 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 163 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl | 20 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 13 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 219 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 116 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 8 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 101 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 126 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlocx.cxx | 146 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3743 ++++++++++ sc/source/ui/vba/vbarange.hxx | 235 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 40 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 425 files changed, 20344 insertions(+), 636 deletions(-) Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ooobuild.VBAObjects.patch 23 Jan 2007 12:15:33 -0000 1.9 +++ ooobuild.VBAObjects.patch 23 Jan 2007 15:45:43 -0000 1.10 @@ -207,7 +207,7 @@ + { + ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( xSdrObj.get(), TRUE ); + if ( pInfo ) -+ pInfo->SetMacro( XclTbxControlHelper::GetScMacroName( xDrawObj->GetMacroName() ) ); ++ pInfo->SetMacro( XclControlObjHelper::GetScMacroName( xDrawObj->GetMacroName() ) ); + } + } + Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.999 retrieving revision 1.1000 diff -u -r1.999 -r1.1000 --- openoffice.org.spec 23 Jan 2007 12:15:33 -0000 1.999 +++ openoffice.org.spec 23 Jan 2007 15:45:43 -0000 1.1000 @@ -116,6 +116,7 @@ Patch49: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch Patch50: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch Patch51: openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch +Patch52: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch %define instdir %{_libdir}/openoffice.org @@ -981,6 +982,7 @@ %patch49 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch %patch50 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch %patch51 -p1 -b .oooXXXXX.javaunohelper.parallel.patch +%patch52 -p1 -b .oooXXXXX.extensions.noxaw.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -2581,6 +2583,7 @@ - drop integrated openoffice.org-2.0.4.rh213710.vba.patch - drop integrated openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch - add openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch +- add openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch * Wed Jan 17 2007 Caolan McNamara - 1:2.1.0-6.14 - Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch From fedora-cvs-commits at redhat.com Tue Jan 23 15:57:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:57:01 -0500 Subject: rpms/ntp/devel ntp-4.2.4-html2man.patch,1.1,1.2 ntp.spec,1.62,1.63 Message-ID: <200701231557.l0NFv18W027591@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27575 Modified Files: ntp-4.2.4-html2man.patch ntp.spec Log Message: - generate makewhatis friendly man pages ntp-4.2.4-html2man.patch: html2man.in | 99 +++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 65 insertions(+), 34 deletions(-) Index: ntp-4.2.4-html2man.patch =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp-4.2.4-html2man.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ntp-4.2.4-html2man.patch 8 Jan 2007 12:50:10 -0000 1.1 +++ ntp-4.2.4-html2man.patch 23 Jan 2007 15:56:58 -0000 1.2 @@ -47,12 +47,15 @@ print MANOUT ".SH NAME\n"; $pat = $fileinfo->[0]; if ($name =~ /$pat/) { -@@ -83,8 +74,10 @@ +@@ -81,10 +72,12 @@ + # Add the manpage name, if not in the HTML title already + print MANOUT "$fileinfo->[0] - "; } - print MANOUT "$name\n\n"; - -- print MANOUT "$top_disclaimer\n"; +- print MANOUT "$name\n\n"; - +- print MANOUT "$top_disclaimer\n"; ++ print MANOUT "$name\n.SH\n\n"; + + @fontstack = (); + $deflevel = 0; + $pre = 0; Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ntp.spec 23 Jan 2007 14:24:06 -0000 1.62 +++ ntp.spec 23 Jan 2007 15:56:58 -0000 1.63 @@ -3,7 +3,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -176,9 +176,10 @@ %changelog -* Tue Jan 23 2007 Miroslav Lichvar 4.2.4-2 +* Tue Jan 23 2007 Miroslav Lichvar 4.2.4-3 - disable autoopts option preset mechanisms for ntpd - document -I option of ntpd +- generate makewhatis friendly man pages * Mon Jan 08 2007 Miroslav Lichvar 4.2.4-1 - update to 4.2.4 (#146884) From fedora-cvs-commits at redhat.com Tue Jan 23 15:59:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 10:59:51 -0500 Subject: rpms/hwdata/devel .cvsignore, 1.78, 1.79 hwdata.spec, 1.80, 1.81 sources, 1.81, 1.82 Message-ID: <200701231559.l0NFxpNe027819@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/hwdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27797 Modified Files: .cvsignore hwdata.spec sources Log Message: - update pci.ids, usb.ids and build for FC-7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- .cvsignore 2 Jan 2007 12:58:47 -0000 1.78 +++ .cvsignore 23 Jan 2007 15:59:49 -0000 1.79 @@ -1 +1 @@ -hwdata-0.193.tar.gz +hwdata-0.195.tar.gz Index: hwdata.spec =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- hwdata.spec 2 Jan 2007 12:58:47 -0000 1.80 +++ hwdata.spec 23 Jan 2007 15:59:49 -0000 1.81 @@ -1,6 +1,6 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.193 +Version: 0.195 Release: 1 License: GPL/MIT Group: System Environment/Base @@ -33,11 +33,19 @@ %config /usr/share/hwdata/* %changelog +* Tue Jan 23 2007 Karsten Hopp 0.195-1 +- update pci.ids, usb.ids and build for FC-7 + * Tue Jan 02 2007 Karsten Hopp 0.193-1 - Update to latest pci.ids/usb.ids for RHEL5 - Resolves: #220182 Add some Dell monitors to MonitorDB +* Wed Dec 06 2006 Karsten Hopp 0.192-1 +- update pci.ids +- update usb.ids +- add some Samsung monitors (Till Maas, #204459) + * Mon Oct 09 2006 Phil Knirsch - 0.191-1 - Update to latest pci.ids for RHEL5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- sources 2 Jan 2007 12:58:47 -0000 1.81 +++ sources 23 Jan 2007 15:59:49 -0000 1.82 @@ -1 +1 @@ -dc2be7f514f88a85dcbdaf82d1d1e21d hwdata-0.193.tar.gz +bf2fcca28a9ef730f48813a65b596dc3 hwdata-0.195.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 16:00:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 11:00:03 -0500 Subject: rpms/ntp/FC-6 ntp-4.2.4-html2man.patch,1.1,1.2 ntp.spec,1.61,1.62 Message-ID: <200701231600.l0NG03uA027934@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv27837 Modified Files: ntp-4.2.4-html2man.patch ntp.spec Log Message: - generate makewhatis friendly man pages ntp-4.2.4-html2man.patch: html2man.in | 99 +++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 65 insertions(+), 34 deletions(-) Index: ntp-4.2.4-html2man.patch =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp-4.2.4-html2man.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ntp-4.2.4-html2man.patch 17 Jan 2007 16:06:39 -0000 1.1 +++ ntp-4.2.4-html2man.patch 23 Jan 2007 16:00:00 -0000 1.2 @@ -47,12 +47,15 @@ print MANOUT ".SH NAME\n"; $pat = $fileinfo->[0]; if ($name =~ /$pat/) { -@@ -83,8 +74,10 @@ +@@ -81,10 +72,12 @@ + # Add the manpage name, if not in the HTML title already + print MANOUT "$fileinfo->[0] - "; } - print MANOUT "$name\n\n"; - -- print MANOUT "$top_disclaimer\n"; +- print MANOUT "$name\n\n"; - +- print MANOUT "$top_disclaimer\n"; ++ print MANOUT "$name\n.SH\n\n"; + + @fontstack = (); + $deflevel = 0; + $pre = 0; Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ntp.spec 17 Jan 2007 16:06:39 -0000 1.61 +++ ntp.spec 23 Jan 2007 16:00:00 -0000 1.62 @@ -3,7 +3,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -177,6 +177,9 @@ %changelog +* Tue Jan 23 2007 Miroslav Lichvar 4.2.4-2.fc6 +- generate makewhatis friendly man pages + * Wed Jan 17 2007 Miroslav Lichvar 4.2.4-1.fc6 - update to 4.2.4 (#216351) - autogenerate man pages from HTML From fedora-cvs-commits at redhat.com Tue Jan 23 16:00:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 11:00:56 -0500 Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch,1.10,1.11 Message-ID: <200701231600.l0NG0uaD028066@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28032 Modified Files: ooobuild.VBAObjects.patch Log Message: i have vba ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 254 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 163 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl | 20 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 13 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 219 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 116 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 8 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 101 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 128 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlocx.cxx | 146 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3743 ++++++++++ sc/source/ui/vba/vbarange.hxx | 235 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 40 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 425 files changed, 20345 insertions(+), 637 deletions(-) Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ooobuild.VBAObjects.patch 23 Jan 2007 15:45:43 -0000 1.10 +++ ooobuild.VBAObjects.patch 23 Jan 2007 16:00:50 -0000 1.11 @@ -145,6 +145,15 @@ { // type of action is dependent on control type rEvent.ListenerType = XclControlObjHelper::GetTbxListenerType( GetObjType() ); +@@ -809,7 +848,7 @@ + { + // set the macro name + rEvent.ScriptType = XclControlObjHelper::GetTbxScriptType(); +- rEvent.ScriptCode = XclControlObjHelper::GetScMacroName( maMacroName ); ++ rEvent.ScriptCode = XclControlObjHelper::GetScMacroName( GetMacroName() ); + return true; + } + } @@ -1055,38 +1094,6 @@ mbFlatBorder = ::get_flag( nStyle, EXC_OBJ_GBO_FLAT ); } From fedora-cvs-commits at redhat.com Tue Jan 23 16:20:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 11:20:33 -0500 Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch,1.11,1.12 Message-ID: <200701231620.l0NGKXTk016576@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16552 Modified Files: ooobuild.VBAObjects.patch Log Message: i hate vba ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 254 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 163 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFillType.idl | 20 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 13 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 219 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 116 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 8 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 101 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 128 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlocx.cxx | 151 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3743 ++++++++++ sc/source/ui/vba/vbarange.hxx | 235 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 40 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 425 files changed, 20350 insertions(+), 637 deletions(-) Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ooobuild.VBAObjects.patch 23 Jan 2007 16:00:50 -0000 1.11 +++ ooobuild.VBAObjects.patch 23 Jan 2007 16:20:31 -0000 1.12 @@ -21171,7 +21171,16 @@ #ifndef _SVDPAGE_HXX #include #endif -@@ -177,7 +211,13 @@ +@@ -81,6 +115,8 @@ + #ifndef SC_XEESCHER_HXX + #include "xeescher.hxx" + #endif ++#include ++#include + + using ::rtl::OUString; + using ::com::sun::star::uno::Reference; +@@ -177,7 +213,13 @@ Reference< XShape > xShape; // reads from mxStrm into xShape, inserts the control model into the form of the sheet if( ReadOCXExcelKludgeStream( mxStrm, &xShape, TRUE ) ) @@ -21185,7 +21194,7 @@ } catch( Exception& ) { -@@ -273,22 +313,118 @@ +@@ -273,22 +315,121 @@ void XclImpOcxConverter::RegisterTbxMacro( const XclImpTbxControlObj& rTbxCtrlObj ) { ScriptEventDescriptor aEvent; @@ -21235,9 +21244,12 @@ +void XclImpOcxConverter::RegisterOleMacros( const Reference< XControlModel > & rxModel, const XclImpOleObj& rOcxCtrlObj ) +{ + // Need to search basic for macro's named e.g. ControlButton1_Click -+ OUString sSearchString = rOcxCtrlObj.GetControlName(); ++ OUString sSearchString; ++ String sControlName; + sSearchString += OUString::createFromAscii("_"); + ScfPropertySet aPropSet( rxModel ); ++ aPropSet.GetStringProperty( sControlName, CREATE_OUSTRING( "Name" ) ); ++ sSearchString = sControlName; + + if( SfxObjectShell* pDocShell = GetDocShell() ) + if( StarBASIC* pBasic = pDocShell->GetBasic() ) @@ -21282,8 +21294,8 @@ + if ( nSearchIndex == 0 ) + { + Sequence< OUString > sHandlerExtns(1); -+ sHandlerExtns[ 0 ] = sMeth.copy( rOcxCtrlObj.GetControlName().Len() ); -+ OUString sMacroName = sMeth.copy( 0, rOcxCtrlObj.GetControlName().Len() ); ++ sHandlerExtns[ 0 ] = sMeth.copy( sControlName.Len() ); ++ OUString sMacroName = sMeth.copy( 0, sControlName.Len() ); + Sequence< ScriptEventDescriptor > aDescs( xEvtDescGen->getEventDescriptions( xCntrl, sLibModName, sHandlerExtns ) ); + if ( aDescs.getLength() ) + { From fedora-cvs-commits at redhat.com Tue Jan 23 16:34:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 11:34:04 -0500 Subject: rpms/nut/devel nut-ipv6.patch,1.2,1.3 nut.spec,1.38,1.39 Message-ID: <200701231634.l0NGY4KI032074@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/nut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31984 Modified Files: nut-ipv6.patch nut.spec Log Message: - rename fatal to fatal_with_errno in ipv6 patch - fix filelist nut-ipv6.patch: clients/upsc.c | 3 clients/upsclient.c | 167 ++++++++++++++++++++++++++++++---------------------- clients/upsclient.h | 2 server/access.c | 149 ++++++++++++++++++++++++++++++++++++++-------- server/access.h | 8 +- server/ctype.h | 2 server/upsd.c | 124 +++++++++++++++++++++++++++----------- server/user.c | 6 - server/user.h | 4 - 9 files changed, 326 insertions(+), 139 deletions(-) Index: nut-ipv6.patch =================================================================== RCS file: /cvs/dist/rpms/nut/devel/nut-ipv6.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nut-ipv6.patch 23 Jan 2007 15:26:50 -0000 1.2 +++ nut-ipv6.patch 23 Jan 2007 16:34:01 -0000 1.3 @@ -49,7 +49,7 @@ + return(0); + } + default: -+ fatal ("mask_cmp: Unknown address family"); ++ fatal_with_errno ("mask_cmp: Unknown address family"); + return(0); + } +} @@ -112,7 +112,7 @@ + stmp = strchr (addr, ']'); + if (stmp == NULL) { + free (tmp); -+ fatal("Expecting \']\' in \"%s\"", addr); ++ fatal_with_errno("Expecting \']\' in \"%s\"", addr); + } + + *stmp = '\0'; @@ -123,7 +123,7 @@ + + if (inet_pton (AF_INET6, addr, &s6.sin6_addr) < 1) { + free (tmp); -+ fatal ("Invalid IPv6 address: \"%s\"", addr); ++ fatal_with_errno ("Invalid IPv6 address: \"%s\"", addr); + } + + /* prefix */ @@ -131,7 +131,7 @@ + + if (tmp->mask < 0 || tmp->mask > 128) { + free (tmp); -+ fatal ("Invalid IPv6 prefix"); ++ fatal_with_errno ("Invalid IPv6 prefix"); + } + + { register unsigned char i; @@ -155,7 +155,7 @@ + + if (tmp->mask < 0 || tmp->mask > 32) { + free (tmp); -+ fatal ("Invalid CIDR type block: Must be > 0 && < 32"); ++ fatal_with_errno ("Invalid CIDR type block: Must be > 0 && < 32"); + } + tmp->mask = 0xffffffff << (32 - tmp->mask); + } else { @@ -167,7 +167,7 @@ + + if (inet_pton (AF_INET, addr, &s4.sin_addr) < 1) { + free (tmp); -+ fatal ("Invalid IPv4 address: \"%s\"", addr); ++ fatal_with_errno ("Invalid IPv4 address: \"%s\"", addr); + } + + s4.sin_addr.s_addr &= htonl (tmp->mask); @@ -316,14 +316,14 @@ + + service = malloc (sizeof (char) * 6); + if (service == NULL) -+ fatal("malloc"); ++ fatal_with_errno("malloc"); + + if (snprintf (service, 6, "%hu", (unsigned short int)net_port) < 1) -+ fatal("snprintf"); ++ fatal_with_errno("snprintf"); + + if (getaddrinfo (listenaddr, service, &hints, &r) != 0) { + free (service); -+ fatal("getaddrinfo"); ++ fatal_with_errno("getaddrinfo"); + } + free (service); + @@ -331,16 +331,16 @@ + listenfd = socket(r->ai_family, r->ai_socktype, r->ai_protocol); + if (listenfd < 0) { + if (r->ai_next == NULL) -+ fatal("socket"); ++ fatal_with_errno("socket"); + continue; + } + res = setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, (void *) &one, sizeof(one)); + if (res != 0) -+ fatal("setsockopt(SO_REUSEADDR)"); ++ fatal_with_errno("setsockopt(SO_REUSEADDR)"); + + if (bind (listenfd, r->ai_addr, r->ai_addrlen) == -1) { + if (r->ai_next == NULL) -+ fatal("Can't bind TCP port number %u", net_port); ++ fatal_with_errno("Can't bind TCP port number %u", net_port); + close (listenfd); + continue; + } @@ -348,16 +348,16 @@ - if (fcntl(listenfd, F_SETFL, res | O_NDELAY) == -1) - fatal_with_errno("fcntl(set)"); + if ((res = fcntl(listenfd, F_GETFL, 0)) == -1) -+ fatal("fcntl(get)"); ++ fatal_with_errno("fcntl(get)"); - if (listen(listenfd, 16)) - fatal_with_errno("listen"); + if (fcntl(listenfd, F_SETFL, res | O_NDELAY) == -1) -+ fatal("fcntl(set)"); ++ fatal_with_errno("fcntl(set)"); + if (listen(listenfd, 16) == -1) { + if (r->ai_next == NULL) -+ fatal("listen"); ++ fatal_with_errno("listen"); + close (listenfd); + continue; + } Index: nut.spec =================================================================== RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- nut.spec 23 Jan 2007 15:26:50 -0000 1.38 +++ nut.spec 23 Jan 2007 16:34:01 -0000 1.39 @@ -11,7 +11,7 @@ Summary: Network UPS Tools Name: nut Version: 2.0.5 -Release: 1 +Release: 2 Group: Applications/System License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -132,12 +132,13 @@ install-snmp DESTDIR=%{buildroot} install -m 755 drivers/hidups %{buildroot}%{modeldir}/ -install -m 755 drivers/dummycons %{buildroot}%{modeldir}/ +# install -m 755 drivers/dummycons %{buildroot}%{modeldir}/ install -m 755 drivers/energizerups %{buildroot}%{modeldir}/ install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups +install -m 644 man/gamatronic.* %{buildroot}%{_mandir}/man8/ install -m 644 scripts/hotplug-ng/nut-usbups.rules %{buildroot}%{_sysconfdir}/udev/rules.d # rename @@ -146,6 +147,8 @@ mv $file %{buildroot}%{_sysconfdir}/ups/`basename $file .sample` done +rm -f %{buildroot}/usr/html/* + %if !%{devel} rm -rf %{buildroot}%{_includedir} \ %{buildroot}%{_mandir}/man3/upscli_* \ @@ -186,7 +189,7 @@ %files %defattr(-,root,root) -%doc COPYING CREDITS CHANGES README docs UPGRADING INSTALL NEWS +%doc COPYING CREDITS ChangeLog README docs UPGRADING INSTALL NEWS %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users @@ -234,13 +237,18 @@ %{_mandir}/man8/cpsups.8.gz %{_mandir}/man8/metasys.8.gz %{_mandir}/man8/mustek.8.gz -%{_mandir}/man8/powermust.8.gz %{_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 +%{_mandir}/man8/dummy-ups.8.gz +%{_mandir}/man8/al175.8.gz +%{_mandir}/man8/megatec.8.gz +%{_mandir}/man8/nitram.8.gz +%{_mandir}/man8/optiups.8.gz +%{_mandir}/man8/powerpanel.8.gz %files client %defattr(-,root,root) %attr(755,root,root) %{initdir}/ups @@ -279,6 +287,10 @@ %{_mandir}/man8/upsset.cgi.8.gz %changelog +* Tue Jan 23 2007 Karsten Hopp 2.0.5-2 +- rename fatal to fatal_with_errno in ipv6 patch +- fix filelist + * Tue Jan 23 2007 Karsten Hopp 2.0.5-1 - update to 2.0.5 From fedora-cvs-commits at redhat.com Tue Jan 23 16:45:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 11:45:25 -0500 Subject: rpms/system-config-bind/devel system-config-bind.spec,1.64,1.65 Message-ID: <200701231645.l0NGjPPV007972@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7943 Modified Files: system-config-bind.spec Log Message: removed a backup Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- system-config-bind.spec 23 Jan 2007 15:45:32 -0000 1.64 +++ system-config-bind.spec 23 Jan 2007 16:45:22 -0000 1.65 @@ -32,7 +32,7 @@ %setup -q %patch -p1 %patch1 -p1 -%patch2 -p1 -b .old +%patch2 -p1 %build rm -rf $RPM_BUILD_ROOT From fedora-cvs-commits at redhat.com Tue Jan 23 17:35:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 12:35:28 -0500 Subject: rpms/xen/devel xen-pvfb-compat.patch,NONE,1.1 xen.spec,1.163,1.164 Message-ID: <200701231735.l0NHZSWu020068@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20014 Modified Files: xen.spec Added Files: xen-pvfb-compat.patch Log Message: Added PVFB back-compat support to make FC5/6 guest kernels work xen-pvfb-compat.patch: b/tools/xenfb/oldxenfb.c | 611 ++++++++++++++++++++++++++++++++++ b/tools/xenfb/oldxenfb.h | 108 ++++++ b/tools/xenfb/oldxenkbd.h | 92 +++++ tools/python/xen/xend/server/vfbif.py | 3 tools/python/xen/xm/create.py | 18 + tools/xenfb/Makefile | 15 tools/xenfb/sdlfb.c | 11 tools/xenfb/vncfb.c | 11 tools/xenfb/xenfb.c | 57 +++ tools/xenfb/xenfb.h | 2 10 files changed, 925 insertions(+), 3 deletions(-) --- NEW FILE xen-pvfb-compat.patch --- diff -r a2618d3912e7 tools/python/xen/xend/server/vfbif.py --- a/tools/python/xen/xend/server/vfbif.py Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/python/xen/xend/server/vfbif.py Tue Dec 05 10:29:17 2006 +0100 @@ -37,5 +37,8 @@ class VfbifController(DevController): def createDevice(self, config): DevController.createDevice(self, config) + # old frontend compatibility + self.vm._writeDom("console/use_graphics", "1") + # /old std_args = [ "--domid", "%d" % self.vm.getDomid(), "--title", self.vm.getName() ] t = config.get("type", None) diff -r 7df4d8cfba3b tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py Tue Dec 05 12:42:29 2006 +0000 +++ b/tools/python/xen/xm/create.py Thu Dec 07 15:50:07 2006 +0100 @@ -577,6 +577,24 @@ def configure_usb(config_devs, vals): config_devs.append(['device', config_usb]) def configure_vfbs(config_devs, vals): + # old config compatibility + if vals.vfb == [] and (vals.sdl or vals.vnc): + if vals.vnc: + cfg = 'type=vnc' + if vals.vncdisplay: + cfg += ',vncdisplay=%s' % vals.vncdisplay + if vals.vncunused: + cfg += ',vncunused=%s' % vals.vncunused + if vals.vnclisten: + cfg += ',vnclisten=%s' % vals.vnclisten + else: + cfg = 'type=sdl' + if vals.xauthority: + cfg += ',xauthority=%s' % vals.xauthority + if vals.display: + cfg += ',display=%s' % vals.display + vals.vfb = [ cfg, ] + # /old for f in vals.vfb: d = comma_sep_kv_to_dict(f) config = ['vfb'] diff -r a2618d3912e7 tools/xenfb/Makefile --- a/tools/xenfb/Makefile Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/Makefile Tue Dec 05 10:26:52 2006 +0100 @@ -13,12 +17,14 @@ all: build .PHONY: build build: mk-symlinks - $(MAKE) vncfb sdlfb + $(MAKE) vncfb sdlfb vncfbo sdlfbo install: all $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen/bin $(INSTALL_PROG) vncfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfb $(INSTALL_PROG) sdlfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfb + $(INSTALL_PROG) vncfbo $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfbo + $(INSTALL_PROG) sdlfbo $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfbo sdlfb: sdlfb.o xenfb.o @@ -33,3 +39,14 @@ vncfb: LDLIBS += $(shell libvncserver-co vncfb: LDLIBS += $(shell libvncserver-config --libs) -lxenctrl -lxenstore sdlfb.o xenfb.o vncfb.o: xenfb.h + +sdlfbo vncfbo: + $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS) + +sdlfbo: sdlfb.o oldxenfb.o +sdlfbo: LDLIBS += $(shell sdl-config --libs) -lxenctrl -lxenstore + +vncfbo: vncfb.o oldxenfb.o +vncfbo: LDLIBS += $(shell libvncserver-config --libs) -lxenctrl -lxenstore + +oldxenfb.o: xenfb.h oldxenfb.h oldxenkbd.h diff -r a2618d3912e7 tools/xenfb/sdlfb.c --- a/tools/xenfb/sdlfb.c Tue Dec 05 12:42:29 2006 +0000 +++ b/tools/xenfb/sdlfb.c Thu Dec 07 19:45:51 2006 +0100 @@ -212,6 +212,7 @@ int main(int argc, char **argv) struct xenfb *xenfb; int domid = -1; char * title = NULL; + int ret; fd_set readfds; int nfds; struct SDLFBData data; @@ -256,11 +257,19 @@ int main(int argc, char **argv) exit(1); } - if (xenfb_attach_dom(xenfb, domid) < 0) { + ret = xenfb_attach_dom(xenfb, domid); + if (ret < 0) { fprintf(stderr, "Could not connect to domain (%s)\n", strerror(errno)); exit(1); } + if (ret > 0) { + if (xenfb_switch_to_old_protocol(argv) < 0) { + fprintf(stderr, "Could not switch to old protocol (%s)\n", + strerror(errno)); + exit(1); + } + } if (SDL_Init(SDL_INIT_VIDEO) < 0) { fprintf(stderr, "Could not initialize SDL\n"); diff -r a2618d3912e7 tools/xenfb/vncfb.c --- a/tools/xenfb/vncfb.c Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/vncfb.c Tue Dec 05 10:26:52 2006 +0100 @@ -269,6 +269,7 @@ int main(int argc, char **argv) bool unused = false; int opt; struct xenfb *xenfb; + int ret; fd_set readfds; int nfds; char portstr[10]; @@ -340,10 +341,18 @@ int main(int argc, char **argv) exit(1); } - if (xenfb_attach_dom(xenfb, domid) < 0) { + ret = xenfb_attach_dom(xenfb, domid); + if (ret < 0) { fprintf(stderr, "Could not connect to domain (%s)\n", strerror(errno)); exit(1); + } + if (ret > 0) { + if (xenfb_switch_to_old_protocol(argv) < 0) { + fprintf(stderr, "Could not switch to old protocol (%s)\n", + strerror(errno)); + exit(1); + } } server = rfbGetScreen(&fake_argc, fake_argv, diff -r a2618d3912e7 tools/xenfb/xenfb.c --- a/tools/xenfb/xenfb.c Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/xenfb.c Tue Dec 05 10:26:52 2006 +0100 @@ -290,6 +301,60 @@ static int xenfb_hotplug(struct xenfb_de return 0; } +static int xenfb_using_old_protocol(struct xenfb_private *xenfb) +{ + struct xs_handle *xsh = xenfb->xsh; + char buf[64]; + char *p, *v, **vec; + enum xenbus_state state; + unsigned dummy; + int ret; + + p = xenfb_path_in_dom(xsh, buf, sizeof(buf), + xenfb->fb.otherend_id, "vfb/page-ref"); + if (!xs_watch(xsh, p, "")) + return -1; + + for (;;) { + state = xenfb_read_state(xsh, xenfb->fb.otherend); + if (state > XenbusStateInitialising) { + ret = 0; /* frontend talks xenbus protocol */ + break; + } + + v = xs_read(xsh, XBT_NULL, p, NULL); + free(v); + if (v) { + ret = 1; /* frontend talks old protocol */ + break; + } + + vec = xs_read_watch(xsh, &dummy); + if (!vec) { + ret = -1; + break; + } + free(vec); + } + + xs_unwatch(xsh, p, ""); + return ret; +} + +int xenfb_switch_to_old_protocol(char **argv) +{ + size_t len = strlen(argv[0]); + char *prog; + + prog = malloc(len + 2); + if (!prog) + return -1; + strcpy(prog, argv[0]); + strcpy(prog + len, "o"); + argv[0] = prog; + return execv(prog, argv); +} + static int xenfb_wait_for_frontend_initialised(struct xenfb_device *dev) { switch (xenfb_wait_for_state(dev->xenfb->xsh, dev->otherend, @@ -473,6 +534,9 @@ int xenfb_attach_dom(struct xenfb *xenfb goto error; if (!xs_watch(xsh, xenfb->kbd.otherend, "")) goto error; + + if (xenfb_using_old_protocol(xenfb)) + return 1; if (xenfb_wait_for_frontend_initialised(&xenfb->fb) < 0) goto error; diff -r a2618d3912e7 tools/xenfb/xenfb.h --- a/tools/xenfb/xenfb.h Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/xenfb.h Tue Dec 05 10:26:52 2006 +0100 @@ -32,4 +32,6 @@ int xenfb_send_motion(struct xenfb *xenf int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y); int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y); +int xenfb_switch_to_old_protocol(char **); + #endif diff -r 3f0ca90351e2 tools/xenfb/oldxenfb.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/xenfb/oldxenfb.c Fri Dec 08 16:31:34 2006 +0100 @@ -0,0 +1,611 @@ +#include +#include +#include +#include +#include +#include +#include +#include "oldxenfb.h" +#include "oldxenkbd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "xenfb.h" + +// FIXME defend against malicious frontend? + +struct xenfb_device { + const char *devicetype; + char nodename[64]; /* backend xenstore dir */ + char otherend[64]; /* frontend xenstore dir */ + int otherend_id; /* frontend domid */ + enum xenbus_state state; /* backend state */ + void *page; /* shared page */ + evtchn_port_t port; + struct xenfb_private *xenfb; +}; + +struct xenfb_private { + struct xenfb pub; + int evt_xch; /* event channel driver handle */ + int xc; /* hypervisor interface handle */ + struct xs_handle *xsh; /* xs daemon handle */ + struct xenfb_device fb, kbd; + size_t fb_len; /* size of framebuffer */ +}; + +static void xenfb_detach_dom(struct xenfb_private *); +static int xenfb_fb_event(struct xenfb_private *, union xenfb_in_event *); + +static char *xenfb_path_in_dom(struct xs_handle *xsh, + char *buf, size_t size, + unsigned domid, const char *fmt, ...) +{ + va_list ap; + char *domp = xs_get_domain_path(xsh, domid); + int n; + + if (domp == NULL) + return NULL; + + n = snprintf(buf, size, "%s/", domp); + free(domp); + if (n >= size) + return NULL; + + va_start(ap, fmt); + n += vsnprintf(buf + n, size - n, fmt, ap); + va_end(ap); + if (n >= size) + return NULL; + + return buf; +} + +static int xenfb_xs_scanf1(struct xs_handle *xsh, + const char *dir, const char *node, + const char *fmt, void *dest) +{ + char buf[1024]; + char *p; + int ret; + + if (snprintf(buf, sizeof(buf), "%s/%s", dir, node) >= sizeof(buf)) { + errno = ENOENT; + return -1; + } + p = xs_read(xsh, XBT_NULL, buf, NULL); + if (!p) { + errno = ENOENT; + return -1; + } + ret = sscanf(p, fmt, dest); + free(p); + if (ret != 1) { + errno = EDOM; + return -1; + } + return ret; +} + +static int xenfb_xs_printf(struct xs_handle *xsh, + const char *dir, const char *node, char *fmt, ...) +{ + va_list ap; + char key[1024]; + char val[1024]; + int n; + + if (snprintf(key, sizeof(key), "%s/%s", dir, node) >= sizeof(key)) { + errno = ENOENT; + return -1; + } + + va_start(ap, fmt); + n = vsnprintf(val, sizeof(val), fmt, ap); + va_end(ap); + if (n >= sizeof(val)) { + errno = ENOSPC; /* close enough */ + return -1; + } + + if (!xs_write(xsh, XBT_NULL, key, val, n)) + return -1; + return 0; +} + +static void xenfb_device_init(struct xenfb_device *dev, + const char *type, + struct xenfb_private *xenfb) +{ + dev->devicetype = type; + dev->otherend_id = -1; + dev->port = -1; + dev->xenfb = xenfb; +} + +int xenfb_device_set_domain(struct xenfb_device *dev, int domid) +{ + struct xenfb_private *xenfb = dev->xenfb; + + dev->otherend_id = domid; + + if (!xenfb_path_in_dom(xenfb->xsh, + dev->otherend, sizeof(dev->otherend), + domid, "device/%s/0", dev->devicetype)) { + errno = ENOENT; + return -1; + } + if (!xenfb_path_in_dom(xenfb->xsh, + dev->nodename, sizeof(dev->nodename), + 0, "backend/%s/%d/0", dev->devicetype, domid)) { + errno = ENOENT; + return -1; + } + + return 0; +} + +struct xenfb *xenfb_new(void) +{ + struct xenfb_private *xenfb = malloc(sizeof(*xenfb)); + int serrno; + + if (xenfb == NULL) + return NULL; + + memset(xenfb, 0, sizeof(*xenfb)); + xenfb->evt_xch = xenfb->xc = -1; + xenfb_device_init(&xenfb->fb, "vfb", xenfb); + xenfb_device_init(&xenfb->kbd, "vkbd", xenfb); + + xenfb->evt_xch = xc_evtchn_open(); + if (xenfb->evt_xch == -1) + goto fail; + + xenfb->xc = xc_interface_open(); + if (xenfb->xc == -1) + goto fail; + + xenfb->xsh = xs_daemon_open(); + if (!xenfb->xsh) + goto fail; + + return &xenfb->pub; + + fail: + serrno = errno; + xenfb_delete(&xenfb->pub); + errno = serrno; + return NULL; +} + +/* Remove the backend area in xenbus since the framebuffer really is + going away. */ +void xenfb_teardown(struct xenfb *xenfb_pub) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + + xs_rm(xenfb->xsh, XBT_NULL, xenfb->fb.nodename); + xs_rm(xenfb->xsh, XBT_NULL, xenfb->kbd.nodename); +} + + +void xenfb_delete(struct xenfb *xenfb_pub) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + + xenfb_detach_dom(xenfb); + if (xenfb->xc >= 0) + xc_interface_close(xenfb->xc); + if (xenfb->evt_xch >= 0) + xc_evtchn_close(xenfb->evt_xch); + if (xenfb->xsh) + xs_daemon_close(xenfb->xsh); + free(xenfb); +} + +static enum xenbus_state xenfb_read_state(struct xs_handle *xsh, + const char *dir) +{ + int ret, state; + + ret = xenfb_xs_scanf1(xsh, dir, "state", "%d", &state); + if (ret < 0) + return XenbusStateUnknown; + + if ((unsigned)state > XenbusStateClosed) + state = XenbusStateUnknown; + return state; +} + +static int xenfb_switch_state(struct xenfb_device *dev, + enum xenbus_state state) +{ + struct xs_handle *xsh = dev->xenfb->xsh; + + if (xenfb_xs_printf(xsh, dev->nodename, "state", "%d", state) < 0) + return -1; + dev->state = state; + return 0; +} + +int xenfb_switch_to_old_protocol(char **argv) +{ + abort(); +} + +static int xenfb_map_fb(struct xenfb_private *xenfb, int domid) +{ + struct xenfb_page *page = xenfb->fb.page; + int n_fbmfns; + int n_fbdirs; + unsigned long *fbmfns; + + n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; + n_fbdirs = n_fbmfns * sizeof(unsigned long); + n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; + + /* + * Bug alert: xc_map_foreign_batch() can fail partly and + * return a non-null value. This is a design flaw. When it + * happens, we happily continue here, and later crash on + * access. + */ + fbmfns = xc_map_foreign_batch(xenfb->xc, domid, + PROT_READ, page->pd, n_fbdirs); + if (fbmfns == NULL) + return -1; + + xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid, + PROT_READ | PROT_WRITE, fbmfns, n_fbmfns); + if (xenfb->pub.pixels == NULL) { + munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE); + return -1; + } + + return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE); +} + +static int xenfb_bind(struct xenfb_device *dev) +{ + struct xenfb_private *xenfb = dev->xenfb; + unsigned long mfn; + evtchn_port_t evtchn; + char buf[64]; + char *p, **vec; + unsigned dummy; + + p = xenfb_path_in_dom(xenfb->xsh, buf, sizeof(buf), + dev->otherend_id, dev->devicetype); + if (!xs_watch(xenfb->xsh, p, "")) + return -1; + for (;;) { + if (xenfb_xs_scanf1(xenfb->xsh, p, "page-ref", "%lu", + &mfn) < 0) { + if (errno == ENOENT || errno == EAGAIN) + goto wait; + return -1; + } + if (xenfb_xs_scanf1(xenfb->xsh, p, "event-channel", "%u", + &evtchn) < 0) { + if (errno == ENOENT || errno == EAGAIN) + goto wait; + return -1; + } + break; + + wait: + printf("Waiting...\n"); + vec = xs_read_watch(xenfb->xsh, &dummy); + if (!vec) + return -1; + free(vec); + } + + dev->port = xc_evtchn_bind_interdomain(xenfb->evt_xch, + dev->otherend_id, evtchn); + if (dev->port == -1) + return -1; + + dev->page = xc_map_foreign_range(xenfb->xc, dev->otherend_id, + XC_PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); + if (dev->page == NULL) + return -1; + + return 0; +} + +static void xenfb_unbind(struct xenfb_device *dev) +{ + if (dev->page) { + munmap(dev->page, XC_PAGE_SIZE); + dev->page = NULL; + } + if (dev->port >= 0) { + xc_evtchn_unbind(dev->xenfb->evt_xch, dev->port); + dev->port = -1; + } +} + +static void xenfb_dev_fatal(struct xenfb_device *dev, int err, + const char *fmt, ...) +{ + struct xs_handle *xsh = dev->xenfb->xsh; + va_list ap; + char errdir[80]; + char buf[1024]; + int n; + + fprintf(stderr, "%s ", dev->nodename); /* somewhat crude */ + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + if (err) + fprintf(stderr, " (%s)", strerror(err)); + putc('\n', stderr); + + if (!xenfb_path_in_dom(xsh, errdir, sizeof(errdir), 0, + "error/%s", dev->nodename)) + goto out; /* FIXME complain */ + + va_start(ap, fmt); + n = snprintf(buf, sizeof(buf), "%d ", err); + snprintf(buf + n, sizeof(buf) - n, fmt, ap); + va_end(ap); + + if (xenfb_xs_printf(xsh, buf, "error", "%s", buf) < 0) + goto out; /* FIXME complain */ + + out: + xenfb_switch_state(dev, XenbusStateClosing); +} + +int xenfb_attach_dom(struct xenfb *xenfb_pub, int domid) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + struct xs_handle *xsh = xenfb->xsh; + int val, serrno; + struct xenfb_page *fb_page; + union xenfb_in_event event; + + xenfb_detach_dom(xenfb); + + xenfb_device_set_domain(&xenfb->fb, domid); + xenfb_device_set_domain(&xenfb->kbd, domid); + + if (!xs_watch(xsh, xenfb->fb.otherend, "")) + goto error; + if (!xs_watch(xsh, xenfb->kbd.otherend, "")) + goto error; + + if (xenfb_bind(&xenfb->fb) < 0) + goto error; + if (xenfb_bind(&xenfb->kbd) < 0) + goto error; + + /* TODO check for permitted ranges */ + fb_page = xenfb->fb.page; + xenfb->pub.depth = fb_page->depth; + xenfb->pub.width = fb_page->width; + xenfb->pub.height = fb_page->height; + /* TODO check for consistency with the above */ + xenfb->fb_len = fb_page->mem_length; + xenfb->pub.row_stride = fb_page->line_length; + + if (xenfb_map_fb(xenfb, domid) < 0) + goto error; + + event.type = XENFB_TYPE_SET_EVENTS; + event.set_events.flags = XENFB_FLAG_UPDATE; + if (xenfb_fb_event(xenfb, &event)) + goto error; + + return 0; + + error: + serrno = errno; + xenfb_detach_dom(xenfb); + xenfb_dev_fatal(&xenfb->fb, serrno, "on fire"); + xenfb_dev_fatal(&xenfb->kbd, serrno, "on fire"); + errno = serrno; + return -1; +} + +static void xenfb_detach_dom(struct xenfb_private *xenfb) +{ + xenfb_unbind(&xenfb->fb); + xenfb_unbind(&xenfb->kbd); + if (xenfb->pub.pixels) { + munmap(xenfb->pub.pixels, xenfb->fb_len); + xenfb->pub.pixels = NULL; + } +} + +static void xenfb_on_fb_event(struct xenfb_private *xenfb) +{ + uint32_t prod, cons; + struct xenfb_page *page = xenfb->fb.page; + + prod = page->out_prod; + if (prod == page->out_cons) + return; + rmb(); /* ensure we see ring contents up to prod */ + for (cons = page->out_cons; cons != prod; cons++) { + union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + + switch (event->type) { + case XENFB_TYPE_UPDATE: + if (xenfb->pub.update) + xenfb->pub.update(&xenfb->pub, + event->update.x, event->update.y, + event->update.width, event->update.height); + break; + } + } + mb(); /* ensure we're done with ring contents */ + page->out_cons = cons; + xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port); +} + +static void xenfb_on_kbd_event(struct xenfb_private *xenfb) +{ + struct xenkbd_info *page = xenfb->kbd.page; + + /* We don't understand any keyboard events, so just ignore them. */ + if (page->out_prod == page->out_cons) + return; + page->out_cons = page->out_prod; + xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port); +} + +static int xenfb_on_state_change(struct xenfb_device *dev) +{ + enum xenbus_state state; + + state = xenfb_read_state(dev->xenfb->xsh, dev->otherend); + + switch (state) { + case XenbusStateUnknown: + /* There was an error reading the frontend state. The + domain has probably gone away; in any case, there's + not much point in us continuing. */ + return -1; + case XenbusStateInitialising: + case XenbusStateInitWait: + case XenbusStateInitialised: + case XenbusStateConnected: + break; + case XenbusStateClosing: + xenfb_unbind(dev); + xenfb_switch_state(dev, state); + break; + case XenbusStateClosed: + xenfb_switch_state(dev, state); + } + return 0; +} + +/* Returns 0 normally, -1 on error, or -2 if the domain went away. */ +int xenfb_poll(struct xenfb *xenfb_pub, fd_set *readfds) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + evtchn_port_t port; + unsigned dummy; + char **vec; + int r; + + if (FD_ISSET(xc_evtchn_fd(xenfb->evt_xch), readfds)) { + port = xc_evtchn_pending(xenfb->evt_xch); + if (port == -1) + return -1; + + if (port == xenfb->fb.port) + xenfb_on_fb_event(xenfb); + else if (port == xenfb->kbd.port) + xenfb_on_kbd_event(xenfb); + + if (xc_evtchn_unmask(xenfb->evt_xch, port) == -1) + return -1; + } + + if (FD_ISSET(xs_fileno(xenfb->xsh), readfds)) { + vec = xs_read_watch(xenfb->xsh, &dummy); + free(vec); + r = xenfb_on_state_change(&xenfb->fb); + if (r == 0) + r = xenfb_on_state_change(&xenfb->kbd); + if (r == -1) + return -2; + } + + return 0; +} + +int xenfb_select_fds(struct xenfb *xenfb_pub, fd_set *readfds) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + int fd1 = xc_evtchn_fd(xenfb->evt_xch); + int fd2 = xs_fileno(xenfb->xsh); + + FD_SET(fd1, readfds); + FD_SET(fd2, readfds); + return fd1 > fd2 ? fd1 + 1 : fd2 + 1; +} + +static int xenfb_fb_event(struct xenfb_private *xenfb, + union xenfb_in_event *event) +{ + uint32_t prod; + struct xenfb_page *page = xenfb->fb.page; + + prod = page->in_prod; + if (prod - page->in_cons == XENFB_IN_RING_LEN) { + errno = EAGAIN; + return -1; + } + + mb(); /* ensure ring space available */ + XENFB_IN_RING_REF(page, prod) = *event; + wmb(); /* ensure ring contents visible */ + page->in_prod = prod + 1; + return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port); +} + +static int xenfb_kbd_event(struct xenfb_private *xenfb, + union xenkbd_in_event *event) +{ + uint32_t prod; + struct xenkbd_info *page = xenfb->kbd.page; + + prod = page->in_prod; + if (prod - page->in_cons == XENKBD_IN_RING_LEN) { + errno = EAGAIN; + return -1; + } + + mb(); /* ensure ring space available */ + XENKBD_IN_RING_REF(page, prod) = *event; + wmb(); /* ensure ring contents visible */ + page->in_prod = prod + 1; + return xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port); +} + +int xenfb_send_key(struct xenfb *xenfb_pub, bool down, int keycode) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + union xenkbd_in_event event; + + memset(&event, 0, XENKBD_IN_EVENT_SIZE); + event.type = XENKBD_TYPE_KEY; + event.key.pressed = down ? 1 : 0; + event.key.keycode = keycode; + + return xenfb_kbd_event(xenfb, &event); +} + +int xenfb_send_motion(struct xenfb *xenfb_pub, int rel_x, int rel_y) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + union xenkbd_in_event event; + + memset(&event, 0, XENKBD_IN_EVENT_SIZE); + event.type = XENKBD_TYPE_MOTION; + event.motion.rel_x = rel_x; + event.motion.rel_y = rel_y; + + return xenfb_kbd_event(xenfb, &event); +} + +int xenfb_send_position(struct xenfb *xenfb_pub, int abs_x, int abs_y) +{ + abort(); +} diff -r 7df4d8cfba3b tools/xenfb/oldxenfb.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/xenfb/oldxenfb.h Tue Dec 05 10:26:52 2006 +0100 @@ -0,0 +1,108 @@ +/* + * linux/include/linux/xenfb.h -- Xen virtual frame buffer device + * + * Copyright (C) 2005 + * + * Anthony Liguori + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef _LINUX_XENFB_H +#define _LINUX_XENFB_H + +#include + +/* out events */ + +#define XENFB_OUT_EVENT_SIZE 40 + +#define XENFB_TYPE_MOTION 1 +#define XENFB_TYPE_UPDATE 2 + +struct xenfb_motion /* currently unused */ +{ + __u8 type; /* XENFB_TYPE_MOTION */ + __u16 x; /* The new x coordinate */ + __u16 y; /* The new y coordinate */ +}; + +struct xenfb_update +{ + __u8 type; /* XENFB_TYPE_UPDATE */ + __u16 x; /* source x */ + __u16 y; /* source y */ + __u16 width; /* rect width */ + __u16 height; /* rect height */ +}; + +union xenfb_out_event +{ + __u8 type; + struct xenfb_motion motion; + struct xenfb_update update; + char _[XENFB_OUT_EVENT_SIZE]; +}; + +/* in events */ + +#define XENFB_IN_EVENT_SIZE 40 + +#define XENFB_TYPE_SET_EVENTS 1 + +#define XENFB_FLAG_MOTION 1 +#define XENFB_FLAG_UPDATE 2 +#define XENFB_FLAG_COPY 4 +#define XENFB_FLAG_FILL 8 + +struct xenfb_set_events +{ + __u8 type; /* XENFB_TYPE_SET_EVENTS */ + __u32 flags; /* combination of XENFB_FLAG_* */ +}; + +union xenfb_in_event +{ + __u8 type; + struct xenfb_set_events set_events; + char _[XENFB_OUT_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENFB_IN_RING_SIZE 1024 +#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE) +#define XENFB_IN_RING_OFFS 1024 +#define XENFB_IN_RING(page) \ + ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS)) +#define XENFB_IN_RING_REF(page, idx) \ + (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN]) + +#define XENFB_OUT_RING_SIZE 2048 +#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE) +#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE) +#define XENFB_OUT_RING(page) \ + ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS)) +#define XENFB_OUT_RING_REF(page, idx) \ + (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN]) + +struct xenfb_page +{ + __u16 width; /* the width of the framebuffer (in pixels) */ + __u16 height; /* the height of the framebuffer (in pixels) */ + __u32 line_length; /* the length of a row of pixels (in bytes) */ + __u32 mem_length; /* the length of the framebuffer (in bytes) */ + __u8 depth; /* the depth of a pixel (in bits) */ + + unsigned long pd[2]; /* FIXME rename to pgdir? */ + /* FIXME pd[1] unused at this time, shrink? */ + + __u32 in_cons, in_prod; + __u32 out_cons, out_prod; +}; + +void xenfb_resume(void); + +#endif diff -r 7df4d8cfba3b tools/xenfb/oldxenkbd.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/xenfb/oldxenkbd.h Tue Dec 05 10:26:52 2006 +0100 @@ -0,0 +1,92 @@ +/* + * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse + * + * Copyright (C) 2005 + * + * Anthony Liguori + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef _LINUX_XENKBD_H +#define _LINUX_XENKBD_H + +#include + +/* in events */ + +#define XENKBD_IN_EVENT_SIZE 40 + +#define XENKBD_TYPE_MOTION 1 /* mouse movement event */ +#define XENKBD_TYPE_BUTTON 2 /* mouse button event */ +#define XENKBD_TYPE_KEY 3 /* keyboard event */ + +struct xenkbd_motion +{ + __u8 type; /* XENKBD_TYPE_MOTION */ + __s16 rel_x; /* relative X motion */ + __s16 rel_y; /* relative Y motion */ +}; + +struct xenkbd_button +{ + __u8 type; /* XENKBD_TYPE_BUTTON */ + __u8 pressed; /* 1 if pressed; 0 otherwise */ + __u8 button; /* the button (0, 1, 2 is right, middle, left) */ +}; + +struct xenkbd_key +{ + __u8 type; /* XENKBD_TYPE_KEY */ + __u8 pressed; /* 1 if pressed; 0 otherwise */ + __u16 keycode; /* KEY_* from linux/input.h */ +}; + +union xenkbd_in_event +{ + __u8 type; + struct xenkbd_motion motion; + struct xenkbd_button button; + struct xenkbd_key key; + char _[XENKBD_IN_EVENT_SIZE]; +}; + +/* out events */ + +#define XENKBD_OUT_EVENT_SIZE 40 + +union xenkbd_out_event +{ + __u8 type; + char _[XENKBD_OUT_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENKBD_IN_RING_SIZE 2048 +#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE) +#define XENKBD_IN_RING_OFFS 1024 +#define XENKBD_IN_RING(page) \ + ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS)) +#define XENKBD_IN_RING_REF(page, idx) \ + (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN]) + +#define XENKBD_OUT_RING_SIZE 1024 +#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE) +#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE) +#define XENKBD_OUT_RING(page) \ + ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS)) +#define XENKBD_OUT_RING_REF(page, idx) \ + (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN]) + +struct xenkbd_info +{ + __u32 in_cons, in_prod; + __u32 out_cons, out_prod; +}; + +void xenkbd_resume(void); + +#endif Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- xen.spec 22 Jan 2007 16:43:12 -0000 1.163 +++ xen.spec 23 Jan 2007 17:35:26 -0000 1.164 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.4 -Release: 2%{dist} +Release: 3%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -21,6 +21,10 @@ Patch102: xen-3.0.2-config-allow-unix-server.patch Patch103: xen-3.0.2-config-disable-reloc.patch +# Hack to support guest kernels using old PVFB protocol +# from FC5/6 days. Can kill off once FC6 is EOL'd +Patch150: xen-pvfb-compat.patch + Patch251: pygrub-manykernels.patch # libVNCserver patches @@ -96,6 +100,9 @@ %patch102 -p1 %patch103 -p1 +# pvfb compat +%patch150 -p1 + # upstream patches %patch251 -p1 @@ -216,7 +223,10 @@ %{_libdir}/*.a %changelog -* Mon Jan 22 2007 Daniel P. Berrange - 3.0.4-2 +* Tue Jan 23 2007 Daniel Berrange - 3.0.4-3.fc7 +- Added PVFB back compat for FC5/6 guests + +* Mon Jan 22 2007 Daniel P. Berrange - 3.0.4-2.fc7 - Ensure the arch-x86 header files are included in xen-devel package - Bring back patch to move /var/xen/dump to /var/lib/xen/dump - Make /var/log/xen mode 0700 From fedora-cvs-commits at redhat.com Tue Jan 23 18:01:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 13:01:42 -0500 Subject: rpms/dvgrab/devel .cvsignore, 1.6, 1.7 dvgrab.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200701231801.l0NI1g8w004836@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/dvgrab/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4820 Modified Files: .cvsignore dvgrab.spec sources Log Message: New upstream release v2.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dvgrab/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 05:10:54 -0000 1.6 +++ .cvsignore 23 Jan 2007 18:01:40 -0000 1.7 @@ -1 +1,2 @@ dvgrab-2.0.tar.gz +dvgrab-2.1.tar.gz Index: dvgrab.spec =================================================================== RCS file: /cvs/dist/rpms/dvgrab/devel/dvgrab.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dvgrab.spec 12 Jul 2006 05:43:03 -0000 1.16 +++ dvgrab.spec 23 Jan 2007 18:01:40 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Utility to capture video from a DV camera Name: dvgrab -Version: 2.0 -Release: 1.2.2 +Version: 2.1 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://kino.schirmacher.de/ @@ -24,7 +24,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,9 @@ %{_mandir}/man1/dvgrab.1* %changelog +* Tue Jan 23 2007 Jarod Wilson - 2.1-1 +- New upstream release + * Wed Jul 12 2006 Jesse Keating - 2.0-1.2.2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/dvgrab/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 05:10:54 -0000 1.6 +++ sources 23 Jan 2007 18:01:40 -0000 1.7 @@ -1 +1 @@ -17115cdd309048a9e2a6652f117a22c6 dvgrab-2.0.tar.gz +6793471d7b5c29788371d8102f013306 dvgrab-2.1.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 18:08:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 13:08:25 -0500 Subject: rpms/gnome-panel/devel gnome-panel-2.12.1-about-fedora.patch, 1.2, NONE gnome-panel-2.12.1-vendor.patch, 1.1, NONE gnome-panel-2.13.5-switch-user.patch, 1.1, NONE gnome-panel-2.15.90-move-suspend-to-menu.patch, 1.3, NONE gnome-panel-2.15.91-use-beagle.patch, 1.1, NONE gnome-panel-2.15.92-no-seconds.patch, 1.1, NONE gnome-panel-2.16.0-respect-session-properties.patch, 1.2, NONE gnome-panel-2.16.1-launcher-copy.patch, 1.3, NONE Message-ID: <200701231808.l0NI8P9K005086@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5071 Removed Files: gnome-panel-2.12.1-about-fedora.patch gnome-panel-2.12.1-vendor.patch gnome-panel-2.13.5-switch-user.patch gnome-panel-2.15.90-move-suspend-to-menu.patch gnome-panel-2.15.91-use-beagle.patch gnome-panel-2.15.92-no-seconds.patch gnome-panel-2.16.0-respect-session-properties.patch gnome-panel-2.16.1-launcher-copy.patch Log Message: drop unused patches --- gnome-panel-2.12.1-about-fedora.patch DELETED --- --- gnome-panel-2.12.1-vendor.patch DELETED --- --- gnome-panel-2.13.5-switch-user.patch DELETED --- --- gnome-panel-2.15.90-move-suspend-to-menu.patch DELETED --- --- gnome-panel-2.15.91-use-beagle.patch DELETED --- --- gnome-panel-2.15.92-no-seconds.patch DELETED --- --- gnome-panel-2.16.0-respect-session-properties.patch DELETED --- --- gnome-panel-2.16.1-launcher-copy.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 18:08:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 13:08:35 -0500 Subject: rpms/dvgrab/devel dvgrab.spec,1.17,1.18 Message-ID: <200701231808.l0NI8Zh6005114@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/dvgrab/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5099 Modified Files: dvgrab.spec Log Message: It helps to set DESTDIR if you nuke a makeinstall... Index: dvgrab.spec =================================================================== RCS file: /cvs/dist/rpms/dvgrab/devel/dvgrab.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dvgrab.spec 23 Jan 2007 18:01:40 -0000 1.17 +++ dvgrab.spec 23 Jan 2007 18:08:33 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Utility to capture video from a DV camera Name: dvgrab Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://kino.schirmacher.de/ @@ -24,7 +24,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,9 @@ %{_mandir}/man1/dvgrab.1* %changelog +* Tue Jan 23 2007 Jarod Wilson - 2.1-2 +- It helps to set DESTDIR if you nuke makeinstall... + * Tue Jan 23 2007 Jarod Wilson - 2.1-1 - New upstream release From fedora-cvs-commits at redhat.com Tue Jan 23 18:15:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 13:15:15 -0500 Subject: rpms/dvgrab/FC-6 .cvsignore, 1.6, 1.7 dvgrab.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200701231815.l0NIFFq7005836@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/dvgrab/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5812 Modified Files: .cvsignore dvgrab.spec sources Log Message: New upstream release v2.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dvgrab/FC-6/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 05:10:54 -0000 1.6 +++ .cvsignore 23 Jan 2007 18:15:13 -0000 1.7 @@ -1 +1,2 @@ dvgrab-2.0.tar.gz +dvgrab-2.1.tar.gz Index: dvgrab.spec =================================================================== RCS file: /cvs/dist/rpms/dvgrab/FC-6/dvgrab.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dvgrab.spec 12 Jul 2006 05:43:03 -0000 1.16 +++ dvgrab.spec 23 Jan 2007 18:15:13 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Utility to capture video from a DV camera Name: dvgrab -Version: 2.0 -Release: 1.2.2 +Version: 2.1 +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://kino.schirmacher.de/ @@ -24,7 +24,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT @@ -36,6 +36,12 @@ %{_mandir}/man1/dvgrab.1* %changelog +* Tue Jan 23 2007 Jarod Wilson - 2.1-2 +- It helps to set DESTDIR if you nuke makeinstall... + +* Tue Jan 23 2007 Jarod Wilson - 2.1-1 +- New upstream release + * Wed Jul 12 2006 Jesse Keating - 2.0-1.2.2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/dvgrab/FC-6/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 05:10:54 -0000 1.6 +++ sources 23 Jan 2007 18:15:13 -0000 1.7 @@ -1 +1 @@ -17115cdd309048a9e2a6652f117a22c6 dvgrab-2.0.tar.gz +6793471d7b5c29788371d8102f013306 dvgrab-2.1.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 18:23:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 13:23:57 -0500 Subject: rpms/systemtap/FC-6 .cvsignore, 1.5, 1.6 sources, 1.19, 1.20 systemtap.spec, 1.28, 1.29 Message-ID: <200701231823.l0NINvo7026744@cvs.devel.redhat.com> Author: fche Update of /cvs/dist/rpms/systemtap/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26729 Modified Files: .cvsignore sources systemtap.spec Log Message: * refresh Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Jul 2006 22:32:14 -0000 1.5 +++ .cvsignore 23 Jan 2007 18:23:55 -0000 1.6 @@ -1,2 +1 @@ -systemtap-0.5.9.tar.gz -elfutils-0.122.tar.gz +systemtap-0.5.12.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-6/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 26 Oct 2006 19:25:49 -0000 1.19 +++ sources 23 Jan 2007 18:23:55 -0000 1.20 @@ -1,2 +1 @@ -6ae4694f813ab7745be01d50f0bebf6f systemtap-0.5.10.tar.gz -f77efb19fd90821ab103533a99de0d4a elfutils-0.124.tar.gz +7631f118944b54dc4eeb470b54ba4f39 systemtap-0.5.12.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-6/systemtap.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- systemtap.spec 26 Oct 2006 19:31:03 -0000 1.28 +++ systemtap.spec 23 Jan 2007 18:23:55 -0000 1.29 @@ -1,19 +1,19 @@ # Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases. %define release 1 # Version number of oldest elfutils release that works with systemtap. -%define elfutils_version 0.124 +%define elfutils_version 0.125 # Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer. %if 0%{?fedora} %define bundled_elfutils 1 -%if "%fedora" >= "7" +%if "%fedora" >= "6" %define bundled_elfutils 0 %endif %endif %if 0%{?rhel} %define bundled_elfutils 1 -%if "%rhel" >= "6" +%if "%rhel" >= "5" %define bundled_elfutils 0 %endif %endif @@ -25,7 +25,7 @@ %endif Name: systemtap -Version: 0.5.10 +Version: 0.5.12 Release: %{release}%{?dist} Summary: Instrumentation System Group: Development/System @@ -37,6 +37,8 @@ Requires: kernel >= 2.6.9-11 BuildRequires: glib2-devel >= 2.0.0 +# make check +BuildRequires: dejagnu Requires: glib2 >= 2.0.0 # Requires: kernel-devel # or is that kernel-smp-devel? kernel-hugemem-devel? @@ -118,7 +120,7 @@ %files %defattr(-,root,root) -%doc README AUTHORS NEWS COPYING +%doc README AUTHORS NEWS COPYING examples %{_bindir}/stap %{_bindir}/lket-b2a @@ -142,6 +144,9 @@ %{_bindir}/staprun %changelog +* Mon Jan 1 2007 Frank Ch. Eigler - 0.5.12-1 +- Many changes, see NEWS file. + * Tue Sep 26 2006 David Smith - 0.5.10-1 - Added 'systemtap-runtime' subpackage. From fedora-cvs-commits at redhat.com Tue Jan 23 19:24:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 14:24:03 -0500 Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.2.0-enable-composite.patch, NONE, 1.1 xorg-x11-server-1.2.0-maxpixclock-option.patch, NONE, 1.1 xorg-x11-server-1.2.0-selinux-awareness.patch, NONE, 1.1 xorg-x11-server-1.2.0-xephyr-only.patch, NONE, 1.1 xorg-x11-server-1.2.0-xf86config-comment-less.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sources, 1.14, 1.15 xorg-x11-server.spec, 1.197, 1.198 xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch, 1.1, NONE xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch, 1.1, NONE xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch, 1.1, NONE xorg-x11-server-1.1.0-no-zlib.patch, 1.1, NONE xorg-x11-server-1.1.0-pci-scan-fixes.patch, 1.2, NONE xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch, 1.2, NONE xorg-x11-server-1.1.0-tfp-damage.patch, 1.4, NONE xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch, 1.1, NONE xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch, 1.2, NONE xorg-x11-server-1.1.1-aiglx-locking.patch, 1.1, NONE xorg-x11-server-1.1.1-autoconfig.patch, 1.1, NONE! xorg-x11-server-1.1.1-edid-hex-dump.patch, 1.1, NONE xorg-x11-server-1.1.1-enable-composite.patch, 1.1, NONE xorg-x11-server-1.1.1-ia64-int10.patch, 1.1, NONE xorg-x11-server-1.1.1-ia64-pci-chipsets.patch, 1.1, NONE xorg-x11-server-1.1.1-lid-close-crash.patch, 1.1, NONE xorg-x11-server-1.1.1-maxpixclock-option.patch, 1.1, NONE xorg-x11-server-1.1.1-mesa-6.5.1.patch, 1.2, NONE xorg-x11-server-1.1.1-mesa-6.5.2.patch, 1.3, NONE xorg-x11-server-1.1.1-pclose-confusion.patch, 1.1, NONE xorg-x11-server-1.1.1-revert-xkb-change.patch, 1.1, NONE xorg-x11-server-1.1.1-selinux-awareness.patch, 1.1, NONE xorg-x11-server-1.1.1-xf86config-comment-less.patch, 1.1, NONE xorg-x11-server-1.1.1-xkb-vidmode-switch.patch, 1.1, NONE xorg-x11-server-1.1.1-xvfb-composite-crash.patch, 1.1, NONE xorg-xserver-1.1.0-dbe-render.diff, 1.1, NONE xserver-1.0.0-parser-add-missing-headers-to-sdk.patch, 1.1, NONE Message-ID: <200701231924.l0NJO3fs022188@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22110/devel Modified Files: .cvsignore sources xorg-x11-server.spec Added Files: xorg-x11-server-1.2.0-enable-composite.patch xorg-x11-server-1.2.0-maxpixclock-option.patch xorg-x11-server-1.2.0-selinux-awareness.patch xorg-x11-server-1.2.0-xephyr-only.patch xorg-x11-server-1.2.0-xf86config-comment-less.patch Removed Files: xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch xorg-x11-server-1.1.0-no-zlib.patch xorg-x11-server-1.1.0-pci-scan-fixes.patch xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch xorg-x11-server-1.1.0-tfp-damage.patch xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch xorg-x11-server-1.1.1-aiglx-locking.patch xorg-x11-server-1.1.1-autoconfig.patch xorg-x11-server-1.1.1-edid-hex-dump.patch xorg-x11-server-1.1.1-enable-composite.patch xorg-x11-server-1.1.1-ia64-int10.patch xorg-x11-server-1.1.1-ia64-pci-chipsets.patch xorg-x11-server-1.1.1-lid-close-crash.patch xorg-x11-server-1.1.1-maxpixclock-option.patch xorg-x11-server-1.1.1-mesa-6.5.1.patch xorg-x11-server-1.1.1-mesa-6.5.2.patch xorg-x11-server-1.1.1-pclose-confusion.patch xorg-x11-server-1.1.1-revert-xkb-change.patch xorg-x11-server-1.1.1-selinux-awareness.patch xorg-x11-server-1.1.1-xf86config-comment-less.patch xorg-x11-server-1.1.1-xkb-vidmode-switch.patch xorg-x11-server-1.1.1-xvfb-composite-crash.patch xorg-xserver-1.1.0-dbe-render.diff xserver-1.0.0-parser-add-missing-headers-to-sdk.patch Log Message: auto-import xorg-x11-server-1.2.0-1.fc7 on branch devel from xorg-x11-server-1.2.0-1.fc7.src.rpm xorg-x11-server-1.2.0-enable-composite.patch: utils.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xorg-x11-server-1.2.0-enable-composite.patch --- --- xorg-server-1.2.0/os/utils.c.enable-composite 2007-01-22 22:13:16.000000000 -0500 +++ xorg-server-1.2.0/os/utils.c 2007-01-23 12:26:04.000000000 -0500 @@ -138,7 +138,7 @@ #ifdef COMPOSITE /* COMPOSITE is disabled by default for now until the * interface is stable */ - #define COMPOSITE_DEFAULT FALSE + #define COMPOSITE_DEFAULT TRUE _X_EXPORT Bool noCompositeExtension = !COMPOSITE_DEFAULT; #endif xorg-x11-server-1.2.0-maxpixclock-option.patch: common/xf86Config.c | 9 ++++++--- common/xf86Mode.c | 6 ++++++ ddc/ddcProperty.c | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) --- NEW FILE xorg-x11-server-1.2.0-maxpixclock-option.patch --- --- xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c.maxpixclock 2007-01-22 22:13:15.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c 2007-01-23 12:35:00.000000000 -0500 @@ -303,7 +303,7 @@ { DisplayModePtr Modes = NULL, Mode; int i, clock; - Bool have_hsync = FALSE, have_vrefresh = FALSE; + Bool have_hsync = FALSE, have_vrefresh = FALSE, have_maxpixclock = FALSE; int preferred; if (!Monitor || !DDC) @@ -332,6 +332,7 @@ /* Skip EDID ranges if they were specified in the config file */ have_hsync = (Monitor->nHsync != 0); have_vrefresh = (Monitor->nVrefresh != 0); + have_maxpixclock = (Monitor->maxPixClock != 0); /* Go through the detailed monitor sections */ for (i = 0; i < DET_TIMINGS; i++) @@ -366,7 +367,7 @@ } clock = DDC->det_mon[i].section.ranges.max_clock * 1000; - if (clock > Monitor->maxPixClock) + if (!have_maxpixclock && clock > Monitor->maxPixClock) Monitor->maxPixClock = clock; break; --- xorg-server-1.2.0/hw/xfree86/common/xf86Mode.c.maxpixclock 2007-01-22 22:13:15.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/common/xf86Mode.c 2007-01-23 12:33:41.000000000 -0500 @@ -1408,6 +1408,12 @@ scrp->monitor->vrefresh[i].lo, scrp->monitor->vrefresh[i].hi); } + if (scrp->monitor->maxPixClock) { + xf86DrvMsg(scrp->scrnIndex, X_INFO, + "%s: Using maximum pixel clock of %.2f MHz\n", + scrp->monitor->id, + (float)scrp->monitor->maxPixClock / 1000.0); + } } /* --- xorg-server-1.2.0/hw/xfree86/common/xf86Config.c.maxpixclock 2007-01-22 22:13:15.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/common/xf86Config.c 2007-01-23 12:33:41.000000000 -0500 @@ -2211,12 +2211,15 @@ } typedef enum { - MON_REDUCEDBLANKING + MON_REDUCEDBLANKING, + MON_MAX_PIX_CLOCK, } MonitorValues; static OptionInfoRec MonitorOptions[] = { { MON_REDUCEDBLANKING, "ReducedBlanking", OPTV_BOOLEAN, {0}, FALSE }, + { MON_MAX_PIX_CLOCK, "MaxPixClock", OPTV_FREQ, + {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE }, }; @@ -2363,11 +2366,11 @@ return FALSE; } - /* Check wether this Monitor accepts Reduced Blanking modelines */ xf86ProcessOptions(-1, monitorp->options, MonitorOptions); - xf86GetOptValBool(MonitorOptions, MON_REDUCEDBLANKING, &monitorp->reducedblanking); + xf86GetOptValFreq(MonitorOptions, MON_MAX_PIX_CLOCK, OPTUNITS_KHZ, + &monitorp->maxPixClock); return TRUE; } xorg-x11-server-1.2.0-selinux-awareness.patch: configure.ac | 4 +++- hw/xfree86/dixmods/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE xorg-x11-server-1.2.0-selinux-awareness.patch --- --- xorg-server-1.2.0/hw/xfree86/dixmods/Makefile.am.selinux-awareness 2007-01-22 22:13:15.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/dixmods/Makefile.am 2007-01-23 12:29:54.000000000 -0500 @@ -42,7 +42,7 @@ -I$(top_srcdir)/GL/glx libGLcore_la_LDFLAGS = -avoid-version -libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la +libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -lselinux libGLcore_la_SOURCES = GLcoremodule.c libafb_la_LDFLAGS = -avoid-version --- xorg-server-1.2.0/configure.ac.selinux-awareness 2007-01-23 12:29:54.000000000 -0500 +++ xorg-server-1.2.0/configure.ac 2007-01-23 12:31:30.000000000 -0500 @@ -237,6 +237,8 @@ ;; esac +SYS_LIBS="${SYS_LIBS} -lselinux" + dnl BSD *_video.c selection AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes]) @@ -1009,7 +1011,7 @@ AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) if test "x$XNEST" = xyes; then - XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB" + XNEST_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $XSERVER_LIBS" AC_SUBST([XNEST_LIBS]) fi xorg-x11-server-1.2.0-xephyr-only.patch: Makefile.am | 19 +------------------ 1 files changed, 1 insertion(+), 18 deletions(-) --- NEW FILE xorg-x11-server-1.2.0-xephyr-only.patch --- --- xorg-server-1.2.0/hw/kdrive/Makefile.am.xephyr 2007-01-22 22:13:14.000000000 -0500 +++ xorg-server-1.2.0/hw/kdrive/Makefile.am 2007-01-23 12:28:32.000000000 -0500 @@ -1,16 +1,3 @@ -if KDRIVEVESA -VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ - smi via -endif - -if KDRIVEFBDEV -FBDEV_SUBDIRS = fbdev -endif - -if XSDLSERVER -XSDL_SUBDIRS = sdl -endif - if XEPHYR XEPHYR_SUBDIRS = ephyr endif @@ -22,11 +9,7 @@ SUBDIRS = \ src \ $(LINUX_SUBDIRS) \ - $(XSDL_SUBDIRS) \ - $(FBDEV_SUBDIRS) \ - $(VESA_SUBDIRS) \ - $(XEPHYR_SUBDIRS) \ - fake + $(XEPHYR_SUBDIRS) DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ smi via fbdev sdl ephyr src linux fake sis300 xorg-x11-server-1.2.0-xf86config-comment-less.patch: Monitor.c | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE xorg-x11-server-1.2.0-xf86config-comment-less.patch --- --- xorg-server-1.2.0/hw/xfree86/parser/Monitor.c.comment-less 2007-01-22 22:13:15.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/parser/Monitor.c 2007-01-23 12:32:48.000000000 -0500 @@ -674,8 +674,6 @@ fprintf (cf, "\tDisplaySize %d\t%d\n", ptr->mon_width, ptr->mon_height); - if ( ptr->mon_n_hsync || ptr->mon_n_vrefresh ) - fprintf(cf," ### Comment all HorizSync and VertRefresh values to use DDC:\n"); for (i = 0; i < ptr->mon_n_hsync; i++) { fprintf (cf, "\tHorizSync %2.1f - %2.1f\n", Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 10 Jul 2006 15:24:12 -0000 1.19 +++ .cvsignore 23 Jan 2007 19:24:00 -0000 1.20 @@ -1 +1 @@ -xorg-server-1.1.1.tar.bz2 +xorg-server-1.2.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 10 Jul 2006 15:24:12 -0000 1.14 +++ sources 23 Jan 2007 19:24:01 -0000 1.15 @@ -1 +1 @@ -a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 +849131833c15c049135f1f309f5f9197 xorg-server-1.2.0.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- xorg-x11-server.spec 9 Jan 2007 22:59:16 -0000 1.197 +++ xorg-x11-server.spec 23 Jan 2007 19:24:01 -0000 1.198 @@ -7,8 +7,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.1.1 -Release: 57%{?dist} +Version: 1.2.0 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -19,60 +19,34 @@ # general bug fixes Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=5093 -Patch3: xserver-1.0.0-parser-add-missing-headers-to-sdk.patch -Patch4: xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch Patch5: xorg-x11-server-libxf86config-dont-write-empty-sections.patch Patch6: xorg-x11-server-1.1.1-builderstring.patch Patch7: xorg-x11-server-1.1.1-xkb-in-xnest.patch -Patch8: xorg-x11-server-1.1.1-xvfb-composite-crash.patch -Patch9: xorg-x11-server-1.1.1-pclose-confusion.patch Patch10: xorg-x11-server-1.1.1-vbe-filter-less.patch Patch11: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch Patch12: xorg-x11-server-1.1.1-graphics-expose.patch -Patch13: xorg-x11-server-1.1.1-ia64-int10.patch -Patch14: xorg-x11-server-1.1.1-ia64-pci-chipsets.patch Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch -Patch16: xorg-x11-server-1.1.1-xkb-vidmode-switch.patch -Patch17: xorg-x11-server-1.1.1-lid-close-crash.patch Patch18: xorg-x11-server-1.1.1-glcore-visual-matching.patch -# http://xorg.freedesktop.org/releases/X11R7.1/patches/xorg-xserver-1.1.0-dbe-render.diff -Patch50: xorg-xserver-1.1.0-dbe-render.diff - # OpenGL compositing manager feature/optimization patches. Patch100: xorg-x11-server-1.1.0-no-move-damage.patch Patch101: xorg-x11-server-1.1.0-dont-backfill-bg-none.patch -Patch103: xorg-x11-server-1.1.0-tfp-damage.patch -Patch104: xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch -Patch105: xorg-x11-server-1.1.1-enable-composite.patch +Patch105: xorg-x11-server-1.2.0-enable-composite.patch Patch106: xorg-x11-server-1.1.1-no-composite-in-xnest.patch Patch107: xorg-x11-server-1.1.1-offscreen-pixmaps.patch -Patch108: xorg-x11-server-1.1.1-mesa-6.5.1.patch -Patch109: xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch -Patch110: xorg-x11-server-1.1.1-mesa-6.5.2.patch # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list Patch1001: xorg-x11-server-Red-Hat-extramodes.patch -Patch1002: xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch +Patch1002: xorg-x11-server-1.2.0-xephyr-only.patch Patch1003: xorg-x11-server-1.0.1-fpic-libxf86config.patch -Patch1004: xorg-x11-server-1.1.1-selinux-awareness.patch +Patch1004: xorg-x11-server-1.2.0-selinux-awareness.patch Patch1005: xorg-x11-server-1.1.1-builtin-fonts.patch Patch1006: xorg-x11-server-1.1.1-no-scanpci.patch Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch -Patch1008: xorg-x11-server-1.1.1-xf86config-comment-less.patch - -# Backports of post-1.1 stuff. -Patch2001: xorg-x11-server-1.1.0-pci-scan-fixes.patch -Patch2004: xorg-x11-server-1.1.0-no-zlib.patch -Patch2005: xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch -Patch2006: xorg-x11-server-1.1.1-revert-xkb-change.patch -Patch2007: xorg-x11-server-1.1.1-aiglx-locking.patch -Patch2008: xorg-x11-server-1.1.1-edid-hex-dump.patch +Patch1008: xorg-x11-server-1.2.0-xf86config-comment-less.patch -Patch3000: xorg-x11-server-1.1.1-autoconfig.patch -Patch3001: xorg-x11-server-1.1.1-maxpixclock-option.patch +Patch3001: xorg-x11-server-1.2.0-maxpixclock-option.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -125,11 +99,8 @@ BuildRequires: libX11-devel # libXext-devel needed for Xdmx, Xnest, Xephyr BuildRequires: libXext-devel -# +# XXX Really? Why would we need this, Xfont should hide it. BuildRequires: freetype-devel >= 2.1.9-1 -# FIXME: Disabling zlib-devel dep as we are applying the xorg-x11-server-1.1.0-no-zlib.patch -# patch which should remove any dependency on zlib anyway. -#BuildRequires: zlib-devel # FIXME: libXt-devel should be wrapped in with_dmx_server - for Xdmxconfig, # probably should only be needed for DMX builds, but the build explodes with @@ -138,16 +109,13 @@ %if %{with_dmx_server} -# libdmx-devel needed for Xdmx BuildRequires: libdmx-devel -# libXmu-devel needed for Xdmx BuildRequires: libXmu-devel -# libXrender-devel needed for Xdmx BuildRequires: libXrender-devel -# libXi-devel needed for Xdmx BuildRequires: libXi-devel BuildRequires: libXpm-devel BuildRequires: libXaw-devel +BuildRequires: libXfixes-devel %endif # To query fontdir from fontutil.pc @@ -156,7 +124,8 @@ %if %{with_dri} BuildRequires: mesa-libGL-devel >= 6.5.1 BuildRequires: mesa-source >= 6.5.1 -BuildRequires: libdrm-devel >= 2.0-1 +BuildRequires: libdrm-devel >= 2.3.0 +Requires: libdrm >= 2.3.0 %endif BuildRequires: libselinux-devel @@ -331,34 +300,20 @@ %prep %setup -q -n %{pkgname}-%{version} %patch0 -p0 -b .init-origins-fix -%patch3 -p0 -b .parser-add-missing-headers-to-sdk %patch5 -p0 -b .libxf86config-dont-write-empty-sections %patch6 -p1 -b .builderstring %patch7 -p1 -b .xkb-in-xnest -%patch8 -p1 -b .xvfb-render-fix -%patch9 -p1 -b .pclose %patch10 -p1 -b .vbe-filter %patch11 -p1 -b .vt-activate %patch12 -p1 -b .graphics-expose -%patch13 -p1 -b .ia64-int10 -%patch14 -p1 -b .ia64-pci-chipsets %patch15 -p1 -b .automake-1.10 -%patch16 -p1 -b .xkb-vidmode-switch -%patch17 -p1 -b .lid-close-crash %patch18 -p1 -b .glcore-visual -%patch50 -p1 -b .alloca - %patch100 -p0 -b .no-move-damage %patch101 -p0 -b .dont-backfill-bg-none -%patch103 -p0 -b .tfp-damage -%patch104 -p0 -b .mesa-copy-sub-buffer -%patch105 -p0 -b .enable-composite +%patch105 -p1 -b .enable-composite %patch106 -p1 -b .no-xnest-composite %patch107 -p1 -b .offscreen-pixmaps -%patch108 -p1 -b .mesa-651 -%patch109 -p1 -b .aiglx-happy-vt-switch -%patch110 -p1 -b .mesa-652 %patch1001 -p1 -b .Red-Hat-extramodes %patch1002 -p1 -b .xephyr @@ -368,15 +323,6 @@ %patch1006 -p1 -b .no-scanpci %patch1007 -p1 -b .xf1bpp %patch1008 -p1 -b .comment-less - -%patch2001 -p1 -b .pci-scan -%patch2004 -p1 -b .zlib -%patch2005 -p1 -b .Xdmx -%patch2006 -p1 -b .revert-xkb-change -%patch2007 -p1 -b .aiglx-locking -%patch2008 -p1 -b .hexdump - -%patch3000 -p1 -b .autoconfig %patch3001 -p1 -b .maxpixclock %build @@ -563,13 +509,9 @@ %{_libdir}/xorg/modules/extensions/libxtrap.so %dir %{_libdir}/xorg/modules/input %dir %{_libdir}/xorg/modules/fonts -%{_libdir}/xorg/modules/fonts/libbitmap.so %{_libdir}/xorg/modules/fonts/libfreetype.so %{_libdir}/xorg/modules/fonts/libtype1.so %dir %{_libdir}/xorg/modules/linux -%if %{with_dri} -%{_libdir}/xorg/modules/linux/libdrm.so -%endif %{_libdir}/xorg/modules/linux/libfbdevhw.so %dir %{_libdir}/xorg/modules/multimedia %{_libdir}/xorg/modules/multimedia/bt829_drv.so @@ -581,7 +523,6 @@ %{_libdir}/xorg/modules/multimedia/uda1380_drv.so %{_libdir}/xorg/modules/libafb.so %{_libdir}/xorg/modules/libcfb.so -%{_libdir}/xorg/modules/libcfb16.so %{_libdir}/xorg/modules/libcfb32.so %{_libdir}/xorg/modules/libddc.so %{_libdir}/xorg/modules/libexa.so @@ -590,7 +531,6 @@ %{_libdir}/xorg/modules/libint10.so %{_libdir}/xorg/modules/libmfb.so %{_libdir}/xorg/modules/libpcidata.so -%{_libdir}/xorg/modules/librac.so %{_libdir}/xorg/modules/libramdac.so %{_libdir}/xorg/modules/libshadow.so %{_libdir}/xorg/modules/libshadowfb.so @@ -611,6 +551,7 @@ #%dir %{_mandir}/man4x #%{_mandir}/man4/fbdevhw.4* %{_mandir}/man4/fbdevhw.4* +%{_mandir}/man4/exa.4* #%dir %{_mandir}/man5x %{_mandir}/man5/xorg.conf.5* %dir %{_localstatedir}/lib/xkb @@ -692,6 +633,9 @@ # ------------------------------------------------------------------- %changelog +* Tue Jan 23 2007 Adam Jackson 1.2.0-1 +- Xorg server 1.2.0. + * Tue Jan 09 2007 Adam Jackson 1.1.1-57 - xorg-xserver-1.1.0-dbe-render.diff: CVE #2006-6101 - xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch: Skip building the --- xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch DELETED --- --- xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch DELETED --- --- xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch DELETED --- --- xorg-x11-server-1.1.0-no-zlib.patch DELETED --- --- xorg-x11-server-1.1.0-pci-scan-fixes.patch DELETED --- --- xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch DELETED --- --- xorg-x11-server-1.1.0-tfp-damage.patch DELETED --- --- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch DELETED --- --- xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch DELETED --- --- xorg-x11-server-1.1.1-aiglx-locking.patch DELETED --- --- xorg-x11-server-1.1.1-autoconfig.patch DELETED --- --- xorg-x11-server-1.1.1-edid-hex-dump.patch DELETED --- --- xorg-x11-server-1.1.1-enable-composite.patch DELETED --- --- xorg-x11-server-1.1.1-ia64-int10.patch DELETED --- --- xorg-x11-server-1.1.1-ia64-pci-chipsets.patch DELETED --- --- xorg-x11-server-1.1.1-lid-close-crash.patch DELETED --- --- xorg-x11-server-1.1.1-maxpixclock-option.patch DELETED --- --- xorg-x11-server-1.1.1-mesa-6.5.1.patch DELETED --- --- xorg-x11-server-1.1.1-mesa-6.5.2.patch DELETED --- --- xorg-x11-server-1.1.1-pclose-confusion.patch DELETED --- --- xorg-x11-server-1.1.1-revert-xkb-change.patch DELETED --- --- xorg-x11-server-1.1.1-selinux-awareness.patch DELETED --- --- xorg-x11-server-1.1.1-xf86config-comment-less.patch DELETED --- --- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch DELETED --- --- xorg-x11-server-1.1.1-xvfb-composite-crash.patch DELETED --- --- xorg-xserver-1.1.0-dbe-render.diff DELETED --- --- xserver-1.0.0-parser-add-missing-headers-to-sdk.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 19:25:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 14:25:18 -0500 Subject: rpms/control-center/devel control-center.spec,1.217,1.218 Message-ID: <200701231925.l0NJPIP5023014@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22894 Modified Files: control-center.spec Log Message: Install gnomecc desktop file Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- control-center.spec 23 Jan 2007 05:25:57 -0000 1.217 +++ control-center.spec 23 Jan 2007 19:25:16 -0000 1.218 @@ -21,7 +21,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.17.90 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -226,16 +226,9 @@ # bug 171059 sed -i -e 's/=Font$/=Fonts/g' $RPM_BUILD_ROOT%{_datadir}/applications/gnome-font-properties.desktop -# remove control center desktop file -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnomecc.desktop - # desktop-file-install really should not be generating this rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache -# replace accessibility desktop file -#/bin/rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*accessibility*.desktop -#ln -sf %{_datadir}/desktop-menu-patches/gnome-accessibility.desktop $RPM_BUILD_ROOT%{_datadir}/applications/gnome-accessibility.desktop - cp -f $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/icons/* $RPM_BUILD_ROOT%{_datadir}/pixmaps # fix installed but not packaged @@ -353,6 +346,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 23 2007 Matthias Clasen - 2.17.90-2 +- Install gnomecc desktop file + * Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 - Update to 2.17.90 From fedora-cvs-commits at redhat.com Tue Jan 23 19:28:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 14:28:49 -0500 Subject: rpms/systemtap/devel .cvsignore, 1.6, 1.7 sources, 1.19, 1.20 systemtap.spec, 1.27, 1.28 elfutils-portability.patch, 1.11, NONE Message-ID: <200701231928.l0NJSnJu025569@cvs.devel.redhat.com> Author: fche Update of /cvs/dist/rpms/systemtap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25498 Modified Files: .cvsignore sources systemtap.spec Removed Files: elfutils-portability.patch Log Message: * refresh Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/systemtap/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 20 Oct 2006 00:06:24 -0000 1.6 +++ .cvsignore 23 Jan 2007 19:28:45 -0000 1.7 @@ -1,4 +1 @@ -systemtap-0.5.9.tar.gz -elfutils-0.122.tar.gz -systemtap-0.5.10.tar.gz -elfutils-0.124.tar.gz +systemtap-0.5.12.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/systemtap/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 20 Oct 2006 00:06:25 -0000 1.19 +++ sources 23 Jan 2007 19:28:45 -0000 1.20 @@ -1,2 +1 @@ -6ae4694f813ab7745be01d50f0bebf6f systemtap-0.5.10.tar.gz -f77efb19fd90821ab103533a99de0d4a elfutils-0.124.tar.gz +7631f118944b54dc4eeb470b54ba4f39 systemtap-0.5.12.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- systemtap.spec 20 Oct 2006 00:13:13 -0000 1.27 +++ systemtap.spec 23 Jan 2007 19:28:45 -0000 1.28 @@ -1,7 +1,7 @@ # Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases. %define release 1 # Version number of oldest elfutils release that works with systemtap. -%define elfutils_version 0.124 +%define elfutils_version 0.125 # Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer. %if 0%{?fedora} @@ -25,7 +25,7 @@ %endif Name: systemtap -Version: 0.5.10 +Version: 0.5.12 Release: %{release}%{?dist} Summary: Instrumentation System Group: Development/System @@ -37,6 +37,8 @@ Requires: kernel >= 2.6.9-11 BuildRequires: glib2-devel >= 2.0.0 +# make check +BuildRequires: dejagnu Requires: glib2 >= 2.0.0 # Requires: kernel-devel # or is that kernel-smp-devel? kernel-hugemem-devel? @@ -118,7 +120,7 @@ %files %defattr(-,root,root) -%doc README AUTHORS NEWS COPYING +%doc README AUTHORS NEWS COPYING examples %{_bindir}/stap %{_bindir}/lket-b2a @@ -142,6 +144,9 @@ %{_bindir}/staprun %changelog +* Mon Jan 1 2007 Frank Ch. Eigler - 0.5.12-1 +- Many changes, see NEWS file. + * Tue Sep 26 2006 David Smith - 0.5.10-1 - Added 'systemtap-runtime' subpackage. --- elfutils-portability.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 19:55:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 14:55:48 -0500 Subject: rpms/redhat-menus/devel redhat-menus-7.8.9-cc-shell.patch, NONE, 1.1 redhat-menus.spec, 1.66, 1.67 Message-ID: <200701231955.l0NJtmgn016110@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16094 Modified Files: redhat-menus.spec Added Files: redhat-menus-7.8.9-cc-shell.patch Log Message: add new preferences.menu redhat-menus-7.8.9-cc-shell.patch: preferences.menu | 102 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 66 insertions(+), 36 deletions(-) --- NEW FILE redhat-menus-7.8.9-cc-shell.patch --- --- redhat-menus-7.8.9/menus/preferences.menu.cc-shell 2007-01-23 14:47:48.000000000 -0500 +++ redhat-menus-7.8.9/menus/preferences.menu 2007-01-23 14:48:04.000000000 -0500 @@ -3,78 +3,108 @@ Preferences - Settings.directory - - - /usr/share/gnome/apps - /etc/X11/applnk + Preferences.directory - + Settings - X-Red-Hat-Base + PersonalSettings + DesktopSettings + NetworkSettings + HardwareSettings + SystemSettings System - Accessibility + - redhat-userpasswd.desktop + gnomecc.desktop - + - Accessibility - Settings-Accessibility.directory + Personal + Personal.directory Settings - Accessibility - - - System - - + PersonalSettings - + - + + + Look and Feel + LookAndFeel.directory + + + Settings + DesktopSettings + + + + - MorePreferences - Settings-More.directory + Internet and Network + InternetAndNetwork.directory Settings - - - System - X-Red-Hat-Base-Only - X-Red-Hat-Base - - + NetworkSettings - gnome-gconf-editor + - - redhat-userinfo.desktop - gnome-gdmphotosetup.desktop - + + + Hardware + Hardware.directory + + + Settings + HardwareSettings + + + - - + + + System + System.directory + + + Settings + + SystemSettings + + System + + + PersonalSettings + DesktopSettings + HardwareSettings + NetworkSettings + + + + + + + + Index: redhat-menus.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- redhat-menus.spec 11 Jan 2007 19:31:04 -0000 1.66 +++ redhat-menus.spec 23 Jan 2007 19:55:46 -0000 1.67 @@ -4,9 +4,14 @@ Summary: Configuration and data files for the desktop menus Name: redhat-menus Version: 7.8.9 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz +# add the preferences.menu file from upstream, which +# gives a much better experience in the control center shell +# do this as a quick patch for now, we need to rethink the +# menu situation anyway +Patch0: redhat-menus-7.8.9-cc-shell.patch PreReq: desktop-file-utils >= %{desktop_file_utils_version} License: XFree86 @@ -33,6 +38,7 @@ %prep %setup -q +%patch0 -p1 -b .cc-shell %build @@ -70,6 +76,9 @@ %{_datadir}/desktop-directories/*.directory %changelog +* Tue Jan 23 2007 Matthias Clasen - 7.8.9-3 +- Update preferences.menu for the control center shell + * Thu Jan 11 2007 Matthias Clasen - 7.8.9-2 - Resolve a conflict with gnome-menus From fedora-cvs-commits at redhat.com Tue Jan 23 20:02:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 15:02:35 -0500 Subject: rpms/xorg-x11-resutils/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-resutils.spec, 1.16, 1.17 Message-ID: <200701232002.l0NK2ZJk016445@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-resutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16415/devel Modified Files: .cvsignore sources xorg-x11-resutils.spec Log Message: auto-import xorg-x11-resutils-7.1-3.fc7 on branch devel from xorg-x11-resutils-7.1-3.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2006 16:18:04 -0000 1.4 +++ .cvsignore 23 Jan 2007 20:02:33 -0000 1.5 @@ -1,4 +1,4 @@ -appres-1.0.0.tar.bz2 editres-1.0.1.tar.bz2 listres-1.0.1.tar.bz2 viewres-1.0.1.tar.bz2 +appres-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2006 16:18:04 -0000 1.4 +++ sources 23 Jan 2007 20:02:33 -0000 1.5 @@ -1,4 +1,4 @@ -4e03ac5f315213d5c70d603fc92cb0a1 appres-1.0.0.tar.bz2 a9bbacc163767f79dfc08a8ebe05490b editres-1.0.1.tar.bz2 827a1ac5adf9aadd0c13b54a897e297b listres-1.0.1.tar.bz2 cdbed540daf7975b56000420c9aa5bf9 viewres-1.0.1.tar.bz2 +420e6cdf38bb771ec8b00228bf09e8ff appres-1.0.1.tar.bz2 Index: xorg-x11-resutils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-resutils.spec 19 Jul 2006 22:22:16 -0000 1.16 +++ xorg-x11-resutils.spec 23 Jan 2007 20:02:33 -0000 1.17 @@ -3,13 +3,13 @@ Summary: X.Org X11 X resource utilities Name: xorg-x11-%{pkgname} Version: 7.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/app/appres-1.0.0.tar.bz2 +Source0: ftp://ftp.x.org/pub/individual/app/appres-1.0.1.tar.bz2 Source1: ftp://ftp.x.org/pub/individual/app/editres-1.0.1.tar.bz2 Source2: ftp://ftp.x.org/pub/individual/app/listres-1.0.1.tar.bz2 Source3: ftp://ftp.x.org/pub/individual/app/viewres-1.0.1.tar.bz2 @@ -82,12 +82,15 @@ %{_datadir}/X11/app-defaults/Editres %{_datadir}/X11/app-defaults/Editres-color %{_datadir}/X11/app-defaults/Viewres -%{_mandir}/man1/appres.1x* -%{_mandir}/man1/editres.1x* -%{_mandir}/man1/listres.1x* -%{_mandir}/man1/viewres.1x* +%{_mandir}/man1/appres.1* +%{_mandir}/man1/editres.1* +%{_mandir}/man1/listres.1* +%{_mandir}/man1/viewres.1* %changelog +* Tue Jan 23 2007 Adam Jackson 7.1-3 +- appres 1.0.1 + * Wed Jul 19 2006 Mike A. Harris 7.1-2.fc6 - Remove app-defaults dir from file manifest, as it is owned by libXt (#174021) - Add 'dist' tag to package release string. From fedora-cvs-commits at redhat.com Tue Jan 23 20:06:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 15:06:53 -0500 Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch,1.12,1.13 Message-ID: <200701232006.l0NK6raq016566@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16550 Modified Files: ooobuild.VBAObjects.patch Log Message: i hate vba ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 254 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 163 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 12 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 218 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 115 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 8 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 101 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 128 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlocx.cxx | 151 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 + sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3619 ++++++++++ sc/source/ui/vba/vbarange.hxx | 234 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 + sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 40 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 424 files changed, 20202 insertions(+), 637 deletions(-) Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ooobuild.VBAObjects.patch 23 Jan 2007 16:20:31 -0000 1.12 +++ ooobuild.VBAObjects.patch 23 Jan 2007 20:06:51 -0000 1.13 @@ -2993,7 +2993,7 @@ + --- /dev/null +++ offapi/org/openoffice/vba/XRange.idl -@@ -0,0 +1,116 @@ +@@ -0,0 +1,115 @@ +#ifndef __org_openoffice_vba_XRange_idl__ +#define __org_openoffice_vba_XRange_idl__ + @@ -3099,7 +3099,6 @@ + void Insert([in] any Shift, [in] any CopyOrigin); + void Autofit(); + void PrintOut([in] any From, [in] any To, [in] any Copies, [in] any Preview, [in] any ActivePrinter, [in] any PrintToFile, [in] any Collate, [in] any PrToFileName); -+ void AutoFill( [in] XRange Destination, [in] any Type ); + +}; + @@ -3349,7 +3348,7 @@ +#endif --- /dev/null +++ offapi/org/openoffice/vba/Excel/makefile.mk -@@ -0,0 +1,219 @@ +@@ -0,0 +1,218 @@ +PRJ=..$/..$/..$/.. + +PRJNAME=api @@ -3376,7 +3375,6 @@ + XlArrowHeadLength.idl \ + XlArrowHeadStyle.idl \ + XlArrowHeadWidth.idl \ -+ XlAutoFillType.idl \ + XlAutoFilterOperator.idl \ + XlAxisCrosses.idl \ + XlAxisGroup.idl \ @@ -4463,29 +4461,6 @@ +}; }; }; }; +#endif --- /dev/null -+++ offapi/org/openoffice/vba/Excel/XlAutoFillType.idl -@@ -0,0 +1,20 @@ -+#ifndef __org_openoffice_vba_Excel_XlAutoFillType_idl__ -+#define __org_openoffice_vba_Excel_XlAutoFillType_idl__ -+module org { module openoffice { module vba { module Excel { -+ -+constants XlAutoFillType -+{ -+ const short xlFillCopy = 1; -+ const short xlFillDays = 5; -+ const short xlFillDefault = 0; -+ const short xlFillFormats = 3; -+ const short xlFillMonths = 7; -+ const short xlFillSeries = 2; -+ const short xlFillValues = 4; -+ const short xlFillWeekdays = 6; -+ const short xlFillYears = 8; -+ const short xlGrowthTrend = 10; -+ const short xlLinearTrend = 9; -+}; -+}; }; }; }; -+#endif ---- /dev/null +++ offapi/org/openoffice/vba/Excel/XlListConflict.idl @@ -0,0 +1,13 @@ +#ifndef __org_openoffice_vba_Excel_XlListConflict_idl__ @@ -7215,14 +7190,13 @@ +#endif --- /dev/null +++ offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl -@@ -0,0 +1,13 @@ +@@ -0,0 +1,12 @@ +#ifndef __org_openoffice_vba_Excel_XlDataSeriesType_idl__ +#define __org_openoffice_vba_Excel_XlDataSeriesType_idl__ +module org { module openoffice { module vba { module Excel { + +constants XlDataSeriesType +{ -+ const long xlAutoFill = 4; + const long xlChronological = 3; + const long xlDataSeriesLinear = -4132; //(&HFFFFEFDC) + const long xlGrowth = 2; @@ -9678,7 +9652,7 @@ +#endif --- /dev/null +++ sc/source/ui/vba/vbarange.cxx -@@ -0,0 +1,3743 @@ +@@ -0,0 +1,3619 @@ +#include +#include + @@ -9748,7 +9722,6 @@ +#include +#include +#include -+#include +#include +#include + @@ -13299,132 +13272,9 @@ + } +} + -+void SAL_CALL -+ScVbaRange::AutoFill( const uno::Reference< vba::XRange >& Destination, const uno::Any& Type ) throw (uno::RuntimeException) -+{ -+ uno::Reference< vba::XRange > xDest( Destination, uno::UNO_QUERY_THROW ); -+ ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xDest.get() ); -+ RangeHelper destRangeHelper( pRange->mxRange ); -+ table::CellRangeAddress destAddress = destRangeHelper.getCellRangeAddressable()->getRangeAddress(); -+ -+ RangeHelper thisRange( mxRange ); -+ table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); -+ ScRange sourceRange; -+ ScRange destRange; -+ -+ ScUnoConversion::FillScRange( destRange, destAddress ); -+ ScUnoConversion::FillScRange( sourceRange, thisAddress ); -+ -+ -+ // source is valid -+// if ( !sourceRange.In( destRange ) ) -+// throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "source not in destination" ) ), uno::Reference< uno::XInterface >() ); -+ -+ FillDir eDir = FILL_TO_BOTTOM; -+ double fStep = 1.0; -+ -+ ScRange aRange( destRange ); -+ ScRange aSourceRange( destRange ); -+ -+ // default to include the number of Rows in the source range; -+ SCCOLROW nSourceCount = ( sourceRange.aEnd.Row() - sourceRange.aStart.Row() ) + 1; -+ SCCOLROW nCount = 0; -+ -+ if ( sourceRange != destRange ) -+ { -+ // Find direction of fill, vertical or horizontal -+ if ( sourceRange.aStart == destRange.aStart ) -+ { -+ if ( sourceRange.aEnd.Row() == destRange.aEnd.Row() ) -+ { -+ nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() + 1 ); -+ aSourceRange.aEnd.SetCol( static_cast( aSourceRange.aStart.Col() + nSourceCount - 1 ) ); -+ eDir = FILL_TO_RIGHT; -+ nCount = aRange.aEnd.Col() - aSourceRange.aEnd.Col(); -+ } -+ else if ( sourceRange.aEnd.Col() == destRange.aEnd.Col() ) -+ { -+ aSourceRange.aEnd.SetRow( static_cast( aSourceRange.aStart.Row() + nSourceCount ) - 1 ); -+ nCount = aRange.aEnd.Row() - aSourceRange.aEnd.Row(); -+ eDir = FILL_TO_BOTTOM; -+ } -+ } -+ -+ else if ( aSourceRange.aEnd == destRange.aEnd ) -+ { -+ if ( sourceRange.aStart.Col() == destRange.aStart.Col() ) -+ { -+ aSourceRange.aStart.SetRow( static_cast( aSourceRange.aEnd.Row() - nSourceCount + 1 ) ); -+ nCount = aSourceRange.aStart.Row() - aRange.aStart.Row(); -+ eDir = FILL_TO_TOP; -+ fStep = -fStep; -+ } -+ else if ( sourceRange.aStart.Row() == destRange.aStart.Row() ) -+ { -+ nSourceCount = ( sourceRange.aEnd.Col() - sourceRange.aStart.Col() ) + 1; -+ aSourceRange.aStart.SetCol( static_cast( aSourceRange.aEnd.Col() - nSourceCount + 1 ) ); -+ nCount = aSourceRange.aStart.Col() - aRange.aStart.Col(); -+ eDir = FILL_TO_LEFT; -+ fStep = -fStep; -+ } -+ } -+ } -+ ScDocShell* pDocSh= getDocShellFromRange( mxRange ); -+ -+ FillCmd eCmd = FILL_AUTO; -+ FillDateCmd eDateCmd = FILL_DAY; -+ -+ double fEndValue = MAXDOUBLE; -+ -+ if ( Type.hasValue() ) -+ { -+ sal_Int16 nFillType = vba::Excel::XlAutoFillType::xlFillDefault; -+ Type >>= nFillType; -+ switch ( nFillType ) -+ { -+ case vba::Excel::XlAutoFillType::xlFillCopy: -+ eCmd = FILL_SIMPLE; -+ fStep = 0.0; -+ break; -+ case vba::Excel::XlAutoFillType::xlFillDays: -+ eCmd = FILL_DATE; -+ break; -+ case vba::Excel::XlAutoFillType::xlFillMonths: -+ eCmd = FILL_DATE; -+ eDateCmd = FILL_MONTH; -+ break; -+ case vba::Excel::XlAutoFillType::xlFillWeekdays: -+ eCmd = FILL_DATE; -+ eDateCmd = FILL_WEEKDAY; -+ break; -+ case vba::Excel::XlAutoFillType::xlFillYears: -+ eCmd = FILL_DATE; -+ eDateCmd = FILL_YEAR; -+ break; -+ case vba::Excel::XlAutoFillType::xlGrowthTrend: -+ eCmd = FILL_GROWTH; -+ break; -+ case vba::Excel::XlAutoFillType::xlFillFormats: -+ throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "xlFillFormat not supported for AutoFill" ) ), uno::Reference< uno::XInterface >() ); -+ break; -+ case vba::Excel::XlAutoFillType::xlFillValues: -+ case vba::Excel::XlAutoFillType::xlFillSeries: -+ case vba::Excel::XlAutoFillType::xlLinearTrend: -+ eCmd = FILL_LINEAR; -+ break; -+ case vba::Excel::XlAutoFillType::xlFillDefault: -+ default: -+ eCmd = FILL_AUTO; -+ break; -+ } -+ } -+ ScDocFunc aFunc(*pDocSh); -+ aFunc.FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, -+ nCount, fStep, fEndValue, TRUE, TRUE ); -+} --- /dev/null +++ sc/source/ui/vba/vbarange.hxx -@@ -0,0 +1,235 @@ +@@ -0,0 +1,234 @@ +#ifndef SC_VBA_RANGE_HXX +#define SC_VBA_RANGE_HXX + @@ -13615,7 +13465,6 @@ + virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Autofit() throw (css::uno::RuntimeException); + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException); -+ virtual void SAL_CALL AutoFill( const css::uno::Reference< oo::vba::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException) ; + // XPropertySet + + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException); From fedora-cvs-commits at redhat.com Tue Jan 23 20:10:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 15:10:49 -0500 Subject: rpms/evolution-sharp/devel .cvsignore, 1.5, 1.6 evolution-sharp.spec, 1.33, 1.34 sources, 1.5, 1.6 Message-ID: <200701232010.l0NKAnKl016766@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16723 Modified Files: .cvsignore evolution-sharp.spec sources Log Message: * Tue Jan 23 2007 Matthew Barnes - 0.12.2-1.fc7 - Update to 0.12.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 3 Jan 2007 19:11:28 -0000 1.5 +++ .cvsignore 23 Jan 2007 20:10:47 -0000 1.6 @@ -1 +1 @@ -evolution-sharp-0.12.1.tar.bz2 +evolution-sharp-0.12.2.tar.bz2 Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- evolution-sharp.spec 5 Jan 2007 15:17:46 -0000 1.33 +++ evolution-sharp.spec 23 Jan 2007 20:10:47 -0000 1.34 @@ -1,8 +1,8 @@ ### Abstract ### Name: evolution-sharp -Version: 0.12.1 -Release: 2%{?dist} +Version: 0.12.2 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Evolution Data Server Mono Bindings @@ -86,6 +86,9 @@ # sonames may need to be updated in evolution-sharp's configure.in. %changelog +* Tue Jan 23 2007 Matthew Barnes - 0.12.2-1.fc7 +- Update to 0.12.2 + * Fri Jan 05 2007 Matthew Barnes - 0.12.1-2.fc7 - Add patch for RH bug #221555 (wrong install directory). - Fix location of mono files to conform to packaging guidelines. Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 3 Jan 2007 19:11:28 -0000 1.5 +++ sources 23 Jan 2007 20:10:47 -0000 1.6 @@ -1 +1 @@ -5dbcf479d81e2a4bde541470ea49b746 evolution-sharp-0.12.1.tar.bz2 +944df17a5ff06d3a254ab312c6470f17 evolution-sharp-0.12.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 20:16:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 15:16:13 -0500 Subject: rpms/kexec-tools/FC-6 kdump.init, 1.11, 1.12 kexec-tools.spec, 1.64, 1.65 Message-ID: <200701232016.l0NKGD4n017052@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17037 Modified Files: kdump.init kexec-tools.spec Log Message: Resolves: bz 224034 Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kdump.init,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kdump.init 28 Sep 2006 16:16:04 -0000 1.11 +++ kdump.init 23 Jan 2007 20:16:11 -0000 1.12 @@ -118,7 +118,7 @@ case "$1" in start) - if [ -f /proc/vmcore ]; then + if [ -s /proc/vmcore ]; then save_core reboot else Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kexec-tools.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- kexec-tools.spec 28 Sep 2006 16:16:04 -0000 1.64 +++ kexec-tools.spec 23 Jan 2007 20:16:11 -0000 1.65 @@ -162,6 +162,9 @@ %doc kexec-kdump-howto.txt %changelog +* Tue Jan 23 2007 Neil Horman - 1.101-55%{dist} +- Fix up init script to not constantly reboot (bz 224034) + * Thu Sep 28 2006 Neil Horman - 1.101-54%{dist} - update mkdumprd to use busybox ifup/down infrastructure - update initscript file to use chkconfig properly From fedora-cvs-commits at redhat.com Tue Jan 23 20:16:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 15:16:34 -0500 Subject: rpms/kexec-tools/FC-6 kexec-tools.spec,1.65,1.66 Message-ID: <200701232016.l0NKGYKc017107@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17092 Modified Files: kexec-tools.spec Log Message: Related: bz 224034 Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/FC-6/kexec-tools.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- kexec-tools.spec 23 Jan 2007 20:16:11 -0000 1.65 +++ kexec-tools.spec 23 Jan 2007 20:16:31 -0000 1.66 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 54%{?dist} +Release: 55%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. From fedora-cvs-commits at redhat.com Tue Jan 23 21:40:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 16:40:33 -0500 Subject: rpms/emacs/devel focus-init.el, NONE, 1.1 .cvsignore, 1.16, 1.17 default.el, 1.6, 1.7 dotemacs.el, 1.9, 1.10 emacs.spec, 1.79, 1.80 sources, 1.17, 1.18 battery-acpi-support.dpatch, 1.1, NONE browse-url-htmlview-84262.patch, 1.1, NONE bzero-and-have-stdlib.dpatch, 1.2, NONE coding-region-leak.dpatch, 1.1, NONE detect-coding-iso2022.dpatch, 1.1, NONE editfns.c-Fformat-multibyte-davej.patch, 1.1, NONE emacs-21.2-alloc-blockinput-83600.patch, 1.1, NONE emacs-21.2-menubar-games.patch, 1.1, NONE emacs-21.2-s390.patch, 1.2, NONE emacs-21.2-s390x.patch, 1.1, NONE emacs-21.2-sticky-bit-80049.patch, 1.1, NONE emacs-21.2-x86_64.patch, 1.1, NONE emacs-21.3-gcc4.patch, 1.1, NONE emacs-21.3-gud-libtool-fix.patch, 1.1, NONE emacs-21.3-latex-mode-hook-144083.patch, 1.1, NONE emacs-21.3-lisp-textmodes-ispell-languages.patch, 1.2, NONE emacs-21.3-no-rpath.patch, 1.1, NONE emacs-21.3-ppc64.patch, 1.1, NONE emacs-21.3-xterm-modifiers-137868.patch, 1.1, NONE emacs-21.4-21.4a-diff.patch, 1.1, NONE emacs-xim-status-under-window-125413.patc! h, 1.2, NONE etags-update-to-cvs.patch, 1.2, NONE fix-batch-mode-signal-handling.dpatch, 1.1, NONE fix-x-vs-no-x-diffs.dpatch, 1.1, NONE ispell-german-utf-8.patch, 1.1, NONE lang-coding-systems-init.el, 1.8, NONE mule-cmd.el-X11-locale.alias-173781.patch, 1.1, NONE multibyte-command-line.patch, 1.1, NONE pcl-cvs-format.dpatch, 1.1, NONE po-compat.el, 1.2, NONE ppc64-unexelf.patch, 1.1, NONE python-completion-ignored-extensions.dpatch, 1.1, NONE remote-files-permissions.dpatch, 1.1, NONE save-buffer.dpatch, 1.1, NONE scroll-margin.dpatch, 1.1, NONE smtpmail-cvs-update.patch, 1.1, NONE sort-columns-posix-key-182282.patch, 1.1, NONE xfree86-4.3-modifiers.dpatch, 1.1, NONE Message-ID: <200701232140.l0NLeXmV005148@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5131 Modified Files: .cvsignore default.el dotemacs.el emacs.spec sources Added Files: focus-init.el Removed Files: battery-acpi-support.dpatch browse-url-htmlview-84262.patch bzero-and-have-stdlib.dpatch coding-region-leak.dpatch detect-coding-iso2022.dpatch editfns.c-Fformat-multibyte-davej.patch emacs-21.2-alloc-blockinput-83600.patch emacs-21.2-menubar-games.patch emacs-21.2-s390.patch emacs-21.2-s390x.patch emacs-21.2-sticky-bit-80049.patch emacs-21.2-x86_64.patch emacs-21.3-gcc4.patch emacs-21.3-gud-libtool-fix.patch emacs-21.3-latex-mode-hook-144083.patch emacs-21.3-lisp-textmodes-ispell-languages.patch emacs-21.3-no-rpath.patch emacs-21.3-ppc64.patch emacs-21.3-xterm-modifiers-137868.patch emacs-21.4-21.4a-diff.patch emacs-xim-status-under-window-125413.patch etags-update-to-cvs.patch fix-batch-mode-signal-handling.dpatch fix-x-vs-no-x-diffs.dpatch ispell-german-utf-8.patch lang-coding-systems-init.el mule-cmd.el-X11-locale.alias-173781.patch multibyte-command-line.patch pcl-cvs-format.dpatch po-compat.el ppc64-unexelf.patch python-completion-ignored-extensions.dpatch remote-files-permissions.dpatch save-buffer.dpatch scroll-margin.dpatch smtpmail-cvs-update.patch sort-columns-posix-key-182282.patch xfree86-4.3-modifiers.dpatch Log Message: major overhaul for emacs-22 pretest --- NEW FILE focus-init.el --- (when window-system ;; make switching frames works properly under the default click-to-focus (setq focus-follows-mouse nil)) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 23 Jun 2005 15:39:10 -0000 1.16 +++ .cvsignore 23 Jan 2007 21:40:31 -0000 1.17 @@ -10,3 +10,4 @@ cc-mode-5.30.9.tar.gz cc-mode-5.30.9 tramp-2.0.49.tar.gz +emacs-22.0.93.tar.gz Index: default.el =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/default.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- default.el 30 May 2005 08:49:09 -0000 1.6 +++ default.el 23 Jan 2007 21:40:31 -0000 1.7 @@ -3,11 +3,3 @@ ;;; Setting `inhibit-default-init' non-nil in "~/.emacs" ;;; prevents loading of this file. Also the "-q" option to emacs ;;; prevents both "~/.emacs" and this file from being loaded at startup. - -(when window-system - ;; enable wheelmouse support by default - (mwheel-install) - ;; make switching frames works properly under the default click-to-focus - (setq focus-follows-mouse nil)) - -(auto-compression-mode t) Index: dotemacs.el =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/dotemacs.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dotemacs.el 6 Nov 2006 16:29:49 -0000 1.9 +++ dotemacs.el 23 Jan 2007 21:40:31 -0000 1.10 @@ -3,10 +3,6 @@ ;;; uncomment this line to disable loading of "default.el" at startup ;; (setq inhibit-default-init t) -;; turn on font-lock mode -(when (fboundp 'global-font-lock-mode) - (global-font-lock-mode t)) - ;; enable visual feedback on selections ;(setq transient-mark-mode t) Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- emacs.spec 14 Nov 2006 21:37:07 -0000 1.79 +++ emacs.spec 23 Jan 2007 21:40:31 -0000 1.80 @@ -1,134 +1,45 @@ # This file is encoded in UTF-8. -*- coding: utf-8 -*- -%define emacs21 1 -%define muleucs_ver current -%define tramp_ver 2.0.49 - -%define cc_mode_ver 5.30.9 - Summary: GNU Emacs text editor Name: emacs -Version: 21.4 -Release: 20.1 +Version: 22.0.93 +Release: 1%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors -Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz -%if %{emacs21} -Source1: ftp://ftp.gnu.org/gnu/emacs/leim-%{version}.tar.gz -%endif -Source3: emacs.desktop -Source4: emacs.png -Source5: dotemacs.el -Source6: site-start.el -Source7: http://www.python.org/emacs/python-mode/python-mode.el -Source8: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el -%if %{emacs21} -Source10: ftp://ftp.gnu.org/gnu/emacs/elisp-manual-21-2.8.tar.bz2 -%endif -Source11: http://download.sourceforge.net/php-mode/php-mode-1.1.0.tgz -Source12: php-mode-init.el -Source13: ssl.el -Source16: python-mode-init.el -Source17: rpm-spec-mode-init.el -Source18: rpm-spec-mode.el-0.14-xemacs-compat.patch -Source20: po-mode.el -Source21: po-compat.el -Source22: po-mode-init.el -Source23: po-mode-auto-replace-date-71264.patch -%if %{emacs21} -Source24: ftp://ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-%{muleucs_ver}.tar.gz -%endif -Source25: lang-coding-systems-init.el -Source26: default.el -%if %{emacs21} -Source27: rfc1345.el -Source28: http://ftp.gnu.org/gnu/tramp/tramp-%{tramp_ver}.tar.gz -Source29: tramp-init.el -%endif -Source30: wrapper -Source31: igrep.el -Source32: igrep-init.el -Source33: http://download.sourceforge.net/cc-mode/cc-mode-%{cc_mode_ver}.tar.gz +Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.gz +Source1: emacs.desktop +Source2: emacs.png +Source3: dotemacs.el +Source4: site-start.el +Source5: http://www.python.org/emacs/python-mode/python-mode.el +Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el +Source7: http://download.sourceforge.net/php-mode/php-mode-1.1.0.tgz +Source8: php-mode-init.el +Source9: ssl.el +Source10: python-mode-init.el +Source11: rpm-spec-mode-init.el +Source12: rpm-spec-mode.el-0.14-xemacs-compat.patch +Source13: focus-init.el +Source14: po-mode.el +Source15: po-mode-init.el +Source16: po-mode-auto-replace-date-71264.patch +Source18: default.el +Source19: wrapper +Source20: igrep.el +Source21: igrep-init.el Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: glibc-devel, gcc, bzip2, ncurses-devel, zlib-devel, texinfo -%if %{emacs21} -Buildrequires: autoconf213, libXaw-devel, Xaw3d-devel -%else -Buildrequires: autoconf, gtk2-devel -%endif -Buildrequires: libX11-devel, libpng-devel, libjpeg-devel, giflib-devel, libtiff-devel -BuildRequires: sendmail +BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel +BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel +BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel +BuildRequires: autoconf, bzip2, cairo, texinfo Requires: xorg-x11-fonts-ISO8859-1-75dpi -%ifarch %{ix86} -BuildRequires: setarch -%endif Requires: emacs-common = %{version}-%{release} -Obsoletes: emacs-X11 Conflicts: gettext < 0.10.40 # C and build patches -Patch2: emacs-21.2-s390.patch -%if %{emacs21} -Patch3: emacs-21.2-x86_64.patch -%endif -# * needs updating for emacs22 * -Patch4: emacs-21.2-sticky-bit-80049.patch -Patch5: emacs-21.2-s390x.patch -# * needs updating for emacs22 * -Patch7: emacs-21.2-alloc-blockinput-83600.patch -%if %{emacs21} -Patch9: emacs-21.3-ppc64.patch -Patch10: editfns.c-Fformat-multibyte-davej.patch -%endif -Patch11: emacs-21.3-no-rpath.patch -# this patch is no longer strictly needed with our iiimf-12.2 -# (however status under the window seems nicer) -Patch14: emacs-xim-status-under-window-125413.patch -%if %{emacs21} -Patch15: emacs-21.3-xterm-modifiers-137868.patch -# * needs updating for emacs22 * -Patch17: emacs-21.3-gcc4.patch -Patch19: emacs-21.4-21.4a-diff.patch -# * maybe needs updating for emacs22 * -Patch20: bzero-and-have-stdlib.dpatch -Patch21: coding-region-leak.dpatch -Patch22: detect-coding-iso2022.dpatch -# * maybe needs updating for emacs22 * -Patch23: fix-batch-mode-signal-handling.dpatch -Patch24: fix-x-vs-no-x-diffs.dpatch -Patch25: scroll-margin.dpatch -Patch26: xfree86-4.3-modifiers.dpatch -# generated from ftp://fly.isti.cnr.it/pub/etags.c.gz -Patch27: etags-update-to-cvs.patch -# required to build on PowerPC64 -Patch34: ppc64-unexelf.patch -Patch35: multibyte-command-line.patch -%endif # Lisp and doc patches -%if %{emacs21} -Patch106: emacs-21.2-menubar-games.patch -%endif -# * needs updating for emacs22 * -Patch108: browse-url-htmlview-84262.patch -# * needs updating for emacs22 * -Patch112: emacs-21.3-lisp-textmodes-ispell-languages.patch -# * maybe needs updating for emacs22 * -Patch113: emacs-21.3-gud-libtool-fix.patch -%if %{emacs21} -# * maybe needs updating for emacs22 * -Patch118: emacs-21.3-latex-mode-hook-144083.patch -Patch119: battery-acpi-support.dpatch -Patch120: pcl-cvs-format.dpatch -Patch121: python-completion-ignored-extensions.dpatch -# * maybe needs updating for emacs22 * -Patch122: save-buffer.dpatch -Patch123: smtpmail-cvs-update.patch -%endif -Patch124: mule-cmd.el-X11-locale.alias-173781.patch -Patch125: sort-columns-posix-key-182282.patch -Patch126: ispell-german-utf-8.patch %description Emacs is a powerful, customizable, self-documenting, modeless text @@ -156,9 +67,7 @@ Summary: Emacs common files Group: Applications/Editors PreReq: /sbin/install-info, dev, %{_sbindir}/alternatives -%if ! %{emacs21} Obsoletes: emacs-leim -%endif %description common Emacs is a powerful, customizable, self-documenting, modeless text @@ -179,138 +88,31 @@ You need to install emacs-el only if you intend to modify any of the Emacs packages or see some elisp examples. -%if %{emacs21} -%package leim -Summary: Emacs Lisp files for input methods for international characters. -Group: Applications/Editors - -%description leim -The emacs-leim package contains Emacs Lisp code for input methods for -various international character scripts. Basically, the Lisp code -provided by this package describes the consecutive keystrokes that a -user must press in order to input a particular character in a -non-English character set. Input methods for many different character -sets are included in this package. -%endif - %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 -%else -%setup -q -a 33 -%endif - -%patch2 -p1 -b .2-s390 -%if %{emacs21} -%patch3 -p1 -b .3-hammer -%patch4 -p1 -b .4-sticky -%endif -%patch5 -p1 -b .5-s390x -%if %{emacs21} -# block input in `allocate_vectorlike' (alloc.c) -%patch7 -p1 -b .7-block -%patch9 -p1 -b .9-ppc64 -%patch10 -p1 -b .10-multibyte -%endif -%patch11 -p1 -b .11-rpath -%patch14 -p1 -b .14-StatusArea -%if %{emacs21} -%patch15 -p0 -b .15-modifier -%patch17 -p1 -b .17-getcwd -%patch19 -p1 -b .19-fedora -%patch20 -p1 -b .20-bzero -%patch21 -p1 -b .21-leak -%patch22 -p1 -b .22-iso2022 -%patch23 -p1 -b .23-batch -%patch24 -p1 -%patch25 -p1 -b .25-scroll-margin -%patch26 -p1 -b .26-xmodifier -%patch27 -p1 -b .27-14.21 -%patch34 -p1 -b .34-ppc64-unexelf -%patch35 -p1 -b .35-multibyte-command-line -%endif - -# patches 2 and 3 touch configure.in -%if %{emacs21} -autoconf-2.13 -%else -autoconf -%endif - -## Lisp patches -%if %{emacs21} -# remove game we can't ship -%patch106 -p1 -rm lisp/finder-inf.el lisp/play/tetris.el* -# make browse-url default to htmlview not netscape -%patch108 -p1 -# fix names of aspell language dictionaries -%patch112 -p1 -# fix running gdb with libtool -%patch113 -p1 -# run latex-mode-hook -%patch118 -p1 -# battery acpi -%patch119 -p1 -# pcl-cvs format -%patch120 -p1 -# .pyc completion -%patch121 -p1 -# save-buffer -%patch122 -p1 -# smtpmail update -%patch123 -p1 -%endif -# locale.alias path -%patch124 -p1 -# sort-columns posix key defs -%patch125 -p1 -# German spell-checking for UTF-8 encoded buffers -%patch126 -p1 +%setup -q # install rest of site-lisp files ( cd site-lisp - cp %SOURCE7 %SOURCE8 %SOURCE13 %SOURCE20 %SOURCE21 %SOURCE31 . + cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE13 %SOURCE20 . # xemacs compat patch for rpm-spec-mode - patch < %SOURCE18 + patch < %SOURCE12 # fix po-auto-replace-revision-date nil - patch < %SOURCE23 - tar zxvf %SOURCE11 -) - -%if %{emacs21} -# add rfc1345 input method (default for UTF-8 lang env) -cp -pi %SOURCE27 leim/quail -%endif - -# install newer cc-mode -cp -p cc-mode-%{cc_mode_ver}/*.el lisp/progmodes + patch < %SOURCE16 ) %build -export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" +export CFLAGS="-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 $RPM_OPT_FLAGS" # stack-protector causes crashing on i386 (#174730) %ifarch %{ix86} CFLAGS=`echo $CFLAGS | sed -e "s/ -fstack-protector//"` %endif -%configure --with-pop --with-sound \ -%if ! %{emacs21} - --with-gtk --without-xim -%endif +%configure --with-pop --with-sound --with-gtk --without-xim -%if ! %{emacs21} %__make bootstrap -%endif -%{setarch} %__make %{?_smp_mflags} +%__make %{?_smp_mflags} # remove versioned file so that we end up with .1 suffix and only one DOC file rm src/emacs-%{version}.* @@ -319,32 +121,15 @@ %define emacsbatch ${TOPDIR}/src/emacs -batch --no-init-file --no-site-file # make sure patched lisp files get byte-compiled -%emacsbatch -f batch-byte-recompile-directory lisp %emacsbatch -f batch-byte-compile site-lisp/*.el -%if %{emacs21} -%emacsbatch -f batch-byte-compile leim/quail/rfc1345.el -%endif %__make %{?_smp_mflags} -C lisp updates -%if %{emacs21} -( cd Mule-UCS-%{muleucs_ver} - %{emacsbatch} -l mucs-comp.el ) - -( cd tramp-%{tramp_ver} - ./configure --with-emacs=${TOPDIR}/src/emacs - make lisp - make -C texi tramp ) -%endif - -( cd cc-mode-%{cc_mode_ver} - makeinfo cc-mode.texi ) - %install rm -rf $RPM_BUILD_ROOT # workaround #101818 (vm/break dumper problem) -%{setarch} make install \ +make install \ prefix=%{?buildroot:%{buildroot}}%{_prefix} \ exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \ bindir=%{?buildroot:%{buildroot}}%{_bindir} \ @@ -362,25 +147,19 @@ # suffix binaries with -x mv $RPM_BUILD_ROOT%{_bindir}/emacs{,-x} mv $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}{,-x} -%if %{emacs21} -mv $RPM_BUILD_ROOT%{emacs_libexecdir}/fns-%{version}.1{,-x}.el -%endif # rebuild without X support # 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 -%{setarch} %__make %{?_smp_mflags} +%__make %{?_smp_mflags} # install the emacs without X install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox ln $RPM_BUILD_ROOT%{_bindir}/emacs{-%{version},}-nox -%if %{emacs21} -install -m 0644 lib-src/fns-%{version}.1.el $RPM_BUILD_ROOT%{emacs_libexecdir}/fns-%{version}.1-nox.el -%endif # install wrapper script -install -m 0755 %SOURCE30 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version} +install -m 0755 %SOURCE19 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version} ln -s %{_bindir}/emacs-%{version} $RPM_BUILD_ROOT%{_bindir}/emacs # make sure movemail isn't setgid @@ -389,8 +168,8 @@ %define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p %{site_lisp} -install -m 0644 %SOURCE6 %{site_lisp}/site-start.el -install -m 0644 %SOURCE26 %{site_lisp} +install -m 0644 %SOURCE4 %{site_lisp}/site-start.el +install -m 0644 %SOURCE18 %{site_lisp} mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs} mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1} @@ -398,9 +177,9 @@ # GNOME / KDE files mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop +install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m 0644 %SOURCE4 $RPM_BUILD_ROOT%{_datadir}/pixmaps/ +install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/pixmaps/ # install site-lisp files install -m 0644 site-lisp/*.el{,c} %{site_lisp} @@ -410,71 +189,35 @@ # default initialization file mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel -install -m 0644 %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs - -%if %{emacs21} -( cd Mule-UCS-%{muleucs_ver}/lisp - mkdir %{site_lisp}/Mule-UCS - cp -p *.el *.elc %{site_lisp}/Mule-UCS ) - -( cd tramp-%{tramp_ver} - %makeinstall lispdir=%{site_lisp}/tramp ) - -# elisp reference manual -tar jxf %{SOURCE10} -( cd elisp-manual-21-2.8 - install -m 644 elisp elisp-* $RPM_BUILD_ROOT%{_infodir} ) -%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} +install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs # after everything is installed, remove info dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir - -%if ! %{emacs21} rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/* -%endif # # create file lists # rm -f *-filelist {common,el}-*-files -%if %{emacs21} -rm -f *-filelist leim-*-files -%endif ( TOPDIR=${PWD} cd $RPM_BUILD_ROOT find .%{_datadir}/emacs/%{version}/lisp \ -%if ! %{emacs21} .%{_datadir}/emacs/%{version}/leim \ -%endif - .%{_datadir}/emacs/site-lisp \( -type f -not -name '*.el' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el' ! -name site-start.el \( -exec test -e '{}'c \; -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) \) + .%{_datadir}/emacs/site-lisp \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) -%if %{emacs21} - find .%{_datadir}/emacs/%{version}/leim \( -name '*.elc' -fprint $TOPDIR/leim-elc-files \) -o \( -type d -fprintf $TOPDIR/leim-dir-files "%%%%dir %%p\n" -fprintf $TOPDIR/el-leim-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint $TOPDIR/el-leim-bytecomped-files -o -fprint $TOPDIR/leim-not-comped-files \) \) -%endif ) # put the lists together after filtering ./usr to /usr sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files cat common-*-files > common-filelist cat el-*-files common-lisp-dir-files > el-filelist -%if %{emacs21} -cat leim-*-files > leim-filelist -%endif %clean rm -rf $RPM_BUILD_ROOT - -%define info_files ada-mode autotype cc-mode.info cl dired-x ebrowse ediff efaq elisp emacs eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman + +%define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman %post common for f in %{info_files}; do @@ -500,9 +243,6 @@ %dir %{_libexecdir}/emacs %dir %{_libexecdir}/emacs/%{version} %dir %{emacs_libexecdir} -%if %{emacs21} -%{emacs_libexecdir}/fns-%{version}.1-x.el -%endif %{_datadir}/applications/gnu-emacs.desktop %{_datadir}/pixmaps/emacs.png @@ -515,9 +255,6 @@ %dir %{_libexecdir}/emacs %dir %{_libexecdir}/emacs/%{version} %dir %{emacs_libexecdir} -%if %{emacs21} -%{emacs_libexecdir}/fns-%{version}.1-nox.el -%endif %files -f common-filelist common %defattr(-,root,root) @@ -531,16 +268,9 @@ %dir %{_datadir}/emacs %dir %{_datadir}/emacs/%{version} %{_datadir}/emacs/%{version}/etc -%if %{emacs21} -# quieten startup when -leim and -el aren't installed -%dir %{_datadir}/emacs/%{version}/leim -%endif %{_datadir}/emacs/%{version}/site-lisp %{_libexecdir}/emacs -%if %{emacs21} -%exclude %{emacs_libexecdir}/fns-%{version}.*.el -%endif -%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el +%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/default.el %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el %files -f el-filelist el @@ -548,19 +278,20 @@ %dir %{_datadir}/emacs %dir %{_datadir}/emacs/%{version} -%if %{emacs21} -%files -f leim-filelist leim -%defattr(-,root,root) -%dir %{_datadir}/emacs -%dir %{_datadir}/emacs/%{version} -%endif - %changelog -* Thu Nov 14 2006 Chip Coldwell - 21.4-20.1 -- don't set keyboard-coding-system when running under X (Dean Messing #205859) +* Tue Jan 23 2007 Chip Coldwell - 22.0.93-1 +- new pretest version +- removed setarch since new dumper copes with execshield +- clean up site initialization files (varions #176171) + +* Tue Jan 2 2007 Chip Coldwell - 22.0.92-1 +- new pretest version +- removed almost all emacs 21 patches from emacs 22 +- clean up spec file, +- many new BuildRequires (David Woodhouse #221250) -* Mon Nov 6 2006 Chip Coldwell - 21.4-20 -- enable multibyte strings in command line arguments (Pawel Salek #196648) +* Tue Nov 14 2006 Chip Coldwell - 22.0.90-1 +- first pretest rpm build * Mon Nov 6 2006 Chip Coldwell - 21.4-19 - BuildRequires: sendmail (Wolfgang Rupprecht #213813) @@ -707,6 +438,11 @@ - suffix version in fns-%%{version}.1.el with -x and -nox respectively - add 100 to elisp patches +* Wed Apr 6 2005 Jens Petersen - 22.0.50-0.20050406 +- update to snapshot of current cvs + - configure xim support off by default + - bootstrap snapshot + * Wed Apr 6 2005 Jens Petersen - 21.3-27 - use alternatives to switch _bindir/emacs between emacs and emacs-nox (Henning Schmiedehausen, #151067) @@ -758,6 +494,21 @@ (125413): add emacs-xim-status-under-window-125413.patch - default diff to unified format in .emacs +* Wed Nov 10 2004 Jens Petersen - 21.3.50-0.20041111 +- initial packaging of cvs emacs + - leim and elisp manual now in main tarball + - no leim subpackage anymore, so make common obsolete it + - no longer need MuleUCS, nor rfc1345.el + - buildrequire and use autoconf rather autoconf213 + - no longer need emacs-21.2-x86_64.patch, + editfns.c-Fformat-multibyte-davej.patch + - bring back game for now + - TODO: some patches still need updating + - fns.el no longer installed + - remove /var/games for now + - update filelist generation to single sweep + - update info_files list + * Thu Nov 4 2004 Jens Petersen - 21.3-18 - show emacs again in the desktop menu (132567) - require fonts-xorg-75dpi to prevent empty boxes at startup due to missing Index: sources =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 23 Jun 2005 15:39:11 -0000 1.17 +++ sources 23 Jan 2007 21:40:31 -0000 1.18 @@ -1,7 +1,2 @@ -1387a2273fe9a9a160f3a0f63e06dbac Mule-UCS-current.tar.gz -a41fdcc6436250b8935fb01af0701cf8 elisp-manual-21-2.8.tar.bz2 aad009f7cff4019aac9a466ec9b55aaf php-mode-1.1.0.tgz -0a68ea5b29bb2f081ba8dd85d37bb9bc emacs-21.4.tar.gz -32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz -0aa54204af872d69ea69498ecf1f71fd cc-mode-5.30.9.tar.gz -fc502b963658f50d2daf3ac40e0b1a95 tramp-2.0.49.tar.gz +4e768a1489e514fbb78d1a5f9c512846 emacs-22.0.93.tar.gz --- battery-acpi-support.dpatch DELETED --- --- browse-url-htmlview-84262.patch DELETED --- --- bzero-and-have-stdlib.dpatch DELETED --- --- coding-region-leak.dpatch DELETED --- --- detect-coding-iso2022.dpatch DELETED --- --- editfns.c-Fformat-multibyte-davej.patch DELETED --- --- emacs-21.2-alloc-blockinput-83600.patch DELETED --- --- emacs-21.2-menubar-games.patch DELETED --- --- emacs-21.2-s390.patch DELETED --- --- emacs-21.2-s390x.patch DELETED --- --- emacs-21.2-sticky-bit-80049.patch DELETED --- --- emacs-21.2-x86_64.patch DELETED --- --- emacs-21.3-gcc4.patch DELETED --- --- emacs-21.3-gud-libtool-fix.patch DELETED --- --- emacs-21.3-latex-mode-hook-144083.patch DELETED --- --- emacs-21.3-lisp-textmodes-ispell-languages.patch DELETED --- --- emacs-21.3-no-rpath.patch DELETED --- --- emacs-21.3-ppc64.patch DELETED --- --- emacs-21.3-xterm-modifiers-137868.patch DELETED --- --- emacs-21.4-21.4a-diff.patch DELETED --- --- emacs-xim-status-under-window-125413.patch DELETED --- --- etags-update-to-cvs.patch DELETED --- --- fix-batch-mode-signal-handling.dpatch DELETED --- --- fix-x-vs-no-x-diffs.dpatch DELETED --- --- ispell-german-utf-8.patch DELETED --- --- lang-coding-systems-init.el DELETED --- --- mule-cmd.el-X11-locale.alias-173781.patch DELETED --- --- multibyte-command-line.patch DELETED --- --- pcl-cvs-format.dpatch DELETED --- --- po-compat.el DELETED --- --- ppc64-unexelf.patch DELETED --- --- python-completion-ignored-extensions.dpatch DELETED --- --- remote-files-permissions.dpatch DELETED --- --- save-buffer.dpatch DELETED --- --- scroll-margin.dpatch DELETED --- --- smtpmail-cvs-update.patch DELETED --- --- sort-columns-posix-key-182282.patch DELETED --- --- xfree86-4.3-modifiers.dpatch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 22:13:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 17:13:06 -0500 Subject: rpms/gcc/devel gcc41-pr27416.patch, 1.2, 1.3 gcc41-pr30421.patch, NONE, 1.1 gcc41-pr30494.patch, NONE, 1.1 .cvsignore, 1.192, 1.193 gcc41.spec, 1.139, 1.140 sources, 1.194, 1.195 gcc41-libgomp-scanrtl.patch, 1.1, NONE gcc41-pr25514.patch, 1.1, NONE Message-ID: <200701232213.l0NMD6vY027227@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27178 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-pr27416.patch gcc41-pr30421.patch gcc41-pr30494.patch Removed Files: gcc41-libgomp-scanrtl.patch gcc41-pr25514.patch Log Message: 4.1.1-54 gcc41-pr27416.patch: gimplify.c | 37 +++++++++++++++++++++++++++++++++++++ testsuite/gcc.dg/gomp/pr27416.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) Index: gcc41-pr27416.patch =================================================================== RCS file: gcc41-pr27416.patch diff -N gcc41-pr27416.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gcc41-pr27416.patch 23 Jan 2007 22:13:04 -0000 1.3 @@ -0,0 +1,116 @@ +2007-01-23 Jakub Jelinek + + PR middle-end/27416 + * gimplify.c (omp_check_private): New function. + (gimplify_scan_omp_clauses): Use it for + firstprivate/lastprivate/reduction. + + * gcc.dg/gomp/pr27416.c: New test. + +--- gcc/gimplify.c.jj 2007-01-23 21:21:13.000000000 +0100 ++++ gcc/gimplify.c 2007-01-23 21:34:59.000000000 +0100 +@@ -4667,6 +4667,31 @@ omp_is_private (struct gimplify_omp_ctx + return !is_global_var (decl); + } + ++/* Return true if DECL is private within a parallel region ++ that binds to the current construct's context or in parallel ++ region's REDUCTION clause. */ ++ ++static bool ++omp_check_private (struct gimplify_omp_ctx *ctx, tree decl) ++{ ++ splay_tree_node n; ++ ++ do ++ { ++ ctx = ctx->outer_context; ++ if (ctx == NULL) ++ return !(is_global_var (decl) ++ /* References might be private, but might be shared too. */ ++ || lang_hooks.decls.omp_privatize_by_reference (decl)); ++ ++ n = splay_tree_lookup (ctx->variables, (splay_tree_key) decl); ++ if (n != NULL) ++ return (n->value & GOVD_SHARED) == 0; ++ } ++ while (!ctx->is_parallel); ++ return false; ++} ++ + /* Scan the OpenMP clauses in *LIST_P, installing mappings into a new + and previous omp contexts. */ + +@@ -4685,6 +4710,7 @@ gimplify_scan_omp_clauses (tree *list_p, + enum gimplify_status gs; + bool remove = false; + bool notice_outer = true; ++ const char *check_non_private = NULL; + unsigned int flags; + tree decl; + +@@ -4699,12 +4725,15 @@ gimplify_scan_omp_clauses (tree *list_p, + goto do_add; + case OMP_CLAUSE_FIRSTPRIVATE: + flags = GOVD_FIRSTPRIVATE | GOVD_EXPLICIT; ++ check_non_private = "firstprivate"; + goto do_add; + case OMP_CLAUSE_LASTPRIVATE: + flags = GOVD_LASTPRIVATE | GOVD_SEEN | GOVD_EXPLICIT; ++ check_non_private = "lastprivate"; + goto do_add; + case OMP_CLAUSE_REDUCTION: + flags = GOVD_REDUCTION | GOVD_SEEN | GOVD_EXPLICIT; ++ check_non_private = "reduction"; + goto do_add; + + do_add: +@@ -4754,6 +4783,14 @@ gimplify_scan_omp_clauses (tree *list_p, + do_notice: + if (outer_ctx) + omp_notice_variable (outer_ctx, decl, true); ++ if (check_non_private ++ && !in_parallel ++ && omp_check_private (ctx, decl)) ++ { ++ error ("%s variable %qs is private in outer context", ++ check_non_private, IDENTIFIER_POINTER (DECL_NAME (decl))); ++ remove = true; ++ } + break; + + case OMP_CLAUSE_IF: +--- gcc/testsuite/gcc.dg/gomp/pr27416.c.jj 2007-01-23 21:26:51.000000000 +0100 ++++ gcc/testsuite/gcc.dg/gomp/pr27416.c 2007-01-23 21:26:12.000000000 +0100 +@@ -0,0 +1,31 @@ ++/* PR middle-end/27416 */ ++/* { dg-do compile } */ ++ ++void ++foo (void) ++{ ++ int i = 0, j = 0; ++#pragma omp for firstprivate (j) /* { dg-error "is private in outer context" } */ ++ for (i = 0; i < 10; i++) ++ j++; ++} ++ ++int ++bar (void) ++{ ++ int i, j; ++#pragma omp for lastprivate (j) /* { dg-error "is private in outer context" } */ ++ for (i = 0; i < 10; i++) ++ j = i; ++ return j; ++} ++ ++int ++baz (void) ++{ ++ int i, j = 0; ++#pragma omp for reduction (+:j) /* { dg-error "is private in outer context" } */ ++ for (i = 0; i < 10; i++) ++ j++; ++ return j; ++} gcc41-pr30421.patch: omp-low.c | 31 +++++++++++++++++++++++++------ testsuite/gcc.dg/gomp/pr30421.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) --- NEW FILE gcc41-pr30421.patch --- 2007-01-18 Jakub Jelinek PR middle-end/30421 * omp-low.c (lower_omp_for_lastprivate): Add dlist argument. If lower_lastprivate_clauses emits some statements, append them to dlist rather than body_p and to body_p append an initializer. (lower_omp_for): Adjust caller. * gcc.dg/gomp/pr30421.c: New test. --- gcc/omp-low.c.jj 2007-01-17 16:07:41.000000000 +0100 +++ gcc/omp-low.c 2007-01-18 19:26:05.000000000 +0100 @@ -1601,7 +1601,7 @@ omp_reduction_init (tree clause, tree ty static void lower_rec_input_clauses (tree clauses, tree *ilist, tree *dlist, - omp_context *ctx) + omp_context *ctx) { tree_stmt_iterator diter; tree c, dtor, copyin_seq, x, args, ptr; @@ -3986,13 +3986,14 @@ lower_omp_critical (tree *stmt_p, omp_co /* A subroutine of lower_omp_for. Generate code to emit the predicate for a lastprivate clause. Given a loop control predicate of (V cond N2), we gate the clause on (!(V cond N2)). The lowered form - is appended to *BODY_P. */ + is appended to *DLIST, iterator initialization is appended to + *BODY_P. */ static void lower_omp_for_lastprivate (struct omp_for_data *fd, tree *body_p, - struct omp_context *ctx) + tree *dlist, struct omp_context *ctx) { - tree clauses, cond; + tree clauses, cond, stmts, vinit, t; enum tree_code cond_code; cond_code = fd->cond_code; @@ -4010,7 +4011,24 @@ lower_omp_for_lastprivate (struct omp_fo cond = build2 (cond_code, boolean_type_node, fd->v, fd->n2); clauses = OMP_FOR_CLAUSES (fd->for_stmt); - lower_lastprivate_clauses (clauses, cond, body_p, ctx); + stmts = NULL; + lower_lastprivate_clauses (clauses, cond, &stmts, ctx); + if (stmts != NULL) + { + append_to_statement_list (stmts, dlist); + + /* Optimize: v = 0; is usually cheaper than v = some_other_constant. */ + vinit = fd->n1; + if (cond_code == EQ_EXPR + && host_integerp (fd->n2, 0) + && ! integer_zerop (fd->n2)) + vinit = build_int_cst (TREE_TYPE (fd->v), 0); + + /* Initialize the iterator variable, so that threads that don't execute + any iterations don't execute the lastprivate clauses by accident. */ + t = build2 (GIMPLE_MODIFY_STMT, void_type_node, fd->v, vinit); + gimplify_and_add (t, body_p); + } } @@ -4066,6 +4084,8 @@ lower_omp_for (tree *stmt_p, omp_context /* Once lowered, extract the bounds and clauses. */ extract_omp_for_data (stmt, &fd); + lower_omp_for_lastprivate (&fd, body_p, &dlist, ctx); + append_to_statement_list (stmt, body_p); append_to_statement_list (OMP_FOR_BODY (stmt), body_p); @@ -4074,7 +4094,6 @@ lower_omp_for (tree *stmt_p, omp_context append_to_statement_list (t, body_p); /* After the loop, add exit clauses. */ - lower_omp_for_lastprivate (&fd, &dlist, ctx); lower_reduction_clauses (OMP_FOR_CLAUSES (stmt), body_p, ctx); append_to_statement_list (dlist, body_p); --- gcc/testsuite/gcc.dg/gomp/pr30421.c.jj 2007-01-18 19:23:24.000000000 +0100 +++ gcc/testsuite/gcc.dg/gomp/pr30421.c 2007-01-18 19:24:39.000000000 +0100 @@ -0,0 +1,39 @@ +/* PR middle-end/30421 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fopenmp -Wall" } */ + +int +foo () +{ + int a = 0, i; + +#pragma omp parallel for firstprivate(a) lastprivate(a) + for (i = 0; i < 10; i++) + a += i; + + return a; +} + +int +bar () +{ + int a = 0, i; + +#pragma omp parallel for firstprivate(a) lastprivate(a) schedule(static, 2) + for (i = 0; i < 10; i++) + a += i; + + return a; +} + +int +baz () +{ + int a = 0, i; + +#pragma omp parallel for firstprivate(a) lastprivate(a) schedule(dynamic) + for (i = 0; i < 10; i++) + a += i; + + return a; +} gcc41-pr30494.patch: gcc/gimplify.c | 7 ++- gcc/testsuite/g++.dg/gomp/pr30494.C | 30 +++++++++++++++ gcc/testsuite/gcc.dg/gomp/pr30494.c | 30 +++++++++++++++ libgomp/testsuite/libgomp.c/pr30494.c | 64 ++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 2 deletions(-) --- NEW FILE gcc41-pr30494.patch --- 2007-01-23 Jakub Jelinek PR middle-end/30494 * gimplify.c (omp_add_variable): Don't call omp_notice_variable on TYPE_SIZE_UNIT for GOVD_LOCAL VLAs. * gcc.dg/gomp/pr30494.c: New test. * g++.dg/gomp/pr30494.C: New test. * testsuite/libgomp.c/pr30494.c: New test. --- gcc/gimplify.c.jj 2007-01-17 16:10:16.000000000 +0100 +++ gcc/gimplify.c 2007-01-23 13:57:46.000000000 +0100 @@ -4505,8 +4505,11 @@ omp_add_variable (struct gimplify_omp_ct /* We're going to make use of the TYPE_SIZE_UNIT at least in the alloca statement we generate for the variable, so make sure it is available. This isn't automatically needed for the SHARED - case, since we won't be allocating local storage then. */ - else + case, since we won't be allocating local storage then. + For local variables TYPE_SIZE_UNIT might not be gimplified yet, + in this case omp_notice_variable will be called later + on when it is gimplified. */ + else if (! (flags & GOVD_LOCAL)) omp_notice_variable (ctx, TYPE_SIZE_UNIT (TREE_TYPE (decl)), true); } else if (lang_hooks.decls.omp_privatize_by_reference (decl)) --- libgomp/testsuite/libgomp.c/pr30494.c.jj 2007-01-23 13:48:05.000000000 +0100 +++ libgomp/testsuite/libgomp.c/pr30494.c 2007-01-23 13:54:30.000000000 +0100 @@ -0,0 +1,64 @@ +/* PR middle-end/30494 */ +/* { dg-do run } */ + +#include + +int errors; + +int +check (int m, int i, int *v, int *w) +{ + int j; + int n = omp_get_thread_num (); + for (j = 0; j < m; j++) + if (v[j] != j + n) + #pragma omp atomic + errors += 1; + for (j = 0; j < m * 3 + i; j++) + if (w[j] != j + 10 + n) + #pragma omp atomic + errors += 1; +} + +int +foo (int n, int m) +{ + int i; +#pragma omp for + for (i = 0; i < 6; i++) + { + int v[n], w[n * 3 + i], j; + for (j = 0; j < n; j++) + v[j] = j + omp_get_thread_num (); + for (j = 0; j < n * 3 + i; j++) + w[j] = j + 10 + omp_get_thread_num (); + check (m, i, v, w); + } + return 0; +} + +int +bar (int n, int m) +{ + int i; +#pragma omp parallel for num_threads (4) + for (i = 0; i < 6; i++) + { + int v[n], w[n * 3 + i], j; + for (j = 0; j < n; j++) + v[j] = j + omp_get_thread_num (); + for (j = 0; j < n * 3 + i; j++) + w[j] = j + 10 + omp_get_thread_num (); + check (m, i, v, w); + } + return 0; +} + +int +main (void) +{ +#pragma omp parallel num_threads (3) + foo (128, 128); + bar (256, 256); + return 0; +} --- gcc/testsuite/gcc.dg/gomp/pr30494.c.jj 2007-01-23 13:46:54.000000000 +0100 +++ gcc/testsuite/gcc.dg/gomp/pr30494.c 2007-01-23 13:46:25.000000000 +0100 @@ -0,0 +1,30 @@ +/* PR middle-end/30494 */ +/* { dg-do compile } */ + +int +foo (int n) +{ + int i; +#pragma omp for + for (i = 0; i < 6; i++) + { + int v[n], w[n * 3 + i]; + v[0] = 1; + w[0] = 2; + } + return 0; +} + +int +bar (int n) +{ + int i; +#pragma parallel omp for + for (i = 0; i < 6; i++) + { + int v[n], w[n * 3 + i]; + v[0] = 1; + w[0] = 2; + } + return 0; +} --- gcc/testsuite/g++.dg/gomp/pr30494.C.jj 2007-01-23 13:46:54.000000000 +0100 +++ gcc/testsuite/g++.dg/gomp/pr30494.C 2007-01-23 13:47:26.000000000 +0100 @@ -0,0 +1,30 @@ +// PR middle-end/30494 +// { dg-do compile } + +int +foo (int n) +{ + int i; +#pragma omp for + for (i = 0; i < 6; i++) + { + int v[n], w[n * 3 + i]; + v[0] = 1; + w[0] = 2; + } + return 0; +} + +int +bar (int n) +{ + int i; +#pragma parallel omp for + for (i = 0; i < 6; i++) + { + int v[n], w[n * 3 + i]; + v[0] = 1; + w[0] = 2; + } + return 0; +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- .cvsignore 5 Jan 2007 23:27:48 -0000 1.192 +++ .cvsignore 23 Jan 2007 22:13:04 -0000 1.193 @@ -1 +1 @@ -gcc-4.1.1-20070105.tar.bz2 +gcc-4.1.1-20070123.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- gcc41.spec 8 Jan 2007 23:49:58 -0000 1.139 +++ gcc41.spec 23 Jan 2007 22:13:04 -0000 1.140 @@ -1,6 +1,6 @@ -%define DATE 20070105 +%define DATE 20070123 %define gcc_version 4.1.1 -%define gcc_release 53 +%define gcc_release 54 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %define include_gappletviewer 1 @@ -143,8 +143,9 @@ Patch34: gcc41-pr30110.patch Patch35: gcc41-pr30143.patch Patch36: gcc41-pr30045.patch -Patch37: gcc41-pr25514.patch -Patch38: gcc41-libgomp-scanrtl.patch +Patch37: gcc41-pr27416.patch +Patch38: gcc41-pr30421.patch +Patch39: gcc41-pr30494.patch %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -456,8 +457,9 @@ %patch34 -p0 -b .pr30110~ %patch35 -p0 -b .pr30143~ %patch36 -p0 -b .pr30045~ -%patch37 -p0 -b .pr25514~ -%patch38 -p0 -b .libgomp-scanrtl~ +%patch37 -p0 -b .pr27416~ +%patch38 -p0 -b .pr30421~ +%patch39 -p0 -b .pr30494~ sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1529,6 +1531,12 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Tue Jan 23 2007 Jakub Jelinek 4.1.1-54 +- update from gcc-4_1-branch (-r120507:121069) + - PRs c++/28999, libgfortran/30435, objc/30479, rtl-optimization/29329, + target/30173, testsuite/12325 +- OpenMP fixes (PRs middle-end/27416, middle-end/30421, middle-end/30494) + * Tue Jan 9 2007 Jakub Jelinek 4.1.1-53 - fix libgomp testsuite driver (Ulrich Weigand) - combiner fixes (Richard Sandiford, PR rtl-optimization/25514, Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- sources 5 Jan 2007 23:27:48 -0000 1.194 +++ sources 23 Jan 2007 22:13:04 -0000 1.195 @@ -1 +1 @@ -4b9c1eb1d83c309010044b827b8c3e45 gcc-4.1.1-20070105.tar.bz2 +408aa3953830b61f30432831a5195db5 gcc-4.1.1-20070123.tar.bz2 --- gcc41-libgomp-scanrtl.patch DELETED --- --- gcc41-pr25514.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 23 22:31:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 17:31:13 -0500 Subject: rpms/emacs/devel emacs.spec,1.80,1.81 Message-ID: <200701232231.l0NMVDhm029220@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29188 Modified Files: emacs.spec Log Message: bump the NVR Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- emacs.spec 23 Jan 2007 21:40:31 -0000 1.80 +++ emacs.spec 23 Jan 2007 22:31:10 -0000 1.81 @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 22.0.93 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors From fedora-cvs-commits at redhat.com Tue Jan 23 22:42:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 17:42:33 -0500 Subject: rpms/gcc/devel gcc41-pr30421.patch,1.1,1.2 Message-ID: <200701232242.l0NMgXRo004763@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4734 Modified Files: gcc41-pr30421.patch Log Message: 4.1.1-54 gcc41-pr30421.patch: omp-low.c | 31 +++++++++++++++++++++++++------ testsuite/gcc.dg/gomp/pr30421.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) Index: gcc41-pr30421.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr30421.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr30421.patch 23 Jan 2007 22:13:04 -0000 1.1 +++ gcc41-pr30421.patch 23 Jan 2007 22:42:30 -0000 1.2 @@ -57,7 +57,7 @@ + + /* Initialize the iterator variable, so that threads that don't execute + any iterations don't execute the lastprivate clauses by accident. */ -+ t = build2 (GIMPLE_MODIFY_STMT, void_type_node, fd->v, vinit); ++ t = build2 (MODIFY_EXPR, TREE_TYPE (fd->v), fd->v, vinit); + gimplify_and_add (t, body_p); + } } From fedora-cvs-commits at redhat.com Tue Jan 23 22:50:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 17:50:31 -0500 Subject: rpms/rhpxl/devel .cvsignore, 1.43, 1.44 rhpxl.spec, 1.52, 1.53 sources, 1.49, 1.50 Message-ID: <200701232250.l0NMoVU9030893@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/rhpxl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30845/devel Modified Files: .cvsignore rhpxl.spec sources Log Message: auto-import rhpxl-0.42-1 on branch devel from rhpxl-0.42-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 29 Nov 2006 16:25:17 -0000 1.43 +++ .cvsignore 23 Jan 2007 22:50:29 -0000 1.44 @@ -1,2 +1 @@ -rhpxl-0.40.tar.gz -rhpxl-0.41.tar.gz +rhpxl-0.42.tar.gz Index: rhpxl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- rhpxl.spec 7 Dec 2006 16:42:01 -0000 1.52 +++ rhpxl.spec 23 Jan 2007 22:50:29 -0000 1.53 @@ -2,8 +2,8 @@ Summary: Python library for configuring and running X. Name: rhpxl -Version: 0.41 -Release: 2%{?dist} +Version: 0.42 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: System Environment/Libraries @@ -42,8 +42,9 @@ %{_sbindir}/ddcprobe %changelog -* Thu Dec 7 2006 Jeremy Katz - 0.41-2 -- rebuild against python 2.5 +* Tue Jan 23 2007 Jeremy Katz - 0.42-1 +- Don't pass a potentially bogus fontpath to the X server. It starts fine + without it and we don't have it on installs from live cd * Wed Nov 29 2006 Chris Lumens 0.41-1 - Trust kudzu to give us the right video driver instead of using Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 29 Nov 2006 20:35:46 -0000 1.49 +++ sources 23 Jan 2007 22:50:29 -0000 1.50 @@ -1 +1 @@ -b5e8d04bda86c62160f178d7db2e2e0e rhpxl-0.41.tar.gz +98745114ff482b97910313bb1617f2f7 rhpxl-0.42.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 23 23:07:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 18:07:03 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.366, 1.367 anaconda.spec, 1.492, 1.493 sources, 1.490, 1.491 Message-ID: <200701232307.l0NN731M010629@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10513/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.15-1 on branch devel from anaconda-11.2.0.15-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- .cvsignore 22 Jan 2007 23:10:08 -0000 1.366 +++ .cvsignore 23 Jan 2007 23:07:01 -0000 1.367 @@ -1 +1 @@ -anaconda-11.2.0.14.tar.bz2 +anaconda-11.2.0.15.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.492 retrieving revision 1.493 diff -u -r1.492 -r1.493 --- anaconda.spec 22 Jan 2007 23:10:08 -0000 1.492 +++ anaconda.spec 23 Jan 2007 23:07:01 -0000 1.493 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.14 +Version: 11.2.0.15 Release: 1 License: GPL Summary: Graphical system installer @@ -27,9 +27,13 @@ Requires: python-pyblock >= 0.24-1 Requires: libbdevid >= 5.1.2-1, libbdevid-python Requires: audit-libs -Requires: system-config-keyboard +Requires: libuser +Requires: authconfig +Requires: gnome-python2-gtkhtml2 +Requires: system-config-securitylevel %ifnarch s390 s390x ppc64 Requires: rhpxl >= 0.25 +Requires: system-config-keyboard %endif Obsoletes: anaconda-images <= 10 Url: http://fedora.redhat.com/projects/anaconda-installer/ @@ -54,6 +58,7 @@ Requires: openssh %endif Requires: /usr/bin/strip, xorg-x11-font-utils, netpbm-progs +Requires: busybox-anaconda %description runtime The anaconda-runtime package contains parts of the installation system which @@ -104,6 +109,14 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Jan 23 2007 Jeremy Katz - 11.2.0.15-1 +- Remove @everything parsing as promised +- Package requirement fixes +- Fix kickstart traceback (clumens, #223903) +- Add more icons +- Don't be too aggressive remaking device nodes +- Fix rescue mode + * Mon Jan 22 2007 Jeremy Katz - 11.2.0.14-1 - Fix shell on tty2 with libncurses in /lib - Use echo icon theme Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.490 retrieving revision 1.491 diff -u -r1.490 -r1.491 --- sources 22 Jan 2007 23:10:08 -0000 1.490 +++ sources 23 Jan 2007 23:07:01 -0000 1.491 @@ -1 +1 @@ -f3462139bdb4255ba1e9df359aa7e341 anaconda-11.2.0.14.tar.bz2 +3910c1859c140c72a32972b034f58ba9 anaconda-11.2.0.15.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 23:12:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 18:12:01 -0500 Subject: rpms/docbook-style-xsl/devel .cvsignore, 1.16, 1.17 docbook-style-xsl.Makefile, 1.4, 1.5 docbook-style-xsl.spec, 1.30, 1.31 sources, 1.16, 1.17 Message-ID: <200701232312.l0NNC1mt014354@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14317 Modified Files: .cvsignore docbook-style-xsl.Makefile docbook-style-xsl.spec sources Log Message: * Tue Jan 23 2007 Tim Waugh 1.72.0-1 - 1.72.0. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Jan 2007 17:16:13 -0000 1.16 +++ .cvsignore 23 Jan 2007 23:11:59 -0000 1.17 @@ -10,3 +10,5 @@ docbook-xsl-doc-1.69.1.tar.bz2 docbook-xsl-1.71.1.tar.bz2 docbook-xsl-doc-1.71.1.tar.bz2 +docbook-xsl-1.72.0.tar.gz +docbook-xsl-doc-1.72.0.tar.bz2 Index: docbook-style-xsl.Makefile =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- docbook-style-xsl.Makefile 19 Jan 2007 21:47:31 -0000 1.4 +++ docbook-style-xsl.Makefile 23 Jan 2007 23:11:59 -0000 1.5 @@ -6,7 +6,7 @@ install: install-xsl install-img install-extensions install-misc install-xsl: - mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling,highlighting,wordml} + mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling,highlighting,roundtrip} cp common/*.dtd $(DESTDIR)/common cp common/*.xml $(DESTDIR)/common cp common/*.xsl $(DESTDIR)/common @@ -23,8 +23,8 @@ cp profiling/*.xsl $(DESTDIR)/profiling cp highlighting/*.xml $(DESTDIR)/highlighting cp highlighting/*.xsl $(DESTDIR)/highlighting - cp wordml/*.xml $(DESTDIR)/wordml - cp wordml/*.xsl $(DESTDIR)/wordml + cp roundtrip/*.xml $(DESTDIR)/roundtrip + cp roundtrip/*.xsl $(DESTDIR)/roundtrip install-img: mkdir -p $(DESTDIR)/images/callouts Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- docbook-style-xsl.spec 19 Jan 2007 21:47:31 -0000 1.30 +++ docbook-style-xsl.spec 23 Jan 2007 23:11:59 -0000 1.31 @@ -1,6 +1,6 @@ Name: docbook-style-xsl -Version: 1.71.1 -Release: 2%{?dist} +Version: 1.72.0 +Release: 1%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version} BuildArch: noarch -Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2 +Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz Source1: %{name}.Makefile Source2: http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2 @@ -97,6 +97,9 @@ %changelog +* Tue Jan 23 2007 Tim Waugh 1.72.0-1 +- 1.72.0. + * Fri Jan 19 2007 Tomas Mraz 1.71.1-2 - Add new wordml and especially highlighting (which is referenced from html) subdirs to Makefile. Index: sources =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Jan 2007 17:16:13 -0000 1.16 +++ sources 23 Jan 2007 23:11:59 -0000 1.17 @@ -1,2 +1,2 @@ -6a269abc854ae949b2cfd6377bc17fde docbook-xsl-1.71.1.tar.bz2 -f7844a751a4612c56acddc0790fbc501 docbook-xsl-doc-1.71.1.tar.bz2 +3493dd2e82e0da3d3cab58d5263c634c docbook-xsl-1.72.0.tar.gz +f6b71552c992f16f477f0513f569985c docbook-xsl-doc-1.72.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 23 23:24:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 18:24:42 -0500 Subject: rpms/emacspeak/devel emacspeak-tcl-pkgreq-tclx.patch, 1.2, 1.3 emacspeak.spec, 1.17, 1.18 Message-ID: <200701232324.l0NNOgte011331@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacspeak/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11103 Modified Files: emacspeak-tcl-pkgreq-tclx.patch emacspeak.spec Log Message: fix emacspeak-tcl-pkgreq-tclx.patch for ssh-outloud emacspeak-tcl-pkgreq-tclx.patch: dsp-outloud | 4 +++- dtk-exp | 4 +++- dtk-mv | 4 +++- dtk-soft | 4 +++- outloud | 4 +++- speech-server | 4 +++- ssh-dtk-exp | 4 +++- ssh-outloud | 4 +++- 8 files changed, 24 insertions(+), 8 deletions(-) Index: emacspeak-tcl-pkgreq-tclx.patch =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak-tcl-pkgreq-tclx.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- emacspeak-tcl-pkgreq-tclx.patch 22 Jan 2007 00:19:25 -0000 1.2 +++ emacspeak-tcl-pkgreq-tclx.patch 23 Jan 2007 23:24:39 -0000 1.3 @@ -61,7 +61,8 @@ --- emacspeak-25/servers/ssh-outloud.1-tclx 2006-08-30 12:50:04.000000000 +1000 +++ emacspeak-25/servers/ssh-outloud 2007-01-22 10:12:40.000000000 +1000 @@ -1,4 +1,6 @@ - #!/usr/bin/tcl +-#!/usr/bin/tcl ++#!/usr/bin/tclsh +package require Tclx + #$Id$ Index: emacspeak.spec =================================================================== RCS file: /cvs/dist/rpms/emacspeak/devel/emacspeak.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- emacspeak.spec 22 Jan 2007 00:22:43 -0000 1.17 +++ emacspeak.spec 23 Jan 2007 23:24:39 -0000 1.18 @@ -1,7 +1,7 @@ Summary: emacspeak -- The Complete Audio Desktop Name: emacspeak Version: 25 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Editors Source: http://download.sourceforge.net/emacspeak/emacspeak-%{version}.tar.bz2 @@ -73,6 +73,9 @@ %{_infodir}/* %changelog +* Wed Jan 24 2007 Jens Petersen - 25-2 +- fix emacspeak-tcl-pkgreq-tclx.patch for ssh-outloud + * Mon Jan 22 2007 Jens Petersen - 25-1 - update to version 25 - update emacspeak-tcl-pkgreq-tclx.patch From fedora-cvs-commits at redhat.com Wed Jan 24 02:46:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 23 Jan 2007 21:46:04 -0500 Subject: rpms/redhat-menus/devel redhat-menus-7.8.9-cc-shell.patch, 1.1, 1.2 redhat-menus.spec, 1.67, 1.68 Message-ID: <200701240246.l0O2k4dY025380@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25238 Modified Files: redhat-menus-7.8.9-cc-shell.patch redhat-menus.spec Log Message: better categories redhat-menus-7.8.9-cc-shell.patch: preferences.menu | 112 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 76 insertions(+), 36 deletions(-) Index: redhat-menus-7.8.9-cc-shell.patch =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus-7.8.9-cc-shell.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- redhat-menus-7.8.9-cc-shell.patch 23 Jan 2007 19:55:46 -0000 1.1 +++ redhat-menus-7.8.9-cc-shell.patch 24 Jan 2007 02:45:56 -0000 1.2 @@ -1,6 +1,6 @@ ---- redhat-menus-7.8.9/menus/preferences.menu.cc-shell 2007-01-23 14:47:48.000000000 -0500 -+++ redhat-menus-7.8.9/menus/preferences.menu 2007-01-23 14:48:04.000000000 -0500 -@@ -3,78 +3,108 @@ +--- redhat-menus-7.8.9/menus/preferences.menu.cc-shell 2005-11-22 01:38:46.000000000 -0500 ++++ redhat-menus-7.8.9/menus/preferences.menu 2007-01-23 21:46:56.000000000 -0500 +@@ -3,78 +3,118 @@ Preferences @@ -19,6 +19,16 @@ + ++ ++ ++ Personal ++ Look and Feel ++ Internet and Network ++ Hardware ++ System ++ ++ ++ @@ -26,11 +36,11 @@ - X-Red-Hat-Base -+ PersonalSettings ++ X-GNOME-PersonalSettings + DesktopSettings -+ NetworkSettings ++ X-GNOME-NetworkSettings + HardwareSettings -+ SystemSettings ++ X-GNOME-SystemSettings System - Accessibility @@ -60,7 +70,7 @@ - System - - -+ PersonalSettings ++ X-GNOME-PersonalSettings - @@ -95,7 +105,7 @@ - X-Red-Hat-Base - - -+ NetworkSettings ++ X-GNOME-NetworkSettings - gnome-gconf-editor @@ -127,15 +137,15 @@ + + Settings + -+ SystemSettings ++ X-GNOME-SystemSettings + + System + + -+ PersonalSettings ++ X-GNOME-PersonalSettings + DesktopSettings + HardwareSettings -+ NetworkSettings ++ X-GNOME-NetworkSettings + + + Index: redhat-menus.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- redhat-menus.spec 23 Jan 2007 19:55:46 -0000 1.67 +++ redhat-menus.spec 24 Jan 2007 02:45:56 -0000 1.68 @@ -4,7 +4,7 @@ Summary: Configuration and data files for the desktop menus Name: redhat-menus Version: 7.8.9 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz # add the preferences.menu file from upstream, which @@ -76,6 +76,9 @@ %{_datadir}/desktop-directories/*.directory %changelog +* Tue Jan 23 2007 Matthias Clasen - 7.8.9-4 +- Once more with better categories + * Tue Jan 23 2007 Matthias Clasen - 7.8.9-3 - Update preferences.menu for the control center shell From fedora-cvs-commits at redhat.com Wed Jan 24 08:29:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 03:29:36 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1000,1.1001 Message-ID: <200701240829.l0O8TaOj025694@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25680 Modified Files: openoffice.org.spec Log Message: install failed, add debugging Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1000 retrieving revision 1.1001 diff -u -r1.1000 -r1.1001 --- openoffice.org.spec 23 Jan 2007 15:45:43 -0000 1.1000 +++ openoffice.org.spec 24 Jan 2007 08:29:33 -0000 1.1001 @@ -1050,7 +1050,13 @@ #get an unpackaged raw install export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}" echo start en-US install time is `date`, diskspace: `df -h . | tail -n 1` -dmake openoffice_en-US +if ! dmake openoffice_en-US; then + echo parallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build... + echo - ---dump log start--- + cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log + echo - ---dump log end--- + dmake openoffice_en-US +fi echo end en-US install time is `date`, diskspace: `df -h . | tail -n 1` %if %{langpacks} echo start langpack install time is `date`, diskspace: `df -h . | tail -n 1` From fedora-cvs-commits at redhat.com Wed Jan 24 09:38:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 04:38:21 -0500 Subject: rpms/units/devel units.spec,1.19,1.20 Message-ID: <200701240938.l0O9cLq6004677@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/units/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25723 Modified Files: units.spec Log Message: - fixed previous fix for rhbz#220533 Index: units.spec =================================================================== RCS file: /cvs/dist/rpms/units/devel/units.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- units.spec 23 Jan 2007 13:46:43 -0000 1.19 +++ units.spec 24 Jan 2007 09:38:19 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another. Name: units Version: 1.86 -Release: 2%{?dist} +Release: 3%{?dist} Source: ftp://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz License: GPL Group: Applications/Engineering @@ -31,13 +31,13 @@ rm -rf $RPM_BUILD_ROOT %post -if [ "$1" = 0 ]; then /sbin/install-info %{_infodir}/units.info.gz %{_infodir}/dir -fi exit 0 %preun -/sbin/install-info %{_infodir}/units.info.gz --delete %{_infodir}/dir +if [ "$1" = 0 ]; then + /sbin/install-info %{_infodir}/units.info.gz --delete %{_infodir}/dir +fi exit 0 %files @@ -48,6 +48,9 @@ %{_mandir}/man1/* %changelog +* Wed Jan 24 2007 Harald Hoyer - 1.86-3 +- fixed previous fix for rhbz#220533 + * Tue Jan 23 2007 Florian La Roche - 1.86-2 - rhbz#220533 From fedora-cvs-commits at redhat.com Wed Jan 24 10:35:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 05:35:04 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.129,1.130 Message-ID: <200701241035.l0OAZ4gP020749@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20703 Modified Files: ghostscript.spec Log Message: * Wed Jan 24 2007 Tim Waugh 8.15.3-6 - Configure with --with-drivers=ALL since the advertised default is not what gets used (bug #223819). - Resolves: rhbz#223819 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- ghostscript.spec 18 Jan 2007 13:20:09 -0000 1.129 +++ ghostscript.spec 24 Jan 2007 10:35:02 -0000 1.130 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 5%{?dist} +Release: 6%{?dist} License: GPL URL: http://www.cups.org/espgs/ @@ -110,7 +110,8 @@ do FONTPATH="$FONTPATH${FONTPATH:+:}$path" done -%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" +%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \ + --with-drivers=ALL # Build IJS cd ijs @@ -246,6 +247,10 @@ %{_libdir}/libijs.*a %changelog +* Wed Jan 24 2007 Tim Waugh 8.15.3-6 +- Configure with --with-drivers=ALL since the advertised default is not + what gets used (bug #223819). + * Thu Jan 18 2007 Tim Waugh 8.15.3-5 - Backported gxcht 64bit crash fix from GPL trunk (bug #177763). From fedora-cvs-commits at redhat.com Wed Jan 24 10:36:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 05:36:07 -0500 Subject: rpms/ghostscript/FC-6 ghostscript.spec,1.129,1.130 Message-ID: <200701241036.l0OAa7Jp021399@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21350 Modified Files: ghostscript.spec Log Message: * Wed Jan 24 2007 Tim Waugh 8.15.3-4 - Configure with --with-drivers=ALL since the advertised default is not what gets used (bug #223819). Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/FC-6/ghostscript.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- ghostscript.spec 18 Jan 2007 13:19:43 -0000 1.129 +++ ghostscript.spec 24 Jan 2007 10:36:00 -0000 1.130 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.cups.org/espgs/ @@ -110,7 +110,8 @@ do FONTPATH="$FONTPATH${FONTPATH:+:}$path" done -%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" +%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \ + --with-drivers=ALL # Build IJS cd ijs @@ -246,6 +247,10 @@ %{_libdir}/libijs.*a %changelog +* Wed Jan 24 2007 Tim Waugh 8.15.3-4 +- Configure with --with-drivers=ALL since the advertised default is not + what gets used (bug #223819). + * Thu Jan 18 2007 Tim Waugh 8.15.3-3 - Backported gxcht 64bit crash fix from GPL trunk (bug #177763). From fedora-cvs-commits at redhat.com Wed Jan 24 10:36:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 05:36:41 -0500 Subject: rpms/telnet/FC-5 telnet.spec,1.23,1.24 Message-ID: <200701241036.l0OAafbS021875@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/telnet/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21788 Modified Files: telnet.spec Log Message: - merged in changes for FC-5 Index: telnet.spec =================================================================== RCS file: /cvs/dist/rpms/telnet/FC-5/telnet.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- telnet.spec 11 Feb 2006 05:49:16 -0000 1.23 +++ telnet.spec 24 Jan 2007 10:36:39 -0000 1.24 @@ -1,7 +1,7 @@ Summary: The client program for the telnet remote login protocol. Name: telnet Version: 0.17 -Release: 35.2.1 +Release: 35.3%{?dist} Epoch: 1 License: BSD Group: Applications/Internet @@ -22,6 +22,9 @@ Patch14: telnet-0.17-cleanup_race.patch Patch15: telnetd-0.17-pty_read.patch Patch16: telnet-0.17-CAN-2005-468_469.patch +Patch17: telnet-0.17-linemode.patch +Patch18: telnet-gethostbyname.patch +Patch19: netkit-telnet-0.17-ipv6.diff BuildPreReq: ncurses-devel Buildroot: %{_tmppath}/%{name}-root @@ -60,6 +63,9 @@ %patch14 -p1 -b .cleanup_race %patch15 -p0 -b .pty_read %patch16 -p1 -b .CAN-2005-468_469 +#%patch17 -p1 -b .linemode +%patch18 -p1 -b .gethost +%patch19 -p1 -b .gethost %build export OPT_FLAGS="$RPM_OPT_FLAGS -g" @@ -125,6 +131,19 @@ %{_mandir}/man8/telnetd.8* %changelog +* Wed Jan 24 2007 Harald Hoyer - 1:0.17-35.3 +- merged in changes for FC-5 + +* Fri Jul 14 2006 Harald Hoyer - 1:0.17-37 +- added netkit-telnet-0.17-ipv6.diff from Marek Gr??c, + which adds IPv6 support to telnetd + +* Wed Jul 12 2006 Jesse Keating - 1:0.17-36.1 +- rebuild + +* Mon May 08 2006 Harald Hoyer - 1:0.17-36 +- patch to remove gethostbyname() (bug #190296) + * Fri Feb 10 2006 Jesse Keating - 1:0.17-35.2.1 - bump again for double-long bug on ppc(64) @@ -233,7 +252,7 @@ * Sat Dec 30 2000 Nalin Dahyabhai - mark the xinetd config file as config(noreplace) -* Fri Dec 01 2000 Trond Eivind Glomsr?d +* Fri Dec 01 2000 Trond Eivind Glomsr??d - make sure the server is turned off by default * Tue Jul 18 2000 Bill Nottingham @@ -246,10 +265,10 @@ - FHS packaging. - update to 0.17-pre20000412. -* Tue May 23 2000 Trond Eivind Glomsr?d +* Tue May 23 2000 Trond Eivind Glomsr??d - moved the xinet entry to the server -* Mon May 22 2000 Trond Eivind Glomsr?d +* Mon May 22 2000 Trond Eivind Glomsr??d - add an entry to /etc/xinetd.d * Tue May 16 2000 Jeff Johnson From fedora-cvs-commits at redhat.com Wed Jan 24 10:38:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 05:38:10 -0500 Subject: rpms/telnet/FC-5 netkit-telnet-0.17-ipv6.diff, NONE, 1.1 telnet-0.17-linemode.patch, NONE, 1.1 telnet-gethostbyname.patch, NONE, 1.1 Message-ID: <200701241038.l0OAcAlW022981@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/telnet/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22910 Added Files: netkit-telnet-0.17-ipv6.diff telnet-0.17-linemode.patch telnet-gethostbyname.patch Log Message: - merged in changes for FC-5 netkit-telnet-0.17-ipv6.diff: telnetd.c | 177 +++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 108 insertions(+), 69 deletions(-) --- NEW FILE netkit-telnet-0.17-ipv6.diff --- diff -uNr netkit-telnet-0.17/telnetd/telnetd.c netkit-telnet-0.17.ipv6/telnetd/telnetd.c --- netkit-telnet-0.17/telnetd/telnetd.c 2006-07-13 08:37:18.000000000 +0200 +++ netkit-telnet-0.17.ipv6/telnetd/telnetd.c 2006-07-14 08:36:11.000000000 +0200 @@ -49,6 +49,7 @@ /* #include */ /* Don't think this is used at all here */ #include #include +#include #include "telnetd.h" #include "pathnames.h" #include "setproctitle.h" @@ -68,7 +69,7 @@ #define HAS_IPPROTO_IP #endif -static void doit(struct sockaddr_in *who); +static void doit(struct sockaddr *who, socklen_t wholen); static int terminaltypeok(const char *s); /* @@ -90,7 +91,7 @@ int main(int argc, char *argv[], char *env[]) { - struct sockaddr_in from; + struct sockaddr from; int on = 1; socklen_t fromlen; register int ch; @@ -248,64 +249,89 @@ argc -= optind; argv += optind; - if (debug) { - int s, ns; - socklen_t foo; - struct servent *sp; - struct sockaddr_in sn; + int s = 0; - memset(&sn, 0, sizeof(sn)); - sn.sin_family = AF_INET; + if (debug) { + struct addrinfo *ai; + unsigned int nfds = 0; + struct pollfd fds[2]; if (argc > 1) { - usage(); - /* NOTREACHED */ - } else if (argc == 1) { - if ((sp = getservbyname(*argv, "tcp"))!=NULL) { - sn.sin_port = sp->s_port; - } - else { - int pt = atoi(*argv); - if (pt <= 0) { - fprintf(stderr, "telnetd: %s: bad port number\n", - *argv); - usage(); - /* NOTREACHED */ - } - sn.sin_port = htons(pt); - } + usage(); + /* NOTREACHED */ } else { - sp = getservbyname("telnet", "tcp"); - if (sp == 0) { - fprintf(stderr, "telnetd: tcp/telnet: unknown service\n"); - exit(1); - } - sn.sin_port = sp->s_port; - } + struct addrinfo hints; + + memset (&hints, '\0', sizeof (hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG | AI_PASSIVE; + hints.ai_protocol = IPPROTO_TCP; + + if (argc == 0) { + if (getaddrinfo(NULL, "telnet", &hints, &ai) != 0) { + fprintf(stderr, "telnetd: %s: bad port number\n", *argv); + usage(); + /* NOTREACHED */ + } + } else { + if (getaddrinfo(NULL, *argv, &hints, &ai) != 0) { + fprintf(stderr, "telnetd: %s: bad port number\n", *argv); + usage(); + /* NOTREACHED */ + } + } + } - s = socket(AF_INET, SOCK_STREAM, 0); - if (s < 0) { + struct addrinfo *runp; + int b = 0; + for (runp = ai; ((runp != NULL) && (nfds < sizeof (fds) / sizeof (fds[0]))); runp = runp->ai_next) { + fds[nfds].fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol); + if (fds[nfds].fd < 0) { perror("telnetd: socket");; - exit(1); + exit(1); + } + fds[nfds].events = POLLIN; + (void) setsockopt(fds[nfds].fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); + + if (bind(fds[nfds].fd, runp->ai_addr, runp->ai_addrlen) != 0) { + // Unable to bind to given port. One of the reason can be + // that we can't bind to both IPv4 and IPv6 + break; + } else { + b++; + } + + if (listen(fds[nfds].fd, 1) < 0) { + perror("listen"); + exit(1); + } + nfds++; } - (void) setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - if (bind(s, (struct sockaddr *)&sn, sizeof(sn)) < 0) { - perror("bind"); - exit(1); - } - if (listen(s, 1) < 0) { - perror("listen"); - exit(1); + freeaddrinfo(ai); + + if (b == 0) { + perror("bind"); + exit(1); } - foo = sizeof(sn); - ns = accept(s, (struct sockaddr *)&sn, &foo); - if (ns < 0) { - perror("accept"); - exit(1); + + int n = poll (fds, nfds, -1); + if (n > 0) { + unsigned int i; + for (i = 0; i < nfds; i++) { + if (fds[i].revents & POLLIN) { + struct sockaddr_storage rem; + socklen_t remlen = sizeof(rem); + int fd = accept(fds[i].fd, (struct sockaddr *) &rem, &remlen); + + if (fd < 0) { + perror("accept"); + exit(1); + } + + s = fd; + } + } } - (void) dup2(ns, 0); - (void) close(ns); - (void) close(s); } else if (argc > 0) { usage(); /* NOT REACHED */ @@ -313,13 +339,13 @@ openlog("telnetd", LOG_PID | LOG_ODELAY, LOG_DAEMON); fromlen = sizeof (from); - if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) { + if (getpeername(s, &from, &fromlen) < 0) { fprintf(stderr, "%s: ", progname); perror("getpeername"); _exit(1); } if (keepalive && - setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) { + setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof (on)) < 0) { syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m"); } @@ -333,13 +359,13 @@ if (tos < 0) tos = 020; /* Low Delay bit */ if (tos - && (setsockopt(0, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) + && (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) && (errno != ENOPROTOOPT) ) syslog(LOG_WARNING, "setsockopt (IP_TOS): %m"); } #endif /* defined(HAS_IPPROTO_IP) && defined(IP_TOS) */ - net = 0; - doit(&from); + net = s; + doit(&from, fromlen); /* NOTREACHED */ return 0; } /* end of main */ @@ -608,10 +634,9 @@ * Get a pty, scan input lines. */ static void -doit(struct sockaddr_in *who) +doit(struct sockaddr *who, socklen_t wholen) { const char *host; - struct hostent *hp; int level; char user_name[256]; @@ -623,12 +648,18 @@ fatal(net, "All network ports in use"); /* get name of connected client */ - hp = gethostbyaddr((char *)&who->sin_addr, sizeof (struct in_addr), - who->sin_family); - if (hp) - host = hp->h_name; - else - host = inet_ntoa(who->sin_addr); + int error = -1; + char namebuf[255]; + + error = getnameinfo(who, wholen, namebuf, sizeof(namebuf), NULL, 0, 0); + + if (error) { + perror("getnameinfo: localhost"); + perror(gai_strerror(error)); + exit(1); + } + + host = namebuf; /* * We must make a copy because Kerberos is probably going @@ -649,13 +680,21 @@ /* Get local host name */ { - struct hostent *h; + struct addrinfo hints; + struct addrinfo *res; + int e; + + memset(&hints, '\0', sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; + gethostname(host_name, sizeof(host_name)); - h = gethostbyname(host_name); - if (h) { - strncpy(host_name, h->h_name, sizeof(host_name)); - host_name[sizeof(host_name)-1] = 0; + if ((e = getaddrinfo(host_name, NULL, &hints, &res)) != 0) { + perror("getaddrinfo: localhost"); + perror(gai_strerror(e)); + exit(1); } + freeaddrinfo(res); } #if defined(AUTHENTICATE) || defined(ENCRYPT) telnet-0.17-linemode.patch: Makefile | 4 ++-- defs.h | 8 ++++++++ ext.h | 4 ++-- state.c | 2 +- telnetd.c | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) --- NEW FILE telnet-0.17-linemode.patch --- --- netkit-telnet-0.17/telnetd/ext.h.linemode 2005-04-19 15:48:42.000000000 +0200 +++ netkit-telnet-0.17/telnetd/ext.h 2005-04-19 15:48:42.000000000 +0200 @@ -96,9 +96,9 @@ extern int SYNCHing; /* we are in TELNET SYNCH mode */ void _termstat(void); -void add_slc(int, int, int); +void add_slc(char func, char flag, cc_t val); void check_slc(void); -void change_slc(int, int, int); +void change_slc(char func, char flag, cc_t val); void cleanup(int); void clientstat(int, int, int); void copy_termbuf(char *, int); --- netkit-telnet-0.17/telnetd/telnetd.c.linemode 2005-04-19 15:48:42.000000000 +0200 +++ netkit-telnet-0.17/telnetd/telnetd.c 2005-04-19 15:48:42.000000000 +0200 @@ -1024,7 +1024,7 @@ if (pcc <= 0) break; pty_read_ok = 1; /* mark connection up for read */ -#ifdef LINEMODE +#if (defined LINEMODE) && (defined TIOCPKT_IOCTL) /* * If ioctl from pty, pass it through net */ --- netkit-telnet-0.17/telnetd/defs.h.linemode 2005-04-19 16:04:39.000000000 +0200 +++ netkit-telnet-0.17/telnetd/defs.h 2005-04-19 16:06:23.000000000 +0200 @@ -214,3 +214,11 @@ #define his_will_wont_is_changing my_do_dont_is_changing #define his_do_dont_is_changing my_will_wont_is_changing + +#ifndef EXTPROC +#define EXTPROC 0200000 +#endif + +#ifndef TIOCPKT_IOCTL +#define TIOCPKT_IOCTL 64 +#endif --- netkit-telnet-0.17/telnetd/state.c.linemode 2005-04-19 15:48:42.000000000 +0200 +++ netkit-telnet-0.17/telnetd/state.c 2005-04-19 15:48:42.000000000 +0200 @@ -119,8 +119,8 @@ * if CRMOD is set, which it normally is). */ if ((c == '\r') && his_state_is_wont(TELOPT_BINARY)) { -#if defined(ENCRYPT) int nc = *netip; +#if defined(ENCRYPT) if (decrypt_input) { nc = (*decrypt_input)(nc & 0xff); } --- netkit-telnet-0.17/telnetd/Makefile.linemode 1999-12-14 01:43:30.000000000 +0100 +++ netkit-telnet-0.17/telnetd/Makefile 2005-04-19 15:48:44.000000000 +0200 @@ -9,7 +9,7 @@ # take out -DPARANOID_TTYS. CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \ - -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS + -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS -DLINEMODE # LIBS += $(LIBTERMCAP) OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \ @@ -27,7 +27,7 @@ telnetd.o: ../version.h install: telnetd - install -s -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd + install -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd install -m$(MANMODE) issue.net.5 $(INSTALLROOT)$(MANDIR)/man5/ install -m$(MANMODE) telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/in.telnetd.8 ln -sf in.telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/telnetd.8 telnet-gethostbyname.patch: commands.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) --- NEW FILE telnet-gethostbyname.patch --- --- netkit-telnet-0.17/telnet/commands.c.old 2006-04-30 10:24:49.000000000 -0700 +++ netkit-telnet-0.17/telnet/commands.c 2006-04-30 10:37:10.000000000 -0700 @@ -1669,9 +1669,15 @@ /* If this is not the full name, try to get it via DNS */ if (strchr(hbuf, '.') == 0) { - struct hostent *he = gethostbyname(hbuf); - if (he != 0) - strncpy(hbuf, he->h_name, sizeof hbuf-1); + struct addrinfo hints; + struct addrinfo *res; + memset (&hints, '\0', sizeof (hints)); + hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | AI_CANONNAME; + if (getaddrinfo (hbuf, NULL, &hints, &res) == 0) { + if (res->ai_canonname != NULL) + strncpy(hbuf, res->ai_canonname, sizeof hbuf-1); + freeaddrinfo (res); + } hbuf[sizeof hbuf-1] = '\0'; } @@ -2832,17 +2838,15 @@ if (!c) cp2 = 0; - if ((tmp = inet_addr(cp)) != -1) { - sin_addr.s_addr = tmp; - } else if ((host = gethostbyname(cp))) { -#if defined(h_addr) - memmove((caddr_t)&sin_addr, - host->h_addr_list[0], - sizeof(sin_addr)); -#else - memmove((caddr_t)&sin_addr, host->h_addr, - sizeof(sin_addr)); -#endif + struct addrinfo hints; + memset (&hints, '\0', sizeof (hints)); + // XXX The code here seems to allow only IPv4 addresses. + hints.ai_family = AF_INET; + hints.ai_flags = AI_ADDRCONFIG; + struct addrinfo *aires; + if (getaddrinfo (cp, NULL, &hints, &aires) == 0) { + sin_addr = ((struct sockaddr_in *) aires->ai_addr)->sin_addr; + freeaddrinfo (aires); } else { *cpp = cp; return(0); From fedora-cvs-commits at redhat.com Wed Jan 24 10:42:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 05:42:45 -0500 Subject: rpms/arts/devel .cvsignore, 1.27, 1.28 arts.spec, 1.65, 1.66 sources, 1.30, 1.31 Message-ID: <200701241042.l0OAgjO1026202@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/arts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26120 Modified Files: .cvsignore arts.spec sources Log Message: 1.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/arts/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 8 Aug 2006 10:00:47 -0000 1.27 +++ .cvsignore 24 Jan 2007 10:42:43 -0000 1.28 @@ -11,3 +11,4 @@ arts-1.5.2.tar.bz2 arts-1.5.3.tar.bz2 arts-1.5.4.tar.bz2 +arts-1.5.6.tar.bz2 Index: arts.spec =================================================================== RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- arts.spec 14 Nov 2006 14:08:14 -0000 1.65 +++ arts.spec 24 Jan 2007 10:42:43 -0000 1.66 @@ -7,7 +7,7 @@ %define make_cvs 1 -Version: 1.5.5 +Version: 1.5.6 Release: 1%{?dist} Summary: aRts (analog realtime synthesizer) - the KDE sound system Name: arts @@ -163,6 +163,9 @@ %{_libdir}/lib*.so %changelog +* Wed Jan 24 2007 Than Ngo - 6:1.5.6-1.fc7 +- 1.5.6 + * Tue Nov 14 2006 Than Ngo - 6:1.5.5-1.fc7 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/arts/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 14 Nov 2006 14:08:14 -0000 1.30 +++ sources 24 Jan 2007 10:42:43 -0000 1.31 @@ -1 +1 @@ -3b0aa1ee08c6ef2aefd8d2d88d1ec146 arts-1.5.5.tar.bz2 +e986393a5827499bbad04a00b797add0 arts-1.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 11:34:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 06:34:34 -0500 Subject: rpms/words/devel words.spec,1.10,1.11 Message-ID: <200701241134.l0OBYYUr005932@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/words/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5881 Modified Files: words.spec Log Message: * Wed Jan 24 2007 Karel Zak - 3.0-10 - fix regex that removes possessives ('s) Index: words.spec =================================================================== RCS file: /cvs/dist/rpms/words/devel/words.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- words.spec 19 Jul 2006 22:33:07 -0000 1.10 +++ words.spec 24 Jan 2007 11:34:31 -0000 1.11 @@ -1,7 +1,7 @@ Summary: A dictionary of English words for the /usr/share/dict directory. Name: words Version: 3.0 -Release: 9 +Release: 10%{?dist} License: public domain Group: System Environment/Libraries Source: http://www.dcs.shef.ac.uk/research/ilash/Moby/mwords.tar.Z @@ -22,7 +22,7 @@ %build cd mwords dos2unix -o *; chmod a+r * -cat [1-9]*.??? | fgrep -v \'s | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby +cat [1-9]*.??? | egrep -v "'s$" | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby cat <license.txt On June 1, 1996 Grady Ward announced that the fruits of @@ -60,6 +60,9 @@ /usr/share/dict/words %changelog +* Wed Jan 24 2007 Karel Zak - 3.0-10 +- fix regex that removes possessives ('s) + * Wed Jul 19 2006 Karel Zak - 3.0-9 - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 11:38:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 06:38:10 -0500 Subject: rpms/words/devel words.spec,1.11,1.12 Message-ID: <200701241138.l0OBcAAw008376@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/words/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8340 Modified Files: words.spec Log Message: make it more readable Index: words.spec =================================================================== RCS file: /cvs/dist/rpms/words/devel/words.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- words.spec 24 Jan 2007 11:34:31 -0000 1.11 +++ words.spec 24 Jan 2007 11:38:08 -0000 1.12 @@ -22,7 +22,7 @@ %build cd mwords dos2unix -o *; chmod a+r * -cat [1-9]*.??? | egrep -v "'s$" | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby +cat [1-9]*.??? | egrep --invert-match "'s$" | egrep "^[[:alnum:]'&!,./-]+$" | sort --ignore-case --dictionary-order | uniq > moby cat <license.txt On June 1, 1996 Grady Ward announced that the fruits of From fedora-cvs-commits at redhat.com Wed Jan 24 11:44:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 06:44:53 -0500 Subject: rpms/pam/devel Linux-PAM-0.99.7.1.tar.bz2.sign, NONE, 1.1 pam-0.99.7.0-namespace-unmnt-override.patch, NONE, 1.1 pam.spec, 1.141, 1.142 Linux-PAM-0.99.7.0.tar.bz2.sign, 1.1, NONE pam-0.99.7.0-selinux-build.patch, 1.1, NONE pam-0.99.7.0-unix-minsalt.patch, 1.1, NONE Message-ID: <200701241144.l0OBirFE004625@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4605 Modified Files: pam.spec Added Files: Linux-PAM-0.99.7.1.tar.bz2.sign pam-0.99.7.0-namespace-unmnt-override.patch Removed Files: Linux-PAM-0.99.7.0.tar.bz2.sign pam-0.99.7.0-selinux-build.patch pam-0.99.7.0-unix-minsalt.patch Log Message: * Wed Jan 24 2007 Tomas Mraz 0.99.7.1-1 - upgrade to new upstream version resolving CVE-2007-0003 - pam_namespace: unmount poly dir for override users --- NEW FILE Linux-PAM-0.99.7.1.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFtgDAyGugalF9Dw4RArOyAJ0duc7/WqnlX1+LfjYsUOQsJhICOgCfdWDb aMzAtzhCqvu+IxJTFwXx/kk= =I+NT -----END PGP SIGNATURE----- pam-0.99.7.0-namespace-unmnt-override.patch: pam_namespace.c | 60 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 45 insertions(+), 15 deletions(-) --- NEW FILE pam-0.99.7.0-namespace-unmnt-override.patch --- --- Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c.unmnt-override 2007-01-22 14:06:31.000000000 +0100 +++ Linux-PAM-0.99.7.0/modules/pam_namespace/pam_namespace.c 2007-01-23 16:41:57.000000000 +0100 @@ -417,17 +417,18 @@ * uids for the polyinstantiated directory, polyinstantiation is not * performed for that user for that directory. */ -static int ns_override(struct polydir_s *polyptr, struct instance_data *idata) +static int ns_override(struct polydir_s *polyptr, struct instance_data *idata, + uid_t uid) { unsigned int i; if (idata->flags & PAMNS_DEBUG) pam_syslog(idata->pamh, LOG_DEBUG, "Checking for ns override in dir %s for uid %d", - polyptr->dir, idata->uid); + polyptr->dir, uid); for (i = 0; i < polyptr->num_uids; i++) { - if (idata->uid == polyptr->uid[i]) { + if (uid == polyptr->uid[i]) { return 1; } } @@ -1013,21 +1014,46 @@ int retval = 0, need_poly = 0, changing_dir = 0; char *cptr, *fptr, poly_parent[PATH_MAX]; struct polydir_s *pptr; + uid_t req_uid; + const void *ruser_name; + struct passwd *pwd; if (idata->flags & PAMNS_DEBUG) pam_syslog(idata->pamh, LOG_DEBUG, "Set up namespace for pid %d", getpid()); + retval = pam_get_item(idata->pamh, PAM_RUSER, &ruser_name); + if (ruser_name == NULL || retval != PAM_SUCCESS) { + retval = PAM_SUCCESS; + req_uid = getuid(); + } else { + pwd = pam_modutil_getpwnam(idata->pamh, ruser_name); + if (pwd != NULL) { + req_uid = pwd->pw_uid; + } else { + req_uid = getuid(); + } + } + /* * Cycle through all polyinstantiated directory entries to see if * polyinstantiation is needed at all. */ for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) { - if (ns_override(pptr, idata)) { - if (idata->flags & PAMNS_DEBUG) - pam_syslog(idata->pamh, LOG_DEBUG, + if (ns_override(pptr, idata, idata->uid)) { + if (unmnt == NO_UNMNT || ns_override(pptr, idata, req_uid)) { + if (idata->flags & PAMNS_DEBUG) + pam_syslog(idata->pamh, LOG_DEBUG, "Overriding poly for user %d for dir %s", idata->uid, pptr->dir); + } else { + if (idata->flags & PAMNS_DEBUG) + pam_syslog(idata->pamh, LOG_DEBUG, + "Need unmount ns for user %d for dir %s", + idata->uid, pptr->dir); + need_poly = 1; + break; + } continue; } else { if (idata->flags & PAMNS_DEBUG) @@ -1057,15 +1083,20 @@ * call ns_setup to setup polyinstantiation for a particular entry. */ for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) { - if (ns_override(pptr, idata)) - continue; - else { - if (idata->flags & PAMNS_DEBUG) + enum unmnt_op dir_unmnt = unmnt; + if (ns_override(pptr, idata, idata->uid)) { + if (unmnt == NO_UNMNT || ns_override(pptr, idata, req_uid)) { + continue; + } else { + dir_unmnt = UNMNT_ONLY; + } + } + if (idata->flags & PAMNS_DEBUG) pam_syslog(idata->pamh, LOG_DEBUG, "Setting poly ns for user %d for dir %s", idata->uid, pptr->dir); - if ((unmnt == UNMNT_REMNT) || (unmnt == UNMNT_ONLY)) { + if ((dir_unmnt == UNMNT_REMNT) || (dir_unmnt == UNMNT_ONLY)) { /* * Check to see if process current directory is in the * bind mounted instance_parent directory that we are trying to @@ -1105,13 +1136,12 @@ } else if (idata->flags & PAMNS_DEBUG) pam_syslog(idata->pamh, LOG_DEBUG, "Umount succeeded %s", pptr->dir); - } + } - if (unmnt != UNMNT_ONLY) { + if (dir_unmnt != UNMNT_ONLY) { retval = ns_setup(pptr, idata); if (retval != PAM_SUCCESS) break; - } } } @@ -1138,7 +1168,7 @@ * appropriate polyinstantiated instance directories. */ for (pptr = idata->polydirs_ptr; pptr; pptr = pptr->next) { - if (ns_override(pptr, idata)) + if (ns_override(pptr, idata, idata->uid)) continue; else { if (idata->flags & PAMNS_DEBUG) Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- pam.spec 22 Jan 2007 13:11:10 -0000 1.141 +++ pam.spec 24 Jan 2007 11:44:51 -0000 1.142 @@ -10,8 +10,8 @@ Summary: A security tool which provides authentication for applications Name: pam -Version: 0.99.7.0 -Release: 2%{?dist} +Version: 0.99.7.1 +Release: 1%{?dist} License: GPL or BSD Group: System Environment/Base Source0: http://ftp.us.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -25,9 +25,7 @@ Source9: system-auth.5 Source10: config-util.5 Patch1: pam-0.99.7.0-redhat-modules.patch -Patch2: pam-0.99.7.0-selinux-build.patch Patch21: pam-0.78-unix-hpux-aging.patch -Patch22: pam-0.99.7.0-unix-minsalt.patch Patch34: pam-0.99.7.0-dbpam.patch Patch70: pam-0.99.2.1-selinux-nofail.patch Patch80: pam-0.99.6.2-selinux-drop-multiple.patch @@ -38,6 +36,7 @@ Patch87: pam-0.99.6.2-namespace-preserve-uid.patch Patch92: pam-0.99.6.2-selinux-select-context.patch Patch93: pam-0.99.7.0-namespace-level.patch +Patch94: pam-0.99.7.0-namespace-unmnt-override.patch Patch95: pam-0.99.6.2-selinux-use-current-range.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -92,9 +91,7 @@ cp %{SOURCE7} . %patch1 -p1 -b .redhat-modules -%patch2 -p1 -b .build %patch21 -p1 -b .unix-hpux-aging -%patch22 -p1 -b .minsalt %patch34 -p1 -b .dbpam %patch70 -p1 -b .nofail %patch80 -p1 -b .drop-multiple @@ -105,6 +102,7 @@ %patch87 -p1 -b .preserve-uid %patch92 -p1 -b .select-context %patch93 -p1 -b .level +%patch94 -p1 -b .unmnt-override %patch95 -p1 -b .range autoreconf @@ -397,9 +395,13 @@ %doc doc/adg/*.txt doc/adg/html %changelog +* Wed Jan 24 2007 Tomas Mraz 0.99.7.1-1 +- upgrade to new upstream version resolving CVE-2007-0003 +- pam_namespace: unmount poly dir for override users + * Mon Jan 22 2007 Tomas Mraz 0.99.7.0-2 - add back min salt length requirement which was erroneously removed - upstream + upstream (CVE-2007-0003) * Fri Jan 19 2007 Tomas Mraz 0.99.7.0-1 - upgrade to new upstream version --- Linux-PAM-0.99.7.0.tar.bz2.sign DELETED --- --- pam-0.99.7.0-selinux-build.patch DELETED --- --- pam-0.99.7.0-unix-minsalt.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 24 11:59:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 06:59:47 -0500 Subject: rpms/perl/devel perl.spec,1.101,1.102 Message-ID: <200701241159.l0OBxlRN025497@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25483 Modified Files: perl.spec Log Message: - put dist tag directly to perlrel to fix dependency to suidperl Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- perl.spec 23 Jan 2007 15:12:16 -0000 1.101 +++ perl.spec 24 Jan 2007 11:59:45 -0000 1.102 @@ -5,7 +5,7 @@ %define multilib_64_archs x86_64 s390x ppc64 sparc64 %define perlver 5.8.8 -%define perlrel 11 +%define perlrel 12%{?dist} %define perlepoch 4 %{?!perl_debugging: %define perl_debugging 0} @@ -41,7 +41,7 @@ Name: perl Version: %{perlver} -Release: %{perlrel}%{?dist} +Release: %{perlrel} Epoch: %{perlepoch} Summary: The Perl programming language @@ -589,6 +589,9 @@ %endif %changelog +* Wed Jan 24 2007 Jindrich Novy - 4:5.8.8-12 +- put dist tag directly to perlrel to fix dependency to suidperl + * Tue Jan 23 2007 Jindrich Novy - 4:5.8.8-11 - rebuild against new db4 - use dist tag From fedora-cvs-commits at redhat.com Wed Jan 24 12:14:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 07:14:31 -0500 Subject: rpms/pam/devel .cvsignore,1.41,1.42 sources,1.43,1.44 Message-ID: <200701241214.l0OCEV3R025939@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25922 Modified Files: .cvsignore sources Log Message: * Wed Jan 24 2007 Tomas Mraz 0.99.7.1-1 - upgrade to new upstream version resolving CVE-2007-0003 - pam_namespace: unmount poly dir for override users Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 19 Jan 2007 17:42:21 -0000 1.41 +++ .cvsignore 24 Jan 2007 12:14:29 -0000 1.42 @@ -1,5 +1,5 @@ db-4.5.20.tar.gz *.src.rpm *.tar.bz2 -Linux-PAM-0.99.7.0.tar.bz2 pam-redhat-0.99.7-1.tar.bz2 +Linux-PAM-0.99.7.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pam/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 19 Jan 2007 17:42:21 -0000 1.43 +++ sources 24 Jan 2007 12:14:29 -0000 1.44 @@ -1,3 +1,3 @@ b0f1c777708cb8e9d37fb47e7ed3312d db-4.5.20.tar.gz -e4c9e503ac6af0efdd6031a46bdf506f Linux-PAM-0.99.7.0.tar.bz2 66845048120c71205bd3363264f2bfe7 pam-redhat-0.99.7-1.tar.bz2 +385458dfb4633071594e255a6ebec9da Linux-PAM-0.99.7.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 12:56:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 07:56:28 -0500 Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.Makefile, 1.5, 1.6 docbook-style-xsl.spec, 1.31, 1.32 Message-ID: <200701241256.l0OCuSt9032606@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32554 Modified Files: docbook-style-xsl.Makefile docbook-style-xsl.spec Log Message: * Wed Jan 24 2007 Tomas Mraz 1.72.0-2 - Install missing *.ent from common. Index: docbook-style-xsl.Makefile =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- docbook-style-xsl.Makefile 23 Jan 2007 23:11:59 -0000 1.5 +++ docbook-style-xsl.Makefile 24 Jan 2007 12:56:26 -0000 1.6 @@ -8,6 +8,7 @@ install-xsl: mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling,highlighting,roundtrip} cp common/*.dtd $(DESTDIR)/common + cp common/*.ent $(DESTDIR)/common cp common/*.xml $(DESTDIR)/common cp common/*.xsl $(DESTDIR)/common cp fo/*.xml $(DESTDIR)/fo Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- docbook-style-xsl.spec 23 Jan 2007 23:11:59 -0000 1.31 +++ docbook-style-xsl.spec 24 Jan 2007 12:56:26 -0000 1.32 @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.72.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -97,10 +97,13 @@ %changelog +* Wed Jan 24 2007 Tomas Mraz 1.72.0-2 +- Install missing *.ent from common. + * Tue Jan 23 2007 Tim Waugh 1.72.0-1 - 1.72.0. -* Fri Jan 19 2007 Tomas Mraz 1.71.1-2 +* Fri Jan 19 2007 Tomas Mraz 1.71.1-2 - Add new wordml and especially highlighting (which is referenced from html) subdirs to Makefile. From fedora-cvs-commits at redhat.com Wed Jan 24 13:45:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 08:45:24 -0500 Subject: rpms/cdrdao/devel cdrdao-1.1.7-endianness.patch, 1.2, 1.3 cdrtools-2.0-O_EXCL.patch, NONE, 1.1 cdrtools-2.01a27-silly-warnings.patch, NONE, 1.1 mkisofs-changelog.patch, NONE, 1.1 cdrdao.spec, 1.37, 1.38 Message-ID: <200701241345.l0ODjOn9013030@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrdao/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13014 Modified Files: cdrdao.spec Added Files: cdrdao-1.1.7-endianness.patch cdrtools-2.0-O_EXCL.patch cdrtools-2.01a27-silly-warnings.patch mkisofs-changelog.patch Log Message: - version 1.2.2 - built without cdrecord-devel now cdrdao-1.1.7-endianness.patch: btorder.h | 1 + 1 files changed, 1 insertion(+) Index: cdrdao-1.1.7-endianness.patch =================================================================== RCS file: cdrdao-1.1.7-endianness.patch diff -N cdrdao-1.1.7-endianness.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ cdrdao-1.1.7-endianness.patch 24 Jan 2007 13:45:22 -0000 1.3 @@ -0,0 +1,10 @@ +--- cdrdao-1.1.7/scsilib/include/btorder.h.endianness 2004-01-20 13:53:42.000000000 +0100 ++++ cdrdao-1.1.7/scsilib/include/btorder.h 2004-01-20 13:55:24.000000000 +0100 +@@ -100,6 +100,7 @@ + # endif + + # if defined(__i386__) || defined(__i386) || defined(i386) || \ ++ defined(__ia64__) || defined(__ia64) || defined(ia64) || \ + defined(__alpha__) || defined(__alpha) || defined(alpha) || \ + defined(__arm__) || defined(__arm) || defined(arm) + # define _BIT_FIELDS_LTOH cdrtools-2.0-O_EXCL.patch: Targets | 2 +- oexcl.c | 29 +++++++++++++++++++++++++++++ oexcl.h | 5 +++++ scsi-linux-ata.c | 3 ++- scsi-linux-sg.c | 7 ++++--- 5 files changed, 41 insertions(+), 5 deletions(-) --- NEW FILE cdrtools-2.0-O_EXCL.patch --- --- cdrtools-2.01/scsilib/libscg/oexcl.c.excl 2004-09-22 12:03:23.426676328 +0200 +++ cdrtools-2.01/scsilib/libscg/oexcl.c 2004-09-22 12:03:23.426676328 +0200 @@ -0,0 +1,29 @@ +#include +#include +#include +#include +#include +#include + +int openexcl(const char *device, int mode) +{ + int f, i; + + f = open(device, mode | O_EXCL); + + if (f < 0) { + f = open(device, mode); + + if (f >= 0) { + close(f); + f = -1; + for (i = 0; (i < 10) && (f == -1); i++) { + fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device); + usleep(1000000 + 100000.0 * rand()/(RAND_MAX+1.0)); + f = open(device, O_RDONLY | O_NONBLOCK | O_EXCL); + } + } + } + + return f; +} --- cdrtools-2.01/scsilib/libscg/scsi-linux-ata.c.excl 2004-09-22 12:03:23.423676784 +0200 +++ cdrtools-2.01/scsilib/libscg/scsi-linux-ata.c 2004-09-22 12:03:23.427676176 +0200 @@ -112,6 +112,7 @@ LOCAL void sglog __PR((const char *fmt, ...)); #include +#include "oexcl.h" /* VARARGS1 */ #ifdef PROTOTYPES @@ -267,7 +268,7 @@ starget, slun; - f = open(device, O_RDWR | O_NONBLOCK); + f = openexcl(device, O_RDWR | O_NONBLOCK); if (f < 0) { if (scgp->errstr) --- cdrtools-2.01/scsilib/libscg/oexcl.h.excl 2004-09-22 12:03:23.428676024 +0200 +++ cdrtools-2.01/scsilib/libscg/oexcl.h 2004-09-22 12:03:23.428676024 +0200 @@ -0,0 +1,5 @@ +#ifndef OEXCL_H + +extern int openexcl(const char *device, int mode); + +#endif --- cdrtools-2.01/scsilib/libscg/Targets.excl 2002-10-19 20:33:37.000000000 +0200 +++ cdrtools-2.01/scsilib/libscg/Targets 2004-09-22 12:03:23.428676024 +0200 @@ -1,3 +1,3 @@ CFILES= scsitransp.c scsihack.c scsiopen.c scgsettarget.c \ - scsierrs.c scgtimes.c scsihelp.c \ + scsierrs.c scgtimes.c scsihelp.c oexcl.c \ rdummy.c --- cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c.excl 2004-09-22 12:03:23.422676936 +0200 +++ cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c 2004-09-22 12:12:49.271654816 +0200 @@ -79,6 +79,7 @@ #endif #include "scsi/sg.h" +#include "oexcl.h" #undef sense /* conflict in struct cdrom_generic_command */ #include @@ -94,7 +95,7 @@ * Choose your name instead of "schily" and make clear that the version * string is related to a modified source. */ -LOCAL char _scg_trans_version[] = "scsi-linux-sg.c-1.83"; /* The version for this transport*/ +LOCAL char _scg_trans_version[] = "scsi-linux-sg.c-1.83-RH"; /* The version for this transport*/ #ifndef SCSI_IOCTL_GET_BUS_NUMBER #define SCSI_IOCTL_GET_BUS_NUMBER 0x5386 @@ -247,7 +249,7 @@ * return "schily" for the SCG_AUTHOR request. */ case SCG_AUTHOR: - return (_scg_auth_schily); + return ("schily - Red Hat"); case SCG_SCCS_ID: return (__sccsid); case SCG_KVERSION: @@ -479,7 +483,7 @@ b = -1; } /* O_NONBLOCK is dangerous */ - f = open(device, O_RDWR | O_NONBLOCK); + f = openexcl(device, O_RDWR | O_NONBLOCK); /* if (f < 0 && errno == ENOENT)*/ /* goto openpg;*/ cdrtools-2.01a27-silly-warnings.patch: scsi-linux-sg.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) --- NEW FILE cdrtools-2.01a27-silly-warnings.patch --- --- cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c.silly 2004-05-20 15:42:12.000000000 +0200 +++ cdrtools-2.01/scsilib/libscg/scsi-linux-sg.c 2004-09-08 11:37:47.670038792 +0200 @@ -315,6 +315,10 @@ if (device != NULL && *device != '\0') { #ifdef USE_ATA if (strncmp(device, "ATAPI", 5) == 0) { + if (scgp->overbose) { + js_fprintf((FILE *)scgp->errfile, + "Use of ATA is preferred over ATAPI.\n"); + } scgp->ops = &ata_ops; return (SCGO_OPEN(scgp, device)); } @@ -336,18 +340,6 @@ */ use_ata = TRUE; device = NULL; - if (scgp->overbose) { - /* - * I strongly encourage people who believe that - * they need to patch this message away to read - * the messages in the Solaris USCSI libscg - * layer instead of wetting their tissues while - * being unwilling to look besides their - * own belly button. - */ - js_fprintf((FILE *)scgp->errfile, - "Warning: Using badly designed ATAPI via /dev/hd* interface.\n"); - } } } @@ -497,20 +489,7 @@ if (b < 0 || b > 25) b = -1; } - if (scgp->overbose) { - /* - * Before you patch this away, are you sure that you - * know what you are going to to? - * - * Note that this is a warning that helps users from - * cdda2wav, mkisofs and other programs (that - * distinguish SCSI addresses from file names) from - * getting unexpected results. - */ - js_fprintf((FILE *)scgp->errfile, - "Warning: Open by 'devname' is unintentional and not supported.\n"); - } - /* O_NONBLOCK is dangerous */ + /* O_NONBLOCK is dangerous */ f = open(device, O_RDWR | O_NONBLOCK); /* if (f < 0 && errno == ENOENT)*/ /* goto openpg;*/ mkisofs-changelog.patch: ChangeLog | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE mkisofs-changelog.patch --- --- cdrtools-1.10/mkisofs/ChangeLog.changelog Sat Apr 7 17:34:04 2001 +++ cdrtools-1.10/mkisofs/ChangeLog Thu Apr 19 01:02:24 2001 @@ -0,0 +1,6 @@ +**************** Packager's Note ****************** +Tue Aug 8 2000 Crutcher Dunnavant + * graft-points are NO LONGER assuemd, + you must specify '-graft-points' + + Index: cdrdao.spec =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- cdrdao.spec 21 Aug 2006 09:48:00 -0000 1.37 +++ cdrdao.spec 24 Jan 2007 13:45:22 -0000 1.38 @@ -1,15 +1,19 @@ Summary: Writes audio CD-Rs in disk-at-once (DAO) mode. Name: cdrdao -Version: 1.2.1 -Release: 2 +Version: 1.2.2 +Release: 1 License: GPL Group: Applications/Multimedia URL: http://cdrdao.sourceforge.net/ Source: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/%{name}-%{version}.tar.bz2 Source1: xcdrdao.desktop +Patch1: mkisofs-changelog.patch +Patch9: cdrdao-1.1.7-endianness.patch +Patch23: cdrtools-2.01a27-silly-warnings.patch +Patch30: cdrtools-2.0-O_EXCL.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: cdrecord-devel >= 9:2.01 BuildRequires: libvorbis-devel >= 1.0 # Only exclude s390 @@ -24,15 +28,17 @@ %prep %setup -q +chmod a+rX -R . +%patch1 -p1 -b .changelog +%patch9 -p1 -b .endian +%patch23 -p1 -b .silly +%patch30 -p1 -b .excl %build %configure --prefix=%{_prefix}\ --without-xdao --without-lame \ --with-pcctsbin=%{_prefix}/bin \ - --with-pcctsinc=%{_prefix}/include/pccts \ - --with-scglib=sys \ - --with-scglib-inc=/usr/include/schily \ - --with-scglib-lib=/usr/%{_lib} + --with-pcctsinc=%{_prefix}/include/pccts make %install @@ -52,6 +58,10 @@ %{_mandir}/*/* %changelog +* Wed Jan 24 2007 Harald Hoyer - 1.2.2-1 +- version 1.2.2 +- built without cdrecord-devel now + * Mon Aug 21 2006 Harald Hoyer - 1.2.1-1.1 - rebuild with new/old cdrtools From fedora-cvs-commits at redhat.com Wed Jan 24 13:48:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 08:48:32 -0500 Subject: rpms/cups/FC-6 cups-busy-loop.patch,NONE,1.1 cups.spec,1.315,1.316 Message-ID: <200701241348.l0ODmW7P021571@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19498 Modified Files: cups.spec Added Files: cups-busy-loop.patch Log Message: * Wed Jan 24 2007 Tim Waugh 1:1.2.7-1.8 - Try another fix for bug #219330 (STR #2179). - Resolves: rhbz#219330 cups-busy-loop.patch: ipp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE cups-busy-loop.patch --- --- cups-1.2.7/cups/ipp.c.busy-loop 2007-01-24 13:45:50.000000000 +0000 +++ cups-1.2.7/cups/ipp.c 2007-01-24 13:47:24.000000000 +0000 @@ -1098,8 +1098,11 @@ break; case IPP_ATTRIBUTE : - while ((*cb)(src, buffer, 1) > 0) + for (;;) { + if ((*cb)(src, buffer, 1) < 1) + return (IPP_ERROR); + DEBUG_printf(("ippReadIO: ipp->current=%p, ipp->prev=%p\n", ipp->current, ipp->prev)); Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- cups.spec 12 Jan 2007 16:27:21 -0000 1.315 +++ cups.spec 24 Jan 2007 13:48:30 -0000 1.316 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2.7 -Release: 1.7%{?dist} +Release: 1.8%{?dist} License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -49,6 +49,7 @@ Patch23: cups-str2111.patch Patch24: cups-str2133.patch Patch25: cups-str2179.patch +Patch26: cups-busy-loop.patch Patch100: cups-lspp.patch Epoch: 1 Url: http://www.cups.org/ @@ -159,6 +160,7 @@ %patch23 -p1 -b .str2111 %patch24 -p1 -b .str2133 %patch25 -p1 -b .str2179 +%patch26 -p1 -b .busy-loop %if %lspp %patch100 -p1 -b .lspp @@ -441,6 +443,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Wed Jan 24 2007 Tim Waugh 1:1.2.7-1.8 +- Try another fix for bug #219330 (STR #2179). + * Fri Jan 12 2007 Tim Waugh 1:1.2.7-1.7 - Don't even reload CUPS when rotating logs (bug #215024). From fedora-cvs-commits at redhat.com Wed Jan 24 13:49:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 08:49:26 -0500 Subject: rpms/cdrdao/devel .cvsignore,1.8,1.9 sources,1.8,1.9 Message-ID: <200701241349.l0ODnQ7X001089@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrdao/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1074 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 8 Mar 2006 12:29:27 -0000 1.8 +++ .cvsignore 24 Jan 2007 13:49:24 -0000 1.9 @@ -1 +1 @@ -cdrdao-1.2.1.tar.bz2 +cdrdao-1.2.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 8 Mar 2006 12:29:27 -0000 1.8 +++ sources 24 Jan 2007 13:49:24 -0000 1.9 @@ -1 +1 @@ -f93f3e68ec5b53ec1a776df73a1def60 cdrdao-1.2.1.tar.bz2 +f0cbf36907406cb4f4c568f9e6669a34 cdrdao-1.2.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 13:55:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 08:55:13 -0500 Subject: rpms/cdrdao/devel cdrdao.spec,1.38,1.39 Message-ID: <200701241355.l0ODtDDL001241@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrdao/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1227 Modified Files: cdrdao.spec Log Message: exclude s390x also Index: cdrdao.spec =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cdrdao.spec 24 Jan 2007 13:45:22 -0000 1.38 +++ cdrdao.spec 24 Jan 2007 13:55:11 -0000 1.39 @@ -17,7 +17,7 @@ BuildRequires: libvorbis-devel >= 1.0 # Only exclude s390 -ExcludeArch: s390 +ExcludeArch: s390 s390x %description Cdrdao records audio CD-Rs in disk-at-once (DAO) mode, based on a From fedora-cvs-commits at redhat.com Wed Jan 24 14:23:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:23:08 -0500 Subject: rpms/desktop-printing/FC-5 eggcups-api-name.patch, NONE, 1.1 desktop-printing.spec, 1.56, 1.57 Message-ID: <200701241423.l0OEN88Q022389@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/desktop-printing/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22373 Modified Files: desktop-printing.spec Added Files: eggcups-api-name.patch Log Message: * Wed Jan 24 2007 Tim Waugh - Fixed HAL printer interface API name (bug #214619). - Resolves: rhbz#214619 eggcups-api-name.patch: ec-cups-manager.c | 6 +++--- ec-driver-prompt-dialog.h | 8 ++++---- ec-tray-icon.c | 22 +++++++++++----------- printdriverselector.conf | 14 +++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) --- NEW FILE eggcups-api-name.patch --- --- eggcups-0.19/ec-tray-icon.c.api-name 2006-11-08 18:14:05.000000000 +0000 +++ eggcups-0.19/ec-tray-icon.c 2006-11-08 18:14:54.000000000 +0000 @@ -22,7 +22,7 @@ * Boston, MA 02111-1307, USA. */ -#define EC_OBJECT_PATH "/org/freedesktop/PrinterManager" +#define EC_OBJECT_PATH "/com/redhat/PrinterManager" #define EC_CONF_SESSION_CUPSD "/apps/eggcups/session_cupsd" #include "ec-tray-icon.h" @@ -549,15 +549,15 @@ GDK_THREADS_ENTER (); if (dbus_message_is_signal (message, - "org.freedesktop.PrinterSpooler", + "com.redhat.PrinterSpooler", "JobQueuedLocal")) { res = handle_dbus_local_queue (icon, is_session, message); } else if (dbus_message_is_signal (message, - "org.freedesktop.PrinterSpooler", + "com.redhat.PrinterSpooler", "JobStartedLocal")) { res = handle_dbus_local_start (icon, is_session, message); } else if (dbus_message_is_signal (message, - "org.freedesktop.PrinterSpooler", + "com.redhat.PrinterSpooler", "JobQueuedRemote")) { res = handle_dbus_remote_queue (icon, is_session, message); } else if (dbus_message_is_signal (message, @@ -678,7 +678,7 @@ rb_debug ("got message"); if (dbus_message_is_method_call (message, - "org.freedesktop.PrinterManager", + "com.redhat.PrinterManager", "promptPassword")) { DBusError error; DBusMessage *reply; @@ -725,7 +725,7 @@ rb_debug ("got error return from gnome_password_dialog_run_and_block"); got_error = TRUE; reply = dbus_message_new_error (message, - "org.freedesktop.PrinterManager.noPasswordGiven", + "com.redhat.PrinterManager.noPasswordGiven", "No password provided"); if (!reply) { g_warning ("out of memory"); @@ -809,7 +809,7 @@ rb_debug ("acquired system bus"); dbus_bus_add_match (dbus, "type='signal'," - "interface='org.freedesktop.PrinterSpooler'", + "interface='com.redhat.PrinterSpooler'", NULL); dbus_connection_add_filter (dbus, handle_system_dbus_message, icon, leak); if (icon->priv->driverprompt != NULL) @@ -840,16 +840,16 @@ rb_debug ("acquired session bus"); - if (dbus_bus_request_name (dbus, "org.freedesktop.PrinterManager", + if (dbus_bus_request_name (dbus, "com.redhat.PrinterManager", 0, &error) < 0) { - g_warning ("couldn't acquire service org.freedesktop.PrinterManager"); + g_warning ("couldn't acquire service com.redhat.PrinterManager"); goto lose; } - rb_debug ("acquired org.freedesktop.PrinterManager"); + rb_debug ("acquired com.redhat.PrinterManager"); dbus_bus_add_match (dbus, "type='signal'," - "interface='org.freedesktop.PrinterSpooler'", + "interface='com.redhat.PrinterSpooler'", NULL); dbus_connection_add_filter (dbus, handle_session_dbus_message, icon, leak); --- eggcups-0.19/ec-driver-prompt-dialog.h.api-name 2006-11-08 18:11:08.000000000 +0000 +++ eggcups-0.19/ec-driver-prompt-dialog.h 2006-11-08 18:11:32.000000000 +0000 @@ -28,12 +28,12 @@ G_BEGIN_DECLS -#define EC_DRIVER_PROMPT_PATH "/org/freedesktop/PrintDriverSelection" -#define EC_DRIVER_PROMPT_NAMESPACE "org.freedesktop.PrintDriverSelection" +#define EC_DRIVER_PROMPT_PATH "/com/redhat/PrintDriverSelection" +#define EC_DRIVER_PROMPT_NAMESPACE "com.redhat.PrintDriverSelection" #define EC_DRIVER_FOOMATIC_PATH "/usr/bin/" -#define CUPS_DRIVER_CONFIG_PATH "/org/freedesktop/CupsDriverConfig" -#define CUPS_DRIVER_CONFIG_NAMESPACE "org.freedesktop.CupsDriverConfig" +#define CUPS_DRIVER_CONFIG_PATH "/com/redhat/CupsDriverConfig" +#define CUPS_DRIVER_CONFIG_NAMESPACE "com.redhat.CupsDriverConfig" #define HAL_NAMESPACE "org.freedesktop.Hal" #define HAL_PRINTER_INTERFACE "org.freedesktop.Hal.Device.Printer" --- eggcups-0.19/printdriverselector.conf.api-name 2006-11-08 18:12:18.000000000 +0000 +++ eggcups-0.19/printdriverselector.conf 2006-11-08 18:13:22.000000000 +0000 @@ -3,22 +3,22 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - + - + - - + + - + - - + + --- eggcups-0.19/ec-cups-manager.c.api-name 2006-11-08 18:13:29.000000000 +0000 +++ eggcups-0.19/ec-cups-manager.c 2006-11-08 18:13:56.000000000 +0000 @@ -20,7 +20,7 @@ * */ -#define EC_SESSION_CUPS_OBJECT_PATH "/org/freedesktop/PrinterManager/SessionCups" +#define EC_SESSION_CUPS_OBJECT_PATH "/com/redhat/PrinterManager/SessionCups" #include "config.h" #include "ec-cups-manager.h" @@ -329,7 +329,7 @@ rb_debug ("got message"); if (dbus_message_is_method_call (message, - "org.freedesktop.PrinterManager", + "com.redhat.PrinterManager", "getPassword")) { DBusMessage *reply; char *password; @@ -362,7 +362,7 @@ dbus_message_unref (reply); return DBUS_HANDLER_RESULT_HANDLED; } else if (dbus_message_is_method_call (message, - "org.freedesktop.PrinterManager", + "com.redhat.PrinterManager", "getPort")) { DBusMessage *reply; guint port; Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/FC-5/desktop-printing.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- desktop-printing.spec 3 Nov 2006 13:30:50 -0000 1.56 +++ desktop-printing.spec 24 Jan 2007 14:23:06 -0000 1.57 @@ -14,6 +14,7 @@ Patch0: desktop-printing-0.19-dbus-api.patch Patch1: eggcups-dbus-send-null-crash.patch Patch2: eggcups-cups12.patch +Patch3: eggcups-api-name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: redhat-menus @@ -41,6 +42,7 @@ %patch0 -p1 -b .dbus-api %patch1 -p0 -b .dbus-null-crash %patch2 -p1 -b .cups12 +%patch3 -p1 -b .api-name popd %build @@ -94,6 +96,9 @@ %{_sysconfdir}/gconf/* %changelog +* Wed Jan 24 2007 Tim Waugh +- Fixed HAL printer interface API name (bug #214619). + * Fri Nov 3 2006 Matthias Clasen - 0.19-8 - Fix a problem where eggcups loses track of remote jobs (#212763) From fedora-cvs-commits at redhat.com Wed Jan 24 14:24:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:24:19 -0500 Subject: rpms/desktop-printing/FC-5 eggcups-cancel-remote-job.patch, NONE, 1.1 desktop-printing.spec, 1.57, 1.58 Message-ID: <200701241424.l0OEOJ1i022422@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/desktop-printing/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22406 Modified Files: desktop-printing.spec Added Files: eggcups-cancel-remote-job.patch Log Message: * Wed Jan 24 2007 Tim Waugh - Fixed remote job cancellation (bug #218945). - Resolves: rhbz#218945 eggcups-cancel-remote-job.patch: ec-job-list.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE eggcups-cancel-remote-job.patch --- --- eggcups-0.19/ec-job-list.c~ 2005-06-23 02:17:32.000000000 +0100 +++ eggcups-0.19/ec-job-list.c 2006-12-08 16:49:42.000000000 +0000 @@ -538,7 +538,7 @@ queue = gnome_cups_queue_get (job_data->printer); error = NULL; - gnome_cups_queue_cancel_job (queue, job_data->job->id, + gnome_cups_queue_cancel_job (queue, job_data->local_jobid, &error); if (error) { Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/FC-5/desktop-printing.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- desktop-printing.spec 24 Jan 2007 14:23:06 -0000 1.57 +++ desktop-printing.spec 24 Jan 2007 14:24:17 -0000 1.58 @@ -15,6 +15,7 @@ Patch1: eggcups-dbus-send-null-crash.patch Patch2: eggcups-cups12.patch Patch3: eggcups-api-name.patch +Patch4: eggcups-cancel-remote-job.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: redhat-menus @@ -43,6 +44,7 @@ %patch1 -p0 -b .dbus-null-crash %patch2 -p1 -b .cups12 %patch3 -p1 -b .api-name +%patch4 -p1 -b .cancel-remote-job popd %build @@ -97,6 +99,7 @@ %changelog * Wed Jan 24 2007 Tim Waugh +- Fixed remote job cancellation (bug #218945). - Fixed HAL printer interface API name (bug #214619). * Fri Nov 3 2006 Matthias Clasen - 0.19-8 From fedora-cvs-commits at redhat.com Wed Jan 24 14:25:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:25:36 -0500 Subject: rpms/crontabs/devel crontabs.spec,1.12,1.13 run-parts,1.2,1.3 Message-ID: <200701241425.l0OEPaRR022473@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/crontabs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22451 Modified Files: crontabs.spec run-parts Log Message: Change in run-parts and spec. Index: crontabs.spec =================================================================== RCS file: /cvs/dist/rpms/crontabs/devel/crontabs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- crontabs.spec 11 Oct 2006 15:28:33 -0000 1.12 +++ crontabs.spec 24 Jan 2007 14:25:28 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs Version: 1.10 -Release: 9%{?dist} +Release: 10%{?dist} License: Public Domain Group: System Environment/Base Source0: crontab @@ -28,7 +28,7 @@ install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron -ln $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron +#ln -s $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron %clean rm -rf $RPM_BUILD_ROOT @@ -41,8 +41,14 @@ %dir /etc/cron.daily %dir /etc/cron.weekly %dir /etc/cron.monthly +%dir /etc/cron.daily/000-delay.cron +#%dir /etc/cron.weekly/000-delay.cron %changelog +* Wed Jan 24 2007 Marcela Maslanova 1.10-10 +- crontabs should ignore Cfengine files +- Resolves: rhbz#223472 + * Wed Oct 11 2006 Marcela Maslanova 1.10-9 - patch (#110894) for delaying more emails in the moment Index: run-parts =================================================================== RCS file: /cvs/dist/rpms/crontabs/devel/run-parts,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- run-parts 9 Sep 2004 03:58:33 -0000 1.2 +++ run-parts 24 Jan 2007 14:25:28 -0000 1.3 @@ -18,7 +18,8 @@ # Ignore *~ and *, scripts for i in $1/*[^~,] ; do [ -d $i ] && continue - # Don't run *.{rpmsave,rpmorig,rpmnew,swp} scripts + # Don't run *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} scripts + [ "${i%.cfsaved}" != "${i}" ] && continue [ "${i%.rpmsave}" != "${i}" ] && continue [ "${i%.rpmorig}" != "${i}" ] && continue [ "${i%.rpmnew}" != "${i}" ] && continue From fedora-cvs-commits at redhat.com Wed Jan 24 14:33:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:33:25 -0500 Subject: rpms/crontabs/FC-6 crontabs.spec,1.12,1.13 run-parts,1.2,1.3 Message-ID: <200701241433.l0OEXPaG004709@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/crontabs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4585 Modified Files: crontabs.spec run-parts Log Message: Update fc-6 Index: crontabs.spec =================================================================== RCS file: /cvs/dist/rpms/crontabs/FC-6/crontabs.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- crontabs.spec 11 Oct 2006 15:28:33 -0000 1.12 +++ crontabs.spec 24 Jan 2007 14:33:22 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs Version: 1.10 -Release: 9%{?dist} +Release: 10%{?dist} License: Public Domain Group: System Environment/Base Source0: crontab @@ -43,6 +43,10 @@ %dir /etc/cron.monthly %changelog +* Wed Jan 24 2007 Marcela Maslanova 1.10-10 +- rebuilt +- Resolves: rhbz#223472 + * Wed Oct 11 2006 Marcela Maslanova 1.10-9 - patch (#110894) for delaying more emails in the moment Index: run-parts =================================================================== RCS file: /cvs/dist/rpms/crontabs/FC-6/run-parts,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- run-parts 9 Sep 2004 03:58:33 -0000 1.2 +++ run-parts 24 Jan 2007 14:33:22 -0000 1.3 @@ -18,7 +18,8 @@ # Ignore *~ and *, scripts for i in $1/*[^~,] ; do [ -d $i ] && continue - # Don't run *.{rpmsave,rpmorig,rpmnew,swp} scripts + # Don't run *.{rpmsave,rpmorig,rpmnew,swp,cfsaved} scripts + [ "${i%.cfsaved}" != "${i}" ] && continue [ "${i%.rpmsave}" != "${i}" ] && continue [ "${i%.rpmorig}" != "${i}" ] && continue [ "${i%.rpmnew}" != "${i}" ] && continue From fedora-cvs-commits at redhat.com Wed Jan 24 14:33:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:33:48 -0500 Subject: rpms/desktop-printing/devel desktop-printing-0.20-category.patch, NONE, 1.1 desktop-printing.spec, 1.81, 1.82 Message-ID: <200701241433.l0OEXmPK004953@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/desktop-printing/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4866 Modified Files: desktop-printing.spec Added Files: desktop-printing-0.20-category.patch Log Message: improve appearance of default printer capplet desktop-printing-0.20-category.patch: gnome-default-printer.desktop.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE desktop-printing-0.20-category.patch --- --- desktop-printing-0.20/eggcups-0.20/gnome-default-printer.desktop.in.category 2007-01-24 09:34:26.000000000 -0500 +++ desktop-printing-0.20/eggcups-0.20/gnome-default-printer.desktop.in 2007-01-24 09:34:35.000000000 -0500 @@ -3,11 +3,11 @@ _Name=Default Printer _Comment=Select default printer Exec=gnome-default-printer -Icon=stock_print +Icon=printer Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Application;Settings; +Categories=GNOME;Settings;HardwareSettings X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=eggcups X-GNOME-Bugzilla-Component=gnome-default-printer Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- desktop-printing.spec 20 Dec 2006 04:45:12 -0000 1.81 +++ desktop-printing.spec 24 Jan 2007 14:33:46 -0000 1.82 @@ -6,11 +6,13 @@ Summary: Desktop print icon Name: desktop-printing Version: 0.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/File Source0: http://download.gnome.org/sources/eggcups/0.20/eggcups-%{version}.tar.bz2 Source1: gnome-default-printer.png +# fixed in upstream svn +Patch0: desktop-printing-0.20-category.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: redhat-menus @@ -36,6 +38,7 @@ %prep %setup -q -c +%patch0 -p1 -b .category %build pushd eggcups-%{version} @@ -87,6 +90,9 @@ %{_sysconfdir}/gconf/* %changelog +* Wed Jan 24 2007 Matthias Clasen 0.20-2 +- Improve appearance of the default printer capplet + * Tue Dec 19 2006 Matthias Clasen 0.20-1 - Update to 0.20 - Drop upstreamed patches From fedora-cvs-commits at redhat.com Wed Jan 24 14:34:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:34:51 -0500 Subject: rpms/desktop-printing/FC-5 desktop-printing.spec,1.58,1.59 Message-ID: <200701241434.l0OEYpOq005684@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/desktop-printing/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5642 Modified Files: desktop-printing.spec Log Message: * Wed Jan 24 2007 Tim Waugh - Removed broken perl scripting line (bug #214619). - Resolves: rhbz#214619 Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/FC-5/desktop-printing.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- desktop-printing.spec 24 Jan 2007 14:24:17 -0000 1.58 +++ desktop-printing.spec 24 Jan 2007 14:34:49 -0000 1.59 @@ -50,7 +50,6 @@ %build pushd eggcups-%{version} %configure --with-session-cupsd=no -find . -type f -print0 \( -name '*.c' -o -name '*.h' -o -name '*.conf' \) | xargs -0 perl -pi -e 's,org/freedesktop/,com/redhat/,g;s,org.freedesktop.,com.redhat.,g' make popd @@ -99,6 +98,7 @@ %changelog * Wed Jan 24 2007 Tim Waugh +- Removed broken perl scripting line (bug #214619). - Fixed remote job cancellation (bug #218945). - Fixed HAL printer interface API name (bug #214619). From fedora-cvs-commits at redhat.com Wed Jan 24 14:36:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:36:55 -0500 Subject: rpms/desktop-printing/FC-5 eggcups-xml-parsing.patch, NONE, 1.1 desktop-printing.spec, 1.59, 1.60 Message-ID: <200701241436.l0OEato2006959@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/desktop-printing/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6929 Modified Files: desktop-printing.spec Added Files: eggcups-xml-parsing.patch Log Message: * Wed Jan 24 2007 Tim Waugh - Fixed parsing of foomatic XML (bug #219283). - Resolves: rhbz#219283 eggcups-xml-parsing.patch: ec-driver-prompt-dialog.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) --- NEW FILE eggcups-xml-parsing.patch --- --- eggcups-0.19/ec-driver-prompt-dialog.c.xml-parsing 2006-12-12 16:46:41.000000000 +0000 +++ eggcups-0.19/ec-driver-prompt-dialog.c 2006-12-12 16:47:23.000000000 +0000 @@ -305,19 +305,6 @@ return g_object_new (EC_TYPE_DRIVER_PROMPT_DIALOG, NULL); } -/* -* Some makes in the Foomatic database are in abreviated form -* and must be translated back to a more readable name -*/ -static gchar * -translate_make (gchar *make) -{ - if (strcmp (make, "HP") == 0) - return g_strdup ("Hewlett-Packard"); - else - return g_strdup (make); -} - static gint default_tree_sort_on_first_col_func (GtkTreeModel *model, GtkTreeIter *a, @@ -613,14 +600,13 @@ switch (dlg->priv->parse_state) { case PARSE_STATE_MAKE: - g_free (dlg->priv->current_driver.make); - dlg->priv->current_driver.make = translate_make (text); - g_free (text); + if (!dlg->priv->current_driver.make) + dlg->priv->current_driver.make = text; break; case PARSE_STATE_MODEL: - g_free (dlg->priv->current_driver.model); - dlg->priv->current_driver.model = text; + if (!dlg->priv->current_driver.model) + dlg->priv->current_driver.model = text; break; case PARSE_STATE_DRIVER: g_free (dlg->priv->current_driver.driver); Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/FC-5/desktop-printing.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- desktop-printing.spec 24 Jan 2007 14:34:49 -0000 1.59 +++ desktop-printing.spec 24 Jan 2007 14:36:53 -0000 1.60 @@ -16,6 +16,7 @@ Patch2: eggcups-cups12.patch Patch3: eggcups-api-name.patch Patch4: eggcups-cancel-remote-job.patch +Patch5: eggcups-xml-parsing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: redhat-menus @@ -45,6 +46,7 @@ %patch2 -p1 -b .cups12 %patch3 -p1 -b .api-name %patch4 -p1 -b .cancel-remote-job +%patch5 -p1 -b .xml-parsing popd %build @@ -98,6 +100,7 @@ %changelog * Wed Jan 24 2007 Tim Waugh +- Fixed parsing of foomatic XML (bug #219283). - Removed broken perl scripting line (bug #214619). - Fixed remote job cancellation (bug #218945). - Fixed HAL printer interface API name (bug #214619). From fedora-cvs-commits at redhat.com Wed Jan 24 14:37:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:37:13 -0500 Subject: rpms/desktop-printing/FC-5 desktop-printing.spec,1.60,1.61 Message-ID: <200701241437.l0OEbDXj007116@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/desktop-printing/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7087 Modified Files: desktop-printing.spec Log Message: 0.19-9 Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/FC-5/desktop-printing.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- desktop-printing.spec 24 Jan 2007 14:36:53 -0000 1.60 +++ desktop-printing.spec 24 Jan 2007 14:37:11 -0000 1.61 @@ -5,7 +5,7 @@ Summary: Desktop print icon Name: desktop-printing Version: 0.19 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/File # total lie @@ -99,7 +99,7 @@ %{_sysconfdir}/gconf/* %changelog -* Wed Jan 24 2007 Tim Waugh +* Wed Jan 24 2007 Tim Waugh 0.19-9 - Fixed parsing of foomatic XML (bug #219283). - Removed broken perl scripting line (bug #214619). - Fixed remote job cancellation (bug #218945). From fedora-cvs-commits at redhat.com Wed Jan 24 14:55:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:55:39 -0500 Subject: rpms/crontabs/FC-6 crontabs.spec,1.13,1.14 Message-ID: <200701241455.l0OEtdqo007569@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/crontabs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7450 Modified Files: crontabs.spec Log Message: Update spec. Index: crontabs.spec =================================================================== RCS file: /cvs/dist/rpms/crontabs/FC-6/crontabs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- crontabs.spec 24 Jan 2007 14:33:22 -0000 1.13 +++ crontabs.spec 24 Jan 2007 14:55:36 -0000 1.14 @@ -28,7 +28,7 @@ install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron -ln $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron +ln -s ./etc/cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron %clean rm -rf $RPM_BUILD_ROOT @@ -41,6 +41,8 @@ %dir /etc/cron.daily %dir /etc/cron.weekly %dir /etc/cron.monthly +%dir /etc/cron.daily/000-delay.cron +%dir /etc/cron.weekly/000-delay.cron %changelog * Wed Jan 24 2007 Marcela Maslanova 1.10-10 From fedora-cvs-commits at redhat.com Wed Jan 24 14:56:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:56:19 -0500 Subject: rpms/crontabs/FC-6 crontabs.spec,1.14,1.15 Message-ID: <200701241456.l0OEuJmv008082@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/crontabs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7984 Modified Files: crontabs.spec Log Message: REbuilt again. Index: crontabs.spec =================================================================== RCS file: /cvs/dist/rpms/crontabs/FC-6/crontabs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- crontabs.spec 24 Jan 2007 14:55:36 -0000 1.14 +++ crontabs.spec 24 Jan 2007 14:56:16 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs Version: 1.10 -Release: 10%{?dist} +Release: 11%{?dist} License: Public Domain Group: System Environment/Base Source0: crontab @@ -45,7 +45,7 @@ %dir /etc/cron.weekly/000-delay.cron %changelog -* Wed Jan 24 2007 Marcela Maslanova 1.10-10 +* Wed Jan 24 2007 Marcela Maslanova 1.10-11 - rebuilt - Resolves: rhbz#223472 From fedora-cvs-commits at redhat.com Wed Jan 24 14:58:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 09:58:20 -0500 Subject: rpms/crontabs/devel crontabs.spec,1.13,1.14 Message-ID: <200701241458.l0OEwKDc009586@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/crontabs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9504 Modified Files: crontabs.spec Log Message: Rebuilt Index: crontabs.spec =================================================================== RCS file: /cvs/dist/rpms/crontabs/devel/crontabs.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- crontabs.spec 24 Jan 2007 14:25:28 -0000 1.13 +++ crontabs.spec 24 Jan 2007 14:58:18 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs Version: 1.10 -Release: 10%{?dist} +Release: 11%{?dist} License: Public Domain Group: System Environment/Base Source0: crontab @@ -28,7 +28,7 @@ install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron -#ln -s $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron +ln -s ./etc/cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron %clean rm -rf $RPM_BUILD_ROOT @@ -42,11 +42,11 @@ %dir /etc/cron.weekly %dir /etc/cron.monthly %dir /etc/cron.daily/000-delay.cron -#%dir /etc/cron.weekly/000-delay.cron +%dir /etc/cron.weekly/000-delay.cron %changelog -* Wed Jan 24 2007 Marcela Maslanova 1.10-10 -- crontabs should ignore Cfengine files +* Wed Jan 24 2007 Marcela Maslanova 1.10-11 +- crontabs should ignore Cfengine files, rebuilt - Resolves: rhbz#223472 * Wed Oct 11 2006 Marcela Maslanova 1.10-9 From fedora-cvs-commits at redhat.com Wed Jan 24 15:06:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:06:17 -0500 Subject: rpms/gnome-user-share/devel gnome-user-share-category.patch, NONE, 1.1 gnome-user-share.spec, 1.16, 1.17 Message-ID: <200701241506.l0OF6H0A014795@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-user-share/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11790 Modified Files: gnome-user-share.spec Added Files: gnome-user-share-category.patch Log Message: improve capplet appearance gnome-user-share-category.patch: gnome-user-share-properties.desktop.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gnome-user-share-category.patch --- --- gnome-user-share-0.10/gnome-user-share-properties.desktop.in.category 2007-01-24 09:46:29.000000000 -0500 +++ gnome-user-share-0.10/gnome-user-share-properties.desktop.in 2007-01-24 09:46:45.000000000 -0500 @@ -7,7 +7,7 @@ StartupNotify=true Terminal=false Type=Application -Categories=GNOME;Application;Settings; +Categories=GNOME;Settings;X-GNOME-NetworkSettings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-user-share Index: gnome-user-share.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-user-share.spec 1 Oct 2006 20:19:19 -0000 1.16 +++ gnome-user-share.spec 24 Jan 2007 15:06:14 -0000 1.17 @@ -6,7 +6,9 @@ Group: System Environment/Libraries URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# fixed in upstream svn +Patch0: gnome-user-share-category.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd >= 2.2.0 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig BuildRequires: gtk2-devel >= 2.4.0 @@ -16,13 +18,16 @@ BuildRequires: libselinux-devel BuildRequires: gettext BuildRequires: perl-XML-Parser -Prereq: GConf2 +Requires(post): GConf2 +Requires(pre): GConf2 +Requires(preun): GConf2 %description -gnome-user-share +GNOME user file sharing. %prep %setup -q +%patch0 -p1 -b .category %build %configure @@ -48,10 +53,19 @@ %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="desktop_gnome_file_sharing.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/desktop_gnome_file_sharing.schemas > /dev/null || : + +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || : +fi + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || : +fi %files -f gnome-user-share.lang %defattr(-,root,root,-) From fedora-cvs-commits at redhat.com Wed Jan 24 15:06:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:06:34 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.134, 1.135 policycoreutils-po.patch, 1.18, 1.19 policycoreutils-rhat.patch, 1.275, 1.276 policycoreutils.spec, 1.362, 1.363 sources, 1.138, 1.139 Message-ID: <200701241506.l0OF6Yvf015004@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14936 Modified Files: .cvsignore policycoreutils-po.patch policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jan 24 2007 Dan Walsh 1.34.1-1 - Fix system-config-selinux ports view - Update to upstream * Fixed newrole non-pam build. * Updated version for stable branch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- .cvsignore 17 Jan 2007 16:14:32 -0000 1.134 +++ .cvsignore 24 Jan 2007 15:06:29 -0000 1.135 @@ -127,3 +127,5 @@ policycoreutils-1.33.12.tgz policycoreutils-1.33.14.tgz policycoreutils-1.33.15.tgz +policycoreutils-1.34.0.tgz +policycoreutils-1.34.1.tgz policycoreutils-po.patch: Makefile | 2 bs.po | 1116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ da.po | 2 mr.po | 462 +++++++++++++------------- ms.po | 274 +++++++++------ sv.po | 57 +-- uk.po | 61 +-- 7 files changed, 1586 insertions(+), 388 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.18 -r 1.19 policycoreutils-po.patch Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-po.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- policycoreutils-po.patch 11 Jan 2007 20:19:37 -0000 1.18 +++ policycoreutils-po.patch 24 Jan 2007 15:06:29 -0000 1.19 @@ -1,82572 +1,1659 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-1.33.10/po/af.po ---- nsapolicycoreutils/po/af.po 2006-11-22 13:53:51.000000000 -0500 -+++ policycoreutils-1.33.10/po/af.po 2007-01-09 10:09:19.000000000 -0500 -@@ -8,7 +8,7 @@ - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2006-10-20 09:14-0400\n" -+"POT-Creation-Date: 2006-11-21 14:21-0500\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -26,226 +26,276 @@ - msgid "%s: Can't load policy: %s\n" - msgstr "" - --#: ../newrole/newrole.c:98 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-1.33.15/po/bs.po +--- nsapolicycoreutils/po/bs.po 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.33.15/po/bs.po 2007-01-24 09:59:59.000000000 -0500 +@@ -0,0 +1,1116 @@ ++# translation of bs.po to Bosnian ++# Adnan Hodzic , 2007. ++msgid "" ++msgstr "" ++"Project-Id-Version: bs\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-11-21 14:21-0500\n" ++"PO-Revision-Date: 2007-01-23 16:51+0100\n" ++"Last-Translator: Adnan Hodzic \n" ++"Language-Team: Bosnian \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Croatian\n" ++"X-Poedit-Country: CROATIA\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#: ../load_policy/load_policy.c:22 ++#, c-format ++msgid "usage: %s [-bq]\n" ++msgstr "upotreba: %s [-bq]\n" ++ ++#: ../load_policy/load_policy.c:66 ++#, c-format ++msgid "%s: Can't load policy: %s\n" ++msgstr "%s: Pravilo nije mogu??e u??itati: %s\n" ++ +#: ../newrole/newrole.c:188 - #, c-format --msgid "Out of memory!\n" ++#, c-format +msgid "failed to set PAM_TTY\n" -+msgstr "" ++msgstr "Zadavanje PAM_TTY nije uspjelo\n" + -+#: ../newrole/newrole.c:218 ../run_init/run_init.c:162 ++#: ../newrole/newrole.c:218 ++#: ../run_init/run_init.c:162 +msgid "Password:" - msgstr "" - --#: ../newrole/newrole.c:200 ../run_init/run_init.c:126 -+#: ../newrole/newrole.c:243 ../run_init/run_init.c:197 - #, c-format --msgid "failed to initialize PAM\n" ++msgstr "Lozinka:" ++ ++#: ../newrole/newrole.c:243 ++#: ../run_init/run_init.c:197 ++#, c-format +msgid "Cannot find your entry in the shadow passwd file.\n" - msgstr "" - --#: ../newrole/newrole.c:211 -+#: ../newrole/newrole.c:250 ../run_init/run_init.c:203 - #, c-format --msgid "failed to set PAM_TTY\n" ++msgstr "Va?? unos u datoteci lozinka u sjeni nije mogu??e prona??i.\n" ++ ++#: ../newrole/newrole.c:250 ++#: ../run_init/run_init.c:203 ++#, c-format +msgid "getpass cannot open /dev/tty\n" - msgstr "" - --#: ../newrole/newrole.c:247 ../run_init/run_init.c:154 --msgid "Password:" ++msgstr "'getpass' ne mo??e otvoriti /dev/tty\n" ++ +#: ../newrole/newrole.c:316 +#, c-format +msgid "cannot find valid entry in the passwd file.\n" - msgstr "" - --#: ../newrole/newrole.c:282 ../run_init/run_init.c:189 ++msgstr "Valjani unos u datoteci lozinka nije mogu??e prona??i.\n" ++ +#: ../newrole/newrole.c:327 - #, c-format --msgid "Cannot find your entry in the shadow passwd file.\n" ++#, c-format +msgid "Out of memory!\n" - msgstr "" - --#: ../newrole/newrole.c:288 ../run_init/run_init.c:195 ++msgstr "Nedovoljno memorije!\n" ++ +#: ../newrole/newrole.c:332 - #, c-format --msgid "getpass cannot open /dev/tty\n" ++#, c-format +msgid "Error! Shell is not valid.\n" -+msgstr "" ++msgstr "Gre??ka! Shell nije valjan.\n" + +#: ../newrole/newrole.c:389 +#, c-format +msgid "Unable to clear environment\n" - msgstr "" - --#: ../newrole/newrole.c:355 -+#: ../newrole/newrole.c:436 ../newrole/newrole.c:513 - #, c-format - msgid "Error initing capabilities, aborting.\n" - msgstr "" - --#: ../newrole/newrole.c:369 -+#: ../newrole/newrole.c:444 ../newrole/newrole.c:519 ++msgstr "??i????enje okru??enje nije mogu??e\n" ++ ++#: ../newrole/newrole.c:436 ++#: ../newrole/newrole.c:513 ++#, c-format ++msgid "Error initing capabilities, aborting.\n" ++msgstr "Gre??ka pri inicijalizaciji sposobnosti. Bit ??e prekinuto.\n" ++ ++#: ../newrole/newrole.c:444 ++#: ../newrole/newrole.c:519 +#, c-format +msgid "Error setting capabilities, aborting\n" -+msgstr "" ++msgstr "Gre??ka pri postavljanju sposobnosti. Bit ??e prekinuto.\n" + +#: ../newrole/newrole.c:450 +#, c-format +msgid "Error setting KEEPCAPS, aborting\n" -+msgstr "" ++msgstr "Gre??ka postavljanju KEEPCAPS. Bit ??e prekinuto.\n" ++ ++#: ../newrole/newrole.c:458 ++#: ../newrole/newrole.c:531 ++#, c-format ++msgid "Error dropping capabilities, aborting\n" ++msgstr "Gre??ka pri ispu??tanju sposobnosti. Bit ??e prekinuto.\n" ++ ++#: ../newrole/newrole.c:464 ++#: ../newrole/newrole.c:562 ++#, c-format ++msgid "Error changing uid, aborting.\n" ++msgstr "Gre??ka pri izmjeni UID. Bit ??e prekinuto.\n" ++ ++#: ../newrole/newrole.c:470 ++#: ../newrole/newrole.c:525 ++#: ../newrole/newrole.c:557 ++#, c-format ++msgid "Error resetting KEEPCAPS, aborting\n" ++msgstr "Gre??ka vra??anju KEEPCAPS na izvorne postavke. Bit ??e prekinuto.\n" + -+#: ../newrole/newrole.c:458 ../newrole/newrole.c:531 - #, c-format - msgid "Error dropping capabilities, aborting\n" - msgstr "" - --#: ../newrole/newrole.c:376 -+#: ../newrole/newrole.c:464 ../newrole/newrole.c:562 - #, c-format - msgid "Error changing uid, aborting.\n" - msgstr "" - --#: ../newrole/newrole.c:383 -+#: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557 - #, c-format - msgid "Error resetting KEEPCAPS, aborting\n" - msgstr "" - --#: ../newrole/newrole.c:391 +#: ../newrole/newrole.c:477 - #, c-format - msgid "Error dropping SETUID capability, aborting\n" - msgstr "" [...86571 lines suppressed...] --#: ../semanage/seobject.py:1117 ../semanage/seobject.py:1121 -+#: ../semanage/seobject.py:1120 ../semanage/seobject.py:1124 - #, python-format - msgid "Could not modify file context for %s" - msgstr "" +@@ -186,7 +186,7 @@ + #: ../newrole/newrole.c:824 + #, c-format + msgid "failed to get new context.\n" +-msgstr "???? ???????????????? ???????????????? ?????????? context.\n" ++msgstr "???? ???????????????? ???????????????? ?????????? ????????????????.\n" --#: ../semanage/seobject.py:1139 -+#: ../semanage/seobject.py:1142 - #, python-format - msgid "File context for %s is defined in policy, cannot be deleted" - msgstr "" + #: ../newrole/newrole.c:831 + #, c-format +@@ -221,17 +221,17 @@ + #: ../newrole/newrole.c:872 + #, c-format + msgid "Unable to allocate memory for new_context" +-msgstr "" ++msgstr "???? ???????????????? ???????????????? ??????'?????? ?????? new_context" --#: ../semanage/seobject.py:1149 ../semanage/seobject.py:1153 -+#: ../semanage/seobject.py:1152 ../semanage/seobject.py:1156 - #, python-format - msgid "Could not delete file context for %s" - msgstr "" + #: ../newrole/newrole.c:898 + #, c-format + msgid "Unable to obtain empty signal set\n" +-msgstr "" ++msgstr "???? ???????????????? ???????????????? ???????????????? ???????????? ??????\n" --#: ../semanage/seobject.py:1161 -+#: ../semanage/seobject.py:1164 - msgid "Could not list file contexts" - msgstr "" + #: ../newrole/newrole.c:906 + #, c-format + msgid "Unable to set SIGHUP handler\n" +-msgstr "" ++msgstr "???? ???????????????? ???????????????????? ???????????????? SIGHUP\n" --#: ../semanage/seobject.py:1165 -+#: ../semanage/seobject.py:1168 - msgid "Could not list local file contexts" - msgstr "" + #: ../newrole/newrole.c:972 + #, c-format +@@ -271,12 +271,12 @@ + #: ../newrole/newrole.c:1059 ../newrole/newrole.c:1082 + #, c-format + msgid "Unable to restore tty label...\n" +-msgstr "" ++msgstr "???? ???????????????? ?????????????????? ???????????????? tty...\n" --#: ../semanage/seobject.py:1200 -+#: ../semanage/seobject.py:1203 - msgid "Requires value" - msgstr "" + #: ../newrole/newrole.c:1061 ../newrole/newrole.c:1088 +-#, fuzzy, c-format ++#, c-format + msgid "Failed to close tty properly\n" +-msgstr "?????????????? ???????????????????????? ???????????? ???????? %s\n" ++msgstr "???? ???????????????? ?????????????????? ?????????????? tty\n" --#: ../semanage/seobject.py:1208 ../semanage/seobject.py:1242 --#: ../semanage/seobject.py:1248 -+#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1245 -+#: ../semanage/seobject.py:1251 - #, python-format - msgid "Could not check if boolean %s is defined" - msgstr "" + #: ../newrole/newrole.c:1117 + #, c-format +@@ -284,9 +284,9 @@ + msgstr "???? ???????????????? ?????????????? ????????????????????.\n" --#: ../semanage/seobject.py:1210 ../semanage/seobject.py:1244 -+#: ../semanage/seobject.py:1213 ../semanage/seobject.py:1247 - #, python-format - msgid "Boolean %s is not defined" - msgstr "" + #: ../newrole/newrole.c:1140 +-#, fuzzy, c-format ++#, c-format + msgid "Error allocating shell's argv0.\n" +-msgstr "?????????????? ?????? ?????????????????? ??????'??????.\n" ++msgstr "?????????????? ?????????????????? argv0 ?? ????????????????.\n" --#: ../semanage/seobject.py:1214 -+#: ../semanage/seobject.py:1217 - #, python-format - msgid "Could not query file context %s" - msgstr "" + #: ../newrole/newrole.c:1147 ../run_init/run_init.c:405 + #, c-format +@@ -296,7 +296,7 @@ + #: ../newrole/newrole.c:1173 + #, c-format + msgid "Unable to restore the environment, aborting\n" +-msgstr "" ++msgstr "???? ???????????????? ?????????????????? ????????????????, ?????????????????? ??????????????????\n" --#: ../semanage/seobject.py:1226 ../semanage/seobject.py:1230 -+#: ../semanage/seobject.py:1229 ../semanage/seobject.py:1233 - #, python-format - msgid "Could not modify boolean %s" - msgstr "" + #: ../newrole/newrole.c:1184 + msgid "failed to exec shell\n" +@@ -313,9 +313,9 @@ + " - ?????????????????? ?????? ?????????? ????????????????." --#: ../semanage/seobject.py:1250 -+#: ../semanage/seobject.py:1253 - #, python-format - msgid "Boolean %s is defined in policy, cannot be deleted" - msgstr "" + #: ../run_init/run_init.c:139 +-#, fuzzy, c-format ++#, c-format + msgid "failed to get account information\n" +-msgstr "???? ???????????????? ???????????????? ?????????? context.\n" ++msgstr "???? ???????????????? ???????????????? ???????????????????? ?????? ?????????????????? ??????????????\n" --#: ../semanage/seobject.py:1258 ../semanage/seobject.py:1262 -+#: ../semanage/seobject.py:1261 ../semanage/seobject.py:1265 - #, python-format - msgid "Could not delete boolean %s" - msgstr "" + #: ../run_init/run_init.c:275 + #, c-format +@@ -489,7 +489,7 @@ --#: ../semanage/seobject.py:1270 -+#: ../semanage/seobject.py:1273 - msgid "Could not list booleans" - msgstr "" + #: ../semanage/seobject.py:218 + msgid "SELinux policy is not managed or store cannot be accessed." +-msgstr "???????????????? SELinux ???? ?? ?????????????????????? ?????? ?????????? ?????????????? ???? ????????????????." ++msgstr "???????????????? SELinux ???? ?? ?????????????????????? ?????? ?????????? ?????????????? ???? ??????????????." -@@ -947,17 +1002,17 @@ - msgid "Generating type enforcment file: %s.te" - msgstr "" + #: ../semanage/seobject.py:223 + msgid "Cannot read policy store." +@@ -621,9 +621,9 @@ + msgstr "???? ???????????????? ???????????????????? ???????????? MLS ?????? %s" --#: ../audit2allow/audit2allow:188 -+#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194 - msgid "Compiling policy" - msgstr "" + #: ../semanage/seobject.py:463 ../semanage/seobject.py:530 +-#, fuzzy, python-format ++#, python-format + msgid "Invalid prefix %s" +-msgstr "?????????????????????? ???????????????? %s" ++msgstr "???????????????????????? ?????????????? %s" --#: ../audit2allow/audit2allow:199 -+#: ../audit2allow/audit2allow:205 - msgid "" - "\n" - "******************** IMPORTANT ***********************\n" - msgstr "" + #: ../semanage/seobject.py:466 + #, python-format +@@ -962,9 +962,8 @@ + msgstr "???? ???????????????? ???????????????? ???????????? ???????????????????? ????????????" --#: ../audit2allow/audit2allow:200 -+#: ../audit2allow/audit2allow:206 - #, c-format - msgid "" - "In order to load this newly created policy package into the kernel,\n" -@@ -967,7 +1022,7 @@ - "\n" - msgstr "" + #: ../semanage/seobject.py:1168 +-#, fuzzy + msgid "Could not list local file contexts" +-msgstr "???? ???????????????? ???????????????? ???????????? ???????????????????? ????????????" ++msgstr "???? ???????????????? ???????????????? ???????????? ?????????????????? ???????????????????? ????????????" --#: ../audit2allow/audit2allow:207 -+#: ../audit2allow/audit2allow:211 - #, c-format - msgid "Options Error: %s " - msgstr "" + #: ../semanage/seobject.py:1203 + msgid "Requires value" policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 semanage/seobject.py | 10 18 files changed, 4803 insertions(+), 9 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- policycoreutils-rhat.patch 17 Jan 2007 16:14:32 -0000 1.275 +++ policycoreutils-rhat.patch 24 Jan 2007 15:06:30 -0000 1.276 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.14/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.15/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/booleansPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/booleansPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -201,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.14/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.15/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/fcontextPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/fcontextPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -363,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.14/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.15/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/loginsPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/loginsPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -528,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.14/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.15/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/Makefile 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/Makefile 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -562,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.14/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.15/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/mappingsPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/mappingsPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -620,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.14/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.15/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/modulesPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/modulesPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -785,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.14/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.15/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/portsPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/portsPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -886,7 +886,7 @@ + self.ports_properties_button.set_sensitive(self.edit) + self.ports_delete_button.set_sensitive(self.edit) + self.mls_col.set_visible(self.edit) -+ if on: ++ if self.edit: + self.load() + else: + self.group_load() @@ -1003,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.14/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.15/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/selinux.tbl 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/selinux.tbl 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1272,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.14/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.15/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/semanagePage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/semanagePage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1385,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.14/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.15/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/statusPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/statusPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1602,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.14/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.15/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/system-config-selinux.glade 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/system-config-selinux.glade 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4409,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.14/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.15/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/system-config-selinux.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/system-config-selinux.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4569,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.14/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.15/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/translationsPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/translationsPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4682,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.14/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.15/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.14/gui/usersPage.py 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/gui/usersPage.py 2007-01-24 09:58:03.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4841,18 +4841,18 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.14/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.15/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.14/Makefile 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/Makefile 2007-01-24 09:58:03.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.14/restorecond/restorecond.c +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.15/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.14/restorecond/restorecond.c 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/restorecond/restorecond.c 2007-01-24 09:58:03.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4879,18 +4879,18 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.14/restorecond/restorecond.conf +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.15/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.14/restorecond/restorecond.conf 2007-01-16 15:13:02.000000000 -0500 ++++ policycoreutils-1.33.15/restorecond/restorecond.conf 2007-01-24 09:58:03.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.14/semanage/seobject.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.15/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2007-01-17 11:11:34.000000000 -0500 -+++ policycoreutils-1.33.14/semanage/seobject.py 2007-01-16 15:16:27.000000000 -0500 ++++ policycoreutils-1.33.15/semanage/seobject.py 2007-01-24 09:58:03.000000000 -0500 @@ -209,7 +209,8 @@ os.write(fd, self.out()) os.close(fd) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- policycoreutils.spec 17 Jan 2007 16:14:32 -0000 1.362 +++ policycoreutils.spec 24 Jan 2007 15:06:32 -0000 1.363 @@ -4,7 +4,7 @@ %define libselinuxver 1.33.4-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.33.15 +Version: 1.34.1 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -168,6 +168,12 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Wed Jan 24 2007 Dan Walsh 1.34.1-1 +- Fix system-config-selinux ports view +- Update to upstream + * Fixed newrole non-pam build. + * Updated version for stable branch. + * Wed Jan 17 2007 Dan Walsh 1.33.15-1 - Update to upstream * Merged unicode-to-string fix for seobject audit from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- sources 17 Jan 2007 16:14:32 -0000 1.138 +++ sources 24 Jan 2007 15:06:32 -0000 1.139 @@ -1 +1 @@ -a2d797ed6d1ef30a10c7ddfc03cc4af8 policycoreutils-1.33.15.tgz +eff759f488ec2ad7dc996ce882527b96 policycoreutils-1.34.1.tgz From fedora-cvs-commits at redhat.com Wed Jan 24 15:08:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:08:12 -0500 Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.17,1.18 Message-ID: <200701241508.l0OF8C5J016084@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-user-share/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15955 Modified Files: gnome-user-share.spec Log Message: better desktop file categories Index: gnome-user-share.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-user-share.spec 24 Jan 2007 15:06:14 -0000 1.17 +++ gnome-user-share.spec 24 Jan 2007 15:08:07 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Gnome user file sharing Name: gnome-user-share Version: 0.10 -Release: 5 +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.gnome.org @@ -77,6 +77,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Wed Jan 24 2007 Matthias Clasen 0.10-6 +- Add better categories to the desktop file + * Sun Oct 01 2006 Jesse Keating - 0.10-5 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 From fedora-cvs-commits at redhat.com Wed Jan 24 15:19:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:19:10 -0500 Subject: rpms/aspell-es/devel aspell-es.spec,1.21,1.22 Message-ID: <200701241519.l0OFJACL009867@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-es/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8095 Modified Files: aspell-es.spec Log Message: - spec file cleanup Index: aspell-es.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-es/devel/aspell-es.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- aspell-es.spec 12 Jul 2006 05:18:11 -0000 1.21 +++ aspell-es.spec 24 Jan 2007 15:19:07 -0000 1.22 @@ -1,10 +1,10 @@ %define lang es %define langrelease 2 -Summary: Spanish dictionaries for Aspell. +Summary: Spanish dictionaries for Aspell Name: aspell-%{lang} Epoch: 50 Version: 0.50 -Release: 13.2.2 +Release: 14%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -21,7 +21,6 @@ Provides the word list/dictionaries for the following: Spanish %prep -rm -rf $RPM_BUILD_ROOT %setup -q -n aspell-%{lang}-%{version}-%{langrelease} %patch -p1 -b .utf-filename %patch1 -p1 -b .pom @@ -38,6 +37,7 @@ make %install +rm -rf $RPM_BUILD_ROOT make install @@ -48,9 +48,11 @@ %defattr(-,root,root) %{_libdir}/aspell-0.60/* -#%{_datadir}/aspell/* %changelog +* Wed Jan 24 2007 Ivana Varekova - 50:0.50-14 +- spec file cleanup + * Wed Jul 12 2006 Jesse Keating - 50:0.50-13.2.2 - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 15:24:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:24:22 -0500 Subject: rpms/libwvstreams/devel libwvstreams-4.2.1-gcc41.patch, 1.3, 1.4 libwvstreams.spec, 1.22, 1.23 libwvstreams-3.69-redhat.patch, 1.1, NONE libwvstreams-3.70-openssl097.patch, 1.2, NONE libwvstreams-3.75.0-gcc34.patch, 1.1, NONE libwvstreams-3.75.0-gcc4.patch, 1.1, NONE libwvstreams-3.75.0-stringbuf.patch, 1.1, NONE Message-ID: <200701241524.l0OFOMLr014926@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/libwvstreams/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14850 Modified Files: libwvstreams-4.2.1-gcc41.patch libwvstreams.spec Removed Files: libwvstreams-3.69-redhat.patch libwvstreams-3.70-openssl097.patch libwvstreams-3.75.0-gcc34.patch libwvstreams-3.75.0-gcc4.patch libwvstreams-3.75.0-stringbuf.patch Log Message: - fixed code for new g++ version libwvstreams-4.2.1-gcc41.patch: gnulib/argp.h | 2 +- include/uniconfkey.h | 2 +- include/wvhttppool.h | 2 +- include/wvstring.h | 2 +- include/wvvector.h | 2 +- include/wvx509.h | 10 +++++----- utils/wvhash.cc | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) Index: libwvstreams-4.2.1-gcc41.patch =================================================================== RCS file: /cvs/dist/rpms/libwvstreams/devel/libwvstreams-4.2.1-gcc41.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libwvstreams-4.2.1-gcc41.patch 24 May 2006 11:08:50 -0000 1.3 +++ libwvstreams-4.2.1-gcc41.patch 24 Jan 2007 15:24:15 -0000 1.4 @@ -80,3 +80,14 @@ extern void __argp_usage (__const struct argp_state *__state); /* If appropriate, print the printf string FMT and following args, preceded +--- wvstreams-4.2.2/include/wvvector.h.gcc5 2007-01-24 16:10:50.000000000 +0100 ++++ wvstreams-4.2.2/include/wvvector.h 2007-01-24 16:14:47.000000000 +0100 +@@ -347,7 +347,7 @@ + } + + /** A simple iterator that walks through all elements in the list. */ +- class Iter : public WvVector::IterBase ++ class Iter : public WvVectorBase::IterBase + { + public: + /** Binds the iterator to the specified vector. */ Index: libwvstreams.spec =================================================================== RCS file: /cvs/dist/rpms/libwvstreams/devel/libwvstreams.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libwvstreams.spec 12 Jul 2006 06:59:14 -0000 1.22 +++ libwvstreams.spec 24 Jan 2007 15:24:15 -0000 1.23 @@ -1,6 +1,6 @@ Name: libwvstreams Version: 4.2.2 -Release: 2.1 +Release: 3%{?dist} Summary: WvStreams is a network programming library written in C++. Source: http://open.nit.ca/download/wvstreams-%{version}.tar.gz Patch1: libwvstreams-3.70-gcc3.patch @@ -52,7 +52,7 @@ touch configure %configure --with-pam --with-openssl --without-fam --without-fftw --without-gdbm --without-pgg --without-tcl --without-swig --without-qt --without-speex --without-vorbis --with-xplc --disable-static -make COPTS="$RPM_OPT_FLAGS -fPIC" CXXOPTS="$RPM_OPT_FLAGS -fPIC" VERBOSE=1 +make COPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" VERBOSE=1 %install rm -rf $RPM_BUILD_ROOT @@ -96,6 +96,9 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jan 24 2007 Harald Hoyer - 4.2.2-3 +- fixed code for new g++ version + * Wed Jul 12 2006 Jesse Keating - 4.2.2-2.1 - rebuild --- libwvstreams-3.69-redhat.patch DELETED --- --- libwvstreams-3.70-openssl097.patch DELETED --- --- libwvstreams-3.75.0-gcc34.patch DELETED --- --- libwvstreams-3.75.0-gcc4.patch DELETED --- --- libwvstreams-3.75.0-stringbuf.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 24 15:27:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:27:11 -0500 Subject: rpms/aspell-es/devel aspell-es.spec,1.22,1.23 Message-ID: <200701241527.l0OFRBIP016918@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-es/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16581 Modified Files: aspell-es.spec Log Message: - fix 224147 - rawhide rebuild fails Index: aspell-es.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-es/devel/aspell-es.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- aspell-es.spec 24 Jan 2007 15:19:07 -0000 1.22 +++ aspell-es.spec 24 Jan 2007 15:27:08 -0000 1.23 @@ -25,7 +25,7 @@ %patch -p1 -b .utf-filename %patch1 -p1 -b .pom cp esponol.alias castellano.alias -mv $(echo -e 'espa\361ol.alias') $(echo -e 'espa\303\261ol.alias') +cp esponol.alias $(echo -e 'espa\303\261ol.alias') %build echo "ASPELL = aspell" > Makefile @@ -52,6 +52,7 @@ %changelog * Wed Jan 24 2007 Ivana Varekova - 50:0.50-14 - spec file cleanup +- fix 224147 - rawhide rebuild fails * Wed Jul 12 2006 Jesse Keating - 50:0.50-13.2.2 - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 15:38:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:38:15 -0500 Subject: rpms/aspell-es/devel aspell-es.spec,1.23,1.24 Message-ID: <200701241538.l0OFcFo0024035@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-es/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23376 Modified Files: aspell-es.spec Log Message: fix another build problem Index: aspell-es.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-es/devel/aspell-es.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- aspell-es.spec 24 Jan 2007 15:27:08 -0000 1.23 +++ aspell-es.spec 24 Jan 2007 15:38:13 -0000 1.24 @@ -25,7 +25,7 @@ %patch -p1 -b .utf-filename %patch1 -p1 -b .pom cp esponol.alias castellano.alias -cp esponol.alias $(echo -e 'espa\303\261ol.alias') +cp esponol.alias espa??ol.alias %build echo "ASPELL = aspell" > Makefile From fedora-cvs-commits at redhat.com Wed Jan 24 15:49:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:49:25 -0500 Subject: rpms/aspell-no/devel aspell-no.spec,1.20,1.21 Message-ID: <200701241549.l0OFnPqB010908@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-no/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10894 Modified Files: aspell-no.spec Log Message: - spec file cleanup - fix 224147 - rawhide rebuild fails Index: aspell-no.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-no/devel/aspell-no.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- aspell-no.spec 12 Jul 2006 05:20:30 -0000 1.20 +++ aspell-no.spec 24 Jan 2007 15:49:23 -0000 1.21 @@ -1,11 +1,11 @@ %define lang nb %define langrelease 0 -Summary: Norwegian dictionaries for Aspell. +Summary: Norwegian dictionaries for Aspell #Name: aspell-%{lang} Name: aspell-no Epoch: 50 Version: 0.50.1 -Release: 9.2.2 +Release: 10%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -21,10 +21,9 @@ Provides the word list/dictionaries for the following: Norwegian %prep -rm -rf $RPM_BUILD_ROOT %setup -q -n aspell-%{lang}-%{version}-%{langrelease} %patch -p1 -b .utf-filename -mv $(echo -e 'bokm\345l.alias') $(echo -e 'bokm\303\245l.alias') +cp bokmal.alias bokm??l.alias %build echo "ASPELL = aspell" > Makefile @@ -36,6 +35,7 @@ make %install +rm -rf $RPM_BUILD_ROOT make install cp ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/nb.multi ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/no.multi @@ -46,9 +46,12 @@ %defattr(-,root,root) %{_libdir}/aspell-0.60/* -#%{_datadir}/aspell/* %changelog +* Wed Jan 24 2007 Ivana Varekova - 50:0.50.1-10 +- spec file cleanup +- fix 224147 - rawhide rebuild fails + * Wed Jul 12 2006 Jesse Keating - 50:0.50.1-9.2.2 - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 15:55:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:55:29 -0500 Subject: rpms/aspell-pt/devel aspell-pt.spec,1.16,1.17 Message-ID: <200701241555.l0OFtTnm011190@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-pt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11157 Modified Files: aspell-pt.spec Log Message: - spec file cleanup - fix 224147 - rawhide rebuild fails Index: aspell-pt.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-pt/devel/aspell-pt.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- aspell-pt.spec 12 Jul 2006 05:21:16 -0000 1.16 +++ aspell-pt.spec 24 Jan 2007 15:55:27 -0000 1.17 @@ -1,10 +1,10 @@ %define lang pt %define langrelease 2 -Summary: Portuguese dictionaries for Aspell. +Summary: Portuguese dictionaries for Aspell Name: aspell-%{lang} Epoch: 50 Version: 0.50 -Release: 10.2.2 +Release: 11%{?dist} License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -22,11 +22,10 @@ Brazilian Portuguese %prep -rm -rf $RPM_BUILD_ROOT %setup -q -n aspell-%{lang}-%{version}-%{langrelease} %patch -p1 -b .utf-filename %patch2 -p1 -b .brasileiro -mv $(echo -e 'portugu\352s.alias') $(echo -e 'portugu\303\252s.alias') +cp portuguese.alias portugu??s.alias %build echo "ASPELL = aspell" > Makefile @@ -38,6 +37,7 @@ make %install +rm -rf $RPM_BUILD_ROOT make install @@ -48,9 +48,12 @@ %defattr(-,root,root) %{_libdir}/aspell-0.60/* -#%{_datadir}/aspell/* %changelog +* Wed Jan 24 2007 Ivana Varekova - 50:0.50-11 +- spec file cleanup +- fix 224147 - rawhide rebuild fails + * Wed Jul 12 2006 Jesse Keating - 50:0.50-10.2.2 - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 15:56:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 10:56:26 -0500 Subject: rpms/gnome-spell/devel gnome-spell-1.0.7-multilib.patch, 1.1, 1.2 gnome-spell.spec, 1.23, 1.24 gnome-spell-1.0.2-pspell-compat.patch, 1.1, NONE gnome-spell-1.0.7-langlist.patch, 1.1, NONE Message-ID: <200701241556.l0OFuQWu011289@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-spell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11259 Modified Files: gnome-spell-1.0.7-multilib.patch gnome-spell.spec Removed Files: gnome-spell-1.0.2-pspell-compat.patch gnome-spell-1.0.7-langlist.patch Log Message: * Wed Jan 24 2007 Matthew Barnes - 1.0.7-4.fc7 - Clean up spec file, remove unused patches. - Revise multilib patch so that we no longer have to run the autotools before building (RH bug #224160). gnome-spell-1.0.7-multilib.patch: configure | 11 +++++------ configure.in | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) Index: gnome-spell-1.0.7-multilib.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell-1.0.7-multilib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-spell-1.0.7-multilib.patch 16 May 2006 15:56:27 -0000 1.1 +++ gnome-spell-1.0.7-multilib.patch 24 Jan 2007 15:56:23 -0000 1.2 @@ -1,5 +1,29 @@ +--- gnome-spell-1.0.7/configure.multilib 2007-01-24 10:26:50.000000000 -0500 ++++ gnome-spell-1.0.7/configure 2007-01-24 10:29:32.000000000 -0500 +@@ -21830,16 +21830,15 @@ + + if test "x$with_aspell_prefix" != "x"; then + saved_LDFLAGS=$LDFLAGS +- LDFLAGS="-L$with_aspell_prefix/lib "$LDFLAGS ++ LDFLAGS="-L$with_aspell_prefix/${_lib:-lib} "$LDFLAGS + ASPELL_INC="-I$with_aspell_prefix/include" +- ASPELL_LIBS="-L$with_aspell_prefix/lib -laspell" +- ASPELL_DATA="$with_aspell_prefix/lib/aspell" ++ ASPELL_LIBS="-L$with_aspell_prefix/${_lib:-lib} -laspell" + else +- LDFLAGS="-L`aspell config prefix`/lib "$LDFLAGS ++ LDFLAGS="-L`aspell config prefix`/${_lib:-lib} "$LDFLAGS + ASPELL_INC="-I`aspell config prefix`/include" +- ASPELL_LIBS="-L`aspell config prefix`/lib -laspell" +- ASPELL_DICT="`aspell config dict-dir`" ++ ASPELL_LIBS="-L`aspell config prefix`/${_lib:-lib} -laspell" + fi ++ASPELL_DICT="`aspell config dict-dir`" + + echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5 + echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6 --- gnome-spell-1.0.7/configure.in.multilib 2006-02-10 06:46:32.000000000 -0500 -+++ gnome-spell-1.0.7/configure.in 2006-05-16 00:20:11.000000000 -0400 ++++ gnome-spell-1.0.7/configure.in 2007-01-24 10:29:24.000000000 -0500 @@ -76,16 +76,15 @@ if test "x$with_aspell_prefix" != "x"; then Index: gnome-spell.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnome-spell.spec 12 Jul 2006 06:09:45 -0000 1.23 +++ gnome-spell.spec 24 Jan 2007 15:56:23 -0000 1.24 @@ -1,23 +1,31 @@ -Summary: Bonobo component for spell checking +### Abstract ### + Name: gnome-spell Version: 1.0.7 -Release: 3.1 -Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2 -# XXX The pspell compatability layer was added three years ago. -# Disable it for now (1.0.7-2) and remove it in the next update. -#Patch0: gnome-spell-1.0.2-pspell-compat.patch -#Patch1: gnome-spell-1.0.7-langlist.patch -Patch2: gnome-spell-1.0.7-multilib.patch +Release: 4%{?dist} License: GPL Group: Applications/Text +Summary: Bonobo component for spell checking BuildRoot: %{_tmppath}/%{name}-root -Requires: libgnomeui, libbonoboui, libglade2 -BuildRequires: aspell-devel, intltool >= 0.11, gettext -BuildRequires: libgnomeui-devel, libbonoboui-devel, libglade2-devel - -# for aspell back patch -#BuildRequires: autoconf, /usr/bin/automake-1.4 -BuildRequires: autoconf, automake +Source: gnome-spell-%{version}.tar.bz2 + +### Patches ### + +Patch1: gnome-spell-1.0.7-multilib.patch + +### Dependencies ### + +Requires: libbonoboui +Requires: libglade2 +Requires: libgnomeui + +### Build Dependencies ### + +BuildRequires: aspell-devel +BuildRequires: gettext +BuildRequires: libbonoboui-devel +BuildRequires: libglade2-devel +BuildRequires: libgnomeui-devel %description Gnome Spell is GNOME/Bonobo component for spell checking. In current @@ -26,16 +34,10 @@ It's based on pspell package, which is required to build gnome-spell. %prep -%setup -q -#%patch0 -p1 -b .pspell-compat -#%patch1 -p1 -b .langlist -%patch2 -p1 -b .multilib +%setup -q -n gnome-spell-%{version} +%patch1 -p1 -b .multilib %build -autoheader -#automake-1.4 -automake -autoconf export _lib=%{_lib} %configure make @@ -51,12 +53,12 @@ sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done -%{find_lang} %{name}-%{version} +%{find_lang} gnome-spell-%{version} %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}-%{version}.lang +%files -f gnome-spell-%{version}.lang %defattr(-,root,root) %doc README COPYING ChangeLog NEWS AUTHORS INSTALL %dir %{_libdir}/gnome-spell @@ -67,6 +69,11 @@ %{_datadir}/idl/* %changelog +* Wed Jan 24 2007 Matthew Barnes - 1.0.7-4.fc7 +- Clean up spec file, remove unused patches. +- Revise multilib patch so that we no longer have to run the autotools + before building (RH bug #224160). + * Wed Jul 12 2006 Jesse Keating - 1.0.7-3.1 - rebuild --- gnome-spell-1.0.2-pspell-compat.patch DELETED --- --- gnome-spell-1.0.7-langlist.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 24 16:13:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:13:14 -0500 Subject: rpms/gnome-spell/devel gnome-spell.spec,1.24,1.25 Message-ID: <200701241613.l0OGDEn9011949@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gnome-spell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11934 Modified Files: gnome-spell.spec Log Message: - Put back the intltool BR. Index: gnome-spell.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnome-spell.spec 24 Jan 2007 15:56:23 -0000 1.24 +++ gnome-spell.spec 24 Jan 2007 16:13:11 -0000 1.25 @@ -23,6 +23,7 @@ BuildRequires: aspell-devel BuildRequires: gettext +BuildRequires: intltool BuildRequires: libbonoboui-devel BuildRequires: libglade2-devel BuildRequires: libgnomeui-devel From fedora-cvs-commits at redhat.com Wed Jan 24 16:15:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:15:23 -0500 Subject: rpms/flex/devel .cvsignore, 1.2, 1.3 flex.spec, 1.31, 1.32 sources, 1.2, 1.3 flex-2.5.4-glibc22.patch, 1.1, NONE flex-2.5.4a-Makefile.in.patch, 1.1, NONE flex-2.5.4a-gcc3.patch, 1.1, NONE flex-2.5.4a-gcc31.patch, 1.2, NONE flex-2.5.4a-posix.patch, 1.1, NONE flex-2.5.4a-skel.patch, 1.1, NONE flex-2.5.4a2-iniscan.patch, 1.1, NONE flex-2.5.4a2-shapwarn.patch, 1.1, NONE flex-2.5.4a2-std.patch, 1.1, NONE flex-2.5.4a2-warn.patch, 1.1, NONE flex-2.5.4a2.patch, 1.1, NONE flex-pic.patch, 1.1, NONE Message-ID: <200701241615.l0OGFNh0012052@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12012 Modified Files: .cvsignore flex.spec sources Removed Files: flex-2.5.4-glibc22.patch flex-2.5.4a-Makefile.in.patch flex-2.5.4a-gcc3.patch flex-2.5.4a-gcc31.patch flex-2.5.4a-posix.patch flex-2.5.4a-skel.patch flex-2.5.4a2-iniscan.patch flex-2.5.4a2-shapwarn.patch flex-2.5.4a2-std.patch flex-2.5.4a2-warn.patch flex-2.5.4a2.patch flex-pic.patch Log Message: - Rebase to 2.5.33 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/flex/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 04:46:06 -0000 1.2 +++ .cvsignore 24 Jan 2007 16:15:21 -0000 1.3 @@ -1 +1 @@ -flex-2.5.4a.tar.gz +flex-2.5.33.tar.bz2 Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- flex.spec 18 Jul 2006 21:11:42 -0000 1.31 +++ flex.spec 24 Jan 2007 16:15:21 -0000 1.32 @@ -1,25 +1,13 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex -Version: 2.5.4a -Release: 41%{?dist} +Version: 2.5.33 +Release: 1%{?dist} 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 -Patch0: flex-2.5.4a-skel.patch -Patch1: flex-2.5.4-glibc22.patch -Patch2: flex-2.5.4a-gcc3.patch -Patch3: flex-2.5.4a-gcc31.patch -Patch4: flex-2.5.4a2.patch -Patch5: flex-pic.patch -Patch6: flex-2.5.4a2-std.patch -Patch7: flex-2.5.4a2-warn.patch -Patch8: flex-2.5.4a2-shapwarn.patch -Patch9: flex-2.5.4a2-iniscan.patch -Patch10: flex-2.5.4a-Makefile.in.patch -#Patch11: flex-2.5.4a-posix.patch -BuildRequires: autoconf, byacc +URL: http://flex.sourceforge.net/ +Source: http://puzzle.dl.sourceforge.net/sourceforge/flex/flex-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: gettext info byacc %description The flex program generates scanners. Scanners are programs which can @@ -36,40 +24,35 @@ application development. %prep -%setup -q -n %{name}-2.5.4 -%patch0 -p1 -%patch1 -p1 -b .glibc22 -%patch2 -p1 -b .glib3 -%patch3 -p1 -b .gcc31 -%patch4 -p1 -b .yynoinput -%patch5 -p1 -b .pic -%patch6 -p1 -b .std -%patch7 -p1 -b .warn -%patch8 -p1 -b .shapwarn -%patch9 -p1 -b .iniscan -%patch10 -p1 -#%patch11 -p1 +%setup -q -n flex-%{version} %build -autoconf -%configure +%configure --disable-dependency-tracking make %install rm -rf $RPM_BUILD_ROOT - -%makeinstall mandir=$RPM_BUILD_ROOT/%{_mandir}/man1 +make DESTDIR=$RPM_BUILD_ROOT install ( cd ${RPM_BUILD_ROOT} ln -sf flex .%{_bindir}/lex + ln -sf flex .%{_bindir}/flex++ ln -s flex.1 .%{_mandir}/man1/lex.1 ln -s flex.1 .%{_mandir}/man1/flex++.1 ln -s libfl.a .%{_libdir}/libl.a ) +%find_lang flex + +%post +/sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||: + +%postun +/sbin/install-info --delete flex --dir-file=%{_infodir}/dir ||: + %check echo ============TESTING=============== -make bigcheck +make check echo ============END TESTING=========== %clean @@ -82,8 +65,13 @@ %{_mandir}/man1/* %{_libdir}/*.a %{_includedir}/FlexLexer.h +%{_infodir}/flex.info* +%{_datadir}/locale/* %changelog +* Fri Jan 19 2007 Petr Machata - 2.5.33-1 +- Rebase to 2.5.33 + * Tue Jul 18 2006 Petr Machata - 2.5.4a-41 - Reverting posix patch. Imposing posix because of warning is too much of a restriction. Index: sources =================================================================== RCS file: /cvs/dist/rpms/flex/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 04:46:06 -0000 1.2 +++ sources 24 Jan 2007 16:15:21 -0000 1.3 @@ -1 +1 @@ -bd8753d0b22e1f4ec87a553a73021adf flex-2.5.4a.tar.gz +343374a00b38d9e39d1158b71af37150 flex-2.5.33.tar.bz2 --- flex-2.5.4-glibc22.patch DELETED --- --- flex-2.5.4a-Makefile.in.patch DELETED --- --- flex-2.5.4a-gcc3.patch DELETED --- --- flex-2.5.4a-gcc31.patch DELETED --- --- flex-2.5.4a-posix.patch DELETED --- --- flex-2.5.4a-skel.patch DELETED --- --- flex-2.5.4a2-iniscan.patch DELETED --- --- flex-2.5.4a2-shapwarn.patch DELETED --- --- flex-2.5.4a2-std.patch DELETED --- --- flex-2.5.4a2-warn.patch DELETED --- --- flex-2.5.4a2.patch DELETED --- --- flex-pic.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 24 16:20:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:20:51 -0500 Subject: rpms/vino/devel vino-2.17.5-base64.patch, NONE, 1.1 vino-2.17.5-category.patch, NONE, 1.1 vino.spec, 1.46, 1.47 Message-ID: <200701241620.l0OGKp6R032565@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/vino/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32548 Modified Files: vino.spec Added Files: vino-2.17.5-base64.patch vino-2.17.5-category.patch Log Message: make it start vino-2.17.5-base64.patch: vino-preferences.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) --- NEW FILE vino-2.17.5-base64.patch --- --- vino-2.17.5/capplet/vino-preferences.c.base64 2007-01-07 12:29:18.000000000 -0500 +++ vino-2.17.5/capplet/vino-preferences.c 2007-01-24 10:59:37.000000000 -0500 @@ -455,12 +455,19 @@ if (!entry->value || entry->value->type != GCONF_VALUE_STRING) return; + password = NULL; + password_b64 = gconf_value_get_string (entry->value); - blob_len = 0; - blob = g_base64_decode (password_b64, &blob_len); + if (password_b64) + { + blob_len = 0; + blob = g_base64_decode (password_b64, &blob_len); + + password = g_strndup ((char *) blob, blob_len); - password = g_strndup ((char *) blob, blob_len); + g_free (blob); + } if (!password || !password [0]) { @@ -479,7 +486,6 @@ } g_free (password); - g_free (blob); } static void @@ -531,13 +537,16 @@ password_b64 = gconf_client_get_string (dialog->client, VINO_PREFS_VNC_PASSWORD, NULL); - blob_len = 0; - blob = g_base64_decode (password_b64, &blob_len); - - password = g_strndup ((char *) blob, blob_len); + if (password_b64) + { + blob_len = 0; + blob = g_base64_decode (password_b64, &blob_len); - g_free (blob); - g_free (password_b64); + password = g_strndup ((char *) blob, blob_len); + + g_free (blob); + g_free (password_b64); + } password_in_keyring = FALSE; } vino-2.17.5-category.patch: vino-preferences.desktop.in.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE vino-2.17.5-category.patch --- --- vino-2.17.5/capplet/vino-preferences.desktop.in.in.category 2007-01-24 11:14:15.000000000 -0500 +++ vino-2.17.5/capplet/vino-preferences.desktop.in.in 2007-01-24 11:14:54.000000000 -0500 @@ -7,7 +7,7 @@ Terminal=false Type=Application StartupNotify=true -Categories=GNOME;GTK;Application;Settings; +Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=vino Index: vino.spec =================================================================== RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- vino.spec 10 Jan 2007 18:40:43 -0000 1.46 +++ vino.spec 24 Jan 2007 16:20:49 -0000 1.47 @@ -4,13 +4,18 @@ %define gconf2_version 2.14.0 %define libgnomeui_version 2.6.0 %define libgcrypt_version 1.2.0 +%define libnotify_version 0.4.3 Summary: A remote desktop system for GNOME Name: vino Version: 2.17.5 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 +# http://bugzilla.gnome.org/show_bug.cgi?id=400260 +Patch0: vino-2.17.5-base64.patch +# fixed in upstream svn +Patch1: vino-2.17.5-category.patch License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,26 +24,19 @@ Requires(post): GConf2 >= %{gconf2_version} Requires(preun): GConf2 >= %{gconf2_version} -Requires: gtk2 >= %{gtk2_version} -Requires: libglade2 >= %{libglade2_version} -Requires: GConf2 >= %{gconf2_version} -Requires: libgnomeui >= %{libgnomeui_version} -Requires: libgcrypt >= %{libgcrypt_version} - BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgcrypt-devel >= %{libgcrypt_version} +BuildRequires: libnotify >= %{libnotify_version} BuildRequires: libXt-devel, libXtst-devel, libXdamage-devel, avahi-glib-devel BuildRequires: desktop-file-utils BuildRequires: perl-XML-Parser BuildRequires: gettext BuildRequires: dbus-glib-devel -Prereq: gtk2 >= %{gtk2_version} - %description Vino is a VNC server for GNOME. It allows remote users to @@ -46,13 +44,15 @@ %prep %setup -q +%patch0 -p1 -b .base64 %build -%configure \ - --enable-avahi \ - --disable-gnutls \ - --disable-session-support \ - --disable-http-server +%configure \ + --enable-avahi \ + --disable-gnutls \ + --disable-session-support \ + --disable-http-server \ + --enable-libnotify make %install @@ -114,6 +114,11 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Jan 24 2007 Matthias Clasen - 2.17.5-2 +- Fix some careless gconf value handling +- use libnotify +- Improve category in the desktop file + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 From fedora-cvs-commits at redhat.com Wed Jan 24 16:37:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:37:26 -0500 Subject: rpms/coreutils/FC-6 coreutils-223869.patch, NONE, 1.1 coreutils.spec, 1.149, 1.150 Message-ID: <200701241637.l0OGbQGu017461@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17413 Modified Files: coreutils.spec Added Files: coreutils-223869.patch Log Message: * Wed Jan 24 2007 Tim Waugh - Fixed wrong error message (bug #223869). - Resolves: rhbz#223869 coreutils-223869.patch: THANKS | 1 + src/copy.c | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) --- NEW FILE coreutils-223869.patch --- --- coreutils-5.97/src/copy.c.223869 2007-01-24 16:33:24.000000000 +0000 +++ coreutils-5.97/src/copy.c 2007-01-24 16:33:33.000000000 +0000 @@ -1352,18 +1352,7 @@ /* This happens when attempting to rename a directory to a subdirectory of itself. */ - if (errno == EINVAL - - /* When src_name is on an NFS file system, some types of - clients, e.g., SunOS4.1.4 and IRIX-5.3, set errno to EIO - instead. Testing for this here risks misinterpreting a real - I/O error as an attempt to move a directory into itself, so - FIXME: consider not doing this. */ - || errno == EIO - - /* And with SunOS-4.1.4 client and OpenBSD-2.3 server, - we get ENOTEMPTY. */ - || errno == ENOTEMPTY) + if (errno == EINVAL) { /* FIXME: this is a little fragile in that it relies on rename(2) failing with a specific errno value. Expect problems on --- coreutils-5.97/THANKS.223869 2006-01-10 09:16:28.000000000 +0000 +++ coreutils-5.97/THANKS 2007-01-24 16:33:33.000000000 +0000 @@ -148,6 +148,7 @@ Felix Lee flee at teleport.com Ferdinand fw at scenic.mine.nu Fletcher Mattox fletcher at cs.utexas.edu +Florent Bayle florent at sarcelle.net Florin Iucha fiucha at hsys.mic.ro Fran??ois Pinard pinard at iro.umontreal.ca Frank Adler fadler at allesklar.de Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/FC-6/coreutils.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- coreutils.spec 10 Jan 2007 15:01:33 -0000 1.149 +++ coreutils.spec 24 Jan 2007 16:37:24 -0000 1.150 @@ -23,6 +23,7 @@ Patch1: coreutils-sort-compatibility.patch Patch2: coreutils-rename.patch Patch3: coreutils-cut-coredump.patch +Patch4: coreutils-223869.patch Patch10: coreutils-newhashes.patch # Our patches @@ -84,6 +85,7 @@ %patch1 -p1 -b .sort-compatibility %patch2 -p1 -b .rename %patch3 -p1 -b .cut-coredump +%patch4 -p1 -b .223869 %patch10 -p1 -b .newhashes # Our patches @@ -286,6 +288,9 @@ /sbin/runuser %changelog +* Wed Jan 24 2007 Tim Waugh +- Fixed wrong error message (bug #223869). + * Wed Jan 10 2007 Tim Waugh 5.97-12.3 - Prevent a cut(1) crash (bug #220312). From fedora-cvs-commits at redhat.com Wed Jan 24 16:39:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:39:38 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch,1.7,1.8 Message-ID: <200701241639.l0OGdcfW018961@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18929 Modified Files: policy-20070102.patch Log Message: * Mon Jan 22 2007 Dan Walsh 2.5.1-5 - Continue fixing, additional user domains policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 83 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 + policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 52 +++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 198 ++++++++++++- policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 + policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 6 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 160 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 111 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 35 +- policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 449 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 170 files changed, 3767 insertions(+), 646 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- policy-20070102.patch 23 Jan 2007 01:08:45 -0000 1.7 +++ policy-20070102.patch 24 Jan 2007 16:39:35 -0000 1.8 @@ -1152,6 +1152,20 @@ sysnet_exec_ifconfig(vpnc_t) sysnet_etc_filetrans_config(vpnc_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/ethereal.if serefpolicy-2.5.1/policy/modules/apps/ethereal.if +--- nsaserefpolicy/policy/modules/apps/ethereal.if 2007-01-02 12:57:22.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/ethereal.if 2007-01-23 09:18:28.000000000 -0500 +@@ -34,6 +34,10 @@ + # + template(`ethereal_per_role_template',` + ++ gen_require(` ++ type ethereal_exec_t; ++ ') ++ + ############################## + # + # Declarations diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/evolution.if serefpolicy-2.5.1/policy/modules/apps/evolution.if --- nsaserefpolicy/policy/modules/apps/evolution.if 2007-01-02 12:57:22.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/apps/evolution.if 2007-01-17 13:32:47.000000000 -0500 @@ -1452,6 +1466,20 @@ + allow $2 $1_evolution_alarm_t:dbus send_msg; + allow $1_evolution_alarm_t $2:dbus send_msg; +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/games.if serefpolicy-2.5.1/policy/modules/apps/games.if +--- nsaserefpolicy/policy/modules/apps/games.if 2007-01-02 12:57:22.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/games.if 2007-01-23 09:19:04.000000000 -0500 +@@ -33,6 +33,10 @@ + ## + # + template(`games_per_role_template',` ++ gen_require(` ++ type games_exec_t; ++ type games_data_t; ++ ') + + ######################################## + # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.fc serefpolicy-2.5.1/policy/modules/apps/gnome.fc --- nsaserefpolicy/policy/modules/apps/gnome.fc 2006-11-16 17:15:07.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/apps/gnome.fc 2007-01-17 13:32:47.000000000 -0500 @@ -1463,7 +1491,7 @@ +HOME_DIR/\.config/gtk-.* gen_context(system_u:object_r:ROLE_gnome_home_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gnome.if serefpolicy-2.5.1/policy/modules/apps/gnome.if --- nsaserefpolicy/policy/modules/apps/gnome.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/gnome.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/gnome.if 2007-01-23 09:18:51.000000000 -0500 @@ -35,19 +35,24 @@ template(`gnome_per_role_template',` gen_require(` @@ -2111,8 +2139,19 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mplayer.if serefpolicy-2.5.1/policy/modules/apps/mplayer.if --- nsaserefpolicy/policy/modules/apps/mplayer.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/apps/mplayer.if 2007-01-17 13:32:47.000000000 -0500 -@@ -178,6 +178,10 @@ ++++ serefpolicy-2.5.1/policy/modules/apps/mplayer.if 2007-01-23 09:18:45.000000000 -0500 +@@ -33,6 +33,10 @@ + ## + # + template(`mplayer_per_role_template',` ++ gen_require(` ++ type mencoder_exec_t; ++ type mplayer_exec_t; ++ ') + + ######################################## + # +@@ -178,6 +182,10 @@ files_dontaudit_list_default($1_mencoder_t) ') @@ -2123,7 +2162,7 @@ tunable_policy(`read_untrusted_content',` files_list_tmp($1_mencoder_t) files_list_home($1_mencoder_t) -@@ -249,6 +253,7 @@ +@@ -249,6 +257,7 @@ allow $1_mplayer_t self:process { signal_perms getsched }; allow $1_mplayer_t self:fifo_file rw_fifo_file_perms; @@ -2131,7 +2170,7 @@ manage_dirs_pattern($1_mplayer_t,$1_mplayer_home_t,$1_mplayer_home_t) manage_files_pattern($1_mplayer_t,$1_mplayer_home_t,$1_mplayer_home_t) -@@ -320,6 +325,7 @@ +@@ -320,6 +329,7 @@ fs_dontaudit_getattr_all_fs($1_mplayer_t) fs_search_auto_mountpoints($1_mplayer_t) @@ -2139,7 +2178,7 @@ libs_use_ld_so($1_mplayer_t) libs_use_shared_libs($1_mplayer_t) -@@ -428,6 +434,11 @@ +@@ -428,6 +438,11 @@ ') optional_policy(` @@ -2151,7 +2190,7 @@ alsa_read_rw_config($1_mplayer_t) ') -@@ -435,3 +446,71 @@ +@@ -435,3 +450,71 @@ nscd_socket_use($1_mplayer_t) ') ') @@ -2494,6 +2533,34 @@ +allow staff_thunderbird_t tmp_t:sock_file create; +') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/tvtime.if serefpolicy-2.5.1/policy/modules/apps/tvtime.if +--- nsaserefpolicy/policy/modules/apps/tvtime.if 2007-01-02 12:57:22.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/tvtime.if 2007-01-23 09:18:33.000000000 -0500 +@@ -33,6 +33,9 @@ + ## + # + template(`tvtime_per_role_template',` ++ gen_require(` ++ type tvtime_exec_t; ++ ') + + ######################################## + # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/uml.if serefpolicy-2.5.1/policy/modules/apps/uml.if +--- nsaserefpolicy/policy/modules/apps/uml.if 2007-01-02 12:57:22.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/uml.if 2007-01-23 09:18:55.000000000 -0500 +@@ -34,6 +34,11 @@ + # + template(`uml_per_role_template',` + ++ gen_require(` ++ type uml_ro_t; ++ type uml_exec_t; ++ ') ++ + ######################################## + # + # Declarations diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/userhelper.if serefpolicy-2.5.1/policy/modules/apps/userhelper.if --- nsaserefpolicy/policy/modules/apps/userhelper.if 2007-01-02 12:57:22.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/apps/userhelper.if 2007-01-17 13:32:47.000000000 -0500 @@ -2527,6 +2594,20 @@ + ') + can_exec($1,userhelper_exec_t) +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/vmware.if serefpolicy-2.5.1/policy/modules/apps/vmware.if +--- nsaserefpolicy/policy/modules/apps/vmware.if 2007-01-02 12:57:22.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/apps/vmware.if 2007-01-23 09:19:00.000000000 -0500 +@@ -33,6 +33,10 @@ + ## + # + template(`vmware_per_role_template',` ++ gen_require(` ++ type vmware_exec_t; ++ type vmware_sys_conf_t; ++ ') + + ############################## + # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.5.1/policy/modules/apps/webalizer.te --- nsaserefpolicy/policy/modules/apps/webalizer.te 2007-01-02 12:57:22.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/apps/webalizer.te 2007-01-17 13:58:19.000000000 -0500 @@ -2949,7 +3030,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.1/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-22 12:51:02.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/kernel/files.if 2007-01-24 10:58:24.000000000 -0500 @@ -350,8 +350,7 @@ ######################################## @@ -3078,7 +3159,7 @@ ') ######################################## -@@ -4479,3 +4537,115 @@ +@@ -4479,3 +4537,133 @@ allow $1 { file_type -security_file_type }:dir manage_dir_perms; ') @@ -3194,13 +3275,45 @@ + allow $1 tmpfile:file r_file_perms; +') + ++######################################## ++## ++## Create, read, write, and delete symbolic links in /etc. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`files_manage_etc_symlinks',` ++ gen_require(` ++ type etc_t; ++ ') ++ ++ allow $1 etc_t:dir rw_dir_perms; ++ allow $1 etc_t:lnk_file create_lnk_perms; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.5.1/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.if 2007-01-17 13:32:47.000000000 -0500 -@@ -2740,6 +2740,25 @@ ++++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.if 2007-01-24 11:38:15.000000000 -0500 +@@ -1110,6 +1110,7 @@ + type dosfs_t; + ') - ######################################## - ## ++ manage_dirs_pattern($1,dosfs_t,dosfs_t) + manage_files_pattern($1,dosfs_t,dosfs_t) + ') + +@@ -2735,7 +2736,26 @@ + type tmpfs_t; + ') + +- dontaudit $1 tmpfs_t:file { read write }; ++ dontaudit $1 tmpfs_t:file rw_file_perms; ++') ++ ++######################################## ++## +## Do not audit attempts to getattr +## generic tmpfs files. +## @@ -3216,13 +3329,9 @@ + ') + + dontaudit $1 tmpfs_t:file getattr; -+') -+ -+######################################## -+## - ## Create, read, write, and delete - ## auto moutpoints. - ## + ') + + ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.5.1/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2007-01-02 12:57:13.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/kernel/filesystem.te 2007-01-17 14:13:14.000000000 -0500 @@ -3519,8 +3628,20 @@ +/opt/fortitude/run(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.1/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/apache.te 2007-01-17 13:32:47.000000000 -0500 -@@ -686,6 +686,7 @@ ++++ serefpolicy-2.5.1/policy/modules/services/apache.te 2007-01-24 11:07:38.000000000 -0500 +@@ -448,6 +448,11 @@ + + logging_send_syslog_msg(httpd_helper_t) + ++optional_policy(` ++ ssh_sigchld(httpd_helper_t) ++ ssh_rw_stream_sockets(httpd_helper_t) ++') ++ + tunable_policy(`httpd_tty_comm',` + # cjp: this is redundant: + term_use_controlling_term(httpd_helper_t) +@@ -686,6 +691,7 @@ optional_policy(` snmp_dontaudit_read_snmp_var_lib_files(httpd_t) @@ -3528,6 +3649,20 @@ ') ######################################## +@@ -694,6 +700,8 @@ + # + + manage_files_pattern(httpd_rotatelogs_t,httpd_log_t,httpd_log_t) ++# Apache-httpd needs to be able to send signals to the log rotate procs. ++allow httpd_t httpd_rotatelogs_t:process signal_perms; + + kernel_read_kernel_sysctls(httpd_rotatelogs_t) + kernel_dontaudit_list_proc(httpd_rotatelogs_t) +@@ -712,3 +720,4 @@ + term_dontaudit_use_generic_ptys(httpd_rotatelogs_t) + term_dontaudit_use_unallocated_ttys(httpd_rotatelogs_t) + ') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.5.1/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/apm.te 2007-01-17 13:32:47.000000000 -0500 @@ -3606,6 +3741,61 @@ fs_mount_all_fs(automount_t) fs_unmount_all_fs(automount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.fc serefpolicy-2.5.1/policy/modules/services/ccs.fc +--- nsaserefpolicy/policy/modules/services/ccs.fc 2006-11-16 17:15:21.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ccs.fc 2007-01-24 11:08:51.000000000 -0500 +@@ -6,3 +6,4 @@ + + /var/run/cluster(/.*)? gen_context(system_u:object_r:ccs_var_run_t,s0) + /var/run/cman_.* -s gen_context(system_u:object_r:ccs_var_run_t,s0) ++/var/lib/openais(/.*)? gen_context(system_u:object_r:ccs_var_lib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ccs.te serefpolicy-2.5.1/policy/modules/services/ccs.te +--- nsaserefpolicy/policy/modules/services/ccs.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ccs.te 2007-01-24 11:00:57.000000000 -0500 +@@ -18,6 +18,10 @@ + type ccs_var_log_t; + logging_log_file(ccs_var_log_t) + ++# var lib files ++type ccs_var_lib_t; ++logging_log_file(ccs_var_lib_t) ++ + # pid files + type ccs_var_run_t; + files_pid_file(ccs_var_run_t) +@@ -27,8 +31,8 @@ + # ccs local policy + # + +-allow ccs_t self:capability { ipc_lock sys_nice sys_resource }; +-allow ccs_t self:process { signal setrlimit setsched }; ++allow ccs_t self:capability { ipc_lock sys_nice sys_resource sys_admin }; ++allow ccs_t self:process { ptrace signal setrlimit setsched }; + allow ccs_t self:fifo_file { read write }; + allow ccs_t self:unix_stream_socket { connectto create_stream_socket_perms }; + allow ccs_t self:unix_dgram_socket create_socket_perms; +@@ -46,6 +50,11 @@ + allow ccs_t ccs_var_log_t:dir setattr; + logging_log_filetrans(ccs_t,ccs_var_log_t,{ sock_file file dir }) + ++# var lib files ++manage_dirs_pattern(ccs_t,ccs_var_lib_t,ccs_var_lib_t) ++manage_files_pattern(ccs_t,ccs_var_lib_t,ccs_var_lib_t) ++files_var_lib_filetrans(ccs_t,ccs_var_lib_t,{ file dir }) ++ + # pid file + manage_dirs_pattern(ccs_t,ccs_var_run_t,ccs_var_run_t) + manage_files_pattern(ccs_t,ccs_var_run_t,ccs_var_run_t) +@@ -95,3 +104,9 @@ + optional_policy(` + unconfined_use_fds(ccs_t) + ') ++ ++ifdef(`hide_broken_symptoms', ` ++ # This is broken ++ corecmd_dontaudit_write_sbin(ccs_t) ++ files_manage_isid_type_files(ccs_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-2.5.1/policy/modules/services/clamav.te --- nsaserefpolicy/policy/modules/services/clamav.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/clamav.te 2007-01-17 13:32:47.000000000 -0500 @@ -4082,6 +4272,20 @@ ## Read dbus configuration. ## ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-2.5.1/policy/modules/services/ftp.if +--- nsaserefpolicy/policy/modules/services/ftp.if 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ftp.if 2007-01-23 09:19:24.000000000 -0500 +@@ -24,6 +24,10 @@ + ## + # + template(`ftp_per_role_template',` ++ gen_require(` ++ type ftpd_t; ++ ') ++ + tunable_policy(`ftpd_is_daemon',` + userdom_manage_user_home_content_files($1,ftpd_t) + userdom_manage_user_home_content_symlinks($1,ftpd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.5.1/policy/modules/services/ftp.te --- nsaserefpolicy/policy/modules/services/ftp.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/ftp.te 2007-01-17 14:08:21.000000000 -0500 @@ -4298,7 +4502,7 @@ kernel_rw_irq_sysctls(irqbalance_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.if serefpolicy-2.5.1/policy/modules/services/kerberos.if --- nsaserefpolicy/policy/modules/services/kerberos.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/kerberos.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/kerberos.if 2007-01-24 11:02:39.000000000 -0500 @@ -41,6 +41,7 @@ allow $1 krb5_conf_t:file { getattr read }; dontaudit $1 krb5_conf_t:file write; @@ -4307,6 +4511,14 @@ tunable_policy(`allow_kerberos',` allow $1 self:tcp_socket create_socket_perms; +@@ -62,6 +63,7 @@ + + sysnet_read_config($1) + sysnet_dns_name_resolve($1) ++ pcscd_stream_connect($1) + ') + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.5.1/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-11-16 17:15:20.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/ktalk.fc 2007-01-17 13:32:47.000000000 -0500 @@ -4404,6 +4616,32 @@ # Allow per user lpr domain read acces for specific user. tunable_policy(`read_untrusted_content',` userdom_read_all_untrusted_content($1_lpr_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.if serefpolicy-2.5.1/policy/modules/services/mta.if +--- nsaserefpolicy/policy/modules/services/mta.if 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/mta.if 2007-01-23 09:19:39.000000000 -0500 +@@ -40,6 +40,11 @@ + # + template(`mta_base_mail_template',` + ++ gen_require(` ++ attribute user_mail_domain; ++ type sendmail_exec_t; ++ ') ++ + ############################## + # + # $1_mail_t declarations +@@ -174,6 +179,10 @@ + ## + # + template(`mta_per_role_template',` ++ gen_require(` ++ attribute mta_user_agent; ++ attribute mailserver_delivery; ++ ') + + ############################## + # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.5.1/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/mta.te 2007-01-17 14:44:11.000000000 -0500 @@ -4846,6 +5084,32 @@ manage_files_pattern(radvd_t,radvd_var_run_t,radvd_var_run_t) files_pid_filetrans(radvd_t,radvd_var_run_t,file) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-2.5.1/policy/modules/services/razor.if +--- nsaserefpolicy/policy/modules/services/razor.if 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/razor.if 2007-01-23 09:19:30.000000000 -0500 +@@ -23,6 +23,12 @@ + ## + # + template(`razor_common_domain_template',` ++ gen_require(` ++ type razor_exec_t; ++ type razor_etc_t; ++ type razor_log_t; ++ type razor_var_lib_t; ++ ') + + allow $1_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; + allow $1_t self:fd use; +@@ -131,6 +137,9 @@ + ## + # + template(`razor_per_role_template',` ++ gen_require(` ++ type razor_exec_t; ++ ') + + type $1_razor_t; + domain_type($1_razor_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.if serefpolicy-2.5.1/policy/modules/services/rhgb.if --- nsaserefpolicy/policy/modules/services/rhgb.if 2006-11-16 17:15:20.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/rhgb.if 2007-01-17 13:32:47.000000000 -0500 @@ -4949,6 +5213,36 @@ xserver_read_xdm_tmp_files(rhgb_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.5.1/policy/modules/services/ricci.te +--- nsaserefpolicy/policy/modules/services/ricci.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/ricci.te 2007-01-24 10:59:45.000000000 -0500 +@@ -385,6 +385,8 @@ + files_search_usr(ricci_modrpm_t) + files_read_etc_files(ricci_modrpm_t) + ++kernel_read_kernel_sysctls(ricci_modrpm_t) ++ + miscfiles_read_localization(ricci_modrpm_t) + + optional_policy(` +@@ -414,6 +416,9 @@ + files_read_etc_files(ricci_modservice_t) + files_read_etc_runtime_files(ricci_modservice_t) + files_search_usr(ricci_modservice_t) ++# Needed for running chkconfig ++init_create_script_files(ricci_modservice_t) ++files_manage_etc_symlinks(ricci_modservice_t) + + consoletype_exec(ricci_modservice_t) + +@@ -460,6 +465,7 @@ + files_manage_etc_files(ricci_modstorage_t) + files_read_etc_runtime_files(ricci_modstorage_t) + files_read_usr_files(ricci_modstorage_t) ++files_read_kernel_modules(ricci_modstorage_t) + + storage_raw_read_fixed_disk(ricci_modstorage_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-2.5.1/policy/modules/services/rlogin.te --- nsaserefpolicy/policy/modules/services/rlogin.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/rlogin.te 2007-01-17 13:32:47.000000000 -0500 @@ -5098,6 +5392,22 @@ + ') + dontaudit $1 snmpd_var_lib_t:file write; +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-2.5.1/policy/modules/services/spamassassin.if +--- nsaserefpolicy/policy/modules/services/spamassassin.if 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/spamassassin.if 2007-01-23 09:19:34.000000000 -0500 +@@ -35,6 +35,12 @@ + # toggled on activation of spamc, and similarly for spamd. + template(`spamassassin_per_role_template',` + ++ gen_require(` ++ type spamc_exec_t; ++ type spamassassin_exec_t; ++ type spamd_t, spamd_tmp_t; ++ ') ++ + ############################## + # + # Declarations diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.te serefpolicy-2.5.1/policy/modules/services/spamassassin.te --- nsaserefpolicy/policy/modules/services/spamassassin.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/spamassassin.te 2007-01-17 13:32:47.000000000 -0500 @@ -6061,7 +6371,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.5.1/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/init.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/init.if 2007-01-24 10:56:30.000000000 -0500 @@ -202,11 +202,14 @@ gen_require(` type initrc_t; @@ -6077,6 +6387,30 @@ role system_r types $1; domtrans_pattern(initrc_t,$2,$1) +@@ -1275,3 +1278,23 @@ + files_search_pids($1) + allow $1 initrc_var_run_t:file manage_file_perms; + ') ++ ++######################################## ++## ++## Read init scripts. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`init_create_script_files',` ++ gen_require(` ++ type initrc_exec_t; ++ ') ++ ++ files_etc_filetrans($1, initrc_exec_t, file) ++ allow $1 initrc_exec_t:file create_file_perms; ++ allow $1 initrc_exec_t:file r_file_perms; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.1/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/init.te 2007-01-17 13:42:33.000000000 -0500 @@ -6462,16 +6796,61 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.1/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/lvm.te 2007-01-17 14:38:17.000000000 -0500 -@@ -44,6 +44,7 @@ ++++ serefpolicy-2.5.1/policy/modules/system/lvm.te 2007-01-24 11:28:20.000000000 -0500 +@@ -44,14 +44,20 @@ # Cluster LVM daemon local policy # -+allow clvmd_t self:capability mknod; ++allow clvmd_t self:capability { sys_admin mknod }; dontaudit clvmd_t self:capability sys_tty_config; - allow clvmd_t self:process signal_perms; +-allow clvmd_t self:process signal_perms; ++allow clvmd_t self:process { ptrace signal_perms }; allow clvmd_t self:socket create_socket_perms; -@@ -147,7 +148,9 @@ + allow clvmd_t self:fifo_file rw_fifo_file_perms; + allow clvmd_t self:unix_stream_socket { connectto create_stream_socket_perms }; + allow clvmd_t self:tcp_socket create_stream_socket_perms; + allow clvmd_t self:udp_socket create_socket_perms; + ++dev_rw_lvm_control(clvmd_t) ++dev_dontaudit_getattr_all_blk_files(clvmd_t) ++dev_dontaudit_getattr_all_chr_files(clvmd_t) ++storage_dontaudit_getattr_removable_dev(clvmd_t) ++ + manage_files_pattern(clvmd_t,clvmd_var_run_t,clvmd_var_run_t) + files_pid_filetrans(clvmd_t,clvmd_var_run_t,file) + +@@ -62,9 +68,11 @@ + kernel_list_proc(clvmd_t) + kernel_read_proc_symlinks(clvmd_t) + kernel_search_debugfs(clvmd_t) ++kernel_dontaudit_getattr_core_if(clvmd_t) + + corecmd_exec_shell(clvmd_t) + corecmd_read_bin_symlinks(clvmd_t) ++corecmd_getattr_sbin_files(clvmd_t) + corecmd_read_sbin_symlinks(clvmd_t) + + corenet_non_ipsec_sendrecv(clvmd_t) +@@ -89,6 +97,7 @@ + + fs_getattr_all_fs(clvmd_t) + fs_search_auto_mountpoints(clvmd_t) ++fs_dontaudit_list_tmpfs(clvmd_t) + + term_dontaudit_use_console(clvmd_t) + +@@ -132,6 +141,10 @@ + ') + + optional_policy(` ++ udev_read_db(clvmd_t) ++') ++ ++optional_policy(` + ricci_dontaudit_rw_modcluster_pipes(clvmd_t) + ricci_dontaudit_use_modcluster_fds(clvmd_t) + ') +@@ -147,7 +160,9 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) # rawio needed for dmraid @@ -6482,7 +6861,15 @@ 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. -@@ -228,6 +231,7 @@ +@@ -156,6 +171,7 @@ + allow lvm_t self:fifo_file rw_file_perms; + allow lvm_t self:unix_dgram_socket create_socket_perms; + allow lvm_t self:netlink_kobject_uevent_socket create_socket_perms; ++allow lvm_t clvmd_t:unix_stream_socket connectto; + + manage_dirs_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t) + manage_files_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t) +@@ -228,6 +244,7 @@ fs_list_tmpfs(lvm_t) fs_read_tmpfs_symlinks(lvm_t) fs_dontaudit_read_removable_files(lvm_t) @@ -6490,13 +6877,40 @@ storage_relabel_fixed_disk(lvm_t) storage_dontaudit_read_removable_device(lvm_t) -@@ -244,6 +248,7 @@ - term_dontaudit_getattr_pty_dirs(lvm_t) +@@ -240,8 +257,8 @@ + # Access raw devices and old /dev/lvm (c 109,0). Is this needed? + storage_manage_fixed_disk(lvm_t) + +-term_dontaudit_getattr_all_user_ttys(lvm_t) +-term_dontaudit_getattr_pty_dirs(lvm_t) ++term_getattr_all_user_ttys(lvm_t) ++term_list_ptys(lvm_t) corecmd_exec_sbin(lvm_t) -+corecmd_dontaudit_getattr_sbin_files(lvm_t) - domain_use_interactive_fds(lvm_t) +@@ -274,8 +291,8 @@ + ') + + ifdef(`targeted_policy', ` +- term_dontaudit_use_unallocated_ttys(lvm_t) +- term_dontaudit_use_generic_ptys(lvm_t) ++ term_use_unallocated_ttys(lvm_t) ++ term_use_generic_ptys(lvm_t) + + files_dontaudit_read_root_files(lvm_t) + ') +@@ -289,6 +306,12 @@ + ') + + optional_policy(` ++ ssh_sigchld(lvm_t) ++ ssh_rw_stream_sockets(lvm_t) ++') ++ ++optional_policy(` ++ gpm_dontaudit_getattr_gpmctl(clvmd_t) + gpm_dontaudit_getattr_gpmctl(lvm_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/miscfiles.fc serefpolicy-2.5.1/policy/modules/system/miscfiles.fc --- nsaserefpolicy/policy/modules/system/miscfiles.fc 2007-01-02 12:57:49.000000000 -0500 From fedora-cvs-commits at redhat.com Wed Jan 24 16:55:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:55:20 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1001,1.1002 Message-ID: <200701241655.l0OGtKoX017154@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16965 Modified Files: openoffice.org.spec Log Message: extra bits Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1001 retrieving revision 1.1002 diff -u -r1.1001 -r1.1002 --- openoffice.org.spec 24 Jan 2007 08:29:33 -0000 1.1001 +++ openoffice.org.spec 24 Jan 2007 16:55:17 -0000 1.1002 @@ -1079,7 +1079,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.soffice_5.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 Wed Jan 24 16:55:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 11:55:28 -0500 Subject: rpms/emacs/devel emacs.spec,1.81,1.82 Message-ID: <200701241655.l0OGtS7f017278@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17226 Modified Files: emacs.spec Log Message: po-mode.el was being left out Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- emacs.spec 23 Jan 2007 22:31:10 -0000 1.81 +++ emacs.spec 24 Jan 2007 16:55:26 -0000 1.82 @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 22.0.93 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -95,7 +95,7 @@ # install rest of site-lisp files ( cd site-lisp - cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE13 %SOURCE20 . + cp %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 . # xemacs compat patch for rpm-spec-mode patch < %SOURCE12 # fix po-auto-replace-revision-date nil @@ -279,6 +279,9 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Wed Jan 24 2007 Chip Coldwell - 22.0.93-3 +- po-mode.el was being left out + * Tue Jan 23 2007 Chip Coldwell - 22.0.93-1 - new pretest version - removed setarch since new dumper copes with execshield From fedora-cvs-commits at redhat.com Wed Jan 24 17:12:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 12:12:30 -0500 Subject: rpms/pm-utils/devel 60sysfont.hook, NONE, 1.1 65sound.hook, NONE, 1.1 pm-utils-0.19.1-avahi.patch, NONE, 1.1 pm-utils-0.19.1-bluetooth.patch, NONE, 1.1 pm-utils-0.19.1-check.patch, NONE, 1.1 pm-utils-0.19.1-disable.patch, NONE, 1.1 pm-utils-0.19.1-permission.patch, NONE, 1.1 pm-utils.spec, 1.44, 1.45 Message-ID: <200701241712.l0OHCUEB028209@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27976 Modified Files: pm-utils.spec Added Files: 60sysfont.hook 65sound.hook pm-utils-0.19.1-avahi.patch pm-utils-0.19.1-bluetooth.patch pm-utils-0.19.1-check.patch pm-utils-0.19.1-disable.patch pm-utils-0.19.1-permission.patch Log Message: - Start/stop correct services in 10NetworkManager hook (#215253) - Fixed check for /sys/power/disk and /sys/power/state (#214407) - Added proper error messages in case /sys/power/disk or /sys/power/state are missing (#215386) - Removed service calls and module load/unload for bluetooth hook (#213387) - Added hook file to restore the sysfont after resume (#215391) - Added the possibility to disable hibernate and suspend completely via the config file (#216459) - Symlinked the config file to /etc/sysconfig/power-management (#216459) - Fixed pm-powersave permission check bug (#222819) - Small specfile cleanups --- NEW FILE 60sysfont.hook --- #!/bin/sh case "$1" in suspend) :;; resume) /sbin/setsysfont >/dev/null 2>&1 ;; esac exit $? --- NEW FILE 65sound.hook --- #!/bin/sh case "$1" in hibernate|suspend) /usr/sbin/alsactl store 0 >/dev/null 2>&1 ;; thaw|resume) /usr/sbin/alsactl restore 0 >/dev/null 2>&1 ;; *) ;; esac exit $? pm-utils-0.19.1-avahi.patch: 10NetworkManager | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE pm-utils-0.19.1-avahi.patch --- --- pm-utils-0.19.1/pm/hooks/10NetworkManager.avahi 2007-01-24 17:42:18.000000000 +0100 +++ pm-utils-0.19.1/pm/hooks/10NetworkManager 2007-01-24 17:43:07.000000000 +0100 @@ -3,7 +3,8 @@ . /etc/pm/functions suspend_nm() { - stopservice mDNSResponder + stopservice avahi-dnsconfd + stopservice avahi-daemon # Tell NetworkManager to shut down networking dbus-send --system \ @@ -23,7 +24,8 @@ org.freedesktop.NetworkManager.wake >/dev/null 2>&1 0<&1 rc=$? - restartservice mDNSResponder + restartservice avahi-daemon + restartservice avahi-dnsconfd return $rc } pm-utils-0.19.1-bluetooth.patch: 49bluetooth | 18 ------------------ 1 files changed, 18 deletions(-) --- NEW FILE pm-utils-0.19.1-bluetooth.patch --- --- pm-utils-0.19.1/pm/hooks/49bluetooth.bluetooth 2006-04-18 02:41:05.000000000 +0200 +++ pm-utils-0.19.1/pm/hooks/49bluetooth 2007-01-24 17:12:28.000000000 +0100 @@ -4,28 +4,15 @@ suspend_bluetooth() { - stopservice dund - stopservice pand - stopservice hidd - stopservice bluetooth - if [ -f /proc/acpi/ibm/bluetooth ]; then savestate ibm_bluetooth $(awk '{ print $2 ; exit; }' /proc/acpi/ibm/bluetooth) else savestate ibm_bluetooth missing fi - - for x in rfcomm hidp l2cap ohci1394 ieee1394 hci_usb bluetooth ; do - modunload $x - done } resume_bluetooth() { - for x in bluetooth hci_usb ieee1394 ohci1394 l2cap hidp rfcomm ; do - modreload $x - done - case "$(restorestate ibm_bluetooth)" in enabled) echo enable > /proc/acpi/ibm/bluetooth @@ -36,11 +23,6 @@ *) ;; esac - - restartservice bluetooth - restartservice hidd - restartservice pand - restartservice dund } case "$1" in pm-utils-0.19.1-check.patch: pm/functions | 12 ++++++++++++ src/pm-action | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) --- NEW FILE pm-utils-0.19.1-check.patch --- --- pm-utils-0.19.1/pm/functions.check 2007-01-24 17:30:06.000000000 +0100 +++ pm-utils-0.19.1/pm/functions 2007-01-24 17:35:38.000000000 +0100 @@ -194,12 +194,24 @@ case "$1" in suspend) if [ "$DISABLE_SUSPEND" != "yes" ] ; then + if [ ! -f /sys/power/state ] ; then + echo "Error: You need /sys/power/state to use suspend" + exit 1 + fi pm-pmu --suspend || echo -n "mem" > /sys/power/state fi run_hooks resume reverse ;; hibernate) if [ "$DISABLE_HIBERNATE" != "yes" ] ; then + if [ ! -f /sys/power/state ] ; then + echo "Error: You need /sys/power/state to use hibernate" + exit 1 + fi + if [ ! -f /sys/power/disk ] ; then + echo "Error: You need /sys/power/disk to use hibernate" + exit 1 + fi echo -n "platform" > /sys/power/disk echo -n "disk" > /sys/power/state fi --- pm-utils-0.19.1/src/pm-action.check 2006-06-12 19:11:13.000000000 +0200 +++ pm-utils-0.19.1/src/pm-action 2007-01-24 17:31:08.000000000 +0100 @@ -34,9 +34,6 @@ . /etc/pm/functions -[ -f /sys/power/disk ] || exit 1 -[ -f /sys/power/state ] || exit 1 - ACTION=$(basename "$0") ACTION=${ACTION#pm-} pm-utils-0.19.1-disable.patch: config | 3 ++- functions | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) --- NEW FILE pm-utils-0.19.1-disable.patch --- --- pm-utils-0.19.1/pm/functions.disable 2007-01-23 15:23:20.000000000 +0100 +++ pm-utils-0.19.1/pm/functions 2007-01-24 16:43:15.000000000 +0100 @@ -5,14 +5,18 @@ # default values go here HIBERNATE_RESUME_POST_VIDEO=no SUSPEND_MODULES="" +DISABLE_HIBERNATE="no" +DISABLE_SUSPEND="no" [ -f /etc/pm/config ] && . /etc/pm/config # export them all here export HIBERNATE_RESUME_POST_VIDEO export SUSPEND_MODULES +export DISABLE_HIBERNATE +export DISABLE_SUSPEND -GLOBAL_CONFIG_VARIABLES="HIBERNATE_RESUME_POST_VIDEO SUSPEND_MODULES" +GLOBAL_CONFIG_VARIABLES="HIBERNATE_RESUME_POST_VIDEO SUSPEND_MODULES DISABLE_HIBERNATE DISABLE_SUSPEND" source_configs() { @@ -189,12 +193,16 @@ case "$1" in suspend) - pm-pmu --suspend || echo -n "mem" > /sys/power/state + if [ "$DISABLE_SUSPEND" != "yes" ] ; then + pm-pmu --suspend || echo -n "mem" > /sys/power/state + fi run_hooks resume reverse ;; hibernate) - echo -n "platform" > /sys/power/disk - echo -n "disk" > /sys/power/state + if [ "$DISABLE_HIBERNATE" != "yes" ] ; then + echo -n "platform" > /sys/power/disk + echo -n "disk" > /sys/power/state + fi run_hooks thaw reverse ;; esac --- pm-utils-0.19.1/pm/config.disable 2007-01-23 15:23:07.000000000 +0100 +++ pm-utils-0.19.1/pm/config 2007-01-23 15:18:34.000000000 +0100 @@ -1,3 +1,4 @@ SUSPEND_MODULES="button" - HIBERNATE_RESUME_POST_VIDEO="no" +DISABLE_HIBERNATE="no" +DISABLE_SUSPEND="no" pm-utils-0.19.1-permission.patch: laptop-tools | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) --- NEW FILE pm-utils-0.19.1-permission.patch --- --- pm-utils-0.19.1/pm/power.d/laptop-tools.permission 2007-01-23 13:57:14.000000000 +0100 +++ pm-utils-0.19.1/pm/power.d/laptop-tools 2007-01-23 14:09:20.000000000 +0100 @@ -26,9 +26,15 @@ echo $DIRTY_BACKGROUND_RATIO > /proc/sys/vm/dirty_background_ratio } -if [ ! -w "/proc/sys/vm/" ] ; then +if [ ! -d "/proc/sys/vm/" ] ; then # Use the raw kernel sysfs interface - echo "You do not have write access to /proc/sys/vm/" + echo "The required directory /proc/sys/vm/ doesn't exist" + exit 1 +fi + +if ! [ -w "/proc/sys/vm/laptop_mode" -a -w "/proc/sys/vm/dirty_writeback_centisecs" -a -w "/proc/sys/vm/dirty_expire_centisecs" -a -w "/proc/sys/vm/dirty_ratio" -a -w "/proc/sys/vm/dirty_background_ratio" ] ; then + # Use the raw kernel sysfs interface + echo "You do not have write access to files in /proc/sys/vm/" exit 1 fi Index: pm-utils.spec =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- pm-utils.spec 1 Oct 2006 16:54:36 -0000 1.44 +++ pm-utils.spec 24 Jan 2007 17:12:27 -0000 1.45 @@ -2,7 +2,7 @@ Summary: Power management utilities and scripts for Fedora Core License: GPL Version: 0.19.1 -Release: 3 +Release: 4%{?dist} Group: System Environment/Base ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 Requires: usermode kbd pciutils >= 2.2.1 @@ -14,6 +14,8 @@ Source4: pm-suspend.app Source5: pm-hibernate.app Source6: pm-powersave.app +Source7: 60sysfont.hook +Source8: 65sound.hook Source10: http://ftp.debian.org/debian/pool/main/v/vbetool/vbetool_0.5-1.tar.gz Source20: radeontool-1.5.tar.gz %ifarch i386 x86_64 @@ -22,7 +24,7 @@ Obsoletes: radeontool Provides: radeontool %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: hal-devel pkgconfig pciutils-devel BuildRequires: dbus-devel >= 0.90 @@ -30,6 +32,11 @@ Patch2: vbetool-0.3-libpci.patch Patch3: pm-utils-0.19-vidhooks.patch Patch4: pm-utils-0.19-emacs.patch +Patch5: pm-utils-0.19.1-permission.patch +Patch6: pm-utils-0.19.1-disable.patch +Patch7: pm-utils-0.19.1-bluetooth.patch +Patch8: pm-utils-0.19.1-check.patch +Patch9: pm-utils-0.19.1-avahi.patch %description The pm-utils package contains utilities and scripts for Fedora Core @@ -41,6 +48,11 @@ %patch2 -p0 -b .libpci %patch3 -p1 -b .vidhooks %patch4 -p1 -b .emacs +%patch5 -p1 -b .permission +%patch6 -p1 -b .disable +%patch7 -p1 -b .bluetooth +%patch8 -p1 -b .check +%patch9 -p1 -b .avahi %build cd vbetool-0.4 @@ -70,7 +82,6 @@ cd vbetool-0.4 make DESTDIR=$RPM_BUILD_ROOT install cd .. -chmod -x $RPM_BUILD_ROOT/etc/pm/hooks/49bluetooth cd radeontool-1.5 mkdir -p $RPM_BUILD_ROOT/%{_sbindir} @@ -97,6 +108,16 @@ done popd +# Symlink the config file to /etc/sysconfig +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig +ln -sf %{_sysconfdir}/pm/config $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/power-management + +# Install sysfont hook +install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/%{_sysconfdir}/pm/hooks/60sysfont + +# Install alsa store/restore hook +install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/pm/hooks/65sound + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -108,15 +129,29 @@ %files %defattr(-,root,root) -/etc/pm -%config(noreplace) /etc/pm/config -/etc/security/console.apps/* -/etc/pam.d/* +%{_sysconfdir}/pm +%config(noreplace) %{_sysconfdir}/pm/config +%{_sysconfdir}/sysconfig/power-management +%{_sysconfdir}/security/console.apps/* +%{_sysconfdir}/pam.d/* %{_bindir}/* %{_sbindir}/* %{_mandir}/man*/* %changelog +* Wed Jan 24 2007 Phil Knirsch - 0.19.1-4 +- Start/stop correct services in 10NetworkManager hook (#215253) +- Fixed check for /sys/power/disk and /sys/power/state (#214407) +- Added proper error messages in case /sys/power/disk or /sys/power/state are + missing (#215386) +- Removed service calls and module load/unload for bluetooth hook (#213387) +- Added hook file to restore the sysfont after resume (#215391) +- Added the possibility to disable hibernate and suspend completely via the + config file (#216459) +- Symlinked the config file to /etc/sysconfig/power-management (#216459) +- Fixed pm-powersave permission check bug (#222819) +- Small specfile cleanups + * Sun Oct 1 2006 Peter Jones - 0.19.1-3 - Disable bluetooth suspend/reusme hook by default; the kernel modules seem to support this correctly these days. From fedora-cvs-commits at redhat.com Wed Jan 24 17:20:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 12:20:22 -0500 Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.104, 1.105 libselinux.spec, 1.246, 1.247 Message-ID: <200701241720.l0OHKM7w021459@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21418 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Fri Jan 19 2007 Dan Walsh - 1.34.0-2 - Add context function to python to split context into 4 parts libselinux-rhat.patch: selinux.pyc |binary selinuxswig.i | 2 +- selinuxswig_wrap.c | 32 ++++++++++++++++---------------- 3 files changed, 17 insertions(+), 17 deletions(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- libselinux-rhat.patch 16 Jan 2007 22:10:55 -0000 1.104 +++ libselinux-rhat.patch 24 Jan 2007 17:20:19 -0000 1.105 @@ -1,555 +1,160 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_add_callback.3 libselinux-1.33.4/man/man3/avc_add_callback.3 ---- nsalibselinux/man/man3/avc_add_callback.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/avc_add_callback.3 2007-01-15 16:21:55.000000000 -0500 -@@ -3,7 +3,7 @@ - .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004 - .TH "avc_add_callback" "3" "9 June 2004" "" "SE Linux API documentation" - .SH "NAME" --avc_add_callback \- additional event notification for userspace object managers. -+avc_add_callback \- additional event notification for SELinux userspace object managers. - .SH "SYNOPSIS" - .B #include - .br -@@ -181,3 +181,4 @@ - .BR avc_context_to_sid (3), - .BR avc_cache_stats (3), - .BR security_compute_av (3) -+.BR selinux (8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_cache_stats.3 libselinux-1.33.4/man/man3/avc_cache_stats.3 ---- nsalibselinux/man/man3/avc_cache_stats.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/avc_cache_stats.3 2007-01-15 16:21:55.000000000 -0500 -@@ -3,7 +3,7 @@ - .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004 - .TH "avc_cache_stats" "3" "27 May 2004" "" "SE Linux API documentation" - .SH "NAME" --avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace AVC statistics. -+avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace SELinux AVC statistics. - .SH "SYNOPSIS" - .B #include - .br -@@ -96,3 +96,4 @@ - .BR avc_has_perm (3), - .BR avc_context_to_sid (3), - .BR avc_add_callback (3) -+.BR selinux (8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_context_to_sid.3 libselinux-1.33.4/man/man3/avc_context_to_sid.3 ---- nsalibselinux/man/man3/avc_context_to_sid.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/avc_context_to_sid.3 2007-01-15 16:21:55.000000000 -0500 -@@ -3,7 +3,7 @@ - .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004 - .TH "avc_context_to_sid" "3" "27 May 2004" "" "SE Linux API documentation" - .SH "NAME" --avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate security ID's. -+avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate SELinux security ID's. - .SH "SYNOPSIS" - .B #include - .br -@@ -88,3 +88,4 @@ - .BR avc_add_callback (3), - .BR getcon (3), - .BR freecon (3) -+.BR selinux (8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_has_perm.3 libselinux-1.33.4/man/man3/avc_has_perm.3 ---- nsalibselinux/man/man3/avc_has_perm.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/avc_has_perm.3 2007-01-15 16:21:55.000000000 -0500 -@@ -152,3 +152,4 @@ - .BR avc_cache_stats (3), - .BR avc_add_callback (3), - .BR security_compute_av (3) -+.BR selinux(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/avc_init.3 libselinux-1.33.4/man/man3/avc_init.3 ---- nsalibselinux/man/man3/avc_init.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/avc_init.3 2007-01-15 16:21:55.000000000 -0500 -@@ -3,7 +3,7 @@ - .\" Author: Eamon Walsh (ewalsh at epoch.ncsc.mil) 2004 - .TH "avc_init" "3" "27 May 2004" "" "SE Linux API documentation" - .SH "NAME" --avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace AVC setup and teardown. -+avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace SELinux AVC setup and teardown. - .SH "SYNOPSIS" - .B #include - .br -@@ -209,3 +209,5 @@ - .BR avc_cache_stats (3), - .BR avc_add_callback (3), - .BR security_compute_av (3) -+.BR selinux (8) -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/context_new.3 libselinux-1.33.4/man/man3/context_new.3 ---- nsalibselinux/man/man3/context_new.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/context_new.3 2007-01-15 16:21:55.000000000 -0500 -@@ -56,3 +56,6 @@ - On success, zero is returned. On failure, -1 is returned and errno is - set appropriately. - -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/freecon.3 libselinux-1.33.4/man/man3/freecon.3 ---- nsalibselinux/man/man3/freecon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/freecon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "freecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --freecon, freeconary \- free memory associated with SE Linux security contexts. -+freecon, freeconary \- free memory associated with SELinux security contexts. - .SH "SYNOPSIS" - .B #include - .sp -@@ -14,3 +14,7 @@ - - .B freeconary - frees the memory allocated for a context array. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getcon.3 libselinux-1.33.4/man/man3/getcon.3 ---- nsalibselinux/man/man3/getcon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/getcon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "getcon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --getcon, getprevcon, getpidcon \- get SE Linux security context of a process. -+getcon, getprevcon, getpidcon \- get SELinux security context of a process. - .br - getpeercon - get security context of a peer socket. - .br -@@ -59,4 +59,4 @@ - On error -1 is returned. On success 0 is returned. - - .SH "SEE ALSO" --.BR freecon "(3), " setexeccon "(3)" -+.BR selinux "(8), " freecon "(3), " setexeccon "(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getexeccon.3 libselinux-1.33.4/man/man3/getexeccon.3 ---- nsalibselinux/man/man3/getexeccon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/getexeccon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "getexeccon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --getexeccon, setexeccon \- get or set the SE Linux security context used for executing a new process. -+getexeccon, setexeccon \- get or set the SELinux security context used for executing a new process. - .br - rpm_execcon \- run a helper for rpm in an appropriate security context - -@@ -55,6 +55,6 @@ - rpm_execcon only returns upon errors, as it calls execve(2). - - .SH "SEE ALSO" --.BR freecon "(3), " getcon "(3)" -+.BR selinux "(8), " freecon "(3), " getcon "(3)" - - -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfilecon.3 libselinux-1.33.4/man/man3/getfilecon.3 ---- nsalibselinux/man/man3/getfilecon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/getfilecon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "getfilecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --getfilecon, fgetfilecon, lgetfilecon \- get SE Linux security context of a file -+getfilecon, fgetfilecon, lgetfilecon \- get SELinux security context of a file - .SH "SYNOPSIS" - .B #include - .sp -@@ -40,4 +40,4 @@ - here. - - .SH "SEE ALSO" --.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" -+.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getfscreatecon.3 libselinux-1.33.4/man/man3/getfscreatecon.3 ---- nsalibselinux/man/man3/getfscreatecon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/getfscreatecon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "getfscreatecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --getfscreatecon, setfscreatecon \- get or set the SE Linux security context used for creating a new file system object. -+getfscreatecon, setfscreatecon \- get or set the SELinux security context used for creating a new file system object. - - .SH "SYNOPSIS" - .B #include -@@ -35,4 +35,4 @@ - On success 0 is returned. - - .SH "SEE ALSO" --.BR freecon "(3), " getcon "(3), " getexeccon "(3)" -+.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/get_ordered_context_list.3 libselinux-1.33.4/man/man3/get_ordered_context_list.3 ---- nsalibselinux/man/man3/get_ordered_context_list.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/get_ordered_context_list.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "get_ordered_context_list" "3" "1 January 2004" "russell at coker.com.au" "SE Linux" - .SH "NAME" --get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine context(s) for user sessions -+get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine SELinux context(s) for user sessions - - .SH "SYNOPSIS" - .B #include -@@ -77,4 +77,4 @@ - The other functions return 0 for success or -1 for errors. - - .SH "SEE ALSO" --.BR freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)" -+.BR selinux "(8), " freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/getseuserbyname.3 libselinux-1.33.4/man/man3/getseuserbyname.3 ---- nsalibselinux/man/man3/getseuserbyname.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/getseuserbyname.3 2007-01-15 16:21:55.000000000 -0500 -@@ -23,3 +23,6 @@ - The errors documented for the stat(2) system call are also applicable - here. - -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_context_customizable.3 libselinux-1.33.4/man/man3/is_context_customizable.3 ---- nsalibselinux/man/man3/is_context_customizable.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/is_context_customizable.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "is_context_customizable" "3" "10 January 2005" "dwalsh at redhat.com" "SELinux API documentation" - .SH "NAME" --is_context_customizable \- check whether context type is customizable by the administrator. -+is_context_customizable \- check whether SELinux context type is customizable by the administrator. - .SH "SYNOPSIS" - .B #include - .sp -@@ -20,3 +20,6 @@ - .SH "FILE" - /etc/selinux/SELINUXTYPE/context/customizable_types - -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_enabled.3 libselinux-1.33.4/man/man3/is_selinux_enabled.3 ---- nsalibselinux/man/man3/is_selinux_enabled.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/is_selinux_enabled.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "is_selinux_enabled" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --is_selinux_enabled \- check whether SE Linux is enabled -+is_selinux_enabled \- check whether SELinux is enabled - .SH "SYNOPSIS" - .B #include - .sp -@@ -9,3 +9,7 @@ - .SH "DESCRIPTION" - .B is_selinux_enabled - returns 1 if SE Linux is running or 0 if it is not. May change soon. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchmediacon.3 libselinux-1.33.4/man/man3/matchmediacon.3 ---- nsalibselinux/man/man3/matchmediacon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/matchmediacon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "matchmediacon" "3" "15 November 2004" "dwalsh at redhat.com" "SE Linux API documentation" - .SH "NAME" --matchmediacon \- get the default security context for the specified mediatype from the policy. -+matchmediacon \- get the default SELinux security context for the specified mediatype from the policy. - - .SH "SYNOPSIS" - .B #include -@@ -23,4 +23,4 @@ - /etc/selinux/POLICYTYPE/contexts/files/media - - .SH "SEE ALSO" --.BR freecon "(3) -+.BR selinux "(8), " freecon "(3) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-1.33.4/man/man3/matchpathcon.3 ---- nsalibselinux/man/man3/matchpathcon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/matchpathcon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "matchpathcon" "3" "16 March 2005" "sds at tycho.nsa.gov" "SE Linux API documentation" - .SH "NAME" --matchpathcon \- get the default security context for the specified path from the file contexts configuration. -+matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration. - - .SH "SYNOPSIS" - .B #include -@@ -117,4 +117,4 @@ - Returns 0 on success or -1 otherwise. - - .SH "SEE ALSO" --.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" -+.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_check_context.3 libselinux-1.33.4/man/man3/security_check_context.3 ---- nsalibselinux/man/man3/security_check_context.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/security_check_context.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "security_check_context" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --security_check_context \- check the validity of a context -+security_check_context \- check the validity of a SELinux context - .SH "SYNOPSIS" - .B #include - .sp -@@ -10,3 +10,7 @@ - .B security_check_context - returns 0 if SE Linux is running and the context is valid, otherwise it - returns -1. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_compute_av.3 libselinux-1.33.4/man/man3/security_compute_av.3 ---- nsalibselinux/man/man3/security_compute_av.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/security_compute_av.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,7 +1,7 @@ - .TH "security_compute_av" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" - security_compute_av, security_compute_create, security_compute_relabel, security_compute_user \- query --the SE Linux policy database in the kernel. -+the SELinux policy database in the kernel. - - .SH "SYNOPSIS" - .B #include -@@ -51,4 +51,4 @@ - 0 for success and on error -1 is returned. - - .SH "SEE ALSO" --.BR getcon "(3), " getfilecon "(3), " get_ordered_context_list "(3)" -+.BR selinux "(8), " getcon "(3), " getfilecon "(3), " get_ordered_context_list "(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_getenforce.3 libselinux-1.33.4/man/man3/security_getenforce.3 ---- nsalibselinux/man/man3/security_getenforce.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/security_getenforce.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "security_getenforce" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --security_getenforce, security_setenforce \- get or set the enforcing state of SE Linux -+security_getenforce, security_setenforce \- get or set the enforcing state of SELinux - .SH "SYNOPSIS" - .B #include - .sp -@@ -17,3 +17,7 @@ - sets SE Linux to enforcing mode if the value 1 is passed in, and sets it to - permissive mode if 0 is passed in. On success 0 is returned, on error -1 is - returned. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_load_booleans.3 libselinux-1.33.4/man/man3/security_load_booleans.3 ---- nsalibselinux/man/man3/security_load_booleans.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/security_load_booleans.3 2007-01-15 16:21:55.000000000 -0500 -@@ -56,4 +56,4 @@ - This manual page was written by Dan Walsh . - - .SH "SEE ALSO" --getsebool(8), booleans(8), togglesebool(8) -+selinux(8), getsebool(8), booleans(8), togglesebool(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_load_policy.3 libselinux-1.33.4/man/man3/security_load_policy.3 ---- nsalibselinux/man/man3/security_load_policy.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/security_load_policy.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "security_load_policy" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --security_load_policy \- load a new policy -+security_load_policy \- load a new SELinux policy - .SH "SYNOPSIS" - .B #include - .sp -@@ -9,3 +9,7 @@ - .SH "DESCRIPTION" - .B security_load_policy - loads a new policy, returns 0 for success and -1 for error. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/security_policyvers.3 libselinux-1.33.4/man/man3/security_policyvers.3 ---- nsalibselinux/man/man3/security_policyvers.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/security_policyvers.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "security_policyvers" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --security_policyvers \- get the version of the SE Linux policy -+security_policyvers \- get the version of the SELinux policy - .SH "SYNOPSIS" - .B #include - .sp -@@ -10,3 +10,7 @@ - .B security_policyvers - returns the version of the policy (a positive integer) on success, or -1 on - error. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_binary_policy_path.3 libselinux-1.33.4/man/man3/selinux_binary_policy_path.3 ---- nsalibselinux/man/man3/selinux_binary_policy_path.3 2007-01-11 14:01:22.000000000 -0500 -+++ libselinux-1.33.4/man/man3/selinux_binary_policy_path.3 2007-01-15 16:21:55.000000000 -0500 -@@ -4,7 +4,7 @@ - selinux_failsafe_context_path, selinux_removable_context_path, - selinux_default_context_path, selinux_user_contexts_path, - selinux_file_context_path, selinux_media_context_path, --selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active policy configuration -+selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active SELinux policy configuration - directories and files. - - .SH "SYNOPSIS" -@@ -65,3 +65,6 @@ - .SH AUTHOR - This manual page was written by Dan Walsh . - -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_check_securetty_context.3 libselinux-1.33.4/man/man3/selinux_check_securetty_context.3 ---- nsalibselinux/man/man3/selinux_check_securetty_context.3 2007-01-11 14:01:22.000000000 -0500 -+++ libselinux-1.33.4/man/man3/selinux_check_securetty_context.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "selinux_check_securetty_context" "3" "1 January 2007" "dwalsh at redhat.com" "SE Linux API documentation" - .SH "NAME" --selinux_check_securetty_context \- check whether a tty security context is defined as a securetty context -+selinux_check_securetty_context \- check whether a SELinux tty security context is defined as a securetty context - .SH "SYNOPSIS" - .B #include - .sp -@@ -10,3 +10,7 @@ - .B selinux_check_securetty_context - returns 0 if tty_context is a securetty context - returns < 0 otherwise. -+ -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_getenforcemode.3 libselinux-1.33.4/man/man3/selinux_getenforcemode.3 ---- nsalibselinux/man/man3/selinux_getenforcemode.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/selinux_getenforcemode.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "selinux_getenforcemode" "3" "25 May 2004" "dwalsh at redhat.com" "SE Linux API documentation" - .SH "NAME" --selinux_getenforcemode \- get the enforcing state of SE Linux -+selinux_getenforcemode \- get the enforcing state of SELinux - .SH "SYNOPSIS" - .B #include - .sp -@@ -19,4 +19,7 @@ - On success, zero is returned. - On failure, -1 is returned. - -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ - -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_policy_root.3 libselinux-1.33.4/man/man3/selinux_policy_root.3 ---- nsalibselinux/man/man3/selinux_policy_root.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/selinux_policy_root.3 2007-01-15 16:21:55.000000000 -0500 -@@ -14,4 +14,7 @@ - On success, returns a directory path containing the SELinux policy files. - On failure, NULL is returned. - -+.SH "SEE ALSO" -+.BR selinux "(8)" -+ - -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/setfilecon.3 libselinux-1.33.4/man/man3/setfilecon.3 ---- nsalibselinux/man/man3/setfilecon.3 2006-11-16 17:15:30.000000000 -0500 -+++ libselinux-1.33.4/man/man3/setfilecon.3 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "setfilecon" "3" "1 January 2004" "russell at coker.com.au" "SE Linux API documentation" - .SH "NAME" --setfilecon, fsetfilecon, lsetfilecon \- set SE Linux security context of a file -+setfilecon, fsetfilecon, lsetfilecon \- set SELinux security context of a file - - .SH "SYNOPSIS" - .B #include -@@ -38,4 +38,4 @@ - here. - - .SH "SEE ALSO" --.BR freecon "(3), " getfilecon "(3), " setfscreatecon "(3)" -+.BR selinux "(3), " freecon "(3), " getfilecon "(3), " setfscreatecon "(3)" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/avcstat.8 libselinux-1.33.4/man/man8/avcstat.8 ---- nsalibselinux/man/man8/avcstat.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/avcstat.8 2007-01-15 16:21:55.000000000 -0500 -@@ -22,6 +22,9 @@ - .B \-f - Specifies the location of the AVC statistics file, defaulting to '/selinux/avc/cache_stats'. - -+.SH "SEE ALSO" -+selinux(8) -+ - .SH AUTHOR - This manual page was written by Dan Walsh . - The program was written by James Morris . -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/getenforce.8 libselinux-1.33.4/man/man8/getenforce.8 ---- nsalibselinux/man/man8/getenforce.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/getenforce.8 2007-01-15 16:21:55.000000000 -0500 -@@ -12,4 +12,4 @@ - Dan Walsh, - - .SH "SEE ALSO" --setenforce(8), selinuxenabled(8) -+selinux(8), setenforce(8), selinuxenabled(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/getsebool.8 libselinux-1.33.4/man/man8/getsebool.8 ---- nsalibselinux/man/man8/getsebool.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/getsebool.8 2007-01-15 16:21:55.000000000 -0500 -@@ -26,9 +26,10 @@ - .B \-a - Show all SELinux booleans. - -+.SH "SEE ALSO" -+selinux(8), setsebool(8), booleans(8) -+ - .SH AUTHOR - This manual page was written by Dan Walsh . - The program was written by Tresys Technology. - --.SH "SEE ALSO" --setsebool(8), booleans(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/matchpathcon.8 libselinux-1.33.4/man/man8/matchpathcon.8 ---- nsalibselinux/man/man8/matchpathcon.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/matchpathcon.8 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "matchpathcon" "8" "21 April 2005" "dwalsh at redhat.com" "SE Linux Command Line documentation" - .SH "NAME" --matchpathcon \- get the default security context for the specified path from the file contexts configuration. -+matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration. - - .SH "SYNOPSIS" - .B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath... -@@ -27,4 +27,5 @@ - This manual page was written by Dan Walsh . - - .SH "SEE ALSO" -+.BR selinux "(8), " - .BR mathpathcon "(3), " -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxenabled.8 libselinux-1.33.4/man/man8/selinuxenabled.8 ---- nsalibselinux/man/man8/selinuxenabled.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/selinuxenabled.8 2007-01-15 16:21:55.000000000 -0500 -@@ -13,4 +13,4 @@ - Dan Walsh, - - .SH "SEE ALSO" --setenforce(8), getenforce(8) -+selinux(8), setenforce(8), getenforce(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/setenforce.8 libselinux-1.33.4/man/man8/setenforce.8 ---- nsalibselinux/man/man8/setenforce.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/setenforce.8 2007-01-15 16:21:55.000000000 -0500 -@@ -17,7 +17,7 @@ - Dan Walsh, - - .SH "SEE ALSO" --getenforce(8), selinuxenabled(8) -+selinux(8), getenforce(8), selinuxenabled(8) - - .SH FILES - /etc/grub.conf, /etc/selinux/config -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/togglesebool.8 libselinux-1.33.4/man/man8/togglesebool.8 ---- nsalibselinux/man/man8/togglesebool.8 2006-11-16 17:15:26.000000000 -0500 -+++ libselinux-1.33.4/man/man8/togglesebool.8 2007-01-15 16:21:55.000000000 -0500 -@@ -1,6 +1,6 @@ - .TH "togglesebool" "1" "26 Oct 2004" "sgrubb at redhat.com" "SELinux Command Line documentation" - .SH "NAME" --togglesebool \- flip the current value of a boolean -+togglesebool \- flip the current value of a SELinux boolean - .SH "SYNOPSIS" - .B togglesebool boolean... - -@@ -14,4 +14,4 @@ - This man page was written by Steve Grubb - - .SH "SEE ALSO" --booleans(8), getsebool(8), setsebool(8) -+selinux(8), booleans(8), getsebool(8), setsebool(8) +Binary files nsalibselinux/src/selinux.pyc and libselinux-1.34.0/src/selinux.pyc differ +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.34.0/src/selinuxswig.i +--- nsalibselinux/src/selinuxswig.i 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.34.0/src/selinuxswig.i 2007-01-24 12:16:39.000000000 -0500 +@@ -25,7 +25,7 @@ + %apply int *OUTPUT { int * }; + %apply int *OUTPUT { size_t * }; + +-%typemap(in, numinputs=0) security_context_t *(security_context_t temp) { ++%typemap(in, numinputs=0) security_context_t *(security_context_t temp=NULL) { + $1 = &temp; + } + %typemap(argout) security_context_t * (char *temp) { +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.34.0/src/selinuxswig_wrap.c +--- nsalibselinux/src/selinuxswig_wrap.c 2006-11-16 17:15:25.000000000 -0500 ++++ libselinux-1.34.0/src/selinuxswig_wrap.c 2007-01-24 12:16:58.000000000 -0500 +@@ -2831,7 +2831,7 @@ + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; +- security_context_t temp1 ; ++ security_context_t temp1 = NULL ; + char *temp10 ; + + { +@@ -2878,7 +2878,7 @@ + int result; + int val1 ; + int ecode1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -2910,7 +2910,7 @@ + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; +- security_context_t temp1 ; ++ security_context_t temp1 = NULL ; + char *temp10 ; + + { +@@ -2936,7 +2936,7 @@ + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; +- security_context_t temp1 ; ++ security_context_t temp1 = NULL ; + char *temp10 ; + + { +@@ -2980,7 +2980,7 @@ + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; +- security_context_t temp1 ; ++ security_context_t temp1 = NULL ; + char *temp10 ; + + { +@@ -3024,7 +3024,7 @@ + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; +- security_context_t temp1 ; ++ security_context_t temp1 = NULL ; + char *temp10 ; + + { +@@ -3068,7 +3068,7 @@ + PyObject *resultobj = 0; + security_context_t *arg1 = (security_context_t *) 0 ; + int result; +- security_context_t temp1 ; ++ security_context_t temp1 = NULL ; + char *temp10 ; + + { +@@ -3116,7 +3116,7 @@ + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -3154,7 +3154,7 @@ + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -3191,7 +3191,7 @@ + int result; + int val1 ; + int ecode1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -3313,7 +3313,7 @@ + int result; + int val1 ; + int ecode1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -3474,7 +3474,7 @@ + security_context_t arg1 ; + security_context_t *arg2 = (security_context_t *) 0 ; + int result; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -3734,7 +3734,7 @@ + int alloc1 = 0 ; + unsigned int val2 ; + int ecode2 = 0 ; +- security_context_t temp3 ; ++ security_context_t temp3 = NULL ; + char *temp30 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; +@@ -3778,7 +3778,7 @@ + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -4212,7 +4212,7 @@ + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + +@@ -4250,7 +4250,7 @@ + int res1 ; + char *buf1 = 0 ; + int alloc1 = 0 ; +- security_context_t temp2 ; ++ security_context_t temp2 = NULL ; + char *temp20 ; + PyObject * obj0 = 0 ; + Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- libselinux.spec 19 Jan 2007 14:22:46 -0000 1.246 +++ libselinux.spec 24 Jan 2007 17:20:19 -0000 1.247 @@ -2,10 +2,11 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 1.34.0 -Release: 1%{?dist} +Release: 3%{?dist} 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} swig Requires: libsepol >= %{libsepolver} setransd @@ -48,6 +49,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -119,6 +121,9 @@ %{_libdir}/python*/site-packages/selinux.py* %changelog +* Fri Jan 19 2007 Dan Walsh - 1.34.0-2 +- Add context function to python to split context into 4 parts + * Fri Jan 19 2007 Dan Walsh - 1.34.0-1 - Upgrade to upstream * Updated version for stable branch. From fedora-cvs-commits at redhat.com Wed Jan 24 17:22:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 12:22:41 -0500 Subject: rpms/flex/devel flex.spec,1.32,1.33 Message-ID: <200701241722.l0OHMeVj022959@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22471 Modified Files: flex.spec Log Message: fixes Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- flex.spec 24 Jan 2007 16:15:21 -0000 1.32 +++ flex.spec 24 Jan 2007 17:22:38 -0000 1.33 @@ -7,7 +7,9 @@ URL: http://flex.sourceforge.net/ Source: http://puzzle.dl.sourceforge.net/sourceforge/flex/flex-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext info byacc +BuildRequires: gettext info bison m4 +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description The flex program generates scanners. Scanners are programs which can @@ -24,7 +26,7 @@ application development. %prep -%setup -q -n flex-%{version} +%setup -q %build %configure --disable-dependency-tracking @@ -33,6 +35,7 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +rm -f $RPM_BUILD_ROOT/%{_infodir}/dir ( cd ${RPM_BUILD_ROOT} ln -sf flex .%{_bindir}/lex @@ -47,8 +50,10 @@ %post /sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||: -%postun -/sbin/install-info --delete flex --dir-file=%{_infodir}/dir ||: +%preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir ||: +fi %check echo ============TESTING=============== From fedora-cvs-commits at redhat.com Wed Jan 24 17:29:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 12:29:42 -0500 Subject: rpms/libfontenc/devel libfontenc.spec,1.19,1.20 Message-ID: <200701241729.l0OHTgMs027764@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libfontenc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27738 Modified Files: libfontenc.spec Log Message: * Wed Jan 24 2007 Adam Jackson 1.0.4-2 - Add BuildRequires on xorg-x11-font-utils to set encodings path correctly. Index: libfontenc.spec =================================================================== RCS file: /cvs/dist/rpms/libfontenc/devel/libfontenc.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libfontenc.spec 6 Jan 2007 04:18:39 -0000 1.19 +++ libfontenc.spec 24 Jan 2007 17:29:40 -0000 1.20 @@ -1,7 +1,7 @@ Summary: X.Org X11 libfontenc runtime library Name: libfontenc Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -15,6 +15,7 @@ BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel BuildRequires: zlib-devel +BuildRequires: xorg-x11-font-utils # FIXME: temporarily require autoconf for workaround BuildRequires: autoconf @@ -86,6 +87,9 @@ %{_libdir}/pkgconfig/fontenc.pc %changelog +* Wed Jan 24 2007 Adam Jackson 1.0.4-2 +- Add BuildRequires on xorg-x11-font-utils to set encodings path correctly. + * Fri Jan 05 2007 Adam Jackson 1.0.4-1 - Update to 1.0.4 From fedora-cvs-commits at redhat.com Wed Jan 24 17:36:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 12:36:30 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch,1.8,1.9 Message-ID: <200701241736.l0OHaUWW032078@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32032 Modified Files: policy-20070102.patch Log Message: * Mon Jan 22 2007 Dan Walsh 2.5.1-5 - Continue fixing, additional user domains policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 83 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 + policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 72 ++++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 21 + policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 198 ++++++++++++- policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 + policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/razor.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 6 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 160 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 111 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 35 +- policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 449 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 171 files changed, 3788 insertions(+), 647 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- policy-20070102.patch 24 Jan 2007 16:39:35 -0000 1.8 +++ policy-20070102.patch 24 Jan 2007 17:36:27 -0000 1.9 @@ -2657,8 +2657,35 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.1/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.if 2007-01-22 13:41:32.000000000 -0500 -@@ -909,7 +909,15 @@ ++++ serefpolicy-2.5.1/policy/modules/kernel/corecommands.if 2007-01-24 12:28:07.000000000 -0500 +@@ -138,6 +138,26 @@ + + ######################################## + ## ++## Do not audit attempts to write ++## sbin directories. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`corecmd_dontaudit_write_sbin',` ++ gen_require(` ++ type sbin_t; ++ ') ++ ++ dontaudit $1 sbin_t:dir write; ++') ++ ++ ++######################################## ++## + ## List the contents of bin directories. + ## + ## +@@ -909,7 +929,15 @@ type bin_t, sbin_t; ') @@ -2675,7 +2702,7 @@ list_dirs_pattern($1,{ bin_t sbin_t },{ bin_t sbin_t }) read_lnk_files_pattern($1,{ bin_t sbin_t },{ bin_t sbin_t }) ') -@@ -931,6 +939,7 @@ +@@ -931,6 +959,7 @@ type bin_t, sbin_t; ') @@ -2683,7 +2710,7 @@ manage_files_pattern($1,{ bin_t sbin_t },exec_type) manage_lnk_files_pattern($1,{ bin_t sbin_t },{ bin_t sbin_t }) ') -@@ -952,6 +961,7 @@ +@@ -952,6 +981,7 @@ ') allow $1 exec_type:file relabel_file_perms; @@ -2691,7 +2718,7 @@ ') ######################################## -@@ -970,4 +980,44 @@ +@@ -970,4 +1000,44 @@ ') allow $1 exec_type:file { getattr read execute }; @@ -5086,7 +5113,7 @@ files_pid_filetrans(radvd_t,radvd_var_run_t,file) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.if serefpolicy-2.5.1/policy/modules/services/razor.if --- nsaserefpolicy/policy/modules/services/razor.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/services/razor.if 2007-01-23 09:19:30.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/razor.if 2007-01-24 12:34:55.000000000 -0500 @@ -23,6 +23,12 @@ ## # @@ -5110,6 +5137,25 @@ type $1_razor_t; domain_type($1_razor_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/razor.te serefpolicy-2.5.1/policy/modules/services/razor.te +--- nsaserefpolicy/policy/modules/services/razor.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/services/razor.te 2007-01-24 12:33:41.000000000 -0500 +@@ -10,7 +10,6 @@ + type razor_exec_t; + domain_type(razor_t) + domain_entry_file(razor_t,razor_exec_t) +-razor_common_domain_template(razor) + role system_r types razor_t; + + type razor_etc_t; +@@ -22,6 +21,7 @@ + type razor_var_lib_t; + files_type(razor_var_lib_t) + ++razor_common_domain_template(razor) + ######################################## + # + # Local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rhgb.if serefpolicy-2.5.1/policy/modules/services/rhgb.if --- nsaserefpolicy/policy/modules/services/rhgb.if 2006-11-16 17:15:20.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/services/rhgb.if 2007-01-17 13:32:47.000000000 -0500 From fedora-cvs-commits at redhat.com Wed Jan 24 18:18:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 13:18:20 -0500 Subject: rpms/dbus-python/devel .cvsignore, 1.2, 1.3 dbus-python.spec, 1.12, 1.13 sources, 1.2, 1.3 Message-ID: <200701241818.l0OIIKkP008688@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/dbus-python/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8670 Modified Files: .cvsignore dbus-python.spec sources Log Message: - upgrade to 0.80.1 - remove dependency on Pyrex and libxml2 - some API breakage, please see http://dbus.freedesktop.org/doc/dbus-python/NEWS.html for notes on changes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dbus-python/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jul 2006 17:11:08 -0000 1.2 +++ .cvsignore 24 Jan 2007 18:18:14 -0000 1.3 @@ -1 +1,2 @@ dbus-python-0.70.tar.gz +dbus-python-0.80.1.tar.gz Index: dbus-python.spec =================================================================== RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dbus-python.spec 3 Jan 2007 21:13:09 -0000 1.12 +++ dbus-python.spec 24 Jan 2007 18:18:14 -0000 1.13 @@ -1,40 +1,53 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define pyrex_version 0.9.4-4 %define dbus_glib_version 0.70 %define dbus_version 0.90 Summary: D-Bus Python Bindings Name: dbus-python -Version: 0.70 -Release: 9%{?dist} +Version: 0.80.1 +Release: 1%{?dist} URL: http://www.freedesktop.org/software/dbus/ Source0: http://dbus.freedesktop.org/releases/%{name}-%{version}.tar.gz -Patch0: dbus-python-0.70-fix-binary-modules-dir.patch + License: AFL/GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} -BuildRequires: Pyrex >= %{pyrex_version} -Requires: libxml2-python %description D-Bus python bindings for use with python programs. +%package devel +Summary: Libraries and headers for dbus-python +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description devel + +Headers and static libraries for hooking up custom mainloops to the dbus python +bindings. + %prep %setup -q -%patch0 -p1 -b .fix-binary-modules-dir %build +%configure + +make -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf %{buildroot} -PKG_CONFIG_PATH=%{_libdir}/pkgconfig %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +#PKG_CONFIG_PATH=%{_libdir}/pkgconfig %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT + +rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la %clean rm -rf %{buildroot} @@ -42,12 +55,36 @@ %files %defattr(-,root,root) -%doc COPYING ChangeLog NEWS - -%{python_sitearch}/dbus/*.so +%doc COPYING ChangeLog +%docdir /usr/share/doc/dbus-python +%{_docdir}/dbus-python/API_CHANGES.txt +%{_docdir}/dbus-python/HACKING.txt +%{_docdir}/dbus-python/NEWS +%{_docdir}/dbus-python/README +%{_docdir}/dbus-python/TODO +%{_docdir}/dbus-python/tutorial.txt + +%dir %{python_sitearch}/dbus +%dir %{python_sitearch}/dbus/mainloop +%{python_sitearch}/*.so +%{python_sitearch}/*.py* %{python_sitearch}/dbus/*.py* +%{python_sitearch}/dbus/mainloop/*.py* + +%files devel +%defattr(-,root,root) + +%{_includedir}/dbus-1.0/dbus/dbus-python.h +%{_libdir}/pkgconfig/dbus-python.pc %changelog +* Wed Jan 24 2007 John (J5) Palmieri - 0.80.1-1 +- upgrade to 0.80.1 +- remove dependency on Pyrex and libxml2 +- some API breakage, + please see http://dbus.freedesktop.org/doc/dbus-python/NEWS.html + for notes on changes + * Wed Jan 3 2007 David Zeuthen - 0.70-9%{?dist} - rebuild against new Pyrex Index: sources =================================================================== RCS file: /cvs/dist/rpms/dbus-python/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Jul 2006 17:11:08 -0000 1.2 +++ sources 24 Jan 2007 18:18:14 -0000 1.3 @@ -1 +1 @@ -26a680134801aa9d8dc77ccde7928927 dbus-python-0.70.tar.gz +42dced5c87a47589ea0b6535ae2e4918 dbus-python-0.80.1.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 24 18:31:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 13:31:35 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.55, 1.56 gnome-utils.spec, 1.141, 1.142 sources, 1.59, 1.60 Message-ID: <200701241831.l0OIVZ2c022129@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22056 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.17.91 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 23 Jan 2007 04:37:56 -0000 1.55 +++ .cvsignore 24 Jan 2007 18:31:32 -0000 1.56 @@ -1 +1 @@ -gnome-utils-2.17.90.tar.bz2 +gnome-utils-2.17.91.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- gnome-utils.spec 23 Jan 2007 04:37:56 -0000 1.141 +++ gnome-utils.spec 24 Jan 2007 18:31:32 -0000 1.142 @@ -9,7 +9,7 @@ %define gnome_panel_version 2.9.4 Name: gnome-utils -Version: 2.17.90 +Version: 2.17.91 Release: 1%{?dist} Epoch: 1 Summary: GNOME utility programs @@ -242,6 +242,9 @@ %changelog +* Wed Jan 24 2007 Matthias Clasen - 2.17.91-1 +- Update to 2.17.91 + * Mon Jan 22 2007 Matthias Clasen - 2.17.90-1 - Update to 2.17.90 - Drop requires for gcalctool, gucharmap, zenity Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 23 Jan 2007 04:37:56 -0000 1.59 +++ sources 24 Jan 2007 18:31:32 -0000 1.60 @@ -1 +1 @@ -185b717f6f735c1460d2f3ace79a28c3 gnome-utils-2.17.90.tar.bz2 +ed06a95f5ebb8de9411297443216ef9f gnome-utils-2.17.91.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 18:33:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 13:33:56 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.71, 1.72 firstboot.spec, 1.93, 1.94 sources, 1.89, 1.90 Message-ID: <200701241833.l0OIXuVe023722@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23652 Modified Files: .cvsignore firstboot.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 18 Dec 2006 18:31:50 -0000 1.71 +++ .cvsignore 24 Jan 2007 18:33:54 -0000 1.72 @@ -43,3 +43,4 @@ firstboot-1.4.26.tar.bz2 firstboot-1.4.27.tar.bz2 firstboot-1.4.28.tar.bz2 +firstboot-1.4.29.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- firstboot.spec 20 Dec 2006 14:53:09 -0000 1.93 +++ firstboot.spec 24 Jan 2007 18:33:54 -0000 1.94 @@ -1,7 +1,7 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.4.28 -Release: 2%{?dist} +Version: 1.4.29 +Release: 1%{?dist} URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -16,7 +16,6 @@ Requires: metacity Requires: rhpl Requires: rhpxl >= 0.19 -Requires: system-config-display Requires: system-config-language Requires: system-config-soundcard Requires: system-config-securitylevel @@ -108,6 +107,11 @@ %changelog +* Wed Jan 24 2007 Chris Lumens 1.4.29-1 +- Fix disabling the soundcard panel if no soundcard are available + (#221177). +- Remove the display module and the dependency on system-config-display. + * Wed Dec 20 2006 Chris Lumens 1.4.28-2 - Revert spec file changes for s390, s390x, and ppc64 for now. Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 20 Dec 2006 14:53:09 -0000 1.89 +++ sources 24 Jan 2007 18:33:54 -0000 1.90 @@ -1 +1 @@ -d3095e82b5e82a00ebfd53aeb81d79cb firstboot-1.4.28.tar.bz2 +2616c6733eed9facbe97b090ead89d15 firstboot-1.4.29.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 18:34:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 13:34:54 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.52, 1.53 gnome-games.spec, 1.112, 1.113 sources, 1.55, 1.56 Message-ID: <200701241834.l0OIYs7U024331@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24256 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.17.90.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 23 Jan 2007 03:15:05 -0000 1.52 +++ .cvsignore 24 Jan 2007 18:34:52 -0000 1.53 @@ -22,3 +22,4 @@ gnome-games-2.17.5.tar.bz2 gnome-games-2.17.90.tar.bz2 gnome-games-extra-data-2.17.90.tar.bz2 +gnome-games-2.17.90.1.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gnome-games.spec 23 Jan 2007 03:15:05 -0000 1.112 +++ gnome-games.spec 24 Jan 2007 18:34:52 -0000 1.113 @@ -29,8 +29,8 @@ Summary: GNOME games Name: gnome-games -Version: 2.17.90 -Release: 2%{?dist} +Version: 2.17.90.1 +Release: 1%{?dist} Epoch: 1 License: LGPL Group: Amusements/Games @@ -348,6 +348,9 @@ %changelog +* Wed Jan 24 2007 Matthias Clasen - 1:2.17.90.1-1 +- Update to 2.17.90.1 + * Mon Jan 22 2007 Matthias Clasen - 1:2.17.90-2 - Update extra data to 2.17.90 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 23 Jan 2007 03:15:05 -0000 1.55 +++ sources 24 Jan 2007 18:34:52 -0000 1.56 @@ -1,2 +1,2 @@ -2cfd9ca0201fbc9f4514ab3cee9a8268 gnome-games-2.17.90.tar.bz2 0d44d896918bab582c947086b3038fb6 gnome-games-extra-data-2.17.90.tar.bz2 +b1bf03bacb7570499a1b06e15764f2f0 gnome-games-2.17.90.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 18:54:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 13:54:01 -0500 Subject: rpms/dbus-python/devel dbus-python.spec,1.13,1.14 Message-ID: <200701241854.l0OIs1gA024786@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/dbus-python/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24654 Modified Files: dbus-python.spec Log Message: - BR python-devel Index: dbus-python.spec =================================================================== RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dbus-python.spec 24 Jan 2007 18:18:14 -0000 1.13 +++ dbus-python.spec 24 Jan 2007 18:53:53 -0000 1.14 @@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} +BuildRequires: python-devel %description From fedora-cvs-commits at redhat.com Wed Jan 24 19:03:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:03:32 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org.spec,1.917,1.918 Message-ID: <200701241903.l0OJ3WCC029688@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29629 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#224230 mark sofficerc as config file Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.917 retrieving revision 1.918 diff -u -r1.917 -r1.918 --- openoffice.org.spec 15 Jan 2007 13:55:23 -0000 1.917 +++ openoffice.org.spec 24 Jan 2007 19:03:27 -0000 1.918 @@ -1848,7 +1848,7 @@ %{instdir}/program/soffice %{instdir}/program/soffice.bin %{instdir}/program/libsoffice.so -%{instdir}/program/sofficerc +%config(noreplace) %{instdir}/program/sofficerc %{instdir}/program/spadmin %{instdir}/program/spadmin.bin %{instdir}/program/streams.uno.so @@ -2565,6 +2565,7 @@ %changelog * Mon Jan 15 2006 Caolan McNamara - 1:2.0.4-5.5.11 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch +- Resolves: rhbz#224230 mark sofficerc as config file * Mon Dec 18 2006 Caolan McNamara - 1:2.0.4-5.5.10 - Resolves: rhbz#219252 add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch From fedora-cvs-commits at redhat.com Wed Jan 24 19:04:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:04:14 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1002,1.1003 Message-ID: <200701241904.l0OJ4E0h029968@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29866 Modified Files: openoffice.org.spec Log Message: Resolves: rhbz#224230 mark sofficerc as config file Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1002 retrieving revision 1.1003 diff -u -r1.1002 -r1.1003 --- openoffice.org.spec 24 Jan 2007 16:55:17 -0000 1.1002 +++ openoffice.org.spec 24 Jan 2007 19:04:07 -0000 1.1003 @@ -1849,7 +1849,7 @@ %{instdir}/program/soffice %{instdir}/program/soffice.bin %{instdir}/program/libsoffice.so -%{instdir}/program/sofficerc +%config(noreplace) %{instdir}/program/sofficerc %{instdir}/program/spadmin %{instdir}/program/spadmin.bin %{instdir}/program/streams.uno.so @@ -2571,6 +2571,7 @@ %changelog * Tue Jan 23 2007 Caolan McNamara - 1:2.2.0-2.1 +- Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch - start of release candidate - drop integrated workspace.icuupgrade.patch From fedora-cvs-commits at redhat.com Wed Jan 24 19:36:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:36:00 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.276, 1.277 policycoreutils.spec, 1.363, 1.364 Message-ID: <200701241936.l0OJa0w4029278@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29229 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jan 24 2007 Dan Walsh 1.34.1-2 - Change chcat to exec semodule so file context is maintained policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ po/Makefile | 2 restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/chcat | 36 semanage/seobject.py | 10 20 files changed, 4832 insertions(+), 18 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- policycoreutils-rhat.patch 24 Jan 2007 15:06:30 -0000 1.276 +++ policycoreutils-rhat.patch 24 Jan 2007 19:35:51 -0000 1.277 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.33.15/gui/booleansPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.34.1/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/booleansPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/booleansPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -201,9 +201,9 @@ + + setsebool="/usr/sbin/setsebool -P %s=%d" % (key, not val) + commands.getstatusoutput(setsebool) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.33.15/gui/fcontextPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.34.1/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/fcontextPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/fcontextPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -363,9 +363,9 @@ + self.store.set_value(iter, 0, fspec) + self.store.set_value(iter, 2, ftype) + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.33.15/gui/loginsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.34.1/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/loginsPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/loginsPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -528,9 +528,9 @@ + self.store.set_value(iter, 1, seuser) + self.store.set_value(iter, 2, seobject.translate(serange)) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.33.15/gui/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.34.1/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/Makefile 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/Makefile 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -562,9 +562,9 @@ +indent: + +relabel: -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.33.15/gui/mappingsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.34.1/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/mappingsPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/mappingsPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -620,9 +620,9 @@ + for k in keys: + print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.33.15/gui/modulesPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.34.1/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/modulesPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/modulesPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -785,9 +785,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.33.15/gui/portsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.34.1/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/portsPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/portsPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1003,9 +1003,9 @@ + self.store.set_value(iter, MLS_COL, mls) + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.33.15/gui/selinux.tbl +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.34.1/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/selinux.tbl 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/selinux.tbl 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1272,9 +1272,9 @@ +ypserv_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for ypserv daemon") +ypxfr_disable_trans _("NIS") _("Disable SELinux protection for NIS Transfer Daemon") +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.33.15/gui/semanagePage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.34.1/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/semanagePage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/semanagePage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1385,9 +1385,9 @@ + self.dialog.hide() + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.33.15/gui/statusPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.34.1/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/statusPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/statusPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1602,9 +1602,9 @@ + return self.types[self.selinuxTypeOptionMenu.get_active()] + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.33.15/gui/system-config-selinux.glade +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.34.1/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/system-config-selinux.glade 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/system-config-selinux.glade 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4409,9 +4409,9 @@ + + + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.33.15/gui/system-config-selinux.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.34.1/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/system-config-selinux.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/system-config-selinux.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4569,9 +4569,9 @@ + + app = childWindow() + app.stand_alone() -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.33.15/gui/translationsPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.34.1/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/translationsPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/translationsPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4682,9 +4682,9 @@ + store, iter = self.view.get_selection().get_selected() + self.store.set_value(iter, 0, level) + self.store.set_value(iter, 1, translation) -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.33.15/gui/usersPage.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.34.1/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/gui/usersPage.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/gui/usersPage.py 2007-01-24 10:05:24.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4841,18 +4841,30 @@ + except ValueError, e: + self.error(e.args[0]) + -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.33.15/Makefile +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.34.1/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.33.15/Makefile 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/Makefile 2007-01-24 10:05:24.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.15/restorecond/restorecond.c +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-1.34.1/po/Makefile +--- nsapolicycoreutils/po/Makefile 2007-01-19 08:50:12.000000000 -0500 ++++ policycoreutils-1.34.1/po/Makefile 2007-01-24 10:05:24.000000000 -0500 +@@ -36,7 +36,7 @@ + + #default:: clean + +-all:: $(MOFILES) ++all:: update-po $(MOFILES) + + $(POTFILE): $(POTFILES) + $(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES) +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.34.1/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.33.15/restorecond/restorecond.c 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/restorecond/restorecond.c 2007-01-24 10:05:24.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4879,18 +4891,86 @@ } free(scontext); close(fd); -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.33.15/restorecond/restorecond.conf +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.34.1/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.33.15/restorecond/restorecond.conf 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/restorecond/restorecond.conf 2007-01-24 10:05:24.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime /etc/samba/secrets.tdb /etc/mtab /var/run/utmp -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.33.15/semanage/seobject.py +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.34.1/scripts/chcat +--- nsapolicycoreutils/scripts/chcat 2006-11-16 17:14:27.000000000 -0500 ++++ policycoreutils-1.34.1/scripts/chcat 2007-01-24 14:33:58.000000000 -0500 +@@ -62,12 +62,20 @@ + for i in newcat[1:]: + if i not in cats: + cats.append(i) ++ + new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ",")) +- ++ if new_serange[-1:] == ":": ++ new_serange = new_serange[:-1] ++ + if add_ind: +- logins.add(u, user[0], new_serange) ++ cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) + else: +- logins.modify(u, user[0], new_serange) ++ cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) ++ rc = commands.getstatusoutput(cmd) ++ if rc[0] != 0: ++ print rc[1] ++ errors += 1 ++ + return errors + + def chcat_add(orig, newcat, objects,login_ind): +@@ -133,11 +141,17 @@ + cats.remove(i) + + new_serange = "%s-%s:%s" % (serange[0], top[0], string.join(cats, ",")) ++ if new_serange[-1:] == ":": ++ new_serange = new_serange[:-1] + + if add_ind: +- logins.add(u, user[0], new_serange) ++ cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) + else: +- logins.modify(u, user[0], new_serange) ++ cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) ++ rc = commands.getstatusoutput(cmd) ++ if rc[0] != 0: ++ print rc[1] ++ errors += 1 + return errors + + def chcat_remove(orig, newcat, objects, login_ind): +@@ -198,11 +212,17 @@ + user = seusers["__default__"] + serange = user[1].split("-") + new_serange = "%s-%s:%s" % (serange[0],newcat[0], string.join(newcat[1:], ",")) +- ++ if new_serange[-1:] == ":": ++ new_serange = new_serange[:-1] ++ + if add_ind: +- logins.add(u, user[0], new_serange) ++ cmd = "semanage login -a -r %s -s %s %s" % (new_serange, user[0], u) + else: +- logins.modify(u, user[0], new_serange) ++ cmd = "semanage login -m -r %s -s %s %s" % (new_serange, user[0], u) ++ rc = commands.getstatusoutput(cmd) ++ if rc[0] != 0: ++ print rc[1] ++ errors += 1 + return errors + + def chcat_replace(newcat, objects, login_ind): +diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.34.1/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2007-01-17 11:11:34.000000000 -0500 -+++ policycoreutils-1.33.15/semanage/seobject.py 2007-01-24 09:58:03.000000000 -0500 ++++ policycoreutils-1.34.1/semanage/seobject.py 2007-01-24 10:05:24.000000000 -0500 @@ -209,7 +209,8 @@ os.write(fd, self.out()) os.close(fd) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- policycoreutils.spec 24 Jan 2007 15:06:32 -0000 1.363 +++ policycoreutils.spec 24 Jan 2007 19:35:53 -0000 1.364 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.34.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,9 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Wed Jan 24 2007 Dan Walsh 1.34.1-2 +- Change chcat to exec semodule so file context is maintained + * Wed Jan 24 2007 Dan Walsh 1.34.1-1 - Fix system-config-selinux ports view - Update to upstream From fedora-cvs-commits at redhat.com Wed Jan 24 19:36:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:36:28 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch,1.9,1.10 Message-ID: <200701241936.l0OJaS4e029488@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29444 Modified Files: policy-20070102.patch Log Message: * Mon Jan 22 2007 Dan Walsh 2.5.1-5 - Continue fixing, additional user domains policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 83 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 + policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 72 ++++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 38 ++ policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 198 ++++++++++++- policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 9 policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 + policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/razor.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 6 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 160 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 105 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 35 +- policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 38 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 449 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 171 files changed, 3799 insertions(+), 647 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- policy-20070102.patch 24 Jan 2007 17:36:27 -0000 1.9 +++ policy-20070102.patch 24 Jan 2007 19:36:24 -0000 1.10 @@ -3003,8 +3003,8 @@ # Type for /dev/mapper/control diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.1/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/kernel/domain.if 2007-01-17 13:32:47.000000000 -0500 -@@ -1217,3 +1217,24 @@ ++++ serefpolicy-2.5.1/policy/modules/kernel/domain.if 2007-01-24 13:44:50.000000000 -0500 +@@ -1217,3 +1217,41 @@ typeattribute $1 can_change_object_identity; typeattribute $1 set_curr_context; ') @@ -3029,6 +3029,23 @@ + dontaudit $1 entry_type:file rx_file_perms; +') + ++######################################## ++## ++## Allow specified type to set context on domain attribute. ++## ++## ++## ++## Type of subject to be allowed this. ++## ++## ++# ++interface(`domain_setcontext',` ++ gen_require(` ++ attribute domain; ++ ') ++ ++ allow $1 domain:association setcontext; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.1/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2006-11-16 17:15:04.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/kernel/domain.te 2007-01-17 13:32:47.000000000 -0500 @@ -6605,7 +6622,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-2.5.1/policy/modules/system/ipsec.te --- nsaserefpolicy/policy/modules/system/ipsec.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/ipsec.te 2007-01-22 20:01:00.000000000 -0500 ++++ serefpolicy-2.5.1/policy/modules/system/ipsec.te 2007-01-24 13:56:36.000000000 -0500 @@ -6,6 +6,16 @@ # Declarations # @@ -6634,7 +6651,7 @@ ######################################## # # ipsec Local policy -@@ -265,3 +279,100 @@ +@@ -265,3 +279,94 @@ allow ipsec_mgmt_t dev_fs:file_class_set getattr; ') dnl end TODO @@ -6689,20 +6706,9 @@ +allow racoon_t self:key_socket { create read setopt write }; +allow racoon_t self:netlink_route_socket { create_netlink_socket_perms }; + -+allow racoon_t node_t:udp_socket node_bind; -+ -+# so racoon can listen on admin port. -+allow racoon_t inaddr_any_node_t:tcp_socket node_bind; -+ -+# allow racoon to use ISAKMP port -+allow racoon_t isakmp_port_t:udp_socket name_bind; -+ +corenet_non_ipsec_sendrecv(racoon_t) -+corenet_udp_bind_link_local_node(racoon_t) -+corenet_udp_bind_compat_ipv4_node(racoon_t) -+corenet_udp_bind_lo_node(racoon_t) -+kernel_read_network_state(racoon_t) -+corenet_udp_bind_site_local_node(racoon_t) ++corenet_tcp_bind_all_nodes(racoon_t) ++corenet_udp_bind_isakmp_port(racoon_t) +seutil_read_config(setkey_t) + +# manage pid file @@ -6720,21 +6726,26 @@ +allow racoon_t ipsec_key_file_t:dir r_dir_perms; +allow racoon_t ipsec_key_file_t:file r_file_perms; +allow racoon_t ipsec_key_file_t:lnk_file r_file_perms; -+ +allow racoon_t ipsec_spd_t:association setcontext; + +userdom_use_sysadm_ttys(racoon_t) -+locallogin_use_fds(racoon_t) ++ ++dev_read_urand(racoon_t) + +# allow racoon to set contexts on ipsec policy and SAs +domain_setcontext(racoon_t) + -+logging_send_syslog_msg(racoon_t) +files_read_etc_files(racoon_t) ++ +libs_use_ld_so(racoon_t) +libs_use_shared_libs(racoon_t) ++ ++logging_send_syslog_msg(racoon_t) ++locallogin_use_fds(racoon_t) ++ +miscfiles_read_localization(racoon_t) -+dev_read_urand(racoon_t) ++ ++kernel_read_network_state(racoon_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.5.1/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.1/policy/modules/system/iptables.te 2007-01-17 13:32:47.000000000 -0500 From fedora-cvs-commits at redhat.com Wed Jan 24 19:42:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:42:20 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.367, 1.368 anaconda.spec, 1.493, 1.494 sources, 1.491, 1.492 Message-ID: <200701241942.l0OJgKIH031439@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31354/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.16-1 on branch devel from anaconda-11.2.0.16-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- .cvsignore 23 Jan 2007 23:07:01 -0000 1.367 +++ .cvsignore 24 Jan 2007 19:42:17 -0000 1.368 @@ -1 +1 @@ -anaconda-11.2.0.15.tar.bz2 +anaconda-11.2.0.16.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.493 retrieving revision 1.494 diff -u -r1.493 -r1.494 --- anaconda.spec 23 Jan 2007 23:07:01 -0000 1.493 +++ anaconda.spec 24 Jan 2007 19:42:17 -0000 1.494 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.15 +Version: 11.2.0.16 Release: 1 License: GPL Summary: Graphical system installer @@ -109,6 +109,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jan 24 2007 Jeremy Katz - 11.2.0.16-1 +- Fix rescue mode +- Fix theming + * Tue Jan 23 2007 Jeremy Katz - 11.2.0.15-1 - Remove @everything parsing as promised - Package requirement fixes Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.491 retrieving revision 1.492 diff -u -r1.491 -r1.492 --- sources 23 Jan 2007 23:07:01 -0000 1.491 +++ sources 24 Jan 2007 19:42:18 -0000 1.492 @@ -1 +1 @@ -3910c1859c140c72a32972b034f58ba9 anaconda-11.2.0.15.tar.bz2 +f1b1cd84cfafe1fde668bea76906d6a2 anaconda-11.2.0.16.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 19:42:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:42:29 -0500 Subject: rpms/policycoreutils/devel policycoreutils-po.patch, 1.19, 1.20 policycoreutils-rhat.patch, 1.277, 1.278 Message-ID: <200701241942.l0OJgTxk031506@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31465 Modified Files: policycoreutils-po.patch policycoreutils-rhat.patch Log Message: * Wed Jan 24 2007 Dan Walsh 1.34.1-2 - Change chcat to exec semodule so file context is maintained policycoreutils-po.patch: bs.po | 1116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ da.po | 2 mr.po | 462 +++++++++++++-------------- ms.po | 274 ++++++++++------ sv.po | 57 +-- uk.po | 61 +-- 6 files changed, 1585 insertions(+), 387 deletions(-) Index: policycoreutils-po.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-po.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- policycoreutils-po.patch 24 Jan 2007 15:06:29 -0000 1.19 +++ policycoreutils-po.patch 24 Jan 2007 19:42:25 -0000 1.20 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-1.33.15/po/bs.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/bs.po policycoreutils-1.34.1/po/bs.po --- nsapolicycoreutils/po/bs.po 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.33.15/po/bs.po 2007-01-24 09:59:59.000000000 -0500 ++++ policycoreutils-1.34.1/po/bs.po 2007-01-24 14:40:16.000000000 -0500 @@ -0,0 +1,1116 @@ +# translation of bs.po to Bosnian +# Adnan Hodzic , 2007. @@ -1118,9 +1118,9 @@ +msgid "Options Error: %s " +msgstr "Opciona gre??ka: %s " + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.33.15/po/da.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/da.po policycoreutils-1.34.1/po/da.po --- nsapolicycoreutils/po/da.po 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.33.15/po/da.po 2007-01-24 09:59:59.000000000 -0500 ++++ policycoreutils-1.34.1/po/da.po 2007-01-24 14:40:16.000000000 -0500 @@ -3,7 +3,7 @@ # Christian Rose , 2006. # Keld Simonsen , 2006. @@ -1130,21 +1130,9 @@ # msgid "" msgstr "" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-1.33.15/po/Makefile ---- nsapolicycoreutils/po/Makefile 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.33.15/po/Makefile 2007-01-17 11:11:40.000000000 -0500 -@@ -36,7 +36,7 @@ - - #default:: clean - --all:: $(MOFILES) -+all:: update-po $(MOFILES) - - $(POTFILE): $(POTFILES) - $(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.33.15/po/mr.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/mr.po policycoreutils-1.34.1/po/mr.po --- nsapolicycoreutils/po/mr.po 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.33.15/po/mr.po 2007-01-24 09:59:59.000000000 -0500 ++++ policycoreutils-1.34.1/po/mr.po 2007-01-24 14:40:16.000000000 -0500 @@ -2,14 +2,15 @@ # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. @@ -2402,9 +2390,9 @@ -msgstr "????????? " +msgstr "?????????????????? ?????????: %s" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.33.15/po/ms.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ms.po policycoreutils-1.34.1/po/ms.po --- nsapolicycoreutils/po/ms.po 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.33.15/po/ms.po 2007-01-24 09:59:59.000000000 -0500 ++++ policycoreutils-1.34.1/po/ms.po 2007-01-24 14:40:16.000000000 -0500 @@ -8,7 +8,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -3091,9 +3079,9 @@ msgid "Options Error: %s " msgstr "Ralat Pilihan: %s" + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.33.15/po/sv.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.34.1/po/sv.po --- nsapolicycoreutils/po/sv.po 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.33.15/po/sv.po 2007-01-24 09:59:59.000000000 -0500 ++++ policycoreutils-1.34.1/po/sv.po 2007-01-24 14:40:16.000000000 -0500 @@ -1,15 +1,15 @@ # Swedish messages for policycoreutils. -# Copyright (C) 2006 Christian Rose. @@ -3268,9 +3256,9 @@ #: ../semanage/seobject.py:1203 msgid "Requires value" -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.33.15/po/uk.po +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/uk.po policycoreutils-1.34.1/po/uk.po --- nsapolicycoreutils/po/uk.po 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.33.15/po/uk.po 2007-01-24 09:59:59.000000000 -0500 ++++ policycoreutils-1.34.1/po/uk.po 2007-01-24 14:40:16.000000000 -0500 @@ -1,14 +1,14 @@ # Ukraqinian translation of policycoreutils. # Copyright (C) 2006 Free software Foundation policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/chcat | 36 semanage/seobject.py | 10 19 files changed, 4831 insertions(+), 17 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.277 retrieving revision 1.278 diff -u -r1.277 -r1.278 --- policycoreutils-rhat.patch 24 Jan 2007 19:35:51 -0000 1.277 +++ policycoreutils-rhat.patch 24 Jan 2007 19:42:26 -0000 1.278 @@ -4850,18 +4850,6 @@ all install relabel clean indent: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-1.34.1/po/Makefile ---- nsapolicycoreutils/po/Makefile 2007-01-19 08:50:12.000000000 -0500 -+++ policycoreutils-1.34.1/po/Makefile 2007-01-24 10:05:24.000000000 -0500 -@@ -36,7 +36,7 @@ - - #default:: clean - --all:: $(MOFILES) -+all:: update-po $(MOFILES) - - $(POTFILE): $(POTFILES) - $(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.34.1/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 +++ policycoreutils-1.34.1/restorecond/restorecond.c 2007-01-24 10:05:24.000000000 -0500 From fedora-cvs-commits at redhat.com Wed Jan 24 19:44:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:44:02 -0500 Subject: rpms/dbus-python/devel dbus-python.spec,1.14,1.15 Message-ID: <200701241944.l0OJi23i032081@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/dbus-python/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31853 Modified Files: dbus-python.spec Log Message: - use python_sitelib for noarch files and python_sitearch for platform files Index: dbus-python.spec =================================================================== RCS file: /cvs/dist/rpms/dbus-python/devel/dbus-python.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dbus-python.spec 24 Jan 2007 18:53:53 -0000 1.14 +++ dbus-python.spec 24 Jan 2007 19:43:56 -0000 1.15 @@ -1,4 +1,5 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define dbus_glib_version 0.70 %define dbus_version 0.90 @@ -65,12 +66,12 @@ %{_docdir}/dbus-python/TODO %{_docdir}/dbus-python/tutorial.txt -%dir %{python_sitearch}/dbus -%dir %{python_sitearch}/dbus/mainloop +%dir %{python_sitelib}/dbus +%dir %{python_sitelib}/dbus/mainloop %{python_sitearch}/*.so -%{python_sitearch}/*.py* -%{python_sitearch}/dbus/*.py* -%{python_sitearch}/dbus/mainloop/*.py* +%{python_sitelib}/*.py* +%{python_sitelib}/dbus/*.py* +%{python_sitelib}/dbus/mainloop/*.py* %files devel %defattr(-,root,root) From fedora-cvs-commits at redhat.com Wed Jan 24 19:50:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:50:14 -0500 Subject: rpms/xorg-x11-drv-trident/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-trident.spec, 1.13, 1.14 Message-ID: <200701241950.l0OJoEWN023367@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23329/devel Modified Files: .cvsignore sources xorg-x11-drv-trident.spec Log Message: auto-import xorg-x11-drv-trident-1.2.3-1.fc7 on branch devel from xorg-x11-drv-trident-1.2.3-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 03:26:21 -0000 1.7 +++ .cvsignore 24 Jan 2007 19:50:12 -0000 1.8 @@ -1 +1 @@ -xf86-video-trident-1.2.1.tar.bz2 +xf86-video-trident-1.2.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 03:26:21 -0000 1.7 +++ sources 24 Jan 2007 19:50:12 -0000 1.8 @@ -1 +1 @@ -0723f8bcb2aa32c30f808e9da01fc0a0 xf86-video-trident-1.2.1.tar.bz2 +c0e8b2f54942b6902b7dd4f30defe800 xf86-video-trident-1.2.3.tar.bz2 Index: xorg-x11-drv-trident.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-trident.spec 25 Jul 2006 06:10:37 -0000 1.13 +++ xorg-x11-drv-trident.spec 24 Jan 2007 19:50:12 -0000 1.14 @@ -6,8 +6,8 @@ Summary: Xorg X11 trident video driver Name: xorg-x11-drv-trident -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.3 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -58,6 +58,9 @@ %{_mandir}/man4/trident.4* %changelog +* Wed Jan 24 2007 Adam Jackson 1.2.3-1 +- Update to 1.2.3 + * Tue Jul 25 2006 Mike A. Harris 1.2.1-3.fc6 - Added trident-missing-symbols-bug168713.patch to fix bug (#168713) - Remove moduledir/driverdir directory ownership (#198294) From fedora-cvs-commits at redhat.com Wed Jan 24 19:52:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 14:52:39 -0500 Subject: rpms/xorg-x11-drv-trident/FC-6 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-trident.spec, 1.13, 1.14 Message-ID: <200701241952.l0OJqdfZ025160@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-trident/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25106/FC-6 Modified Files: .cvsignore sources xorg-x11-drv-trident.spec Log Message: auto-import xorg-x11-drv-trident-1.2.3-1.fc6 on branch FC-6 from xorg-x11-drv-trident-1.2.3-1.fc6.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/FC-6/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 03:26:21 -0000 1.7 +++ .cvsignore 24 Jan 2007 19:52:37 -0000 1.8 @@ -1 +1 @@ -xf86-video-trident-1.2.1.tar.bz2 +xf86-video-trident-1.2.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/FC-6/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 03:26:21 -0000 1.7 +++ sources 24 Jan 2007 19:52:37 -0000 1.8 @@ -1 +1 @@ -0723f8bcb2aa32c30f808e9da01fc0a0 xf86-video-trident-1.2.1.tar.bz2 +c0e8b2f54942b6902b7dd4f30defe800 xf86-video-trident-1.2.3.tar.bz2 Index: xorg-x11-drv-trident.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/FC-6/xorg-x11-drv-trident.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-trident.spec 25 Jul 2006 06:10:37 -0000 1.13 +++ xorg-x11-drv-trident.spec 24 Jan 2007 19:52:37 -0000 1.14 @@ -6,8 +6,8 @@ Summary: Xorg X11 trident video driver Name: xorg-x11-drv-trident -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.3 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -58,6 +58,9 @@ %{_mandir}/man4/trident.4* %changelog +* Wed Jan 24 2007 Adam Jackson 1.2.3-1 +- Update to 1.2.3 + * Tue Jul 25 2006 Mike A. Harris 1.2.1-3.fc6 - Added trident-missing-symbols-bug168713.patch to fix bug (#168713) - Remove moduledir/driverdir directory ownership (#198294) From fedora-cvs-commits at redhat.com Wed Jan 24 20:15:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:15:05 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.278, 1.279 policycoreutils.spec, 1.364, 1.365 Message-ID: <200701242015.l0OKF5lO030200@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30181 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jan 24 2007 Dan Walsh 1.34.1-3 - More chcat fixes policycoreutils-rhat.patch: Makefile | 2 gui/Makefile | 30 gui/booleansPage.py | 199 ++ gui/fcontextPage.py | 158 ++ gui/loginsPage.py | 161 ++ gui/mappingsPage.py | 54 gui/modulesPage.py | 161 ++ gui/portsPage.py | 214 +++ gui/selinux.tbl | 265 +++ gui/semanagePage.py | 109 + gui/statusPage.py | 213 +++ gui/system-config-selinux.glade | 2803 ++++++++++++++++++++++++++++++++++++++++ gui/system-config-selinux.py | 156 ++ gui/translationsPage.py | 109 + gui/usersPage.py | 155 ++ restorecond/restorecond.c | 12 restorecond/restorecond.conf | 1 scripts/chcat | 36 semanage/seobject.py | 10 19 files changed, 4831 insertions(+), 17 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.278 retrieving revision 1.279 diff -u -r1.278 -r1.279 --- policycoreutils-rhat.patch 24 Jan 2007 19:42:26 -0000 1.278 +++ policycoreutils-rhat.patch 24 Jan 2007 20:15:03 -0000 1.279 @@ -1,6 +1,6 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/booleansPage.py policycoreutils-1.34.1/gui/booleansPage.py --- nsapolicycoreutils/gui/booleansPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/booleansPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/booleansPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,199 @@ +# +# booleansPage.py - GUI for Booleans page in system-config-securitylevel @@ -203,7 +203,7 @@ + commands.getstatusoutput(setsebool) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/fcontextPage.py policycoreutils-1.34.1/gui/fcontextPage.py --- nsapolicycoreutils/gui/fcontextPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/fcontextPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/fcontextPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,158 @@ +## fcontextPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -365,7 +365,7 @@ + self.store.set_value(iter, 1, "system_u:object_r:%s:%s" % (type, mls)) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/loginsPage.py policycoreutils-1.34.1/gui/loginsPage.py --- nsapolicycoreutils/gui/loginsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/loginsPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/loginsPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,161 @@ +## loginsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -530,7 +530,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-1.34.1/gui/Makefile --- nsapolicycoreutils/gui/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/Makefile 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/Makefile 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,30 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -564,7 +564,7 @@ +relabel: diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/mappingsPage.py policycoreutils-1.34.1/gui/mappingsPage.py --- nsapolicycoreutils/gui/mappingsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/mappingsPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/mappingsPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,54 @@ +## mappingsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -622,7 +622,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/modulesPage.py policycoreutils-1.34.1/gui/modulesPage.py --- nsapolicycoreutils/gui/modulesPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/modulesPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/modulesPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,161 @@ +## modulesPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -787,7 +787,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/portsPage.py policycoreutils-1.34.1/gui/portsPage.py --- nsapolicycoreutils/gui/portsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/portsPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/portsPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,214 @@ +## portsPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1005,7 +1005,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/selinux.tbl policycoreutils-1.34.1/gui/selinux.tbl --- nsapolicycoreutils/gui/selinux.tbl 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/selinux.tbl 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/selinux.tbl 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,265 @@ +acct_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for acct daemon") +allow_cvs_read_shadow _("CVS") _("Allow cvs daemon to read shadow") @@ -1274,7 +1274,7 @@ +zebra_disable_trans _("SELinux Service Protection") _("Disable SELinux protection for zebra daemon") diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/semanagePage.py policycoreutils-1.34.1/gui/semanagePage.py --- nsapolicycoreutils/gui/semanagePage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/semanagePage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/semanagePage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,109 @@ +## semanagePage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -1387,7 +1387,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/statusPage.py policycoreutils-1.34.1/gui/statusPage.py --- nsapolicycoreutils/gui/statusPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/statusPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/statusPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,213 @@ +## statusPage.py - show selinux status +## Copyright (C) 2006 Red Hat, Inc. @@ -1604,7 +1604,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.glade policycoreutils-1.34.1/gui/system-config-selinux.glade --- nsapolicycoreutils/gui/system-config-selinux.glade 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/system-config-selinux.glade 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/system-config-selinux.glade 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,2803 @@ + + @@ -4411,7 +4411,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/system-config-selinux.py policycoreutils-1.34.1/gui/system-config-selinux.py --- nsapolicycoreutils/gui/system-config-selinux.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/system-config-selinux.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/system-config-selinux.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,156 @@ +#!/usr/bin/python +# @@ -4571,7 +4571,7 @@ + app.stand_alone() diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/translationsPage.py policycoreutils-1.34.1/gui/translationsPage.py --- nsapolicycoreutils/gui/translationsPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/translationsPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/translationsPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,109 @@ +## translationsPage.py - show selinux translations +## Copyright (C) 2006 Red Hat, Inc. @@ -4684,7 +4684,7 @@ + self.store.set_value(iter, 1, translation) diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/gui/usersPage.py policycoreutils-1.34.1/gui/usersPage.py --- nsapolicycoreutils/gui/usersPage.py 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.34.1/gui/usersPage.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/gui/usersPage.py 2007-01-24 14:42:19.000000000 -0500 @@ -0,0 +1,155 @@ +## usersPage.py - show selinux mappings +## Copyright (C) 2006 Red Hat, Inc. @@ -4843,7 +4843,7 @@ + diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.34.1/Makefile --- nsapolicycoreutils/Makefile 2006-11-16 17:15:00.000000000 -0500 -+++ policycoreutils-1.34.1/Makefile 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/Makefile 2007-01-24 14:42:19.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui @@ -4852,7 +4852,7 @@ @for subdir in $(SUBDIRS); do \ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.34.1/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500 -+++ policycoreutils-1.34.1/restorecond/restorecond.c 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/restorecond/restorecond.c 2007-01-24 14:42:19.000000000 -0500 @@ -210,9 +210,10 @@ } @@ -4881,7 +4881,7 @@ close(fd); diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.34.1/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 2006-11-20 12:19:55.000000000 -0500 -+++ policycoreutils-1.34.1/restorecond/restorecond.conf 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/restorecond/restorecond.conf 2007-01-24 14:42:19.000000000 -0500 @@ -1,4 +1,5 @@ /etc/resolv.conf +/etc/localtime @@ -4890,7 +4890,7 @@ /var/run/utmp diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.34.1/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2006-11-16 17:14:27.000000000 -0500 -+++ policycoreutils-1.34.1/scripts/chcat 2007-01-24 14:33:58.000000000 -0500 ++++ policycoreutils-1.34.1/scripts/chcat 2007-01-24 14:42:19.000000000 -0500 @@ -62,12 +62,20 @@ for i in newcat[1:]: if i not in cats: @@ -4958,7 +4958,7 @@ def chcat_replace(newcat, objects, login_ind): diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.34.1/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2007-01-17 11:11:34.000000000 -0500 -+++ policycoreutils-1.34.1/semanage/seobject.py 2007-01-24 10:05:24.000000000 -0500 ++++ policycoreutils-1.34.1/semanage/seobject.py 2007-01-24 14:42:19.000000000 -0500 @@ -209,7 +209,8 @@ os.write(fd, self.out()) os.close(fd) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- policycoreutils.spec 24 Jan 2007 19:35:53 -0000 1.364 +++ policycoreutils.spec 24 Jan 2007 20:15:03 -0000 1.365 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.34.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -168,6 +168,9 @@ [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null %changelog +* Wed Jan 24 2007 Dan Walsh 1.34.1-3 +- More chcat fixes + * Wed Jan 24 2007 Dan Walsh 1.34.1-2 - Change chcat to exec semodule so file context is maintained From fedora-cvs-commits at redhat.com Wed Jan 24 20:24:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:24:32 -0500 Subject: rpms/cman/FC-6 cman.spec,1.98,1.99 sources,1.35,1.36 Message-ID: <200701242024.l0OKOWtP018301@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18284 Modified Files: cman.spec sources Log Message: Sync to latest RHEL5 packages Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/FC-6/cman.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- cman.spec 5 Oct 2006 22:58:35 -0000 1.98 +++ cman.spec 24 Jan 2007 20:24:30 -0000 1.99 @@ -10,7 +10,7 @@ ############################################################################### ############################################################################### %define cman_major 2 -%define cman_minor 0.21 +%define cman_minor 0.60 %define buildxen 0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/cman/FC-6/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 5 Oct 2006 22:58:35 -0000 1.35 +++ sources 24 Jan 2007 20:24:30 -0000 1.36 @@ -1 +1 @@ -6042fbbd8c043b3d244d0927472563ee cman-2.0.21.tar.gz +0c81fef950377f75a95623533ca0adb7 cman-2.0.60.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 24 20:24:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:24:39 -0500 Subject: rpms/xorg-x11-drv-nsc/devel nsc-2.8.1-noexecstack.patch, NONE, 1.1 xorg-x11-drv-nsc.spec, 1.12, 1.13 Message-ID: <200701242024.l0OKOdBo018327@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18311 Modified Files: xorg-x11-drv-nsc.spec Added Files: nsc-2.8.1-noexecstack.patch Log Message: * Wed Jan 24 2007 Adam Jackson 2.8.1-2 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for selinux conformance. (#220749) nsc-2.8.1-noexecstack.patch: nsc_msr_asm.S | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE nsc-2.8.1-noexecstack.patch --- --- xf86-video-nsc-2.8.1/src/nsc_msr_asm.S.jx 2004-04-23 15:40:15.000000000 -0400 +++ xf86-video-nsc-2.8.1/src/nsc_msr_asm.S 2007-01-24 15:09:44.000000000 -0500 @@ -225,5 +225,9 @@ LEAVE RET +#if defined (__ELF__) && defined (__linux__) + .section .note.GNU-stack,"",%progbits +#endif + /*###################################*/ Index: xorg-x11-drv-nsc.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-drv-nsc.spec 12 Jul 2006 09:04:40 -0000 1.12 +++ xorg-x11-drv-nsc.spec 24 Jan 2007 20:24:37 -0000 1.13 @@ -7,7 +7,7 @@ Summary: Xorg X11 nsc video driver Name: xorg-x11-drv-nsc Version: 2.8.1 -Release: 2.1 +Release: 3%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -16,6 +16,8 @@ Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 Source1: nsc.xinf +Patch0: nsc-2.8.1-noexecstack.patch + ExclusiveArch: %{ix86} BuildRequires: pkgconfig @@ -28,6 +30,7 @@ %prep %setup -q -n %{tarball}-%{version} +%patch0 -p1 -b .execstack %build %configure --disable-static @@ -58,6 +61,10 @@ %{_mandir}/man4/nsc.4* %changelog +* Wed Jan 24 2007 Adam Jackson 2.8.1-2 +- nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for + selinux conformance. (#220749) + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 20:30:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:30:20 -0500 Subject: rpms/libgnomekbd/devel libgnomekbd-2.17.2-corner.patch, NONE, 1.1 libgnomekbd-2.17.2-label-color.patch, NONE, 1.1 libgnomekbd-2.17.2-primary.patch, NONE, 1.1 libgnomekbd-2.17.2-redraw.patch, NONE, 1.1 libgnomekbd-2.17.2-rotated-text.patch, NONE, 1.1 libgnomekbd.spec, 1.13, 1.14 Message-ID: <200701242030.l0OKUKaY018550@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomekbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18479 Modified Files: libgnomekbd.spec Added Files: libgnomekbd-2.17.2-corner.patch libgnomekbd-2.17.2-label-color.patch libgnomekbd-2.17.2-primary.patch libgnomekbd-2.17.2-redraw.patch libgnomekbd-2.17.2-rotated-text.patch Log Message: Port the control-center patches for improved keyboard rendering libgnomekbd-2.17.2-corner.patch: gkbd-keyboard-drawing.c | 314 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 288 insertions(+), 26 deletions(-) --- NEW FILE libgnomekbd-2.17.2-corner.patch --- --- libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c.corner 2007-01-24 15:21:42.000000000 -0500 +++ libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c 2007-01-24 15:23:24.000000000 -0500 @@ -66,14 +66,227 @@ * cos (M_PI * angle / 1800.0); } +static gdouble +length (gdouble x, gdouble y) +{ + return sqrt (x*x + y*y); +} + +static gdouble +point_line_distance (gdouble ax, gdouble ay, + gdouble nx, gdouble ny) +{ + return ax * nx + ay * ny; +} + +static void +normal_form (gdouble ax, gdouble ay, + gdouble bx, gdouble by, + gdouble *nx, gdouble *ny, gdouble *d) +{ + gdouble l; + + *nx = by - ay; + *ny = ax - bx; + + l = length (*nx, *ny); + + *nx /= l; + *ny /= l; + + *d = point_line_distance (ax, ay, *nx, *ny); +} + +static void +inverse (gdouble a, gdouble b, gdouble c, gdouble d, + gdouble *e, gdouble *f, gdouble *g, gdouble *h) +{ + gdouble det; + + det = a*d - b*c; + + *e = d / det; + *f = -b / det; + *g = -c / det; + *h = a / det; +} + +static void +multiply (gdouble a, gdouble b, gdouble c, gdouble d, + gdouble e, gdouble f, + gdouble *x, gdouble *y) +{ + *x = a*e + b*f; + *y = c*e + d*f; +} + +static void +intersect (gdouble n1x, gdouble n1y, gdouble d1, + gdouble n2x, gdouble n2y, gdouble d2, + gdouble *x, gdouble *y) +{ + gdouble e, f, g, h; + + inverse (n1x, n1y, n2x, n2y, &e, &f, &g, &h); + multiply (e, f, g, h, d1, d2, x, y); +} + + +/* draw an angle from the current point to b and then to c, + * with a rounded corner of the given radius. + */ +static void +rounded_corner (cairo_t *cr, + gdouble bx, gdouble by, + gdouble cx, gdouble cy, + gdouble radius) +{ + gdouble ax, ay; + gdouble n1x, n1y, d1; + gdouble n2x, n2y, d2; + gdouble pd1, pd2; + gdouble ix, iy; + gdouble dist1, dist2; + gdouble nx, ny, d; + gdouble a1x, a1y, c1x, c1y; + gdouble phi1, phi2; + + cairo_get_current_point (cr, &ax, &ay); + + /* make sure radius is not too large */ + dist1 = length (bx - ax, by - ay); + dist2 = length (cx - bx, cy - by); + + radius = MIN (radius, MIN (dist1, dist2)); + + /* construct normal forms of the lines */ + normal_form (ax, ay, bx, by, &n1x, &n1y, &d1); + normal_form (bx, by, cx, cy, &n2x, &n2y, &d2); + + /* find which side of the line a,b the point c is on */ + if (point_line_distance (cx, cy, n1x, n1y) < d1) + pd1 = d1 - radius; + else + pd1 = d1 + radius; + + /* find which side of the line b,c the point a is on */ + if (point_line_distance (ax, ay, n2x, n2y) < d2) + pd2 = d2 - radius; + else + pd2 = d2 + radius; + + /* intersect the parallels to find the center of the arc */ + intersect (n1x, n1y, pd1, n2x, n2y, pd2, &ix, &iy); + + nx = (bx - ax) / dist1; + ny = (by - ay) / dist1; + d = point_line_distance (ix, iy, nx, ny); + + /* a1 is the point on the line a-b where the arc starts */ + intersect (n1x, n1y, d1, nx, ny, d, &a1x, &a1y); + + nx = (cx - bx) / dist2; + ny = (cy - by) / dist2; + d = point_line_distance (ix, iy, nx, ny); + + /* c1 is the point on the line b-c where the arc ends */ + intersect (n2x, n2y, d2, nx, ny, d, &c1x, &c1y); + + /* determine the first angle */ + if (a1x - ix == 0) + phi1 = (a1y - iy > 0) ? M_PI_2 : 3*M_PI_2; + else if (a1x - ix > 0) + phi1 = atan ((a1y - iy)/(a1x - ix)); + else + phi1 = M_PI + atan ((a1y - iy)/(a1x - ix)); + + /* determine the second angle */ + if (c1x - ix == 0) + phi2 = (c1y - iy > 0) ? M_PI_2 : 3*M_PI_2; + else if (c1x - ix > 0) + phi2 = atan ((c1y - iy)/(c1x - ix)); + else + phi2 = M_PI + atan ((c1y - iy)/(c1x - ix)); + + /* compute the difference between phi2 and phi1 mod 2pi */ + d = phi2 - phi1; + while (d < 0) + d += 2*M_PI; + while (d > 2*M_PI) + d -= 2*M_PI; + + cairo_line_to (cr, a1x, a1y); + + /* pick the short arc from phi1 to phi2 */ + if (d < M_PI) + cairo_arc (cr, ix, iy, radius, phi1, phi2); + else + cairo_arc_negative (cr, ix, iy, radius, phi1, phi2); + + cairo_line_to (cr, cx, cy); +} + +static void +draw (cairo_t *cr, + gint width, + gint height) +{ + gdouble x0 = 100; + gdouble y0 = 100; + gdouble x1 = 200; + gdouble y1 = 100; + gdouble x2 = 180; + gdouble y2 = 200; + gdouble x3 = 240; + gdouble y3 = 190; + + gdouble radius = 20; + + cairo_move_to (cr, x0, y0); + + rounded_corner (cr, x1, y1, (x1+x2)/2, (y1+y2)/2, radius); + rounded_corner (cr, x2, y2, x3, y3, radius); + + cairo_stroke (cr); +} + +static void +rounded_polygon (cairo_t *cr, + gboolean filled, + gdouble radius, + GdkPoint *points, + gint num_points) +{ + gint i, j; + + cairo_move_to (cr, + (gdouble)(points[num_points - 1].x + points[0].x)/2, + (gdouble)(points[num_points - 1].y + points[0].y)/2); + + for (i = 0; i < num_points; i++) + { + j = (i + 1) % num_points; + rounded_corner (cr, (gdouble)points[i].x, (gdouble)points[i].y, + (gdouble)(points[i].x + points[j].x)/2, + (gdouble)(points[i].y + points[j].y)/2, + radius); + }; + cairo_close_path (cr); + + if (filled) + cairo_fill (cr); + else + cairo_stroke (cr); +} + static void draw_polygon (GkbdKeyboardDrawing * drawing, GdkColor * fill_color, gint xkb_x, - gint xkb_y, XkbPointRec * xkb_points, guint num_points) + gint xkb_y, XkbPointRec * xkb_points, guint num_points, gdouble radius) { GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing)); - GdkGC *gc; + cairo_t *cr; GdkPoint *points; gboolean filled; gint i; @@ -82,14 +295,15 @@ return; if (fill_color) { - gc = gdk_gc_new (GTK_WIDGET (drawing)->window); - gdk_gc_set_rgb_fg_color (gc, fill_color); - filled = TRUE; + filled = TRUE; } else { - gc = GTK_WIDGET (drawing)->style->dark_gc[state]; + fill_color = >K_WIDGET (drawing)->style->dark[state]; filled = FALSE; } + cr = gdk_cairo_create (GDK_DRAWABLE (drawing->pixmap)); + gdk_cairo_set_source_color (cr, fill_color); + points = g_new (GdkPoint, num_points); for (i = 0; i < num_points; i++) { @@ -99,11 +313,64 @@ xkb_to_pixmap_coord (drawing, xkb_y + xkb_points[i].y); } - gdk_draw_polygon (drawing->pixmap, gc, filled, points, num_points); + rounded_polygon (cr, filled, radius, points, num_points); g_free (points); - if (fill_color) - g_object_unref (gc); +} + +static void +curve_rectangle (cairo_t *cr, + gdouble x0, + gdouble y0, + gdouble width, + gdouble height, + gdouble radius) +{ + gdouble x1, y1; + + if (!width || !height) + return; + + x1 = x0 + width; + y1 = y0 + height; + + radius = MIN(radius, MIN(width / 2, height / 2)); + + cairo_move_to (cr, x0, y0 + radius); + cairo_arc (cr, x0 + radius, y0 + radius, radius, M_PI, 3*M_PI/2); + cairo_line_to (cr, x1 - radius, y0); + cairo_arc (cr, x1 - radius, y0 + radius, radius, 3*M_PI/2, 2*M_PI); + cairo_line_to (cr, x1, y1 - radius); + cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, M_PI/2); + cairo_line_to (cr, x0 + radius, y1); + cairo_arc (cr, x0 + radius, y1 - radius, radius, M_PI/2, M_PI); + + cairo_close_path (cr); +} + +static void +draw_curve_rectangle (GdkPixmap *pixmap, + gboolean filled, + GdkColor *fill_color, + gint x, + gint y, + gint width, + gint height, + gint radius) +{ + cairo_t *cr; + + cr = gdk_cairo_create (GDK_DRAWABLE (pixmap)); + curve_rectangle (cr, x, y, width, height, radius); + + gdk_cairo_set_source_color (cr, fill_color); + + if (filled) + cairo_fill (cr); + else + cairo_stroke (cr); + + cairo_destroy (cr); } /* x, y, width, height are in the xkb coordinate system */ @@ -111,7 +378,7 @@ draw_rectangle (GkbdKeyboardDrawing * drawing, GdkColor * fill_color, gint angle, - gint xkb_x, gint xkb_y, gint xkb_width, gint xkb_height) + gint xkb_x, gint xkb_y, gint xkb_width, gint xkb_height, gint radius) { if (drawing->pixmap == NULL) return; @@ -121,14 +388,11 @@ GTK_WIDGET_STATE (GTK_WIDGET (drawing)); gint x, y, width, height; gboolean filled; - GdkGC *gc; if (fill_color) { - gc = gdk_gc_new (GTK_WIDGET (drawing)->window); - gdk_gc_set_rgb_fg_color (gc, fill_color); filled = TRUE; } else { - gc = GTK_WIDGET (drawing)->style->dark_gc[state]; + fill_color = >K_WIDGET (drawing)->style->dark[state]; filled = FALSE; } @@ -139,11 +403,8 @@ height = xkb_to_pixmap_coord (drawing, xkb_y + xkb_height) - y; - gdk_draw_rectangle (drawing->pixmap, gc, filled, x, y, - width, height); - - if (fill_color) - g_object_unref (gc); + draw_curve_rectangle (drawing->pixmap, filled, fill_color, + x, y, width, height, radius); } else { XkbPointRec points[4]; gint x, y; @@ -164,7 +425,7 @@ points[3].y = y; /* the points we've calculated are relative to 0,0 */ - draw_polygon (drawing, fill_color, 0, 0, points, 4); + draw_polygon (drawing, fill_color, 0, 0, points, 4, radius); } } @@ -181,7 +442,7 @@ if (color) draw_rectangle (drawing, color, angle, origin_x, origin_y, outline->points[0].x, - outline->points[0].y); + outline->points[0].y, outline->corner_radius); #ifdef KBDRAW_DEBUG printf ("points:%p\n", outline->points); @@ -191,7 +452,7 @@ draw_rectangle (drawing, NULL, angle, origin_x, origin_y, outline->points[0].x, - outline->points[0].y); + outline->points[0].y, outline->corner_radius); } else if (outline->num_points == 2) { gint rotated_x0, rotated_y0; @@ -202,19 +463,20 @@ if (color) draw_rectangle (drawing, color, angle, rotated_x0, rotated_y0, outline->points[1].x, - outline->points[1].y); + outline->points[1].y, outline->corner_radius); draw_rectangle (drawing, NULL, angle, rotated_x0, rotated_y0, outline->points[1].x, - outline->points[1].y); + outline->points[1].y, outline->corner_radius); } else { if (color) draw_polygon (drawing, color, origin_x, origin_y, outline->points, - outline->num_points); + outline->num_points, outline->corner_radius); draw_polygon (drawing, NULL, origin_x, origin_y, - outline->points, outline->num_points); + outline->points, outline->num_points, + outline->corner_radius); } } libgnomekbd-2.17.2-label-color.patch: gkbd-keyboard-drawing.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) --- NEW FILE libgnomekbd-2.17.2-label-color.patch --- --- libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c.label-color 2007-01-24 14:36:58.000000000 -0500 +++ libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c 2007-01-24 14:39:12.000000000 -0500 @@ -489,6 +489,9 @@ gint angle, gint x, gint y, PangoLayout * layout) { GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing)); + GdkColor *color; + + color = drawing->colors + (drawing->xkb->geom->label_color - drawing->xkb->geom->colors); if (drawing->pixmap == NULL) return; @@ -502,9 +505,9 @@ drawing->angle = angle; } - gdk_draw_layout (drawing->pixmap, - GTK_WIDGET (drawing)->style->text_gc[state], x, y, - drawing->layout); + gdk_draw_layout_with_colors (drawing->pixmap, + GTK_WIDGET (drawing)->style->text_gc[state], x, y, + drawing->layout, color, NULL); } static void libgnomekbd-2.17.2-primary.patch: gkbd-keyboard-drawing.c | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) --- NEW FILE libgnomekbd-2.17.2-primary.patch --- --- libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c.primary 2007-01-24 14:41:18.000000000 -0500 +++ libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c 2007-01-24 14:47:27.000000000 -0500 @@ -677,9 +677,22 @@ shape->num_outlines); #endif - for (i = 0; i < 1 /* shape->num_outlines */ ; i++) - draw_outline (drawing, shape->outlines + i, color, - key->angle, key->origin_x, key->origin_y); + /* draw the primary outline */ + draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, + color, key->angle, key->origin_x, key->origin_y); +#if 0 + /* don't draw other outlines for now, since + * the text placement does not take them into account + */ + for (i = 0; i < shape->num_outlines; i++) + { + if (shape->outlines + i == shape->approx || + shape->outlines + i == shape->primary) + continue; + draw_outline (drawing, shape->outlines + i, NULL, + key->angle, key->origin_x, key->origin_y); + } +#endif draw_key_label (drawing, key->keycode, key->angle, key->origin_x, key->origin_y, shape->bounds.x2, shape->bounds.y2); @@ -822,11 +835,21 @@ shape = drawing->xkb->geom->shapes + shape_doodad->shape_ndx; color = drawing->colors + shape_doodad->color_ndx; - for (i = 0; i < shape->num_outlines; i++) - draw_outline (drawing, shape->outlines + i, color, - doodad->angle, - doodad->origin_x + shape_doodad->left, - doodad->origin_y + shape_doodad->top); + /* draw the primary outline filled */ + draw_outline (drawing, shape->primary ? shape->primary : shape->outlines, + color, doodad->angle, + doodad->origin_x + shape_doodad->left, + doodad->origin_y + shape_doodad->top); + + /* stroke the other outlines */ + for (i = 0; i < shape->num_outlines; i++) { + if (shape->outlines + i == shape->approx || + shape->outlines + i == shape->primary) + continue; + draw_outline (drawing, shape->outlines + i, NULL, doodad->angle, + doodad->origin_x + shape_doodad->left, + doodad->origin_y + shape_doodad->top); + } } static void libgnomekbd-2.17.2-redraw.patch: gkbd-keyboard-drawing.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletion(-) --- NEW FILE libgnomekbd-2.17.2-redraw.patch --- --- libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c.redraw 2007-01-24 15:29:25.000000000 -0500 +++ libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c 2007-01-24 15:30:03.000000000 -0500 @@ -1121,6 +1121,25 @@ } static void +redraw_overlapping_doodads (GkbdKeyboardDrawing * drawing, + GkbdKeyboardDrawingKey * key) +{ + GList *list; + gboolean do_draw = FALSE; + + for (list = drawing->keyboard_items; list; list = list->next) + { + GkbdKeyboardDrawingItem * item = list->data; + + if (do_draw && item->type == GKBD_KEYBOARD_DRAWING_ITEM_TYPE_DOODAD) + draw_doodad (drawing, (GkbdKeyboardDrawingDoodad *) item); + + if (list->data == key) + do_draw = TRUE; + } +} + +static void draw_keyboard_item (GkbdKeyboardDrawingItem * item, GkbdKeyboardDrawing * drawing) { @@ -1279,7 +1298,7 @@ key->pressed = (event->type == GDK_KEY_PRESS); draw_key (drawing, key); - + redraw_overlapping_doodads (drawing, key); invalidate_key_region (drawing, key); return TRUE; @@ -1309,6 +1328,7 @@ if (drawing->keys[i].pressed) { drawing->keys[i].pressed = FALSE; draw_key (drawing, drawing->keys + i); + redraw_overlapping_doodads (drawing, drawing->keys + i); invalidate_key_region (drawing, drawing->keys + i); } libgnomekbd-2.17.2-rotated-text.patch: gkbd-keyboard-drawing.c | 39 --------------------------------------- 1 files changed, 39 deletions(-) --- NEW FILE libgnomekbd-2.17.2-rotated-text.patch --- --- libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c.rotated-text 2007-01-24 14:34:02.000000000 -0500 +++ libgnomekbd-2.17.2/libgnomekbd/gkbd-keyboard-drawing.c 2007-01-24 14:34:05.000000000 -0500 @@ -489,9 +489,6 @@ gint angle, gint x, gint y, PangoLayout * layout) { GtkStateType state = GTK_WIDGET_STATE (GTK_WIDGET (drawing)); - PangoLayoutLine *line; - gint x_off, y_off; - gint i; if (drawing->pixmap == NULL) return; @@ -505,42 +502,6 @@ drawing->angle = angle; } - i = 0; - y_off = 0; - for (line = pango_layout_get_line (drawing->layout, i); - line != NULL; - line = pango_layout_get_line (drawing->layout, ++i)) { - GSList *runp; - PangoRectangle line_extents; - - x_off = 0; - - for (runp = line->runs; runp != NULL; runp = runp->next) { - PangoGlyphItem *run = runp->data; - gint j; - - for (j = 0; j < run->glyphs->num_glyphs; j++) { - PangoGlyphGeometry *geometry; - gint xx, yy; - - geometry = - &run->glyphs->glyphs[j].geometry; - - rotate_coordinate (0, 0, x_off, y_off, - angle, &xx, &yy); - geometry->x_offset -= x_off - xx; - geometry->y_offset -= y_off - yy; - - x_off += geometry->width; - } - } - - pango_layout_line_get_extents (line, NULL, &line_extents); - y_off += - line_extents.height + - pango_layout_get_spacing (drawing->layout); - } - gdk_draw_layout (drawing->pixmap, GTK_WIDGET (drawing)->style->text_gc[state], x, y, drawing->layout); Index: libgnomekbd.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomekbd/devel/libgnomekbd.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libgnomekbd.spec 8 Dec 2006 04:45:49 -0000 1.13 +++ libgnomekbd.spec 24 Jan 2007 20:30:18 -0000 1.14 @@ -1,6 +1,6 @@ Name: libgnomekbd Version: 2.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A keyboard configuration library Group: System Environment/Libraries @@ -10,6 +10,15 @@ Source1: m4.tar.gz # http://bugzilla.gnome.org/show_bug.cgi?id=365590 Patch1: libgnomekbd-0.1-werror.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=352777 +Patch2: libgnomekbd-2.17.2-rotated-text.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=352778 +Patch3: libgnomekbd-2.17.2-label-color.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=35277 +Patch4: libgnomekbd-2.17.2-corner.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=35316 +Patch5: libgnomekbd-2.17.2-redraw.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-devel >= 0.92 @@ -52,6 +61,10 @@ %prep %setup -q %patch1 -p1 -b .werror +%patch2 -p1 -b .rotated-text +%patch3 -p1 -b .label-color +%patch4 -p1 -b .corner +%patch5 -p1 -b .redraw tar xzf %{SOURCE1} @@ -120,6 +133,9 @@ %changelog +* Wed Jan 24 2007 Matthias Clasen - 2.17.2-2 +- Port former control-center patches to improve keyboard drawing + * Tue Nov 7 2006 Matthias Clasen - 2.17.2-1 - Update to 2.17.2 From fedora-cvs-commits at redhat.com Wed Jan 24 20:30:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:30:33 -0500 Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.23, 1.24 Message-ID: <200701242030.l0OKUX65030958@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/gstreamer-plugins-good/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28360 Modified Files: gstreamer-plugins-good.spec Log Message: * Wed Jan 24 2007 Adam Jackson - 0.10.5-2 - Re-add the gdkpixbuf loader. (#222837) Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gstreamer-plugins-good.spec 17 Jan 2007 14:35:53 -0000 1.23 +++ gstreamer-plugins-good.spec 24 Jan 2007 20:30:31 -0000 1.24 @@ -6,7 +6,7 @@ Name: %{gstreamer}-plugins-good Version: 0.10.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer plug-ins with good code and licensing Group: Applications/Multimedia @@ -106,7 +106,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so %find_lang gst-plugins-good-%{majorminor} @@ -157,6 +156,7 @@ %{_libdir}/gstreamer-%{majorminor}/libgstcairo.so %{_libdir}/gstreamer-%{majorminor}/libgstesd.so %{_libdir}/gstreamer-%{majorminor}/libgstflac.so +%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so %{_libdir}/gstreamer-%{majorminor}/libgsthalelements.so %{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so # %{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so @@ -199,6 +199,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || : %changelog +* Wed Jan 24 2007 Adam Jackson - 0.10.5-2 +- Re-add the gdkpixbuf loader. (#222837) + * Wed Jan 17 2007 Matthias Clasen - 0.10.5-1 - Update to 0.10.5 From fedora-cvs-commits at redhat.com Wed Jan 24 20:33:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:33:44 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1003,1.1004 Message-ID: <200701242033.l0OKXi3v001083@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1008 Modified Files: openoffice.org.spec Log Message: extra bits Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1003 retrieving revision 1.1004 diff -u -r1.1003 -r1.1004 --- openoffice.org.spec 24 Jan 2007 19:04:07 -0000 1.1003 +++ openoffice.org.spec 24 Jan 2007 20:33:42 -0000 1.1004 @@ -1055,6 +1055,12 @@ echo - ---dump log start--- cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log echo - ---dump log end--- + echo - ---debug jar start--- + for i in ../../solver/680/*/bin/*.jar; do unzip -l $i; done + echo - ---debug jar end--- + rm -rf ../../solver/680/*/bin/*.jar + unset MAXPROCESS + build --dlv_switch -link --all dmake openoffice_en-US fi echo end en-US install time is `date`, diskspace: `df -h . | tail -n 1` From fedora-cvs-commits at redhat.com Wed Jan 24 20:38:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:38:51 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.368, 1.369 anaconda.spec, 1.494, 1.495 sources, 1.492, 1.493 Message-ID: <200701242038.l0OKcpHO004715@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4662/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.17-1 on branch devel from anaconda-11.2.0.17-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- .cvsignore 24 Jan 2007 19:42:17 -0000 1.368 +++ .cvsignore 24 Jan 2007 20:38:48 -0000 1.369 @@ -1 +1 @@ -anaconda-11.2.0.16.tar.bz2 +anaconda-11.2.0.17.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.494 retrieving revision 1.495 diff -u -r1.494 -r1.495 --- anaconda.spec 24 Jan 2007 19:42:17 -0000 1.494 +++ anaconda.spec 24 Jan 2007 20:38:48 -0000 1.495 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.16 +Version: 11.2.0.17 Release: 1 License: GPL Summary: Graphical system installer @@ -109,6 +109,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jan 24 2007 Jeremy Katz - 11.2.0.17-1 +- Disable extra repo for now + * Wed Jan 24 2007 Jeremy Katz - 11.2.0.16-1 - Fix rescue mode - Fix theming Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.492 retrieving revision 1.493 diff -u -r1.492 -r1.493 --- sources 24 Jan 2007 19:42:18 -0000 1.492 +++ sources 24 Jan 2007 20:38:48 -0000 1.493 @@ -1 +1 @@ -f1b1cd84cfafe1fde668bea76906d6a2 anaconda-11.2.0.16.tar.bz2 +93a6203bcbdbcfe55a405cf84fcd54a3 anaconda-11.2.0.17.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 24 20:52:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:52:10 -0500 Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.13,1.14 Message-ID: <200701242052.l0OKqA7H002239@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2202 Modified Files: xorg-x11-drv-nsc.spec Log Message: * Wed Jan 24 2007 Adam Jackson 2.8.1-2 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for selinux conformance. (#220749) - nsc-2.8.1-xserver12-compat.patch: Build fix for new X server sdk. Index: xorg-x11-drv-nsc.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-nsc.spec 24 Jan 2007 20:24:37 -0000 1.13 +++ xorg-x11-drv-nsc.spec 24 Jan 2007 20:52:03 -0000 1.14 @@ -17,6 +17,7 @@ Source1: nsc.xinf Patch0: nsc-2.8.1-noexecstack.patch +Patch1: nsc-2.8.1-xserver12-compat.patch ExclusiveArch: %{ix86} @@ -31,6 +32,7 @@ %prep %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .execstack +%patch1 -p1 -b .xserver12 %build %configure --disable-static @@ -64,6 +66,7 @@ * Wed Jan 24 2007 Adam Jackson 2.8.1-2 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for selinux conformance. (#220749) +- nsc-2.8.1-xserver12-compat.patch: Build fix for new X server sdk. * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Wed Jan 24 20:52:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:52:42 -0500 Subject: rpms/libgnomekbd/devel libgnomekbd.spec,1.14,1.15 Message-ID: <200701242052.l0OKqgYZ002694@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomekbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2627 Modified Files: libgnomekbd.spec Log Message: fix bug references Index: libgnomekbd.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomekbd/devel/libgnomekbd.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libgnomekbd.spec 24 Jan 2007 20:30:18 -0000 1.14 +++ libgnomekbd.spec 24 Jan 2007 20:52:40 -0000 1.15 @@ -14,9 +14,9 @@ Patch2: libgnomekbd-2.17.2-rotated-text.patch # http://bugzilla.gnome.org/show_bug.cgi?id=352778 Patch3: libgnomekbd-2.17.2-label-color.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=35277 +# http://bugzilla.gnome.org/show_bug.cgi?id=352779 Patch4: libgnomekbd-2.17.2-corner.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=35316 +# http://bugzilla.gnome.org/show_bug.cgi?id=353163 Patch5: libgnomekbd-2.17.2-redraw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-cvs-commits at redhat.com Wed Jan 24 20:53:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:53:37 -0500 Subject: rpms/xorg-x11-drv-nsc/devel nsc-2.8.1-xserver12-compat.patch, NONE, 1.1 Message-ID: <200701242053.l0OKrbfh003418@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3385 Added Files: nsc-2.8.1-xserver12-compat.patch Log Message: * Wed Jan 24 2007 Adam Jackson 2.8.1-2 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for selinux conformance. (#220749) - nsc-2.8.1-xserver12-compat.patch: Build fix for new X server sdk. nsc-2.8.1-xserver12-compat.patch: platform.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE nsc-2.8.1-xserver12-compat.patch --- --- xf86-video-nsc-2.8.1/src/panel/platform.c.jx 2005-07-01 18:43:12.000000000 -0400 +++ xf86-video-nsc-2.8.1/src/panel/platform.c 2007-01-24 15:41:31.000000000 -0500 @@ -192,7 +192,7 @@ static unsigned char get_sys_board_type(SYS_BOARD_INFO *, SYS_BOARD_INFO *); #if defined(linux) && !defined(__KERNEL__) -#if !defined(XFree86Server) +#if 0 static void protected_mode_access(unsigned int, unsigned int, unsigned long, unsigned char *); static void setup_pma(); From fedora-cvs-commits at redhat.com Wed Jan 24 20:58:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 15:58:33 -0500 Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.24, 1.25 Message-ID: <200701242058.l0OKwXsx007224@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/gstreamer-plugins-good/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7191 Modified Files: gstreamer-plugins-good.spec Log Message: * Wed Jan 24 2007 Adam Jackson - 0.10.5-2 - Re-add the gdkpixbuf loader. (#222837) Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gstreamer-plugins-good.spec 24 Jan 2007 20:30:31 -0000 1.24 +++ gstreamer-plugins-good.spec 24 Jan 2007 20:58:31 -0000 1.25 @@ -39,6 +39,7 @@ BuildRequires: mikmod BuildRequires: glibc-devel BuildRequires: speex-devel +BuildRequires: gdk-pixbuf-devel gtk2-devel %ifnarch s390 s390x BuildRequires: libdv-devel From fedora-cvs-commits at redhat.com Wed Jan 24 21:08:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 16:08:39 -0500 Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.25, 1.26 Message-ID: <200701242108.l0OL8d4E014296@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/gstreamer-plugins-good/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14264 Modified Files: gstreamer-plugins-good.spec Log Message: * Wed Jan 24 2007 Adam Jackson - 0.10.5-2 - Re-add the gdkpixbuf loader. (#222837) Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gstreamer-plugins-good.spec 24 Jan 2007 20:58:31 -0000 1.25 +++ gstreamer-plugins-good.spec 24 Jan 2007 21:08:31 -0000 1.26 @@ -39,7 +39,7 @@ BuildRequires: mikmod BuildRequires: glibc-devel BuildRequires: speex-devel -BuildRequires: gdk-pixbuf-devel gtk2-devel +BuildRequires: gtk2-devel %ifnarch s390 s390x BuildRequires: libdv-devel From fedora-cvs-commits at redhat.com Wed Jan 24 21:08:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 16:08:41 -0500 Subject: rpms/xorg-x11-drv-nsc/devel nsc-2.8.1-xserver12-compat.patch, 1.1, 1.2 xorg-x11-drv-nsc.spec, 1.14, 1.15 Message-ID: <200701242108.l0OL8fnX014388@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14328 Modified Files: nsc-2.8.1-xserver12-compat.patch xorg-x11-drv-nsc.spec Log Message: * Wed Jan 24 2007 Adam Jackson 2.8.1-2 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for selinux conformance. (#220749) - nsc-2.8.1-xserver12-compat.patch: Build fix for new X server sdk. nsc-2.8.1-xserver12-compat.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: nsc-2.8.1-xserver12-compat.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/nsc-2.8.1-xserver12-compat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nsc-2.8.1-xserver12-compat.patch 24 Jan 2007 20:53:35 -0000 1.1 +++ nsc-2.8.1-xserver12-compat.patch 24 Jan 2007 21:08:39 -0000 1.2 @@ -1,11 +1,11 @@ ---- xf86-video-nsc-2.8.1/src/panel/platform.c.jx 2005-07-01 18:43:12.000000000 -0400 -+++ xf86-video-nsc-2.8.1/src/panel/platform.c 2007-01-24 15:41:31.000000000 -0500 -@@ -192,7 +192,7 @@ - static unsigned char get_sys_board_type(SYS_BOARD_INFO *, SYS_BOARD_INFO *); - - #if defined(linux) && !defined(__KERNEL__) --#if !defined(XFree86Server) -+#if 0 - static void protected_mode_access(unsigned int, unsigned int, - unsigned long, unsigned char *); - static void setup_pma(); +--- xf86-video-nsc-2.8.1/src/Makefile.am.jx 2005-10-04 18:59:15.000000000 -0400 ++++ xf86-video-nsc-2.8.1/src/Makefile.am 2007-01-24 15:56:26.000000000 -0500 +@@ -23,7 +23,7 @@ + # -avoid-version prevents gratuitous .0.0.0 version numbers on the end + # _ladir passes a dummy rpath to libtool so the thing will actually link + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +-AM_CFLAGS = @XORG_CFLAGS@ -I$(top_srcdir)/src/gfx -I$(top_srcdir)/src/panel ++AM_CFLAGS = @XORG_CFLAGS@ -I$(top_srcdir)/src/gfx -I$(top_srcdir)/src/panel -DXFree86Server + AM_CCASFLAGS = @XORG_CFLAGS@ + nsc_drv_la_LTLIBRARIES = nsc_drv.la + nsc_drv_la_LDFLAGS = -module -avoid-version Index: xorg-x11-drv-nsc.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-nsc.spec 24 Jan 2007 20:52:03 -0000 1.14 +++ xorg-x11-drv-nsc.spec 24 Jan 2007 21:08:39 -0000 1.15 @@ -23,6 +23,8 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-server-sdk >= 1.0.99.901 +# XXX remove once the server12 patch is removed +BuildRequires: automake autoconf libtool Requires: xorg-x11-server-Xorg >= 1.0.99.901 @@ -32,9 +34,10 @@ %prep %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .execstack -%patch1 -p1 -b .xserver12 +#%patch1 -p1 -b .server-12 %build +aclocal ; automake -a ; autoconf %configure --disable-static make From fedora-cvs-commits at redhat.com Wed Jan 24 21:10:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 16:10:38 -0500 Subject: rpms/mesa/FC-6 mesa.spec,1.119,1.120 Message-ID: <200701242110.l0OLAcpS015895@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/mesa/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15869 Modified Files: mesa.spec Log Message: * Wed Jan 24 2007 Adam Jackson 6.5.1-9.fc6 - Add a build (and hopefully runtime) fix for mach64. (#221117) Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/FC-6/mesa.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- mesa.spec 31 Oct 2006 19:53:00 -0000 1.119 +++ mesa.spec 24 Jan 2007 21:10:36 -0000 1.120 @@ -47,7 +47,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 6.5.1 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -68,6 +68,7 @@ # General patches from upstream go here: Patch50: post-6.5.1-i965-fixes.patch Patch51: i965-interleaved-arrays-fix.patch +Patch52: mach64-libdrm230-compat.patch BuildRequires: pkgconfig %if %{with_dri} @@ -248,6 +249,7 @@ %patch18 -p1 -b .selinux-awareness %patch50 -p1 -b .post-6.5.1-i965-fixes %patch51 -p1 -b .i965-interleaved-arrays-fix +%patch52 -p1 -b .mach64-blit # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. @@ -417,6 +419,9 @@ %{_bindir}/glxinfo %changelog +* Wed Jan 24 2007 Adam Jackson 6.5.1-9.fc6 +- Add a build (and hopefully runtime) fix for mach64. (#221117) + * Mon Oct 16 2006 Kristian - 6.5.1-8.fc6 - Add i965-interleaved-arrays-fix.patch to fix (#209318). From fedora-cvs-commits at redhat.com Wed Jan 24 21:12:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 16:12:02 -0500 Subject: rpms/mesa/FC-6 mach64-libdrm230-compat.patch,NONE,1.1 Message-ID: <200701242112.l0OLC2s1016881@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/mesa/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16854 Added Files: mach64-libdrm230-compat.patch Log Message: * Wed Jan 24 2007 Adam Jackson 6.5.1-9.fc6 - Add a build (and hopefully runtime) fix for mach64. (#221117) mach64-libdrm230-compat.patch: mach64_ioctl.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE mach64-libdrm230-compat.patch --- --- Mesa-6.5.1/src/mesa/drivers/dri/mach64/mach64_ioctl.c.jx 2005-05-04 16:11:38.000000000 -0400 +++ Mesa-6.5.1/src/mesa/drivers/dri/mach64/mach64_ioctl.c 2007-01-24 15:23:38.000000000 -0500 @@ -187,7 +187,6 @@ drm_mach64_blit_t blit; GLint ret; - blit.idx = buffer->idx; blit.offset = offset; blit.pitch = pitch; blit.format = format; From fedora-cvs-commits at redhat.com Wed Jan 24 21:13:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 16:13:40 -0500 Subject: rpms/xorg-x11-drv-nsc/devel xorg-x11-drv-nsc.spec,1.15,1.16 Message-ID: <200701242113.l0OLDef2018134@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-nsc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18106 Modified Files: xorg-x11-drv-nsc.spec Log Message: * Wed Jan 24 2007 Adam Jackson 2.8.1-2 - nsc-2.8.1-noexecstack.patch: Mark the asm file as execstack-clean for selinux conformance. (#220749) - nsc-2.8.1-xserver12-compat.patch: Build fix for new X server sdk. Index: xorg-x11-drv-nsc.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-nsc/devel/xorg-x11-drv-nsc.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xorg-x11-drv-nsc.spec 24 Jan 2007 21:08:39 -0000 1.15 +++ xorg-x11-drv-nsc.spec 24 Jan 2007 21:13:38 -0000 1.16 @@ -34,7 +34,7 @@ %prep %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .execstack -#%patch1 -p1 -b .server-12 +%patch1 -p1 -b .server-12 %build aclocal ; automake -a ; autoconf From fedora-cvs-commits at redhat.com Wed Jan 24 22:40:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 17:40:24 -0500 Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.23, 1.24 Message-ID: <200701242240.l0OMeOH9011118@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11065 Modified Files: gstreamer-plugins-base.spec Log Message: * Wed Jan 24 2007 Adam Jackson - Minor spec cleanups (#186550) Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gstreamer-plugins-base.spec 12 Dec 2006 14:01:14 -0000 1.23 +++ gstreamer-plugins-base.spec 24 Jan 2007 22:40:13 -0000 1.24 @@ -19,7 +19,6 @@ Requires: %{gstreamer} >= %{_gst} BuildRequires: %{gstreamer}-devel >= %{_gst} -BuildRequires: liboil-devel >= 0.3.6 BuildRequires: gettext BuildRequires: gcc-c++ @@ -27,12 +26,12 @@ BuildRequires: libogg-devel >= 1.0 BuildRequires: libvorbis-devel >= 1.0 BuildRequires: libtheora-devel >= 1.0 -BuildRequires: liboil-devel >= 0.3.2 +BuildRequires: liboil-devel >= 0.3.6 BuildRequires: alsa-lib-devel BuildRequires: pango-devel BuildRequires: libXv-devel BuildRequires: cdparanoia-devel -Obsoletes: gstreamer-plugins +Obsoletes: gstreamer-plugins # documentation BuildRequires: gtk-doc >= 1.3 @@ -87,13 +86,12 @@ # libraries %{_libdir}/libgstinterfaces-%{majorminor}.so.* %{_libdir}/libgstaudio-%{majorminor}.so.* +%{_libdir}/libgstcdda-%{majorminor}.so.* %{_libdir}/libgstriff-%{majorminor}.so.* %{_libdir}/libgsttag-%{majorminor}.so.* %{_libdir}/libgstnetbuffer-%{majorminor}.so.* %{_libdir}/libgstrtp-%{majorminor}.so.* %{_libdir}/libgstvideo-%{majorminor}.so.* -%{_libdir}/libgstcdda-0.10.so.* - # base plugins without external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstadder.so @@ -113,11 +111,11 @@ %{_libdir}/gstreamer-%{majorminor}/libgsttcp.so %{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioresample.so -%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so %{_libdir}/gstreamer-%{majorminor}/libgstgdp.so # base plugins with dependencies %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so +%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so %{_libdir}/gstreamer-%{majorminor}/libgstgnomevfs.so %{_libdir}/gstreamer-%{majorminor}/libgstogg.so %{_libdir}/gstreamer-%{majorminor}/libgstpango.so @@ -126,13 +124,11 @@ %{_libdir}/gstreamer-%{majorminor}/libgstximagesink.so %{_libdir}/gstreamer-%{majorminor}/libgstxvimagesink.so - - %package devel Summary: GStreamer Base Plugins Development files Group: Development/Libraries Requires: %{gstreamer}-plugins-base = %{version} -Obsoletes: gstreamer-plugins-devel +Obsoletes: gstreamer-plugins-devel %description devel GStreamer Base Plugins library development and header files. @@ -141,15 +137,18 @@ %defattr(-, root, root) # plugin helper library headers %{_includedir}/gstreamer-%{majorminor}/gst/audio/audio.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioclock.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiofilter.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosink.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosrc.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstbaseaudiosink.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstbaseaudiosrc.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstringbuffer.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/mixerutils.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel-enumtypes.h %{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel.h +%{_includedir}/gstreamer-%{majorminor}/gst/cdda/gstcddabasesrc.h %{_includedir}/gstreamer-%{majorminor}/gst/floatcast/floatcast.h -%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-ids.h -%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-media.h -%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-read.h -%{_includedir}/gstreamer-%{majorminor}/gst/video/video.h -%{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideofilter.h -%{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideosink.h %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/colorbalance.h %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/colorbalancechannel.h %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/interfaces-enumtypes.h @@ -163,22 +162,18 @@ %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/tunernorm.h %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/videoorientation.h %{_includedir}/gstreamer-%{majorminor}/gst/interfaces/xoverlay.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosrc.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstbaseaudiosrc.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/multichannel-enumtypes.h -%{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpbuffer.h -%{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertpaudiopayload.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudioclock.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstaudiosink.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstbaseaudiosink.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/gstringbuffer.h %{_includedir}/gstreamer-%{majorminor}/gst/netbuffer/gstnetbuffer.h -%{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h +%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-ids.h +%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-media.h +%{_includedir}/gstreamer-%{majorminor}/gst/riff/riff-read.h +%{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertpaudiopayload.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertpdepayload.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertppayload.h -%{_includedir}/gstreamer-%{majorminor}/gst/audio/mixerutils.h -%{_includedir}/gstreamer-%{majorminor}/gst/cdda/gstcddabasesrc.h - +%{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstrtpbuffer.h +%{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideofilter.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/gstvideosink.h +%{_includedir}/gstreamer-%{majorminor}/gst/video/video.h %{_libdir}/libgstaudio-%{majorminor}.so %{_libdir}/libgstinterfaces-%{majorminor}.so @@ -189,7 +184,6 @@ %{_libdir}/libgstvideo-%{majorminor}.so %{_libdir}/libgstcdda-0.10.so - # pkg-config files %{_libdir}/pkgconfig/gstreamer-plugins-base-%{majorminor}.pc @@ -198,6 +192,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Wed Jan 24 2007 Adam Jackson +- Minor spec cleanups (#186550) + * Tue Dec 12 2006 Matthias Clasen - 0.10.11-1 - Update to 0.10.11 From fedora-cvs-commits at redhat.com Wed Jan 24 22:43:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 17:43:06 -0500 Subject: rpms/frysk/FC-6 frysk-20070106-TestFStack.patch, NONE, 1.1 frysk-20070124-libunwind.patch, NONE, 1.1 frysk.spec, 1.110, 1.111 Message-ID: <200701242243.l0OMh6Cp011927@cvs.devel.redhat.com> Author: skasal Update of /cvs/dist/rpms/frysk/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11866 Modified Files: frysk.spec Added Files: frysk-20070106-TestFStack.patch frysk-20070124-libunwind.patch Log Message: Synchronize with RHEL-5. frysk-20070106-TestFStack.patch: TestFStack.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) --- NEW FILE frysk-20070106-TestFStack.patch --- 2007-01-06 Andrew Cagney * TestFStack.java: Use wild cards, instead of Build.SRCDIR. Index: frysk-core/frysk/util/TestFStack.java =================================================================== RCS file: /cvs/frysk/frysk-core/frysk/util/TestFStack.java,v retrieving revision 1.29 diff -u -r1.29 TestFStack.java --- frysk-core/frysk/util/TestFStack.java 18 Dec 2006 18:24:38 -0000 1.29 +++ frysk-core/frysk/util/TestFStack.java 24 Jan 2007 21:01:53 -0000 @@ -42,7 +42,6 @@ import java.util.logging.Level; -import frysk.core.Build; import frysk.event.Event; import frysk.event.RequestStopEvent; import frysk.proc.Manager; @@ -54,17 +53,15 @@ String mainThread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*" + "#[\\d]+ 0x[\\da-f]+ in server \\(\\) from: " - + Build.SRCDIR - + "/frysk/pkglibdir/funit-child.c#[\\d]+\n" + + ".*/frysk/pkglibdir/funit-child.c#[\\d]+\n" + "#[\\d]+ 0x[\\da-f]+ in main \\(\\) from: " - + Build.SRCDIR - + "/frysk/pkglibdir/funit-child.c#[\\d]+\n" + + ".*/frysk/pkglibdir/funit-child.c#[\\d]+\n" + "#[\\d]+ 0x[\\da-f]+ in __libc_start_main \\(\\)\n" + "#[\\d]+ 0x[\\da-f]+ in _start \\(\\)\n"; String thread = "Task #\\d+\n" + "(#[\\d]+ 0x[\\da-f]+ in .*\n)*" + "#[\\d]+ 0x[\\da-f]+ in server \\(\\) from: " - + Build.SRCDIR + "/frysk/pkglibdir/funit-child.c#[\\d]+\n" + + ".*/frysk/pkglibdir/funit-child.c#[\\d]+\n" + "#[\\d]+ 0x[\\da-f]+ in start_thread \\(\\)\n" + "#[\\d]+ 0x[\\da-f]+ in (__)?clone \\(\\)\n"; frysk-20070124-libunwind.patch: lib/unwind/cni/FrameCursor.cxx | 48 +++++++++++++++++++++++------------------ libunwind/ChangeLog | 7 +++++ libunwind/src/elfxx.c | 4 +++ 3 files changed, 38 insertions(+), 21 deletions(-) --- NEW FILE frysk-20070124-libunwind.patch --- frysk-imports/lib/unwind/ChangeLog: 2007-01-24 Jan Kratochvil Mike Cvet * cni/FrameCursor.cxx (create_frame_cursor): Fix retrieved address. Temporarily remove assertion failing due to libunwind Bug 3917. Index: frysk-imports/lib/unwind/cni/FrameCursor.cxx =================================================================== RCS file: /cvs/frysk/frysk-imports/lib/unwind/cni/FrameCursor.cxx,v diff -u -r1.2 FrameCursor.cxx --- frysk-imports/lib/unwind/cni/FrameCursor.cxx 14 Dec 2006 20:21:03 -0000 1.2 +++ frysk-imports/lib/unwind/cni/FrameCursor.cxx 24 Jan 2007 21:08:24 -0000 @@ -36,40 +36,48 @@ // modification, you must delete this exception statement from your // version and license this file solely under the GPL without // exception. + #include #include +#include #include "lib/unwind/FrameCursor.h" +#include "lib/unwind/UnwindException.h" void lib::unwind::FrameCursor::create_frame_cursor (jlong _cursor) { ::unw_cursor_t *cursor = (::unw_cursor_t *) _cursor; - - ::unw_cursor_t *native_cursor = (::unw_cursor_t *) JvMalloc(sizeof(::unw_cursor_t)); - + + ::unw_cursor_t *native_cursor = (::unw_cursor_t *) JvMalloc (sizeof (::unw_cursor_t)); + // Create a local copy of the unwind cursor - memcpy(native_cursor, cursor, sizeof(::unw_cursor_t)); - - this->nativeCursor = (gnu::gcj::RawDataManaged *) native_cursor; + memcpy (native_cursor, cursor, sizeof (::unw_cursor_t)); + + this -> nativeCursor = (gnu::gcj::RawDataManaged *) native_cursor; - unw_proc_info_t proc_info; - int result = unw_get_proc_info(cursor, &proc_info); int len = 256; char buf[len]; unw_word_t offset; - - if(!unw_get_proc_name(cursor, buf, len, &offset)) - { - this->methodName = JvNewStringUTF(buf); - - if(result == 0) - this->address = (jlong) offset + proc_info.start_ip; - } - - unw_word_t tmp; - unw_get_reg (cursor, UNW_REG_SP, &tmp); - this -> cfa = tmp; + unw_word_t ip; + unw_word_t sp; + + if (unw_get_reg (cursor, UNW_REG_IP, &ip)) + throw new lib::unwind::UnwindException ( + JvNewStringUTF ("Could not get program counter for the current stack.") + ); + + this -> address = ip; + + if (unw_get_reg (cursor, UNW_REG_SP, &sp)) + throw new lib::unwind::UnwindException ( + JvNewStringUTF ("Could not get stack pointer for the current stack.") + ); + + this -> cfa = sp; + + if (!unw_get_proc_name (cursor, buf, len, &offset)) + this -> methodName = JvNewStringUTF (buf); } jlong Index: frysk-imports/libunwind/ChangeLog =================================================================== RCS file: /cvs/frysk/frysk-imports/libunwind/ChangeLog,v diff -u -r1.33 ChangeLog --- frysk-imports/libunwind/ChangeLog 18 Dec 2006 21:44:19 -0000 1.33 +++ frysk-imports/libunwind/ChangeLog 24 Jan 2007 21:08:25 -0000 @@ -1,6 +1,11 @@ +2007-01-24 Jan Kratochvil + + * src/elfxx.c (lookup_symbol): Fix false preceding zero-sized function + resolving (printed `_start' symbols for stripped binaries). + 2006-12-18 Jan Kratochvil - * src/elfxx.c (elf_w): Fix regression in the 2006-12-10 bugfix; + * src/elfxx.c (lookup_symbol): Fix regression in the 2006-12-10 bugfix; on already prelink(8)ed libraries loaded at a different address. No testcase provided as prelink(8) need `root' privileges. Index: frysk-imports/libunwind/src/elfxx.c =================================================================== RCS file: /cvs/frysk/frysk-imports/libunwind/src/elfxx.c,v diff -u -r1.6 elfxx.c --- frysk-imports/libunwind/src/elfxx.c 18 Dec 2006 21:44:19 -0000 1.6 +++ frysk-imports/libunwind/src/elfxx.c 24 Jan 2007 21:08:25 -0000 @@ -49,6 +49,7 @@ Elf_W (Off) soff, str_soff; Elf_W (Shdr) *shdr, *str_shdr; Elf_W (Addr) val, min_dist = ~(Elf_W (Addr))0; + Elf_W (Addr) val_max_below = 0; int i, ret = 0; char *strtab; @@ -109,6 +110,9 @@ if (ip < val) continue; + if (val + sym->st_size < val_max_below) + continue; + val_max_below = val + sym->st_size; if (sym->st_size && ip >= val + sym->st_size) continue; Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-6/frysk.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- frysk.spec 22 Dec 2006 19:25:56 -0000 1.110 +++ frysk.spec 24 Jan 2007 22:42:59 -0000 1.111 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis tool Name: frysk Version: 0.0.1.2006.12.22.rh1 -Release: 1%{?dist} +Release: 5%{?dist} License: GPL Group: Development/System URL: http://sourceware.org/frysk @@ -20,6 +20,10 @@ # Temporarily disable install-dejagnu: Patch2: frysk-no-dejagnu.patch +# Fix #224248: +Patch3: frysk-20070106-TestFStack.patch +Patch4: frysk-20070124-libunwind.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: glib-java >= 0.2.6 @@ -107,6 +111,10 @@ %endif %patch1 %patch2 +%patch3 +%patch4 +# This is needed for the libunwind.patch, because we do not run bootstrap.sh: +echo 'lib/unwind/cni/FrameCursor.o: lib/unwind/UnwindException.h' >>frysk-imports/Makefile.in %build @@ -125,7 +133,7 @@ uname -a gcc --version -# FIXME: Warninggs should be fixed, not suppressed: +# FIXME: Warnings should be fixed, not suppressed: RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /} %configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" --disable-arch32-tests @@ -133,6 +141,13 @@ touch frysk-gui/glade.catalog touch frysk-gui/checked-glade-xml +%ifarch x86_64 ppc64 +# A workaround for bug 3881: +make -C frysk-imports pkglibdir='$(pkglib32dir)' frysk/pkglibdir/fsystest.8 +make -C frysk-core pkglibdir='$(pkglib32dir)' frysk/pkglibdir/funit{,-child,-exec,-exit,-threads}.8 +make -C frysk-gui pkglibdir='$(pkglib32dir)' frysk/pkglibdir/ftail.8 +%endif + make %{?_smp_mflags} %if %{run_make_check} @@ -149,11 +164,18 @@ make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags} +# Fix timestamp of a generated script: +touch -r frysk-gui/frysk/gui/ChangeLog $RPM_BUILD_ROOT%{_datadir}/%{name}/dogtail_scripts/frysk_suite.py +# ...and a few other ones: +for f in test2866.py test2985.py test3380.py; do + touch -r frysk-gui/frysk/gui/test/dogtail_scripts/$f $RPM_BUILD_ROOT%{_datadir}/%{name}/test/$f +done + # Workaround for #211824: -rm $RPM_BUILD_ROOT/%{_datadir}/java/*.jar +rm $RPM_BUILD_ROOT%{_datadir}/java/*.jar # We are not yet ready to be in the menu: -rm $RPM_BUILD_ROOT/%{_datadir}/applications/frysk.desktop +rm $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop %post -p /sbin/ldconfig @@ -181,7 +203,7 @@ %{_libdir}/libfrysk-jline.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/messages.properties -%{_mandir}/man*/* +%{_mandir}/man1/* %files devel %defattr(-,root,root) @@ -196,6 +218,7 @@ %dir %{_datadir}/%{name}/test %{_datadir}/%{name}/test/test* %{_datadir}/%{name}/dogtail_scripts +%{_mandir}/man8/* %files gnome %defattr(-,root,root) @@ -210,11 +233,29 @@ %{_datadir}/pixmaps/fryskTrayIcon48.png %changelog +* Wed Jan 24 2007 Stepan Kasal - 0.0.1.2006.12.22.rh1-5 +- Add frysk-20070106-TestFStack.patch frysk-20070124-libunwind.patch . +- Resolves: #224248 + +* Wed Jan 17 2007 Stepan Kasal - 0.0.1.2006.12.22.rh1-4 +- Second iteration to make section 8 man pages platform-independent. +- Resolves: #222468 + +* Wed Jan 17 2007 Stepan Kasal - 0.0.1.2006.12.22.rh1-3 +- Make the contents of section 8 man pages platform-independent. +- Resolves: #222468 +- Move section 8 man pages to frysk-devel, where the corresponding utilities + reside. + +* Wed Jan 17 2007 Stepan Kasal - 0.0.1.2006.12.22.rh1-2 +- Fix time stamps of installed *.py files, which ... +- Resolves: #222468 + * Tue Dec 19 2006 Stepan Kasal - 0.0.1.2006.12.22.rh1-1 - New upstream version. - libexecdir -> libdir and other file list updates - Remove frysk-arch32-disable.patch, use --disable-arch32-tests instead. -- Add frysk-no-dejagnu.patch and create $RPM_BUILD_ROOT/${pkgdatadir}, +- Add frysk-no-dejagnu.patch and create $RPM_BUILD_ROOT${pkgdatadir}, to work around a bug in install-dejagnu-testsuite-local rule. - Resolves: #218819 From fedora-cvs-commits at redhat.com Wed Jan 24 22:51:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 17:51:56 -0500 Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.198,1.199 Message-ID: <200701242251.l0OMpu9w003009@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2972 Modified Files: xorg-x11-server.spec Log Message: * Wed Jan 24 2007 Adam Jackson 1.2.0-2 - Delete ModulePath lines rather than attempt to munge them. (#186338) Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- xorg-x11-server.spec 23 Jan 2007 19:24:01 -0000 1.198 +++ xorg-x11-server.spec 24 Jan 2007 22:51:48 -0000 1.199 @@ -8,7 +8,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -471,9 +471,8 @@ # unnecessary, and break upgrades from monolithic to modular X. # Fixes bugs (#173036, 173435, 173453, 173428) perl -p -i -e 's#^\s*RgbPath.*$##gi' $configfile - # If ModulePath is specified in the config file, check for the old - # monolithic module path, and replace it with the new one. - perl -p -i -e "m,^\s*ModulePath.*\"${OLD_MODULEPATH}\".*$,; s,${OLD_MODULEPATH},%{moduledir}," $configfile + # If ModulePath is specified in the config file, delete it. + perl -p -i -e 's#^\s*ModulePath.*$##gi' $configfile fi # done popd @@ -633,6 +632,9 @@ # ------------------------------------------------------------------- %changelog +* Wed Jan 24 2007 Adam Jackson 1.2.0-2 +- Delete ModulePath lines rather than attempt to munge them. (#186338) + * Tue Jan 23 2007 Adam Jackson 1.2.0-1 - Xorg server 1.2.0. From fedora-cvs-commits at redhat.com Thu Jan 25 01:22:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 24 Jan 2007 20:22:00 -0500 Subject: rpms/xorg-x11-drv-vesa/devel vesa-1.2.1-validmode.patch, 1.1, 1.2 xorg-x11-drv-vesa.spec, 1.19, 1.20 Message-ID: <200701250122.l0P1M0wB029967@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-vesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29935 Modified Files: vesa-1.2.1-validmode.patch xorg-x11-drv-vesa.spec Log Message: * Wed Jan 24 2007 Adam Jackson 1.3.0-2 - vesa-1.2.1-validmode.patch: Strictly limit runtime modes to the intersection of the BIOS and DDC lists, if a DDC list exists; fixes cases where we'd choose 1600x1200 on 1680x1050 panel. Conversely, be more forgiving when validating the resulting set against the sync ranges; fixes 640x480 syndrome when the monitor has broken DDC. Don't be deceived though, vesa still sucks. vesa-1.2.1-validmode.patch: vesa.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 80 insertions(+), 9 deletions(-) Index: vesa-1.2.1-validmode.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/vesa-1.2.1-validmode.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vesa-1.2.1-validmode.patch 5 Dec 2006 01:39:16 -0000 1.1 +++ vesa-1.2.1-validmode.patch 25 Jan 2007 01:21:57 -0000 1.2 @@ -1,17 +1,31 @@ ---- xf86-video-vesa-1.2.1/src/vesa.c.validmode 2006-12-04 18:25:14.000000000 -0500 -+++ xf86-video-vesa-1.2.1/src/vesa.c 2006-12-04 19:46:21.000000000 -0500 -@@ -273,6 +273,60 @@ +--- xf86-video-vesa-1.3.0/src/vesa.c.validmode 2007-01-24 19:29:16.000000000 -0500 ++++ xf86-video-vesa-1.3.0/src/vesa.c 2007-01-24 19:34:16.000000000 -0500 +@@ -273,6 +273,85 @@ xf86PrintChipsets(VESA_NAME, "driver for VESA chipsets", VESAChipsets); } ++static VESAPtr ++VESAGetRec(ScrnInfoPtr pScrn) ++{ ++ if (!pScrn->driverPrivate) ++ pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1); ++ ++ return ((VESAPtr)pScrn->driverPrivate); ++} ++ +static ModeStatus +VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) +{ + static int warned = 0; ++ int found = 0; + ScrnInfoPtr pScrn = xf86Screens[scrn]; -+ MonPtr mon = pScrn->monitor; -+ ModeStatus ret1, ret2; -+ DisplayModePtr lo, hi, drop; ++ VESAPtr pVesa = VESAGetRec(pScrn); ++ MonPtr mon = pScrn->monitor, vesamon = pVesa->monitor; ++ ModeStatus ret; ++ DisplayModePtr mode; ++ float v; ++ ++ pVesa = VESAGetRec(pScrn); + + if (pass != MODECHECK_FINAL) { + if (!warned) { @@ -30,38 +44,49 @@ + * So first off, if this isn't a mode we handed to the server (ie, + * M_T_BUILTIN), then we know we can't do it. + */ -+ + if (!(p->type & M_T_BUILTIN)) + return MODE_NOMODE; + + /* -+ * Next, synthesize fully-loaded modes corresponding to the maximal and -+ * minimal refresh rates. If they both fail, then pass the failure code -+ * up (possibly bogus, but oh well). ++ * Next, walk through the mode list from DDC (if any) and look for a ++ * matching resolution. + */ -+ -+ lo = xf86CVTMode(p->HDisplay, p->VDisplay, mon->vrefresh[0].lo, 0, 0); -+ hi = xf86CVTMode(p->HDisplay, p->VDisplay, mon->vrefresh[0].hi, 0, 0); -+ ret1 = xf86CheckModeForMonitor(lo, mon); -+ ret2 = xf86CheckModeForMonitor(hi, mon); -+ xfree(lo); -+ xfree(hi); -+ -+ if (ret1 && ret2) { -+ if (ret1 == ret2) -+ return ret1; -+ else return MODE_BAD; ++ if (pScrn->monitor->DDC) { ++ for (mode = pScrn->monitor->Modes; mode; mode = mode->next) { ++ if (mode->type & M_T_DRIVER && ++ mode->HDisplay == p->HDisplay && ++ mode->VDisplay == p->VDisplay) { ++ found = 1; ++ break; ++ } ++ if (mode == pScrn->monitor->Last) ++ break; ++ } ++ if (!found) ++ return MODE_NOMODE; + } + -+ /* Hooray, we think we can do it */ ++ /* ++ * Finally, walk through the vsync rates 1Hz at a time looking for a mode ++ * that will fit. This is assuredly a terrible way to do this, but ++ * there's no obvious method for computing a mode of a given size that ++ * will pass xf86CheckModeForMonitor. ++ */ ++ for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) { ++ mode = xf86CVTMode(p->HDisplay, p->VDisplay, v, 0, 0); ++ ret = xf86CheckModeForMonitor(mode, mon); ++ xfree(mode); ++ if (ret == MODE_OK) ++ break; ++ } + -+ return MODE_OK; ++ return ret; +} + /* * This function is called once, at the start of the first server generation to * do a minimal probe for supported hardware. -@@ -318,6 +372,7 @@ +@@ -318,6 +397,7 @@ pScrn->PreInit = VESAPreInit; pScrn->ScreenInit = VESAScreenInit; pScrn->SwitchMode = VESASwitchMode; @@ -69,3 +94,19 @@ pScrn->AdjustFrame = VESAAdjustFrame; pScrn->EnterVT = VESAEnterVT; pScrn->LeaveVT = VESALeaveVT; +@@ -391,15 +471,6 @@ + return (int)CHIP_VESA_GENERIC; + } + +-static VESAPtr +-VESAGetRec(ScrnInfoPtr pScrn) +-{ +- if (!pScrn->driverPrivate) +- pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1); +- +- return ((VESAPtr)pScrn->driverPrivate); +-} +- + static void + VESAFreeRec(ScrnInfoPtr pScrn) + { Index: xorg-x11-drv-vesa.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-vesa/devel/xorg-x11-drv-vesa.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xorg-x11-drv-vesa.spec 5 Dec 2006 01:39:16 -0000 1.19 +++ xorg-x11-drv-vesa.spec 25 Jan 2007 01:21:57 -0000 1.20 @@ -7,7 +7,7 @@ Summary: Xorg X11 vesa video driver Name: xorg-x11-drv-vesa Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 License: MIT/X11 @@ -31,7 +31,7 @@ %setup -q -n %{tarball}-%{version} %patch0 -p1 -b .randr-crash -%patch1 -p1 -b .shadowfb +%patch1 -p1 -b .validmode %build %configure --disable-static @@ -58,6 +58,13 @@ %{_mandir}/man4/vesa.4* %changelog +* Wed Jan 24 2007 Adam Jackson 1.3.0-2 +- vesa-1.2.1-validmode.patch: Strictly limit runtime modes to the intersection + of the BIOS and DDC lists, if a DDC list exists; fixes cases where we'd + choose 1600x1200 on 1680x1050 panel. Conversely, be more forgiving when + validating the resulting set against the sync ranges; fixes 640x480 syndrome + when the monitor has broken DDC. Don't be deceived though, vesa still sucks. + * Mon Dec 4 2006 Adam Jackson 1.3.0-1 - Update to 1.3.0 - vesa-1.2.1-validmode.patch: Implement a ValidMode driver hook, which rejects From fedora-cvs-commits at redhat.com Thu Jan 25 08:24:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 03:24:40 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1004,1.1005 Message-ID: <200701250824.l0P8OeUl004696@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4682 Modified Files: openoffice.org.spec Log Message: extra bits Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1004 retrieving revision 1.1005 diff -u -r1.1004 -r1.1005 --- openoffice.org.spec 24 Jan 2007 20:33:42 -0000 1.1004 +++ openoffice.org.spec 25 Jan 2007 08:24:37 -0000 1.1005 @@ -1539,7 +1539,6 @@ %{instdir}/program/classes/xmerge.jar %{instdir}/program/classes/XSLTFilter.jar %{instdir}/program/classes/XSLTValidate.jar -%{instdir}/program/classes/xt.jar %{instdir}/program/cmdmail.uno.so %{instdir}/program/configimport %{instdir}/program/configimport.bin @@ -2171,7 +2170,7 @@ %{_datadir}/applications/openoffice.org-*-base.desktop %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application -%{_datadir}/mimelnk/application/openoffice.org-*-oasis-database.desktop +%{_datadir}/mimelnk/application/*database* %post base update-desktop-database -q %{_datadir}/applications @@ -2597,6 +2596,7 @@ - drop integrated openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch - add openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch - add openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch +- xt.jar no longer distributed * Wed Jan 17 2007 Caolan McNamara - 1:2.1.0-6.14 - Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch From fedora-cvs-commits at redhat.com Thu Jan 25 09:31:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 04:31:34 -0500 Subject: rpms/tcl/devel tcl-8.5a5-makefile.patch, NONE, 1.1 tcl.spec, 1.34, 1.35 Message-ID: <200701250931.l0P9VYYN010845@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10748 Modified Files: tcl.spec Added Files: tcl-8.5a5-makefile.patch Log Message: Add tcl-8.5a5-makefile.patch: Makefile.in | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) --- NEW FILE tcl-8.5a5-makefile.patch --- --- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.patch 2007-01-25 09:20:35.000000000 +0100 +++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in 2007-01-25 09:56:42.000000000 +0100 @@ -813,12 +813,10 @@ install-tzdata: @echo "Installing time zone data" - @echo "Creating tzdata"; - cp -R $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata -## @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ -## TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -## ./tclsh $(TOOL_DIR)/installData.tcl \ -## $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata + @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tclsh $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata install-msgs: @echo "Installing message catalogs" Index: tcl.spec =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- tcl.spec 18 Jan 2007 15:18:52 -0000 1.34 +++ tcl.spec 25 Jan 2007 09:31:32 -0000 1.35 @@ -5,7 +5,7 @@ Summary: Tcl scripting language development environment Name: tcl Version: %{majorver}a5 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Development/Languages URL: http://tcl.sourceforge.net/ @@ -19,6 +19,7 @@ Patch4: tcl-8.5a5-no_rpath.patch #Patch5: tcl-8.4.13-autoconf.patch Patch6: tcl-8.5a5-cflags.patch +Patch7: tcl-8.5a5-makefile.patch %description The Tcl (Tool Command Language) provides a powerful platform for @@ -72,6 +73,7 @@ pushd .. %patch6 -p1 -b .6-cflags popd +%patch7 -p1 -b .7-makefile # patch1 touches tcl.m4, and patch3 touches configure.in cd unix @@ -156,6 +158,9 @@ %doc %{name}%{version}/html/* %changelog +* Thu Jan 25 2007 Marcela Maslanova - 8.5a5-5 +- rebuilt + * Mon Dec 18 2006 Marcela Maslanova - 8.5a5-4 - change in spec for compatibility with tk, version 8.5a5 - Resolves: rhbz#160441 From fedora-cvs-commits at redhat.com Thu Jan 25 09:32:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 04:32:25 -0500 Subject: rpms/tcl/devel .cvsignore,1.12,1.13 sources,1.13,1.14 Message-ID: <200701250932.l0P9WP6H011421@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11352 Modified Files: .cvsignore sources Log Message: Add source Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 19 Dec 2006 13:42:58 -0000 1.12 +++ .cvsignore 25 Jan 2007 09:32:18 -0000 1.13 @@ -1,2 +1,2 @@ -tcl8.5a5-src.tar.gz tk8.5a5-src.tar.gz +tcl8.5a5-src.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 19 Dec 2006 13:42:58 -0000 1.13 +++ sources 25 Jan 2007 09:32:18 -0000 1.14 @@ -1,2 +1,2 @@ -fe9e399c1f186f8c605de8d2e262881e tcl8.5a5-src.tar.gz 8118677251db51faf49bb3333ed6db16 tk8.5a5-src.tar.gz +fe9e399c1f186f8c605de8d2e262881e tcl8.5a5-src.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 25 10:42:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 05:42:43 -0500 Subject: rpms/sound-juicer/devel sound-juicer.spec,1.65,1.66 Message-ID: <200701251042.l0PAghWO006583@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6547 Modified Files: sound-juicer.spec Log Message: * Thu Jan 25 2007 Alexander Larsson - 2.16.2-2 - Remove hicolor icon theme cache (#223483) - Resolves: rhbz#223483 Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sound-juicer.spec 5 Dec 2006 14:47:14 -0000 1.65 +++ sound-juicer.spec 25 Jan 2007 10:42:41 -0000 1.66 @@ -13,7 +13,7 @@ Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.16.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia Source: %{name}-%{version}.tar.bz2 @@ -78,6 +78,8 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper %find_lang sound-juicer +rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache + %clean rm -rf $RPM_BUILD_ROOT @@ -121,6 +123,9 @@ %{_datadir}/icons/hicolor/* %changelog +* Thu Jan 25 2007 Alexander Larsson - 2.16.2-2 +- Remove hicolor icon theme cache (#223483) + * Tue Dec 5 2006 Matthias Clasen - 2.16.2-1 - Update to 2.16.2 From fedora-cvs-commits at redhat.com Thu Jan 25 10:51:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 05:51:40 -0500 Subject: rpms/tcl/devel tcl-8.5a5-makefile.patch,1.1,1.2 tcl.spec,1.35,1.36 Message-ID: <200701251051.l0PApeWM000996@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv912 Modified Files: tcl-8.5a5-makefile.patch tcl.spec Log Message: Add patch tcl-8.5a5-makefile.patch: Makefile.in | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) Index: tcl-8.5a5-makefile.patch =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl-8.5a5-makefile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tcl-8.5a5-makefile.patch 25 Jan 2007 09:31:32 -0000 1.1 +++ tcl-8.5a5-makefile.patch 25 Jan 2007 10:51:38 -0000 1.2 @@ -1,19 +1,24 @@ ---- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.patch 2007-01-25 09:20:35.000000000 +0100 -+++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in 2007-01-25 09:56:42.000000000 +0100 -@@ -813,12 +813,10 @@ +--- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.patch 2006-10-23 15:41:32.000000000 +0200 ++++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in 2007-01-25 11:42:56.000000000 +0100 +@@ -813,17 +813,13 @@ install-tzdata: @echo "Installing time zone data" -- @echo "Creating tzdata"; -- cp -R $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata --## @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ --## TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ --## ./tclsh $(TOOL_DIR)/installData.tcl \ --## $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata -+ @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ -+ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ -+ ./tclsh $(TOOL_DIR)/installData.tcl \ -+ $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata +- @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ +- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ +- ./tclsh $(TOOL_DIR)/installData.tcl \ +- $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata ++ mkdir -p $(SCRIPT_INSTALL_DIR) ++ cp -R $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata install-msgs: @echo "Installing message catalogs" +- @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ +- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ +- ./tclsh $(TOOL_DIR)/installData.tcl \ +- $(TOP_DIR)/library/msgs $(SCRIPT_INSTALL_DIR)/msgs ++ mkdir -p $(SCRIPT_INSTALL_DIR) ++ cp -R $(TOP_DIR)/library/msgs $(SCRIPT_INSTALL_DIR)/msgs + + install-doc: doc + @if test ! -x $(UNIX_DIR)/installManPage; then \ Index: tcl.spec =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tcl.spec 25 Jan 2007 09:31:32 -0000 1.35 +++ tcl.spec 25 Jan 2007 10:51:38 -0000 1.36 @@ -72,8 +72,8 @@ #%patch5 -p1 -b .5-ac213 pushd .. %patch6 -p1 -b .6-cflags -popd %patch7 -p1 -b .7-makefile +popd # patch1 touches tcl.m4, and patch3 touches configure.in cd unix From fedora-cvs-commits at redhat.com Thu Jan 25 11:05:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 06:05:28 -0500 Subject: rpms/brltty/devel brltty-3.7.2-vt-buildfix.patch, NONE, 1.1 brltty.spec, 1.19, 1.20 Message-ID: <200701251105.l0PB5S3q011042@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/brltty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11005 Modified Files: brltty.spec Added Files: brltty-3.7.2-vt-buildfix.patch Log Message: * Thu Jan 25 2007 Tomas Janousek - 3.7.2-1.1 - fix building with newer kernel-headers (#224149) brltty-3.7.2-vt-buildfix.patch: api_client.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE brltty-3.7.2-vt-buildfix.patch --- --- brltty-3.7.2/Programs/api_client.c.vt-buildfix 2005-12-26 13:57:11.000000000 +0100 +++ brltty-3.7.2/Programs/api_client.c 2007-01-25 11:54:44.000000000 +0100 @@ -74,7 +74,7 @@ #ifdef linux #include -#include +#include #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES #endif /* linux */ Index: brltty.spec =================================================================== RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- brltty.spec 12 Jul 2006 11:48:49 -0000 1.19 +++ brltty.spec 25 Jan 2007 11:05:26 -0000 1.20 @@ -1,11 +1,12 @@ Name: brltty Version: 3.7.2 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL Group: System Environment/Daemons URL: http://mielke.cc/brltty/ Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz Patch0: brltty-3.7.2-linux-compiler-h.patch +Patch1: brltty-3.7.2-vt-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot Summary: Braille display driver for Linux/Unix. Requires(post): coreutils @@ -53,6 +54,7 @@ %prep %setup -n brltty-3.7.2 %patch0 -p1 -b .linux-compiler-h +%patch1 -p1 -b .vt-buildfix %build %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt @@ -122,6 +124,9 @@ %doc Documents/BrlAPIref-HTML %changelog +* Thu Jan 25 2007 Tomas Janousek - 3.7.2-1.1 +- fix building with newer kernel-headers (#224149) + * Wed Jul 12 2006 Petr Rockai - 3.7.2-1 - upgrade to latest upstream version - split off brlapi and brlapi-devel packages From fedora-cvs-commits at redhat.com Thu Jan 25 11:49:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 06:49:14 -0500 Subject: rpms/indent/devel indent.spec,1.26,1.27 Message-ID: <200701251149.l0PBnExY004469@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/indent/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4455 Modified Files: indent.spec Log Message: - Ville Skytta: patch for non-failing %%post, %%preun - Resolves: #223703 Index: indent.spec =================================================================== RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- indent.spec 17 Jul 2006 13:41:07 -0000 1.26 +++ indent.spec 25 Jan 2007 11:49:12 -0000 1.27 @@ -1,7 +1,7 @@ Summary: A GNU program for formatting C code. Name: indent Version: 2.2.9 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL Group: Applications/Text URL: http://www.gnu.org/software/indent/ @@ -58,11 +58,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/install-info %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent). Program to format source code." +/sbin/install-info %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent). Program to format source code." || : %preun if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent). Program to format source code." + /sbin/install-info --delete %{_infodir}/indent.info.gz %{_infodir}/dir --entry="* indent: (indent). Program to format source code." || : fi %files -f %{name}.lang @@ -73,6 +73,10 @@ %changelog +* Thu Jan 25 2007 Petr Machata - 2.2.9-15 +- Ville Skytta: patch for non-failing %%post, %%preun +- Resolves: #223703 + * Mon Jul 17 2006 Karsten Hopp 2.2.9-14 - add buildrequires makeinfo From fedora-cvs-commits at redhat.com Thu Jan 25 12:00:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:00:41 -0500 Subject: rpms/make/devel make-3.81-rlimit.patch, NONE, 1.1 make.spec, 1.29, 1.30 Message-ID: <200701251200.l0PC0flH004855@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/make/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4784 Modified Files: make.spec Added Files: make-3.81-rlimit.patch Log Message: - make now restores rlimit to its original values before launching subprocess (#214033) - this doesn't resolve #214033, it's merely related make-3.81-rlimit.patch: job.c | 3 +++ main.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--------------- make.h | 7 +++++++ 3 files changed, 54 insertions(+), 15 deletions(-) --- NEW FILE make-3.81-rlimit.patch --- diff -Burp make-3.81/job.c make-3.81-pm/job.c --- make-3.81/job.c 2006-11-30 11:00:23.000000000 +0100 +++ make-3.81-pm/job.c 2006-11-30 10:58:46.000000000 +0100 @@ -2079,6 +2079,9 @@ exec_command (char **argv, char **envp) # else /* Run the program. */ +#ifdef SET_STACK_SIZE + restore_original_stack_rlimit (); +#endif environ = envp; execvp (argv[0], argv); diff -Burp make-3.81/main.c make-3.81-pm/main.c --- make-3.81/main.c 2006-11-30 11:00:23.000000000 +0100 +++ make-3.81-pm/main.c 2006-11-30 10:38:04.000000000 +0100 @@ -44,12 +44,51 @@ Foundation, Inc., 51 Franklin St, Fifth # include #endif -#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) -# define SET_STACK_SIZE -#endif - #ifdef SET_STACK_SIZE # include +/* Whether the rlimit was set successfuly */ +static int setrlimit_succeeded = 0; +/* Original rlim_cur */ +static rlim_t setrlimit_orig_cur = 0; + +/* Get rid of any avoidable limit on stack size so that alloca does + not fail. */ +void +set_max_stack_rlimit (void) +{ + struct rlimit rlim; + + /* Back off if the limit is still set, probably due to failure in + restore_original_stack_rlimit. */ + if (setrlimit_succeeded) + return; + + if (getrlimit (RLIMIT_STACK, &rlim) == 0) + { + setrlimit_orig_cur = rlim.rlim_cur; + rlim.rlim_cur = rlim.rlim_max; + if (setrlimit (RLIMIT_STACK, &rlim) != -1) + setrlimit_succeeded = 1; + } +} + +/* Set the rlimit back to its original value. To be called before + process spawn. */ +void +restore_original_stack_rlimit (void) +{ + struct rlimit rlim; + + if (!setrlimit_succeeded) + return; + + if (getrlimit (RLIMIT_STACK, &rlim) == 0) + { + rlim.rlim_cur = setrlimit_orig_cur; + if (setrlimit (RLIMIT_STACK, &rlim) != -1) + setrlimit_succeeded = 0; + } +} #endif #ifdef _AMIGA @@ -915,17 +954,7 @@ main (int argc, char **argv, char **envp #endif #ifdef SET_STACK_SIZE - /* Get rid of any avoidable limit on stack size. */ - { - struct rlimit rlim; - - /* Set the stack limit huge so that alloca does not fail. */ - if (getrlimit (RLIMIT_STACK, &rlim) == 0) - { - rlim.rlim_cur = rlim.rlim_max; - setrlimit (RLIMIT_STACK, &rlim); - } - } + set_max_stack_rlimit (); #endif #ifdef HAVE_ATEXIT diff -Burp make-3.81/make.h make-3.81-pm/make.h --- make-3.81/make.h 2006-11-30 11:00:23.000000000 +0100 +++ make-3.81-pm/make.h 2006-11-30 10:29:50.000000000 +0100 @@ -346,6 +346,13 @@ extern int strcmpi (const char *,const c #define N_(msgid) gettext_noop (msgid) #define S_(msg1,msg2,num) ngettext (msg1,msg2,num) +/* Handle rlimit */ +#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) +# define SET_STACK_SIZE +void set_max_stack_rlimit (void); +void restore_original_stack_rlimit (void); +#endif + /* Handle other OSs. */ #if defined(HAVE_DOS_PATHS) # define PATH_SEPARATOR_CHAR ';' Index: make.spec =================================================================== RCS file: /cvs/dist/rpms/make/devel/make.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- make.spec 12 Jul 2006 07:17:38 -0000 1.29 +++ make.spec 25 Jan 2007 12:00:34 -0000 1.30 @@ -2,7 +2,7 @@ Name: make Epoch: 1 Version: 3.81 -Release: 1.1 +Release: 2%{?dist} License: GPL Group: Development/Tools URL: http://www.gnu.org/software/make/ @@ -12,6 +12,7 @@ Patch5: make-3.80-getcwd.patch Patch6: make-3.81-err-reporting.patch Patch7: make-3.81-memory.patch +Patch8: make-3.81-rlimit.patch Prereq: /sbin/install-info Prefix: %{_prefix} Buildroot: %{_tmppath}/%{name}-root @@ -34,6 +35,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build config/missing --run aclocal -I config @@ -81,6 +83,10 @@ %{_infodir}/*.info* %changelog +* Thu Jan 25 2007 Petr Machata - 1:3.81-2 +- make now restores rlimit to its original values before launching + subprocess (#214033) + * Wed Jul 12 2006 Jesse Keating - 1:3.81-1.1 - rebuild From fedora-cvs-commits at redhat.com Thu Jan 25 12:13:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:13:09 -0500 Subject: rpms/nasm/devel nasm.spec,1.18,1.19 Message-ID: <200701251213.l0PCD9mQ005086@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/nasm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5072 Modified Files: nasm.spec Log Message: - Ville Skytta: patch for non-failing %%post, %%preun - Resolves: #223714 Index: nasm.spec =================================================================== RCS file: /cvs/dist/rpms/nasm/devel/nasm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nasm.spec 12 Jul 2006 07:25:51 -0000 1.18 +++ nasm.spec 25 Jan 2007 12:13:07 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A portable x86 assembler which uses Intel-like syntax. Name: nasm Version: 0.98.39 -Release: 3.2.2 +Release: 4%{?dist} Patch0: nasm-0.98-boguself2.patch Patch1: nasm-0.98.39-overfl.patch License: LGPL @@ -61,11 +61,11 @@ rm -rf "$RPM_BUILD_ROOT" %post -/sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir || : fi %files @@ -90,6 +90,10 @@ %{_bindir}/rdx %changelog +* Thu Jan 25 2007 Petr Machata - 0.98.39-4 +- Ville Skytta: patch for non-failing %%post, %%preun +- Resolves: #223714 + * Wed Jul 12 2006 Jesse Keating - 0.98.39-3.2.2 - rebuild From fedora-cvs-commits at redhat.com Thu Jan 25 12:13:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:13:15 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.130,1.131 Message-ID: <200701251213.l0PCDFXE005109@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5095 Modified Files: ghostscript.spec Log Message: * Thu Jan 25 2007 Tim Waugh - Moved libijs.so and libgs.so into devel package (bug #203623). - Resolves: rhbz#203623 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- ghostscript.spec 24 Jan 2007 10:35:02 -0000 1.130 +++ ghostscript.spec 25 Jan 2007 12:13:13 -0000 1.131 @@ -227,8 +227,7 @@ %{_mandir}/*/* %doc %{_docdir}/%{name}-%{gs_dot_ver} %{_libdir}/libgs.so.* -%{_libdir}/libgs.so -%{_libdir}/libijs*.so* +%{_libdir}/libijs-*.so* %{_libdir}/%{name}/%{gs_dot_ver} /usr/lib/cups/filter/pstopxl %{_datadir}/cups/model/pxl* @@ -244,9 +243,14 @@ %dir %{_includedir}/ijs %{_includedir}/ijs/* %{_bindir}/ijs-config +%{_libdir}/libijs.so %{_libdir}/libijs.*a +%{_libdir}/libgs.so %changelog +* Thu Jan 25 2007 Tim Waugh +- Moved libijs.so and libgs.so into devel package (bug #203623). + * Wed Jan 24 2007 Tim Waugh 8.15.3-6 - Configure with --with-drivers=ALL since the advertised default is not what gets used (bug #223819). From fedora-cvs-commits at redhat.com Thu Jan 25 12:15:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:15:59 -0500 Subject: rpms/ghostscript/devel ghostscript-dvipdf.patch, NONE, 1.1 ghostscript.spec, 1.131, 1.132 Message-ID: <200701251215.l0PCFxK7005202@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5187 Modified Files: ghostscript.spec Added Files: ghostscript-dvipdf.patch Log Message: * Thu Jan 25 2007 Tim Waugh - dvipdf script fixes (bug #88906). - Resolves: rhbz#88906 ghostscript-dvipdf.patch: dvipdf | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ghostscript-dvipdf.patch --- --- espgs-8.15.3/lib/dvipdf.dvipdf 2007-01-25 12:14:49.000000000 +0000 +++ espgs-8.15.3/lib/dvipdf 2007-01-25 12:15:02.000000000 +0000 @@ -37,4 +37,4 @@ # We have to include the options twice because -I only takes effect if it # appears before other options. -exec dvips -q -f "$infile" | gs $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - +exec dvips -R -q -f "$infile" | gs $OPTIONS -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- ghostscript.spec 25 Jan 2007 12:13:13 -0000 1.131 +++ ghostscript.spec 25 Jan 2007 12:15:57 -0000 1.132 @@ -20,6 +20,7 @@ Patch4: ghostscript-big-cmap-post.patch Patch5: ghostscript-split-cidfnmap.patch Patch6: ghostscript-gxcht-64bit-crash.patch +Patch7: ghostscript-dvipdf.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel @@ -91,6 +92,9 @@ # Backported gxcht 64bit crash fix from GPL trunk (bug #177763). %patch6 -p1 -b .gxcht-64bit-crash +# dvipdf script fixes (bug #88906). +%patch7 -p1 -b .dvipdf + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -249,6 +253,7 @@ %changelog * Thu Jan 25 2007 Tim Waugh +- dvipdf script fixes (bug #88906). - Moved libijs.so and libgs.so into devel package (bug #203623). * Wed Jan 24 2007 Tim Waugh 8.15.3-6 From fedora-cvs-commits at redhat.com Thu Jan 25 12:16:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:16:36 -0500 Subject: rpms/sed/devel sed.spec,1.39,1.40 Message-ID: <200701251216.l0PCGaHg005232@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/sed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5216 Modified Files: sed.spec Log Message: - Ville Skytta: patch for non-failing %%post, %%preun - Resolves: #223716 Index: sed.spec =================================================================== RCS file: /cvs/dist/rpms/sed/devel/sed.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sed.spec 8 Dec 2006 21:06:49 -0000 1.39 +++ sed.spec 25 Jan 2007 12:16:34 -0000 1.40 @@ -5,7 +5,7 @@ Summary: A GNU stream text editor. Name: sed Version: 4.1.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.gz @@ -52,11 +52,11 @@ %find_lang %{name} %post -/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/sed.info.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/sed.info.gz %{_infodir}/dir || : fi %clean @@ -70,6 +70,10 @@ %{_mandir}/man*/* %changelog +* Thu Jan 25 2007 Petr Machata - 4.1.5-7 +- Ville Skytta: patch for non-failing %%post, %%preun +- Resolves: #223716 + * Fri Dec 8 2006 Petr Machata - 4.1.5-6 - Split confused patches "copy+symlink" and "relsymlink" into discrete "copy" and "symlink". From fedora-cvs-commits at redhat.com Thu Jan 25 12:16:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:16:46 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.132,1.133 Message-ID: <200701251216.l0PCGkMr005285@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5270 Modified Files: ghostscript.spec Log Message: 8.15.3-7 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- ghostscript.spec 25 Jan 2007 12:15:57 -0000 1.132 +++ ghostscript.spec 25 Jan 2007 12:16:44 -0000 1.133 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 6%{?dist} +Release: 7%{?dist} License: GPL URL: http://www.cups.org/espgs/ @@ -252,7 +252,7 @@ %{_libdir}/libgs.so %changelog -* Thu Jan 25 2007 Tim Waugh +* Thu Jan 25 2007 Tim Waugh 8.15.3-7 - dvipdf script fixes (bug #88906). - Moved libijs.so and libgs.so into devel package (bug #203623). From fedora-cvs-commits at redhat.com Thu Jan 25 12:18:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:18:06 -0500 Subject: rpms/make/devel make.spec,1.30,1.31 Message-ID: <200701251218.l0PCI6LD025729@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/make/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25715 Modified Files: make.spec Log Message: - Ville Skytta: patch for non-failing %%post, %%preun - Resolves: #223709 Index: make.spec =================================================================== RCS file: /cvs/dist/rpms/make/devel/make.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- make.spec 25 Jan 2007 12:00:34 -0000 1.30 +++ make.spec 25 Jan 2007 12:18:04 -0000 1.31 @@ -2,7 +2,7 @@ Name: make Epoch: 1 Version: 3.81 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://www.gnu.org/software/make/ @@ -68,11 +68,11 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility." +/sbin/install-info %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility." || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility." + /sbin/install-info --delete %{_infodir}/make.info.gz %{_infodir}/dir --entry="* Make: (make). The GNU make utility." || : fi %files -f %{name}.lang @@ -83,6 +83,10 @@ %{_infodir}/*.info* %changelog +* Thu Jan 25 2007 Petr Machata - 1:3.81-3 +- Ville Skytta: patch for non-failing %%post, %%preun +- Resolves: #223709 + * Thu Jan 25 2007 Petr Machata - 1:3.81-2 - make now restores rlimit to its original values before launching subprocess (#214033) From fedora-cvs-commits at redhat.com Thu Jan 25 12:20:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 07:20:12 -0500 Subject: rpms/tk/devel tk.spec,1.24,1.25 Message-ID: <200701251220.l0PCKCOZ025824@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25799 Modified Files: tk.spec Log Message: New version Index: tk.spec =================================================================== RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- tk.spec 19 Dec 2006 14:54:57 -0000 1.24 +++ tk.spec 25 Jan 2007 12:20:10 -0000 1.25 @@ -117,7 +117,7 @@ %{_mandir}/mann/* %changelog -* Mon Dec 18 2006 Marcela Maslanova - 8.5a5-1 +* Thu Jan 25 2007 Marcela Maslanova - 8.5a5-1 - update: version 8.5a5 - Resolves: rhbz#160442 From fedora-cvs-commits at redhat.com Thu Jan 25 13:03:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 08:03:51 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch, NONE, 1.1 openoffice.org.spec, 1.918, 1.919 Message-ID: <200701251303.l0PD3pW8018874@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18786 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch Log Message: Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch: unx/gtk/window/gtkframe.cxx | 0 vcl/unx/gtk/window/gtkframe.cxx | 3 +++ 2 files changed, 3 insertions(+) --- NEW FILE openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch --- Index: unx/gtk/window/gtkframe.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v retrieving revision 1.56.34.1 diff -u -r1.56.34.1 gtkframe.cxx --- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 31 Oct 2006 12:30:13 -0000 1.56.34.1 +++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 25 Jan 2007 12:31:53 -0000 @@ -2779,6 +2782,9 @@ void GtkSalFrame::IMHandler::endExtTextInput( USHORT /*nFlags*/ ) { + + gtk_im_context_reset ( m_pIMContext ); + if( m_aInputEvent.mpTextAttr ) { vcl::DeletionListener aDel( m_pFrame ); Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.918 retrieving revision 1.919 diff -u -r1.918 -r1.919 --- openoffice.org.spec 24 Jan 2007 19:03:27 -0000 1.918 +++ openoffice.org.spec 25 Jan 2007 13:03:49 -0000 1.919 @@ -152,6 +152,7 @@ Patch84: openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch Patch85: openoffice.org-2.1.0.ooo69010.sd.undocrash.patch Patch86: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch +Patch87: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -1038,6 +1039,7 @@ %patch84 -p1 -b .ooo72505.vcl.wrongrole.patch %patch85 -p1 -b .ooo69010.sd.undocrash.patch %patch86 -p1 -b .ooo73481.svx.longnotint32.patch +%patch87 -p1 -b .ooo73863.vcl.imcommit.patch tar xzf %{SOURCE1} @@ -2566,6 +2568,7 @@ * Mon Jan 15 2006 Caolan McNamara - 1:2.0.4-5.5.11 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch - Resolves: rhbz#224230 mark sofficerc as config file +- Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch * Mon Dec 18 2006 Caolan McNamara - 1:2.0.4-5.5.10 - Resolves: rhbz#219252 add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch From fedora-cvs-commits at redhat.com Thu Jan 25 13:04:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 08:04:29 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch, NONE, 1.1 openoffice.org.spec, 1.1005, 1.1006 Message-ID: <200701251304.l0PD4TQK019365@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19197 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch Log Message: Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch: unx/gtk/window/gtkframe.cxx | 0 vcl/unx/gtk/window/gtkframe.cxx | 3 +++ 2 files changed, 3 insertions(+) --- NEW FILE openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch --- Index: unx/gtk/window/gtkframe.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v retrieving revision 1.56.34.1 diff -u -r1.56.34.1 gtkframe.cxx --- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 31 Oct 2006 12:30:13 -0000 1.56.34.1 +++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 25 Jan 2007 12:31:53 -0000 @@ -2779,6 +2782,9 @@ void GtkSalFrame::IMHandler::endExtTextInput( USHORT /*nFlags*/ ) { + + gtk_im_context_reset ( m_pIMContext ); + if( m_aInputEvent.mpTextAttr ) { vcl::DeletionListener aDel( m_pFrame ); Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1005 retrieving revision 1.1006 diff -u -r1.1005 -r1.1006 --- openoffice.org.spec 25 Jan 2007 08:24:37 -0000 1.1005 +++ openoffice.org.spec 25 Jan 2007 13:04:27 -0000 1.1006 @@ -117,7 +117,7 @@ Patch50: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch Patch51: openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch Patch52: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch - +Patch53: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch %define instdir %{_libdir}/openoffice.org @@ -983,6 +983,7 @@ %patch50 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch %patch51 -p1 -b .oooXXXXX.javaunohelper.parallel.patch %patch52 -p1 -b .oooXXXXX.extensions.noxaw.patch +%patch53 -p1 -b .ooo73863.vcl.imcommit.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -2575,6 +2576,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Thu Jan 25 2007 Caolan McNamara - 1:2.2.0-2.2 +- Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch + * Tue Jan 23 2007 Caolan McNamara - 1:2.2.0-2.1 - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch From fedora-cvs-commits at redhat.com Thu Jan 25 13:37:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 08:37:06 -0500 Subject: rpms/file/devel file-4.19-ooffice.patch, NONE, 1.1 file.spec, 1.56, 1.57 Message-ID: <200701251337.l0PDb6WB024539@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24516 Modified Files: file.spec Added Files: file-4.19-ooffice.patch Log Message: * Thu Jan 25 2007 Martin Bacovsky - 4.19-2.fc7 - Resolves: #223297 - file does not recognize OpenOffice "native" formats - Resolves: #224344 - Magic rules should be in file-libs file-4.19-ooffice.patch: archive | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE file-4.19-ooffice.patch --- --- file-4.19/magic/Magdir/archive.ooffice 2007-01-25 11:18:43.000000000 +0100 +++ file-4.19/magic/Magdir/archive 2007-01-25 11:19:08.000000000 +0100 @@ -536,8 +536,6 @@ >4 byte 0x0b Zip archive data, at least v1.1 to extract >4 byte 0x14 >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract ->0x161 string WINZIP Zip archive data, WinZIP self-extracting - # OpenOffice.org / KOffice / StarOffice documents # From: Abel Cheung Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/devel/file.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- file.spec 9 Jan 2007 19:23:02 -0000 1.56 +++ file.spec 25 Jan 2007 13:37:02 -0000 1.57 @@ -3,7 +3,7 @@ Summary: A utility for determining file types. Name: file Version: 4.19 -Release: 1%{?dist} +Release: 2%{?dist} License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -20,6 +20,7 @@ Patch18: file-4.17-powerpoint.patch Patch20: file-4.17-bash.patch Patch21: file-4.19-ELF.patch +Patch22: file-4.19-ooffice.patch #Patch19: file-4.17-empty.patch @@ -68,6 +69,7 @@ #%patch19 -p1 -b .empty %patch20 -p1 -b .bash %patch21 -p1 -b .ELF +%patch22 -p1 -b .ooffice iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -103,15 +105,15 @@ %defattr(-,root,root) %doc LEGAL.NOTICE README %{_bindir}/* -%{_datadir}/magic* -%{_datadir}/file -%{_datadir}/misc/* -%{_mandir}/man[15]/* +%{_mandir}/man1/* %files libs %defattr(-,root,root) %{_libdir}/*so.* -%{_mandir}/man3/* +%{_mandir}/man[35]/* +%{_datadir}/magic* +%{_datadir}/file +%{_datadir}/misc/* %files devel %defattr(0644, root, root, 0755) @@ -121,6 +123,10 @@ %changelog +* Thu Jan 25 2007 Martin Bacovsky - 4.19-2.fc7 +- Resolves: #223297 - file does not recognize OpenOffice "native" formats +- Resolves: #224344 - Magic rules should be in file-libs + * Tue Jan 9 2007 Martin Bacovsky - 4.19-1.fc7 - Resolves: #208880 - Pointless file(1) error message while detecting ELF 64-bit file thanks to for patch From fedora-cvs-commits at redhat.com Thu Jan 25 14:07:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 09:07:14 -0500 Subject: rpms/kdelibs/devel .cvsignore, 1.37, 1.38 kdelibs.spec, 1.197, 1.198 sources, 1.49, 1.50 kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch, 1.1, NONE kdelibs-3.5.5-kde#135988.patch, 1.1, NONE kdelibs-3.5.5-kmcupsmanager.patch, 1.1, NONE Message-ID: <200701251407.l0PE7EoK012954@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12935 Modified Files: .cvsignore kdelibs.spec sources Removed Files: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch kdelibs-3.5.5-kde#135988.patch kdelibs-3.5.5-kmcupsmanager.patch Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdelibs/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 8 Aug 2006 10:21:02 -0000 1.37 +++ .cvsignore 25 Jan 2007 14:07:12 -0000 1.38 @@ -12,3 +12,4 @@ kdelibs-3.5.2.tar.bz2 kdelibs-3.5.3.tar.bz2 kdelibs-3.5.4.tar.bz2 +kdelibs-3.5.6.tar.bz2 Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- kdelibs.spec 14 Nov 2006 15:18:14 -0000 1.197 +++ kdelibs.spec 25 Jan 2007 14:07:12 -0000 1.198 @@ -1,4 +1,4 @@ -%define distname "Fedora-Core" +%define distname "Fedora" %define debug 0 %define final 1 @@ -16,7 +16,7 @@ %define make_cvs 0 %define arts 1 -Version: 3.5.5 +Version: 3.5.6 Release: 1%{?dist} Summary: K Desktop Environment - Libraries Name: kdelibs @@ -46,13 +46,6 @@ Patch39: kdelibs-3.5.4-kabc-make.patch Patch40: kdelibs-3.5.4-kdeprint-utf8.patch -# upstream patches -Patch100: kdelibs-3.5.5-kmcupsmanager.patch -Patch101: kdelibs-3.5.5-kde#135988.patch - -# security fixes -Patch500: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch - Requires: arts >= %{arts_epoch}:%{arts_version} Requires: qt >= %{qt_epoch}:%{qt_version} Requires: cups-libs >= %{cups_epoch}:1.1.12 @@ -175,13 +168,6 @@ %patch39 -p1 -b .kabc-make %patch40 -p1 -b .kdeprint-utf8 -# upstream pathces -%patch100 -p1 -b .kmcupsmanager -%patch101 -p0 -b .kde#135988 - -# security fixes -%patch500 -p1 -b .CVE-2006-4811 - perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h %build @@ -397,6 +383,9 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Thu Jan 25 2007 Than Ngo - 6:3.5.5-1.fc7 +- 3.5.6 + * Tue Nov 14 2006 Than Ngo - 6:3.5.5-1.fc7 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdelibs/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 14 Nov 2006 15:18:14 -0000 1.49 +++ sources 25 Jan 2007 14:07:12 -0000 1.50 @@ -1 +1 @@ -2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 +e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 --- kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch DELETED --- --- kdelibs-3.5.5-kde#135988.patch DELETED --- --- kdelibs-3.5.5-kmcupsmanager.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 25 14:52:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 09:52:32 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1006,1.1007 Message-ID: <200701251452.l0PEqWLL017826@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17727 Modified Files: openoffice.org.spec Log Message: extra bits Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1006 retrieving revision 1.1007 diff -u -r1.1006 -r1.1007 --- openoffice.org.spec 25 Jan 2007 13:04:27 -0000 1.1006 +++ openoffice.org.spec 25 Jan 2007 14:52:30 -0000 1.1007 @@ -1298,6 +1298,9 @@ #remove pagein stuff rm -f $RPM_BUILD_ROOT/%{instdir}/program/pagein* +#remove dummy .dat files +rm -f $RPM_BUILD_ROOT/%{instdir}/program/root?.dat + #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs #have snuck through pic=0 @@ -1578,6 +1581,7 @@ %{instdir}/program/libbasctl680*.so %{instdir}/program/libbasegfx680*.so %{instdir}/program/libbf_frm680*.so +%{instdir}/program/libbf_go680*.so %{instdir}/program/libbf_lng680*.so %{instdir}/program/libbf_migratefilter680*.so %{instdir}/program/libbf_ofa680*.so @@ -1610,6 +1614,7 @@ %{instdir}/program/libdbpool2.so %{instdir}/program/libdbtools680*.so %{instdir}/program/libdbu680*.so +%{instdir}/program/libdeploymentmisc680*.so %{instdir}/program/libdict_ja.so %{instdir}/program/libdict_zh.so %{instdir}/program/libdtransX11680*.so @@ -1859,6 +1864,7 @@ %{instdir}/program/spadmin %{instdir}/program/spadmin.bin %{instdir}/program/streams.uno.so +%{instdir}/program/stringresource680*.uno.so %{instdir}/program/sunjavaplugin.so %{instdir}/program/svtmisc.uno.so %{instdir}/program/sysmgr1.uno.so @@ -1875,6 +1881,7 @@ %{instdir}/program/unopkg %{instdir}/program/unopkg.bin %{instdir}/program/unorc +%{instdir}/program/updatefeed.uno.so %{instdir}/program/uri-encode %{instdir}/program/uriproc.uno.so %{instdir}/program/uuresolver.uno.so @@ -1971,6 +1978,7 @@ %{instdir}/share/registry/data/org/openoffice/Office/Writer.xcu %{instdir}/share/registry/data/org/openoffice/Setup.xcu %{instdir}/share/registry/data/org/openoffice/TypeDetection +%{instdir}/share/registry/data/org/openoffice/UserProfile.xcu %{instdir}/share/registry/data/org/openoffice/VCL.xcu %dir %{instdir}/share/registry/data/org/openoffice/ucb %{instdir}/share/registry/data/org/openoffice/ucb/Configuration.xcu @@ -2117,6 +2125,10 @@ %if %{stlvisibilityfcked} %{instdir}/program/libstlport*.so %endif +%dir %{_datadir}/mimelnk +%dir %{_datadir}/mimelnk/application +%{_datadir}/mimelnk/application/*extension* + %post core update-desktop-database -q %{_datadir}/applications @@ -2576,12 +2588,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Thu Jan 25 2007 Caolan McNamara - 1:2.2.0-2.2 -- Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch - -* Tue Jan 23 2007 Caolan McNamara - 1:2.2.0-2.1 +* Thu Jan 25 2007 Caolan McNamara - 1:2.2.0-2.1 - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch +- Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch - start of release candidate - drop integrated workspace.icuupgrade.patch - drop integrated workspace.cmcfixes29.patch @@ -2601,6 +2611,7 @@ - add openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch - add openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch - xt.jar no longer distributed +- some new .sos * Wed Jan 17 2007 Caolan McNamara - 1:2.1.0-6.14 - Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch From fedora-cvs-commits at redhat.com Thu Jan 25 16:37:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 11:37:28 -0500 Subject: rpms/kdelibs/devel kdelibs-3.5.6-utempter.patch, NONE, 1.1 kdelibs.spec, 1.198, 1.199 Message-ID: <200701251637.l0PGbRVk001053@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv520 Modified Files: kdelibs.spec Added Files: kdelibs-3.5.6-utempter.patch Log Message: patch to use libutempter kdelibs-3.5.6-utempter.patch: configure.in | 2 +- configure.in.in | 2 +- kdecore/Makefile.am | 2 +- kdecore/Makefile.in | 2 +- kdecore/kpty.cpp | 30 ++++++------------------------ 5 files changed, 10 insertions(+), 28 deletions(-) --- NEW FILE kdelibs-3.5.6-utempter.patch --- --- kdelibs-3.5.6/kdecore/Makefile.am.utempter 2007-01-25 17:38:24.000000000 +0100 +++ kdelibs-3.5.6/kdecore/Makefile.am 2007-01-25 17:53:21.000000000 +0100 @@ -115,7 +115,7 @@ kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ kqiodevicegzip_p.cpp ktimezones.cpp -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined +libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ --- kdelibs-3.5.6/kdecore/Makefile.in.utempter 2007-01-25 17:38:03.000000000 +0100 +++ kdelibs-3.5.6/kdecore/Makefile.in 2007-01-25 17:53:21.000000000 +0100 @@ -783,7 +783,7 @@ #>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined #>+ 1 -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) +libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ --- kdelibs-3.5.6/kdecore/kpty.cpp.utempter 2007-01-25 17:37:50.000000000 +0100 +++ kdelibs-3.5.6/kdecore/kpty.cpp 2007-01-25 17:53:21.000000000 +0100 @@ -80,6 +80,10 @@ # include #endif +#ifdef HAVE_UTEMPTER +# include +#endif + #ifdef HAVE_TERMIOS_H /* for HP-UX (some versions) the extern C is needed, and for other platforms it doesn't hurt */ @@ -138,21 +142,6 @@ // private functions // /////////////////////// -#ifdef HAVE_UTEMPTER -class KProcess_Utmp : public KProcess -{ -public: - int commSetupDoneC() - { - dup2(cmdFd, 0); - dup2(cmdFd, 1); - dup2(cmdFd, 3); - return 1; - } - int cmdFd; -}; -#endif - #define BASE_CHOWN "kgrantpty" @@ -399,12 +388,8 @@ void KPty::login(const char *user, const char *remotehost) { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; - utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << ""; - utmp.start(KProcess::Block); + utempter_add_record (d->masterFd, remotehost); Q_UNUSED(user); - Q_UNUSED(remotehost); #elif defined(USE_LOGIN) const char *str_ptr; struct utmp l_struct; @@ -442,10 +427,7 @@ void KPty::logout() { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; - utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-d" << d->ttyName; - utmp.start(KProcess::Block); + utempter_remove_record (d->masterFd); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); if (!memcmp(str_ptr, "/dev/", 5)) --- kdelibs-3.5.6/configure.in.in.utempter 2006-05-22 20:14:23.000000000 +0200 +++ kdelibs-3.5.6/configure.in.in 2007-01-25 18:15:25.000000000 +0100 @@ -395,7 +395,7 @@ [], with_utempter=check) if test "x$with_utempter" != xno; then kde_have_utempter=yes - AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) + AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) AC_SUBST(LIBUTEMPTER) if test "$kde_have_utempter" = "yes"; then AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment]) --- kdelibs-3.5.6/configure.in.utempter 2007-01-25 18:15:52.000000000 +0100 +++ kdelibs-3.5.6/configure.in 2007-01-25 18:15:39.000000000 +0100 @@ -399,7 +399,7 @@ [], with_utempter=check) if test "x$with_utempter" != xno; then kde_have_utempter=yes - AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) + AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) AC_SUBST(LIBUTEMPTER) if test "$kde_have_utempter" = "yes"; then AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment]) Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- kdelibs.spec 25 Jan 2007 14:07:12 -0000 1.198 +++ kdelibs.spec 25 Jan 2007 16:37:25 -0000 1.199 @@ -45,6 +45,7 @@ Patch38: kdelibs-3.5.2-cupsdconf2-group.patch Patch39: kdelibs-3.5.4-kabc-make.patch Patch40: kdelibs-3.5.4-kdeprint-utf8.patch +Patch41: kdelibs-3.5.6-utempter.patch Requires: arts >= %{arts_epoch}:%{arts_version} Requires: qt >= %{qt_epoch}:%{qt_version} @@ -167,6 +168,7 @@ %patch38 -p1 -b .cupsdconf2-group %patch39 -p1 -b .kabc-make %patch40 -p1 -b .kdeprint-utf8 +%patch41 -p1 -b .utempter perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h From fedora-cvs-commits at redhat.com Thu Jan 25 18:00:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 13:00:59 -0500 Subject: rpms/bind/devel .cvsignore, 1.23, 1.24 bind.spec, 1.155, 1.156 sources, 1.30, 1.31 Message-ID: <200701251800.l0PI0xaT007881@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7748/bind/devel Modified Files: .cvsignore bind.spec sources Log Message: Updated to 9.3.4 which contains two security bugfixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bind/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Dec 2006 23:52:53 -0000 1.23 +++ .cvsignore 25 Jan 2007 18:00:56 -0000 1.24 @@ -1,15 +1,3 @@ -bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 -bind-9.2.4rc7.tar.gz +bind-9.3.4.tar.gz bind-chroot.tar.gz -bind-manpages-2.tar.bz2 -bind-manpages.patch.bz2 -bind-9.2.4rc8.tar.gz -bind-9.3.0.tar.gz -bind-9.3.1rc1.tar.gz libbind-man.tar.gz -bind-9.3.1.tar.gz -bind-9.3.2rc1.tar.gz -bind-9.3.2.tar.gz -bind-9.3.3rc2.tar.gz -bind-9.3.3rc3.tar.gz -bind-9.3.3.tar.gz Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- bind.spec 23 Jan 2007 12:45:28 -0000 1.155 +++ bind.spec 25 Jan 2007 18:00:56 -0000 1.156 @@ -16,8 +16,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. Name: bind License: BSD-like -Version: 9.3.3 -Release: 5%{?prever}%{?dist} +Version: 9.3.4 +Release: 1%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -743,6 +743,9 @@ :; %changelog +* Wed Jan 25 2007 Adam Tkac 31:9.3.4-1.fc7 +- updated to version 9.3.4 which contains security bugfixes + * Tue Jan 23 2007 Adam Tkac 31:9.3.3-5.fc7 - package bind-libbind-devel has been marked as obsolete Index: sources =================================================================== RCS file: /cvs/dist/rpms/bind/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 10 Dec 2006 23:52:53 -0000 1.30 +++ sources 25 Jan 2007 18:00:56 -0000 1.31 @@ -1,3 +1,3 @@ +df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz 3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz -b5cad77aa7912bf7b4cb770cfc42fdad bind-9.3.3.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 25 18:00:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 13:00:59 -0500 Subject: rpms/bind/FC-6 .cvsignore, 1.21, 1.22 bind.spec, 1.145, 1.146 sources, 1.30, 1.31 Message-ID: <200701251800.l0PI0xfu007870@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7748/bind/FC-6 Modified Files: .cvsignore bind.spec sources Log Message: Updated to 9.3.4 which contains two security bugfixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 15 Sep 2006 14:44:12 -0000 1.21 +++ .cvsignore 25 Jan 2007 18:00:56 -0000 1.22 @@ -1,13 +1,3 @@ -bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 -bind-9.2.4rc7.tar.gz -bind-chroot.tar.gz -bind-manpages-2.tar.bz2 -bind-manpages.patch.bz2 -bind-9.2.4rc8.tar.gz -bind-9.3.0.tar.gz -bind-9.3.1rc1.tar.gz +bind-9.3.4.tar.gz libbind-man.tar.gz -bind-9.3.1.tar.gz -bind-9.3.2rc1.tar.gz -bind-9.3.2.tar.gz -bind-9.3.3rc2.tar.gz +bind-chroot.tar.gz Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/bind.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- bind.spec 4 Jan 2007 14:38:50 -0000 1.145 +++ bind.spec 25 Jan 2007 18:00:56 -0000 1.146 @@ -16,8 +16,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. Name: bind License: BSD-like -Version: 9.3.3 -Release: 2%{?prever}%{?dist} +Version: 9.3.4 +Release: 1%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -777,6 +777,9 @@ :; %changelog +* Wed Jan 25 2007 Adam Tkac 31:9.3.4-1.fc6 +- updated to 9.3.4 which contains two security bugfixes + * Thu Jan 4 2007 Martin Stransky - 31:9.3.3-2 - added namedGetForwarders written in shell (#176100), created by Baris Cicek . Index: sources =================================================================== RCS file: /cvs/dist/rpms/bind/FC-6/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 10 Dec 2006 23:57:37 -0000 1.30 +++ sources 25 Jan 2007 18:00:56 -0000 1.31 @@ -1,3 +1,3 @@ -3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz +df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz -b5cad77aa7912bf7b4cb770cfc42fdad bind-9.3.3.tar.gz +3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 25 19:05:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 14:05:12 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch, 1.10, 1.11 selinux-policy.spec, 1.385, 1.386 Message-ID: <200701251905.l0PJ5C09025786@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25648 Modified Files: policy-20070102.patch selinux-policy.spec Log Message: * Thu Jan 25 2007 Dan Walsh 2.5.2-1 - Add ability to generate webadm_t policy - Lots of new interfaces for httpd - Allow sshd to login as unconfined_t policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 - policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 83 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 + policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 72 ++++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 38 ++ policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 198 ++++++++++++- policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 9 policy/modules/services/apache.if | 98 ++++++ policy/modules/services/apache.te | 10 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 + policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.fc | 1 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.if | 4 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/razor.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 18 + policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 161 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 105 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.te | 35 +- policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 8 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 41 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 450 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 173 files changed, 3918 insertions(+), 647 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.10 -r 1.11 policy-20070102.patch Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- policy-20070102.patch 24 Jan 2007 19:36:24 -0000 1.10 +++ policy-20070102.patch 25 Jan 2007 19:05:10 -0000 1.11 @@ -1,27 +1,27 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.5.1/config/appconfig-strict/seusers +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.5.2/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.5.1/config/appconfig-strict/seusers 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/config/appconfig-strict/seusers 2007-01-25 09:00:58.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.5.2/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.5.1/config/appconfig-strict-mcs/seusers 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/config/appconfig-strict-mcs/seusers 2007-01-25 09:00:58.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.5.1/config/appconfig-strict-mls/seusers +diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.5.2/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-16 17:15:27.000000000 -0500 -+++ serefpolicy-2.5.1/config/appconfig-strict-mls/seusers 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/config/appconfig-strict-mls/seusers 2007-01-25 09:00:58.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.5.1/man/man8/httpd_selinux.8 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.5.2/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 2006-11-16 17:15:28.000000000 -0500 -+++ serefpolicy-2.5.1/man/man8/httpd_selinux.8 2007-01-19 12:10:20.000000000 -0500 ++++ serefpolicy-2.5.2/man/man8/httpd_selinux.8 2007-01-25 09:00:58.000000000 -0500 @@ -1,4 +1,12 @@ .TH "httpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "httpd Selinux Policy documentation" +.de EX @@ -188,9 +188,9 @@ system-config-securitylevel is a GUI tool available to customize SELinux policy settings. .SH AUTHOR This manual page was written by Dan Walsh . -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.5.1/man/man8/kerberos_selinux.8 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.5.2/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 2006-11-16 17:15:28.000000000 -0500 -+++ serefpolicy-2.5.1/man/man8/kerberos_selinux.8 2007-01-19 12:10:20.000000000 -0500 ++++ serefpolicy-2.5.2/man/man8/kerberos_selinux.8 2007-01-25 09:00:58.000000000 -0500 @@ -1,4 +1,12 @@ .TH "kerberos_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "kerberos Selinux Policy documentation" +.de EX @@ -234,9 +234,9 @@ system-config-securitylevel is a GUI tool available to customize SELinux policy settings. .SH AUTHOR This manual page was written by Dan Walsh . -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/named_selinux.8 serefpolicy-2.5.1/man/man8/named_selinux.8 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/named_selinux.8 serefpolicy-2.5.2/man/man8/named_selinux.8 --- nsaserefpolicy/man/man8/named_selinux.8 2006-11-16 17:15:28.000000000 -0500 -+++ serefpolicy-2.5.1/man/man8/named_selinux.8 2007-01-19 12:10:20.000000000 -0500 ++++ serefpolicy-2.5.2/man/man8/named_selinux.8 2007-01-25 09:00:58.000000000 -0500 @@ -1,4 +1,12 @@ .TH "named_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "named Selinux Policy documentation" +.de EX @@ -274,9 +274,9 @@ system-config-securitylevel is a GUI tool available to customize SELinux policy settings. .SH AUTHOR This manual page was written by Dan Walsh . -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-2.5.1/man/man8/rsync_selinux.8 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-2.5.2/man/man8/rsync_selinux.8 --- nsaserefpolicy/man/man8/rsync_selinux.8 2006-11-16 17:15:28.000000000 -0500 -+++ serefpolicy-2.5.1/man/man8/rsync_selinux.8 2007-01-19 12:10:20.000000000 -0500 ++++ serefpolicy-2.5.2/man/man8/rsync_selinux.8 2007-01-25 09:00:58.000000000 -0500 @@ -1,4 +1,12 @@ .TH "rsync_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "rsync Selinux Policy documentation" +.de EX @@ -321,9 +321,9 @@ .TP system-config-securitylevel is a GUI tool available to customize SELinux policy settings. .SH AUTHOR -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.1/policy/flask/access_vectors +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.5.2/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-16 17:15:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/flask/access_vectors 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/flask/access_vectors 2007-01-25 09:00:58.000000000 -0500 @@ -594,6 +594,8 @@ shmempwd shmemgrp @@ -342,9 +342,9 @@ } class key -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.1/policy/global_tunables +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.2/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/global_tunables 2007-01-22 14:45:19.000000000 -0500 ++++ serefpolicy-2.5.2/policy/global_tunables 2007-01-25 09:00:58.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -551,9 +551,9 @@ +gen_tunable(allow_netlabel,true) ') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.1/policy/mls +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.2/policy/mls --- nsaserefpolicy/policy/mls 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/mls 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/mls 2007-01-25 09:00:58.000000000 -0500 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -625,9 +625,9 @@ ( t2 == unlabeled_t )); mlsconstrain association { polmatch } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.1/policy/modules/admin/acct.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.5.2/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/acct.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/acct.te 2007-01-25 09:00:58.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -636,9 +636,9 @@ type acct_data_t; logging_log_file(acct_data_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.5.1/policy/modules/admin/bootloader.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.5.2/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/bootloader.fc 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/bootloader.fc 2007-01-25 09:00:58.000000000 -0500 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -651,9 +651,9 @@ /sbin/lilo.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) -/sbin/mkinitrd -- gen_context(system_u:object_r:bootloader_exec_t,s0) /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.5.1/policy/modules/admin/bootloader.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.5.2/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/bootloader.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/bootloader.te 2007-01-25 09:00:58.000000000 -0500 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -673,9 +673,9 @@ # new file system defaults to file_t, granting file_t access is still bad. files_manage_isid_type_dirs(bootloader_t) files_manage_isid_type_files(bootloader_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.1/policy/modules/admin/consoletype.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.5.2/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/consoletype.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/consoletype.te 2007-01-25 09:00:58.000000000 -0500 @@ -8,7 +8,12 @@ type consoletype_t; @@ -710,9 +710,9 @@ optional_policy(` auth_read_pam_pid(consoletype_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.1/policy/modules/admin/dmesg.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.5.2/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-16 17:15:26.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/dmesg.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/dmesg.te 2007-01-25 09:00:58.000000000 -0500 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -721,9 +721,9 @@ role system_r types dmesg_t; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.5.1/policy/modules/admin/logwatch.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.5.2/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/logwatch.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/logwatch.te 2007-01-25 09:00:58.000000000 -0500 @@ -58,6 +58,7 @@ # Read /proc/PID directories for all domains. domain_read_all_domains_state(logwatch_t) @@ -740,9 +740,9 @@ +optional_policy(` + nis_use_ypbind(logwatch_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.1/policy/modules/admin/netutils.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.5.2/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/admin/netutils.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/admin/netutils.te 2007-01-25 09:00:58.000000000 -0500 @@ -22,6 +22,7 @@ type traceroute_t; type traceroute_exec_t; [...1944 lines suppressed...] +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.2/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/selinuxutil.te 2007-01-17 14:20:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/selinuxutil.te 2007-01-25 09:00:58.000000000 -0500 @@ -108,6 +108,18 @@ domain_entry_file(semanage_t, semanage_exec_t) role system_r types semanage_t; @@ -7488,9 +7659,9 @@ + ssh_sigchld(load_policy_t) + ssh_rw_stream_sockets(load_policy_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.1/policy/modules/system/sysnetwork.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.5.2/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/sysnetwork.te 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/sysnetwork.te 2007-01-25 09:00:58.000000000 -0500 @@ -326,6 +326,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) @@ -7501,16 +7672,16 @@ ') optional_policy(` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.5.1/policy/modules/system/tzdata.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.5.2/policy/modules/system/tzdata.fc --- nsaserefpolicy/policy/modules/system/tzdata.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/tzdata.fc 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/tzdata.fc 2007-01-25 09:00:58.000000000 -0500 @@ -0,0 +1,3 @@ +# tzdata executable will have: + +/usr/sbin/tzdata-update -- gen_context(system_u:object_r:tzdata_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.5.1/policy/modules/system/tzdata.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.5.2/policy/modules/system/tzdata.if --- nsaserefpolicy/policy/modules/system/tzdata.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/tzdata.if 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/tzdata.if 2007-01-25 09:00:58.000000000 -0500 @@ -0,0 +1,19 @@ +## policy for tzdata + @@ -7531,10 +7702,10 @@ + + domtrans_pattern($1,tzdata_exec_t,tzdata_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.5.1/policy/modules/system/tzdata.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.5.2/policy/modules/system/tzdata.te --- nsaserefpolicy/policy/modules/system/tzdata.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/tzdata.te 2007-01-17 13:32:47.000000000 -0500 -@@ -0,0 +1,38 @@ ++++ serefpolicy-2.5.2/policy/modules/system/tzdata.te 2007-01-25 09:00:58.000000000 -0500 +@@ -0,0 +1,41 @@ +policy_module(tzdata,1.0.0) + +######################################## @@ -7556,6 +7727,9 @@ +files_read_etc_files(tzdata_t) +libs_use_ld_so(tzdata_t) +libs_use_shared_libs(tzdata_t) ++ ++locallogin_dontaudit_use_fds(tzdata_t) ++ +miscfiles_read_localization(tzdata_t) + +files_search_spool(tzdata_t) @@ -7573,9 +7747,9 @@ +optional_policy(` + postfix_search_spool(tzdata_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.1/policy/modules/system/unconfined.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.5.2/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.fc 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/unconfined.fc 2007-01-25 09:00:58.000000000 -0500 @@ -9,4 +9,6 @@ /usr/bin/valgrind -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) /usr/local/RealPlayer/realplay\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -7583,9 +7757,9 @@ +/usr/bin/qemu.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) +/usr/bin/vmware.* -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.1/policy/modules/system/unconfined.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.5.2/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.if 2007-01-22 13:38:44.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/unconfined.if 2007-01-25 13:56:01.000000000 -0500 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -7602,9 +7776,9 @@ tunable_policy(`allow_execheap',` # Allow making the stack executable via mprotect. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.1/policy/modules/system/unconfined.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.5.2/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/unconfined.te 2007-01-22 11:29:35.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/unconfined.te 2007-01-25 09:00:58.000000000 -0500 @@ -63,6 +63,10 @@ ') @@ -7657,9 +7831,9 @@ dbus_stub(unconfined_execmem_t) init_dbus_chat_script(unconfined_execmem_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.5.1/policy/modules/system/userdomain.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.5.2/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2006-11-16 17:15:24.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.fc 2007-01-17 16:02:48.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/userdomain.fc 2007-01-25 09:00:58.000000000 -0500 @@ -1,11 +1,4 @@ -ifdef(`strict_policy',` HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-mls_systemhigh) @@ -7672,9 +7846,9 @@ -HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) -HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) -') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.1/policy/modules/system/userdomain.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.2/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.if 2007-01-22 15:19:36.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/userdomain.if 2007-01-25 13:55:14.000000000 -0500 @@ -102,6 +102,9 @@ libs_exec_ld_so($1_t) @@ -7793,13 +7967,13 @@ optional_policy(` cups_stream_connect_ptal($1_t) + cups_stream_connect($1_t) -+ ') -+ -+ optional_policy(` -+ locate_read_lib_files($1_t) ') optional_policy(` ++ locate_read_lib_files($1_t) ++ ') ++ ++ optional_policy(` + allow $1_t self:dbus send_msg; dbus_system_bus_client_template($1,$1_t) @@ -8018,7 +8192,7 @@ ## Do not audit attempts to read users ## untrusted files. ## -@@ -5549,3 +5658,275 @@ +@@ -5549,3 +5658,276 @@ allow $1 user_home_dir_t:dir manage_dir_perms; files_home_filetrans($1,user_home_dir_t,dir) ') @@ -8294,9 +8468,10 @@ + + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.1/policy/modules/system/userdomain.te ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.5.2/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/userdomain.te 2007-01-22 19:21:55.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/userdomain.te 2007-01-25 11:54:40.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -8400,9 +8575,9 @@ usermanage_run_admin_passwd(sysadm_t,sysadm_r,admin_terminal) usermanage_run_groupadd(sysadm_t,sysadm_r,admin_terminal) usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.1/policy/modules/system/xen.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.5.2/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.1/policy/modules/system/xen.te 2007-01-17 14:42:44.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/xen.te 2007-01-25 09:00:58.000000000 -0500 @@ -166,8 +166,13 @@ files_manage_etc_runtime_files(xend_t) files_etc_filetrans_etc_runtime(xend_t,file) @@ -8454,9 +8629,9 @@ +fs_write_nfs_files(xend_t) +fs_read_nfs_files(xend_t) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.1/policy/support/obj_perm_sets.spt +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/support/obj_perm_sets.spt serefpolicy-2.5.2/policy/support/obj_perm_sets.spt --- nsaserefpolicy/policy/support/obj_perm_sets.spt 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.1/policy/support/obj_perm_sets.spt 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/policy/support/obj_perm_sets.spt 2007-01-25 09:00:58.000000000 -0500 @@ -215,7 +215,7 @@ define(`getattr_file_perms',`{ getattr }') define(`setattr_file_perms',`{ setattr }') @@ -8466,9 +8641,9 @@ define(`exec_file_perms',`{ getattr read execute execute_no_trans }') define(`append_file_perms',`{ getattr append lock ioctl }') define(`write_file_perms',`{ getattr write append lock ioctl }') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.1/Rules.modular +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.5.2/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-16 17:15:29.000000000 -0500 -+++ serefpolicy-2.5.1/Rules.modular 2007-01-17 13:32:47.000000000 -0500 ++++ serefpolicy-2.5.2/Rules.modular 2007-01-25 09:00:58.000000000 -0500 @@ -219,6 +219,16 @@ ######################################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- selinux-policy.spec 23 Jan 2007 01:08:45 -0000 1.385 +++ selinux-policy.spec 25 Jan 2007 19:05:10 -0000 1.386 @@ -16,8 +16,8 @@ %define CHECKPOLICYVER 1.30.11-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.5.1 -Release: 5%{?dist} +Version: 2.5.2 +Release: 1%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -165,7 +165,7 @@ %description SELinux Reference Policy - modular. -Based off of reference policy: Checked out revision 2175. +Based off of reference policy: Checked out revision 2178. %prep %setup -q -n serefpolicy-%{version} @@ -356,6 +356,11 @@ %endif %changelog +* Thu Jan 25 2007 Dan Walsh 2.5.2-1 +- Add ability to generate webadm_t policy +- Lots of new interfaces for httpd +- Allow sshd to login as unconfined_t + * Mon Jan 22 2007 Dan Walsh 2.5.1-5 - Continue fixing, additional user domains From fedora-cvs-commits at redhat.com Thu Jan 25 19:07:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 14:07:02 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.100, 1.101 sources, 1.104, 1.105 Message-ID: <200701251907.l0PJ72Lw027131@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27085 Modified Files: .cvsignore sources Log Message: * Thu Jan 25 2007 Dan Walsh 2.5.2-1 - Add ability to generate webadm_t policy - Lots of new interfaces for httpd - Allow sshd to login as unconfined_t Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- .cvsignore 22 Jan 2007 18:15:16 -0000 1.100 +++ .cvsignore 25 Jan 2007 19:07:00 -0000 1.101 @@ -102,3 +102,4 @@ serefpolicy-2.4.5.tgz serefpolicy-2.4.6.tgz serefpolicy-2.5.1.tgz +serefpolicy-2.5.2.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- sources 22 Jan 2007 18:15:16 -0000 1.104 +++ sources 25 Jan 2007 19:07:00 -0000 1.105 @@ -1 +1 @@ -bc5b8cfa70fc210ac3e10adfeb19658e serefpolicy-2.5.1.tgz +feb68b3e3bbddea9f941385d5347dc42 serefpolicy-2.5.2.tgz From fedora-cvs-commits at redhat.com Thu Jan 25 19:13:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 14:13:41 -0500 Subject: rpms/python-virtinst/devel virtinst-nfs-mount.patch, NONE, 1.1 python-virtinst.spec, 1.9, 1.10 Message-ID: <200701251913.l0PJDfAX032290@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/python-virtinst/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32256 Modified Files: python-virtinst.spec Added Files: virtinst-nfs-mount.patch Log Message: Fixed NFS mounted installs virtinst-nfs-mount.patch: ParaVirtGuest.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE virtinst-nfs-mount.patch --- diff -r 2c7176fccb80 virtinst/ParaVirtGuest.py --- a/virtinst/ParaVirtGuest.py Mon Jan 22 17:42:02 2007 -0500 +++ b/virtinst/ParaVirtGuest.py Thu Jan 25 13:50:36 2007 -0500 @@ -127,7 +127,7 @@ class ParaVirtGuest(Guest.Guest): initrd.close() elif self.location.startswith("nfs:"): - nfsmntdir = tempfile.mkdtemp(prefix="nfs.", dir="/var/lib/virtinst") + nfsmntdir = tempfile.mkdtemp(prefix="nfs.", dir=scratchdir) cmd = ["mount", "-o", "ro", self.location[4:], nfsmntdir] ret = subprocess.call(cmd) if ret != 0: @@ -140,12 +140,12 @@ class ParaVirtGuest(Guest.Guest): kernel = open(nfsmntdir + "/images/" + self.type + "/vmlinuz", "r") except IOError, e: raise RuntimeError, "Invalid NFS location given: " + str(e) - kfn = _copy_temp(kernel, prefix="vmlinuz.") + kfn = _copy_temp(kernel, prefix="vmlinuz.", scratchdir=scratchdir) try: initrd = open(nfsmntdir + "/images/" + self.type + "/initrd.img", "r") except IOError, e: raise RuntimeError, "Invalid NFS location given: " + str(e) - ifn = _copy_temp(initrd, prefix="initrd.img.") + ifn = _copy_temp(initrd, prefix="initrd.img.", scratchdir=scratchdir) finally: if kernel: kernel.close() Index: python-virtinst.spec =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- python-virtinst.spec 22 Jan 2007 22:57:36 -0000 1.9 +++ python-virtinst.spec 25 Jan 2007 19:13:39 -0000 1.10 @@ -3,8 +3,9 @@ Summary: Python modules for starting Xen guest installations Name: python-virtinst Version: 0.100.0 -Release: 1%{?dist} +Release: 2%{?dist} Source0: virtinst-%{version}.tar.gz +Patch1: virtinst-nfs-mount.patch License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,7 +29,8 @@ virtinst in a command line mode. %prep -%setup -q -n virtinst-%{version} +%setup -q -n virtinst-%{version} +%patch1 -p1 %build python setup.py build @@ -50,6 +52,9 @@ %{_sbindir}/virt-install %changelog +* Thu Jan 25 2007 Daniel P. Berrange - 0.100.0-2.fc7 +- Fix errors with NFS mount based installs + * Mon Jan 22 2007 Daniel P. Berrange - 0.100.0-1.fc7 - Updated to 0.100.0 which now uses libvirt inactive domain support needed to operate correctly against xen 3.0.4 From fedora-cvs-commits at redhat.com Thu Jan 25 19:24:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 14:24:22 -0500 Subject: rpms/emacs/devel loaddefs-dependencies.patch, NONE, 1.1 emacs.spec, 1.82, 1.83 Message-ID: <200701251924.l0PJOMxO028373@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28346 Modified Files: emacs.spec Added Files: loaddefs-dependencies.patch Log Message: fixup loaddefs.el dependencies (Dan Nicolaescu #176171) loaddefs-dependencies.patch: Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE loaddefs-dependencies.patch --- --- emacs-22.0.93/lisp/Makefile.in.orig 2007-01-25 14:06:57.978552000 -0500 +++ emacs-22.0.93/lisp/Makefile.in 2007-01-25 14:08:51.486931000 -0500 @@ -87,12 +87,12 @@ doit: $(lisp)/cus-load.el: touch $@ -custom-deps: $(lisp)/cus-load.el doit +custom-deps: $(lisp)/loaddefs.el $(lisp)/cus-load.el doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins -finder-data: doit +finder-data: $(lisp)/loaddefs.el doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- emacs.spec 24 Jan 2007 16:55:26 -0000 1.82 +++ emacs.spec 25 Jan 2007 19:24:19 -0000 1.83 @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 22.0.93 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -38,6 +38,7 @@ Conflicts: gettext < 0.10.40 # C and build patches +Patch0: loaddefs-dependencies.patch # Lisp and doc patches @@ -92,6 +93,7 @@ %prep %setup -q +%patch0 -p1 # install rest of site-lisp files ( cd site-lisp @@ -279,6 +281,9 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Thu Jan 25 2007 Chip Coldwell - 22.0.93-4 +- fixup loaddefs.el dependencies (Dan Nicolaescu #176171) + * Wed Jan 24 2007 Chip Coldwell - 22.0.93-3 - po-mode.el was being left out From fedora-cvs-commits at redhat.com Thu Jan 25 19:59:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 14:59:05 -0500 Subject: rpms/emacs/devel emacs.spec,1.83,1.84 Message-ID: <200701251959.l0PJx5LD023436@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23419 Modified Files: emacs.spec Log Message: changes to Makefile.in have no effect without BR: automake Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- emacs.spec 25 Jan 2007 19:24:19 -0000 1.83 +++ emacs.spec 25 Jan 2007 19:59:03 -0000 1.84 @@ -32,7 +32,7 @@ BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel -BuildRequires: autoconf, bzip2, cairo, texinfo +BuildRequires: autoconf, automake, bzip2, cairo, texinfo Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: emacs-common = %{version}-%{release} Conflicts: gettext < 0.10.40 From fedora-cvs-commits at redhat.com Thu Jan 25 20:00:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 15:00:16 -0500 Subject: rpms/emacs/devel emacs.spec,1.84,1.85 Message-ID: <200701252000.l0PK0GHf023535@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23517 Modified Files: emacs.spec Log Message: update changelog Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- emacs.spec 25 Jan 2007 19:59:03 -0000 1.84 +++ emacs.spec 25 Jan 2007 20:00:14 -0000 1.85 @@ -283,6 +283,7 @@ %changelog * Thu Jan 25 2007 Chip Coldwell - 22.0.93-4 - fixup loaddefs.el dependencies (Dan Nicolaescu #176171) +- add BuildRequires: automake (changes to Makefile.in) * Wed Jan 24 2007 Chip Coldwell - 22.0.93-3 - po-mode.el was being left out From fedora-cvs-commits at redhat.com Thu Jan 25 20:13:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 15:13:30 -0500 Subject: rpms/kexec-tools/devel kdump.conf, 1.4, 1.5 kdump.init, 1.12, 1.13 kexec-tools.spec, 1.68, 1.69 mkdumprd, 1.11, 1.12 Message-ID: <200701252013.l0PKDUKN023956@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23939 Modified Files: kdump.conf kdump.init kexec-tools.spec mkdumprd Log Message: Updating kdump.init and mkdumprd to equiv. of -163.el5 Index: kdump.conf =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kdump.conf 15 Dec 2006 21:05:01 -0000 1.4 +++ kdump.conf 25 Jan 2007 20:13:28 -0000 1.5 @@ -44,7 +44,8 @@ # initramfs will wait before attempting to transmit # user data. # default -# if all of the above fail, do the default action. +# Action to preform instead of mounting root fs and +# running init process # reboot: If the default action is reboot simply reboot # the system and loose the core that you are # trying to retrieve. Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdump.init 15 Dec 2006 21:05:01 -0000 1.12 +++ kdump.init 25 Jan 2007 20:13:28 -0000 1.13 @@ -154,6 +154,13 @@ KDUMP_COMMANDLINE=`cat /proc/cmdline` fi + MEM_RESERVED=`echo $KDUMP_COMMANDLINE | grep "crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]"` + if [ -z "$MEM_RESERVED" ] + then + $LOGGER "No crashkernel parameter specified for running kernel" + return 1 + fi + ARCH=`uname -m` if [ "$ARCH" == "i686" -o "$ARCH" == "i386" ] then @@ -179,7 +186,7 @@ fi fi - KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'` + KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+[MmKkGg]@[0-9]\+[MmGgKk]//'` KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} ${KDUMP_COMMANDLINE_APPEND}" $KEXEC $KEXEC_ARGS $standard_kexec_args \ Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- kexec-tools.spec 5 Jan 2007 17:47:37 -0000 1.68 +++ kexec-tools.spec 25 Jan 2007 20:13:28 -0000 1.69 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 56%{?dist} +Release: 57%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -224,6 +224,9 @@ %doc kexec-kdump-howto.txt %changelog +* Wed Jan 25 2007 Neil Horman - 1.101-55%{dist} +- Updating kdump.init and mkdumprd with most recent RHEL5 fixes + * Thu Jan 04 2007 Neil Horman - 1.101-56%{dist} - Fix option parsing problem for bzImage files (bz 221272) Index: mkdumprd =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mkdumprd 15 Dec 2006 21:05:01 -0000 1.11 +++ mkdumprd 25 Jan 2007 20:13:28 -0000 1.12 @@ -45,8 +45,6 @@ MPATHS="" -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd - CONFMODS="$MODULES" MODULES="" @@ -68,7 +66,7 @@ vg_list="" net_list="" -USING_METHOD="local_fs" +USING_METHOD="" SAVE_PATH=/var/crash vecho() @@ -406,6 +404,11 @@ then echo " " netmask $NETMASK >> $MNTIMAGE/etc/network/interfaces fi + if [ -z "$GATEWAY" ] + then + GATEWAY=`/sbin/ip route show | awk '/^default/ {print $3}'` + fi + echo " " gateway $GATEWAY >> $MNTIMAGE/etc/network/interfaces fi #This lets us recursively handle stacked devices @@ -909,6 +912,7 @@ #don't process comments or blank line continue fi + USING_METHOD="filesystem" if (echo $location | egrep -q "^(LABEL|UUID)="); then location=$(findfs $location) fi @@ -925,7 +929,14 @@ rm -rf $MNTIMAGE rm -rf $IMAGE exit 1 - fi + fi + + if [ -z "$USING_METHOD" ] + then + echo "Warning! Lack of dump target specification means core_collector option is ignored!" + CORE_COLLECTOR="" + fi + fi @@ -1459,12 +1470,17 @@ #test raw partition kdump_chk "dd if=$location count=1 of=/dev/null > /dev/null 2>&1" \ "Bad raw partition $location" - #TODO check for available size is greater than $memtotal + #check for available size is greater than $memtotal + available_size=$(fdisk -s $location) + if [ $available_size -lt $memtotal ]; then + echo "Warning: There is not space enough to save a vmcore." + echo " The size of $location should be much greater than $memtotal bytes." + fi #setup raw case emit "echo Saving to partition $location" emit "dd if=/proc/vmcore of=$location" - emit "if [ $? == 0 ]" + emit "if [ \$? == 0 ]" emit "then" emit " reboot -f" emit "fi" @@ -1526,6 +1542,7 @@ "Bad NFS mount $location" mkdir -p $tmnt/$SAVE_PATH tdir=`mktemp -dqp $tmnt/$SAVE_PATH` + available_size=$(df $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f4) rc=$? && rm -rf $tdir umount $tmnt @@ -1543,7 +1560,11 @@ CORE_COLLECTOR="cp" fi - #TODO check for available size is greater than $memtotal + #check for available size is greater than $memtotal + if [ $available_size -lt $memtotal ]; then + echo "Warning: There is not space enough to save a vmcore." + echo " The size of $location should be much greater than $memtotal bytes." + fi #setup nfs case mkdir -p $MNTIMAGE/mnt @@ -1571,6 +1592,14 @@ echo "$KDUMP_CONFIG_FILE: Could not create temp directory in $location:$SAVE_PATH" exit 1 fi + remote_df=`ssh -q $s_opts $rlocation df $tdir` + available_size=$(echo $remote_df | tail -1 | tr -s ' ' '|' | cut -d\| -f10) + + #check for available size is greater than $memtotal + if [ $available_size -lt $memtotal ]; then + echo "Warning: There is not space enough to save a vmcore." + echo " The size of $rlocation:$tdir should be much greater than $memtotal bytes." + fi #We do this to remove the temp directory from above ssh -q $s_opts $rlocation rmdir $tdir @@ -1606,12 +1635,18 @@ kdump_chk "mount -t $type $location /mnt" "Bad mount point $location" mkdir -p /mnt/$SAVE_PATH tdir=`mktemp -dqp /mnt/$SAVE_PATH` + available_size=$(df $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f4) rc=$? && rm -rf $tdir && umount /mnt if [ $rc != "0" ]; then echo "Cannot create directory in $location: $SAVE_PATH" exit 1 fi - #TODO check for available size is greater than $memtotal + #check for available size is greater than $memtotal + if [ $available_size -lt $memtotal ]; then + echo "Warning: There is not space enough to save a vmcore." + echo " The size of $location should be much greater than $memtotal bytes." + fi + #setup filesystem case mkdir -p $MNTIMAGE/mnt From fedora-cvs-commits at redhat.com Thu Jan 25 20:47:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 15:47:59 -0500 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.69,1.70 Message-ID: <200701252047.l0PKlwxJ012245@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11922 Modified Files: kexec-tools.spec Log Message: bumping revision number Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- kexec-tools.spec 25 Jan 2007 20:13:28 -0000 1.69 +++ kexec-tools.spec 25 Jan 2007 20:47:54 -0000 1.70 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 57%{?dist} +Release: 58%{?dist} License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -224,7 +224,7 @@ %doc kexec-kdump-howto.txt %changelog -* Wed Jan 25 2007 Neil Horman - 1.101-55%{dist} +* Wed Jan 25 2007 Neil Horman - 1.101-58%{dist} - Updating kdump.init and mkdumprd with most recent RHEL5 fixes * Thu Jan 04 2007 Neil Horman - 1.101-56%{dist} From fedora-cvs-commits at redhat.com Thu Jan 25 21:02:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 16:02:19 -0500 Subject: rpms/selinux-policy/FC-6 booleans-mls.conf, 1.7, 1.8 policy-20061106.patch, 1.11, 1.12 securetty_types-mls, 1.1, 1.2 selinux-policy.spec, 1.337, 1.338 Message-ID: <200701252102.l0PL2J6j002786@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv2603 Modified Files: booleans-mls.conf policy-20061106.patch securetty_types-mls selinux-policy.spec Log Message: * Wed Jan 24 2007 Dan Walsh 2.4.6-31 - Fix clvmd policy - Fix squid cgi script to run with correct context. - Maintain proper context on /etc/lvm/.cache file - Lots of fixes for ricci and friends - mount.nfs needs sys_resource - Change gstreamer context for only i386 - Fix libXcomp file_context Resolves: #224441 Index: booleans-mls.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/booleans-mls.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- booleans-mls.conf 15 Jan 2007 15:55:21 -0000 1.7 +++ booleans-mls.conf 25 Jan 2007 21:02:17 -0000 1.8 @@ -224,3 +224,7 @@ # allow_netlabel = true +# Allow ipsec labeled packets to flow +# +allow_ipsec_label = true + policy-20061106.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 policy/flask/access_vectors | 2 policy/global_tunables | 66 +++ policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/amanda.if | 17 policy/modules/admin/amanda.te | 6 policy/modules/admin/backup.te | 5 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 14 policy/modules/admin/consoletype.te | 21 - policy/modules/admin/ddcprobe.te | 10 policy/modules/admin/dmesg.te | 7 policy/modules/admin/dmidecode.te | 5 policy/modules/admin/firstboot.if | 6 policy/modules/admin/kudzu.te | 5 policy/modules/admin/logrotate.te | 5 policy/modules/admin/logwatch.te | 6 policy/modules/admin/netutils.te | 10 policy/modules/admin/portage.te | 5 policy/modules/admin/prelink.te | 17 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 24 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 49 +- policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/tripwire.te | 11 policy/modules/admin/usbmodules.te | 5 policy/modules/admin/usermanage.te | 34 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.te | 5 policy/modules/apps/evolution.if | 106 +++++ policy/modules/apps/evolution.te | 1 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 108 +++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.fc | 2 policy/modules/apps/java.if | 38 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 17 policy/modules/apps/mozilla.if | 209 +++++++++-- policy/modules/apps/mplayer.if | 84 ++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 80 +++- policy/modules/apps/userhelper.if | 19 - policy/modules/apps/webalizer.te | 6 policy/modules/apps/yam.te | 5 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 77 ++++ policy/modules/kernel/corenetwork.if.in | 99 +++++ policy/modules/kernel/corenetwork.te.in | 17 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 5 policy/modules/kernel/devices.te | 8 policy/modules/kernel/domain.if | 58 +++ policy/modules/kernel/domain.te | 22 + policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 220 +++++++++++ policy/modules/kernel/filesystem.if | 23 + policy/modules/kernel/filesystem.te | 13 policy/modules/kernel/kernel.if | 64 +++ policy/modules/kernel/kernel.te | 12 policy/modules/kernel/mls.if | 28 + policy/modules/kernel/mls.te | 6 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.fc | 1 policy/modules/kernel/terminal.if | 2 policy/modules/kernel/terminal.te | 1 policy/modules/services/apache.fc | 11 policy/modules/services/apache.te | 23 + policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/avahi.if | 21 + policy/modules/services/bind.fc | 1 policy/modules/services/bind.te | 5 policy/modules/services/bluetooth.te | 5 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 11 policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 92 ++-- policy/modules/services/cron.te | 48 ++ policy/modules/services/cups.te | 7 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.fc | 1 policy/modules/services/dbus.if | 43 ++ policy/modules/services/dcc.te | 9 policy/modules/services/ftp.te | 14 policy/modules/services/hal.fc | 4 policy/modules/services/hal.if | 57 +++ policy/modules/services/hal.te | 9 policy/modules/services/inetd.te | 28 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 3 policy/modules/services/kerberos.te | 11 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 56 +- policy/modules/services/lpd.te | 5 policy/modules/services/mta.if | 1 policy/modules/services/mta.te | 2 policy/modules/services/munin.te | 5 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 3 policy/modules/services/nis.if | 8 policy/modules/services/nis.te | 15 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 policy/modules/services/oav.te | 5 policy/modules/services/oddjob.te | 3 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 62 +++ policy/modules/services/pcscd.te | 78 ++++ policy/modules/services/pegasus.if | 31 + policy/modules/services/pegasus.te | 5 policy/modules/services/portmap.te | 5 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.if | 2 policy/modules/services/postfix.te | 17 policy/modules/services/procmail.te | 16 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/rhgb.if | 76 ++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 6 policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.te | 23 + policy/modules/services/rsync.te | 1 policy/modules/services/samba.if | 2 policy/modules/services/samba.te | 17 policy/modules/services/sasl.te | 2 policy/modules/services/sendmail.te | 8 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 1 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 4 policy/modules/services/spamassassin.te | 9 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 1 policy/modules/services/squid.te | 11 policy/modules/services/ssh.if | 65 +++ policy/modules/services/ssh.te | 10 policy/modules/services/telnet.te | 1 policy/modules/services/tftp.te | 2 policy/modules/services/uucp.fc | 1 policy/modules/services/uucp.if | 67 +++ policy/modules/services/uucp.te | 44 ++ policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 190 +++++++++- policy/modules/services/xserver.te | 12 policy/modules/system/authlogin.if | 74 +++ policy/modules/system/authlogin.te | 6 policy/modules/system/clock.te | 13 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 11 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 19 - policy/modules/system/init.if | 23 + policy/modules/system/init.te | 44 ++ policy/modules/system/ipsec.fc | 5 policy/modules/system/ipsec.if | 80 ++++ policy/modules/system/ipsec.te | 107 +++++ policy/modules/system/iptables.te | 16 policy/modules/system/libraries.fc | 37 + policy/modules/system/libraries.te | 11 policy/modules/system/locallogin.if | 37 + policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 14 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.if | 21 + policy/modules/system/lvm.te | 73 +++ policy/modules/system/miscfiles.fc | 3 policy/modules/system/miscfiles.if | 79 ++++ policy/modules/system/modutils.te | 25 + policy/modules/system/mount.te | 27 - policy/modules/system/pcmcia.te | 5 policy/modules/system/raid.te | 13 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 119 ++++++ policy/modules/system/selinuxutil.te | 118 ++---- policy/modules/system/sysnetwork.te | 10 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 23 + policy/modules/system/tzdata.te | 51 ++ policy/modules/system/unconfined.fc | 4 policy/modules/system/unconfined.if | 19 + policy/modules/system/unconfined.te | 23 + policy/modules/system/userdomain.if | 569 ++++++++++++++++++++++++++---- policy/modules/system/userdomain.te | 63 +-- policy/modules/system/xen.fc | 1 policy/modules/system/xen.te | 35 + 204 files changed, 4475 insertions(+), 576 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 policy-20061106.patch Index: policy-20061106.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/policy-20061106.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- policy-20061106.patch 15 Jan 2007 16:06:37 -0000 1.11 +++ policy-20061106.patch 25 Jan 2007 21:02:17 -0000 1.12 @@ -1,27 +1,27 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict/seusers serefpolicy-2.4.6/config/appconfig-strict/seusers --- nsaserefpolicy/config/appconfig-strict/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/config/appconfig-strict/seusers 2007-01-16 11:11:26.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u root:root __default__:user_u diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/seusers serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers --- nsaserefpolicy/config/appconfig-strict-mcs/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/config/appconfig-strict-mcs/seusers 2007-01-16 11:11:26.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mcs_systemhigh root:root:s0-mcs_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/seusers serefpolicy-2.4.6/config/appconfig-strict-mls/seusers --- nsaserefpolicy/config/appconfig-strict-mls/seusers 2006-11-29 12:04:52.000000000 -0500 -+++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/config/appconfig-strict-mls/seusers 2007-01-16 11:11:26.000000000 -0500 @@ -1,2 +1,3 @@ +system_u:system_u:s0-mls_systemhigh root:root:s0-mls_systemhigh __default__:user_u:s0 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/flask/access_vectors serefpolicy-2.4.6/policy/flask/access_vectors --- nsaserefpolicy/policy/flask/access_vectors 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/flask/access_vectors 2007-01-16 11:11:26.000000000 -0500 @@ -619,6 +619,8 @@ send recv @@ -33,7 +33,7 @@ class key diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.4.6/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/global_tunables 2007-01-08 15:32:24.000000000 -0500 ++++ serefpolicy-2.4.6/policy/global_tunables 2007-01-22 20:15:51.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -80,7 +80,7 @@ ## Allow mount to mount any file ##

        ##         -@@ -596,8 +619,41 @@ +@@ -596,8 +619,49 @@ ## ##

        @@ -116,16 +116,24 @@ +ifdef(`mls_policy',` +## +##

        -+## Allow netlabel packets to work on system ++## Allow all domains to use netlabel labeled packets +##

        +##         +gen_tunable(allow_netlabel,true) ++ ++## ++##

        ++## Allow all domains to use ipsec labeled packets ++##

        ++##         ++gen_tunable(allow_ipsec_label,true) ') + + ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.4.6/policy/mls --- nsaserefpolicy/policy/mls 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/mls 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/mls 2007-01-16 11:11:26.000000000 -0500 @@ -89,12 +89,14 @@ mlsconstrain { file lnk_file fifo_file dir chr_file blk_file sock_file } { write create setattr relabelfrom append unlink link rename mounton } (( l1 eq l2 ) or @@ -199,7 +207,7 @@ mlsconstrain association { polmatch } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/acct.te serefpolicy-2.4.6/policy/modules/admin/acct.te --- nsaserefpolicy/policy/modules/admin/acct.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/acct.te 2007-01-16 11:11:26.000000000 -0500 @@ -9,6 +9,7 @@ type acct_t; type acct_exec_t; @@ -210,7 +218,7 @@ logging_log_file(acct_data_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.if serefpolicy-2.4.6/policy/modules/admin/amanda.if --- nsaserefpolicy/policy/modules/admin/amanda.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.if 2007-01-16 11:11:26.000000000 -0500 @@ -127,4 +127,21 @@ allow $1 amanda_log_t:file ra_file_perms; ') @@ -235,7 +243,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.4.6/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-01-15 09:29:39.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/amanda.te 2007-01-16 11:11:26.000000000 -0500 @@ -75,6 +75,7 @@ allow amanda_t self:unix_dgram_socket create_socket_perms; allow amanda_t self:tcp_socket create_stream_socket_perms; @@ -255,7 +263,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/backup.te serefpolicy-2.4.6/policy/modules/admin/backup.te --- nsaserefpolicy/policy/modules/admin/backup.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-01-15 09:34:00.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/backup.te 2007-01-16 11:11:26.000000000 -0500 @@ -82,3 +82,8 @@ optional_policy(` nis_use_ypbind(backup_t) @@ -267,7 +275,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.fc serefpolicy-2.4.6/policy/modules/admin/bootloader.fc --- nsaserefpolicy/policy/modules/admin/bootloader.fc 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.fc 2007-01-16 11:11:26.000000000 -0500 @@ -2,11 +2,6 @@ /etc/lilo\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) /etc/yaboot\.conf.* -- gen_context(system_u:object_r:bootloader_etc_t,s0) @@ -282,7 +290,7 @@ /sbin/ybin.* -- gen_context(system_u:object_r:bootloader_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.4.6/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-01-15 09:34:41.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/bootloader.te 2007-01-16 11:11:26.000000000 -0500 @@ -93,6 +93,8 @@ fs_manage_dos_files(bootloader_t) @@ -317,7 +325,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.4.6/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-01-10 15:39:52.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/consoletype.te 2007-01-16 11:11:26.000000000 -0500 @@ -8,7 +8,12 @@ type consoletype_t; @@ -373,7 +381,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/ddcprobe.te serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te --- nsaserefpolicy/policy/modules/admin/ddcprobe.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-01-15 09:41:31.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/ddcprobe.te 2007-01-16 11:11:26.000000000 -0500 @@ -53,3 +53,13 @@ #reh why? this does not seem even necessary to function properly @@ -390,7 +398,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmesg.te serefpolicy-2.4.6/policy/modules/admin/dmesg.te --- nsaserefpolicy/policy/modules/admin/dmesg.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-01-15 11:02:21.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/dmesg.te 2007-01-16 11:11:26.000000000 -0500 @@ -10,6 +10,7 @@ type dmesg_t; type dmesg_exec_t; @@ -412,7 +420,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.4.6/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te 2007-01-15 09:41:55.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/dmidecode.te 2007-01-16 11:11:26.000000000 -0500 @@ -38,3 +38,8 @@ term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) @@ -424,7 +432,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/firstboot.if serefpolicy-2.4.6/policy/modules/admin/firstboot.if --- nsaserefpolicy/policy/modules/admin/firstboot.if 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/firstboot.if 2007-01-16 11:11:26.000000000 -0500 @@ -96,7 +96,7 @@ ######################################## @@ -449,7 +457,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.4.6/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-11-29 12:04:49.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/kudzu.te 2007-01-15 09:47:24.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/kudzu.te 2007-01-16 11:11:26.000000000 -0500 @@ -167,3 +167,8 @@ ') allow kudzu_t cupsd_rw_etc_t:dir r_dir_perms; @@ -461,7 +469,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.4.6/policy/modules/admin/logrotate.te --- nsaserefpolicy/policy/modules/admin/logrotate.te 2006-11-29 12:04:48.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/admin/logrotate.te 2007-01-15 09:46:15.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/admin/logrotate.te 2007-01-16 11:11:26.000000000 -0500 @@ -210,3 +210,8 @@ [...2606 lines suppressed...] init_use_fds(restorecond_t) init_dontaudit_use_script_ptys(restorecond_t) -@@ -549,82 +568,11 @@ +@@ -549,82 +574,11 @@ ######################################## # @@ -7953,7 +8470,7 @@ ######################################## # -@@ -672,6 +620,7 @@ +@@ -672,6 +626,7 @@ init_use_fds(setfiles_t) init_use_script_fds(setfiles_t) init_use_script_ptys(setfiles_t) @@ -7961,7 +8478,7 @@ domain_use_interactive_fds(setfiles_t) -@@ -691,3 +640,16 @@ +@@ -691,3 +646,16 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory userdom_read_all_users_home_content_files(setfiles_t) @@ -7980,7 +8497,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.4.6/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-01-15 09:54:44.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/sysnetwork.te 2007-01-16 11:11:26.000000000 -0500 @@ -333,6 +333,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) @@ -8004,14 +8521,14 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.fc serefpolicy-2.4.6/policy/modules/system/tzdata.fc --- nsaserefpolicy/policy/modules/system/tzdata.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.fc 2007-01-16 11:11:26.000000000 -0500 @@ -0,0 +1,3 @@ +# tzdata executable will have: + +/usr/sbin/tzdata-update -- gen_context(system_u:object_r:tzdata_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.if serefpolicy-2.4.6/policy/modules/system/tzdata.if --- nsaserefpolicy/policy/modules/system/tzdata.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.if 2007-01-16 11:11:26.000000000 -0500 @@ -0,0 +1,23 @@ +## policy for tzdata + @@ -8038,8 +8555,8 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/tzdata.te serefpolicy-2.4.6/policy/modules/system/tzdata.te --- nsaserefpolicy/policy/modules/system/tzdata.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-01-15 09:31:50.000000000 -0500 -@@ -0,0 +1,43 @@ ++++ serefpolicy-2.4.6/policy/modules/system/tzdata.te 2007-01-25 08:08:47.000000000 -0500 +@@ -0,0 +1,51 @@ +policy_module(tzdata,1.0.0) + +######################################## @@ -8056,11 +8573,15 @@ +# +# tzdata local policy +# ++allow tzdata_t self:capability dac_override; + +# Some common macros (you might be able to remove some) +files_read_etc_files(tzdata_t) +libs_use_ld_so(tzdata_t) +libs_use_shared_libs(tzdata_t) ++ ++locallogin_dontaudit_use_fds(tzdata_t) ++ +miscfiles_read_localization(tzdata_t) + +files_search_spool(tzdata_t) @@ -8080,12 +8601,16 @@ +') + +optional_policy(` ++ locallogin_dontaudit_use_fds(tzdata_t) ++') ++ ++optional_policy(` + ssh_sigchld(tzdata_t) + ssh_rw_stream_sockets(tzdata_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.4.6/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.fc 2007-01-16 11:11:26.000000000 -0500 @@ -7,6 +7,8 @@ ifdef(`targeted_policy',` /usr/lib/openoffice\.org.*/program/.+\.bin -- gen_context(system_u:object_r:unconfined_execmem_exec_t,s0) @@ -8098,7 +8623,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.4.6/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-01-15 10:46:48.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.if 2007-01-16 11:11:26.000000000 -0500 @@ -31,6 +31,7 @@ allow $1 self:nscd *; allow $1 self:dbus *; @@ -8134,8 +8659,19 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.4.6/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-01-05 15:23:37.000000000 -0500 -@@ -83,6 +83,9 @@ ++++ serefpolicy-2.4.6/policy/modules/system/unconfined.te 2007-01-23 15:59:13.000000000 -0500 +@@ -48,6 +48,10 @@ + userdom_priveleged_home_dir_manager(unconfined_t) + + optional_policy(` ++ lvm_domtrans(unconfined_t) ++ ') ++ ++ optional_policy(` + ada_domtrans(unconfined_t) + ') + +@@ -83,6 +87,9 @@ optional_policy(` networkmanager_dbus_chat(unconfined_t) ') @@ -8145,7 +8681,7 @@ ') optional_policy(` -@@ -138,6 +141,8 @@ +@@ -138,6 +145,8 @@ optional_policy(` rpm_domtrans(unconfined_t) @@ -8154,7 +8690,7 @@ ') optional_policy(` -@@ -173,6 +178,12 @@ +@@ -173,6 +182,12 @@ optional_policy(` xserver_domtrans_xdm_xserver(unconfined_t) ') @@ -8167,7 +8703,7 @@ ') ######################################## -@@ -181,10 +192,18 @@ +@@ -181,10 +196,18 @@ # ifdef(`targeted_policy',` @@ -8188,7 +8724,7 @@ init_dbus_chat_script(unconfined_execmem_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.4.6/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-01-11 16:28:29.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.if 2007-01-17 10:29:18.000000000 -0500 @@ -22,9 +22,9 @@ ## # @@ -9023,7 +9559,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.4.6/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-01-15 10:53:20.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/userdomain.te 2007-01-22 19:58:27.000000000 -0500 @@ -24,6 +24,9 @@ # users home directory contents attribute home_type; @@ -9153,7 +9689,7 @@ usermanage_run_useradd(sysadm_t,sysadm_r,admin_terminal) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.fc serefpolicy-2.4.6/policy/modules/system/xen.fc --- nsaserefpolicy/policy/modules/system/xen.fc 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/xen.fc 2007-01-16 11:11:26.000000000 -0500 @@ -8,6 +8,7 @@ /usr/sbin/xm -- gen_context(system_u:object_r:xm_exec_t,s0) @@ -9164,7 +9700,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xen.te serefpolicy-2.4.6/policy/modules/system/xen.te --- nsaserefpolicy/policy/modules/system/xen.te 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/policy/modules/system/xen.te 2007-01-16 11:11:26.000000000 -0500 @@ -86,8 +86,8 @@ allow xend_t self:tcp_socket create_stream_socket_perms; allow xend_t self:packet_socket create_socket_perms; @@ -9256,7 +9792,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.4.6/Rules.modular --- nsaserefpolicy/Rules.modular 2006-11-29 12:04:51.000000000 -0500 -+++ serefpolicy-2.4.6/Rules.modular 2007-01-05 15:23:37.000000000 -0500 ++++ serefpolicy-2.4.6/Rules.modular 2007-01-16 11:11:26.000000000 -0500 @@ -219,6 +219,16 @@ ######################################## Index: securetty_types-mls =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/securetty_types-mls,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- securetty_types-mls 15 Jan 2007 16:06:37 -0000 1.1 +++ securetty_types-mls 25 Jan 2007 21:02:17 -0000 1.2 @@ -2,4 +2,4 @@ user_tty_device_t staff_tty_device_t auditadm_tty_device_t -secureadm_tty_device_t +secadm_tty_device_t Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-6/selinux-policy.spec,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- selinux-policy.spec 15 Jan 2007 17:00:40 -0000 1.337 +++ selinux-policy.spec 25 Jan 2007 21:02:17 -0000 1.338 @@ -12,12 +12,12 @@ %endif %define POLICYVER 21 %define libsepolver 1.12.26-1 -%define POLICYCOREUTILSVER 1.33.6-3 +%define POLICYCOREUTILSVER 1.33.12-1 %define CHECKPOLICYVER 1.30.11-1 Summary: SELinux policy configuration Name: selinux-policy Version: 2.4.6 -Release: 27%{?dist} +Release: 31%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -356,6 +356,31 @@ %endif %changelog +* Wed Jan 24 2007 Dan Walsh 2.4.6-31 +- Fix clvmd policy +- Fix squid cgi script to run with correct context. +- Maintain proper context on /etc/lvm/.cache file +- Lots of fixes for ricci and friends +- mount.nfs needs sys_resource +- Change gstreamer context for only i386 +- Fix libXcomp file_context +Resolves: #224441 + +* Tue Jan 23 2007 Dan Walsh 2.4.6-30 +- Fixes for ricci_modservice +Resolves: #217519 + +* Mon Jan 22 2007 Dan Walsh 2.4.6-29 +- remove swapfile avc +- Fix rpcsvcgssd +Resolves: #217519 + +* Wed Jan 17 2007 Dan Walsh 2.4.6-28 +- Allow logwatch to use ypbind +- Allow system_crond_t to create cron_var_run_t files (prelink files) +- dontaudit postfix-smtp reading /boot, fix file context on lmtp +Resolves: #215722 + * Mon Jan 15 2007 Dan Walsh 2.4.6-27 - Fix senmail avc trying to read /root - More fixes for ssh transitions to userspace From fedora-cvs-commits at redhat.com Thu Jan 25 21:55:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 16:55:57 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.45, 1.46 pykickstart.spec, 1.49, 1.50 sources, 1.49, 1.50 Message-ID: <200701252155.l0PLtvBu031839@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31822 Modified Files: .cvsignore pykickstart.spec sources Log Message: New version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 19 Jan 2007 21:30:26 -0000 1.45 +++ .cvsignore 25 Jan 2007 21:55:55 -0000 1.46 @@ -7,3 +7,4 @@ pykickstart-0.90.tar.gz pykickstart-0.91.tar.gz pykickstart-0.92.tar.gz +pykickstart-0.93.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- pykickstart.spec 19 Jan 2007 21:30:26 -0000 1.49 +++ pykickstart.spec 25 Jan 2007 21:55:55 -0000 1.50 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.92 +Version: 0.93 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -38,6 +38,11 @@ /usr/share/locale/*/*/* %changelog +* Thu Jan 25 2007 Chris Lumens - 0.93-1 +- Add support for FC3, RHEL4, and RHEL5. +- The key command was not supported until after FC6. +- Accept more strings in stringToVersion. + * Fri Jan 19 2007 Chris Lumens - 0.92-1 - Fix KickstartVersionError reporting. - Add a version attribute to handler objects. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 19 Jan 2007 21:30:26 -0000 1.49 +++ sources 25 Jan 2007 21:55:55 -0000 1.50 @@ -1 +1 @@ -610eb46319a222804e978fbd9b9440f2 pykickstart-0.92.tar.gz +7d94829a67df8189cff6935b5957a538 pykickstart-0.93.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 25 22:48:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 17:48:03 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.70, 1.71 libsemanage-rhat.patch, 1.18, 1.19 libsemanage.spec, 1.115, 1.116 sources, 1.72, 1.73 Message-ID: <200701252248.l0PMm37p022950@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22320 Modified Files: .cvsignore libsemanage-rhat.patch libsemanage.spec sources Log Message: * Fri Dec 22 2006 Dan Walsh - 1.9.2-1 - Upgrade to latest from NSA * Merged patch to optionally reduce disk usage by removing the backup module store and linked policy from Karl MacMillan * Merged patch to correctly propagate return values in libsemanage Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- .cvsignore 9 Jan 2007 15:22:05 -0000 1.70 +++ .cvsignore 25 Jan 2007 22:48:00 -0000 1.71 @@ -76,3 +76,4 @@ libsemanage-1.8.tgz libsemanage-1.9.1.tgz libsemanage-1.9.2.tgz +libsemanage-1.10.0.tgz libsemanage-rhat.patch: semanageswig_python.i | 50 +++++++++--------- semanageswig_wrap.c | 138 +++++++++++++++++++++++++------------------------- 2 files changed, 94 insertions(+), 94 deletions(-) Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libsemanage-rhat.patch 22 Dec 2006 16:50:50 -0000 1.18 +++ libsemanage-rhat.patch 25 Jan 2007 22:48:00 -0000 1.19 @@ -1,70 +1,852 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-1.9.1/src/direct_api.c ---- nsalibsemanage/src/direct_api.c 2006-11-16 17:14:02.000000000 -0500 -+++ libsemanage-1.9.1/src/direct_api.c 2006-12-22 11:36:55.000000000 -0500 -@@ -603,7 +603,8 @@ - - /* Create new policy object, then attach to policy databases - * that work with a policydb */ -- if (semanage_expand_sandbox(sh, base, &out) < 0) -+ retval = semanage_expand_sandbox(sh, base, &out); -+ if (retval < 0) - goto cleanup; - - dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase, -@@ -615,13 +616,16 @@ - - /* ============= Apply changes, and verify =============== */ - -- if (semanage_base_merge_components(sh) < 0) -+ retval = semanage_base_merge_components(sh); -+ if (retval < 0) - goto cleanup; -- -- if (semanage_write_policydb(sh, out) < 0) -+ -+ retval = semanage_write_policydb(sh, out); -+ if (retval < 0) - goto cleanup; -- -- if (semanage_verify_kernel(sh) != 0) -+ -+ retval = semanage_verify_kernel(sh); -+ if (retval < 0) - goto cleanup; - } - -@@ -635,26 +639,30 @@ - * merged into the main file_contexts. We won't check the - * large file_contexts - checked at compile time */ - if (sh->do_rebuild || modified || fcontexts_modified) { -- if (semanage_fcontext_validate_local(sh, out) < 0) -+ retval = semanage_fcontext_validate_local(sh, out); -+ if (retval < 0) - goto cleanup; - } - - /* Validate local seusers against policy */ - if (sh->do_rebuild || modified || seusers_modified) { -- if (semanage_seuser_validate_local(sh, out) < 0) -+ retval = semanage_seuser_validate_local(sh, out); -+ if (retval < 0) - goto cleanup; - } - - /* Validate local ports for overlap */ - if (sh->do_rebuild || ports_modified) { -- if (semanage_port_validate_local(sh) < 0) -+ retval = semanage_port_validate_local(sh); -+ if (retval < 0) - goto cleanup; - } - - /* ================== Write non-policydb components ========= */ - - /* Commit changes to components */ -- if (semanage_commit_components(sh) < 0) -+ retval = semanage_commit_components(sh); -+ if (retval < 0) - goto cleanup; +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanageswig_python.i libsemanage-1.10.0/src/semanageswig_python.i +--- nsalibsemanage/src/semanageswig_python.i 2006-11-16 17:14:02.000000000 -0500 ++++ libsemanage-1.10.0/src/semanageswig_python.i 2007-01-24 13:33:28.000000000 -0500 +@@ -99,7 +99,7 @@ + %apply int *OUTPUT { size_t * }; + %apply int *OUTPUT { unsigned int * }; - retval = semanage_install_sandbox(sh); +-%typemap(in, numinputs=0) char **(char *temp) { ++%typemap(in, numinputs=0) char **(char *temp=NULL) { + $1 = &temp; + } + +@@ -108,7 +108,7 @@ + free(*$1); + } + +-%typemap(in, numinputs=0) char ***(char **temp) { ++%typemap(in, numinputs=0) char ***(char **temp=NULL) { + $1 = &temp; + } + +@@ -136,7 +136,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_module_info_t ** parameter */ +-%typemap(in, numinputs=0) semanage_module_info_t **(semanage_module_info_t *temp) { ++%typemap(in, numinputs=0) semanage_module_info_t **(semanage_module_info_t *temp=NULL) { + $1 = &temp; + } + +@@ -148,7 +148,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_context_t ** parameter */ +-%typemap(in, numinputs=0) semanage_context_t **(semanage_context_t *temp) { ++%typemap(in, numinputs=0) semanage_context_t **(semanage_context_t *temp=NULL) { + $1 = &temp; + } + +@@ -160,7 +160,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_bool_t *** parameter */ +-%typemap(in, numinputs=0) semanage_bool_t ***(semanage_bool_t **temp) { ++%typemap(in, numinputs=0) semanage_bool_t ***(semanage_bool_t **temp=NULL) { + $1 = &temp; + } + +@@ -183,7 +183,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_bool_t **(semanage_bool_t *temp) { ++%typemap(in, numinputs=0) semanage_bool_t **(semanage_bool_t *temp=NULL) { + $1 = &temp; + } + +@@ -195,7 +195,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_bool_key_t **(semanage_bool_key_t *temp) { ++%typemap(in, numinputs=0) semanage_bool_key_t **(semanage_bool_key_t *temp=NULL) { + $1 = &temp; + } + +@@ -203,7 +203,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_fcontext_t *** parameter */ +-%typemap(in, numinputs=0) semanage_fcontext_t ***(semanage_fcontext_t **temp) { ++%typemap(in, numinputs=0) semanage_fcontext_t ***(semanage_fcontext_t **temp=NULL) { + $1 = &temp; + } + +@@ -226,7 +226,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_fcontext_t **(semanage_fcontext_t *temp) { ++%typemap(in, numinputs=0) semanage_fcontext_t **(semanage_fcontext_t *temp=NULL) { + $1 = &temp; + } + +@@ -238,7 +238,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_fcontext_key_t **(semanage_fcontext_key_t *temp) { ++%typemap(in, numinputs=0) semanage_fcontext_key_t **(semanage_fcontext_key_t *temp=NULL) { + $1 = &temp; + } + +@@ -246,7 +246,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_iface_t *** parameter */ +-%typemap(in, numinputs=0) semanage_iface_t ***(semanage_iface_t **temp) { ++%typemap(in, numinputs=0) semanage_iface_t ***(semanage_iface_t **temp=NULL) { + $1 = &temp; + } + +@@ -270,7 +270,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_iface_t **(semanage_iface_t *temp) { ++%typemap(in, numinputs=0) semanage_iface_t **(semanage_iface_t *temp=NULL) { + $1 = &temp; + } + +@@ -282,7 +282,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_iface_key_t **(semanage_iface_key_t *temp) { ++%typemap(in, numinputs=0) semanage_iface_key_t **(semanage_iface_key_t *temp=NULL) { + $1 = &temp; + } + +@@ -290,7 +290,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_seuser_t *** parameter */ +-%typemap(in, numinputs=0) semanage_seuser_t ***(semanage_seuser_t **temp) { ++%typemap(in, numinputs=0) semanage_seuser_t ***(semanage_seuser_t **temp=NULL) { + $1 = &temp; + } + +@@ -314,7 +314,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_seuser_t **(semanage_seuser_t *temp) { ++%typemap(in, numinputs=0) semanage_seuser_t **(semanage_seuser_t *temp=NULL) { + $1 = &temp; + } + +@@ -326,7 +326,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_seuser_key_t **(semanage_seuser_key_t *temp) { ++%typemap(in, numinputs=0) semanage_seuser_key_t **(semanage_seuser_key_t *temp=NULL) { + $1 = &temp; + } + +@@ -334,7 +334,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_user_t *** parameter */ +-%typemap(in, numinputs=0) semanage_user_t ***(semanage_user_t **temp) { ++%typemap(in, numinputs=0) semanage_user_t ***(semanage_user_t **temp=NULL) { + $1 = &temp; + } + +@@ -357,7 +357,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_user_t **(semanage_user_t *temp) { ++%typemap(in, numinputs=0) semanage_user_t **(semanage_user_t *temp=NULL) { + $1 = &temp; + } + +@@ -369,7 +369,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_user_key_t **(semanage_user_key_t *temp) { ++%typemap(in, numinputs=0) semanage_user_key_t **(semanage_user_key_t *temp=NULL) { + $1 = &temp; + } + +@@ -377,7 +377,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_port_t *** parameter */ +-%typemap(in, numinputs=0) semanage_port_t ***(semanage_port_t **temp) { ++%typemap(in, numinputs=0) semanage_port_t ***(semanage_port_t **temp=NULL) { + $1 = &temp; + } + +@@ -400,7 +400,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_port_t **(semanage_port_t *temp) { ++%typemap(in, numinputs=0) semanage_port_t **(semanage_port_t *temp=NULL) { + $1 = &temp; + } + +@@ -412,7 +412,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_port_key_t **(semanage_port_key_t *temp) { ++%typemap(in, numinputs=0) semanage_port_key_t **(semanage_port_key_t *temp=NULL) { + $1 = &temp; + } + +@@ -420,7 +420,7 @@ + + /* the wrapper will setup this parameter for passing... the resulting python functions + will not take the semanage_node_t *** parameter */ +-%typemap(in, numinputs=0) semanage_node_t ***(semanage_node_t **temp) { ++%typemap(in, numinputs=0) semanage_node_t ***(semanage_node_t **temp=NULL) { + $1 = &temp; + } + +@@ -443,7 +443,7 @@ + } + } + +-%typemap(in, numinputs=0) semanage_node_t **(semanage_node_t *temp) { ++%typemap(in, numinputs=0) semanage_node_t **(semanage_node_t *temp=NULL) { + $1 = &temp; + } + +@@ -456,7 +456,7 @@ + $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj(*$1, $*1_descriptor, 0)); + } + +-%typemap(in, numinputs=0) semanage_node_key_t **(semanage_node_key_t *temp) { ++%typemap(in, numinputs=0) semanage_node_key_t **(semanage_node_key_t *temp=NULL) { + $1 = &temp; + } + +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanageswig_wrap.c libsemanage-1.10.0/src/semanageswig_wrap.c +--- nsalibsemanage/src/semanageswig_wrap.c 2006-11-16 17:14:02.000000000 -0500 ++++ libsemanage-1.10.0/src/semanageswig_wrap.c 2007-01-24 13:34:03.000000000 -0500 +@@ -3528,7 +3528,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_module_info_t *temp2 ; ++ semanage_module_info_t *temp2 = NULL ; + int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -3923,7 +3923,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_context_t *temp2 ; ++ semanage_context_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -3956,7 +3956,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_context_t *temp3 ; ++ semanage_context_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4017,7 +4017,7 @@ + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; +- semanage_context_t *temp3 ; ++ semanage_context_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4058,7 +4058,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char *temp3 ; ++ char *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4099,7 +4099,7 @@ + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; +- semanage_bool_key_t *temp3 ; ++ semanage_bool_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4140,7 +4140,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_bool_key_t *temp3 ; ++ semanage_bool_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4376,7 +4376,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_bool_t *temp2 ; ++ semanage_bool_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -4409,7 +4409,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_bool_t *temp3 ; ++ semanage_bool_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4469,7 +4469,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_bool_t *temp3 ; ++ semanage_bool_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4616,7 +4616,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_bool_t **temp2 ; ++ semanage_bool_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -4734,7 +4734,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_bool_t *temp3 ; ++ semanage_bool_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -4881,7 +4881,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_bool_t **temp2 ; ++ semanage_bool_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -4968,7 +4968,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_bool_t *temp3 ; ++ semanage_bool_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -5115,7 +5115,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_bool_t **temp2 ; ++ semanage_bool_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -5225,7 +5225,7 @@ + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; +- semanage_iface_key_t *temp3 ; ++ semanage_iface_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -5266,7 +5266,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_iface_key_t *temp3 ; ++ semanage_iface_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -5512,7 +5512,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_iface_t *temp2 ; ++ semanage_iface_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -5545,7 +5545,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_iface_t *temp3 ; ++ semanage_iface_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -5676,7 +5676,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_iface_t *temp3 ; ++ semanage_iface_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -5823,7 +5823,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_iface_t **temp2 ; ++ semanage_iface_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -5870,7 +5870,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_iface_t *temp3 ; ++ semanage_iface_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -6017,7 +6017,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_iface_t **temp2 ; ++ semanage_iface_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -6065,7 +6065,7 @@ + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; +- semanage_user_key_t *temp3 ; ++ semanage_user_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -6106,7 +6106,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_user_key_t *temp3 ; ++ semanage_user_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -6621,7 +6621,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char **temp3 ; ++ char **temp3 = NULL ; + unsigned int temp4 ; + int res4 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -6675,7 +6675,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char *temp3 ; ++ char *temp3 = NULL ; + unsigned int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; +@@ -6720,7 +6720,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_user_t *temp2 ; ++ semanage_user_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -6753,7 +6753,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_user_t *temp3 ; ++ semanage_user_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -6884,7 +6884,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_user_t *temp3 ; ++ semanage_user_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -7031,7 +7031,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_user_t **temp2 ; ++ semanage_user_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -7078,7 +7078,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_user_t *temp3 ; ++ semanage_user_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -7225,7 +7225,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_user_t **temp2 ; ++ semanage_user_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -7340,7 +7340,7 @@ + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; +- semanage_port_key_t *temp5 ; ++ semanage_port_key_t *temp5 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; +@@ -7391,7 +7391,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_port_key_t *temp3 ; ++ semanage_port_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -7697,7 +7697,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_port_t *temp2 ; ++ semanage_port_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -7730,7 +7730,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_port_t *temp3 ; ++ semanage_port_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -7861,7 +7861,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_port_t *temp3 ; ++ semanage_port_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -8008,7 +8008,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_port_t **temp2 ; ++ semanage_port_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -8055,7 +8055,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_port_t *temp3 ; ++ semanage_port_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -8202,7 +8202,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_port_t **temp2 ; ++ semanage_port_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -8315,7 +8315,7 @@ + int alloc2 = 0 ; + int val3 ; + int ecode3 = 0 ; +- semanage_fcontext_key_t *temp4 ; ++ semanage_fcontext_key_t *temp4 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; +@@ -8362,7 +8362,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_fcontext_key_t *temp3 ; ++ semanage_fcontext_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -8620,7 +8620,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_fcontext_t *temp2 ; ++ semanage_fcontext_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -8653,7 +8653,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_fcontext_t *temp3 ; ++ semanage_fcontext_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -8784,7 +8784,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_fcontext_t *temp3 ; ++ semanage_fcontext_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -8931,7 +8931,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_fcontext_t **temp2 ; ++ semanage_fcontext_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -8978,7 +8978,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_fcontext_t *temp3 ; ++ semanage_fcontext_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -9125,7 +9125,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_fcontext_t **temp2 ; ++ semanage_fcontext_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -9173,7 +9173,7 @@ + int res2 ; + char *buf2 = 0 ; + int alloc2 = 0 ; +- semanage_seuser_key_t *temp3 ; ++ semanage_seuser_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -9214,7 +9214,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_seuser_key_t *temp3 ; ++ semanage_seuser_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -9528,7 +9528,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_seuser_t *temp2 ; ++ semanage_seuser_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -9561,7 +9561,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_seuser_t *temp3 ; ++ semanage_seuser_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -9692,7 +9692,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_seuser_t *temp3 ; ++ semanage_seuser_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -9839,7 +9839,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_seuser_t **temp2 ; ++ semanage_seuser_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -9886,7 +9886,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_seuser_t *temp3 ; ++ semanage_seuser_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -10033,7 +10033,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_seuser_t **temp2 ; ++ semanage_seuser_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -10150,7 +10150,7 @@ + int alloc3 = 0 ; + int val4 ; + int ecode4 = 0 ; +- semanage_node_key_t *temp5 ; ++ semanage_node_key_t *temp5 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; +@@ -10205,7 +10205,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_node_key_t *temp3 ; ++ semanage_node_key_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -10265,7 +10265,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char *temp3 ; ++ char *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -10306,7 +10306,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char *temp3 ; ++ char *temp3 = NULL ; + size_t temp4 ; + int res4 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -10459,7 +10459,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char *temp3 ; ++ char *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -10500,7 +10500,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- char *temp3 ; ++ char *temp3 = NULL ; + size_t temp4 ; + int res4 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -10786,7 +10786,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_node_t *temp2 ; ++ semanage_node_t *temp2 = NULL ; + PyObject * obj0 = 0 ; + + { +@@ -10819,7 +10819,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_node_t *temp3 ; ++ semanage_node_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -10950,7 +10950,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_node_t *temp3 ; ++ semanage_node_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -11097,7 +11097,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_node_t **temp2 ; ++ semanage_node_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; +@@ -11144,7 +11144,7 @@ + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; +- semanage_node_t *temp3 ; ++ semanage_node_t *temp3 = NULL ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + +@@ -11291,7 +11291,7 @@ + int result; + void *argp1 = 0 ; + int res1 = 0 ; +- semanage_node_t **temp2 ; ++ semanage_node_t **temp2 = NULL ; + unsigned int temp3 ; + int res3 = SWIG_TMPOBJ ; + PyObject * obj0 = 0 ; Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- libsemanage.spec 9 Jan 2007 15:22:05 -0000 1.115 +++ libsemanage.spec 25 Jan 2007 22:48:00 -0000 1.116 @@ -1,12 +1,13 @@ -%define libsepolver 1.14-1 -%define libselinuxver 1.32-1 +%define libsepolver 1.16.0-1 +%define libselinuxver 1.34-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.9.2 -Release: 1%{?dist} +Version: 1.10.0 +Release: 2%{?dist} 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} swig Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sources 9 Jan 2007 15:22:05 -0000 1.72 +++ sources 25 Jan 2007 22:48:00 -0000 1.73 @@ -1 +1 @@ -c5bf4a31d5b39958587cec079c93cfee libsemanage-1.9.2.tgz +10c452bcc81cba31f63270ffbec1835f libsemanage-1.10.0.tgz From fedora-cvs-commits at redhat.com Fri Jan 26 01:03:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 25 Jan 2007 20:03:14 -0500 Subject: rpms/python-virtinst/devel virtinst-compat.patch, NONE, 1.1 python-virtinst.spec, 1.10, 1.11 Message-ID: <200701260103.l0Q13EvN021437@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/python-virtinst/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21403 Modified Files: python-virtinst.spec Added Files: virtinst-compat.patch Log Message: Added back-compat classes to avoid API issues virtinst-compat.patch: FullVirtGuest.py | 2 +- Guest.py | 29 ++++++++++++++++++++++++++--- ParaVirtGuest.py | 2 +- __init__.py | 2 +- 4 files changed, 29 insertions(+), 6 deletions(-) --- NEW FILE virtinst-compat.patch --- changeset: 82:605f0a3329d5 tag: tip user: "Daniel P. Berrange " date: Thu Jan 25 20:01:39 2007 -0500 summary: Add back in back-compat classes to avoid API break diff -r 2c7176fccb80 -r 605f0a3329d5 virtinst/FullVirtGuest.py --- a/virtinst/FullVirtGuest.py Mon Jan 22 17:42:02 2007 -0500 +++ b/virtinst/FullVirtGuest.py Thu Jan 25 20:01:39 2007 -0500 @@ -21,7 +21,7 @@ import util import util -class FullVirtGuest(Guest.Guest): +class FullVirtGuest(Guest.XenGuest): def __init__(self, type=None, hypervisorURI=None, emulator=None): Guest.Guest.__init__(self, type=type, hypervisorURI=hypervisorURI) self._cdrom = None diff -r 2c7176fccb80 -r 605f0a3329d5 virtinst/Guest.py --- a/virtinst/Guest.py Mon Jan 22 17:42:02 2007 -0500 +++ b/virtinst/Guest.py Thu Jan 25 20:01:39 2007 -0500 @@ -21,7 +21,6 @@ import util import util import logging - class VirtualDisk: DRIVER_FILE = "file" @@ -129,6 +128,10 @@ class VirtualDisk: def __repr__(self): return "%s:%s" %(self.type, self.path) +# Back compat class to avoid ABI break +class XenDisk(VirtualDisk): + pass + class VirtualNetworkInterface: def __init__(self, macaddr = None, bridge = None): self.macaddr = macaddr @@ -147,6 +150,10 @@ class VirtualNetworkInterface: " \n") % \ { "bridge": self.bridge, "mac": self.macaddr } +# Back compat class to avoid ABI break +class XenNetworkInterface(VirtualNetworkInterface): + pass + class VirtualGraphics: def __init__(self, *args): self.name = "" @@ -154,7 +161,11 @@ class VirtualGraphics: def get_xml_config(self): return "" -class VNCVirtualGraphics(VirtualGraphics): +# Back compat class to avoid ABI break +class XenGraphics(VirtualGraphics): + pass + +class VNCVirtualGraphics(XenGraphics): def __init__(self, *args): self.name = "vnc" if len(args) >= 1 and args[0]: @@ -165,12 +176,20 @@ class VNCVirtualGraphics(VirtualGraphics def get_xml_config(self): return " " % (self.port) -class SDLVirtualGraphics(VirtualGraphics): +# Back compat class to avoid ABI break +class XenVNCGraphics(VNCVirtualGraphics): + pass + +class SDLVirtualGraphics(XenGraphics): def __init__(self, *args): self.name = "sdl" def get_xml_config(self): return " " + +# Back compat class to avoid ABI break +class XenSDLGraphics(SDLVirtualGraphics): + pass class Guest(object): def __init__(self, type=None, hypervisorURI=None): @@ -428,3 +447,7 @@ class Guest(object): self.vcpus = 1 if self.name is None or self.memory is None: raise RuntimeError, "Name and memory must be specified for all guests!" + +# Back compat class to avoid ABI break +class XenGuest(Guest): + pass diff -r 2c7176fccb80 -r 605f0a3329d5 virtinst/ParaVirtGuest.py --- a/virtinst/ParaVirtGuest.py Mon Jan 22 17:42:02 2007 -0500 +++ b/virtinst/ParaVirtGuest.py Thu Jan 25 20:01:39 2007 -0500 @@ -37,7 +37,7 @@ def _copy_temp(fileobj, prefix, scratchd os.close(fd) return fn -class ParaVirtGuest(Guest.Guest): +class ParaVirtGuest(Guest.XenGuest): def __init__(self, type=None, hypervisorURI=None): Guest.Guest.__init__(self, type=type, hypervisorURI=hypervisorURI) self._location = None diff -r 2c7176fccb80 -r 605f0a3329d5 virtinst/__init__.py --- a/virtinst/__init__.py Mon Jan 22 17:42:02 2007 -0500 +++ b/virtinst/__init__.py Thu Jan 25 20:01:39 2007 -0500 @@ -1,4 +1,4 @@ import util import util -from Guest import Guest, VirtualDisk, VirtualNetworkInterface +from Guest import Guest, VirtualDisk, VirtualNetworkInterface, XenGuest, XenDisk, XenNetworkInterface from FullVirtGuest import FullVirtGuest from ParaVirtGuest import ParaVirtGuest Index: python-virtinst.spec =================================================================== RCS file: /cvs/dist/rpms/python-virtinst/devel/python-virtinst.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- python-virtinst.spec 25 Jan 2007 19:13:39 -0000 1.10 +++ python-virtinst.spec 26 Jan 2007 01:03:12 -0000 1.11 @@ -3,9 +3,10 @@ Summary: Python modules for starting Xen guest installations Name: python-virtinst Version: 0.100.0 -Release: 2%{?dist} +Release: 3%{?dist} Source0: virtinst-%{version}.tar.gz Patch1: virtinst-nfs-mount.patch +Patch2: virtinst-compat.patch License: GPL Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,7 +31,8 @@ %prep %setup -q -n virtinst-%{version} -%patch1 -p1 +%patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -52,6 +54,9 @@ %{_sbindir}/virt-install %changelog +* Thu Jan 25 2007 Daniel P. Berrange - 0.100.0-3.fc7 +- Make back-compat with old APIs for Cobbler sanity + * Thu Jan 25 2007 Daniel P. Berrange - 0.100.0-2.fc7 - Fix errors with NFS mount based installs From fedora-cvs-commits at redhat.com Fri Jan 26 05:22:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 00:22:33 -0500 Subject: rpms/alacarte/devel alacarte.spec,1.28,1.29 Message-ID: <200701260522.l0Q5MXIx026735@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/alacarte/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25433 Modified Files: alacarte.spec Log Message: Fix provides Index: alacarte.spec =================================================================== RCS file: /cvs/dist/rpms/alacarte/devel/alacarte.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- alacarte.spec 11 Jan 2007 05:40:34 -0000 1.28 +++ alacarte.spec 26 Jan 2007 05:22:22 -0000 1.29 @@ -2,7 +2,7 @@ Name: alacarte Version: 0.11.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple menu editor for GNOME Group: Applications/System @@ -20,7 +20,7 @@ Requires: pygtk2, gnome-python2-gconf Requires: gnome-menus >= 2.15.4 Obsoletes: smeg -Provides: smeg %{version}-%{release} +Provides: smeg-%{version}-%{release} %description Alacarte is a menu editor for GNOME that lets you get things done, @@ -68,6 +68,9 @@ %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg %changelog +* Fri Jan 26 2007 Matthias Clasen - 0.11.1.1-2 +- Fix the Provides: line + * Thu Jan 11 2007 Matthias Clasen - 0.11.1.1-1 - Update to 0.11.1.1 From fedora-cvs-commits at redhat.com Fri Jan 26 06:29:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 01:29:39 -0500 Subject: rpms/desktop-printing/devel desktop-printing-0.20-dbus-close.patch, NONE, 1.1 desktop-printing.spec, 1.82, 1.83 Message-ID: <200701260629.l0Q6TdhM019131@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/desktop-printing/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19115 Modified Files: desktop-printing.spec Added Files: desktop-printing-0.20-dbus-close.patch Log Message: fix a crash on logout desktop-printing-0.20-dbus-close.patch: ec-tray-icon.c | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE desktop-printing-0.20-dbus-close.patch --- --- desktop-printing-0.20/eggcups-0.20/ec-tray-icon.c.dbus-close 2007-01-26 01:24:55.000000000 -0500 +++ desktop-printing-0.20/eggcups-0.20/ec-tray-icon.c 2007-01-26 01:25:23.000000000 -0500 @@ -249,13 +249,11 @@ rb_debug ("disposing"); if (icon->priv->system_dbus) { - dbus_connection_close (icon->priv->system_dbus); dbus_connection_unref (icon->priv->system_dbus); icon->priv->system_dbus = NULL; } if (icon->priv->session_dbus) { - dbus_connection_close (icon->priv->session_dbus); dbus_connection_unref (icon->priv->session_dbus); icon->priv->session_dbus = NULL; } Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- desktop-printing.spec 24 Jan 2007 14:33:46 -0000 1.82 +++ desktop-printing.spec 26 Jan 2007 06:29:37 -0000 1.83 @@ -6,13 +6,14 @@ Summary: Desktop print icon Name: desktop-printing Version: 0.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/File Source0: http://download.gnome.org/sources/eggcups/0.20/eggcups-%{version}.tar.bz2 Source1: gnome-default-printer.png # fixed in upstream svn Patch0: desktop-printing-0.20-category.patch +Patch1: desktop-printing-0.20-dbus-close.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: redhat-menus @@ -39,6 +40,7 @@ %prep %setup -q -c %patch0 -p1 -b .category +%patch1 -p1 -b .dbus-close %build pushd eggcups-%{version} @@ -90,6 +92,9 @@ %{_sysconfdir}/gconf/* %changelog +* Fri Jan 26 2007 Matthias Clasen 0.20-3 +- Fix a crash on logout + * Wed Jan 24 2007 Matthias Clasen 0.20-2 - Improve appearance of the default printer capplet From fedora-cvs-commits at redhat.com Fri Jan 26 08:27:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 03:27:21 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch, NONE, 1.1 openoffice.org.spec, 1.919, 1.920 Message-ID: <200701260827.l0Q8RLUM026898@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26882 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch Log Message: Resolves: rhbz#224532 openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch: binfilter/inc/bf_svx/svdobj.hxx | 2 +- inc/bf_svx/svdobj.hxx | 0 inc/svdobj.hxx | 0 sc/source/ui/inc/csvcontrol.hxx | 2 +- source/ui/inc/csvcontrol.hxx | 0 svx/inc/svdobj.hxx | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch --- Index: inc/svdobj.hxx =================================================================== RCS file: /cvs/graphics/svx/inc/svdobj.hxx,v retrieving revision 1.41 diff -u -r1.41 svdobj.hxx --- openoffice.org.orig/svx/inc/svdobj.hxx 19 Jun 2006 14:44:11 -0000 1.41 +++ openoffice.org/svx/inc/svdobj.hxx 31 Oct 2006 14:28:29 -0000 @@ -323,7 +323,7 @@ {} virtual ~SdrObjUserData(); - virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; + virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; UINT32 GetInventor() const { return nInventor; } UINT16 GetId() const { return nIdentifier; } //BFS01virtual void WriteData(SvStream& rOut); Index: inc/bf_svx/svdobj.hxx =================================================================== RCS file: /cvs/framework/binfilter/inc/bf_svx/svdobj.hxx,v retrieving revision 1.5 diff -u -r1.5 svdobj.hxx --- openoffice.org.orig/binfilter/inc/bf_svx/svdobj.hxx 9 Sep 2005 14:38:27 -0000 1.5 +++ openoffice.org/binfilter/inc/bf_svx/svdobj.hxx 1 Nov 2006 09:42:05 -0000 @@ -265,7 +265,7 @@ {} virtual ~SdrObjUserData(); - virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; + virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; UINT32 GetInventor() const { return nInventor; } UINT16 GetId() const { return nIdentifier; } virtual void WriteData(SvStream& rOut); Index: source/ui/inc/csvcontrol.hxx =================================================================== RCS file: /cvs/sc/sc/source/ui/inc/csvcontrol.hxx,v retrieving revision 1.13 diff -u -r1.13 csvcontrol.hxx --- openoffice.org.orig/sc/source/ui/inc/csvcontrol.hxx 8 Sep 2005 21:17:47 -0000 1.13 +++ openoffice.org/sc/source/ui/inc/csvcontrol.hxx 1 Nov 2006 14:51:16 -0000 @@ -444,7 +444,7 @@ protected: /** Derived classes create a new accessible object here. */ - virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; + virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; }; Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.919 retrieving revision 1.920 diff -u -r1.919 -r1.920 --- openoffice.org.spec 25 Jan 2007 13:03:49 -0000 1.919 +++ openoffice.org.spec 26 Jan 2007 08:27:19 -0000 1.920 @@ -153,6 +153,7 @@ Patch85: openoffice.org-2.1.0.ooo69010.sd.undocrash.patch Patch86: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch Patch87: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch +Patch88: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -1040,6 +1041,7 @@ %patch85 -p1 -b .ooo69010.sd.undocrash.patch %patch86 -p1 -b .ooo73481.svx.longnotint32.patch %patch87 -p1 -b .ooo73863.vcl.imcommit.patch +%patch88 -p1 -b .ooo71039.svx.purevirtual.patch tar xzf %{SOURCE1} @@ -2569,6 +2571,7 @@ - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch +- Resolves: rhbz#224532 openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch * Mon Dec 18 2006 Caolan McNamara - 1:2.0.4-5.5.10 - Resolves: rhbz#219252 add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch From fedora-cvs-commits at redhat.com Fri Jan 26 08:35:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 03:35:07 -0500 Subject: rpms/openoffice.org/devel .cvsignore, 1.119, 1.120 sources, 1.217, 1.218 Message-ID: <200701260835.l0Q8Z7VA010612@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10583 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- .cvsignore 1 Dec 2006 16:31:24 -0000 1.119 +++ .cvsignore 26 Jan 2007 08:35:05 -0000 1.120 @@ -191,3 +191,6 @@ OOE680_m4.tar.bz2 OOE680_m5.tar.bz2 OOE680_m6.tar.bz2 +OOF680_m1.tar.bz2 +OOF680_m2.tar.bz2 +OOF680_m3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- sources 23 Jan 2007 10:02:12 -0000 1.217 +++ sources 26 Jan 2007 08:35:05 -0000 1.218 @@ -7,8 +7,7 @@ d57f21d70ba34ddb20f40a4d08427722 AutoSaveRecovery.xcu cba51824724ada973394d8feecdd0213 pa-IN-179.sdf 26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz -9d65fe089ddb5793cc1815ebe96b1f8a OOE680_m6.tar.bz2 b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz -307059dba0ce1e26fe97cceca6278941 OOF680_m2.tar.bz2 +0a0b01bc70afcef9814d87ac0dc2f1f3 OOF680_m3.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 26 08:42:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 03:42:59 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch, NONE, 1.1 openoffice.org.spec, 1.1007, 1.1008 openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch, 1.1, NONE Message-ID: <200701260842.l0Q8gxVt016419@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16336 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch Removed Files: openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch Log Message: new sources openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch: build.lst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch --- --- openoffice.org.orig/javaunohelper/prj/build.lst 2007-01-22 10:09:16.000000000 +0000 +++ openoffice.org/javaunohelper/prj/build.lst 2007-01-22 10:07:13.000000000 +0000 @@ -2,9 +2,9 @@ jh javaunohelper usr1 - all jh_mkout NULL jh javaunohelper\inc nmake - all jh_inc NULL jh javaunohelper\com\sun\star\comp\helper nmake - all jh_helper jh_inc NULL -jh javaunohelper\com\sun\star\comp\juhtest nmake - all jh_juhtest jh_helper NULL +jh javaunohelper\com\sun\star\comp\juhtest nmake - all jh_juhtest jh_helper jh_libhelp NULL jh javaunohelper\com\sun\star\comp nmake - all jh_comp jh_juhtest NULL jh javaunohelper\com\sun\star\lib\uno\adapter nmake - all jh_adapter jh_libhelp jh_inc NULL jh javaunohelper\com\sun\star\lib\uno\helper nmake - all jh_libhelp jh_inc NULL jh javaunohelper\source nmake - all jh_source jh_inc NULL -jh javaunohelper\util nmake - all jh_util jh_helper jh_source jh_adapter jh_libhelp NULL +jh javaunohelper\util nmake - all jh_util jh_helper jh_source jh_adapter jh_libhelp jh_comp NULL Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1007 retrieving revision 1.1008 diff -u -r1.1007 -r1.1008 --- openoffice.org.spec 25 Jan 2007 14:52:30 -0000 1.1007 +++ openoffice.org.spec 26 Jan 2007 08:42:56 -0000 1.1008 @@ -1,5 +1,5 @@ %define oootag OOF680 -%define ooomilestone 2 +%define ooomilestone 3 %define rh_rpm_release 1 # gcc#19664# @@ -115,7 +115,7 @@ Patch48: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch Patch49: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch Patch50: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch -Patch51: openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch +Patch51: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch Patch52: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch Patch53: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch @@ -981,7 +981,7 @@ %patch48 -p1 -b .ooo73481.svx.longnotint32.patch %patch49 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch %patch50 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch -%patch51 -p1 -b .oooXXXXX.javaunohelper.parallel.patch +%patch51 -p1 -b .ooo73866.javaunohelper.parallel.patch %patch52 -p1 -b .oooXXXXX.extensions.noxaw.patch %patch53 -p1 -b .ooo73863.vcl.imcommit.patch @@ -2588,7 +2588,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Thu Jan 25 2007 Caolan McNamara - 1:2.2.0-2.1 +* Fri Jan 26 2007 Caolan McNamara - 1:2.2.0-3.1 - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch - Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch @@ -2608,7 +2608,7 @@ - drop integrated workspace.inplaceobjects.patch - drop integrated openoffice.org-2.0.4.rh213710.vba.patch - drop integrated openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch -- add openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch +- add openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch - add openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch - xt.jar no longer distributed - some new .sos --- openoffice.org-2.2.0.oooXXXXX.javaunohelper.parallel.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 09:00:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 04:00:41 -0500 Subject: rpms/openoffice.org/devel pseudoworkspace.valgrind1.patch, 1.14, 1.15 Message-ID: <200701260900.l0Q90fUs017499@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17454 Modified Files: pseudoworkspace.valgrind1.patch Log Message: upstreamed patches pseudoworkspace.valgrind1.patch: bf_sfx2/source/explorer/sfx2_nochaos.cxx | 0 binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx | 4 ++-- inc/xhatch.hxx | 0 source/core/txtnode/swfont.cxx | 0 source/dialog/dlgctrl.cxx | 0 source/dialog/numpages.cxx | 0 svx/inc/xhatch.hxx | 2 +- svx/source/dialog/dlgctrl.cxx | 4 ++-- svx/source/dialog/numpages.cxx | 1 + sw/source/core/txtnode/swfont.cxx | 2 +- 10 files changed, 7 insertions(+), 6 deletions(-) Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- pseudoworkspace.valgrind1.patch 22 Jan 2007 09:27:00 -0000 1.14 +++ pseudoworkspace.valgrind1.patch 26 Jan 2007 09:00:39 -0000 1.15 @@ -1,61 +1,3 @@ -Index: unx/gtk/gdi/salnativewidgets-gtk.cxx -=================================================================== -RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v -retrieving revision 1.34 -diff -u -r1.34 salnativewidgets-gtk.cxx ---- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 6 Oct 2006 09:59:39 -0000 1.34 -+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 15 Dec 2006 14:53:10 -0000 -@@ -247,8 +247,7 @@ - Rectangle m_pixmapRect; - GdkPixmap* m_pixmap; - -- NWPixmapCacheData() -- { m_pixmap = NULL; }; -+ NWPixmapCacheData() : m_nType(0), m_nState(0), m_pixmap(0) {} - ~NWPixmapCacheData() - { SetPixmap( NULL ); }; - void SetPixmap( GdkPixmap* pPixmap ); -Index: source/helper/ppdparser.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/ppdparser.cxx,v -retrieving revision 1.22 -diff -u -r1.22 ppdparser.cxx ---- openoffice.org.orig/psprint/source/helper/ppdparser.cxx 16 Sep 2006 12:35:02 -0000 1.22 -+++ openoffice.org/psprint/source/helper/ppdparser.cxx 15 Dec 2006 16:28:53 -0000 -@@ -1624,7 +1624,7 @@ - m_aCurrentValues.clear(); - - char* pRun = (char*)pBuffer; -- while( *pRun && nBytes ) -+ while( nBytes && *pRun ) - { - ByteString aLine( pRun ); - int nPos = aLine.Search( ':' ); -Index: source/gdi/impgraph.cxx -=================================================================== -RCS file: /cvs/gsl/vcl/source/gdi/impgraph.cxx,v -retrieving revision 1.27 -diff -u -r1.27 impgraph.cxx ---- openoffice.org.orig/vcl/source/gdi/impgraph.cxx 17 Sep 2006 12:03:05 -0000 1.27 -+++ openoffice.org/vcl/source/gdi/impgraph.cxx 4 Jan 2007 11:12:30 -0000 -@@ -1592,7 +1592,7 @@ - - if( !rIStm.GetError() ) - { -- UINT32 nMagic1, nMagic2; -+ UINT32 nMagic1(0), nMagic2(0); - ULONG nActPos = rIStm.Tell(); - - rIStm >> nMagic1 >> nMagic2; -@@ -1600,7 +1600,7 @@ - - rImpGraphic = ImpGraphic( aBmpEx ); - -- if( ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) && !rIStm.GetError() ) -+ if( !rIStm.GetError() && ( 0x5344414e == nMagic1 ) && ( 0x494d4931 == nMagic2 ) ) - { - delete rImpGraphic.mpAnimation; - rImpGraphic.mpAnimation = new Animation; Index: source/dialog/dlgctrl.cxx =================================================================== RCS file: /cvs/graphics/svx/source/dialog/dlgctrl.cxx,v From fedora-cvs-commits at redhat.com Fri Jan 26 09:21:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 04:21:47 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1008, 1.1009 openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch, 1.2, NONE Message-ID: <200701260921.l0Q9Llio021841@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21752 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch Log Message: upstreamed patches Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1008 retrieving revision 1.1009 diff -u -r1.1008 -r1.1009 --- openoffice.org.spec 26 Jan 2007 08:42:56 -0000 1.1008 +++ openoffice.org.spec 26 Jan 2007 09:21:45 -0000 1.1009 @@ -107,17 +107,16 @@ Patch40: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch Patch41: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch Patch42: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch -Patch43: openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch -Patch44: workspace.vcl71.patch -Patch45: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch -Patch46: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch -Patch47: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch -Patch48: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch -Patch49: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch -Patch50: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch -Patch51: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch -Patch52: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch -Patch53: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch +Patch43: workspace.vcl71.patch +Patch44: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch +Patch45: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch +Patch46: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch +Patch47: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch +Patch48: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch +Patch49: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch +Patch50: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch +Patch51: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch +Patch52: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch %define instdir %{_libdir}/openoffice.org @@ -973,17 +972,16 @@ %patch40 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch %patch41 -p1 -b .rh217269.officecfg.nosequencecheck.patch %patch42 -p1 -b .ooo72129.vcl.fontglyphindex.patch -%patch43 -p1 -b .ooo73485.vcl.filterzwatrender.patch -%patch44 -p1 -b .workspace.vcl71.patch -%patch45 -p1 -b .gccXXXXX.basegfx.crash.patch -%patch46 -p1 -b .ooo72349.svx.scriptrange.patch -%patch47 -p1 -b .ooo73201.sw.a11yloadcrash.patch -%patch48 -p1 -b .ooo73481.svx.longnotint32.patch -%patch49 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch -%patch50 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch -%patch51 -p1 -b .ooo73866.javaunohelper.parallel.patch -%patch52 -p1 -b .oooXXXXX.extensions.noxaw.patch -%patch53 -p1 -b .ooo73863.vcl.imcommit.patch +%patch43 -p1 -b .workspace.vcl71.patch +%patch44 -p1 -b .gccXXXXX.basegfx.crash.patch +%patch45 -p1 -b .ooo72349.svx.scriptrange.patch +%patch46 -p1 -b .ooo73201.sw.a11yloadcrash.patch +%patch47 -p1 -b .ooo73481.svx.longnotint32.patch +%patch48 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch +%patch49 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch +%patch50 -p1 -b .ooo73866.javaunohelper.parallel.patch +%patch51 -p1 -b .oooXXXXX.extensions.noxaw.patch +%patch52 -p1 -b .ooo73863.vcl.imcommit.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -2608,6 +2606,7 @@ - drop integrated workspace.inplaceobjects.patch - drop integrated openoffice.org-2.0.4.rh213710.vba.patch - drop integrated openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch +- drop integrated openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch - add openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch - add openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch - xt.jar no longer distributed --- openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 09:34:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 04:34:47 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1009, 1.1010 workspace.vcl71.patch, 1.1, NONE Message-ID: <200701260934.l0Q9Yl7T032316@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30934 Modified Files: openoffice.org.spec Removed Files: workspace.vcl71.patch Log Message: upstreamed patches Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1009 retrieving revision 1.1010 diff -u -r1.1009 -r1.1010 --- openoffice.org.spec 26 Jan 2007 09:21:45 -0000 1.1009 +++ openoffice.org.spec 26 Jan 2007 09:34:45 -0000 1.1010 @@ -107,16 +107,15 @@ Patch40: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch Patch41: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch Patch42: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch -Patch43: workspace.vcl71.patch -Patch44: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch -Patch45: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch -Patch46: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch -Patch47: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch -Patch48: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch -Patch49: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch -Patch50: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch -Patch51: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch -Patch52: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch +Patch43: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch +Patch44: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch +Patch45: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch +Patch46: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch +Patch47: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch +Patch48: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch +Patch49: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch +Patch50: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch +Patch51: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch %define instdir %{_libdir}/openoffice.org @@ -972,16 +971,15 @@ %patch40 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch %patch41 -p1 -b .rh217269.officecfg.nosequencecheck.patch %patch42 -p1 -b .ooo72129.vcl.fontglyphindex.patch -%patch43 -p1 -b .workspace.vcl71.patch -%patch44 -p1 -b .gccXXXXX.basegfx.crash.patch -%patch45 -p1 -b .ooo72349.svx.scriptrange.patch -%patch46 -p1 -b .ooo73201.sw.a11yloadcrash.patch -%patch47 -p1 -b .ooo73481.svx.longnotint32.patch -%patch48 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch -%patch49 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch -%patch50 -p1 -b .ooo73866.javaunohelper.parallel.patch -%patch51 -p1 -b .oooXXXXX.extensions.noxaw.patch -%patch52 -p1 -b .ooo73863.vcl.imcommit.patch +%patch43 -p1 -b .gccXXXXX.basegfx.crash.patch +%patch44 -p1 -b .ooo72349.svx.scriptrange.patch +%patch45 -p1 -b .ooo73201.sw.a11yloadcrash.patch +%patch46 -p1 -b .ooo73481.svx.longnotint32.patch +%patch47 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch +%patch48 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch +%patch49 -p1 -b .ooo73866.javaunohelper.parallel.patch +%patch50 -p1 -b .oooXXXXX.extensions.noxaw.patch +%patch51 -p1 -b .ooo73863.vcl.imcommit.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -2597,6 +2595,7 @@ - drop integrated workspace.sixtyfour10.patch - drop integrated workspace.vcl69.patch - drop integrated workspace.vcl70.patch +- drop integrated workspace.vcl71.patch - drop integrated workspace.os89.patch - drop integrated workspace.dr51.patch - drop integrated workspace.fwk59.patch --- workspace.vcl71.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 10:04:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 05:04:22 -0500 Subject: rpms/openswan/devel openswan.spec,1.33,1.34 Message-ID: <200701261004.l0QA4MP3014850@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/openswan/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14821 Modified Files: openswan.spec Log Message: - removed key generation from install phase - version 2.4.7 Index: openswan.spec =================================================================== RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- openswan.spec 12 Jul 2006 07:36:04 -0000 1.33 +++ openswan.spec 26 Jan 2007 10:04:20 -0000 1.34 @@ -1,6 +1,6 @@ Summary: Openswan IPSEC implementation Name: openswan -Version: 2.4.5 +Version: 2.4.7 %define with_klips 0 @@ -24,7 +24,7 @@ %define srcpkgver 2.4.5 %define debug_package %{nil} -Release: 2.1 +Release: 1%{?dist} License: GPL Url: http://www.openswan.org/ Source: openswan-%{srcpkgver}.tar.gz @@ -199,10 +199,12 @@ # /usr/share/doc/openswan/* %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.conf %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipsec.secrets -%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/no_oe.conf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/policies/* %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/examples/* +%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/examples +%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/policies +%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d %{_initrddir}/ipsec %{_libdir}/ipsec %{_sbindir}/ipsec @@ -235,13 +237,13 @@ %endif %post %{do_userland} -chkconfig --add ipsec -if [ ! -e /etc/ipsec.d/hostkey.secrets ];then - ipsec newhostkey --output /etc/ipsec.d/hostkey.secrets -fi -exit 0 +chkconfig --add ipsec || : %changelog +* Fri Jan 26 2007 Harald Hoyer - 2.4.7-1 +- removed key generation from install phase +- version 2.4.7 + * Wed Jul 12 2006 Jesse Keating - 2.4.5-2.1 - rebuild From fedora-cvs-commits at redhat.com Fri Jan 26 10:08:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 05:08:52 -0500 Subject: rpms/openswan/devel .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 upstream, 1.1, 1.2 Message-ID: <200701261008.l0QA8qTM014969@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/openswan/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14952 Modified Files: .cvsignore sources upstream Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openswan/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 5 May 2006 12:52:09 -0000 1.11 +++ .cvsignore 26 Jan 2007 10:08:50 -0000 1.12 @@ -1 +1 @@ -openswan-2.4.5.tar.gz +openswan-2.4.7.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/openswan/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 5 May 2006 12:52:09 -0000 1.11 +++ sources 26 Jan 2007 10:08:50 -0000 1.12 @@ -1 +1 @@ -a9a8e88313faceebfc5ceb1a9da9a3c4 openswan-2.4.5.tar.gz +70f22e8adc39e07a165f75eccb7cd079 openswan-2.4.7.tar.gz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/openswan/devel/upstream,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upstream 5 May 2006 08:28:20 -0000 1.1 +++ upstream 26 Jan 2007 10:08:50 -0000 1.2 @@ -1 +1 @@ -openswan-2.4.5.tar.gz +openswan-2.4.7.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 26 10:10:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 05:10:57 -0500 Subject: rpms/openswan/devel openswan.spec,1.34,1.35 Message-ID: <200701261010.l0QAAv16015062@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/openswan/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15048 Modified Files: openswan.spec Log Message: Index: openswan.spec =================================================================== RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- openswan.spec 26 Jan 2007 10:04:20 -0000 1.34 +++ openswan.spec 26 Jan 2007 10:10:55 -0000 1.35 @@ -1,6 +1,8 @@ Summary: Openswan IPSEC implementation Name: openswan Version: 2.4.7 +#%define srcpkgver %(echo %{version} | tr -s '_' '-') +%define srcpkgver %{version} %define with_klips 0 @@ -20,8 +22,6 @@ # Openswan -pre/-rc nomenclature has to co-exist with hyphen paranoia %endif -%define srcpkgver %(echo %{version} | tr -s '_' '-') -%define srcpkgver 2.4.5 %define debug_package %{nil} Release: 1%{?dist} From fedora-cvs-commits at redhat.com Fri Jan 26 10:15:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 05:15:13 -0500 Subject: rpms/openswan/devel openswan.spec,1.35,1.36 Message-ID: <200701261015.l0QAFD5I015155@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/openswan/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15133 Modified Files: openswan.spec Log Message: - removed key generation from install phase - version 2.4.7 Index: openswan.spec =================================================================== RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- openswan.spec 26 Jan 2007 10:10:55 -0000 1.35 +++ openswan.spec 26 Jan 2007 10:15:10 -0000 1.36 @@ -32,8 +32,6 @@ Source2: ipsec.init Source3: ipsec.conf -Patch1: openswan-typofix.patch - Group: System Environment/Daemons BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root/ BuildRequires: gmp-devel bison flex @@ -100,7 +98,6 @@ %prep rm -rf ${RPM_BUILD_ROOT} %setup -q -n openswan-%{srcpkgver} -%patch1 -p1 -b .typo %build From fedora-cvs-commits at redhat.com Fri Jan 26 12:07:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:07:02 -0500 Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.7, 1.8 linux-2.6-xen.patch, 1.1, 1.2 Message-ID: <200701261207.l0QC72q4022167@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22051 Modified Files: kernel-xen.spec linux-2.6-xen.patch Log Message: - Revert upstream xen-unstable chnageset 12680, because that breaks with console=tty console=xvc. - Change default domU console back to /dev/xcv0. Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kernel-xen.spec 25 Jan 2007 02:21:19 -0000 1.7 +++ kernel-xen.spec 26 Jan 2007 12:06:59 -0000 1.8 @@ -2053,6 +2053,11 @@ %endif %changelog +* Fri Jan 26 2007 Markus Armbruster +- Revert upstream xen-unstable chnageset 12680, because that breaks + with console=tty console=xvc. +- Change default domU console back to /dev/xcv0. + * Wed Jan 24 2007 Jeremy Katz - don't build this for ppc either linux-2.6-xen.patch: arch/i386/Kconfig | 85 arch/i386/Kconfig.cpu | 4 arch/i386/Kconfig.debug | 1 arch/i386/Makefile | 24 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 21 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1332 ++++++++ arch/i386/kernel/alternative.c | 11 arch/i386/kernel/apic-xen.c | 223 + arch/i386/kernel/asm-offsets.c | 7 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 747 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 198 + arch/i386/kernel/crash.c | 4 arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 1254 ++++++++ arch/i386/kernel/entry.S | 6 arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 201 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2965 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 121 arch/i386/kernel/irq-xen.c | 328 ++ arch/i386/kernel/ldt-xen.c | 270 + arch/i386/kernel/machine_kexec.c | 40 arch/i386/kernel/microcode-xen.c | 141 arch/i386/kernel/mpparse-xen.c | 1157 +++++++ arch/i386/kernel/pci-dma-xen.c | 377 ++ arch/i386/kernel/process-xen.c | 852 +++++ arch/i386/kernel/quirks-xen.c | 47 arch/i386/kernel/setup-xen.c | 1747 +++++++++++ arch/i386/kernel/smp-xen.c | 635 ++++ arch/i386/kernel/swiotlb.c | 683 ++++ arch/i386/kernel/sysenter.c | 22 arch/i386/kernel/time-xen.c | 1121 +++++++ arch/i386/kernel/traps-xen.c | 1248 ++++++++ arch/i386/kernel/traps.c | 9 arch/i386/kernel/tsc.c | 2 arch/i386/kernel/vm86.c | 12 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/lib/delay.c | 3 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/irqflags.c | 99 arch/i386/mach-xen/setup.c | 169 + arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 756 +++++ arch/i386/mm/highmem-xen.c | 121 arch/i386/mm/hypervisor.c | 449 +++ arch/i386/mm/init-xen.c | 879 +++++ arch/i386/mm/ioremap-xen.c | 443 ++ arch/i386/mm/pageattr.c | 2 arch/i386/mm/pgtable-xen.c | 728 ++++ arch/i386/oprofile/Makefile | 7 arch/i386/oprofile/xenoprof.c | 179 + arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1167 +++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 72 arch/ia64/Makefile | 16 arch/ia64/dig/setup.c | 17 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/asm-offsets.c | 24 arch/ia64/kernel/entry.S | 36 arch/ia64/kernel/gate.S | 116 arch/ia64/kernel/gate.lds.S | 22 arch/ia64/kernel/head.S | 6 arch/ia64/kernel/iosapic.c | 75 arch/ia64/kernel/irq_ia64.c | 328 ++ arch/ia64/kernel/pal.S | 3 arch/ia64/kernel/patch.c | 71 arch/ia64/kernel/perfmon.c | 89 arch/ia64/kernel/setup.c | 130 arch/ia64/mm/ioremap.c | 3 arch/ia64/oprofile/Makefile | 4 arch/ia64/oprofile/init.c | 14 arch/ia64/oprofile/oprofile_perfmon.h | 30 arch/ia64/oprofile/perfmon.c | 35 arch/ia64/oprofile/xenoprof.c | 142 arch/ia64/xen/Makefile | 9 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/hypercall.S | 411 ++ arch/ia64/xen/hypervisor.c | 1104 +++++++ arch/ia64/xen/mem.c | 76 arch/ia64/xen/util.c | 117 arch/ia64/xen/xcom_hcall.c | 365 ++ arch/ia64/xen/xcom_mini.c | 417 ++ arch/ia64/xen/xcom_privcmd.c | 663 ++++ arch/ia64/xen/xencomm.c | 263 + arch/ia64/xen/xenentry.S | 908 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2178 ++++++++++++++ arch/ia64/xen/xenminstate.h | 368 ++ arch/ia64/xen/xenpal.S | 76 arch/ia64/xen/xensetup.S | 53 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 62 arch/x86_64/Makefile | 20 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 743 +++++ 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 | 20 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 254 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/crash.c | 6 arch/x86_64/kernel/e820-xen.c | 763 +++++ arch/x86_64/kernel/early_printk-xen.c | 299 ++ arch/x86_64/kernel/entry-xen.S | 1217 ++++++++ arch/x86_64/kernel/genapic-xen.c | 143 arch/x86_64/kernel/genapic_xen.c | 190 + arch/x86_64/kernel/head-xen.S | 189 + arch/x86_64/kernel/head64-xen.c | 119 arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2182 ++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 99 arch/x86_64/kernel/irq.c | 4 arch/x86_64/kernel/irqflags-xen.c | 100 arch/x86_64/kernel/ldt-xen.c | 283 + arch/x86_64/kernel/machine_kexec.c | 119 arch/x86_64/kernel/mpparse-xen.c | 850 +++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 55 arch/x86_64/kernel/process-xen.c | 859 +++++ arch/x86_64/kernel/setup-xen.c | 1481 +++++++++ arch/x86_64/kernel/setup64-xen.c | 356 ++ arch/x86_64/kernel/smp-xen.c | 571 +++ arch/x86_64/kernel/traps-xen.c | 1245 ++++++++ arch/x86_64/kernel/vmlinux.lds.S | 2 arch/x86_64/kernel/vsyscall-xen.c | 329 ++ arch/x86_64/kernel/xen_entry.S | 40 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 717 ++++ arch/x86_64/mm/init-xen.c | 1182 +++++++ arch/x86_64/mm/pageattr-xen.c | 396 ++ arch/x86_64/oprofile/Makefile | 10 arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/char/hangcheck-timer.c | 2 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 12 drivers/char/tpm/Makefile | 2 drivers/char/tpm/tpm.c | 55 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_vtpm.c | 547 +++ drivers/char/tpm/tpm_vtpm.h | 68 drivers/char/tpm/tpm_xen.c | 760 +++++ drivers/firmware/Kconfig | 2 drivers/ide/ide-lib.c | 8 drivers/oprofile/buffer_sync.c | 66 drivers/oprofile/cpu_buffer.c | 51 drivers/oprofile/cpu_buffer.h | 9 drivers/oprofile/event_buffer.h | 7 drivers/oprofile/oprof.c | 32 drivers/oprofile/oprof.h | 3 drivers/oprofile/oprofile_files.c | 207 + drivers/pci/Kconfig | 3 drivers/serial/Kconfig | 1 drivers/xen/Kconfig | 283 + drivers/xen/Makefile | 19 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 624 ++++ drivers/xen/balloon/common.h | 58 drivers/xen/balloon/sysfs.c | 164 + drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 581 +++ drivers/xen/blkback/common.h | 138 drivers/xen/blkback/interface.c | 171 + drivers/xen/blkback/vbd.c | 118 drivers/xen/blkback/xenbus.c | 485 +++ drivers/xen/blkfront/Kconfig | 6 drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 891 ++++++ drivers/xen/blkfront/block.h | 156 + drivers/xen/blkfront/vbd.c | 375 ++ drivers/xen/blktap/Makefile | 6 drivers/xen/blktap/blktap.c | 1517 ++++++++++ drivers/xen/blktap/blktapmain.c | 1507 ++++++++++ drivers/xen/blktap/common.h | 120 drivers/xen/blktap/interface.c | 164 + drivers/xen/blktap/xenbus.c | 366 ++ drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 203 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 715 ++++ drivers/xen/console/xencons_ring.c | 143 drivers/xen/core/Makefile | 14 drivers/xen/core/cpu_hotplug.c | 188 + drivers/xen/core/evtchn.c | 861 +++++ drivers/xen/core/features.c | 34 drivers/xen/core/gnttab.c | 487 +++ drivers/xen/core/hypervisor_sysfs.c | 59 drivers/xen/core/machine_kexec.c | 190 + drivers/xen/core/machine_reboot.c | 185 + drivers/xen/core/reboot.c | 221 + drivers/xen/core/skbuff.c | 144 drivers/xen/core/smpboot.c | 461 +++ drivers/xen/core/xen_proc.c | 18 drivers/xen/core/xen_sysfs.c | 378 ++ drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 456 +++ drivers/xen/fbfront/Makefile | 2 drivers/xen/fbfront/xenfb.c | 750 +++++ drivers/xen/fbfront/xenkbd.c | 300 ++ drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 146 drivers/xen/netback/interface.c | 349 ++ drivers/xen/netback/loopback.c | 320 ++ drivers/xen/netback/netback.c | 1524 ++++++++++ drivers/xen/netback/xenbus.c | 450 +++ drivers/xen/netfront/Kconfig | 6 drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 2114 ++++++++++++++ drivers/xen/pciback/Makefile | 15 drivers/xen/pciback/conf_space.c | 425 ++ drivers/xen/pciback/conf_space.h | 126 drivers/xen/pciback/conf_space_capability.c | 71 drivers/xen/pciback/conf_space_capability.h | 23 drivers/xen/pciback/conf_space_capability_pm.c | 113 drivers/xen/pciback/conf_space_capability_vpd.c | 42 drivers/xen/pciback/conf_space_header.c | 299 ++ drivers/xen/pciback/conf_space_quirks.c | 128 drivers/xen/pciback/conf_space_quirks.h | 35 drivers/xen/pciback/passthrough.c | 157 + drivers/xen/pciback/pci_stub.c | 916 ++++++ drivers/xen/pciback/pciback.h | 93 drivers/xen/pciback/pciback_ops.c | 95 drivers/xen/pciback/slot.c | 151 + drivers/xen/pciback/vpci.c | 204 + drivers/xen/pciback/xenbus.c | 458 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 46 drivers/xen/pcifront/pci_op.c | 273 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 + drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 285 + drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 86 drivers/xen/tpmback/interface.c | 182 + drivers/xen/tpmback/tpmback.c | 944 ++++++ drivers/xen/tpmback/xenbus.c | 289 + drivers/xen/util.c | 70 drivers/xen/xenbus/Makefile | 9 drivers/xen/xenbus/xenbus_backend_client.c | 147 drivers/xen/xenbus/xenbus_client.c | 305 ++ drivers/xen/xenbus/xenbus_comms.c | 210 + drivers/xen/xenbus/xenbus_comms.h | 44 drivers/xen/xenbus/xenbus_dev.c | 361 ++ drivers/xen/xenbus/xenbus_probe.c | 1017 ++++++ drivers/xen/xenbus/xenbus_probe.h | 73 drivers/xen/xenbus/xenbus_probe_backend.c | 271 + drivers/xen/xenbus/xenbus_xs.c | 859 +++++ drivers/xen/xenoprof/xenoprofile.c | 500 +++ fs/Kconfig | 1 include/asm-i386/apic.h | 2 include/asm-i386/kexec.h | 14 include/asm-i386/mach-default/mach_traps.h | 12 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 203 + include/asm-i386/mach-xen/asm/dma-mapping.h | 151 + include/asm-i386/mach-xen/asm/fixmap.h | 160 + include/asm-i386/mach-xen/asm/floppy.h | 147 include/asm-i386/mach-xen/asm/highmem.h | 80 include/asm-i386/mach-xen/asm/hypercall.h | 407 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 245 + include/asm-i386/mach-xen/asm/io.h | 363 ++ include/asm-i386/mach-xen/asm/irqflags.h | 81 include/asm-i386/mach-xen/asm/kmap_types.h | 31 include/asm-i386/mach-xen/asm/maddr.h | 176 + include/asm-i386/mach-xen/asm/mmu.h | 29 include/asm-i386/mach-xen/asm/mmu_context.h | 108 include/asm-i386/mach-xen/asm/page.h | 231 + include/asm-i386/mach-xen/asm/pci.h | 153 + include/asm-i386/mach-xen/asm/pgalloc.h | 63 include/asm-i386/mach-xen/asm/pgtable-2level.h | 78 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 24 include/asm-i386/mach-xen/asm/pgtable-3level.h | 195 + include/asm-i386/mach-xen/asm/pgtable.h | 551 +++ include/asm-i386/mach-xen/asm/processor.h | 737 ++++ include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 132 include/asm-i386/mach-xen/asm/setup.h | 81 include/asm-i386/mach-xen/asm/smp.h | 114 include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 145 include/asm-i386/mach-xen/asm/system.h | 531 +++ include/asm-i386/mach-xen/asm/timer.h | 67 include/asm-i386/mach-xen/asm/tlbflush.h | 99 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/asm/xenoprof.h | 48 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.h | 5 include/asm-i386/pgtable-2level-defs.h | 2 include/asm-i386/pgtable-3level-defs.h | 2 include/asm-i386/spinlock.h | 5 include/asm-ia64/agp.h | 31 include/asm-ia64/dma-mapping.h | 98 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hw_irq.h | 10 include/asm-ia64/hypercall.h | 463 +++ include/asm-ia64/hypervisor.h | 224 + include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/io.h | 56 include/asm-ia64/iosapic.h | 2 include/asm-ia64/irq.h | 33 include/asm-ia64/machvec_dig.h | 15 include/asm-ia64/maddr.h | 102 include/asm-ia64/meminit.h | 5 include/asm-ia64/page.h | 52 include/asm-ia64/pal.h | 1 include/asm-ia64/pgalloc.h | 4 include/asm-ia64/privop.h | 60 include/asm-ia64/processor.h | 1 include/asm-ia64/sal.h | 21 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/uaccess.h | 20 include/asm-ia64/xen/privop.h | 303 ++ include/asm-ia64/xen/xcom_hcall.h | 86 include/asm-ia64/xen/xencomm.h | 60 include/asm-ia64/xenoprof.h | 48 include/asm-um/page.h | 2 include/asm-x86_64/acpi.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/dwarf2.h | 2 include/asm-x86_64/ipi.h | 5 include/asm-x86_64/kexec.h | 13 include/asm-x86_64/mach-xen/asm/agp.h | 35 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 40 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 200 + include/asm-x86_64/mach-xen/asm/dmi.h | 29 include/asm-x86_64/mach-xen/asm/e820.h | 59 include/asm-x86_64/mach-xen/asm/fixmap.h | 108 include/asm-x86_64/mach-xen/asm/floppy.h | 207 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 136 include/asm-x86_64/mach-xen/asm/hypercall.h | 406 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 301 ++ include/asm-x86_64/mach-xen/asm/irq.h | 34 include/asm-x86_64/mach-xen/asm/irqflags.h | 65 include/asm-x86_64/mach-xen/asm/maddr.h | 150 + include/asm-x86_64/mach-xen/asm/mmu.h | 38 include/asm-x86_64/mach-xen/asm/mmu_context.h | 135 include/asm-x86_64/mach-xen/asm/msr.h | 410 ++ include/asm-x86_64/mach-xen/asm/nmi.h | 96 include/asm-x86_64/mach-xen/asm/page.h | 214 + include/asm-x86_64/mach-xen/asm/pci.h | 173 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 + include/asm-x86_64/mach-xen/asm/pgtable.h | 562 +++ include/asm-x86_64/mach-xen/asm/processor.h | 499 +++ include/asm-x86_64/mach-xen/asm/smp.h | 132 include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 266 + include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 120 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xenoprof.h | 1 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 | 111 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 63 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/interrupt.h | 6 include/linux/kexec.h | 13 include/linux/mm.h | 10 include/linux/oprofile.h | 11 include/linux/pfn.h | 4 include/linux/skbuff.h | 15 include/xen/balloon.h | 57 include/xen/cpu_hotplug.h | 43 include/xen/driver_util.h | 15 include/xen/evtchn.h | 113 include/xen/features.h | 20 include/xen/foreign_page.h | 30 include/xen/gnttab.h | 151 + include/xen/hvm.h | 24 include/xen/hypervisor_sysfs.h | 32 include/xen/interface/COPYING | 38 include/xen/interface/acm.h | 205 + include/xen/interface/acm_ops.h | 120 include/xen/interface/arch-ia64.h | 500 +++ include/xen/interface/arch-powerpc.h | 121 include/xen/interface/arch-x86/xen-x86_32.h | 151 + include/xen/interface/arch-x86/xen-x86_64.h | 208 + include/xen/interface/arch-x86/xen.h | 190 + include/xen/interface/arch-x86_32.h | 27 include/xen/interface/arch-x86_64.h | 27 include/xen/interface/callback.h | 92 include/xen/interface/dom0_ops.h | 120 include/xen/interface/domctl.h | 437 ++ include/xen/interface/elfnote.h | 179 + include/xen/interface/event_channel.h | 251 + include/xen/interface/features.h | 71 include/xen/interface/grant_table.h | 380 ++ include/xen/interface/hvm/e820.h | 47 include/xen/interface/hvm/hvm_info_table.h | 41 include/xen/interface/hvm/hvm_op.h | 53 include/xen/interface/hvm/ioreq.h | 97 include/xen/interface/hvm/params.h | 36 include/xen/interface/hvm/vmx_assist.h | 116 include/xen/interface/io/blkif.h | 126 include/xen/interface/io/console.h | 51 include/xen/interface/io/fbif.h | 138 include/xen/interface/io/kbdif.h | 130 include/xen/interface/io/netif.h | 184 + include/xen/interface/io/pciif.h | 83 include/xen/interface/io/ring.h | 299 ++ include/xen/interface/io/tpmif.h | 77 include/xen/interface/io/xenbus.h | 73 include/xen/interface/io/xs_wire.h | 116 include/xen/interface/kexec.h | 137 include/xen/interface/memory.h | 276 + include/xen/interface/nmi.h | 78 include/xen/interface/physdev.h | 169 + include/xen/interface/platform.h | 143 include/xen/interface/sched.h | 121 include/xen/interface/sysctl.h | 169 + include/xen/interface/trace.h | 102 include/xen/interface/vcpu.h | 142 include/xen/interface/version.h | 91 include/xen/interface/xen-compat.h | 51 include/xen/interface/xen.h | 597 ++++ include/xen/interface/xencomm.h | 41 include/xen/interface/xenoprof.h | 130 include/xen/pcifront.h | 76 include/xen/public/evtchn.h | 88 include/xen/public/privcmd.h | 79 include/xen/xen_proc.h | 12 include/xen/xenbus.h | 307 ++ include/xen/xencons.h | 17 include/xen/xenoprof.h | 42 kernel/Kconfig.preempt | 1 kernel/fork.c | 3 kernel/irq/manage.c | 1 kernel/kexec.c | 48 lib/Kconfig.debug | 2 lib/Makefile | 1 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 120 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 63 net/core/skbuff.c | 29 net/ipv4/netfilter/ip_nat_proto_tcp.c | 7 net/ipv4/netfilter/ip_nat_proto_udp.c | 7 net/ipv4/xfrm4_output.c | 6 net/ipv6/addrconf.c | 3 scripts/Makefile.xen | 14 462 files changed, 96315 insertions(+), 236 deletions(-) Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-xen.patch 24 Jan 2007 01:28:48 -0000 1.1 +++ linux-2.6-xen.patch 26 Jan 2007 12:07:00 -0000 1.2 @@ -11048,7 +11048,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/setup-xen.c source/arch/i386/kernel/setup-xen.c --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/setup-xen.c 1970-01-01 01:00:00.000000000 +0100 +++ source/arch/i386/kernel/setup-xen.c 2007-01-15 15:48:21.000000000 +0100 -@@ -0,0 +1,1748 @@ +@@ -0,0 +1,1747 @@ +/* + * linux/arch/i386/kernel/setup.c + * @@ -12759,7 +12759,6 @@ + conswitchp = &dummy_con; +#endif + } -+ xencons_early_setup(); +#ifdef CONFIG_X86_TSC + tsc_init(); +#endif @@ -23425,7 +23424,7 @@ ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist); *cmdline_p = __va(ia64_boot_param->command_line); -@@ -479,7 +577,26 @@ setup_arch (char **cmdline_p) +@@ -479,7 +577,25 @@ setup_arch (char **cmdline_p) conswitchp = &vga_con; # endif } @@ -23445,7 +23444,6 @@ #endif + } + } -+ xencons_early_setup(); +#endif +#endif + @@ -40500,7 +40498,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/setup-xen.c source/arch/x86_64/kernel/setup-xen.c --- /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/setup-xen.c 1970-01-01 01:00:00.000000000 +0100 +++ source/arch/x86_64/kernel/setup-xen.c 2007-01-23 00:24:18.000000000 +0100 -@@ -0,0 +1,1482 @@ +@@ -0,0 +1,1481 @@ +/* + * linux/arch/x86-64/kernel/setup.c + * @@ -41271,7 +41269,6 @@ +#endif + } + } -+ xencons_early_setup(); +#else /* CONFIG_XEN */ + +#ifdef CONFIG_VT @@ -48257,44 +48254,6 @@ +module_init(tpmif_init); + +MODULE_LICENSE("Dual BSD/GPL"); -diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/drivers/char/tty_io.c source/drivers/char/tty_io.c ---- /scratch/src/linux-2.6.19.2/drivers/char/tty_io.c 2006-11-29 22:57:37.000000000 +0100 -+++ source/drivers/char/tty_io.c 2007-01-15 15:48:32.000000000 +0100 -@@ -131,6 +131,8 @@ LIST_HEAD(tty_drivers); /* linked list - DEFINE_MUTEX(tty_mutex); - EXPORT_SYMBOL(tty_mutex); - -+int console_use_vt = 1; -+ - #ifdef CONFIG_UNIX98_PTYS - extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ - extern int pty_limit; /* Config limit on Unix98 ptys */ -@@ -2477,7 +2479,7 @@ retry_open: - goto got_driver; - } - #ifdef CONFIG_VT -- if (device == MKDEV(TTY_MAJOR,0)) { -+ if (console_use_vt && (device == MKDEV(TTY_MAJOR,0))) { - extern struct tty_driver *console_driver; - driver = console_driver; - index = fg_console; -@@ -3912,6 +3914,8 @@ static int __init tty_init(void) - #endif - - #ifdef CONFIG_VT -+ if (!console_use_vt) -+ goto out_vt; - cdev_init(&vc0_cdev, &console_fops); - if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || - register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) -@@ -3919,6 +3923,7 @@ static int __init tty_init(void) - class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); - - vty_init(); -+ out_vt: - #endif - return 0; - } diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/drivers/firmware/Kconfig source/drivers/firmware/Kconfig --- /scratch/src/linux-2.6.19.2/drivers/firmware/Kconfig 2006-11-29 22:57:37.000000000 +0100 +++ source/drivers/firmware/Kconfig 2007-01-15 15:48:33.000000000 +0100 @@ -56713,7 +56672,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/drivers/xen/console/console.c source/drivers/xen/console/console.c --- /scratch/src/linux-2.6.19.2/drivers/xen/console/console.c 1970-01-01 01:00:00.000000000 +0100 +++ source/drivers/xen/console/console.c 2007-01-15 15:48:48.000000000 +0100 -@@ -0,0 +1,717 @@ +@@ -0,0 +1,715 @@ +/****************************************************************************** + * console.c + * @@ -56782,14 +56741,14 @@ + * 'xencons=tty' [XC_TTY]: Console attached to '/dev/tty[0-9]+'. + * 'xencons=ttyS' [XC_SERIAL]: Console attached to '/dev/ttyS[0-9]+'. + * 'xencons=xvc' [XC_XVC]: Console attached to '/dev/xvc0'. -+ * default: DOM0 -> XC_SERIAL ; all others -> XC_TTY. ++ * [XC_DEFAULT]: DOM0 -> XC_SERIAL ; all others -> XC_TTY. + * + * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses + * warnings from standard distro startup scripts. + */ +static enum { -+ XC_OFF, XC_TTY, XC_SERIAL, XC_XVC -+} xc_mode; ++ XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL, XC_XVC ++} xc_mode = XC_DEFAULT; +static int xc_num = -1; + +/* /dev/xvc0 device number allocated by lanana.org. */ @@ -56801,32 +56760,17 @@ +extern int sysrq_enabled; +#endif + -+void xencons_early_setup(void) -+{ -+ extern int console_use_vt; -+ -+ if (is_initial_xendomain()) { -+ xc_mode = XC_SERIAL; -+ } else { -+ xc_mode = XC_TTY; -+ console_use_vt = 0; -+ } -+} -+ +static int __init xencons_setup(char *str) +{ + char *q; + int n; -+ extern int console_use_vt; + -+ console_use_vt = 1; + if (!strncmp(str, "ttyS", 4)) { + xc_mode = XC_SERIAL; + str += 4; + } else if (!strncmp(str, "tty", 3)) { + xc_mode = XC_TTY; + str += 3; -+ console_use_vt = 0; + } else if (!strncmp(str, "xvc", 3)) { + xc_mode = XC_XVC; + str += 3; @@ -56924,10 +56868,14 @@ + goto out; + + if (is_initial_xendomain()) { ++ if (xc_mode == XC_DEFAULT) ++ xc_mode = XC_SERIAL; + kcons_info.write = kcons_write_dom0; + } else { + if (!xen_start_info->console.domU.evtchn) + goto out; ++ if (xc_mode == XC_DEFAULT) ++ xc_mode = XC_XVC; + kcons_info.write = kcons_write; + } + @@ -57425,6 +57373,15 @@ + printk("Xen virtual console successfully installed as %s%d\n", + DRV(xencons_driver)->name, xc_num); + ++ /* Check about framebuffer messing up the console */ ++ if (!is_initial_xendomain() && ++ !xenbus_exists(XBT_NIL, "device", "vfb")) { ++ /* FIXME: this is ugly */ ++ unregister_console(&kcons_info); ++ kcons_info.flags |= CON_CONSDEV; ++ register_console(&kcons_info); ++ } ++ + return 0; +} + @@ -100312,7 +100269,7 @@ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/include/xen/xencons.h source/include/xen/xencons.h --- /scratch/src/linux-2.6.19.2/include/xen/xencons.h 1970-01-01 01:00:00.000000000 +0100 +++ source/include/xen/xencons.h 2007-01-15 15:49:03.000000000 +0100 -@@ -0,0 +1,19 @@ +@@ -0,0 +1,17 @@ +#ifndef __ASM_XENCONS_H__ +#define __ASM_XENCONS_H__ + @@ -100329,8 +100286,6 @@ +int xencons_ring_init(void); +int xencons_ring_send(const char *data, unsigned len); + -+void xencons_early_setup(void); -+ +#endif /* __ASM_XENCONS_H__ */ diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/include/xen/xenoprof.h source/include/xen/xenoprof.h --- /scratch/src/linux-2.6.19.2/include/xen/xenoprof.h 1970-01-01 01:00:00.000000000 +0100 From fedora-cvs-commits at redhat.com Fri Jan 26 12:12:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:12:44 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2260,1.2261 Message-ID: <200701261212.l0QCCiBh022271@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22253 Modified Files: kernel-2.6.spec Log Message: Bump version. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2260 retrieving revision 1.2261 diff -u -r1.2260 -r1.2261 --- kernel-2.6.spec 20 Dec 2006 19:21:53 -0000 1.2260 +++ kernel-2.6.spec 26 Jan 2007 12:12:42 -0000 1.2261 @@ -297,7 +297,9 @@ Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch Patch959: linux-2.6-xen-x86-unwinder.patch -Patch990: linux-2.6-xen-pvfb.patch +Patch990: linux-2.6-xen-console.patch +Patch991: linux-2.6-xen-pvfb.patch +Patch992: linux-2.6-xen-pvfb-fixes.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -814,6 +816,8 @@ # xen framebuffer patches %patch990 -p1 +%patch991 -p1 +%patch992 -p1 %endif @@ -1643,6 +1647,14 @@ %endif %changelog +* Wed Jan 24 2007 Markus Armbruster +- Update Xen paravirt framebuffer patch to upstream xen-unstable + changeset 13066, less changeset 12680, because that breaks with + console=tty console=xvc. Also change default domU console back to + /dev/xcv0. This changes the protocol to the one accepted upstream. +- Add compatibility with guests running our initial protocol. +- Update Xen console major/minor to lanana.org-assigned numbers. + * Wed Dec 20 2006 Dave Jones - Update to 2.6.18.6 final (no changes since rc2) - Reenable squashfs (#220293) From fedora-cvs-commits at redhat.com Fri Jan 26 12:17:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:17:28 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2261,1.2262 Message-ID: <200701261217.l0QCHSZt010225@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5837 Modified Files: kernel-2.6.spec Log Message: Revert accidental commit of rev. 1.2261. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2261 retrieving revision 1.2262 diff -u -r1.2261 -r1.2262 --- kernel-2.6.spec 26 Jan 2007 12:12:42 -0000 1.2261 +++ kernel-2.6.spec 26 Jan 2007 12:17:26 -0000 1.2262 @@ -297,9 +297,7 @@ Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch Patch959: linux-2.6-xen-x86-unwinder.patch -Patch990: linux-2.6-xen-console.patch -Patch991: linux-2.6-xen-pvfb.patch -Patch992: linux-2.6-xen-pvfb-fixes.patch +Patch990: linux-2.6-xen-pvfb.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -816,8 +814,6 @@ # xen framebuffer patches %patch990 -p1 -%patch991 -p1 -%patch992 -p1 %endif @@ -1647,14 +1643,6 @@ %endif %changelog -* Wed Jan 24 2007 Markus Armbruster -- Update Xen paravirt framebuffer patch to upstream xen-unstable - changeset 13066, less changeset 12680, because that breaks with - console=tty console=xvc. Also change default domU console back to - /dev/xcv0. This changes the protocol to the one accepted upstream. -- Add compatibility with guests running our initial protocol. -- Update Xen console major/minor to lanana.org-assigned numbers. - * Wed Dec 20 2006 Dave Jones - Update to 2.6.18.6 final (no changes since rc2) - Reenable squashfs (#220293) From fedora-cvs-commits at redhat.com Fri Jan 26 12:20:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:20:34 -0500 Subject: rpms/kernel-xen-2.6/devel kernel-xen.spec,1.8,1.9 Message-ID: <200701261220.l0QCKY96010291@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel-xen-2.6/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10275 Modified Files: kernel-xen.spec Log Message: Bump version. Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- kernel-xen.spec 26 Jan 2007 12:06:59 -0000 1.8 +++ kernel-xen.spec 26 Jan 2007 12:20:32 -0000 1.9 @@ -2054,7 +2054,7 @@ %changelog * Fri Jan 26 2007 Markus Armbruster -- Revert upstream xen-unstable chnageset 12680, because that breaks +- Revert upstream xen-unstable changeset 12680, because that breaks with console=tty console=xvc. - Change default domU console back to /dev/xcv0. From fedora-cvs-commits at redhat.com Fri Jan 26 12:37:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:37:30 -0500 Subject: rpms/enscript/FC-5 enscript-wrap_header.patch, NONE, 1.1 enscript.spec, 1.31, 1.32 enscript-1.6.4-wrap_header.patch, 1.1, NONE Message-ID: <200701261237.l0QCbURE028486@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/enscript/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28193/enscript/FC-5 Modified Files: enscript.spec Added Files: enscript-wrap_header.patch Removed Files: enscript-1.6.4-wrap_header.patch Log Message: wrap_header patch has been improved enscript-wrap_header.patch: simple.hdr | 118 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 68 insertions(+), 50 deletions(-) --- NEW FILE enscript-wrap_header.patch --- --- enscript-1.6.1/lib/simple.hdr.wrap_header 1997-03-03 09:00:08.000000000 +0100 +++ enscript-1.6.1/lib/simple.hdr 2007-01-26 13:06:55.000000000 +0100 @@ -1,50 +1,68 @@ -% -% Default simple header. -% Copyright (c) 1995 Markku Rossi. -% Author: Markku Rossi -% - -% -% This file is part of GNU enscript. -% -% 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; see the file COPYING. If not, write to -% the Free Software Foundation, 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. -% - -% -- code follows this line -- -%Format: fmodstr $D{%a %b %d %H:%M:%S %Y} -%Format: pagenumstr $V$% - -/do_header { % print default simple header - gsave - d_header_x d_header_y HFpt_h 3 div add translate - - HF setfont - user_header_p { - 5 0 moveto user_header_left_str show - - d_header_w user_header_center_str stringwidth pop sub 2 div - 0 moveto user_header_center_str show - - d_header_w user_header_right_str stringwidth pop sub 5 sub - 0 moveto user_header_right_str show - } { - 5 0 moveto fname show - 45 0 rmoveto fmodstr show - 45 0 rmoveto pagenumstr show - } ifelse - - grestore -} def +% +% Default simple header. +% Copyright (c) 1995 Markku Rossi. +% Author: Markku Rossi +% +% Modified: Chris Josefy, USA, MAY 2006 +% + Added line wrapping to header to work more like AIX enscript +% + This assumes that one does not change the header font size from the default +% + This also assumes that the line only wraps once + +% +% This file is part of GNU enscript. +% +% 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; see the file COPYING. If not, write to +% the Free Software Foundation, 59 Temple Place - Suite 330, +% Boston, MA 02111-1307, USA. +% + +% -- code follows this line -- +%Format: fmodstr $D{%a %b %d %H:%M:%S %Y} +%Format: pagenumstr $V$% +%HeaderHeight: 44 + +/do_header { % print default simple header + gsave + d_header_x d_header_y HFpt_h 3 div add translate + + HF setfont + user_header_p { + 5 0 moveto user_header_left_str show + + d_header_w user_header_center_str stringwidth pop sub 2 div + 0 moveto user_header_center_str show + + d_header_w user_header_right_str stringwidth pop sub 5 sub + 0 moveto user_header_right_str show + } { + fname length fmodstr length add pagenumstr length add d_header_w 6 idiv le{ + 5 0 moveto fname show + 45 0 rmoveto fmodstr show + 45 0 rmoveto pagenumstr show + } { + 5 0 moveto fmodstr show + 45 0 rmoveto pagenumstr show + fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto + 1 1 fname length d_header_w 6 idiv idiv + { + dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show + 5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto + } for + 5 10 moveto + fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show + }ifelse + }ifelse + + grestore +} def Index: enscript.spec =================================================================== RCS file: /cvs/dist/rpms/enscript/FC-5/enscript.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- enscript.spec 1 Sep 2006 08:46:11 -0000 1.31 +++ enscript.spec 26 Jan 2007 12:37:27 -0000 1.32 @@ -1,7 +1,7 @@ Summary: A plain ASCII to PostScript converter. Name: enscript Version: 1.6.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz @@ -15,7 +15,7 @@ Patch4: enscript-doublefree.patch Patch6: enscript-1.6.1-CAN-2004-1185.patch Patch7: enscript-1.6.1-CAN-2004-1186.patch -Patch8: enscript-1.6.4-wrap_header.patch +Patch8: enscript-wrap_header.patch URL: http://www.codento.com/people/mtr/genscript/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: nenscript @@ -89,6 +89,9 @@ %changelog +* Fri Jan 26 2007 Adam Tkac 1.6.4-4 +- wrap_header patch has been improved (#223866) + * Fri Aug 01 2006 Jitka Kudrnacova - 1.6.4-3 - enscript now wrapes long header instead of truncating --- enscript-1.6.4-wrap_header.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 12:37:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:37:30 -0500 Subject: rpms/enscript/FC-6 enscript-wrap_header.patch, NONE, 1.1 enscript.spec, 1.33, 1.34 enscript-1.6.4-wrap_header.patch, 1.1, NONE Message-ID: <200701261237.l0QCbUCs028499@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/enscript/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28193/enscript/FC-6 Modified Files: enscript.spec Added Files: enscript-wrap_header.patch Removed Files: enscript-1.6.4-wrap_header.patch Log Message: wrap_header patch has been improved enscript-wrap_header.patch: simple.hdr | 118 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 68 insertions(+), 50 deletions(-) --- NEW FILE enscript-wrap_header.patch --- --- enscript-1.6.1/lib/simple.hdr.wrap_header 1997-03-03 09:00:08.000000000 +0100 +++ enscript-1.6.1/lib/simple.hdr 2007-01-26 13:06:55.000000000 +0100 @@ -1,50 +1,68 @@ -% -% Default simple header. -% Copyright (c) 1995 Markku Rossi. -% Author: Markku Rossi -% - -% -% This file is part of GNU enscript. -% -% 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; see the file COPYING. If not, write to -% the Free Software Foundation, 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. -% - -% -- code follows this line -- -%Format: fmodstr $D{%a %b %d %H:%M:%S %Y} -%Format: pagenumstr $V$% - -/do_header { % print default simple header - gsave - d_header_x d_header_y HFpt_h 3 div add translate - - HF setfont - user_header_p { - 5 0 moveto user_header_left_str show - - d_header_w user_header_center_str stringwidth pop sub 2 div - 0 moveto user_header_center_str show - - d_header_w user_header_right_str stringwidth pop sub 5 sub - 0 moveto user_header_right_str show - } { - 5 0 moveto fname show - 45 0 rmoveto fmodstr show - 45 0 rmoveto pagenumstr show - } ifelse - - grestore -} def +% +% Default simple header. +% Copyright (c) 1995 Markku Rossi. +% Author: Markku Rossi +% +% Modified: Chris Josefy, USA, MAY 2006 +% + Added line wrapping to header to work more like AIX enscript +% + This assumes that one does not change the header font size from the default +% + This also assumes that the line only wraps once + +% +% This file is part of GNU enscript. +% +% 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; see the file COPYING. If not, write to +% the Free Software Foundation, 59 Temple Place - Suite 330, +% Boston, MA 02111-1307, USA. +% + +% -- code follows this line -- +%Format: fmodstr $D{%a %b %d %H:%M:%S %Y} +%Format: pagenumstr $V$% +%HeaderHeight: 44 + +/do_header { % print default simple header + gsave + d_header_x d_header_y HFpt_h 3 div add translate + + HF setfont + user_header_p { + 5 0 moveto user_header_left_str show + + d_header_w user_header_center_str stringwidth pop sub 2 div + 0 moveto user_header_center_str show + + d_header_w user_header_right_str stringwidth pop sub 5 sub + 0 moveto user_header_right_str show + } { + fname length fmodstr length add pagenumstr length add d_header_w 6 idiv le{ + 5 0 moveto fname show + 45 0 rmoveto fmodstr show + 45 0 rmoveto pagenumstr show + } { + 5 0 moveto fmodstr show + 45 0 rmoveto pagenumstr show + fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto + 1 1 fname length d_header_w 6 idiv idiv + { + dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show + 5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto + } for + 5 10 moveto + fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show + }ifelse + }ifelse + + grestore +} def Index: enscript.spec =================================================================== RCS file: /cvs/dist/rpms/enscript/FC-6/enscript.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- enscript.spec 1 Sep 2006 08:34:39 -0000 1.33 +++ enscript.spec 26 Jan 2007 12:37:28 -0000 1.34 @@ -1,7 +1,7 @@ Summary: A plain ASCII to PostScript converter. Name: enscript Version: 1.6.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz @@ -15,7 +15,7 @@ Patch4: enscript-doublefree.patch Patch6: enscript-1.6.1-CAN-2004-1185.patch Patch7: enscript-1.6.1-CAN-2004-1186.patch -Patch8: enscript-1.6.4-wrap_header.patch +Patch8: enscript-wrap_header.patch URL: http://www.codento.com/people/mtr/genscript/ Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -90,6 +90,9 @@ %changelog +* Fri Jan 26 2007 Adam Tkac 1.6.4-5 +- wrap_header patch has been improved (#223866) + * Fri Sep 01 2006 Jitka Kudrnacova - 1.6.4-4 - enscript now wrapes long header instead of truncating --- enscript-1.6.4-wrap_header.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 12:37:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:37:31 -0500 Subject: rpms/enscript/devel enscript-wrap_header.patch, NONE, 1.1 enscript.spec, 1.34, 1.35 enscript-1.6.4-wrap_header.patch, 1.2, NONE Message-ID: <200701261237.l0QCbVWb028524@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/enscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28193/enscript/devel Modified Files: enscript.spec Added Files: enscript-wrap_header.patch Removed Files: enscript-1.6.4-wrap_header.patch Log Message: wrap_header patch has been improved enscript-wrap_header.patch: simple.hdr | 118 +++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 68 insertions(+), 50 deletions(-) --- NEW FILE enscript-wrap_header.patch --- --- enscript-1.6.1/lib/simple.hdr.wrap_header 1997-03-03 09:00:08.000000000 +0100 +++ enscript-1.6.1/lib/simple.hdr 2007-01-26 13:06:55.000000000 +0100 @@ -1,50 +1,68 @@ -% -% Default simple header. -% Copyright (c) 1995 Markku Rossi. -% Author: Markku Rossi -% - -% -% This file is part of GNU enscript. -% -% 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; see the file COPYING. If not, write to -% the Free Software Foundation, 59 Temple Place - Suite 330, -% Boston, MA 02111-1307, USA. -% - -% -- code follows this line -- -%Format: fmodstr $D{%a %b %d %H:%M:%S %Y} -%Format: pagenumstr $V$% - -/do_header { % print default simple header - gsave - d_header_x d_header_y HFpt_h 3 div add translate - - HF setfont - user_header_p { - 5 0 moveto user_header_left_str show - - d_header_w user_header_center_str stringwidth pop sub 2 div - 0 moveto user_header_center_str show - - d_header_w user_header_right_str stringwidth pop sub 5 sub - 0 moveto user_header_right_str show - } { - 5 0 moveto fname show - 45 0 rmoveto fmodstr show - 45 0 rmoveto pagenumstr show - } ifelse - - grestore -} def +% +% Default simple header. +% Copyright (c) 1995 Markku Rossi. +% Author: Markku Rossi +% +% Modified: Chris Josefy, USA, MAY 2006 +% + Added line wrapping to header to work more like AIX enscript +% + This assumes that one does not change the header font size from the default +% + This also assumes that the line only wraps once + +% +% This file is part of GNU enscript. +% +% 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; see the file COPYING. If not, write to +% the Free Software Foundation, 59 Temple Place - Suite 330, +% Boston, MA 02111-1307, USA. +% + +% -- code follows this line -- +%Format: fmodstr $D{%a %b %d %H:%M:%S %Y} +%Format: pagenumstr $V$% +%HeaderHeight: 44 + +/do_header { % print default simple header + gsave + d_header_x d_header_y HFpt_h 3 div add translate + + HF setfont + user_header_p { + 5 0 moveto user_header_left_str show + + d_header_w user_header_center_str stringwidth pop sub 2 div + 0 moveto user_header_center_str show + + d_header_w user_header_right_str stringwidth pop sub 5 sub + 0 moveto user_header_right_str show + } { + fname length fmodstr length add pagenumstr length add d_header_w 6 idiv le{ + 5 0 moveto fname show + 45 0 rmoveto fmodstr show + 45 0 rmoveto pagenumstr show + } { + 5 0 moveto fmodstr show + 45 0 rmoveto pagenumstr show + fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto + 1 1 fname length d_header_w 6 idiv idiv + { + dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show + 5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto + } for + 5 10 moveto + fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show + }ifelse + }ifelse + + grestore +} def Index: enscript.spec =================================================================== RCS file: /cvs/dist/rpms/enscript/devel/enscript.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- enscript.spec 19 Dec 2006 15:52:22 -0000 1.34 +++ enscript.spec 26 Jan 2007 12:37:28 -0000 1.35 @@ -1,7 +1,7 @@ Summary: A plain ASCII to PostScript converter. Name: enscript Version: 1.6.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Publishing Source0: http://www.iki.fi/mtr/genscript/enscript-%{version}.tar.gz @@ -15,7 +15,7 @@ Patch4: enscript-doublefree.patch Patch6: enscript-1.6.1-CAN-2004-1185.patch Patch7: enscript-1.6.1-CAN-2004-1186.patch -Patch8: enscript-1.6.4-wrap_header.patch +Patch8: enscript-wrap_header.patch URL: http://www.codento.com/people/mtr/genscript/ Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -90,8 +90,11 @@ %changelog +* Fri Jan 26 2007 Adam Tkac 1.6.4-6 +- wrap_header patch has been improved + * Tue Dec 19 2006 Adam Tkac 1.6.4-5 -- fixed long-header patch (#202082) +- fixed long-header patch * Fri Sep 01 2006 Jitka Kudrnacova - 1.6.4-4 - enscript now wrapes long header instead of truncating --- enscript-1.6.4-wrap_header.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 12:55:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 07:55:01 -0500 Subject: rpms/pciutils/devel pciutils-2.2.4-buf.patch, NONE, 1.1 pciutils-2.2.4-multilib.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 pciutils-strip.patch, 1.7, 1.8 pciutils.spec, 1.42, 1.43 sources, 1.10, 1.11 pciutils-2.2.3-multilib.patch, 1.6, NONE pciutils-2.2.3-sata.patch, 1.1, NONE pciutils-devicetype.patch, 1.2, NONE Message-ID: <200701261255.l0QCt1ps029550@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/pciutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29431 Modified Files: .cvsignore pciutils-strip.patch pciutils.spec sources Added Files: pciutils-2.2.4-buf.patch pciutils-2.2.4-multilib.patch Removed Files: pciutils-2.2.3-multilib.patch pciutils-2.2.3-sata.patch pciutils-devicetype.patch Log Message: - version 2.2.4 - truncate long device names (#205948) - Resolves: rhbz#205948 pciutils-2.2.4-buf.patch: names.c | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) --- NEW FILE pciutils-2.2.4-buf.patch --- --- pciutils-2.2.4/lib/names.c.buf 2006-09-09 12:46:39.000000000 +0200 +++ pciutils-2.2.4/lib/names.c 2007-01-26 13:47:01.000000000 +0100 @@ -372,12 +372,27 @@ res = snprintf(buf, size, "%s", num); else if (!name) res = snprintf(buf, size, ((flags & PCI_LOOKUP_MIXED) ? "%s [%s]" : "%s %s"), unknown, num); - else if (!(flags & PCI_LOOKUP_MIXED)) + else if (!(flags & PCI_LOOKUP_MIXED)) res = snprintf(buf, size, "%s", name); else res = snprintf(buf, size, "%s [%s]", name, num); - if (res < 0 || res >= size) + if (res < 0 || res >= size) { + if (name && res >= size) { + int nlen = strlen(name); + if (nlen > (res - size) + 5) { + char *nname = strdup(name); + int off = nlen - (res - size) - 5; + if (nname) { + nname[off] = '.'; + nname[off+1] = '.'; + nname[off+2] = '.'; + nname[off+3] = 0; + return format_name(buf, size, flags, nname, num, unknown); + } + } + } return ""; + } else return buf; } @@ -408,8 +423,24 @@ else /* v && !d */ res = snprintf(buf, size, "%s Unknown device %s", v, num+5); } - if (res < 0 || res >= size) + if (res < 0 || res >= size) { + if (d && res >= size) { + int nlen = strlen(d); + if (nlen > (res - size) + 5) { + char *nname = strdup(d); + int off = nlen - (res - size) - 5; + if (nname) { + nname[off] = '.'; + nname[off+1] = '.'; + nname[off+2] = '.'; + nname[off+3] = 0; + return format_name_pair(buf, size, flags, v, nname, num); + } + } + } + return ""; + } else return buf; } pciutils-2.2.4-multilib.patch: configure | 114 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 51 insertions(+), 63 deletions(-) --- NEW FILE pciutils-2.2.4-multilib.patch --- --- pciutils-2.2.4/lib/configure.multilib 2006-09-09 13:06:10.000000000 +0200 +++ pciutils-2.2.4/lib/configure 2007-01-26 13:09:31.000000000 +0100 @@ -35,74 +35,60 @@ zlib=$5 c=config.h +cm=config.h.mk m=config.mk -echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" -echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`" -rm -f $m +cat >$c <$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" +#echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`" +rm -f $cm +echo >$cm "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`" +echo >>$cm "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`" echo_n "Looking for access methods..." +echo_n " sysfs proc" -case $sys in - linux*) - echo_n " sysfs proc" - echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS' - echo >>$c '#define PCI_HAVE_PM_LINUX_PROC' - echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H' - echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"' - echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"' - case $cpu in - i386) echo_n " i386-ports" - echo >>$c '#define PCI_HAVE_PM_INTEL_CONF' - ;; - esac - echo >>$c '#define PCI_HAVE_64BIT_ADDRESS' - ;; - sunos) - case $cpu in - i386) echo_n " i386-ports" - echo >>$c "#define PCI_HAVE_PM_INTEL_CONF" - ;; - *) - echo " The PCI library is does not support Solaris for this architecture: $cpu" - exit 1 - ;; - esac - ;; - freebsd) - echo_n " fbsd-device" - echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE' - echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"' - ;; - openbsd) - echo_n " obsd-device" - echo >>$c '#define PCI_HAVE_PM_OBSD_DEVICE' - echo >>$c '#define PCI_PATH_OBSD_DEVICE "/dev/pci"' - ;; - aix) - echo_n " aix-device" - echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE' - echo >>$m 'CFLAGS=-g' - echo >>$m 'INSTALL=installbsd' - echo >>$m 'DIRINSTALL=mkdir -p' - ;; - netbsd) - echo_n " nbsd-libpci" - echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI' - echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"' - echo >>$m 'PCILIB=lib/libpciutils.a' - echo >>$m 'LDFLAGS+=-lpci' - ;; - gnu) - echo_n " i386-ports" - echo >>$c '#define PCI_HAVE_PM_INTEL_CONF' - ;; - *) - echo " Unfortunately, your OS is not supported by the PCI Library" - exit 1 - ;; +echo >>$cm '#define PCI_HAVE_PM_LINUX_SYSFS' +echo >>$cm '#define PCI_HAVE_PM_LINUX_PROC' +echo >>$cm '#define PCI_HAVE_LINUX_BYTEORDER_H' +echo >>$cm '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"' +echo >>$cm '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"' +case $cpu in + i386) echo_n " i386-ports" + echo >>$cm '#define PCI_HAVE_PM_INTEL_CONF' + ;; esac +echo >>$cm '#define PCI_HAVE_64BIT_ADDRESS' + echo >>$c '#define PCI_HAVE_PM_DUMP' +echo >>$cm '#define PCI_HAVE_PM_DUMP' echo " dump" echo_n "Checking for zlib support... " @@ -124,6 +110,8 @@ echo >>$c '#define PCI_IDS "pci.ids"' fi echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\"" - echo >>$c "#define PCILIB_VERSION \"$version\"" -sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m +echo >>$cm "#define PCI_PATH_IDS_DIR \"$idsdir\"" +echo >>$cm "#define PCILIB_VERSION \"$version\"" +#sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m +sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$cm >>$m Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pciutils/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 23 May 2006 12:33:57 -0000 1.10 +++ .cvsignore 26 Jan 2007 12:54:59 -0000 1.11 @@ -1 +1 @@ -pciutils-2.2.3.tar.gz +pciutils-2.2.4.tar.gz pciutils-strip.patch: Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: pciutils-strip.patch =================================================================== RCS file: /cvs/dist/rpms/pciutils/devel/pciutils-strip.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pciutils-strip.patch 13 Dec 2005 22:27:24 -0000 1.7 +++ pciutils-strip.patch 26 Jan 2007 12:54:59 -0000 1.8 @@ -1,7 +1,7 @@ ---- pciutils-2.1.99-test3/Makefile.strip 2004-02-25 01:46:14.315787866 -0500 -+++ pciutils-2.1.99-test3/Makefile 2004-02-25 01:47:45.478046260 -0500 -@@ -32,7 +32,7 @@ - all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids +--- pciutils-2.2.4/Makefile.strip 2007-01-26 12:44:56.000000000 +0100 ++++ pciutils-2.2.4/Makefile 2007-01-26 12:43:45.000000000 +0100 +@@ -27,7 +27,7 @@ + all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 $(PCI_IDS) $(PCILIB): $(PCIINC) force - $(MAKE) -C lib all @@ -9,14 +9,12 @@ force: ---- pciutils-2.1.99-test8/Makefile.foo 2005-05-10 15:24:45.000000000 -0400 -+++ pciutils-2.1.99-test8/Makefile 2005-05-10 15:24:50.000000000 -0400 -@@ -65,7 +65,7 @@ +@@ -58,7 +58,7 @@ install: all # -c is ignored on Linux, but required on FreeBSD - $(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8 -- $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR) -+ $(INSTALL) -c -m 755 lspci setpci $(SBINDIR) - $(INSTALL) -c -m 755 update-pciids $(SBINDIR) - $(INSTALL) -c -m 644 pci.ids $(IDSDIR) - $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8 + $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 +- $(INSTALL) -c -m 755 -s lspci setpci $(DESTDIR)$(SBINDIR) ++ $(INSTALL) -c -m 755 lspci setpci $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) + $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 Index: pciutils.spec =================================================================== RCS file: /cvs/dist/rpms/pciutils/devel/pciutils.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- pciutils.spec 9 Aug 2006 17:22:22 -0000 1.42 +++ pciutils.spec 26 Jan 2007 12:54:59 -0000 1.43 @@ -1,15 +1,14 @@ Name: pciutils -Version: 2.2.3 -Release: 4 +Version: 2.2.4 +Release: 1 Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz Patch0: pciutils-strip.patch +Patch1: pciutils-2.2.4-buf.patch Patch2: pciutils-2.1.10-scan.patch Patch3: pciutils-havepread.patch -Patch5: pciutils-devicetype.patch Patch6: pciutils-2.2.1-idpath.patch Patch7: pciutils-2.1.99-gcc4.patch -Patch8: pciutils-2.2.3-multilib.patch -Patch9: pciutils-2.2.3-sata.patch +Patch8: pciutils-2.2.4-multilib.patch License: GPL URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -35,13 +34,12 @@ %prep %setup -q -n pciutils-%{version} %patch0 -p1 -b .strip +%patch1 -p1 -b .buf %patch2 -p1 -b .scan %patch3 -p1 -b .pread -%patch5 -p1 -b .devicetype %patch6 -p1 -b .idpath %patch7 -p1 -b .glibcmacros %patch8 -p1 -b .multilib -%patch9 -p1 -b .sata %build make OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE=1" PREFIX="/usr" IDSDIR="/usr/share/hwdata" @@ -74,6 +72,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 26 2007 Harald Hoyer - 2.2.4-1 +- version 2.2.4 +- truncate long device names (#205948) +- Resolves: rhbz#205948 + * Wed Aug 9 2006 Peter Jones - 2.2.3-4 - Add definitions for more pci storage classes Index: sources =================================================================== RCS file: /cvs/dist/rpms/pciutils/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 23 May 2006 12:33:57 -0000 1.10 +++ sources 26 Jan 2007 12:54:59 -0000 1.11 @@ -1 +1 @@ -39747279aad46e7a6a3e1ea636d055b4 pciutils-2.2.3.tar.gz +5629fdb049f189fb853e7021f85553d2 pciutils-2.2.4.tar.gz --- pciutils-2.2.3-multilib.patch DELETED --- --- pciutils-2.2.3-sata.patch DELETED --- --- pciutils-devicetype.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 13:16:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 08:16:29 -0500 Subject: rpms/tcl/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 tcl-8.5a5-makefile.patch, 1.2, 1.3 tcl.spec, 1.36, 1.37 Message-ID: <200701261316.l0QDGTjs012977@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12771 Modified Files: .cvsignore sources tcl-8.5a5-makefile.patch tcl.spec Log Message: Add correct patch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 25 Jan 2007 09:32:18 -0000 1.13 +++ .cvsignore 26 Jan 2007 13:16:27 -0000 1.14 @@ -1,2 +1,3 @@ tk8.5a5-src.tar.gz tcl8.5a5-src.tar.gz +lst.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 25 Jan 2007 09:32:18 -0000 1.14 +++ sources 26 Jan 2007 13:16:27 -0000 1.15 @@ -1,2 +1,3 @@ 8118677251db51faf49bb3333ed6db16 tk8.5a5-src.tar.gz fe9e399c1f186f8c605de8d2e262881e tcl8.5a5-src.tar.gz +d3c75c99e2767cbf1b587aa1e4538df8 lst.tar.gz tcl-8.5a5-makefile.patch: Makefile.in | 67 ++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 26 deletions(-) Index: tcl-8.5a5-makefile.patch =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl-8.5a5-makefile.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tcl-8.5a5-makefile.patch 25 Jan 2007 10:51:38 -0000 1.2 +++ tcl-8.5a5-makefile.patch 26 Jan 2007 13:16:27 -0000 1.3 @@ -1,5 +1,5 @@ ---- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.patch 2006-10-23 15:41:32.000000000 +0200 -+++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in 2007-01-25 11:42:56.000000000 +0100 +--- tcl-8.5a5/tcl8.5a5/unix/Makefile.in.7-makefile 2006-10-23 15:41:32.000000000 +0200 ++++ tcl-8.5a5/tcl8.5a5/unix/Makefile.in 2007-01-26 13:46:33.000000000 +0100 @@ -813,17 +813,13 @@ install-tzdata: @@ -22,3 +22,68 @@ install-doc: doc @if test ! -x $(UNIX_DIR)/installManPage; then \ +@@ -1749,27 +1745,46 @@ + + # + # This target creates the HTML folder for Tcl & Tk and places it +-# in DISTDIR/html. It uses the tcltk-man2html.tcl tool from +-# the Tcl group's tool workspace. It depends on the Tcl & Tk being +-# in directories called tcl8.* & tk8.* up two directories from the +-# TOOL_DIR. ++# in DISTDIR/html. It uses the man2html. ++# It depends on the Tcl & Tk being in directories called tcl8.* & tk8.* ++# up two directories from the TOOL_DIR. + # + + html: +- $(BUILD_HTML) +- @EXTRA_BUILD_HTML@ +-html-tcl: +- $(BUILD_HTML) --tcl +- @EXTRA_BUILD_HTML@ +-html-tk: +- $(BUILD_HTML) --tk +- @EXTRA_BUILD_HTML@ +- +-BUILD_HTML = \ +- @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ +- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ +- ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \ +- --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) ++ echo "Building html" \ ++ echo "adresar $(HTML_DIR)"; \ ++ mkdir -p ../htmll; \ ++ mkdir -p ../html; \ ++ mkdir -p ../html/TclCmd; ++ mkdir -p ../html/TclLib; ++ mkdir -p ../html/TkCmd; ++ mkdir -p ../html/TkLib; ++ mkdir -p ../html/UserCmd; ++ cd ..; \ ++ for i in `ls doc`; do \ ++ j=`echo $$i | sed s/[0-9n]$$/htm/`; \ ++ man2html doc/$$i > htmll/$$j 2> /dev/null ; \ ++ done; ++ for i in `ls ../../tk8.5a5/doc`; do \ ++ j=`echo $$i | sed s/[0-9n]$$/htm/`; \ ++ man2html ../../tk8.5a5/doc/$$i > ../htmll/$$j 2> /dev/null; \ ++ done; ++ for i in `cat lst/tclcmd_list`; do \ ++ cp ../htmll/$$i ../html/TclCmd/$$i; \ ++ done; ++ for i in `cat lst/tcllib_list`; do \ ++ cp ../htmll/$$i ../html/TclLib/$$i; \ ++ done; ++ for i in `cat lst/tkcmd_list`; do \ ++ cp ../htmll/$$i ../html/TkCmd/$$i; \ ++ done; ++ for i in `cat lst/tklib_list`; do \ ++ cp ../htmll/$$i ../html/TkLib/$$i; \ ++ done; ++ for i in `cat lst/usercmd_list`; do \ ++ cp ../htmll/$$i ../html/UserCmd/$$i; \ ++ done; ++ rm -r ../htmll; + + # + # Targets to build Solaris package of the distribution for the current Index: tcl.spec =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tcl.spec 25 Jan 2007 10:51:38 -0000 1.36 +++ tcl.spec 26 Jan 2007 13:16:27 -0000 1.37 @@ -11,6 +11,7 @@ URL: http://tcl.sourceforge.net/ Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz Source1: http://switch.dl.sourceforge.net/sourceforge/tcl/tk%{version}-src.tar.gz +Source2: lst.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Buildrequires: autoconf, sed Patch1: tcl-8.5a5-tclm4-soname.patch @@ -62,6 +63,9 @@ %prep %setup -T -D -c %{name}-%{version} -q -a 0 -a 1 ##-a 1 +pwd +ls +tar -xvzf ../lst.tar.gz cd %{name}%{version} # define DT SONAME in shared lib From fedora-cvs-commits at redhat.com Fri Jan 26 13:53:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 08:53:57 -0500 Subject: rpms/tcl/devel tcl.spec,1.37,1.38 Message-ID: <200701261353.l0QDrv22029734@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29716 Modified Files: tcl.spec Log Message: Changing spec file again. Index: tcl.spec =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- tcl.spec 26 Jan 2007 13:16:27 -0000 1.37 +++ tcl.spec 26 Jan 2007 13:53:55 -0000 1.38 @@ -61,11 +61,8 @@ This package contains the html manual. %prep -%setup -T -D -c %{name}-%{version} -q -a 0 -a 1 +%setup -T -D -c %{name}-%{version} -q -a 0 -a 1 -a 2 ##-a 1 -pwd -ls -tar -xvzf ../lst.tar.gz cd %{name}%{version} # define DT SONAME in shared lib From fedora-cvs-commits at redhat.com Fri Jan 26 14:21:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 09:21:53 -0500 Subject: rpms/pm-utils/devel pm-utils-0.19.1-avahi.patch, 1.1, 1.2 pm-utils.spec, 1.45, 1.46 Message-ID: <200701261421.l0QELrwG018371@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18335 Modified Files: pm-utils-0.19.1-avahi.patch pm-utils.spec Log Message: - Fixed problem with changes in 10NetworkManager hook (#224556) pm-utils-0.19.1-avahi.patch: 10NetworkManager | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Index: pm-utils-0.19.1-avahi.patch =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19.1-avahi.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pm-utils-0.19.1-avahi.patch 24 Jan 2007 17:12:27 -0000 1.1 +++ pm-utils-0.19.1-avahi.patch 26 Jan 2007 14:21:50 -0000 1.2 @@ -1,12 +1,12 @@ ---- pm-utils-0.19.1/pm/hooks/10NetworkManager.avahi 2007-01-24 17:42:18.000000000 +0100 -+++ pm-utils-0.19.1/pm/hooks/10NetworkManager 2007-01-24 17:43:07.000000000 +0100 +--- pm-utils-0.19.1/pm/hooks/10NetworkManager.avahi 2006-04-17 21:02:32.000000000 +0200 ++++ pm-utils-0.19.1/pm/hooks/10NetworkManager 2007-01-26 15:13:08.000000000 +0100 @@ -3,7 +3,8 @@ . /etc/pm/functions suspend_nm() { - stopservice mDNSResponder -+ stopservice avahi-dnsconfd -+ stopservice avahi-daemon ++ # stopservice avahi-dnsconfd ++ # stopservice avahi-daemon # Tell NetworkManager to shut down networking dbus-send --system \ @@ -15,8 +15,8 @@ rc=$? - restartservice mDNSResponder -+ restartservice avahi-daemon -+ restartservice avahi-dnsconfd ++ # restartservice avahi-daemon ++ # restartservice avahi-dnsconfd return $rc } Index: pm-utils.spec =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- pm-utils.spec 24 Jan 2007 17:12:27 -0000 1.45 +++ pm-utils.spec 26 Jan 2007 14:21:51 -0000 1.46 @@ -2,7 +2,7 @@ Summary: Power management utilities and scripts for Fedora Core License: GPL Version: 0.19.1 -Release: 4%{?dist} +Release: 5%{?dist} Group: System Environment/Base ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 Requires: usermode kbd pciutils >= 2.2.1 @@ -139,6 +139,9 @@ %{_mandir}/man*/* %changelog +* Fri Jan 26 2007 Phil Knirsch - 0.19.1-5 +- Fixed problem with changes in 10NetworkManager hook (#224556) + * Wed Jan 24 2007 Phil Knirsch - 0.19.1-4 - Start/stop correct services in 10NetworkManager hook (#215253) - Fixed check for /sys/power/disk and /sys/power/state (#214407) From fedora-cvs-commits at redhat.com Fri Jan 26 14:24:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 09:24:31 -0500 Subject: rpms/device-mapper/devel device-mapper.1.02.16.tgz.asc, NONE, 1.1 .cvsignore, 1.22, 1.23 device-mapper.spec, 1.50, 1.51 sources, 1.27, 1.28 upstream, 1.18, 1.19 device-mapper.1.02.15.tgz.asc, 1.1, NONE Message-ID: <200701261424.l0QEOVer018587@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18569 Modified Files: .cvsignore device-mapper.spec sources upstream Added Files: device-mapper.1.02.16.tgz.asc Removed Files: device-mapper.1.02.15.tgz.asc Log Message: Update dmsetup to use new libdevmapper reporting functionality. --- NEW FILE device-mapper.1.02.16.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFuT7EIoGRwVZ+LBcRAmfKAKCXGYvlWj4xyeZvWZ+RwmqwHVVLyQCgx2xl WNm6/KDuP5TXN6j1xfyKrjY= =6MJ3 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 17 Jan 2007 18:03:59 -0000 1.22 +++ .cvsignore 26 Jan 2007 14:24:29 -0000 1.23 @@ -1 +1 @@ -device-mapper.1.02.15.tgz +device-mapper.1.02.16.tgz Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- device-mapper.spec 17 Jan 2007 18:03:59 -0000 1.50 +++ device-mapper.spec 26 Jan 2007 14:24:29 -0000 1.51 @@ -1,6 +1,6 @@ Summary: Device mapper library Name: device-mapper -Version: 1.02.15 +Version: 1.02.16 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -48,6 +48,9 @@ %changelog +* Fri Jan 26 2007 Alasdair Kergon - 1.02.16-1 +- Update dmsetup to use new libdevmapper reporting functionality. + * Wed Jan 17 2007 Alasdair Kergon - 1.02.15-1 - Add basic reporting functions to libdevmapper. Index: sources =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 17 Jan 2007 18:03:59 -0000 1.27 +++ sources 26 Jan 2007 14:24:29 -0000 1.28 @@ -1 +1 @@ -79c61b014ecabf3160de60de2c8b9719 device-mapper.1.02.15.tgz +8cf2d345a66c41d008e5fafd34e2dcb6 device-mapper.1.02.16.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/upstream,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- upstream 17 Jan 2007 18:03:59 -0000 1.18 +++ upstream 26 Jan 2007 14:24:29 -0000 1.19 @@ -1 +1 @@ -device-mapper.1.02.15.tgz +device-mapper.1.02.16.tgz --- device-mapper.1.02.15.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 14:26:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 09:26:39 -0500 Subject: rpms/logwatch/devel logwatch-7.3.2-amavis.patch, NONE, 1.1 logwatch-7.3.2-automount.patch, NONE, 1.1 logwatch-7.3.2-cron.patch, NONE, 1.1 logwatch-7.3.2-sendmail.patch, NONE, 1.1 logwatch.spec, 1.56, 1.57 Message-ID: <200701261426.l0QEQdGV018709@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18687 Modified Files: logwatch.spec Added Files: logwatch-7.3.2-amavis.patch logwatch-7.3.2-automount.patch logwatch-7.3.2-cron.patch logwatch-7.3.2-sendmail.patch Log Message: - add sendmail, automount, amvais and cron patch logwatch-7.3.2-amavis.patch: amavis | 1 + 1 files changed, 1 insertion(+) --- NEW FILE logwatch-7.3.2-amavis.patch --- --- logwatch-7.3.2/scripts/services/amavis.pom 2006-11-12 19:39:34.000000000 +0100 +++ logwatch-7.3.2/scripts/services/amavis 2007-01-26 13:41:37.000000000 +0100 @@ -124,6 +124,7 @@ or ($ThisLine =~ /^lookup_ip_acl /) or ($ThisLine =~ /^release /) or ($ThisLine =~ /^[.]{3}/) # non-adjacent continuation lines, captured elsewhere + or ($ThisLine =~ /SA TIMED OUT/) ) { } elsif ($ThisLine =~ /^Passed( CLEAN)?, /) { logwatch-7.3.2-automount.patch: automount | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.3.2-automount.patch --- --- logwatch-7.3.2/scripts/services/automount.pom 2006-12-15 07:22:14.000000000 +0100 +++ logwatch-7.3.2/scripts/services/automount 2007-01-26 13:20:01.000000000 +0100 @@ -21,7 +21,9 @@ ($ThisLine =~ /^>>.*mount: .*$/) or ($ThisLine =~ /lookup_read_master: lookup\(nisplus\): couldn't locat nis\+ table auto.master/) or ($ThisLine =~ /create_(tcp|udp)_client: hostname lookup failed: No such process/) or - ($ThisLine =~ /lookup_mount: exports lookup failed for .*directory/)) { + ($ThisLine =~ /lookup_mount: exports lookup failed for .*directory/) or + ($ThisLine =~ /create_(tc|ud)p_client: hostname lookup failed: Operation not permitted/) + ) { # don't care about these } elsif ( ($ThisMount) = ($ThisLine =~ /^attempting to mount entry (.*)$/) ) { logwatch-7.3.2-cron.patch: cron | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE logwatch-7.3.2-cron.patch --- --- logwatch-7.3.2/scripts/services/cron.pom 2006-12-20 16:35:02.000000000 +0100 +++ logwatch-7.3.2/scripts/services/cron 2007-01-26 14:06:04.000000000 +0100 @@ -135,6 +135,8 @@ $Errors{$Reason}++; } elsif ( ($FileName) = ($ThisLine =~ /BAD FILE MODE \((.+)\)/) ) { $BFMFile{$FileName}++; + } elsif ( ($FileName) = ($ThisLine = /WRONG FILE OWNER \((.+)\)/) ) { + $WFM{$FileName}++; } else { # Report any unmatched entries... push @OtherList, "$ThisLine\n"; @@ -238,6 +240,12 @@ } } +if (keys %WFO) { + foreach $i (keys %WFO) { + printf "\n Wrong file owner (". $i ."): " . $WFO{$i}. " Time(s)\n"; + } +} + if ($Ntpdate) { print "\nNtpdate: adjusted $Ntpdate times\n"; print "\tMinimum offset $ntpdateminoffset\n"; logwatch-7.3.2-sendmail.patch: sendmail | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE logwatch-7.3.2-sendmail.patch --- --- logwatch-7.3.2/scripts/services/sendmail.pom 2006-12-19 18:13:28.000000000 +0100 +++ logwatch-7.3.2/scripts/services/sendmail 2007-01-26 13:02:26.000000000 +0100 @@ -527,8 +527,10 @@ # file=queue.c, LogLevel>97, LOG_DEBUG ( $ThisLine =~ /$QueueIDFormat: unlink-fail $ENOENT/o ) or # generic DEBUG statement - ( $ThisLine =~ /^DEBUG: / ) - + ( $ThisLine =~ /^DEBUG: / ) or + ( $ThisLine =~ /[0-9]: fl=0x[0-9], mode=\S+: (FIFO:|SOCK|CHR:) dev=\S+, ino=\S+, nlink=\S+, u.gid=\S+, size=\S+/) or + ( $ThisLine =~ /unable to qualify my own domain name/) or + ( $ThisLine =~ /My unqualified host name (\S+) unknown; sleeping for retry/) ) { # We don't care about these statements above Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- logwatch.spec 17 Jan 2007 13:34:20 -0000 1.56 +++ logwatch.spec 26 Jan 2007 14:26:37 -0000 1.57 @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.2 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -10,6 +10,10 @@ Patch2: logwatch-7.3.1-vsftpd.patch Patch3: logwatch-7.3.2-sshd.patch Patch4: logwatch-7.3.2-xntpd.patch +Patch5: logwatch-7.3.2-sendmail.patch +Patch6: logwatch-7.3.2-automount.patch +Patch7: logwatch-7.3.2-amavis.patch +Patch8: logwatch-7.3.2-cron.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build @@ -27,6 +31,10 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %install @@ -135,6 +143,9 @@ %doc License project/CHANGES project/TODO %changelog +* Fri Jan 26 2007 Ivana Varekova 7.3.2-5 +- add sendmail, automount, amvais and cron patch + * Wed Jan 17 2007 Ivana Varekova 7.3.2-4 - add xntpd patch From fedora-cvs-commits at redhat.com Fri Jan 26 14:29:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 09:29:34 -0500 Subject: rpms/lvm2/devel LVM2.2.02.20.tgz.asc, NONE, 1.1 .cvsignore, 1.45, 1.46 lvm2.spec, 1.98, 1.99 sources, 1.48, 1.49 upstream, 1.38, 1.39 LVM2.2.02.19.tgz.asc, 1.1, NONE Message-ID: <200701261429.l0QETYES018804@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18783 Modified Files: .cvsignore lvm2.spec sources upstream Added Files: LVM2.2.02.20.tgz.asc Removed Files: LVM2.2.02.19.tgz.asc Log Message: new upstream --- NEW FILE LVM2.2.02.20.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFuT+WIoGRwVZ+LBcRAvGxAJ9m/iM/HDio4F2+4Ox1RaSHcR7VAACeJz+z 0BrRwvlOWiVqNBblTpvOoI0= =2lyN -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 17 Jan 2007 18:07:30 -0000 1.45 +++ .cvsignore 26 Jan 2007 14:29:32 -0000 1.46 @@ -1 +1 @@ -LVM2.2.02.19.tgz +LVM2.2.02.20.tgz Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- lvm2.spec 22 Jan 2007 11:48:57 -0000 1.98 +++ lvm2.spec 26 Jan 2007 14:29:32 -0000 1.99 @@ -1,9 +1,9 @@ -%define device_mapper_version 1.02.15-1 +%define device_mapper_version 1.02.16-1 Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.19 -Release: 2%{?dist} +Version: 2.02.20 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/lvm2 @@ -112,6 +112,17 @@ %changelog +* Fri Jan 26 2007 Alasdair Kergon - 2.02.20-1 +- Fix exit statuses of reporting tools. +- Add some missing close() and fclose() return code checks. +- Add devices/ignore_suspended_devices to ignore suspended dm devices. +- Fix refresh_toolcontext() always to wipe persistent device filter cache. +- Long-lived processes write out persistent dev cache in refresh_toolcontext(). +- Streamline dm_report_field_* interface. +- Update reporting man pages. +- Add --clustered to man pages. +- Add field definitions to report help text. + * Mon Jan 22 2007 Milan Broz - 2.02.19-2 - Remove BuildRequires libtermcap-devel Resolves: #223766 Index: sources =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 17 Jan 2007 18:07:31 -0000 1.48 +++ sources 26 Jan 2007 14:29:32 -0000 1.49 @@ -1 +1 @@ -70a7ee2a0f1cf113e593eeb6d2e7e1e3 LVM2.2.02.19.tgz +edaef626b1a6487bbc9b2acabf036cda LVM2.2.02.20.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/upstream,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- upstream 17 Jan 2007 18:07:31 -0000 1.38 +++ upstream 26 Jan 2007 14:29:32 -0000 1.39 @@ -1 +1 @@ -LVM2.2.02.19.tgz +LVM2.2.02.20.tgz --- LVM2.2.02.19.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 14:32:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 09:32:50 -0500 Subject: rpms/tcl/devel tcl.spec,1.38,1.39 Message-ID: <200701261432.l0QEWoUg000567@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tcl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv435 Modified Files: tcl.spec Log Message: change spec. Index: tcl.spec =================================================================== RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- tcl.spec 26 Jan 2007 13:53:55 -0000 1.38 +++ tcl.spec 26 Jan 2007 14:32:47 -0000 1.39 @@ -13,7 +13,7 @@ Source1: http://switch.dl.sourceforge.net/sourceforge/tcl/tk%{version}-src.tar.gz Source2: lst.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Buildrequires: autoconf, sed +Buildrequires: autoconf, sed, man Patch1: tcl-8.5a5-tclm4-soname.patch Patch2: tcl-8.4.5-lib-perm.patch Patch3: tcl8.3.5-tclConfig-package-path-90160.patch From fedora-cvs-commits at redhat.com Fri Jan 26 14:43:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 09:43:31 -0500 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.70,1.71 Message-ID: <200701261443.l0QEhVc9008140@cvs.devel.redhat.com> Author: nhorman Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8114 Modified Files: kexec-tools.spec Log Message: fixing Buildreq Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- kexec-tools.spec 25 Jan 2007 20:47:54 -0000 1.70 +++ kexec-tools.spec 26 Jan 2007 14:43:29 -0000 1.71 @@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): coreutils chkconfig sed Requires: busybox >= 1.2.0 -BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig elfutils-libelf-devel elfutils-devel +BuildRequires: zlib-devel elfutils-libelf-devel glib2-devel pkgconfig elfutils-libelf-devel elfutils-devel-static ExcludeArch: ppc %ifarch %{ix86} x86_64 ppc64 ia64 Obsoletes: diskdumputils netdump @@ -226,6 +226,7 @@ %changelog * Wed Jan 25 2007 Neil Horman - 1.101-58%{dist} - Updating kdump.init and mkdumprd with most recent RHEL5 fixes +- Fixing BuildReq to require elfutils-devel-static * Thu Jan 04 2007 Neil Horman - 1.101-56%{dist} - Fix option parsing problem for bzImage files (bz 221272) From fedora-cvs-commits at redhat.com Fri Jan 26 15:22:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 10:22:49 -0500 Subject: rpms/file/FC-6 file-4.19-ELF.patch, NONE, 1.1 file-4.19-debian.patch, NONE, 1.1 file-4.19-magic.patch, NONE, 1.1 file-4.19-ooffice.patch, NONE, 1.1 file-4.19-oracle.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 file.spec, 1.55, 1.56 sources, 1.16, 1.17 file-4.10-debian.patch, 1.2, NONE file-4.12-core64.patch, 1.1, NONE file-4.17-empty.patch, 1.1, NONE file-4.17-init-mem.patch, 1.1, NONE file-4.17-magic.patch, 1.1, NONE file-4.17-mp3_flac.patch, 1.1, NONE file-4.17-oracle.patch, 1.1, NONE file-4.17-wctype-header.patch, 1.1, NONE Message-ID: <200701261522.l0QFMnGe012579@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/file/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv12455 Modified Files: .cvsignore file.spec sources Added Files: file-4.19-ELF.patch file-4.19-debian.patch file-4.19-magic.patch file-4.19-ooffice.patch file-4.19-oracle.patch Removed Files: file-4.10-debian.patch file-4.12-core64.patch file-4.17-empty.patch file-4.17-init-mem.patch file-4.17-magic.patch file-4.17-mp3_flac.patch file-4.17-oracle.patch file-4.17-wctype-header.patch Log Message: * Fri Jan 26 2007 Martin Bacovsky - 4.19-1.fc6 - Resolves: #224334 - file does not recognize OpenOffice "native" formats - upgrade to new upstream 4.19 - patch revision and cleaning - Resolves: #208880 - Pointless file(1) error message while detecting ELF 64-bit file thanks to for patch file-4.19-ELF.patch: readelf.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) --- NEW FILE file-4.19-ELF.patch --- --- file-4.19/src/readelf.c.ELF 2007-01-09 19:47:26.000000000 +0100 +++ file-4.19/src/readelf.c 2007-01-09 19:50:35.000000000 +0100 @@ -45,7 +45,7 @@ off_t, int *); #endif private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t, - off_t, int *); + off_t, int *, int); private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, int *); private size_t donote(struct magic_set *, unsigned char *, size_t, size_t, int, int, size_t, int *); @@ -785,7 +785,7 @@ */ private int dophn_exec(struct magic_set *ms, int class, int swap, int fd, off_t off, - int num, size_t size, off_t fsize, int *flags) + int num, size_t size, off_t fsize, int *flags, int sh_num) { Elf32_Phdr ph32; Elf64_Phdr ph64; @@ -854,6 +854,19 @@ return -1; align = 4; } + /* If we have a section header table, handle note + sections just in doshn. Handling them also here + means that for executables we print the note content + twice and, more importantly, don't handle + strip -o created debuginfo files correctly. + They have PT_NOTE header, but the actual note + content is not present in the debuginfo file, + only in the original stripped executable or library. + The corresponding .note.* section is SHT_NOBITS + rather than SHT_NOTE, so doshn will not look + at it. */ + if (sh_num) + break; /* * This is a PT_NOTE section; loop through all the notes * in the section. @@ -960,7 +973,8 @@ fd, (off_t)getu32(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize), - fsize, &flags) + fsize, &flags, + getu16(swap, elfhdr.e_shnum)) == -1) return -1; } @@ -1001,7 +1015,8 @@ (off_t)elf_getu64(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize), - fsize, &flags) == -1) + fsize, &flags, + getu16(swap, elfhdr.e_shnum)) == -1) return -1; } if (doshn(ms, class, swap, fd, file-4.19-debian.patch: magic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE file-4.19-debian.patch --- --- file-4.19/src/magic.c.debian 2007-01-09 17:40:50.000000000 +0100 +++ file-4.19/src/magic.c 2007-01-09 17:42:29.000000000 +0100 @@ -238,7 +238,7 @@ int fd = 0; int rv = -1; unsigned char *buf; - struct stat sb; + struct stat sb, *st = &sb; ssize_t nbytes = 0; /* number of bytes read from a datafile */ int ispipe = 0; @@ -253,7 +253,7 @@ if (file_reset(ms) == -1) goto done; - switch (file_fsmagic(ms, inname, &sb)) { + switch (file_fsmagic(ms, inname, st)) { case -1: /* error */ goto done; case 0: /* nothing found */ file-4.19-magic.patch: magic/Magdir/apple | 17 +++++++++++++++++ magic/Magdir/images | 6 ++++++ magic/Magdir/revision | 6 ++++++ magic/magic.mime | 26 +++++++++++++++----------- src/fsmagic.c | 3 ++- 5 files changed, 46 insertions(+), 12 deletions(-) --- NEW FILE file-4.19-magic.patch --- --- file-4.19/magic/Magdir/revision.magic 2007-01-09 17:49:30.000000000 +0100 +++ file-4.19/magic/Magdir/revision 2007-01-09 17:59:01.000000000 +0100 @@ -3,3 +3,9 @@ # file(1) magic for revision control files # From Hendrik Scholz 0 string /1\ :pserver: cvs password text file + + +# Subversion (SVN) dumps +# Uwe Zeisberger +0 string SVN-fs-dump-format-version: Subversion dumpfile +>28 string >\0 (version: %s) --- file-4.19/magic/Magdir/images.magic 2007-01-09 17:49:12.000000000 +0100 +++ file-4.19/magic/Magdir/images 2007-01-09 17:57:07.000000000 +0100 @@ -524,6 +524,12 @@ 0 belong 0x0e031301 Hierarchical Data Format (version 4) data 0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data +# The boot loaders syslinux and isolinux use a RLE based image format +# called SLL16 to store splash screens. +0 lelong 0x1413f33d Syslinux SLL16 image data, +>4 leshort >0 %hd x +>6 leshort >0 %hd + # From: Tobias Burnus # Xara (for a while: Corel Xara) is a graphic package, see # http://www.xara.com/ for Windows and as GPL application for --- file-4.19/magic/Magdir/apple.magic 2007-01-09 17:48:49.000000000 +0100 +++ file-4.19/magic/Magdir/apple 2007-01-09 17:54:25.000000000 +0100 @@ -10,6 +10,23 @@ 0 belong 0x00051600 AppleSingle encoded Macintosh file 0 belong 0x00051607 AppleDouble encoded Macintosh file +# Apple Emulator 2IMG format +# +0 string 2IMG Apple ][ 2IMG Disk Image +>4 string XGS! \b, XGS +>4 string CTKG \b, Catakig +>4 string ShIm \b, Sheppy's ImageMaker +>4 string WOOF \b, Sweet 16 +>4 string B2TR \b, Bernie ][ the Rescue +>4 string !nfc \b, ASIMOV2 +>4 string x \b, Unknown Format +>0xc byte 00 \b, DOS 3.3 sector order +>>0x10 byte 00 \b, Volume 254 +>>0x10 byte&0x7f x \b, Volume %u +>0xc byte 01 \b, ProDOS sector order +>>0x14 short x \b, %u Blocks +>0xc byte 02 \b, NIB data + # magic for Newton PDA package formats # from Ruda Moura 0 string package0 Newton package, NOS 1.x, --- file-4.19/magic/magic.mime.magic 2007-01-09 17:49:55.000000000 +0100 +++ file-4.19/magic/magic.mime 2007-01-09 18:08:43.000000000 +0100 @@ -193,7 +193,7 @@ 0 beshort 0x4De1 audio/MP4A-LATM # MPEG Layer 3 sound files -0 beshort &0xffe0 audio/mpeg +0 beshort&0xfffe =0xfffa audio/mpeg #MP3 with ID3 tag 0 string ID3 audio/mpeg # Ogg/Vorbis @@ -397,16 +397,14 @@ # # from Daniel Quinlan # -0 string \14 byte 12 (OS/2 1.x format) #>14 byte 64 (OS/2 2.x format) #>14 byte 40 (Windows 3.x format) @@ -924,6 +922,12 @@ 0 string fLaC audio/x-flac 0 string CWS application/x-shockwave-flash + +# Gnumeric spreadsheet +# This entry is only semi-helpful, as Gnumeric compresses its files, so +# they will ordinarily reported as "compressed", but at least -z helps +39 string = --- file-4.19/src/fsmagic.c.magic 2007-01-09 17:47:35.000000000 +0100 +++ file-4.19/src/fsmagic.c 2007-01-09 17:51:23.000000000 +0100 @@ -92,7 +92,8 @@ if (file_printf(ms, "cannot open `%s' (%s)", fn, strerror(errno)) == -1) return -1; - return 1; + ms->haderr++; + return -1; } if ((ms->flags & MAGIC_MIME) != 0) { file-4.19-ooffice.patch: archive | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE file-4.19-ooffice.patch --- --- file-4.19/magic/Magdir/archive.ooffice 2007-01-25 11:18:43.000000000 +0100 +++ file-4.19/magic/Magdir/archive 2007-01-25 11:19:08.000000000 +0100 @@ -536,8 +536,6 @@ >4 byte 0x0b Zip archive data, at least v1.1 to extract >4 byte 0x14 >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract ->0x161 string WINZIP Zip archive data, WinZIP self-extracting - # OpenOffice.org / KOffice / StarOffice documents # From: Abel Cheung file-4.19-oracle.patch: filesystems | 13 +++++++++++++ 1 files changed, 13 insertions(+) --- NEW FILE file-4.19-oracle.patch --- --- file-4.19/magic/Magdir/filesystems.oracle 2007-01-09 18:14:04.000000000 +0100 +++ file-4.19/magic/Magdir/filesystems 2007-01-09 18:15:15.000000000 +0100 @@ -979,6 +979,19 @@ >>>>>>>>&0 bedate =0 full dump >>>>>>>>&0 bedate !0 incremental since: %s +# Oracle Clustered Filesystem - Aaron Botsis +8 string OracleCFS Oracle Clustered Filesystem, +>4 long x rev %d +>0 long x \b.%d, +>560 string x label: %.64s, +>136 string x mountpoint: %.128s + +# Oracle ASM tagged volume - Aaron Botsis +32 string ORCLDISK Oracle ASM Volume, +>40 string x Disk Name: %0.12s +32 string ORCLCLRD Oracle ASM Volume (cleared), +>40 string x Disk Name: %0.12s + # VMS backup savesets - gerardo.cacciari at gmail.com # had to comment out GEM Image and G3 raw data entries due to conflict #0 byte x Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file/FC-6/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Mar 2006 07:28:43 -0000 1.16 +++ .cvsignore 26 Jan 2007 15:22:47 -0000 1.17 @@ -1 +1 @@ -file-4.17.tar.gz +file-4.19.tar.gz Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/FC-6/file.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- file.spec 23 Aug 2006 16:14:07 -0000 1.55 +++ file.spec 26 Jan 2007 15:22:47 -0000 1.56 @@ -2,27 +2,25 @@ Summary: A utility for determining file types. Name: file -Version: 4.17 -Release: 8 +Version: 4.19 +Release: 1%{dist} License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz URL: http://www.darwinsys.com/file/ -Patch1: file-4.10-debian.patch +Patch1: file-4.19-debian.patch Patch2: file-selinux.patch -Patch3: file-4.17-magic.patch +Patch3: file-4.19-magic.patch Patch5: file-4.13-fsdump.patch 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 -Patch16: file-4.17-oracle.patch +Patch16: file-4.19-oracle.patch Patch17: file-4.17-clamav.patch Patch18: file-4.17-powerpoint.patch -Patch19: file-4.17-empty.patch Patch20: file-4.17-bash.patch +Patch21: file-4.19-ELF.patch +Patch22: file-4.19-ooffice.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -44,14 +42,12 @@ %patch6 -p1 -b .quick %patch8 -p1 -b .berkeley %patch12 -p1 -b .xen -%patch13 -p1 -b .mem -%patch14 -p1 -b .wctype -%patch15 -p1 -b .mp3 %patch16 -p1 -b .oracle %patch17 -p1 -b .clamav %patch18 -p1 -b .powerpoint -%patch19 -p1 -b .empty %patch20 -p1 -b .bash +%patch21 -p1 -b .ELF +%patch22 -p1 -b .ooffice iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -97,6 +93,13 @@ %{_libdir}/libmagic.* %changelog +* Fri Jan 26 2007 Martin Bacovsky - 4.19-1.fc6 +- Resolves: #224334 - file does not recognize OpenOffice "native" formats +- upgrade to new upstream 4.19 +- patch revision and cleaning +- Resolves: #208880 - Pointless file(1) error message while detecting ELF 64-bit file + thanks to for patch + * Wed Aug 23 2006 Martin Bacovsky - 4.17-8 - fix recognition of perl script with embed awk (#203610) Index: sources =================================================================== RCS file: /cvs/dist/rpms/file/FC-6/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Mar 2006 07:28:43 -0000 1.16 +++ sources 26 Jan 2007 15:22:47 -0000 1.17 @@ -1 +1 @@ -50919c65e0181423d66bb25d7fe7b0fd file-4.17.tar.gz +a61ef3aa8339d5987148089afde25f60 file-4.19.tar.gz --- file-4.10-debian.patch DELETED --- --- file-4.12-core64.patch DELETED --- --- file-4.17-empty.patch DELETED --- --- file-4.17-init-mem.patch DELETED --- --- file-4.17-magic.patch DELETED --- --- file-4.17-mp3_flac.patch DELETED --- --- file-4.17-oracle.patch DELETED --- --- file-4.17-wctype-header.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 16:12:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 11:12:36 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch, 1.11, 1.12 selinux-policy.spec, 1.386, 1.387 Message-ID: <200701261612.l0QGCaIv008497@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8474 Modified Files: policy-20070102.patch selinux-policy.spec Log Message: * Thu Jan 25 2007 Dan Walsh 2.5.2-2 - Fix squid cachemgr labeling policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 44 -- policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 83 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 + policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 72 ++++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.if | 18 + policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 38 ++ policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 198 ++++++++++++- policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 10 policy/modules/services/apache.if | 116 +++++++ policy/modules/services/apache.te | 10 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 + policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.te | 2 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.if | 4 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/razor.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 24 + policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.te | 24 + policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 2 policy/modules/services/squid.te | 9 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 161 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 105 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.if | 23 + policy/modules/system/lvm.te | 36 ++ policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 10 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 41 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 450 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 180 files changed, 4026 insertions(+), 674 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- policy-20070102.patch 25 Jan 2007 19:05:10 -0000 1.11 +++ policy-20070102.patch 26 Jan 2007 16:12:32 -0000 1.12 @@ -1708,8 +1708,30 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.if serefpolicy-2.5.2/policy/modules/apps/loadkeys.if --- nsaserefpolicy/policy/modules/apps/loadkeys.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/apps/loadkeys.if 2007-01-25 09:00:58.000000000 -0500 -@@ -45,18 +45,13 @@ ++++ serefpolicy-2.5.2/policy/modules/apps/loadkeys.if 2007-01-25 16:07:18.000000000 -0500 +@@ -11,16 +11,12 @@ + ## + # + interface(`loadkeys_domtrans',` +- ifdef(`strict_policy',` +- gen_require(` +- type loadkeys_t, loadkeys_exec_t; +- ') +- +- corecmd_search_bin($1) +- domtrans_pattern($1, loadkeys_exec_t, loadkeys_t) +- ',` +- refpolicywarn(`$0($*) has no effect in targeted policy.') ++ gen_require(` ++ type loadkeys_t, loadkeys_exec_t; + ') ++ ++ corecmd_search_bin($1) ++ domtrans_pattern($1, loadkeys_exec_t, loadkeys_t) + ') + + ######################################## +@@ -45,18 +41,13 @@ ## # interface(`loadkeys_run',` @@ -1734,6 +1756,25 @@ ') ######################################## +@@ -70,15 +61,8 @@ + ## + # + interface(`loadkeys_exec',` +- ifdef(`targeted_policy',` +- # $0(): the loadkeys program is an alias +- # of generic bin programs. +- corecmd_exec_bin($1) +- ',` +- gen_require(` +- type loadkeys_exec_t; +- ') +- +- can_exec($1,loadkeys_exec_t) ++ gen_require(` ++ type loadkeys_exec_t; + ') ++ can_exec($1,loadkeys_exec_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/loadkeys.te serefpolicy-2.5.2/policy/modules/apps/loadkeys.te --- nsaserefpolicy/policy/modules/apps/loadkeys.te 2007-01-02 12:57:22.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/apps/loadkeys.te 2007-01-25 09:00:58.000000000 -0500 @@ -2978,6 +3019,31 @@ ',`dnl') portcon $2 $3 gen_context(system_u:object_r:$1,$4) ifelse(`$5',`',`',`declare_ports($1,shiftn(4,$*))')dnl +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.5.2/policy/modules/kernel/devices.if +--- nsaserefpolicy/policy/modules/kernel/devices.if 2007-01-02 12:57:13.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/kernel/devices.if 2007-01-26 10:04:44.000000000 -0500 +@@ -3173,3 +3173,21 @@ + + typeattribute $1 devices_unconfined_type; + ') ++ ++######################################## ++## ++## delete entries from directories in /dev. ++## ++## ++## ++## Domain allowed to delete entries. ++## ++## ++# ++interface(`dev_delete',` ++ gen_require(` ++ type device_t; ++ ') ++ ++ allow $1 device_t:dir delete_dir_perms; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.te serefpolicy-2.5.2/policy/modules/kernel/devices.te --- nsaserefpolicy/policy/modules/kernel/devices.te 2007-01-02 12:57:13.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/kernel/devices.te 2007-01-25 09:00:58.000000000 -0500 @@ -3644,8 +3710,16 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.2/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2007-01-25 08:13:58.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/apache.fc 2007-01-25 09:00:58.000000000 -0500 -@@ -81,3 +81,12 @@ ++++ serefpolicy-2.5.2/policy/modules/services/apache.fc 2007-01-25 14:48:52.000000000 -0500 +@@ -21,7 +21,6 @@ + + /usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0) + /usr/lib/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) +-/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_exec_t,s0) + /usr/lib(64)?/apache(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) + /usr/lib(64)?/apache2/modules(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) + /usr/lib(64)?/apache(2)?/suexec(2)? -- gen_context(system_u:object_r:httpd_suexec_exec_t,s0) +@@ -81,3 +80,12 @@ /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) @@ -3660,8 +3734,33 @@ +/opt/fortitude/run(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.2/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/apache.if 2007-01-25 11:15:47.000000000 -0500 -@@ -752,6 +752,7 @@ ++++ serefpolicy-2.5.2/policy/modules/services/apache.if 2007-01-26 10:23:48.000000000 -0500 +@@ -434,6 +434,24 @@ + + ######################################## + ## ++## getattr apache.process ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`apache_getattr',` ++ gen_require(` ++ type httpd_t; ++ ') ++ ++ allow $1 httpd_t:process getattr; ++') ++ ++######################################## ++## + ## Inherit and use file descriptors from Apache. + ## + ## +@@ -752,6 +770,7 @@ ') allow $1 httpd_modules_t:dir list_dir_perms; @@ -3669,7 +3768,7 @@ ') ######################################## -@@ -1000,3 +1001,100 @@ +@@ -1000,3 +1019,100 @@ allow $1 httpd_sys_script_t:dir search_dir_perms; ') @@ -4865,7 +4964,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.5.2/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/nis.te 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/nis.te 2007-01-25 14:27:40.000000000 -0500 @@ -285,6 +285,7 @@ domain_use_interactive_fds(ypserv_t) @@ -4884,7 +4983,7 @@ +allow ypxfr_t ypserv_t:udp_socket { read write }; + allow ypxfr_t self:unix_stream_socket create_stream_socket_perms; -+allow ypxfr_t self:tcp_socket connected_socket_perms; ++allow ypxfr_t self:tcp_socket create_stream_socket_perms; +allow ypxfr_t self:udp_socket create_socket_perms; allow ypxfr_t ypserv_t:tcp_socket { read write }; @@ -5210,6 +5309,18 @@ /usr/libexec/postfix/scache -- gen_context(system_u:object_r:postfix_smtp_exec_t,s0) /usr/libexec/postfix/smtpd -- gen_context(system_u:object_r:postfix_smtpd_exec_t,s0) /usr/libexec/postfix/bounce -- gen_context(system_u:object_r:postfix_bounce_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.5.2/policy/modules/services/postfix.te +--- nsaserefpolicy/policy/modules/services/postfix.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/postfix.te 2007-01-26 09:49:14.000000000 -0500 +@@ -173,6 +173,8 @@ + mta_rw_aliases(postfix_master_t) + mta_read_sendmail_bin(postfix_master_t) + ++term_search_ptys(postfix_master_t) ++ + ifdef(`targeted_policy',` + term_dontaudit_use_unallocated_ttys(postfix_master_t) + term_dontaudit_use_generic_ptys(postfix_master_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.2/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/procmail.te 2007-01-25 09:00:58.000000000 -0500 @@ -5411,7 +5522,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ricci.te serefpolicy-2.5.2/policy/modules/services/ricci.te --- nsaserefpolicy/policy/modules/services/ricci.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/ricci.te 2007-01-25 09:46:54.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/ricci.te 2007-01-26 10:10:33.000000000 -0500 @@ -74,6 +74,9 @@ domain_entry_file(ricci_modstorage_t, ricci_modstorage_exec_t) role system_r types ricci_modstorage_t; @@ -5476,6 +5587,25 @@ storage_raw_read_fixed_disk(ricci_modstorage_t) +@@ -473,13 +489,17 @@ + logging_send_syslog_msg(ricci_modstorage_t) + + lvm_domtrans(ricci_modstorage_t) +-lvm_read_config(ricci_modstorage_t) ++lvm_manage_config(ricci_modstorage_t) + + miscfiles_read_localization(ricci_modstorage_t) + + modutils_read_module_deps(ricci_modstorage_t) + + optional_policy(` ++ nscd_socket_use(ricci_modstorage_t) ++') ++ ++optional_policy(` + ccs_read_config(ricci_modstorage_t) + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rlogin.te serefpolicy-2.5.2/policy/modules/services/rlogin.te --- nsaserefpolicy/policy/modules/services/rlogin.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/rlogin.te 2007-01-25 09:00:58.000000000 -0500 @@ -5517,6 +5647,61 @@ /usr/sbin/rpc\.idmapd -- gen_context(system_u:object_r:rpcd_exec_t,s0) /usr/sbin/rpc\.gssd -- gen_context(system_u:object_r:gssd_exec_t,s0) /usr/sbin/rpc\.mountd -- gen_context(system_u:object_r:nfsd_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.5.2/policy/modules/services/rpc.te +--- nsaserefpolicy/policy/modules/services/rpc.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/rpc.te 2007-01-26 09:40:48.000000000 -0500 +@@ -120,16 +120,20 @@ + # GSSD local policy + # + +-allow gssd_t self:capability { dac_override dac_read_search setuid }; +-allow gssd_t self:process getsched; +-allow gssd_t self:fifo_file { read write }; ++allow gssd_t self:capability { dac_override dac_read_search setuid sys_nice }; ++allow gssd_t self:process { getsched setsched }; ++allow gssd_t self:fifo_file rw_file_perms; + + manage_dirs_pattern(gssd_t,gssd_tmp_t,gssd_tmp_t) + manage_files_pattern(gssd_t,gssd_tmp_t,gssd_tmp_t) + files_tmp_filetrans(gssd_t, gssd_tmp_t, { file dir }) + ++corecmd_search_sbin(gssd_t) ++corecmd_exec_bin(gssd_t) ++ + kernel_read_network_state(gssd_t) + kernel_read_network_state_symlinks(gssd_t) ++kernel_search_network_sysctl(gssd_t) + + fs_list_rpc(gssd_t) + fs_read_rpc_sockets(gssd_t) +@@ -138,6 +142,7 @@ + files_list_tmp(gssd_t) + files_read_generic_tmp_files(gssd_t) + files_read_generic_tmp_symlinks(gssd_t) ++files_read_usr_symlinks(gssd_t) + + miscfiles_read_certs(gssd_t) + +@@ -148,6 +153,19 @@ + ') + + optional_policy(` ++ pcscd_read_pub_files(gssd_t) ++') ++ ++optional_policy(` + kerberos_use(gssd_t) + kerberos_read_keytab(gssd_t) + ') ++ ++optional_policy(` ++ xserver_rw_xdm_tmp_files(gssd_t) ++') ++ ++# Manage the users kerberos tgt file ++optional_policy(` ++ files_manage_generic_tmp_files(gssd_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rsync.te serefpolicy-2.5.2/policy/modules/services/rsync.te --- nsaserefpolicy/policy/modules/services/rsync.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/rsync.te 2007-01-25 09:00:58.000000000 -0500 @@ -5581,7 +5766,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/setroubleshoot.te serefpolicy-2.5.2/policy/modules/services/setroubleshoot.te --- nsaserefpolicy/policy/modules/services/setroubleshoot.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/setroubleshoot.te 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/setroubleshoot.te 2007-01-26 11:09:49.000000000 -0500 @@ -53,6 +53,7 @@ kernel_read_kernel_sysctls(setroubleshootd_t) @@ -5590,6 +5775,14 @@ corecmd_exec_sbin(setroubleshootd_t) corecmd_exec_bin(setroubleshootd_t) +@@ -73,6 +74,7 @@ + files_read_usr_files(setroubleshootd_t) + files_read_etc_files(setroubleshootd_t) + files_getattr_all_dirs(setroubleshootd_t) ++files_getattr_all_files(setroubleshootd_t) + + selinux_get_enforce_mode(setroubleshootd_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/smartmon.te serefpolicy-2.5.2/policy/modules/services/smartmon.te --- nsaserefpolicy/policy/modules/services/smartmon.te 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/smartmon.te 2007-01-25 09:00:58.000000000 -0500 @@ -5680,6 +5873,42 @@ userdom_manage_generic_user_home_content_dirs(spamd_t) userdom_manage_generic_user_home_content_files(spamd_t) userdom_manage_generic_user_home_content_symlinks(spamd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.fc serefpolicy-2.5.2/policy/modules/services/squid.fc +--- nsaserefpolicy/policy/modules/services/squid.fc 2006-11-16 17:15:21.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/squid.fc 2007-01-25 14:49:22.000000000 -0500 +@@ -12,3 +12,4 @@ + /var/run/squid\.pid -- gen_context(system_u:object_r:squid_var_run_t,s0) + + /var/spool/squid(/.*)? gen_context(system_u:object_r:squid_cache_t,s0) ++/usr/lib/squid/cachemgr\.cgi -- gen_context(system_u:object_r:httpd_squid_script_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.if serefpolicy-2.5.2/policy/modules/services/squid.if +--- nsaserefpolicy/policy/modules/services/squid.if 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/squid.if 2007-01-25 14:47:00.000000000 -0500 +@@ -36,7 +36,7 @@ + ') + + files_search_etc($1) +- allow $1 squid_conf_t:file read_file_perms; ++ read_files_pattern($1, squid_conf_t, squid_conf_t) + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/squid.te serefpolicy-2.5.2/policy/modules/services/squid.te +--- nsaserefpolicy/policy/modules/services/squid.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/squid.te 2007-01-25 14:48:22.000000000 -0500 +@@ -178,3 +178,12 @@ + #squid requires the following when run in diskd mode, the recommended setting + allow squid_t tmpfs_t:file { read write }; + ') dnl end TODO ++ ++optional_policy(` ++ apache_content_template(squid) ++ corenet_tcp_connect_http_cache_port(httpd_squid_script_t) ++ squid_read_config(httpd_squid_script_t) ++ allow httpd_squid_script_t self:tcp_socket create_socket_perms; ++ sysnet_read_config(httpd_squid_script_t) ++ corenet_non_ipsec_sendrecv(httpd_squid_script_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.2/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/ssh.if 2007-01-25 09:00:58.000000000 -0500 @@ -7022,9 +7251,45 @@ + ssh_sigchld(auditctl_t) + ssh_rw_stream_sockets(auditctl_t) +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.if serefpolicy-2.5.2/policy/modules/system/lvm.if +--- nsaserefpolicy/policy/modules/system/lvm.if 2007-01-02 12:57:49.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/lvm.if 2007-01-26 10:09:07.000000000 -0500 +@@ -63,10 +63,31 @@ + # + interface(`lvm_read_config',` + gen_require(` +- type lvm_t, lvm_etc_t; ++ type xlvm_etc_t; + ') + + files_search_etc($1) + allow $1 lvm_etc_t:dir list_dir_perms; + read_files_pattern($1,lvm_etc_t,lvm_etc_t) + ') ++ ++######################################## ++## ++## Manage LVM configuration files. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++## ++# ++interface(`lvm_manage_config',` ++ gen_require(` ++ type lvm_etc_t; ++ ') ++ ++ files_search_etc($1) ++ manage_dir_pattern($1, lvm_etc_t, lvm_etc_t) ++ manage_files_pattern($1,lvm_etc_t,lvm_etc_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.2/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/lvm.te 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/lvm.te 2007-01-26 10:03:25.000000000 -0500 @@ -44,14 +44,20 @@ # Cluster LVM daemon local policy # @@ -7097,7 +7362,15 @@ manage_dirs_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t) manage_files_pattern(lvm_t,lvm_tmp_t,lvm_tmp_t) -@@ -228,6 +244,7 @@ +@@ -203,6 +219,7 @@ + selinux_compute_user_contexts(lvm_t) + + dev_create_generic_chr_files(lvm_t) ++dev_delete(lvm_t) + dev_read_rand(lvm_t) + dev_read_urand(lvm_t) + dev_rw_lvm_control(lvm_t) +@@ -228,6 +245,7 @@ fs_list_tmpfs(lvm_t) fs_read_tmpfs_symlinks(lvm_t) fs_dontaudit_read_removable_files(lvm_t) @@ -7105,7 +7378,7 @@ storage_relabel_fixed_disk(lvm_t) storage_dontaudit_read_removable_device(lvm_t) -@@ -240,8 +257,8 @@ +@@ -240,8 +258,8 @@ # Access raw devices and old /dev/lvm (c 109,0). Is this needed? storage_manage_fixed_disk(lvm_t) @@ -7116,7 +7389,7 @@ corecmd_exec_sbin(lvm_t) -@@ -274,8 +291,8 @@ +@@ -274,8 +292,8 @@ ') ifdef(`targeted_policy', ` @@ -7127,7 +7400,7 @@ files_dontaudit_read_root_files(lvm_t) ') -@@ -289,6 +306,12 @@ +@@ -289,6 +307,12 @@ ') optional_policy(` @@ -7292,7 +7565,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.5.2/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/mount.te 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/mount.te 2007-01-25 14:14:26.000000000 -0500 @@ -9,6 +9,7 @@ type mount_t; type mount_exec_t; @@ -7301,6 +7574,15 @@ role system_r types mount_t; type mount_loopback_t; # customizable +@@ -29,7 +30,7 @@ + # + + # 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 self:capability { ipc_lock sys_rawio sys_resource sys_admin dac_override chown sys_tty_config setuid setgid }; + + allow mount_t mount_loopback_t:file read_file_perms; + allow mount_t self:netlink_route_socket r_netlink_socket_perms; @@ -122,10 +123,15 @@ ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- selinux-policy.spec 25 Jan 2007 19:05:10 -0000 1.386 +++ selinux-policy.spec 26 Jan 2007 16:12:32 -0000 1.387 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.5.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -356,6 +356,9 @@ %endif %changelog +* Thu Jan 25 2007 Dan Walsh 2.5.2-2 +- Fix squid cachemgr labeling + * Thu Jan 25 2007 Dan Walsh 2.5.2-1 - Add ability to generate webadm_t policy - Lots of new interfaces for httpd From fedora-cvs-commits at redhat.com Fri Jan 26 16:20:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 11:20:45 -0500 Subject: rpms/selinux-policy/devel policy-20070102.patch,1.12,1.13 Message-ID: <200701261620.l0QGKjc5030325@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30291 Modified Files: policy-20070102.patch Log Message: * Thu Jan 25 2007 Dan Walsh 2.5.2-2 - Fix squid cachemgr labeling policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 +++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_tunables | 123 +++++--- policy/mls | 31 +- policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 + policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 10 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 +++++++-- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 ++++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.if | 33 ++ policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 44 -- policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 252 ++++++++++++++-- policy/modules/apps/mplayer.if | 83 +++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 + policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 72 ++++ policy/modules/kernel/corenetwork.if.in | 81 +++++ policy/modules/kernel/corenetwork.te.in | 16 - policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.if | 18 + policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 38 ++ policy/modules/kernel/domain.te | 19 + policy/modules/kernel/files.if | 198 ++++++++++++- policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 ++++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 10 policy/modules/services/apache.if | 116 +++++++ policy/modules/services/apache.te | 10 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 + policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 +++-- policy/modules/services/cron.te | 39 ++ policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 44 ++ policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 1 policy/modules/services/inetd.te | 31 +- policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +-- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 - policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 +++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.te | 2 policy/modules/services/procmail.te | 1 policy/modules/services/pyzor.if | 4 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/razor.te | 2 policy/modules/services/rhgb.if | 76 +++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 24 + policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.te | 24 + policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 + policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 2 policy/modules/services/squid.te | 9 policy/modules/services/ssh.if | 79 ++++- policy/modules/services/ssh.te | 161 +++++----- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 ++++++++++ policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 72 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 35 ++ policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 19 + policy/modules/system/ipsec.te | 105 +++++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.if | 23 + policy/modules/system/lvm.te | 36 ++ policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 +++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 10 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 +++++++ policy/modules/system/selinuxutil.te | 116 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 41 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 450 +++++++++++++++++++++++++++--- policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 180 files changed, 4026 insertions(+), 674 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- policy-20070102.patch 26 Jan 2007 16:12:32 -0000 1.12 +++ policy-20070102.patch 26 Jan 2007 16:20:43 -0000 1.13 @@ -7253,7 +7253,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.if serefpolicy-2.5.2/policy/modules/system/lvm.if --- nsaserefpolicy/policy/modules/system/lvm.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/lvm.if 2007-01-26 10:09:07.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/lvm.if 2007-01-26 11:17:17.000000000 -0500 @@ -63,10 +63,31 @@ # interface(`lvm_read_config',` @@ -7284,12 +7284,12 @@ + ') + + files_search_etc($1) -+ manage_dir_pattern($1, lvm_etc_t, lvm_etc_t) ++ manage_dirs_pattern($1, lvm_etc_t, lvm_etc_t) + manage_files_pattern($1,lvm_etc_t,lvm_etc_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.5.2/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/lvm.te 2007-01-26 10:03:25.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/lvm.te 2007-01-26 11:17:11.000000000 -0500 @@ -44,14 +44,20 @@ # Cluster LVM daemon local policy # From fedora-cvs-commits at redhat.com Fri Jan 26 17:30:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 12:30:02 -0500 Subject: rpms/setroubleshoot/devel .cvsignore, 1.63, 1.64 setroubleshoot.spec, 1.77, 1.78 sources, 1.73, 1.74 Message-ID: <200701261730.l0QHU2oi032717@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/setroubleshoot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32647/devel Modified Files: .cvsignore setroubleshoot.spec sources Log Message: auto-import setroubleshoot-1.8.15-1 on branch devel from setroubleshoot-1.8.15-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 11 Jan 2007 23:05:02 -0000 1.63 +++ .cvsignore 26 Jan 2007 17:30:00 -0000 1.64 @@ -1 +1 @@ -setroubleshoot-1.8.14.tar.gz +setroubleshoot-1.8.15.tar.gz Index: setroubleshoot.spec =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/setroubleshoot.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- setroubleshoot.spec 11 Jan 2007 23:05:02 -0000 1.77 +++ setroubleshoot.spec 26 Jan 2007 17:30:00 -0000 1.78 @@ -1,6 +1,6 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 1.8.14 +Version: 1.8.15 Release: 1%{?dist} License: GPL Group: Applications/System @@ -108,6 +108,11 @@ %{_datadir}/dbus-1/services/sealert.service %changelog +* Fri Jan 12 2007 Dan Walsh - 1.8.15-1 +- Update po +- Additional Plugins +- Cleanup Plugins + * Thu Jan 11 2007 John Dennis - 1.8.14-1 - Resolves: bug# 221850 plugin module loading was failing in python 2.5 with the message Index: sources =================================================================== RCS file: /cvs/dist/rpms/setroubleshoot/devel/sources,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sources 11 Jan 2007 23:05:02 -0000 1.73 +++ sources 26 Jan 2007 17:30:00 -0000 1.74 @@ -1 +1 @@ -91bd6605a3f234bf02dbad9e071a8e11 setroubleshoot-1.8.14.tar.gz +cc11d48ac2f6bc1f69c6b49941dc5c3e setroubleshoot-1.8.15.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 26 18:15:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 13:15:28 -0500 Subject: rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.6,1.7 Message-ID: <200701261815.l0QIFSvj028907@cvs.devel.redhat.com> Author: rnorwood Update of /cvs/dist/rpms/perl-Carp-Clan/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28843 Modified Files: perl-Carp-Clan.spec Log Message: Resolves: bz#224571 - Remove erroneous rpm 'provides' of perl(DB) Index: perl-Carp-Clan.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Carp-Clan/devel/perl-Carp-Clan.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Carp-Clan.spec 2 Dec 2006 17:45:03 -0000 1.6 +++ perl-Carp-Clan.spec 26 Jan 2007 18:15:25 -0000 1.7 @@ -24,6 +24,16 @@ %prep %setup -q -n Carp-Clan-%{version} +# Filter unwanted Provides: +cat << EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ + sed -e '/perl(DB)/d' +EOF + +%define __perl_provides %{_builddir}/Carp-Clan-%{version}/%{name}-prov +chmod +x %{__perl_provides} + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -50,6 +60,9 @@ %changelog +* Fri Jan 26 2007 Robin Norwood - 5.8-2 +- Resolves: bz#224571 - Remove erroneous rpm 'provides' of perl(DB) + * Sat Dec 02 2006 Robin Norwood - 5.8-1 - New version From fedora-cvs-commits at redhat.com Fri Jan 26 18:16:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 13:16:08 -0500 Subject: rpms/perl-Carp-Clan/devel perl-Carp-Clan.spec,1.7,1.8 Message-ID: <200701261816.l0QIG8ER029069@cvs.devel.redhat.com> Author: rnorwood Update of /cvs/dist/rpms/perl-Carp-Clan/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29055 Modified Files: perl-Carp-Clan.spec Log Message: forgot to bump the release in last commit. Index: perl-Carp-Clan.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Carp-Clan/devel/perl-Carp-Clan.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Carp-Clan.spec 26 Jan 2007 18:15:25 -0000 1.7 +++ perl-Carp-Clan.spec 26 Jan 2007 18:16:01 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Carp-Clan Version: 5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Report errors from perspective of caller of a "clan" of modules Group: Development/Libraries From fedora-cvs-commits at redhat.com Fri Jan 26 18:50:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 13:50:38 -0500 Subject: rpms/evolution/FC-6 evolution.spec,1.204,1.205 Message-ID: <200701261850.l0QIocgO001110@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv977 Modified Files: evolution.spec Log Message: * Fri Jan 26 2007 Matthew Barnes - 2.8.2.1-4.fc6 - Compile with the -fno-strict-aliasing flag, which will hopefully improve reliablity until the illegal type-punning is fixed (RH bug #224552). Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/FC-6/evolution.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- evolution.spec 30 Dec 2006 14:39:03 -0000 1.204 +++ evolution.spec 26 Jan 2007 18:50:36 -0000 1.205 @@ -43,7 +43,7 @@ Name: evolution Version: 2.8.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -326,7 +326,7 @@ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing" %install rm -rf $RPM_BUILD_ROOT @@ -636,11 +636,15 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Sat Dec 30 2007 Matthew Barnes - 2.8.2.1-3.fc6 +* Fri Jan 26 2007 Matthew Barnes - 2.8.2.1-4.fc6 +- Compile with the -fno-strict-aliasing flag, which will hopefully improve + reliablity until the illegal type-punning is fixed (RH bug #224552). + +* Sat Dec 30 2006 Matthew Barnes - 2.8.2.1-3.fc6 - Add Requires evolution-data-server-devel to devel subpackage (RH bug #218889). -* Mon Nov 27 2007 Matthew Barnes - 2.8.2.1-2.fc6 +* Mon Nov 27 2006 Matthew Barnes - 2.8.2.1-2.fc6 - Remove patch for GNOME bug #343331 (fixed upstream). - Require evolution-data-server-1.8.2, since libcamel's API changed. From fedora-cvs-commits at redhat.com Fri Jan 26 18:54:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 13:54:06 -0500 Subject: rpms/evolution/devel evolution.spec,1.225,1.226 Message-ID: <200701261854.l0QIs6kx003927@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3682 Modified Files: evolution.spec Log Message: * Fri Jan 26 2007 Matthew Barnes - 2.9.5-4.fc7 - Compile with the -fno-strict-aliasing flag, which will hopefully improve reliability until the illegal type-punning is fixed (RH bug #224552). Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- evolution.spec 22 Jan 2007 03:37:21 -0000 1.225 +++ evolution.spec 26 Jan 2007 18:54:04 -0000 1.226 @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -410,7 +410,7 @@ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing" %install rm -rf $RPM_BUILD_ROOT @@ -725,6 +725,10 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Jan 26 2007 Matthew Barnes - 2.9.5-4.fc7 +- Compile with the -fno-strict-aliasing flag, which will hopefully improve + reliability until the illegal type-punning is fixed (RH bug #224552). + * Sun Jan 21 2007 Matthew Barnes - 2.9.5-3.fc7 - Revise evolution-2.7.1-no-gnome-common.patch so that we no longer have to run autoconf before building. From fedora-cvs-commits at redhat.com Fri Jan 26 19:17:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 14:17:07 -0500 Subject: rpms/mdadm/devel .cvsignore, 1.15, 1.16 mdadm-2.5.2-static.patch, 1.1, 1.2 mdadm.spec, 1.38, 1.39 sources, 1.15, 1.16 mdadm-2.3.1-fswab64.patch, 1.1, NONE mdadm-2.5.4-guid-printout.patch, 1.1, NONE mdassemble.8, 1.1, NONE mdmpd-0.4-node.patch, 1.1, NONE mdmpd.init, 1.2, NONE Message-ID: <200701261917.l0QJH7Aj021116@cvs.devel.redhat.com> Author: dledford Update of /cvs/dist/rpms/mdadm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21051 Modified Files: .cvsignore mdadm-2.5.2-static.patch mdadm.spec sources Removed Files: mdadm-2.3.1-fswab64.patch mdadm-2.5.4-guid-printout.patch mdassemble.8 mdmpd-0.4-node.patch mdmpd.init Log Message: * Fri Jan 26 2007 Doug Ledford - 2.6-1 - Update to latest upstream version - Remove the mdmpd daemon entirely. Now that multipath tools from the lvm/dm packages handles multipath devices well, this is no longer needed. - Various cleanups in the spec file Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mdadm/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 13 Oct 2006 13:14:06 -0000 1.15 +++ .cvsignore 26 Jan 2007 19:17:05 -0000 1.16 @@ -4,3 +4,4 @@ mdadm-2.5.2.tar.bz2 mdadm-2.5.3.tar.bz2 mdadm-2.5.4.tgz +mdadm-2.6.tgz mdadm-2.5.2-static.patch: Makefile | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Index: mdadm-2.5.2-static.patch =================================================================== RCS file: /cvs/dist/rpms/mdadm/devel/mdadm-2.5.2-static.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mdadm-2.5.2-static.patch 7 Jul 2006 19:24:16 -0000 1.1 +++ mdadm-2.5.2-static.patch 26 Jan 2007 19:17:05 -0000 1.2 @@ -1,6 +1,6 @@ ---- mdadm-2.5.2/Makefile.static 2006-07-07 14:12:20.000000000 -0400 -+++ mdadm-2.5.2/Makefile 2006-07-07 14:17:54.000000000 -0400 -@@ -141,20 +141,22 @@ $(OBJS) : mdadm.h bitmap.h +--- mdadm-2.6/Makefile.static 2007-01-26 11:16:37.000000000 -0500 ++++ mdadm-2.6/Makefile 2007-01-26 11:24:55.000000000 -0500 +@@ -145,23 +145,26 @@ sha1.o : sha1.c sha1.h md5.h $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c @@ -29,3 +29,7 @@ install-man: mdadm.8 md.4 mdadm.conf.5 $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 ++ $(INSTALL) -D -m 644 mdassemble.8 $(DESTDIR)$(MAN8DIR)/mdassemble.8 + $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 + $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 + Index: mdadm.spec =================================================================== RCS file: /cvs/dist/rpms/mdadm/devel/mdadm.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- mdadm.spec 9 Nov 2006 17:42:25 -0000 1.38 +++ mdadm.spec 26 Jan 2007 19:17:05 -0000 1.39 @@ -1,20 +1,14 @@ Summary: mdadm controls Linux md devices (software RAID arrays) Name: mdadm -Version: 2.5.4 -Release: 3%{?dist} +Version: 2.6 +Release: 1%{?dist} Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz Source1: mdmonitor.init -Source2: mdmpd-0.4.tgz -Source3: mdmpd.init -Source4: mdassemble.8 -Patch: mdadm-1.5.0-email.patch -Patch1: mdmpd-0.4-node.patch +Patch1: mdadm-1.5.0-email.patch Patch2: mdadm-2.5.2-s390-build.patch Patch3: mdadm-2.5.2-static.patch -Patch4: mdadm-2.5.4-guid-printout.patch -Patch5: mdadm-2.2-nodiet.patch -Patch6: mdadm-2.5.2-cflags.patch -Patch7: mdadm-2.3.1-fswab64.patch +Patch4: mdadm-2.2-nodiet.patch +Patch5: mdadm-2.5.2-cflags.patch URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/ License: GPL Group: System Environment/Base @@ -30,27 +24,20 @@ file can be used to help with some common tasks. %prep -%setup -q -a 2 -%patch -p1 -b .email -%patch1 -p1 -b .node +%setup -q +%patch1 -p1 -b .email %patch2 -p1 -b .s390 %patch3 -p1 -b .static -%patch4 -p1 -b .printout -%patch5 -p1 -b .nodiet -%patch6 -p1 -b .cflags -#%patch7 -p1 -b .fswab64 +%patch4 -p1 -b .nodiet +%patch5 -p1 -b .cflags + %build make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" MDASSEMBLE_AUTO=1 mdadm mdadm.static mdassemble.static -make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd %install make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor -install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd -install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man8/mdassemble.8 -mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm %clean @@ -58,24 +45,24 @@ %post /sbin/chkconfig --add mdmonitor -/sbin/chkconfig --add mdmpd +# If we are upgrading, the postun for mdmpd will not have deleted the init.d +# file, so clean the stale file out here. We should only have to carry this +# baggage around for a little while before we can assume that the old mdmpd +# stuff has been cleaned up. +if [ -x /etc/init.d/mdmpd ]; then + service mdmpd stop > /dev/null 2>&1 ||: + /sbin/chkconfig --del mdmpd +fi %preun if [ "$1" = 0 ]; then service mdmonitor stop > /dev/null 2>&1 ||: /sbin/chkconfig --del mdmonitor - if [ -e %{_initrddir}/mdmpd ]; then - service mdmpd stop > /dev/null 2>&1 ||: - /sbin/chkconfig --del mdmpd - fi fi %postun if [ "$1" -ge "1" ]; then service mdmonitor condrestart > /dev/null 2>&1 - if [ -e %{_initrddir}/mdmpd ]; then - service mdmpd condrestart > /dev/null 2>&1 - fi fi %files @@ -84,10 +71,15 @@ /sbin/* %{_initrddir}/* %{_mandir}/man*/md* -%attr(0700,root,root) %dir /var/run/mdmpd %attr(0700,root,root) %dir /var/run/mdadm %changelog +* Fri Jan 26 2007 Doug Ledford - 2.6-1 +- Update to latest upstream version +- Remove the mdmpd daemon entirely. Now that multipath tools from the lvm/dm + packages handles multipath devices well, this is no longer needed. +- Various cleanups in the spec file + * Thu Nov 09 2006 Doug Ledford - 2.5.4-3 - Add a fix for the broken printout of array GUID when using the -E --brief flags Index: sources =================================================================== RCS file: /cvs/dist/rpms/mdadm/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 13 Oct 2006 13:14:06 -0000 1.15 +++ sources 26 Jan 2007 19:17:05 -0000 1.16 @@ -1,2 +1 @@ -d173fc81f2cc11cb84522fac63e876f1 mdmpd-0.4.tgz -167f6fe5b55a82766cf397377e080bea mdadm-2.5.4.tgz +15019078eacc8c21eac7b0b7faf86129 mdadm-2.6.tgz --- mdadm-2.3.1-fswab64.patch DELETED --- --- mdadm-2.5.4-guid-printout.patch DELETED --- --- mdassemble.8 DELETED --- --- mdmpd-0.4-node.patch DELETED --- --- mdmpd.init DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 26 19:43:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 14:43:03 -0500 Subject: rpms/emacs/devel emacs.spec,1.85,1.86 Message-ID: <200701261943.l0QJh33g022779@cvs.devel.redhat.com> Author: coldwell Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22749 Modified Files: emacs.spec Log Message: remove Tetris to avoid trademark problems (Ville Skytt?? #224627) Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- emacs.spec 25 Jan 2007 20:00:14 -0000 1.85 +++ emacs.spec 26 Jan 2007 19:43:00 -0000 1.86 @@ -3,7 +3,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 22.0.93 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -103,6 +103,10 @@ # fix po-auto-replace-revision-date nil patch < %SOURCE16 ) +# avoid trademark issues +( cd lisp/play + rm -f tetris.el tetris.elc ) + %build export CFLAGS="-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 $RPM_OPT_FLAGS" @@ -281,6 +285,9 @@ %dir %{_datadir}/emacs/%{version} %changelog +* Fri Jan 26 2007 Chip Coldwell - 22.0.93-5 +- remove Tetris to avoid trademark problems (Ville Skytt?? #224627) + * Thu Jan 25 2007 Chip Coldwell - 22.0.93-4 - fixup loaddefs.el dependencies (Dan Nicolaescu #176171) - add BuildRequires: automake (changes to Makefile.in) From fedora-cvs-commits at redhat.com Fri Jan 26 20:09:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 15:09:20 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.369, 1.370 anaconda.spec, 1.495, 1.496 sources, 1.493, 1.494 Message-ID: <200701262009.l0QK9KUw012565@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12526/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.18-1 on branch devel from anaconda-11.2.0.18-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- .cvsignore 24 Jan 2007 20:38:48 -0000 1.369 +++ .cvsignore 26 Jan 2007 20:09:13 -0000 1.370 @@ -1 +1 @@ -anaconda-11.2.0.17.tar.bz2 +anaconda-11.2.0.18.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.495 retrieving revision 1.496 diff -u -r1.495 -r1.496 --- anaconda.spec 24 Jan 2007 20:38:48 -0000 1.495 +++ anaconda.spec 26 Jan 2007 20:09:13 -0000 1.496 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.2.0.17 +Version: 11.2.0.18 Release: 1 License: GPL Summary: Graphical system installer @@ -109,6 +109,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 26 2007 Jeremy Katz - 11.2.0.18-1 +- Fix pkgorder +- Give indication of city being pointed at for timezone (clumens, #219417) + * Wed Jan 24 2007 Jeremy Katz - 11.2.0.17-1 - Disable extra repo for now Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.493 retrieving revision 1.494 diff -u -r1.493 -r1.494 --- sources 24 Jan 2007 20:38:48 -0000 1.493 +++ sources 26 Jan 2007 20:09:13 -0000 1.494 @@ -1 +1 @@ -93a6203bcbdbcfe55a405cf84fcd54a3 anaconda-11.2.0.17.tar.bz2 +b6dee317339b1eea0470c1bba0592b6c anaconda-11.2.0.18.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 26 20:50:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 15:50:03 -0500 Subject: rpms/hfsutils/devel hfsutils.spec,1.11,1.12 Message-ID: <200701262050.l0QKo3QW017805@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/hfsutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17762 Modified Files: hfsutils.spec Log Message: bump Index: hfsutils.spec =================================================================== RCS file: /cvs/dist/rpms/hfsutils/devel/hfsutils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hfsutils.spec 12 Jul 2006 06:21:55 -0000 1.11 +++ hfsutils.spec 26 Jan 2007 20:50:01 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Tools for reading and writing Macintosh HFS volumes. Name: hfsutils Version: 3.2.6 -Release: 7.2.2 +Release: 8 Group: Applications/File License: GPL Source: ftp://ftp.mars.org/pub/hfs/%{name}-%{version}.tar.gz @@ -120,6 +120,9 @@ %{_includedir}/rsrc.h %changelog +* Fri Jan 26 2007 Jesse Keating - 3.2.6-8 +- rebuild for new tcl + * Wed Jul 12 2006 Jesse Keating - 3.2.6-7.2.2 - rebuild From fedora-cvs-commits at redhat.com Fri Jan 26 22:46:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 17:46:57 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2913,1.2914 Message-ID: <200701262246.l0QMkvFe005836@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4733 Modified Files: kernel-2.6.spec Log Message: I hate sysfs. A lot. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2913 retrieving revision 1.2914 diff -u -r1.2913 -r1.2914 --- kernel-2.6.spec 23 Jan 2007 21:32:03 -0000 1.2913 +++ kernel-2.6.spec 26 Jan 2007 22:46:55 -0000 1.2914 @@ -2003,6 +2003,9 @@ # - tux. %changelog +* Fri Jan 26 2007 Bill Nottingham +- turn on CONFIG_SYSFS_DEPRECATED so that things actually work. *sigh* + * Tue Jan 23 2007 Jeremy Katz - temporarily restore START_ARRAY ioctl for mdraid so that we can have mdraid in test1 From fedora-cvs-commits at redhat.com Fri Jan 26 22:46:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 17:46:58 -0500 Subject: rpms/kernel/devel/configs config-generic,1.279,1.280 Message-ID: <200701262246.l0QMkwFH005903@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4733/configs Modified Files: config-generic Log Message: I hate sysfs. A lot. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.279 retrieving revision 1.280 diff -u -r1.279 -r1.280 --- config-generic 12 Jan 2007 00:58:21 -0000 1.279 +++ config-generic 26 Jan 2007 22:46:56 -0000 1.280 @@ -2784,7 +2784,7 @@ # CONFIG_TUX_DEBUG is not set CONFIG_CPUSETS=y -# CONFIG_SYSFS_DEPRECATED is not set +CONFIG_SYSFS_DEPRECATED=y CONFIG_RELAY=y # CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set From fedora-cvs-commits at redhat.com Fri Jan 26 22:52:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 17:52:12 -0500 Subject: rpms/gdb/devel gdb-6.6-upstream.patch, NONE, 1.1 gdb.spec, 1.218, 1.219 gdb-6.6-ia64-kernel-unwind.patch, 1.1, NONE gdb-6.6-ia64-pc-unwind.patch, 1.1, NONE Message-ID: <200701262252.l0QMqC3k029013@cvs.devel.redhat.com> Author: jkratoch Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28859 Modified Files: gdb.spec Added Files: gdb-6.6-upstream.patch Removed Files: gdb-6.6-ia64-kernel-unwind.patch gdb-6.6-ia64-pc-unwind.patch Log Message: * Fri Jan 26 2007 Jan Kratochvil - 6.6-2 - Backported post gdb-6.6 release PPC `show endian' fixup. - Fix displaying of numeric char arrays as strings (BZ 224128). - Simplified patches by merging upstream accepted ones into a single file. - Resolves: rhbz#224128 gdb-6.6-upstream.patch: NEWS | 3 + arch-utils.c | 2 - c-valprint.c | 2 - doc/gdb.texinfo | 20 +++++++++++ frame.c | 13 +++++-- ia64-tdep.c | 11 +++--- testsuite/gdb.arch/i386-sse.exp | 5 ++ testsuite/gdb.base/charsign.c | 37 ++++++++++++++++++++ testsuite/gdb.base/charsign.exp | 70 +++++++++++++++++++++++++++++++++++++++ testsuite/gdb.base/printcmds.exp | 12 +++--- testsuite/gdb.base/setvar.exp | 8 ++-- 11 files changed, 162 insertions(+), 21 deletions(-) --- NEW FILE gdb-6.6-upstream.patch --- 2006-12-28 Daniel Jacobowitz * ia64-tdep.c (get_kernel_table): Correct signedness in check for a negative return value. --- ./gdb/ia64-tdep.c 12 Jul 2006 18:13:45 -0000 1.140 +++ ./gdb/ia64-tdep.c 28 Dec 2006 23:48:51 -0000 1.141 @@ -2486,13 +2486,14 @@ get_kernel_table (unw_word_t ip, unw_dyn if (!ktab) { gdb_byte *ktab_buf; - size_t size; + LONGEST size; - ktab_size = getunwind_table (&ktab_buf); - if (ktab_size <= 0) + size = getunwind_table (&ktab_buf); + if (size <= 0) return -UNW_ENOINFO; - else - ktab = (struct ia64_table_entry *) ktab_buf; + + ktab = (struct ia64_table_entry *) ktab_buf; + ktab_size = size; for (etab = ktab; etab->start_offset; ++etab) etab->info_offset += KERNEL_START; 2007-01-11 Daniel Jacobowitz * frame.c (get_prev_frame_1): Check PC_REGNUM before using it. --- ./gdb/frame.c 9 Jan 2007 20:19:15 -0000 1.218 +++ ./gdb/frame.c 11 Jan 2007 17:18:22 -0000 1.219 @@ -1221,10 +1221,17 @@ get_prev_frame_1 (struct frame_info *thi have different frame IDs, the new frame will be bogus; two functions can't share a register save slot for the PC. This can happen when the prologue analyzer finds a stack adjustment, but - no PC save. This check does assume that the "PC register" is - roughly a traditional PC, even if the gdbarch_unwind_pc method - frobs it. */ + no PC save. + + This check does assume that the "PC register" is roughly a + traditional PC, even if the gdbarch_unwind_pc method adjusts + it (we do not rely on the value, only on the unwound PC being + dependent on this value). A potential improvement would be + to have the frame prev_pc method and the gdbarch unwind_pc + method set the same lval and location information as + frame_register_unwind. */ if (this_frame->level > 0 + && PC_REGNUM >= 0 && get_frame_type (this_frame) == NORMAL_FRAME && get_frame_type (this_frame->next) == NORMAL_FRAME) { 2007-01-20 Daniel Jacobowitz * arch-utils.c (show_endian): Correct reversed condition. --- ./gdb/arch-utils.c 13 Jan 2007 23:24:43 -0000 1.138 +++ ./gdb/arch-utils.c 20 Jan 2007 18:16:33 -0000 @@ -322,7 +322,7 @@ static void show_endian (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { - if (target_byte_order_user != BFD_ENDIAN_UNKNOWN) + if (target_byte_order_user == BFD_ENDIAN_UNKNOWN) if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) fprintf_unfiltered (file, _("The target endianness is set automatically " "(currently big endian)\n")); https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224128 2007-01-26 Jan Kratochvil * c-valprint.c (c_val_print): Require strings to be of no-signed CHARs. * NEWS: Describe CHAR array vs. string identifcation rules. 2007-01-26 Jan Kratochvil Eli Zaretskii * gdb.texinfo: Describe CHAR array vs. string identifcation rules. 2007-01-25 Jan Kratochvil * gdb.base/charsign.exp, gdb.base/charsign.c: New files. * gdb.arch/i386-sse.exp: Check $xmm.v16_int8 printing as a number array. * gdb.base/printcmds.exp: Sign-provided CHARs now became arrays. * gdb.base/setvar.exp: Likewise. --- ./gdb/NEWS 21 Jan 2007 17:48:53 -0000 1.211 +++ ./gdb/NEWS 26 Jan 2007 10:31:48 -0000 @@ -15,6 +15,9 @@ frequency signals (e.g. SIGALRM) via the target's overall architecture. GDB can read a description from a local file or over the remote serial protocol. +* Arrays of explicitly SIGNED or UNSIGNED CHARs are now printed as arrays + of numbers. + * New commands set mem inaccessible-by-default --- ./gdb/c-valprint.c 9 Jan 2007 17:58:50 -0000 1.41 +++ ./gdb/c-valprint.c 26 Jan 2007 10:31:48 -0000 @@ -96,7 +96,7 @@ c_val_print (struct type *type, const gd } /* For an array of chars, print with string syntax. */ if (eltlen == 1 && - ((TYPE_CODE (elttype) == TYPE_CODE_INT) + ((TYPE_CODE (elttype) == TYPE_CODE_INT && TYPE_NOSIGN (elttype)) || ((current_language->la_language == language_m2) && (TYPE_CODE (elttype) == TYPE_CODE_CHAR))) && (format == 0 || format == 's')) --- ./gdb/doc/gdb.texinfo 26 Jan 2007 08:54:01 -0000 1.380 +++ ./gdb/doc/gdb.texinfo 26 Jan 2007 10:32:00 -0000 @@ -5632,6 +5632,26 @@ If you ask to print an object whose cont by the debug information, @value{GDBN} will say @samp{}. @xref{Symbols, incomplete type}, for more about this. +Strings are identified as arrays of @code{char} values without specified +signedness. Arrays of either @code{signed char} or @code{unsigned char} get +printed as arrays of 1 byte sized integers. @code{-fsigned-char} or + at code{-funsigned-char} @value{NGCC} options have no effect as @value{GDBN} +defines literal string type @code{"char"} as @code{char} without a sign. +For program code + + at smallexample +char var0[] = "A"; +signed char var1[] = "A"; + at end smallexample + +You get during debugging + at smallexample +(gdb) print var0 +$1 = "A" +(gdb) print var1 +$2 = @{65 'A', 0 '\0'@} + at end smallexample + @node Arrays @section Artificial arrays --- ./gdb/testsuite/gdb.arch/i386-sse.exp 9 Jan 2007 17:59:09 -0000 1.5 +++ ./gdb/testsuite/gdb.arch/i386-sse.exp 26 Jan 2007 10:32:00 -0000 @@ -83,7 +83,10 @@ gdb_continue_to_breakpoint "continue to foreach r {0 1 2 3 4 5 6 7} { gdb_test "print \$xmm$r.v4_float" \ ".. = \\{$r, $r.25, $r.5, $r.75\\}.*" \ - "check contents of %xmm$r" + "check float contents of %xmm$r" + gdb_test "print \$xmm$r.v16_int8" \ + ".. = \\{(-?\[0-9\]+ '.*', ){15}-?\[0-9\]+ '.*'\\}.*" \ + "check int8 contents of %xmm$r" } foreach r {0 1 2 3 4 5 6 7} { --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.base/charsign.c 26 Jan 2007 10:32:00 -0000 @@ -0,0 +1,37 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2007 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 */ + +int main() +{ + return 0; +} + +char n[]="A"; +signed char s[]="A"; +unsigned char u[]="A"; + +typedef char char_n; +typedef signed char char_s; +typedef unsigned char char_u; + +char_n n_typed[]="A"; +char_s s_typed[]="A"; +char_u u_typed[]="A"; --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ./gdb/testsuite/gdb.base/charsign.exp 26 Jan 2007 10:32:00 -0000 @@ -0,0 +1,70 @@ +# Copyright 2007 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. + +if $tracelevel then { + strace $tracelevel +} + +set prms_id 0 +set bug_id 0 + +set testfile charsign +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +proc do_test { cflags } { + global srcdir + global binfile + global subdir + global srcfile + global gdb_prompt + + if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug additional_flags=$cflags]] != "" } { + untested "Couldn't compile test program" + return -1 + } + + # Get things started. + + gdb_exit + gdb_start + gdb_reinitialize_dir $srcdir/$subdir + gdb_load ${binfile} + + # For C programs, "start" should stop in main(). + + gdb_test "p n" \ + "= \"A\"" + gdb_test "p s" \ + "= \\{65 'A', 0 '\\\\0'\\}" + gdb_test "p u" \ + "= \\{65 'A', 0 '\\\\0'\\}" + gdb_test "p n_typed" \ + "= \"A\"" + gdb_test "p s_typed" \ + "= \\{65 'A', 0 '\\\\0'\\}" + gdb_test "p u_typed" \ + "= \\{65 'A', 0 '\\\\0'\\}" +} + +# The string identification works despite the compiler flags below due to +# gdbtypes.c: +# if (name && strcmp (name, "char") == 0) +# TYPE_FLAGS (type) |= TYPE_FLAG_NOSIGN; + +do_test {} +do_test {-fsigned-char} +do_test {-funsigned-char} --- ./gdb/testsuite/gdb.base/printcmds.exp 9 Jan 2007 17:59:11 -0000 1.14 +++ ./gdb/testsuite/gdb.base/printcmds.exp 26 Jan 2007 10:32:01 -0000 @@ -590,18 +590,18 @@ proc test_print_char_arrays {} { gdb_test "set print address on" "" gdb_test "p arrays" \ - " = {array1 = \"abc\", array2 = \"d\", array3 = \"e\", array4 = \"fg\", array5 = \"hij\"}" + " = \\{array1 = \\{97 'a', 98 'b', 99 'c', 0 '\\\\0'\\}, array2 = \\{100 'd'\\}, array3 = \\{101 'e'\\}, array4 = \\{102 'f', 103 'g'\\}, array5 = \\{104 'h', 105 'i', 106 'j', 0 '\\\\0'\\}\\}" gdb_test "p parrays" " = \\(struct some_arrays \\*\\) $hex" - gdb_test "p parrays->array1" " = \"abc\"" + gdb_test "p parrays->array1" " = \\{97 'a', 98 'b', 99 'c', 0 '\\\\0'\\}" gdb_test "p &parrays->array1" " = \\(unsigned char \\(\\*\\)\\\[4\\\]\\) $hex" - gdb_test "p parrays->array2" " = \"d\"" + gdb_test "p parrays->array2" " = \\{100 'd'\\}" gdb_test "p &parrays->array2" " = \\(unsigned char \\(\\*\\)\\\[1\\\]\\) $hex" - gdb_test "p parrays->array3" " = \"e\"" + gdb_test "p parrays->array3" " = \\{101 'e'\\}" gdb_test "p &parrays->array3" " = \\(unsigned char \\(\\*\\)\\\[1\\\]\\) $hex" - gdb_test "p parrays->array4" " = \"fg\"" + gdb_test "p parrays->array4" " = \\{102 'f', 103 'g'\\}" gdb_test "p &parrays->array4" " = \\(unsigned char \\(\\*\\)\\\[2\\\]\\) $hex" - gdb_test "p parrays->array5" " = \"hij\"" + gdb_test "p parrays->array5" " = \\{104 'h', 105 'i', 106 'j', 0 '\\\\0'\\}" gdb_test "p &parrays->array5" " = \\(unsigned char \\(\\*\\)\\\[4\\\]\\) $hex" gdb_test "set print address off" "" --- ./gdb/testsuite/gdb.base/setvar.exp 9 Jan 2007 17:59:11 -0000 1.10 +++ ./gdb/testsuite/gdb.base/setvar.exp 26 Jan 2007 10:32:01 -0000 @@ -233,11 +233,11 @@ test_set "set variable v_char_array\[0\] # # test "set variable" for "signed char array[2]" # -test_set "set variable v_signed_char_array\[0\]='h'" "set variable v_signed_char_array\[1\]='i'" "print v_signed_char_array" ".*.\[0-9\]* =.*\"hi\"" "set variable signed char array=\"hi\" (string)" +test_set "set variable v_signed_char_array\[0\]='h'" "set variable v_signed_char_array\[1\]='i'" "print v_signed_char_array" ".*.\[0-9\]* =.*\\{104 'h', 105 'i'\\}" "set variable signed char array=\"hi\" (string)" # # test "set variable" for "unsigned char array[2]" # -test_set "set variable v_unsigned_char_array\[0\]='h'" "set variable v_unsigned_char_array\[1\]='i'" "print v_unsigned_char_array" ".*.\[0-9\]* =.*\"hi\"" "set variable unsigned char array=\"hi\" (string)" +test_set "set variable v_unsigned_char_array\[0\]='h'" "set variable v_unsigned_char_array\[1\]='i'" "print v_unsigned_char_array" ".*.\[0-9\]* =.*\\{104 'h', 105 'i'\\}" "set variable unsigned char array=\"hi\" (string)" # # test "set variable" for "short array[2]" # @@ -289,11 +289,11 @@ test_set "set v_char_pointer=v_char_arra # # test "set variable" for type "signed char *" # -test_set "set v_signed_char_pointer=v_signed_char_array" "set variable *(v_signed_char_pointer)='h'" "set variable *(v_signed_char_pointer+1)='i'" "print v_signed_char_array" ".*.\[0-9\]* =.*\"hi\"" "print *(v_signed_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'" "set variable signed char pointer=\"hi\" (string)" +test_set "set v_signed_char_pointer=v_signed_char_array" "set variable *(v_signed_char_pointer)='h'" "set variable *(v_signed_char_pointer+1)='i'" "print v_signed_char_array" ".*.\[0-9\]* =.*\\{104 'h', 105 'i'\\}" "print *(v_signed_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'" "set variable signed char pointer=\"hi\" (string)" # # test "set variable" for type "unsigned char *" # -test_set "set v_unsigned_char_pointer=v_unsigned_char_array" "set variable *(v_unsigned_char_pointer)='h'" "set variable *(v_unsigned_char_pointer+1)='i'" "print v_unsigned_char_array" ".*.\[0-9\]* =.*\"hi\"" "print *(v_unsigned_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'" "set variable unsigned char pointer=\"hi\" (string)" +test_set "set v_unsigned_char_pointer=v_unsigned_char_array" "set variable *(v_unsigned_char_pointer)='h'" "set variable *(v_unsigned_char_pointer+1)='i'" "print v_unsigned_char_array" ".*.\[0-9\]* =.*\\{104 'h', 105 'i'\\}" "print *(v_unsigned_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'" "set variable unsigned char pointer=\"hi\" (string)" # # test "set variable" for type "short *" # Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- gdb.spec 21 Jan 2007 01:53:01 -0000 1.218 +++ gdb.spec 26 Jan 2007 22:52:10 -0000 1.219 @@ -11,7 +11,7 @@ Version: 6.6 # The release always contains a leading reserved number, start it at 1. -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Debuggers @@ -302,9 +302,8 @@ # Testcase for exec() from threaded program (BZ 202689). Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch -# Backported post gdb-6.6 release ia64 unwinding fixups. -Patch232: gdb-6.6-ia64-kernel-unwind.patch -Patch233: gdb-6.6-ia64-pc-unwind.patch +# Backported post gdb-6.6 release fixups. +Patch232: gdb-6.6-upstream.patch BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu gettext BuildRequires: flex bison sharutils @@ -430,7 +429,6 @@ %patch230 -p1 %patch231 -p1 %patch232 -p1 -%patch233 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -593,6 +591,11 @@ # don't include the files in include, they are part of binutils %changelog +* Fri Jan 26 2007 Jan Kratochvil - 6.6-2 +- Backported post gdb-6.6 release PPC `show endian' fixup. +- Fix displaying of numeric char arrays as strings (BZ 224128). +- Simplified patches by merging upstream accepted ones into a single file. + * Sat Jan 20 2007 Jan Kratochvil - 6.6-1 - Upgrade to GDB 6.6. Drop redundant patches, forward-port remaining ones. - Backported post gdb-6.6 release ia64 unwinding fixups. --- gdb-6.6-ia64-kernel-unwind.patch DELETED --- --- gdb-6.6-ia64-pc-unwind.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 27 02:17:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 21:17:49 -0500 Subject: rpms/fedora-release/devel fedora-release.spec,1.46,1.47 Message-ID: <200701270217.l0R2HnVh022881@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/fedora-release/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21943 Modified Files: fedora-release.spec Log Message: la la la la Index: fedora-release.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- fedora-release.spec 24 Jan 2007 19:46:17 -0000 1.46 +++ fedora-release.spec 27 Jan 2007 02:17:46 -0000 1.47 @@ -1,9 +1,9 @@ %define release_name Rawhide -Summary: Fedora Core release files +Summary: Fedora release files Name: fedora-release Version: 6.90 -Release: 1 +Release: 2 License: GFDL Group: System Environment/Base URL: http://fedoraproject.org @@ -15,7 +15,7 @@ BuildArch: noarch %description -Fedora Core release files +Fedora release files %prep %setup -q -n fedora-release-6 @@ -25,7 +25,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc -echo "Fedora Core release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release +echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net @@ -63,6 +63,9 @@ /etc/pki/rpm-gpg/* %changelog +* Fri Jan 26 2007 Jesse Keating - 6.90-2 +- Core? What Core? + * Wed Jan 24 2007 Jeremy Katz - 6.90-1 - Bump to 6.90. Keep working with older release notes From fedora-cvs-commits at redhat.com Sat Jan 27 04:25:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 23:25:45 -0500 Subject: rpms/anaconda/devel anaconda.spec,1.496,1.497 Message-ID: <200701270425.l0R4PjFM002960@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2946 Modified Files: anaconda.spec Log Message: rebuild against old pciutils Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.496 retrieving revision 1.497 diff -u -r1.496 -r1.497 --- anaconda.spec 26 Jan 2007 20:09:13 -0000 1.496 +++ anaconda.spec 27 Jan 2007 04:25:42 -0000 1.497 @@ -1,6 +1,6 @@ Name: anaconda Version: 11.2.0.18 -Release: 1 +Release: 2 License: GPL Summary: Graphical system installer Group: Applications/System @@ -109,6 +109,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 26 2007 Jeremy Katz - 11.2.0.18-2 +- rebuild against older pciutils + * Fri Jan 26 2007 Jeremy Katz - 11.2.0.18-1 - Fix pkgorder - Give indication of city being pointed at for timezone (clumens, #219417) From fedora-cvs-commits at redhat.com Sat Jan 27 04:48:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 23:48:39 -0500 Subject: rpms/eclipse/devel eclipse-ecj-square-bracket-classpath.patch, 1.1, 1.2 eclipse.spec, 1.399, 1.400 Message-ID: <200701270448.l0R4mdTr010600@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10116 Modified Files: eclipse-ecj-square-bracket-classpath.patch eclipse.spec Log Message: Fix bug in ecj [] patch. eclipse-ecj-square-bracket-classpath.patch: Main.java | 101 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 35 deletions(-) Index: eclipse-ecj-square-bracket-classpath.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-ecj-square-bracket-classpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-ecj-square-bracket-classpath.patch 29 Oct 2006 01:58:05 -0000 1.1 +++ eclipse-ecj-square-bracket-classpath.patch 27 Jan 2007 04:48:36 -0000 1.2 @@ -1,12 +1,10 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.jdt.core Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v retrieving revision 1.254.4.1 diff -u -r1.254.4.1 Main.java --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2 Jul 2006 10:11:58 -0000 1.254.4.1 -+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Oct 2006 21:45:05 -0000 ++++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 19 Jan 2007 19:22:57 -0000 @@ -28,9 +28,11 @@ import java.text.MessageFormat; import java.util.ArrayList; @@ -40,7 +38,7 @@ import org.eclipse.jdt.internal.compiler.util.Util; public class Main implements ProblemSeverities, SuffixConstants { -@@ -2989,56 +2991,73 @@ +@@ -2989,56 +2991,74 @@ ArrayList currentRuleSpecs = new ArrayList(defaultSize); StringTokenizer tokenizer = new StringTokenizer(currentPath, File.pathSeparator + "[]", true); //$NON-NLS-1$ @@ -90,6 +88,7 @@ - case readyToCloseEndingWithRules: case readyToCloseOrOtherEntry: - state = readyToCloseOrOtherEntry; ++ Collections.reverse(currentRuleSpecs); addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); currentRuleSpecs.clear(); + state = readyForPathOrRules; @@ -139,7 +138,7 @@ state = error; } -@@ -3046,24 +3065,25 @@ +@@ -3046,24 +3066,26 @@ // regular word switch (state) { case start: @@ -170,10 +169,11 @@ - case readyToCloseOrOtherEntry : + case readyForPathOrRules: + case readyToCloseOrOtherEntry: ++ Collections.reverse(currentRuleSpecs); addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); break; default : -@@ -3071,4 +3091,13 @@ +@@ -3071,4 +3093,13 @@ this.logger.logIncorrectClasspath(currentPath); } } Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.399 retrieving revision 1.400 diff -u -r1.399 -r1.400 --- eclipse.spec 16 Jan 2007 17:28:29 -0000 1.399 +++ eclipse.spec 27 Jan 2007 04:48:36 -0000 1.400 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 31%{?dist} +Release: 32%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1730,6 +1730,9 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Fri Jan 26 2007 Ben Konrath 3.2.1-32 +- Fix bug in ecj [] patch. + * Tue Jan 16 2007 Ben Konrath 3.2.1-31 - Add bugzilla reference to remove jars bug in comment. - Update bugzilla refereces to [] bugs. From fedora-cvs-commits at redhat.com Sat Jan 27 04:52:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 26 Jan 2007 23:52:52 -0500 Subject: rpms/eclipse/devel eclipse-buildDocPlugins.patch,1.1,NONE Message-ID: <200701270452.l0R4qqYg020409@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20377 Removed Files: eclipse-buildDocPlugins.patch Log Message: rm eclipse-buildDocPlugins.patch --- eclipse-buildDocPlugins.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 27 05:35:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 27 Jan 2007 00:35:22 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.400,1.401 Message-ID: <200701270535.l0R5ZLqa027399@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27352 Modified Files: eclipse.spec Log Message: remove unnecessary comments Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.400 retrieving revision 1.401 diff -u -r1.400 -r1.401 --- eclipse.spec 27 Jan 2007 04:48:36 -0000 1.400 +++ eclipse.spec 27 Jan 2007 05:35:18 -0000 1.401 @@ -81,8 +81,6 @@ Patch8: %{name}-webapp-tomcat55.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 Patch5: %{name}-updatehomedir.patch -# JPackage []s in names of symlinks ... -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199961 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=161996 Patch9: %{name}-ecj-square-bracket-classpath.patch # Use ecj for gcj From fedora-cvs-commits at redhat.com Sat Jan 27 05:51:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 27 Jan 2007 00:51:31 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.401,1.402 Message-ID: <200701270551.l0R5pV76005804@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1482 Modified Files: eclipse.spec Log Message: small clean up Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.401 retrieving revision 1.402 diff -u -r1.401 -r1.402 --- eclipse.spec 27 Jan 2007 05:35:18 -0000 1.401 +++ eclipse.spec 27 Jan 2007 05:51:29 -0000 1.402 @@ -82,7 +82,7 @@ # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 Patch5: %{name}-updatehomedir.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=161996 -Patch9: %{name}-ecj-square-bracket-classpath.patch +Patch9: %{name}-ecj-square-bracket-classpath.patch # Use ecj for gcj # The patch to Main.java can go away with 3.2.2. Patch17: %{name}-ecj-gcj.patch @@ -102,7 +102,7 @@ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853 Patch20: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch # This is already upstream in 3.3 builds. It *may* get into 3.2.2. -Patch21: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch +Patch21: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch # Add ppc64 to the list of arches with gre64.conf # part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016 Patch22: %{name}-ppc64gre64.patch From fedora-cvs-commits at redhat.com Sat Jan 27 16:14:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 27 Jan 2007 11:14:18 -0500 Subject: rpms/openoffice.org/devel sources,1.218,1.219 Message-ID: <200701271614.l0RGEICH026030@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26014 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- sources 26 Jan 2007 08:35:05 -0000 1.218 +++ sources 27 Jan 2007 16:14:16 -0000 1.219 @@ -10,4 +10,4 @@ b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz -0a0b01bc70afcef9814d87ac0dc2f1f3 OOF680_m3.tar.bz2 +47e92cd8ead74e13c9e56050a98fadb5 OOF680_m4.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 27 16:17:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 27 Jan 2007 11:17:14 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1010,1.1011 Message-ID: <200701271617.l0RGHEaX029539@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26763 Modified Files: openoffice.org.spec Log Message: next candidate Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1010 retrieving revision 1.1011 diff -u -r1.1010 -r1.1011 --- openoffice.org.spec 26 Jan 2007 09:34:45 -0000 1.1010 +++ openoffice.org.spec 27 Jan 2007 16:17:12 -0000 1.1011 @@ -1,5 +1,5 @@ %define oootag OOF680 -%define ooomilestone 3 +%define ooomilestone 4 %define rh_rpm_release 1 # gcc#19664# @@ -2584,6 +2584,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Sat Jan 27 2007 Caolan McNamara - 1:2.2.0-4.1 +- next candidate + * Fri Jan 26 2007 Caolan McNamara - 1:2.2.0-3.1 - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#223190 openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch From fedora-cvs-commits at redhat.com Sun Jan 28 05:04:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 28 Jan 2007 00:04:01 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.81,1.82 Message-ID: <200701280504.l0S541RH015045@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15020 Modified Files: spamassassin.spec Log Message: - explicit requires on perl(HTTP::Date) and perl(LWP::UserAgent) (Bug #193100) Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- spamassassin.spec 22 Jan 2007 17:07:26 -0000 1.81 +++ spamassassin.spec 28 Jan 2007 05:03:58 -0000 1.82 @@ -12,7 +12,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.7 -Release: 5%{?dist} +Release: 6%{?dist} License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -42,6 +42,8 @@ BuildRequires: perl(HTML::Parser) BuildRequires: openssl-devel +Requires: perl(HTTP::Date) +Requires: perl(LWP::UserAgent) Requires: perl(Net::DNS) Requires: perl(Time::HiRes) Requires: perl(DB_File) @@ -183,6 +185,10 @@ exit 0 %changelog +* Sun Jan 28 2007 Warren Togami 3.1.7-6 +- explicit requires on perl(HTTP::Date) and perl(LWP::UserAgent) + (Bug #193100) + * Mon Jan 22 2007 Warren Togami 3.1.7-5 - fix typo in logrotate.d (#223817) From fedora-cvs-commits at redhat.com Sun Jan 28 14:57:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 28 Jan 2007 09:57:48 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org.spec,1.920,1.921 Message-ID: <200701281457.l0SEvmfM011229@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11132 Modified Files: openoffice.org.spec Log Message: changelog date Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.920 retrieving revision 1.921 diff -u -r1.920 -r1.921 --- openoffice.org.spec 26 Jan 2007 08:27:19 -0000 1.920 +++ openoffice.org.spec 28 Jan 2007 14:57:45 -0000 1.921 @@ -2567,7 +2567,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Jan 15 2006 Caolan McNamara - 1:2.0.4-5.5.11 +* Mon Jan 15 2007 Caolan McNamara - 1:2.0.4-5.5.11 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch From fedora-cvs-commits at redhat.com Sun Jan 28 15:01:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 28 Jan 2007 10:01:15 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.19, 1.20 openoffice.org.spec, 1.1011, 1.1012 Message-ID: <200701281501.l0SF1F2A013618@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13521 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch openoffice.org.spec Log Message: cupsinitalize crash openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/psprint/ppdparser.hxx | 4 psprint/source/printer/cupsmgr.cxx | 11 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 516 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 ++++++ vcl/source/gdi/print.cxx | 11 26 files changed, 757 insertions(+), 14 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 22 Jan 2007 09:27:00 -0000 1.19 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 28 Jan 2007 15:01:13 -0000 1.20 @@ -363,6 +363,18 @@ // check for CUPS server(?) > 1.2 // since there is no API to query, check for options that were +@@ -485,9 +486,9 @@ + // this is needed to check for %%IncludeFeature support + // (#i65684#, #i65491#) + cups_dest_t* pDest = ((cups_dest_t*)m_pDests); +- const char* pOpt = m_pCUPSWrapper->cupsGetOption( "printer-info", ++ const char* pOpt = pDest ? m_pCUPSWrapper->cupsGetOption( "printer-info", + pDest->num_options, +- pDest->options ); ++ pDest->options ) : 0; + if( pOpt ) + m_bUseIncludeFeature = true; + @@ -569,6 +570,10 @@ m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback ); Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1011 retrieving revision 1.1012 diff -u -r1.1011 -r1.1012 --- openoffice.org.spec 27 Jan 2007 16:17:12 -0000 1.1011 +++ openoffice.org.spec 28 Jan 2007 15:01:13 -0000 1.1012 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 4 -%define rh_rpm_release 1 +%define rh_rpm_release 2 # gcc#19664# %define stlvisibilityfcked 1 @@ -2584,6 +2584,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Sun Jan 28 2007 Caolan McNamara - 1:2.2.0-4.2 +- fix CUPSManager::initialize + * Sat Jan 27 2007 Caolan McNamara - 1:2.2.0-4.1 - next candidate From fedora-cvs-commits at redhat.com Sun Jan 28 20:41:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 28 Jan 2007 15:41:57 -0500 Subject: rpms/kdebase/devel kdebase-3.5.5-1-redhat-startkde.patch, NONE, 1.1 kdebase-3.5.5-dbus.patch, NONE, 1.1 kdebase-3.5.5-keyinit.patch, NONE, 1.1 kdebase-3.5.5-redhat-pam.patch, NONE, 1.1 kdebase-3.5.5-suspend.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 kdebase.spec, 1.234, 1.235 sources, 1.74, 1.75 kde-libtool.patch, 1.1, NONE kdebase-3.5.3-1-redhat.patch, 1.1, NONE kdebase-3.5.3-dbus.patch, 1.2, NONE kdebase-3.5.3-keyinit.patch, 1.1, NONE kdebase-3.5.4-2-redhat.patch, 1.2, NONE kdebase-3.5.4-halbackend-dbus.patch, 1.1, NONE kdebase-3.5.4-kde#124116.patch, 1.1, NONE kdebase-3.5.4-kde#128552.patch, 1.1, NONE kdebase-3.5.4-kde#131770.patch, 1.1, NONE kdebase-3.5.4-kde#132873.patch, 1.1, NONE kdebase-3.5.4-kde#133665.patch, 1.1, NONE kdebase-3.5.4-kde#53642.patch, 1.1, NONE kdebase-3.5.4-kdm.patch, 1.1, NONE kdebase-3.5.4-leaks.patch, 1.2, NONE Message-ID: <200701282041.l0SKfvRR000853@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv633 Modified Files: .cvsignore kdebase.spec sources Added Files: kdebase-3.5.5-1-redhat-startkde.patch kdebase-3.5.5-dbus.patch kdebase-3.5.5-keyinit.patch kdebase-3.5.5-redhat-pam.patch kdebase-3.5.5-suspend.patch Removed Files: kde-libtool.patch kdebase-3.5.3-1-redhat.patch kdebase-3.5.3-dbus.patch kdebase-3.5.3-keyinit.patch kdebase-3.5.4-2-redhat.patch kdebase-3.5.4-halbackend-dbus.patch kdebase-3.5.4-kde#124116.patch kdebase-3.5.4-kde#128552.patch kdebase-3.5.4-kde#131770.patch kdebase-3.5.4-kde#132873.patch kdebase-3.5.4-kde#133665.patch kdebase-3.5.4-kde#53642.patch kdebase-3.5.4-kdm.patch kdebase-3.5.4-leaks.patch Log Message: 3.5.6 kdebase-3.5.5-1-redhat-startkde.patch: startkde | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 9 deletions(-) --- NEW FILE kdebase-3.5.5-1-redhat-startkde.patch --- --- kdebase-3.5.5/startkde.redhat 2006-10-02 13:13:29.000000000 +0200 +++ kdebase-3.5.5/startkde 2006-10-10 17:35:53.000000000 +0200 @@ -1,7 +1,54 @@ #!/bin/sh # # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.5 ) -# +# 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=`LANG=C df /tmp | xargs | cut -d" " -f11` +homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8` + +if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then + # check for AFS + space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10` +else + # check regular mounts + space_home=`LANG=C 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. @@ -14,12 +61,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 @@ -61,7 +108,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` @@ -170,9 +217,10 @@ # better use the Autostart folder. exepath=`kde-config --path exe | tr : '\n'` +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 @@ -378,7 +426,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 kdebase-3.5.5-dbus.patch: configure.in.in | 66 ----- mediamanager/Makefile.am | 11 mediamanager/connection.cpp | 168 +++++++++++++ mediamanager/connection.h | 86 ++++++ mediamanager/halbackend.h | 2 mediamanager/integrator.cpp | 244 +++++++++++++++++++ mediamanager/integrator.h | 95 +++++++ mediamanager/message.cpp | 551 ++++++++++++++++++++++++++++++++++++++++++++ mediamanager/message.h | 132 ++++++++++ 9 files changed, 1286 insertions(+), 69 deletions(-) --- NEW FILE kdebase-3.5.5-dbus.patch --- --- kdebase-3.5.5/kioslave/media/configure.in.in.dbus 2006-10-01 19:31:54.000000000 +0200 +++ kdebase-3.5.5/kioslave/media/configure.in.in 2006-10-10 19:55:19.000000000 +0200 @@ -97,70 +97,6 @@ AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_LIBS) - -########### Check for DBus-Qt3 bindings - - AC_MSG_CHECKING(for DBus-Qt3 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 @@ -168,7 +104,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.5/kioslave/media/mediamanager/halbackend.h.dbus 2006-07-22 10:15:45.000000000 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/halbackend.h 2006-10-10 17:41:42.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 --- /dev/null 2006-10-09 18:32:23.425560750 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/connection.cpp 2006-10-10 17:41:42.000000000 +0200 @@ -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_close( 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" --- /dev/null 2006-10-09 18:32:23.425560750 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/connection.h 2006-10-10 17:41:42.000000000 +0200 @@ -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 --- /dev/null 2006-10-09 18:32:23.425560750 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/message.h 2006-10-10 17:41:42.000000000 +0200 @@ -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 --- /dev/null 2006-10-09 18:32:23.425560750 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/integrator.h 2006-10-10 17:41:42.000000000 +0200 @@ -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 --- kdebase-3.5.5/kioslave/media/mediamanager/Makefile.am.dbus 2005-09-10 10:25:36.000000000 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/Makefile.am 2006-10-10 17:41:42.000000000 +0200 @@ -1,17 +1,22 @@ kde_module_LTLIBRARIES = kded_mediamanager.la if include_media_halbackend -HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS) +HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) endif METASOURCES = AUTO INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes) +DBUSQT3BINDING_LIB = libdbusqt3.la +libdbusqt3_la_SOURCES = connection.cpp integrator.cpp message.cpp +libdbusqt3_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined +libdbusqt3_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) + if include_media_halbackend HALBACKEND_LIB = libhalbackend.la libhalbackend_la_SOURCES = halbackend.cpp libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined -libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS) +libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT3BINDING_LIB) endif if include_media_linuxcdpolling @@ -20,7 +25,7 @@ liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined endif -noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) +noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) $(DBUSQT3BINDING_LIB) kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version --- /dev/null 2006-10-09 18:32:23.425560750 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/message.cpp 2006-10-10 17:41:42.000000000 +0200 @@ -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 +} + +} --- /dev/null 2006-10-09 18:32:23.425560750 +0200 +++ kdebase-3.5.5/kioslave/media/mediamanager/integrator.cpp 2006-10-10 17:41:42.000000000 +0200 @@ -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" kdebase-3.5.5-keyinit.patch: kdm.pamd | 10 ++++++++++ 1 files changed, 10 insertions(+) --- NEW FILE kdebase-3.5.5-keyinit.patch --- diff -uNrp kdebase-3.5.5-orig/kdm.pamd kdebase-3.5.5/kdm.pamd --- kdebase-3.5.5-orig/kdm.pamd 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.5/kdm.pamd 2006-07-13 14:26:10.000000000 +0100 @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session optional pam_keyinit.so force revoke +session include system-auth +session required pam_loginuid.so +session optional pam_selinux.so +session optional pam_console.so kdebase-3.5.5-redhat-pam.patch: kde.pamd | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) --- NEW FILE kdebase-3.5.5-redhat-pam.patch --- --- kdebase-3.5.4/kde.pamd.redhat 2005-09-10 10:26:16.000000000 +0200 +++ kdebase-3.5.4/kde.pamd 2006-08-25 14:15:02.000000000 +0200 @@ -1,7 +1,9 @@ #%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 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_selinux.so +session optional pam_console.so kdebase-3.5.5-suspend.patch: shutdowndlg.cpp | 40 +++++++++++++++++++++++++++++++++++++++- shutdowndlg.h | 8 ++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) --- NEW FILE kdebase-3.5.5-suspend.patch --- --- kdebase-3.5.5/ksmserver/shutdowndlg.h.tn 2006-11-06 12:50:17.000000000 +0100 +++ kdebase-3.5.5/ksmserver/shutdowndlg.h 2006-11-07 15:50:59.000000000 +0100 @@ -17,6 +17,9 @@ #include +#define SUSPEND_TYPE_HIBERNATE 0 +#define SUSPEND_TYPE_STANDBY 1 + // The (singleton) widget that makes the desktop gray. class KSMShutdownFeedback : public QWidget { @@ -54,6 +57,7 @@ void slotHalt(); void slotReboot(); void slotReboot(int); + void slotSuspend(); protected: ~KSMShutdownDlg() {}; @@ -64,6 +68,10 @@ QString m_bootOption; QPopupMenu *targets; QStringList rebootOptions; + KPushButton *btnSuspend; + int suspendType; + void keyPressEvent( QKeyEvent *e); + void keyReleaseEvent( QKeyEvent *e ); }; class KSMDelayedPushButton : public KPushButton --- kdebase-3.5.5/ksmserver/shutdowndlg.cpp.tn 2006-11-06 12:50:05.000000000 +0100 +++ kdebase-3.5.5/ksmserver/shutdowndlg.cpp 2006-11-07 16:02:27.000000000 +0100 @@ -87,7 +87,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget* parent, bool maysd, KApplication::ShutdownType sdtype ) - : QDialog( parent, 0, TRUE, WType_Popup ), targets(0) + : QDialog( parent, 0, TRUE, WType_Popup ), targets(0), btnSuspend(0) // this is a WType_Popup on purpose. Do not change that! Not // having a popup here has severe side effects. { @@ -132,6 +132,13 @@ if (maysd) { + // hibernate and standby + suspendType = SUSPEND_TYPE_STANDBY; + btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend Computer"), "down"), frame ); + btnSuspend->setFont( btnFont ); + buttonlay->addWidget( btnSuspend ); + connect(btnSuspend, SIGNAL(clicked()), SLOT(slotSuspend())); + // Shutdown KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "exit"), frame ); btnHalt->setFont( btnFont ); @@ -274,3 +281,34 @@ popt->stop(); setDown(false); } + +void KSMShutdownDlg::slotSuspend() +{ + switch ( suspendType ) { + case SUSPEND_TYPE_HIBERNATE: system("/usr/bin/pm-hibernate"); break; + case SUSPEND_TYPE_STANDBY: system("/usr/bin/pm-suspend"); break; + } + reject(); +} + +void KSMShutdownDlg::keyPressEvent( QKeyEvent *e ) +{ + switch ( e->key() ) { + case Key_Shift: + btnSuspend->setText("&Hibernate Computer"); + suspendType = SUSPEND_TYPE_HIBERNATE; + default: + e->ignore(); + } +} + +void KSMShutdownDlg::keyReleaseEvent( QKeyEvent *e ) +{ + switch( e->key() ) { + case Key_Shift: + btnSuspend->setText("&Suspend Computer"); + suspendType = SUSPEND_TYPE_STANDBY; + default: + e->ignore(); + } +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 30 Sep 2006 21:12:08 -0000 1.53 +++ .cvsignore 28 Jan 2007 20:41:50 -0000 1.54 @@ -27,3 +27,4 @@ kdebase-3.5.4.tar.bz2 kde-redhat-config-3.5-fc5-0.4.tar.bz2 kde-redhat-config-3.5-fc5-0.5.tar.bz2 +kdebase-3.5.6.tar.bz2 Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- kdebase.spec 4 Oct 2006 14:04:49 -0000 1.234 +++ kdebase.spec 28 Jan 2007 20:41:50 -0000 1.235 @@ -7,8 +7,8 @@ %define include_kappfinder 0 %define qt_version 3.3.6 -%define arts_version 1.5.4 -%define kde_version 3.5.4 +%define arts_version 1.5.5 +%define kde_version 3.5.5 %define kdelibs_epoch 6 %define arts_epoch 8 %define make_cvs 1 @@ -17,8 +17,8 @@ Summary: K Desktop Environment - core files Name: kdebase -Version: 3.5.4 -Release: 13%{?dist} +Version: 3.5.5 +Release: 0.6%{?dist} Epoch: 6 Url: http://www.kde.org Group: User Interface/Desktops @@ -37,8 +37,8 @@ Source10: cr32-app-package_games_kids.png Source11: cr48-app-package_games_kids.png -Patch200: kde-libtool.patch -Patch1: kdebase-3.5.4-2-redhat.patch +Patch0: kdebase-3.5.5-redhat-pam.patch +Patch1: kdebase-3.5.5-1-redhat-startkde.patch Patch2: kdebase-3.3.92-vroot.patch Patch3: kdebase-3.x-shortcuts.patch Patch4: kdebase-3.2.0-keymap.patch @@ -48,29 +48,33 @@ Patch8: kdebase-3.2.92-logo.patch Patch10: kdebase-3.4.2-kdesktop-konsole.patch Patch11: kdebase-3.5.1-xdg.patch -Patch13: kdebase-3.5.3-dbus.patch +Patch13: kdebase-3.5.5-dbus.patch Patch14: kdebase-3.5.1-kdm-readme.patch Patch15: kdebase-3.5.1-konsole-fonts.patch Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch Patch18: kdebase-3.5.2-kconf_update-klipper.patch -Patch20: kdebase-3.5.3-keyinit.patch +Patch20: kdebase-3.5.5-keyinit.patch Patch21: kdebase-3.5.3-khelpcenter-sort.patch Patch22: kdebase-3.5.4-htdig.patch Patch23: kdebase-3.5.4-antialias.patch Patch24: kdebase-3.5.4-tango-icon-theme.patch Patch25: kdebase-3.5.4-konqueror-shortcut.patch +Patch26: kdebase-3.5.5-suspend.patch # upstream patches -Patch100: kdebase-3.5.4-halbackend-dbus.patch -Patch101: kdebase-3.5.4-kde#128552.patch -Patch102: kdebase-3.5.4-kde#124116.patch -Patch103: kdebase-3.5.4-kde#131770.patch -Patch104: kdebase-3.5.4-kde#132873.patch -Patch105: kdebase-3.5.4-kdm.patch -Patch106: kdebase-3.5.4-kde#53642.patch -Patch107: kdebase-3.5.4-kde#133665.patch -Patch108: kdebase-3.5.4-leaks.patch - +Patch500: kdebase-3.5.5-kde#134816.patch +Patch501: kdebase-3.5.5-kde#135250.patch +Patch502: kdebase-3.5.5-kde#88506.patch +Patch503: kdebase-3.5.5-kde#137889.patch + +Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch} + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils +Requires(post): fileutils sh-utils +Requires(postun): fileutils sh-utils Requires: kdelibs >= %{kdelibs_epoch}:%{version} Requires: libxml2 >= 2.6.5 Requires: /etc/X11/xdm/Xaccess @@ -79,20 +83,19 @@ Requires: /etc/X11/xinit/Xsession Requires: /etc/X11/xdm/Xsetup_0 Requires: cdparanoia-libs -Requires(post,postun): /sbin/ldconfig -Requires(post,postun): desktop-file-utils -Requires(pre,post): fileutils sh-utils -Requires(post): xfs Requires: pam >= 0.79-6 Requires: htdig +%ifarch %{ix86} x86_64 ia64 ppc ppc64 +Requires: pm-utils +%endif %ifnarch s390 s390x Requires: eject %endif %if %{redhatify} Requires: desktop-backgrounds-basic -Requires: redhat-menus => 1.2 -Requires: redhat-artwork >= 0.92 +Requires: redhat-menus => 6.7.5 +Requires: redhat-artwork >= 5.0.8 %endif BuildRequires: kdelibs-devel >= %{kde_version} @@ -148,7 +151,7 @@ %package devel Summary: Development files for kdebase -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release}.%{_arch} Requires: kdelibs-devel >= %{version} Group: Development/Libraries @@ -159,7 +162,8 @@ %prep %setup -q -%patch1 -p1 -b .redhat +%patch0 -p1 -b .redhat-pam +%patch1 -p1 -b .redhat-startkde %patch2 -p1 -b .vroot %patch3 -p1 -b .shortcuts %patch4 -p1 -b .keymap @@ -180,17 +184,13 @@ %patch23 -p1 -b .antialias %patch24 -p1 -b .tango-icon-theme %patch25 -p1 -b .konqueror-shortcut +%patch26 -p1 -b .suspend # upstream patches -%patch100 -p0 -b .halbackend-dbus -%patch101 -p0 -b .kde#128552 -%patch102 -p0 -b .kde#124116 -%patch103 -p0 -b .kde#131770 -%patch104 -p0 -b .kde#132873 -%patch105 -p0 -b .kdm-crash -%patch106 -p0 -b .kde#53642 -%patch107 -p0 -b .kde#133665 -%patch108 -p0 -b .leaks +%patch500 -p0 -b .kde#134816 +%patch501 -p1 -b .kde#135250 +%patch502 -p1 -b .kde#88506 +%patch503 -p1 -b .kde#137889 %if %{rhel} rm -rf kdeprint/kdeprintfax @@ -409,6 +409,7 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : fi %{_bindir}/update-desktop-database 2> /dev/null || : +%{_bindir}/kbuildsycoca --noincremental --global > /dev/null 2>&1 || : %postun /sbin/ldconfig @@ -417,6 +418,7 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : fi %{_bindir}/update-desktop-database 2> /dev/null || : +%{_bindir}/kbuildsycoca --noincremental --global > /dev/null 2>&1 || : %files %defattr(-,root,root) @@ -564,9 +566,30 @@ %dir %{_includedir}/kde/ksplash %{_includedir}/kde/ksplash/* %{_libdir}/*.so -%exclude %{_libdir}/libkdeinit_* +%exclude %{_libdir}/libkdeinit_*.so %changelog +* Thu Nov 30 2006 Than Ngo - 6:3.5.5-0.6.fc6 +- apply upstream fix: + #88506, dragged window follows mouse but on wrong screen (dual-head non-xinerama) + #137889, Title bar font size does not correspond to KControl on first use + +* Tue Nov 07 2006 Than Ngo 6:3.5.5-0.5.fc6 +- add hibernate/suspend in shutdown dialog + +* Fri Nov 03 2006 Than Ngo 6:3.5.5-0.4.fc6 +- rebuild + +* Thu Nov 02 2006 Than Ngo 6:3.5.5-0.3.fc6 +- rebuild + +* Thu Nov 02 2006 Than Ngo 6:3.5.5-0.2.fc6 +- apply upstream patch to fix #213219, KWin focus issue +- fix pam config issue + +* Thu Oct 26 2006 Than Ngo 6:3.5.5-0.1 +- 3.5.5 + * Wed Oct 04 2006 Than Ngo Than Ngo 6:3.5.4-13 - add shortcut Shift+Left/Shift+Right for tab_move_left/tab_move_right Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/sources,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- sources 30 Sep 2006 21:12:08 -0000 1.74 +++ sources 28 Jan 2007 20:41:50 -0000 1.75 @@ -1,2 +1,2 @@ -882a9729c08b197caef2c8712c980d9c kdebase-3.5.4.tar.bz2 61b60ed4ea41b30dfc18579cac48d20c kde-redhat-config-3.5-fc5-0.5.tar.bz2 +a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 --- kde-libtool.patch DELETED --- --- kdebase-3.5.3-1-redhat.patch DELETED --- --- kdebase-3.5.3-dbus.patch DELETED --- --- kdebase-3.5.3-keyinit.patch DELETED --- --- kdebase-3.5.4-2-redhat.patch DELETED --- --- kdebase-3.5.4-halbackend-dbus.patch DELETED --- --- kdebase-3.5.4-kde#124116.patch DELETED --- --- kdebase-3.5.4-kde#128552.patch DELETED --- --- kdebase-3.5.4-kde#131770.patch DELETED --- --- kdebase-3.5.4-kde#132873.patch DELETED --- --- kdebase-3.5.4-kde#133665.patch DELETED --- --- kdebase-3.5.4-kde#53642.patch DELETED --- --- kdebase-3.5.4-kdm.patch DELETED --- --- kdebase-3.5.4-leaks.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 28 20:55:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 28 Jan 2007 15:55:58 -0500 Subject: rpms/kdebase/devel kdebase-3.5.6-1-redhat-startkde.patch, NONE, 1.1 kdebase.spec, 1.235, 1.236 kdebase-3.5.5-1-redhat-startkde.patch, 1.1, NONE Message-ID: <200701282055.l0SKtwga031606@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31507 Modified Files: kdebase.spec Added Files: kdebase-3.5.6-1-redhat-startkde.patch Removed Files: kdebase-3.5.5-1-redhat-startkde.patch Log Message: 3.5.6 kdebase-3.5.6-1-redhat-startkde.patch: startkde | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 9 deletions(-) --- NEW FILE kdebase-3.5.6-1-redhat-startkde.patch --- --- kdebase-3.5.5/startkde.redhat 2006-10-02 13:13:29.000000000 +0200 +++ kdebase-3.5.5/startkde 2006-10-10 17:35:53.000000000 +0200 @@ -1,7 +1,54 @@ #!/bin/sh # # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.6 ) -# +# 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=`LANG=C df /tmp | xargs | cut -d" " -f11` +homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8` + +if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then + # check for AFS + space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10` +else + # check regular mounts + space_home=`LANG=C 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. @@ -14,12 +61,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 @@ -61,7 +108,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` @@ -170,9 +217,10 @@ # better use the Autostart folder. exepath=`kde-config --path exe | tr : '\n'` +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 @@ -378,7 +426,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/devel/kdebase.spec,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- kdebase.spec 28 Jan 2007 20:41:50 -0000 1.235 +++ kdebase.spec 28 Jan 2007 20:55:56 -0000 1.236 @@ -7,8 +7,8 @@ %define include_kappfinder 0 %define qt_version 3.3.6 -%define arts_version 1.5.5 -%define kde_version 3.5.5 +%define arts_version 1.5.6 +%define kde_version 3.5.6 %define kdelibs_epoch 6 %define arts_epoch 8 %define make_cvs 1 @@ -17,8 +17,8 @@ Summary: K Desktop Environment - core files Name: kdebase -Version: 3.5.5 -Release: 0.6%{?dist} +Version: 3.5.6 +Release: 1%{?dist} Epoch: 6 Url: http://www.kde.org Group: User Interface/Desktops @@ -38,7 +38,7 @@ Source11: cr48-app-package_games_kids.png Patch0: kdebase-3.5.5-redhat-pam.patch -Patch1: kdebase-3.5.5-1-redhat-startkde.patch +Patch1: kdebase-3.5.6-1-redhat-startkde.patch Patch2: kdebase-3.3.92-vroot.patch Patch3: kdebase-3.x-shortcuts.patch Patch4: kdebase-3.2.0-keymap.patch @@ -61,12 +61,6 @@ Patch25: kdebase-3.5.4-konqueror-shortcut.patch Patch26: kdebase-3.5.5-suspend.patch -# upstream patches -Patch500: kdebase-3.5.5-kde#134816.patch -Patch501: kdebase-3.5.5-kde#135250.patch -Patch502: kdebase-3.5.5-kde#88506.patch -Patch503: kdebase-3.5.5-kde#137889.patch - Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch} Requires(post): /sbin/ldconfig @@ -186,12 +180,6 @@ %patch25 -p1 -b .konqueror-shortcut %patch26 -p1 -b .suspend -# upstream patches -%patch500 -p0 -b .kde#134816 -%patch501 -p1 -b .kde#135250 -%patch502 -p1 -b .kde#88506 -%patch503 -p1 -b .kde#137889 - %if %{rhel} rm -rf kdeprint/kdeprintfax perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am @@ -569,6 +557,9 @@ %exclude %{_libdir}/libkdeinit_*.so %changelog +* Sun Jan 28 2007 Than Ngo 6:3.5.6-1.fc7 +- 3.5.6 + * Thu Nov 30 2006 Than Ngo - 6:3.5.5-0.6.fc6 - apply upstream fix: #88506, dragged window follows mouse but on wrong screen (dual-head non-xinerama) --- kdebase-3.5.5-1-redhat-startkde.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 28 21:16:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 28 Jan 2007 16:16:00 -0500 Subject: rpms/kdebase/devel kdebase.spec,1.236,1.237 Message-ID: <200701282116.l0SLG0IW014039@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13941 Modified Files: kdebase.spec Log Message: 3.5.6 Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- kdebase.spec 28 Jan 2007 20:55:56 -0000 1.236 +++ kdebase.spec 28 Jan 2007 21:15:58 -0000 1.237 @@ -51,7 +51,6 @@ Patch13: kdebase-3.5.5-dbus.patch Patch14: kdebase-3.5.1-kdm-readme.patch Patch15: kdebase-3.5.1-konsole-fonts.patch -Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch Patch18: kdebase-3.5.2-kconf_update-klipper.patch Patch20: kdebase-3.5.5-keyinit.patch Patch21: kdebase-3.5.3-khelpcenter-sort.patch @@ -170,7 +169,6 @@ %patch13 -p1 -b .dbus %patch14 -p1 -b .kdm-readme %patch15 -p1 -b .konsole-fonts -%patch17 -p1 -b .pam_krb5-bz#191049 %patch18 -p1 -b .klipper %patch20 -p1 -b .keyinit %patch21 -p1 -b .khelpcenter-sort From fedora-cvs-commits at redhat.com Mon Jan 29 06:27:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 01:27:33 -0500 Subject: rpms/autofs/devel autofs-5.0.1-rc3-consistent-dquote-handling.patch, NONE, 1.1 autofs-5.0.1-rc3-match-export-fqdn.patch, NONE, 1.1 autofs-5.0.1-rc3-trailing-whitespace.patch, NONE, 1.1 autofs.spec, 1.179, 1.180 Message-ID: <200701290627.l0T6RXnI019940@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19925 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-consistent-dquote-handling.patch autofs-5.0.1-rc3-match-export-fqdn.patch autofs-5.0.1-rc3-trailing-whitespace.patch Log Message: * Mon Jan 29 2007 Ian Kent - 5.0.1-0.rc3.13 - make double quote handing consistent (at least as much as we can). - fix handling of trailing white space in wildcard lookup (forward port bz 199720). - check fqdn of each interface when matching export access list (bz 213700). - Resolves: rhbz#199720 rhbz#213700 autofs-5.0.1-rc3-consistent-dquote-handling.patch: CHANGELOG | 1 lib/parse_subs.c | 24 ++++++++++++++- modules/lookup_file.c | 36 +++++++++++++++++++++-- modules/parse_sun.c | 76 ++++++++++++++++++++++++++++++++------------------ samples/auto.smb | 11 ++++++- 5 files changed, 114 insertions(+), 34 deletions(-) --- NEW FILE autofs-5.0.1-rc3-consistent-dquote-handling.patch --- diff --git a/CHANGELOG b/CHANGELOG index b77c2cd..5bbf9a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ - ignore "winbind" if it appears in "automount" nsswitch.conf. - fix another expire regression introduced in the "mitigate manual umount" patch. - correct check for busy offset mounts before offset umount. +- make double quote handing consistent. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/parse_subs.c b/lib/parse_subs.c index d4ddbe4..81db459 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -89,6 +89,18 @@ int chunklen(const char *whence, int expect_colon) quote = 1; continue; } + case '"': + if (quote) + break; + while (*str) { + str++; + n++; + if (*str == '"') + break; + if (*str == ':') + expect_colon = 0; + } + break; case ':': if (expect_colon) expect_colon = 0; @@ -185,11 +197,19 @@ int span_space(const char *str, unsigned int maxlen) const char *p = str; unsigned int len = 0; - while (!isblank(*(p++)) && len++ < maxlen) { - if (*p == '\\') { + while (*p && !isblank(*p) && len < maxlen) { + if (*p == '"') { + while (*p++ && len++ < maxlen) { + if (*p == '"') + break; + } + } else if (*p == '\\') { p += 2; len += 2; + continue; } + p++; + len++; } return len; } diff --git a/modules/lookup_file.c b/modules/lookup_file.c index 051e5b5..0f4d8f1 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -41,7 +41,7 @@ typedef enum { } LOOKUP_STATE; typedef enum { got_nothing, got_star, got_real, got_plus } FOUND_STATE; -typedef enum { esc_none, esc_char, esc_val } ESCAPES; +typedef enum { esc_none, esc_char, esc_val, esc_all } ESCAPES; struct lookup_context { @@ -143,6 +143,8 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig ungetc(nch, f); escape = esc_char; } + if (ch == '"') + escape = esc_all; break; case esc_char: @@ -152,6 +154,11 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig case esc_val: escape = esc_none; break; + + case esc_all: + if (ch == '"') + escape = esc_none; + break; } switch (state) { @@ -171,6 +178,10 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig *(kptr++) = ch; key_len++; } + } else if (escape == esc_all) { + state = st_compare; + *(kptr++) = ch; + key_len++; } else if (escape == esc_char); else state = st_badent; @@ -181,7 +192,11 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig state = st_begin; if (gotten == got_plus) goto got_it; - if (escape != esc_val) + else if (escape == esc_all) { + warn(LOGOPT_ANY, MODPREFIX + "unmatched \" in map key %s", key); + goto next; + } else if (escape != esc_val) goto got_it; } else if (isspace(ch) && !escape) { getting = got_real; @@ -199,6 +214,10 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig "length is %d", key, KEY_MAX_LEN); } else { + if (escape == esc_val) { + *(kptr++) = '\\'; + key_len++; + } *(kptr++) = ch; key_len++; } @@ -237,9 +256,12 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig break; } p = mapent; - *(p++) = '\\'; + if (escape == esc_val) { + *(p++) = '\\'; + mapent_len++; + } *(p++) = ch; - mapent_len = 2; + mapent_len++; } else { p = mapent; *(p++) = ch; @@ -264,6 +286,12 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig } ungetc(nch, f); state = st_begin; + if (escape == esc_all) { + warn(LOGOPT_ANY, MODPREFIX + "unmatched \" in %s for key %s", + mapent, key); + goto next; + } if (gotten == got_real || gotten == getting) goto got_it; } else if (mapent_len < MAPENT_MAX_LEN) { diff --git a/modules/parse_sun.c b/modules/parse_sun.c index 6b2a640..0a3cac9 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -193,6 +193,23 @@ int expandsunent(const char *src, char *dst, const char *key, } break; + case '"': + len++; + if (dst) + *dst++ = ch; + + while (*src && *src != '"') { + len++; + if (dst) + *dst++ = *src; + src++; + } + if (*src && dst) { + len++; + *dst++ = *src++; + } + break; + case ':': if (dst) *(dst++) = @@ -573,7 +590,10 @@ static int check_is_multi(const char *mapent) MODPREFIX "unexpected NULL map entry pointer"); return 0; } - + + if (*p == '"') + p++; + /* If first character is "/" it's a multi-mount */ if (*p == '/') return 1; @@ -590,6 +610,8 @@ static int check_is_multi(const char *mapent) * entry. */ if (not_first_chunk) { + if (*p == '"') + p++; if (*p == '/' || *p == '-') { multi = 1; break; @@ -749,13 +771,6 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char * debug(logopt, MODPREFIX "gathered options: %s", myoptions); - /* Location can't begin with a '/' */ - if (*p == '/') { - warn(logopt, MODPREFIX "error location begins with \"/\""); - free(myoptions); - return 0; - } - l = chunklen(p, check_colon(p)); loc = dequote(p, l, logopt); if (!loc) { @@ -764,6 +779,13 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char * return 0; } + /* Location can't begin with a '/' */ + if (*p == '/') { + warn(logopt, MODPREFIX "error location begins with \"/\""); + free(myoptions); + return 0; + } + if (!validate_location(loc)) { warn(logopt, MODPREFIX "invalid location"); free(myoptions); @@ -776,22 +798,22 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char * p += l; p = skipspace(p); - while (*p && *p != '/') { + while (*p && ((*p == '"' && *(p + 1) != '/') || (*p != '"' && *p != '/'))) { char *tmp, *ent; - /* Location can't begin with a '/' */ - if (*p == '/') { - warn(logopt, - MODPREFIX "error location begins with \"/\""); + l = chunklen(p, check_colon(p)); + ent = dequote(p, l, logopt); + if (!ent) { + warn(logopt, MODPREFIX "null location or out of memory"); free(myoptions); free(loc); return 0; } - l = chunklen(p, check_colon(p)); - ent = dequote(p, l, logopt); - if (!ent) { - warn(logopt, MODPREFIX "null location or out of memory"); + /* Location can't begin with a '/' */ + if (*p == '/') { + warn(logopt, + MODPREFIX "error location begins with \"/\""); free(myoptions); free(loc); return 0; @@ -1077,7 +1099,7 @@ int parse_mount(struct autofs_point *ap, const char *name, char *path, *myoptions, *loc; int status; - if (*p != '/') { + if ((*p == '"' && *(p + 1) != '/') || (*p != '"' && *p != '/')) { l = 0; path = dequote("/", 1, ap->logopt); debug(ap->logopt, @@ -1139,7 +1161,7 @@ int parse_mount(struct autofs_point *ap, const char *name, free(loc); free(path); free(myoptions); - } while (*p == '/'); + } while (*p == '/' || (*p == '"' && *(p + 1) == '/')); /* * We've got the ordered list of multi-mount entries so go @@ -1203,14 +1225,6 @@ int parse_mount(struct autofs_point *ap, const char *name, int loclen; int l; - /* Location can't begin with a '/' */ - if (*p == '/') { - free(options); - warn(ap->logopt, - MODPREFIX "error location begins with \"/\""); - return 1; - } - l = chunklen(p, check_colon(p)); loc = dequote(p, l, ap->logopt); if (!loc) { @@ -1219,6 +1233,14 @@ int parse_mount(struct autofs_point *ap, const char *name, return 1; } + /* Location can't begin with a '/' */ + if (*p == '/') { + free(options); + warn(ap->logopt, + MODPREFIX "error location begins with \"/\""); + return 1; + } + if (!validate_location(loc)) { free(loc); free(options); diff --git a/samples/auto.smb b/samples/auto.smb index d0abcd7..56e6232 100755 --- a/samples/auto.smb +++ b/samples/auto.smb @@ -20,7 +20,16 @@ done $SMBCLIENT -gNL $key 2>/dev/null| awk -v key="$key" -v opts="$opts" -F'|' -- ' BEGIN { ORS=""; first=1 } - /Disk/ { if (first) { print opts; first=0 }; sub(/ /, "\\ ", $2); print " \\\n\t /" $2, "://" key "/" $2 } + /Disk/ { + if (first) + print opts; first=0 + dir = $2 + loc = $2 + # Enclose mount dir and location in quotes + # Double quote "$" in location as it is special + gsub(/\$$/, "\\$", loc); + print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\"" + } END { if (!first) print "\n"; else exit 1 } ' autofs-5.0.1-rc3-match-export-fqdn.patch: CHANGELOG | 1 lib/rpc_subs.c | 131 +++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 105 insertions(+), 27 deletions(-) --- NEW FILE autofs-5.0.1-rc3-match-export-fqdn.patch --- diff --git a/CHANGELOG b/CHANGELOG index b435501..48b959a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - correct check for busy offset mounts before offset umount. - make double quote handing consistent. - fix handling of trailing white space in wildcard lookup. +- check fqdn of each interface when matching export access list. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c index b4e9c91..1c5f009 100644 --- a/lib/rpc_subs.c +++ b/lib/rpc_subs.c @@ -42,7 +42,8 @@ #include "log.h" #endif -#define MAX_ERR_BUF 512 +#define MAX_IFC_BUF 1024 +#define MAX_ERR_BUF 128 static char *ypdomain = NULL; @@ -755,7 +756,7 @@ void rpc_exports_free(exports list) static int masked_match(const char *addr, const char *mask) { - char buf[MAX_ERR_BUF], *ptr; + char buf[MAX_IFC_BUF], *ptr; struct sockaddr_in saddr; struct sockaddr_in6 saddr6; struct ifconf ifc; @@ -926,42 +927,118 @@ static int pattern_match(const char *s, const char *pattern) /* NOTREACHED */ } -static int string_match(const char *myname, const char *pattern) +static int name_match(const char *name, const char *pattern) { - struct addrinfo hints, *ni; int ret; - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_CANONNAME; - hints.ai_family = 0; - hints.ai_socktype = 0; + if (strchr(pattern, '*') || strchr(pattern, '?')) + ret = pattern_match(name, pattern); + else { + ret = !memcmp(name, pattern, strlen(pattern)); + /* Name could still be a netgroup (Solaris) */ + if (!ret && ypdomain) + ret = innetgr(pattern, name, NULL, ypdomain); + } + + return ret; +} + +static int fqdn_match(const char *pattern) +{ + char buf[MAX_IFC_BUF], *ptr; + struct ifconf ifc; + struct ifreq *ifr; + int sock, cl_flags, ret, i; + char fqdn[NI_MAXHOST + 1]; + + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) { + char *estr = strerror_r(errno, buf, MAX_ERR_BUF); + error(LOGOPT_ANY, "socket creation failed: %s", estr); + return 0; + } + + if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) { + cl_flags |= FD_CLOEXEC; + fcntl(sock, F_SETFD, cl_flags); + } - ret = getaddrinfo(myname, NULL, &hints, &ni); - if (ret) { - error(LOGOPT_ANY, "name lookup failed: %s", gai_strerror(ret)); + ifc.ifc_len = sizeof(buf); + ifc.ifc_req = (struct ifreq *) buf; + ret = ioctl(sock, SIOCGIFCONF, &ifc); + if (ret == -1) { + close(sock); + char *estr = strerror_r(errno, buf, MAX_ERR_BUF); + error(LOGOPT_ANY, "ioctl: %s", estr); return 0; } - if (strchr(pattern, '*') || strchr(pattern, '?')) { - ret = pattern_match(myname, pattern); - if (!ret) - ret = pattern_match(ni->ai_canonname, pattern); - } else { - /* Match simple nane or FQDN */ - ret = !memcmp(myname, pattern, strlen(pattern)); - if (!ret) - ret = !memcmp(ni->ai_canonname, pattern, strlen(pattern)); + i = 0; + ptr = (char *) &ifc.ifc_buf[0]; - /* Name could still be a netgroup (Solaris) */ - if (!ret && ypdomain) { - ret = innetgr(pattern, myname, NULL, ypdomain); - if (!ret) - ret = innetgr(pattern, - ni->ai_canonname, NULL, ypdomain); + while (ptr < buf + ifc.ifc_len) { + ifr = (struct ifreq *) ptr; + + switch (ifr->ifr_addr.sa_family) { + case AF_INET: + { + socklen_t slen = sizeof(struct sockaddr); + + ret = getnameinfo(&ifr->ifr_addr, slen, fqdn, + NI_MAXHOST, NULL, 0, NI_NAMEREQD); + if (!ret) { + ret = name_match(fqdn, pattern); + if (ret) { + close(sock); + return 1; + } + } + break; + } + + /* glibc rpc only understands IPv4 atm */ + case AF_INET6: + break; + + default: + break; } + i++; + ptr = (char *) &ifc.ifc_req[i]; } - freeaddrinfo(ni); + + close(sock); + return 0; +} + +static int string_match(const char *myname, const char *pattern) +{ + struct addrinfo hints, *ni; + int ret; + + /* Try simple name match first */ + ret = name_match(myname, pattern); + if (ret) + goto done; + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_CANONNAME; + hints.ai_family = 0; + hints.ai_socktype = 0; + + /* See if our canonical name matches */ + if (getaddrinfo(myname, NULL, &hints, &ni) == 0) { + ret = name_match(ni->ai_canonname, pattern); + freeaddrinfo(ni); + } else + warn(LOGOPT_ANY, "name lookup failed: %s", gai_strerror(ret)); + if (ret) + goto done; + + /* Lastly see if the name of an interfaces matches */ + ret = fqdn_match(pattern); +done: return ret; } autofs-5.0.1-rc3-trailing-whitespace.patch: CHANGELOG | 1 + lib/parse_subs.c | 12 ++++++++++++ modules/parse_sun.c | 29 ++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) --- NEW FILE autofs-5.0.1-rc3-trailing-whitespace.patch --- diff --git a/CHANGELOG b/CHANGELOG index 5bbf9a1..b435501 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ - fix another expire regression introduced in the "mitigate manual umount" patch. - correct check for busy offset mounts before offset umount. - make double quote handing consistent. +- fix handling of trailing white space in wildcard lookup. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/parse_subs.c b/lib/parse_subs.c index 81db459..bdb19cd 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -157,10 +157,22 @@ char *dequote(const char *str, int origlen, unsigned int logopt) const char *scp; int len = origlen; int quote = 0, dquote = 0; + int i, j; if (ret == NULL) return NULL; + /* first thing to do is strip white space from the end */ + i = len - 1; + while (isspace(str[i])) { + /* of course, we have to keep escaped white-space */ + j = i - 1; + if (j > 0 && (str[j] == '\\' || str[j] == '"')) + break; + i--; + len--; + } + for (scp = str; len > 0 && *scp; scp++, len--) { if (!quote) { if (*scp == '"') { diff --git a/modules/parse_sun.c b/modules/parse_sun.c index 0a3cac9..7020902 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -135,9 +135,32 @@ int expandsunent(const char *src, char *dst, const char *key, switch (ch) { case '&': l = strlen(key); - if (dst) { - strcpy(dst, key); - dst += l; + /* + * In order to ensure that any spaces in the key + * re preserved, we need to escape them here. + */ + if (strchr(key, ' ')) { + char *keyp = key; + while (*keyp) { + if (isspace(*keyp)) { + if (dst) { + *dst++ = '\\'; + *dst++ = *keyp++; + } else + keyp++; + l++; + } else { + if (dst) + *dst++ = *keyp++; + else + keyp++; + } + } + } else { + if (dst) { + strcpy(dst, key); + dst += l; + } } len += l; break; Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- autofs.spec 19 Jan 2007 06:32:27 -0000 1.179 +++ autofs.spec 29 Jan 2007 06:27:31 -0000 1.180 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.11 +%define release 0.rc3.13 Version: %{version} Release: %{release} Epoch: 1 @@ -16,6 +16,9 @@ Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch Patch4: autofs-5.0.1-rc3-correct-expire-check.patch Patch5: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch +Patch6: autofs-5.0.1-rc3-consistent-dquote-handling.patch +Patch7: autofs-5.0.1-rc3-trailing-whitespace.patch +Patch8: autofs-5.0.1-rc3-match-export-fqdn.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 @@ -63,6 +66,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -119,6 +125,11 @@ %{_libdir}/autofs/* %changelog +* Mon Jan 29 2007 Ian Kent - 5.0.1-0.rc3.13 +- make double quote handing consistent (at least as much as we can). +- fix handling of trailing white space in wildcard lookup (forward port bz 199720). +- check fqdn of each interface when matching export access list (bz 213700). + * Thu Jan 18 2007 Ian Kent - 5.0.1-0.rc3.11 - correct check for busy offset mounts before offset umount (bz 222872). From fedora-cvs-commits at redhat.com Mon Jan 29 06:47:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 01:47:19 -0500 Subject: rpms/autofs/FC-6 autofs-5.0.1-rc3-consistent-dquote-handling.patch, NONE, 1.1 autofs-5.0.1-rc3-match-export-fqdn.patch, NONE, 1.1 autofs-5.0.1-rc3-trailing-whitespace.patch, NONE, 1.1 autofs.spec, 1.168, 1.169 Message-ID: <200701290647.l0T6lJHo019762@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv17468 Modified Files: autofs.spec Added Files: autofs-5.0.1-rc3-consistent-dquote-handling.patch autofs-5.0.1-rc3-match-export-fqdn.patch autofs-5.0.1-rc3-trailing-whitespace.patch Log Message: * Mon Jan 29 2007 Ian Kent - 5.0.1-0.rc3.12 - make double quote handing consistent (at least as much as we can). - fix handling of trailing white space in wildcard lookup (forward port bz 199720). - check fqdn of each interface when matching export access list (bz 213700). - Resolves: rhbz#222872 rhbz#213700 autofs-5.0.1-rc3-consistent-dquote-handling.patch: CHANGELOG | 1 lib/parse_subs.c | 24 ++++++++++++++- modules/lookup_file.c | 36 +++++++++++++++++++++-- modules/parse_sun.c | 76 ++++++++++++++++++++++++++++++++------------------ samples/auto.smb | 11 ++++++- 5 files changed, 114 insertions(+), 34 deletions(-) --- NEW FILE autofs-5.0.1-rc3-consistent-dquote-handling.patch --- diff --git a/CHANGELOG b/CHANGELOG index b77c2cd..5bbf9a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ - ignore "winbind" if it appears in "automount" nsswitch.conf. - fix another expire regression introduced in the "mitigate manual umount" patch. - correct check for busy offset mounts before offset umount. +- make double quote handing consistent. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/parse_subs.c b/lib/parse_subs.c index d4ddbe4..81db459 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -89,6 +89,18 @@ int chunklen(const char *whence, int expect_colon) quote = 1; continue; } + case '"': + if (quote) + break; + while (*str) { + str++; + n++; + if (*str == '"') + break; + if (*str == ':') + expect_colon = 0; + } + break; case ':': if (expect_colon) expect_colon = 0; @@ -185,11 +197,19 @@ int span_space(const char *str, unsigned int maxlen) const char *p = str; unsigned int len = 0; - while (!isblank(*(p++)) && len++ < maxlen) { - if (*p == '\\') { + while (*p && !isblank(*p) && len < maxlen) { + if (*p == '"') { + while (*p++ && len++ < maxlen) { + if (*p == '"') + break; + } + } else if (*p == '\\') { p += 2; len += 2; + continue; } + p++; + len++; } return len; } diff --git a/modules/lookup_file.c b/modules/lookup_file.c index 051e5b5..0f4d8f1 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -41,7 +41,7 @@ typedef enum { } LOOKUP_STATE; typedef enum { got_nothing, got_star, got_real, got_plus } FOUND_STATE; -typedef enum { esc_none, esc_char, esc_val } ESCAPES; +typedef enum { esc_none, esc_char, esc_val, esc_all } ESCAPES; struct lookup_context { @@ -143,6 +143,8 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig ungetc(nch, f); escape = esc_char; } + if (ch == '"') + escape = esc_all; break; case esc_char: @@ -152,6 +154,11 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig case esc_val: escape = esc_none; break; + + case esc_all: + if (ch == '"') + escape = esc_none; + break; } switch (state) { @@ -171,6 +178,10 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig *(kptr++) = ch; key_len++; } + } else if (escape == esc_all) { + state = st_compare; + *(kptr++) = ch; + key_len++; } else if (escape == esc_char); else state = st_badent; @@ -181,7 +192,11 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig state = st_begin; if (gotten == got_plus) goto got_it; - if (escape != esc_val) + else if (escape == esc_all) { + warn(LOGOPT_ANY, MODPREFIX + "unmatched \" in map key %s", key); + goto next; + } else if (escape != esc_val) goto got_it; } else if (isspace(ch) && !escape) { getting = got_real; @@ -199,6 +214,10 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig "length is %d", key, KEY_MAX_LEN); } else { + if (escape == esc_val) { + *(kptr++) = '\\'; + key_len++; + } *(kptr++) = ch; key_len++; } @@ -237,9 +256,12 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig break; } p = mapent; - *(p++) = '\\'; + if (escape == esc_val) { + *(p++) = '\\'; + mapent_len++; + } *(p++) = ch; - mapent_len = 2; + mapent_len++; } else { p = mapent; *(p++) = ch; @@ -264,6 +286,12 @@ static int read_one(FILE *f, char *key, unsigned int *k_len, char *mapent, unsig } ungetc(nch, f); state = st_begin; + if (escape == esc_all) { + warn(LOGOPT_ANY, MODPREFIX + "unmatched \" in %s for key %s", + mapent, key); + goto next; + } if (gotten == got_real || gotten == getting) goto got_it; } else if (mapent_len < MAPENT_MAX_LEN) { diff --git a/modules/parse_sun.c b/modules/parse_sun.c index 6b2a640..0a3cac9 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -193,6 +193,23 @@ int expandsunent(const char *src, char *dst, const char *key, } break; + case '"': + len++; + if (dst) + *dst++ = ch; + + while (*src && *src != '"') { + len++; + if (dst) + *dst++ = *src; + src++; + } + if (*src && dst) { + len++; + *dst++ = *src++; + } + break; + case ':': if (dst) *(dst++) = @@ -573,7 +590,10 @@ static int check_is_multi(const char *mapent) MODPREFIX "unexpected NULL map entry pointer"); return 0; } - + + if (*p == '"') + p++; + /* If first character is "/" it's a multi-mount */ if (*p == '/') return 1; @@ -590,6 +610,8 @@ static int check_is_multi(const char *mapent) * entry. */ if (not_first_chunk) { + if (*p == '"') + p++; if (*p == '/' || *p == '-') { multi = 1; break; @@ -749,13 +771,6 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char * debug(logopt, MODPREFIX "gathered options: %s", myoptions); - /* Location can't begin with a '/' */ - if (*p == '/') { - warn(logopt, MODPREFIX "error location begins with \"/\""); - free(myoptions); - return 0; - } - l = chunklen(p, check_colon(p)); loc = dequote(p, l, logopt); if (!loc) { @@ -764,6 +779,13 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char * return 0; } + /* Location can't begin with a '/' */ + if (*p == '/') { + warn(logopt, MODPREFIX "error location begins with \"/\""); + free(myoptions); + return 0; + } + if (!validate_location(loc)) { warn(logopt, MODPREFIX "invalid location"); free(myoptions); @@ -776,22 +798,22 @@ static int parse_mapent(const char *ent, char *g_options, char **options, char * p += l; p = skipspace(p); - while (*p && *p != '/') { + while (*p && ((*p == '"' && *(p + 1) != '/') || (*p != '"' && *p != '/'))) { char *tmp, *ent; - /* Location can't begin with a '/' */ - if (*p == '/') { - warn(logopt, - MODPREFIX "error location begins with \"/\""); + l = chunklen(p, check_colon(p)); + ent = dequote(p, l, logopt); + if (!ent) { + warn(logopt, MODPREFIX "null location or out of memory"); free(myoptions); free(loc); return 0; } - l = chunklen(p, check_colon(p)); - ent = dequote(p, l, logopt); - if (!ent) { - warn(logopt, MODPREFIX "null location or out of memory"); + /* Location can't begin with a '/' */ + if (*p == '/') { + warn(logopt, + MODPREFIX "error location begins with \"/\""); free(myoptions); free(loc); return 0; @@ -1077,7 +1099,7 @@ int parse_mount(struct autofs_point *ap, const char *name, char *path, *myoptions, *loc; int status; - if (*p != '/') { + if ((*p == '"' && *(p + 1) != '/') || (*p != '"' && *p != '/')) { l = 0; path = dequote("/", 1, ap->logopt); debug(ap->logopt, @@ -1139,7 +1161,7 @@ int parse_mount(struct autofs_point *ap, const char *name, free(loc); free(path); free(myoptions); - } while (*p == '/'); + } while (*p == '/' || (*p == '"' && *(p + 1) == '/')); /* * We've got the ordered list of multi-mount entries so go @@ -1203,14 +1225,6 @@ int parse_mount(struct autofs_point *ap, const char *name, int loclen; int l; - /* Location can't begin with a '/' */ - if (*p == '/') { - free(options); - warn(ap->logopt, - MODPREFIX "error location begins with \"/\""); - return 1; - } - l = chunklen(p, check_colon(p)); loc = dequote(p, l, ap->logopt); if (!loc) { @@ -1219,6 +1233,14 @@ int parse_mount(struct autofs_point *ap, const char *name, return 1; } + /* Location can't begin with a '/' */ + if (*p == '/') { + free(options); + warn(ap->logopt, + MODPREFIX "error location begins with \"/\""); + return 1; + } + if (!validate_location(loc)) { free(loc); free(options); diff --git a/samples/auto.smb b/samples/auto.smb index d0abcd7..56e6232 100755 --- a/samples/auto.smb +++ b/samples/auto.smb @@ -20,7 +20,16 @@ done $SMBCLIENT -gNL $key 2>/dev/null| awk -v key="$key" -v opts="$opts" -F'|' -- ' BEGIN { ORS=""; first=1 } - /Disk/ { if (first) { print opts; first=0 }; sub(/ /, "\\ ", $2); print " \\\n\t /" $2, "://" key "/" $2 } + /Disk/ { + if (first) + print opts; first=0 + dir = $2 + loc = $2 + # Enclose mount dir and location in quotes + # Double quote "$" in location as it is special + gsub(/\$$/, "\\$", loc); + print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\"" + } END { if (!first) print "\n"; else exit 1 } ' autofs-5.0.1-rc3-match-export-fqdn.patch: CHANGELOG | 1 lib/rpc_subs.c | 131 +++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 105 insertions(+), 27 deletions(-) --- NEW FILE autofs-5.0.1-rc3-match-export-fqdn.patch --- diff --git a/CHANGELOG b/CHANGELOG index b435501..48b959a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ - correct check for busy offset mounts before offset umount. - make double quote handing consistent. - fix handling of trailing white space in wildcard lookup. +- check fqdn of each interface when matching export access list. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c index b4e9c91..1c5f009 100644 --- a/lib/rpc_subs.c +++ b/lib/rpc_subs.c @@ -42,7 +42,8 @@ #include "log.h" #endif -#define MAX_ERR_BUF 512 +#define MAX_IFC_BUF 1024 +#define MAX_ERR_BUF 128 static char *ypdomain = NULL; @@ -755,7 +756,7 @@ void rpc_exports_free(exports list) static int masked_match(const char *addr, const char *mask) { - char buf[MAX_ERR_BUF], *ptr; + char buf[MAX_IFC_BUF], *ptr; struct sockaddr_in saddr; struct sockaddr_in6 saddr6; struct ifconf ifc; @@ -926,42 +927,118 @@ static int pattern_match(const char *s, const char *pattern) /* NOTREACHED */ } -static int string_match(const char *myname, const char *pattern) +static int name_match(const char *name, const char *pattern) { - struct addrinfo hints, *ni; int ret; - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_CANONNAME; - hints.ai_family = 0; - hints.ai_socktype = 0; + if (strchr(pattern, '*') || strchr(pattern, '?')) + ret = pattern_match(name, pattern); + else { + ret = !memcmp(name, pattern, strlen(pattern)); + /* Name could still be a netgroup (Solaris) */ + if (!ret && ypdomain) + ret = innetgr(pattern, name, NULL, ypdomain); + } + + return ret; +} + +static int fqdn_match(const char *pattern) +{ + char buf[MAX_IFC_BUF], *ptr; + struct ifconf ifc; + struct ifreq *ifr; + int sock, cl_flags, ret, i; + char fqdn[NI_MAXHOST + 1]; + + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) { + char *estr = strerror_r(errno, buf, MAX_ERR_BUF); + error(LOGOPT_ANY, "socket creation failed: %s", estr); + return 0; + } + + if ((cl_flags = fcntl(sock, F_GETFD, 0)) != -1) { + cl_flags |= FD_CLOEXEC; + fcntl(sock, F_SETFD, cl_flags); + } - ret = getaddrinfo(myname, NULL, &hints, &ni); - if (ret) { - error(LOGOPT_ANY, "name lookup failed: %s", gai_strerror(ret)); + ifc.ifc_len = sizeof(buf); + ifc.ifc_req = (struct ifreq *) buf; + ret = ioctl(sock, SIOCGIFCONF, &ifc); + if (ret == -1) { + close(sock); + char *estr = strerror_r(errno, buf, MAX_ERR_BUF); + error(LOGOPT_ANY, "ioctl: %s", estr); return 0; } - if (strchr(pattern, '*') || strchr(pattern, '?')) { - ret = pattern_match(myname, pattern); - if (!ret) - ret = pattern_match(ni->ai_canonname, pattern); - } else { - /* Match simple nane or FQDN */ - ret = !memcmp(myname, pattern, strlen(pattern)); - if (!ret) - ret = !memcmp(ni->ai_canonname, pattern, strlen(pattern)); + i = 0; + ptr = (char *) &ifc.ifc_buf[0]; - /* Name could still be a netgroup (Solaris) */ - if (!ret && ypdomain) { - ret = innetgr(pattern, myname, NULL, ypdomain); - if (!ret) - ret = innetgr(pattern, - ni->ai_canonname, NULL, ypdomain); + while (ptr < buf + ifc.ifc_len) { + ifr = (struct ifreq *) ptr; + + switch (ifr->ifr_addr.sa_family) { + case AF_INET: + { + socklen_t slen = sizeof(struct sockaddr); + + ret = getnameinfo(&ifr->ifr_addr, slen, fqdn, + NI_MAXHOST, NULL, 0, NI_NAMEREQD); + if (!ret) { + ret = name_match(fqdn, pattern); + if (ret) { + close(sock); + return 1; + } + } + break; + } + + /* glibc rpc only understands IPv4 atm */ + case AF_INET6: + break; + + default: + break; } + i++; + ptr = (char *) &ifc.ifc_req[i]; } - freeaddrinfo(ni); + + close(sock); + return 0; +} + +static int string_match(const char *myname, const char *pattern) +{ + struct addrinfo hints, *ni; + int ret; + + /* Try simple name match first */ + ret = name_match(myname, pattern); + if (ret) + goto done; + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_CANONNAME; + hints.ai_family = 0; + hints.ai_socktype = 0; + + /* See if our canonical name matches */ + if (getaddrinfo(myname, NULL, &hints, &ni) == 0) { + ret = name_match(ni->ai_canonname, pattern); + freeaddrinfo(ni); + } else + warn(LOGOPT_ANY, "name lookup failed: %s", gai_strerror(ret)); + if (ret) + goto done; + + /* Lastly see if the name of an interfaces matches */ + ret = fqdn_match(pattern); +done: return ret; } autofs-5.0.1-rc3-trailing-whitespace.patch: CHANGELOG | 1 + lib/parse_subs.c | 12 ++++++++++++ modules/parse_sun.c | 29 ++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) --- NEW FILE autofs-5.0.1-rc3-trailing-whitespace.patch --- diff --git a/CHANGELOG b/CHANGELOG index 5bbf9a1..b435501 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ - fix another expire regression introduced in the "mitigate manual umount" patch. - correct check for busy offset mounts before offset umount. - make double quote handing consistent. +- fix handling of trailing white space in wildcard lookup. 4/1/2007 autofs-5.0.1 rc3 ------------------------- diff --git a/lib/parse_subs.c b/lib/parse_subs.c index 81db459..bdb19cd 100644 --- a/lib/parse_subs.c +++ b/lib/parse_subs.c @@ -157,10 +157,22 @@ char *dequote(const char *str, int origlen, unsigned int logopt) const char *scp; int len = origlen; int quote = 0, dquote = 0; + int i, j; if (ret == NULL) return NULL; + /* first thing to do is strip white space from the end */ + i = len - 1; + while (isspace(str[i])) { + /* of course, we have to keep escaped white-space */ + j = i - 1; + if (j > 0 && (str[j] == '\\' || str[j] == '"')) + break; + i--; + len--; + } + for (scp = str; len > 0 && *scp; scp++, len--) { if (!quote) { if (*scp == '"') { diff --git a/modules/parse_sun.c b/modules/parse_sun.c index 0a3cac9..7020902 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -135,9 +135,32 @@ int expandsunent(const char *src, char *dst, const char *key, switch (ch) { case '&': l = strlen(key); - if (dst) { - strcpy(dst, key); - dst += l; + /* + * In order to ensure that any spaces in the key + * re preserved, we need to escape them here. + */ + if (strchr(key, ' ')) { + char *keyp = key; + while (*keyp) { + if (isspace(*keyp)) { + if (dst) { + *dst++ = '\\'; + *dst++ = *keyp++; + } else + keyp++; + l++; + } else { + if (dst) + *dst++ = *keyp++; + else + keyp++; + } + } + } else { + if (dst) { + strcpy(dst, key); + dst += l; + } } len += l; break; Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- autofs.spec 19 Jan 2007 06:34:53 -0000 1.168 +++ autofs.spec 29 Jan 2007 06:47:17 -0000 1.169 @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs %define version 5.0.1 -%define release 0.rc3.10 +%define release 0.rc3.12 Version: %{version} Release: %{release} Epoch: 1 @@ -16,6 +16,9 @@ Patch3: autofs-5.0.1-rc3-nsswitch-ignore-winbind.patch Patch4: autofs-5.0.1-rc3-correct-expire-check.patch Patch5: autofs-5.0.1-rc3-correct-offset-mount-busy-check.patch +Patch6: autofs-5.0.1-rc3-consistent-dquote-handling.patch +Patch7: autofs-5.0.1-rc3-trailing-whitespace.patch +Patch8: autofs-5.0.1-rc3-match-export-fqdn.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel Conflicts: kernel < 2.6.17 @@ -63,6 +66,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -119,6 +125,11 @@ %{_libdir}/autofs/* %changelog +* Mon Jan 29 2007 Ian Kent - 5.0.1-0.rc3.12 +- make double quote handing consistent (at least as much as we can). +- fix handling of trailing white space in wildcard lookup (forward port bz 199720). +- check fqdn of each interface when matching export access list (bz 213700). + * Thu Jan 18 2007 Ian Kent - 5.0.1-0.rc3.10 - correct check for busy offset mounts before offset umount (bz 222872). From fedora-cvs-commits at redhat.com Mon Jan 29 07:27:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 02:27:23 -0500 Subject: rpms/kdebase/devel kdebase.spec,1.237,1.238 Message-ID: <200701290727.l0T7RNKU018101@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17593 Modified Files: kdebase.spec Log Message: add buildreq on libutempter Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- kdebase.spec 28 Jan 2007 21:15:58 -0000 1.237 +++ kdebase.spec 29 Jan 2007 07:27:20 -0000 1.238 @@ -125,6 +125,7 @@ BuildRequires: libXtst-devel BuildRequires: libXxf86misc-devel BuildRequires: libxkbfile-devel +BuildRequires: libutempter-devel %ifnarch s390 s390x BuildRequires: libraw1394-devel %endif From fedora-cvs-commits at redhat.com Mon Jan 29 07:52:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 02:52:54 -0500 Subject: rpms/traceroute/devel traceroute.spec,1.30,1.31 Message-ID: <200701290752.l0T7qs3q007446@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/traceroute/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7428 Modified Files: traceroute.spec Log Message: * Mon Jan 29 2007 Martin Bacovsky - 3:2.0.3-1.1.fc7 - Resolves: #225063: Re-add Epoch to traceroute Index: traceroute.spec =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- traceroute.spec 22 Jan 2007 17:22:37 -0000 1.30 +++ traceroute.spec 29 Jan 2007 07:52:52 -0000 1.31 @@ -1,8 +1,8 @@ Summary: Traces the route taken by packets over an IPv4/IPv6 network Name: traceroute -Epoch: 1 +Epoch: 3 Version: 2.0.3 -Release: 1%{?dist} +Release: 1.1%{?dist} Group: Applications/Internet License: GPL URL: http://dmitry.butskoy.name/traceroute @@ -57,6 +57,9 @@ %changelog +* Mon Jan 29 2007 Martin Bacovsky - 3:2.0.3-1.1.fc7 +- Resolves: #225063: Re-add Epoch to traceroute + * Mon Jan 22 2007 Martin Bacovsky - 2.0.3-1.fc7 - Resolves: #222577 - man page with execute bit - Resolves: #223784 - new traceroute breaks scripts From fedora-cvs-commits at redhat.com Mon Jan 29 08:55:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 03:55:35 -0500 Subject: rpms/gd/devel gd-2.0.33-cve-07-0455.patch, NONE, 1.1 gd.spec, 1.39, 1.40 Message-ID: <200701290855.l0T8tZrh015096@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14878 Modified Files: gd.spec Added Files: gd-2.0.33-cve-07-0455.patch Log Message: - Resolves: #224610 CVE-2007-0455 gd buffer overrun gd-2.0.33-cve-07-0455.patch: gdft.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gd-2.0.33-cve-07-0455.patch --- --- gd-2.0.33/gdft.c.cve-07-0455 2007-01-29 09:43:46.000000000 +0100 +++ gd-2.0.33/gdft.c 2007-01-29 09:46:07.000000000 +0100 @@ -1161,7 +1161,7 @@ { ch = c & 0xFF; /* don't extend sign */ } - next++; + if (*next) next++; } break; case gdFTEX_Big5: Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gd.spec 21 Nov 2006 09:03:03 -0000 1.39 +++ gd.spec 29 Jan 2007 08:55:33 -0000 1.40 @@ -1,7 +1,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 11%{?dist} +Release: 12%{?dist} Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ @@ -15,6 +15,7 @@ Patch6: gd-2.0.33-overflow.patch Patch7: gd-2.0.33-AALineThick.patch Patch8: gd-2.0.33-BoxBound.patch +Patch9: gd-2.0.33-cve-07-0455.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig @@ -63,6 +64,7 @@ %patch6 -p1 -b .overflow %patch7 -p1 -b .AALineThick %patch8 -p1 -b .bb +%patch9 -p1 -b .cve-07-0455 %build %configure --disable-rpath @@ -102,6 +104,10 @@ %changelog +* Mon Jan 29 2007 Ivana Varekova 2.0.33-12 +- Resolves: #224610 + CVE-2007-0455 gd buffer overrun + * Tue Nov 21 2006 Ivana Varekova 2.0.33-11 - Fix problem with to large box boundaries Resolves: #197747 From fedora-cvs-commits at redhat.com Mon Jan 29 09:08:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 04:08:38 -0500 Subject: rpms/gd/FC-6 gd-2.0.33-cve-07-0455.patch, NONE, 1.1 gd.spec, 1.36, 1.37 Message-ID: <200701290908.l0T98cVr025025@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gd/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24622 Modified Files: gd.spec Added Files: gd-2.0.33-cve-07-0455.patch Log Message: - Resolves: #224610 CVE-2007-0455 gd buffer overrun gd-2.0.33-cve-07-0455.patch: gdft.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gd-2.0.33-cve-07-0455.patch --- --- gd-2.0.33/gdft.c.cve-07-0455 2004-11-02 22:00:48.000000000 +0100 +++ gd-2.0.33/gdft.c 2007-01-29 10:04:58.000000000 +0100 @@ -1161,7 +1161,7 @@ { ch = c & 0xFF; /* don't extend sign */ } - next++; + if (*next) next++; } break; case gdFTEX_Big5: Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/FC-6/gd.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gd.spec 13 Sep 2006 08:41:12 -0000 1.36 +++ gd.spec 29 Jan 2007 09:08:35 -0000 1.37 @@ -1,7 +1,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 9.3%{?dist} +Release: 10%{?dist} Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ @@ -12,6 +12,7 @@ Patch3: gd-2.0.33-multilib.patch Patch4: gd-loop.patch Patch5: gd-sparc64.patch +Patch6: gd-2.0.33-cve-07-0455.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig @@ -57,6 +58,7 @@ %patch3 -p1 -b .mlib %patch4 -p1 -b .loop %patch5 -p1 -b .sparc64 +%patch6 -p1 -b .cve-07-0455 %build %configure --disable-rpath @@ -96,6 +98,10 @@ %changelog +* Mon Jan 29 2007 Ivana Varekova - 2.0.33-10 +- Resolves: #224610 + CVE-2007-0455 gd buffer overrun + * Wed Sep 13 2006 Jitka Kudrnacova - 2.0.33 - 9.3 - gd-devel now requires fontconfig-devel (#205834) From fedora-cvs-commits at redhat.com Mon Jan 29 09:18:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 04:18:53 -0500 Subject: rpms/gd/FC-5 gd-2.0.33-cve-07-0455.patch, NONE, 1.1 gd.spec, 1.30, 1.31 Message-ID: <200701290918.l0T9Irqb020402@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gd/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16399 Modified Files: gd.spec Added Files: gd-2.0.33-cve-07-0455.patch Log Message: - Resolves: #224610 CVE-2007-0455 gd buffer overrun gd-2.0.33-cve-07-0455.patch: gdft.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gd-2.0.33-cve-07-0455.patch --- --- gd-2.0.33/gdft.c.cve-07-0455 2004-11-02 22:00:48.000000000 +0100 +++ gd-2.0.33/gdft.c 2007-01-29 10:13:04.000000000 +0100 @@ -1161,7 +1161,7 @@ { ch = c & 0xFF; /* don't extend sign */ } - next++; + if (*next) next++; } break; case gdFTEX_Big5: Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/FC-5/gd.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gd.spec 11 Feb 2006 02:49:11 -0000 1.30 +++ gd.spec 29 Jan 2007 09:18:51 -0000 1.31 @@ -1,7 +1,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 6.2 +Release: 7%{?dist} Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ @@ -9,6 +9,7 @@ Patch0: gd-2.0.33-freetype.patch Patch1: gd-2.0.33-SetAAPixel.patch Patch2: gd-2.0.33-security.patch +Patch3: gd-2.0.33-cve-07-0455.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel @@ -50,6 +51,7 @@ %patch0 -p1 -b .freetype %patch1 -p1 -b .SetAAPixel %patch2 -p1 -b .security +%patch3 -p1 -b .cve-07-0455 %build %configure --disable-rpath @@ -88,6 +90,10 @@ %changelog +* Mon Jan 29 2007 Ivana Varekova - 2.0.33-7 +- Resolves: #224610 + CVE-2007-0455 gd buffer overrun + * Fri Feb 10 2006 Jesse Keating - 2.0.33-6.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Jan 29 10:00:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 05:00:00 -0500 Subject: rpms/libidn/devel libidn-0.6.9.tar.gz.sig, NONE, 1.1 .cvsignore, 1.25, 1.26 libidn.spec, 1.39, 1.40 sources, 1.26, 1.27 upstream, 1.16, 1.17 Message-ID: <200701291000.l0TA00Ce015453@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/libidn/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15436 Modified Files: .cvsignore libidn.spec sources upstream Added Files: libidn-0.6.9.tar.gz.sig Log Message: * Mon Jan 29 2007 Joe Orton 0.6.9-2 - update to 0.6.9 - make install-info use failsafe (Ville Skytt??, #223707) --- NEW FILE libidn-0.6.9.tar.gz.sig --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iOoEAAECADQFAkVuyQ8tFIAAAAAAFQAPcGthLWFkZHJlc3NAZ251cGcub3JnamFz QGV4dHVuZG8uY29tAAoJEO2iHpS1ZXFvWa0FAKRtf/xl4yN4nt+9l8kER0WP3xSE GbOgvBn9qLiHxh+EBBa7ICzd8O2gU+32ajfrILy18+jrdoFnAAe1eioga2J3guEM jykgIEqYtx+3cu28UFdjQcC10wnWbW5Hl9vf2XKwV8tYAOEhc80mZspRfZ4aWUCh Dow6FdAFadkvUQL2WXACK96kTT4tlV60cSuKvkNa54Vix1XwRspxVjv4vxo= =DzHe -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 15 Nov 2006 15:00:08 -0000 1.25 +++ .cvsignore 29 Jan 2007 09:59:57 -0000 1.26 @@ -1 +1,3 @@ -libidn-0.6.8.tar.gz +libidn-0.6.9.tar.gz +libidn-0.6.9 +x86_64 Index: libidn.spec =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/libidn.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- libidn.spec 15 Nov 2006 15:55:28 -0000 1.39 +++ libidn.spec 29 Jan 2007 09:59:57 -0000 1.40 @@ -1,7 +1,7 @@ Summary: Internationalized Domain Name support library Name: libidn -Version: 0.6.8 -Release: 4 +Version: 0.6.9 +Release: 2 URL: http://www.gnu.org/software/libidn License: LGPL Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz @@ -9,8 +9,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig, gettext Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info Requires(postun): /sbin/ldconfig -Requires(pre): /sbin/ldconfig, /sbin/install-info +Requires(pre): /sbin/ldconfig %description GNU Libidn is an implementation of the Stringprep, Punycode and @@ -65,7 +66,7 @@ %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir || : fi %postun -p /sbin/ldconfig @@ -92,6 +93,10 @@ %{_mandir}/man3/* %changelog +* Mon Jan 29 2007 Joe Orton 0.6.9-2 +- update to 0.6.9 +- make install-info use failsafe (Ville Skytt??, #223707) + * Wed Nov 15 2006 Joe Orton 0.6.8-4 - use non-GNU section in info directory (#209491) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 15 Nov 2006 15:00:09 -0000 1.26 +++ sources 29 Jan 2007 09:59:57 -0000 1.27 @@ -1 +1 @@ -5d1a2e42f91c1d53376ec37557601d47 libidn-0.6.8.tar.gz +616135837f5aaa9fac752e6b54221fb3 libidn-0.6.9.tar.gz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/libidn/devel/upstream,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- upstream 15 Nov 2006 15:00:09 -0000 1.16 +++ upstream 29 Jan 2007 09:59:57 -0000 1.17 @@ -1 +1 @@ -libidn-0.6.8.tar.gz +libidn-0.6.9.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 10:25:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 05:25:25 -0500 Subject: rpms/system-config-boot/devel system-config-boot.spec,1.15,1.16 Message-ID: <200701291025.l0TAPPq9003723@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/system-config-boot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3697 Modified Files: system-config-boot.spec Log Message: more build reqs and translation updates Index: system-config-boot.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-boot/devel/system-config-boot.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- system-config-boot.spec 11 Oct 2006 15:02:29 -0000 1.15 +++ system-config-boot.spec 29 Jan 2007 10:25:23 -0000 1.16 @@ -1,8 +1,8 @@ # -*- RPM-SPEC -*- Summary: A graphical interface for configuring the boot loader Name: system-config-boot -Version: 0.2.12 -Release: 1 +Version: 0.2.14 +Release: 1%{dist} URL: http://fedora.redhat.com/ License: GPL ExclusiveOS: Linux @@ -17,8 +17,7 @@ ExclusiveArch: %{ix86} x86_64 Obsoletes: redhat-config-boot Provides: redhat-config-boot = %{version} -BuildRequires: desktop-file-utils -BuildRequires: perl(XML::Parser) gettext +BuildRequires: python >= 0:2.2, perl, gettext, glibc-devel, gcc, desktop-file-utils, yelp, perl-XML-Parser %description system-config-boot is a graphical user interface that allows @@ -64,21 +63,15 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-boot %changelog -* Mon Oct 09 2006 Harald Hoyer - 0.2.12-1 -- translation update (bug #208886, #209188) - -* Wed Jul 12 2006 Jesse Keating - 0.2.11-4 -- rebuild -- Add missing br gettext - -* Mon Jun 05 2006 Jesse Keating - 0.2.11-3 -- Added missing BuildRequire on perl-XML-Parser +* Mon Jan 29 2007 Harald Hoyer - 0.2.14-1%{dist} +- more build requirements -* Tue Feb 07 2006 Jesse Keating - 0.2.11-1.2 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Mon Oct 09 2006 Harald Hoyer - 0.2.13-1%{dist} +- translation update +- Resolves: rhbz#216607 -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Mon Oct 09 2006 Harald Hoyer - 0.2.12-1 +- translation update (bug #208886, #209188) * Thu Oct 13 2005 Harald Hoyer - 0.2.11-1 - use new config tool pam configuration file From fedora-cvs-commits at redhat.com Mon Jan 29 10:26:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 05:26:01 -0500 Subject: rpms/system-config-boot/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 Message-ID: <200701291026.l0TAQ19P003763@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/system-config-boot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3739 Modified Files: .cvsignore sources Log Message: more build reqs and translation updates Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-boot/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Oct 2006 15:02:29 -0000 1.10 +++ .cvsignore 29 Jan 2007 10:25:54 -0000 1.11 @@ -1 +1 @@ -system-config-boot-0.2.12.tar.gz +system-config-boot-0.2.14.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-boot/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 11 Oct 2006 15:02:29 -0000 1.10 +++ sources 29 Jan 2007 10:25:54 -0000 1.11 @@ -1 +1 @@ -1a0029c4050d7bd7aa4aaa8cd3431e25 system-config-boot-0.2.12.tar.gz +b31f422b09c4ff45025cd6f71b839708 system-config-boot-0.2.14.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 10:56:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 05:56:27 -0500 Subject: rpms/star/devel star.spec,1.31,1.32 Message-ID: <200701291056.l0TAuRln022971@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/star/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22848 Modified Files: star.spec Log Message: fix buildreq. Index: star.spec =================================================================== RCS file: /cvs/dist/rpms/star/devel/star.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- star.spec 19 Jan 2007 13:07:31 -0000 1.31 +++ star.spec 29 Jan 2007 10:56:20 -0000 1.32 @@ -4,17 +4,16 @@ Summary: An archiving tool with ACL support Name: star Version: 1.5a76 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://cdrecord.berlios.de/old/private/star.html Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2 Patch1: star-1.5-newMake.patch Patch2: star-1.5-selinux.patch - License: CDDL Group: Applications/Archiving BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libattr-devel libacl-devel libtool libselinux-devel - +BuildRequires: libattr-devel libacl-devel libtool libselinux-devel e2fsprogs-devel + %description Star saves many files together into a single tape or disk archive, and can restore individual files from the archive. Star supports ACL. @@ -97,6 +96,9 @@ %{_mandir}/man1/spax.1* %changelog +* Tue Aug 08 2006 Peter Vrabec 1.5a76-2 +- fix buildreq. and rebuild + * Thu Jan 18 2007 Jan Cholasta 1.5a76-1 - upgrade From fedora-cvs-commits at redhat.com Mon Jan 29 11:00:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 06:00:37 -0500 Subject: rpms/star/devel star.spec,1.32,1.33 Message-ID: <200701291100.l0TB0bXj026012@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/star/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25935 Modified Files: star.spec Log Message: fix changelog Index: star.spec =================================================================== RCS file: /cvs/dist/rpms/star/devel/star.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- star.spec 29 Jan 2007 10:56:20 -0000 1.32 +++ star.spec 29 Jan 2007 11:00:34 -0000 1.33 @@ -96,7 +96,7 @@ %{_mandir}/man1/spax.1* %changelog -* Tue Aug 08 2006 Peter Vrabec 1.5a76-2 +* Mon Jan 29 2007 Peter Vrabec 1.5a76-2 - fix buildreq. and rebuild * Thu Jan 18 2007 Jan Cholasta 1.5a76-1 From fedora-cvs-commits at redhat.com Mon Jan 29 11:22:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 06:22:26 -0500 Subject: rpms/webalizer/devel .cvsignore,1.4,1.5 webalizer.spec,1.26,1.27 Message-ID: <200701291122.l0TBMQVM029815@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/webalizer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29776 Modified Files: .cvsignore webalizer.spec Log Message: * Mon Jan 29 2007 Joe Orton 2.01_10-31 - rebuild to pick up new db4 soname Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/webalizer/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 14:18:31 -0000 1.4 +++ .cvsignore 29 Jan 2007 11:22:23 -0000 1.5 @@ -1 +1,4 @@ webalizer-2.01-10-src.tar.bz2 +clog +*.src.rpm +x86_64 Index: webalizer.spec =================================================================== RCS file: /cvs/dist/rpms/webalizer/devel/webalizer.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- webalizer.spec 12 Jul 2006 08:47:09 -0000 1.26 +++ webalizer.spec 29 Jan 2007 11:22:23 -0000 1.27 @@ -5,7 +5,7 @@ Summary: A flexible Web server log file analysis program. Group: Applications/Internet Version: %{ver}_%{patchlevel} -Release: 30.1 +Release: 31 URL: http://www.mrunix.net/webalizer/ License: GPL Buildroot: %{_tmppath}/%{name}-root @@ -115,6 +115,9 @@ %attr(-, webalizer, root) /var/www/usage/*.png %changelog +* Mon Jan 29 2007 Joe Orton 2.01_10-31 +- rebuild to pick up new db4 soname + * Wed Jul 12 2006 Jesse Keating - 2.01_10-30.1 - rebuild From fedora-cvs-commits at redhat.com Mon Jan 29 12:24:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 07:24:08 -0500 Subject: rpms/dump/devel dump-immutable.patch,NONE,1.1 dump.spec,1.38,1.39 Message-ID: <200701291224.l0TCO8dF011447@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11431/dump/devel Modified Files: dump.spec Added Files: dump-immutable.patch Log Message: Fixed restoring of immutable files dump-immutable.patch: dirs.c | 8 ++++---- tape.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) --- NEW FILE dump-immutable.patch --- diff -ur dump-0.4b41.orig/restore/dirs.c dump-0.4b41/restore/dirs.c --- dump-0.4b41.orig/restore/dirs.c 2005-05-28 13:34:47.000000000 -0500 +++ dump-0.4b41/restore/dirs.c 2007-01-26 18:32:02.000000000 -0600 @@ -710,6 +710,10 @@ cp = myname(ep); (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); + utimes(cp, node.timep); + if (node.xattr) + xattr_extract(cp, xattr); + ep->e_flags &= ~NEW; if (node.flags) #ifdef __linux__ (void) lsetflags(cp, node.flags); @@ -719,10 +723,6 @@ (void) chflags(cp, node.flags); #endif #endif - utimes(cp, node.timep); - if (node.xattr) - xattr_extract(cp, xattr); - ep->e_flags &= ~NEW; } } if (ferror(mf)) diff -ur dump-0.4b41.orig/restore/tape.c dump-0.4b41/restore/tape.c --- dump-0.4b41.orig/restore/tape.c 2007-01-26 18:14:25.000000000 -0600 +++ dump-0.4b41/restore/tape.c 2007-01-26 18:51:52.000000000 -0600 @@ -908,6 +908,8 @@ } (void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid); (void) chmod(name, mode); + extractattr(name); + utimes(name, timep); if (flags) #ifdef __linux__ (void) lsetflags(name, flags); @@ -922,8 +924,6 @@ #endif #endif skipfile(); - extractattr(name); - utimes(name, timep); return (GOOD); case IFCHR: @@ -944,6 +944,8 @@ } (void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid); (void) chmod(name, mode); + extractattr(name); + utimes(name, timep); if (flags) #ifdef __linux__ { @@ -964,8 +966,6 @@ #endif #endif skipfile(); - extractattr(name); - utimes(name, timep); return (GOOD); case IFREG: @@ -994,6 +994,8 @@ skipfile(); (void) chown(name, luid, lgid); (void) chmod(name, mode); + extractattr(name); + utimes(name, timep); if (flags) #ifdef __linux__ (void) lsetflags(name, flags); @@ -1007,8 +1009,6 @@ (void) chflags(name, flags); #endif #endif - extractattr(name); - utimes(name, timep); return (GOOD); } } @@ -1216,8 +1216,8 @@ (void) fchown(ofile, uid, gid); (void) fchmod(ofile, mode); (void) close(ofile); - (void) lsetflags(oFileRsrc, flags); utimes(oFileRsrc, timep); + (void) lsetflags(oFileRsrc, flags); return (GOOD); } /* NOTREACHED */ Index: dump.spec =================================================================== RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- dump.spec 18 Jan 2007 15:52:10 -0000 1.38 +++ dump.spec 29 Jan 2007 12:24:01 -0000 1.39 @@ -3,13 +3,14 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b41 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ Source: dump-%{version}.tar.bz2 Patch0: dump-selinux.patch Patch1: dump-dmfix.patch +Patch2: dump-immutable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: zlib-devel, bzip2-devel, ncurses-devel @@ -46,6 +47,7 @@ %setup -q %patch0 -p1 -b .selinux %patch1 -p1 -b .dmfix +%patch2 -p1 -b .orig %build @@ -117,6 +119,9 @@ %{_mandir}/man8/rmt.8* %changelog +* Mon Jan 29 2007 Adam Tkac 0.4b41-4.fc7 +- added Andrew Kroeger's patch. Immutable files are restored correctly + * Wed Jan 18 2007 Adam Tkac 0.4b41-3.fc7 - dump is now linked dynamically - removed termcap dependency From fedora-cvs-commits at redhat.com Mon Jan 29 12:50:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 07:50:56 -0500 Subject: rpms/netpbm/devel netpbm-10.27-bmptopnm.patch, 1.3, 1.4 netpbm.spec, 1.84, 1.85 Message-ID: <200701291250.l0TCouvI027088@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26709 Modified Files: netpbm-10.27-bmptopnm.patch netpbm.spec Log Message: - bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) netpbm-10.27-bmptopnm.patch: bmptopnm.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: netpbm-10.27-bmptopnm.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/devel/netpbm-10.27-bmptopnm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- netpbm-10.27-bmptopnm.patch 28 Feb 2006 12:59:04 -0000 1.3 +++ netpbm-10.27-bmptopnm.patch 29 Jan 2007 12:50:54 -0000 1.4 @@ -1,6 +1,6 @@ ---- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm 2006-02-27 15:02:02.000000000 +0100 -+++ netpbm-10.32/converter/other/bmptopnm.c 2006-02-27 15:07:31.000000000 +0100 -@@ -1248,7 +1248,7 @@ readBmp(FILE * const ifP, +--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 ++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 +@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, xel ** const colormapP, bool const verbose) { @@ -9,12 +9,11 @@ unsigned int pos; /* Current byte position in the BMP file */ -@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) { - writeRasterGen(BMPraster, cols, rows, outputType, cBitCount, - pixelformat, colormap); +@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP, + BMPreadfileheader(ifP, &bytesRead, &offBits); + pos += bytesRead; } -- free(colormap); -+ if (colormap) free(colormap); - free(BMPraster); - - return 0; +- if(BMPheader.cmapsize != 0) + { + unsigned int bytesRead; + BMPreadinfoheader(ifP, &bytesRead, &BMPheader); Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- netpbm.spec 28 Dec 2006 11:01:44 -0000 1.84 +++ netpbm.spec 29 Jan 2007 12:50:54 -0000 1.85 @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm Version: 10.35 -Release: 9%{?dist} +Release: 10%{?dist} License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -189,6 +189,9 @@ %{_mandir}/man5/* %changelog +* Mon Jan 29 2006 Jindrich Novy 10.35-10 +- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) + * Thu Dec 28 2006 Jindrich Novy 10.35-9 - pbmtog3 won't segfault on 64bit arches (#220739) From fedora-cvs-commits at redhat.com Mon Jan 29 12:52:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 07:52:57 -0500 Subject: rpms/netpbm/devel netpbm.spec,1.85,1.86 Message-ID: <200701291252.l0TCqv5o028653@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28468 Modified Files: netpbm.spec Log Message: - gosh, it's not 2006 any more Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- netpbm.spec 29 Jan 2007 12:50:54 -0000 1.85 +++ netpbm.spec 29 Jan 2007 12:52:55 -0000 1.86 @@ -189,7 +189,7 @@ %{_mandir}/man5/* %changelog -* Mon Jan 29 2006 Jindrich Novy 10.35-10 +* Mon Jan 29 2007 Jindrich Novy 10.35-10 - bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) * Thu Dec 28 2006 Jindrich Novy 10.35-9 From fedora-cvs-commits at redhat.com Mon Jan 29 13:14:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:14:43 -0500 Subject: rpms/tk/devel tk-8.5a5-cflags.patch, NONE, 1.1 tk-8.5a5-no_rpath.patch, NONE, 1.1 tk-8.5a5-tclm4-soname.patch, NONE, 1.1 tk-8.3.5-tclm4-soname.patch, 1.1, NONE tk-8.4-no_rpath.patch, 1.1, NONE tk-8.4.13-cflags.patch, 1.2, NONE Message-ID: <200701291314.l0TDEh6x012208@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11993 Added Files: tk-8.5a5-cflags.patch tk-8.5a5-no_rpath.patch tk-8.5a5-tclm4-soname.patch Removed Files: tk-8.3.5-tclm4-soname.patch tk-8.4-no_rpath.patch tk-8.4.13-cflags.patch Log Message: Add & remove patches for new version of TK. tk-8.5a5-cflags.patch: tcl.m4 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE tk-8.5a5-cflags.patch --- --- tk8.5a5/unix/tcl.m4.5-cflags 2006-12-19 15:09:26.000000000 +0100 +++ tk8.5a5/unix/tcl.m4 2006-12-19 15:14:17.000000000 +0100 @@ -1398,7 +1398,7 @@ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - SHLIB_LD='${CC} -shared -Wl,-soname,${@}' + SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" @@ -1428,7 +1428,7 @@ SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" - SHLIB_LD="${CC} -shared" + SHLIB_LD="${CC} ${CFLAGS} -shared" DL_OBJS="" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" tk-8.5a5-no_rpath.patch: tcl.m4 | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE tk-8.5a5-no_rpath.patch --- --- tk8.5a5/unix/tcl.m4.3-rpath 2006-12-19 15:07:12.000000000 +0100 +++ tk8.5a5/unix/tcl.m4 2006-12-19 15:07:54.000000000 +0100 @@ -1402,7 +1402,7 @@ DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + CC_SEARCH_FLAGS='' LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} if test "`uname -m`" = "alpha" ; then CFLAGS="$CFLAGS -mieee" tk-8.5a5-tclm4-soname.patch: tcl.m4 | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE tk-8.5a5-tclm4-soname.patch --- --- tk8.5a5/unix/tcl.m4.1-soname 2006-10-23 15:45:33.000000000 +0200 +++ tk8.5a5/unix/tcl.m4 2006-12-19 15:04:52.000000000 +0100 @@ -1398,7 +1398,7 @@ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - SHLIB_LD="${CC} -shared" + SHLIB_LD='${CC} -shared -Wl,-soname,${@}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" --- tk-8.3.5-tclm4-soname.patch DELETED --- --- tk-8.4-no_rpath.patch DELETED --- --- tk-8.4.13-cflags.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 13:29:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:29:15 -0500 Subject: rpms/man-pages/devel man-pages-2.43-rt_spm.patch, NONE, 1.1 man-pages-2.43-swapon.patch, NONE, 1.1 man-pages.spec, 1.60, 1.61 Message-ID: <200701291329.l0TDTFlr010553@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9873 Modified Files: man-pages.spec Added Files: man-pages-2.43-rt_spm.patch man-pages-2.43-swapon.patch Log Message: - fix rt_sigprocmask.2 (#219074) - remove pciconfig_{read,write,iobase}.2 (#219827) - fix swapon.2 (#222493) man-pages-2.43-rt_spm.patch: rt_sigprocmask.2 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE man-pages-2.43-rt_spm.patch --- --- man-pages-2.43/man2/rt_sigprocmask.2.pom 2007-01-29 10:50:05.000000000 +0100 +++ man-pages-2.43/man2/rt_sigprocmask.2 2007-01-29 11:46:45.000000000 +0100 @@ -29,7 +29,7 @@ .ad l .hy 0 .HP 25 -long\ \fBsys_rt_sigprocmask\fR\ (sigset_t\ \fI*set\fR, sigset_t\ \fI*oset\fR, size_t\ \fIsigsetsize\fR); +long\ \fBsys_rt_sigprocmask\fR\ (int\ \fIhow\fR, sigset_t\ \fI*set\fR, sigset_t\ \fI*oset\fR, size_t\ \fIsigsetsize\fR); .ad .hy @@ -60,7 +60,7 @@ .TP -EINVAL -\fIsigsetsize\fR was not equivalent to the size of a \fIsigset_t\fR type. +\fIsigsetsize\fR was not equivalent to the size of a \fIsigset_t\fR type or the value specified in \fIhow\fR was invalid. .TP -EFAULT man-pages-2.43-swapon.patch: swapon.2 | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) --- NEW FILE man-pages-2.43-swapon.patch --- --- man-pages-2.43/man2/swapon.2.pom 2007-01-29 13:58:32.000000000 +0100 +++ man-pages-2.43/man2/swapon.2 2007-01-29 14:22:04.000000000 +0100 @@ -134,9 +134,15 @@ .B EPERM The caller does not have the .B CAP_SYS_ADMIN -capability, or all -.B MAX_SWAPFILES -(earlier 8; 32 since Linux 2.4.10) are in use. +capability. +If all swapfiles are in use. +(If +.B CONFIG_MIGRATION +is enabled then the maximal number of swap files is +.B MAX_SWAPFILES-2 +(30 since linux 2.4.10), otherwise +.B MAX_SWAPFILES +(32 since Linux 2.4.10, 8 earlier) swap files could be used) .SH "CONFORMING TO" These functions are Linux specific and should not be used in programs intended to be portable. Index: man-pages.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- man-pages.spec 12 Jan 2007 11:48:34 -0000 1.60 +++ man-pages.spec 29 Jan 2007 13:29:13 -0000 1.61 @@ -1,7 +1,7 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages Version: 2.43 -Release: 3%{?dist} +Release: 4%{?dist} License: distributable Group: Documentation URL: http://www.kernel.org/pub/linux/docs/manpages/ @@ -40,6 +40,8 @@ Patch38: man-pages-2.43-mount.patch Patch39: man-pages-2.39-tgkill.patch Patch40: man-pages-2.39-mmap2.patch +Patch41: man-pages-2.43-rt_spm.patch +Patch42: man-pages-2.43-swapon.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Autoreq: false @@ -86,6 +88,8 @@ %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 +%patch42 -p1 %build @@ -151,6 +155,9 @@ # Problem with db x db4 - man pages rm -f man3/{btree,dbopen,hash,mpool,recno}.3 +# Deprecated +rm -f man2/pciconfig_{write,read,iobase}.2 + find . -name "*sudo*" -exec rm {} \; for l1 in man[1-9]*/* @@ -186,6 +193,11 @@ %{_mandir}/en/man* %changelog +* Mon Jan 29 2007 Ivana Varekova 2.43-4 +- fix rt_sigprocmask.2 (#219074) +- remove pciconfig_{read,write,iobase}.2 (#219827) +- fix swapon.2 (#222493) + * Fri Jan 12 2007 Ivana Varekova 2.43-3 - fix mmap2 man page - spec file cleanup From fedora-cvs-commits at redhat.com Mon Jan 29 13:33:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:33:48 -0500 Subject: rpms/ntp/devel ntp-4.2.4-bcast.patch, NONE, 1.1 ntp-4.2.4-mlock.patch, NONE, 1.1 ntp-4.2.4-optvalues.patch, NONE, 1.1 ntp-4.2.4-sleep.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, 1.2, 1.3 ntp.spec, 1.63, 1.64 Message-ID: <200701291333.l0TDXmaP013740@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13040 Modified Files: ntp-4.2.4-html2man.patch ntp.spec Added Files: ntp-4.2.4-bcast.patch ntp-4.2.4-mlock.patch ntp-4.2.4-optvalues.patch ntp-4.2.4-sleep.patch Log Message: - don't wake up every second (#204748) - add option to enable memory locking (#195617) - fix broadcast client - use option values in ntp-keygen - improve man pages Resolves: #204748, #195617 ntp-4.2.4-bcast.patch: ntp_io.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ntp-4.2.4-bcast.patch --- Upstream bug #768 --- ntp-4.2.4/ntpd/ntp_io.c.bcast 2006-12-28 13:03:29.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_io.c 2007-01-29 13:02:20.000000000 +0100 @@ -1870,7 +1870,7 @@ */ interf->family = AF_INET; interf->bfd = open_socket(&interf->bcast, - INT_BROADCAST, 1, interf); + INT_BROADCAST, 0, interf); /* * If we succeeded then we use it otherwise ntp-4.2.4-mlock.patch: html/ntpd.html | 4 +++- ntpd/ntpd-opts.c | 23 ++++++++++++++++++++++- ntpd/ntpd-opts.h | 19 +++++++++++++------ ntpd/ntpd.c | 4 +++- 4 files changed, 41 insertions(+), 9 deletions(-) --- NEW FILE ntp-4.2.4-mlock.patch --- --- ntp-4.2.4/html/ntpd.html.mlock 2007-01-29 13:26:21.000000000 +0100 +++ ntp-4.2.4/html/ntpd.html 2007-01-29 13:26:22.000000000 +0100 @@ -34,7 +34,7 @@

      Synopsis

      - ntpd [ -46aAbdDgLnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -I iface ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ] + ntpd [ -46aAbdDgLmnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -I iface ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ]

      Description

      The ntpd program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. ntpd does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.

      How NTP Operates

      @@ -95,6 +95,8 @@
      Specify the name and path of the log file. The default is the system log file. This is the same operation as the logfile logfile configuration command.
      -L
      Do not listen to virtual IPs. The default is to listen. +
      -m +
      Lock memory.
      -n
      Don't fork.
      -N --- ntp-4.2.4/ntpd/ntpd.c.mlock 2007-01-29 13:26:21.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd.c 2007-01-29 13:26:22.000000000 +0100 @@ -704,7 +704,8 @@ } #endif -#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE) +#if defined(MCL_CURRENT) && defined(MCL_FUTURE) + if (HAVE_OPT( MLOCK )) { # ifdef HAVE_SETRLIMIT /* * Set the stack limit to something smaller, so that we don't lock a lot @@ -742,6 +743,7 @@ */ if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) msyslog(LOG_ERR, "mlockall(): %m"); + } #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */ # ifdef HAVE_PLOCK # ifdef PROCLOCK --- ntp-4.2.4/ntpd/ntpd-opts.c.mlock 2007-01-29 13:26:22.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd-opts.c 2007-01-29 13:26:22.000000000 +0100 @@ -265,6 +265,15 @@ #define NICE_FLAGS (OPTST_DISABLED) /* + * Mlock option description: + */ +tSCC zMlockText[] = + "Lock memory"; +tSCC zMlock_NAME[] = "MLOCK"; +tSCC zMlock_Name[] = "mlock"; +#define MLOCK_FLAGS (OPTST_DISABLED) + +/* * Pidfile option description: */ tSCC zPidfileText[] = @@ -796,6 +805,18 @@ /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name, /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ 29, VALUE_OPT_MLOCK, + /* equiv idx, value */ 29, VALUE_OPT_MLOCK, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ MLOCK_FLAGS, 0, + /* last opt argumnt */ { NULL }, + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name, + /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, @@ -913,7 +934,7 @@ NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 29 /* user option count */ + OPTION_CT, 30 /* user option count */ }; /* --- ntp-4.2.4/ntpd/ntpd-opts.h.mlock 2006-12-29 01:11:53.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd-opts.h 2007-01-29 13:26:22.000000000 +0100 @@ -82,14 +82,15 @@ INDEX_OPT_VAR = 26, INDEX_OPT_DVAR = 27, INDEX_OPT_SLEW = 28, - INDEX_OPT_VERSION = 29, - INDEX_OPT_HELP = 30, - INDEX_OPT_MORE_HELP = 31, - INDEX_OPT_SAVE_OPTS = 32, - INDEX_OPT_LOAD_OPTS = 33 + INDEX_OPT_MLOCK = 29, + INDEX_OPT_VERSION = 30, + INDEX_OPT_HELP = 31, + INDEX_OPT_MORE_HELP = 32, + INDEX_OPT_SAVE_OPTS = 33, + INDEX_OPT_LOAD_OPTS = 34 } teOptIndex; -#define OPTION_CT 34 +#define OPTION_CT 35 #define NTPD_VERSION "4.2.4" #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4" @@ -182,6 +183,10 @@ # warning undefining MODIFYMMTIMER due to option name conflict # undef MODIFYMMTIMER # endif +# ifdef MLOCK +# warning undefining MLOCK due to option name conflict +# undef MLOCK +# endif # ifdef NOFORK # warning undefining NOFORK due to option name conflict # undef NOFORK @@ -251,6 +256,7 @@ # undef LOGFILE # undef NOVIRTUALIPS # undef MODIFYMMTIMER +# undef MLOCK # undef NOFORK # undef NICE # undef PIDFILE @@ -293,6 +299,7 @@ #ifdef SYS_WINNT #define VALUE_OPT_MODIFYMMTIMER 'M' #endif /* SYS_WINNT */ +#define VALUE_OPT_MLOCK 'm' #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_NICE 'N' #define VALUE_OPT_PIDFILE 'p' ntp-4.2.4-optvalues.patch: ntp-keygen.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE ntp-4.2.4-optvalues.patch --- --- ntp-4.2.4/util/ntp-keygen.c.optvalues 2006-12-29 00:02:02.000000000 +0100 +++ ntp-4.2.4/util/ntp-keygen.c 2007-01-29 10:53:42.000000000 +0100 @@ -323,7 +323,7 @@ #ifdef OPENSSL if (HAVE_OPT( MODULUS )) - modulus = DESC(MODULUS).optOccCt; + modulus = OPT_VALUE_MODULUS; if (HAVE_OPT( PVT_CERT )) exten = EXT_KEY_PRIVATE; @@ -345,12 +345,12 @@ if (HAVE_OPT( MV_PARAMS )) { mvpar++; - nkeys = DESC(MV_PARAMS).optOccCt; + nkeys = OPT_VALUE_MV_PARAMS; } if (HAVE_OPT( MV_KEYS )) { mvkey++; - nkeys = DESC(MV_KEYS).optOccCt; + nkeys = OPT_VALUE_MV_KEYS; } #endif ntp-4.2.4-sleep.patch: include/ntp_stdlib.h | 1 include/ntpd.h | 7 ++-- libntp/authkeys.c | 18 ++++++++++ ntpd/ntp_loopfilter.c | 16 ++++++++- ntpd/ntp_timer.c | 53 ++++++++++++++++++++++++++++--- ntpd/ntpd.c | 85 +++++++++++++++++++++++++++++++------------------- 6 files changed, 141 insertions(+), 39 deletions(-) --- NEW FILE ntp-4.2.4-sleep.patch --- --- ntp-4.2.4/include/ntp_stdlib.h.sleep 2006-12-28 13:03:05.000000000 +0100 +++ ntp-4.2.4/include/ntp_stdlib.h 2007-01-29 13:31:38.000000000 +0100 @@ -101,6 +101,7 @@ extern void signal_no_reset P((int, RETSIGTYPE (*func)(int))); extern void getauthkeys P((const char *)); +extern int auth_agekeys_is_needed P((void)); extern void auth_agekeys P((void)); extern void rereadkeys P((void)); --- ntp-4.2.4/include/ntpd.h.sleep 2006-12-28 13:03:06.000000000 +0100 +++ ntp-4.2.4/include/ntpd.h 2007-01-29 13:31:38.000000000 +0100 @@ -118,8 +118,10 @@ /* ntp_loopfilter.c */ extern void init_loopfilter P((void)); extern int local_clock P((struct peer *, double)); -extern void adj_host_clock P((void)); +extern int adj_host_clock_is_needed P((void)); +extern void adj_host_clock P((int)); extern void loop_config P((int, double)); +extern int huffpuff_enabled P((void)); extern void huffpuff P((void)); extern u_long sys_clocktime; extern u_long sys_tai; @@ -219,7 +221,8 @@ /* ntp_timer.c */ extern void init_timer P((void)); extern void reinit_timer P((void)); -extern void timer P((void)); +extern int when_next_event P((void)); +extern void timer P((int)); extern void timer_clr_stats P((void)); extern void timer_interfacetimeout P((u_long)); extern volatile int interface_interval; --- ntp-4.2.4/libntp/authkeys.c.sleep 2004-02-25 06:58:03.000000000 +0100 +++ ntp-4.2.4/libntp/authkeys.c 2007-01-29 13:31:38.000000000 +0100 @@ -394,6 +394,24 @@ } } +int auth_agekeys_is_needed() { + struct savekey *sk; + int i; + + if (authnumkeys > 20) + return 1; + + for (i = 0; i < HASHSIZE; i++) { + sk = key_hash[i]; + while (sk != 0) { + if (sk->lifetime > 0) + return 1; + sk = sk->next; + } + } + return 0; +} + /* * auth_agekeys - delete keys whose lifetimes have expired */ --- ntp-4.2.4/ntpd/ntp_loopfilter.c.sleep 2007-01-29 13:31:38.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_loopfilter.c 2007-01-29 13:42:05.000000000 +0100 @@ -765,6 +765,10 @@ #endif /* LOCKCLOCK */ } +int adj_host_clock_is_needed() { + return !(!ntp_enable || mode_ntpdate || (pll_control && + kern_enable && clock_max < 0.5)); +} /* * adj_host_clock - Called once every second to update the local clock. @@ -774,7 +778,7 @@ */ void adj_host_clock( - void + int time_elapsed ) { double adjustment; @@ -789,7 +793,10 @@ * maximum error and the local clock driver will pick it up and * pass to the common refclock routines. Very elegant. */ - sys_rootdispersion += clock_phi; + sys_rootdispersion += clock_phi * time_elapsed; +#if 0 + printf("loopfilter: %d\n", time_elapsed); +#endif #ifndef LOCKCLOCK /* @@ -849,6 +856,11 @@ } +int huffpuff_enabled() +{ + return sys_huffpuff != NULL; +} + /* * huff-n'-puff filter */ --- ntp-4.2.4/ntpd/ntpd.c.sleep 2007-01-29 13:31:38.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd.c 2007-01-29 13:31:38.000000000 +0100 @@ -188,8 +188,6 @@ char const *progname; -int was_alarmed; - #ifdef DECL_SYSCALL /* * We put this here, since the argument profile is syscall-specific @@ -443,6 +441,7 @@ msyslog(LOG_ERR, "set_process_priority: No way found to improve our priority"); } +#define TS_LAST_SIZE 2 /* * Main program. Initialize us, disconnect us from the tty if necessary, @@ -455,6 +454,9 @@ ) { l_fp now; + l_fp ts_last[TS_LAST_SIZE]; + unsigned int ts_last_index; + int time_elapsed; struct recvbuf *rbuf; #ifdef _AIX /* HMS: ifdef SIGDANGER? */ struct sigaction sa; @@ -1012,7 +1014,11 @@ #else /* normal I/O */ BLOCK_IO_AND_ALARM(); - was_alarmed = 0; + + for (ts_last_index = 0; ts_last_index < TS_LAST_SIZE; ts_last_index++) + L_CLR(&ts_last[ts_last_index]); + time_elapsed = 0; + for (;;) { # if !defined(HAVE_SIGNALED_IO) @@ -1023,39 +1029,61 @@ int nfound; # endif - if (alarm_flag) /* alarmed? */ - { - was_alarmed = 1; - alarm_flag = 0; - } - - if (!was_alarmed && has_full_recv_buffer() == ISC_FALSE) + if (has_full_recv_buffer() == ISC_FALSE) { /* * Nothing to do. Wait for something. */ # ifndef HAVE_SIGNALED_IO + extern l_fp timer_base; + l_fp ts, ts2, ts3; + double d; + rdfdes = activefds; -# if defined(VMS) || defined(SYS_VXWORKS) - /* make select() wake up after one second */ - { + ts2 = timer_base; + get_systime(&ts); + ts3 = ts; + L_SUB(&ts3, &ts_last[ts_last_index]); + + /* don't call when_next_event() too often */ + if (ts3.l_ui) + ts2.l_ui += when_next_event(); + else + ts2.l_ui += 1; + + L_SUB(&ts2, &ts); + LFPTOD(&ts2, d); +#if 0 + printf("%f ", d); +#endif + if (d >= 0.0) { struct timeval t1; - t1.tv_sec = 1; t1.tv_usec = 0; + /* shoot 1ms over */ + d += 0.001; + t1.tv_sec = floor(d); + t1.tv_usec = (d - t1.tv_sec) * 1000000; nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0, (fd_set *)0, &t1); - } -# else - nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0, - (fd_set *)0, (struct timeval *)0); -# endif /* VMS */ - if (nfound > 0) - { - l_fp ts; - get_systime(&ts); + } else + nfound = 0; + ts2 = ts; + L_SUB(&ts2, &timer_base); + time_elapsed += ts2.l_ui; + timer_base.l_ui += ts2.l_ui; +#if 0 + ts2 = ts; + ts2.l_ui = 0; + LFPTOD(&ts2, d); + printf("%f\n", d); +#endif + if (nfound > 0) + { (void)input_handler(&ts); + ts_last[ts_last_index] = ts; + ts_last_index = (ts_last_index + 1) % TS_LAST_SIZE; } else if (nfound == -1 && errno != EINTR) netsyslog(LOG_ERR, "select() error: %m"); @@ -1067,22 +1095,17 @@ wait_for_signal(); # endif /* HAVE_SIGNALED_IO */ - if (alarm_flag) /* alarmed? */ - { - was_alarmed = 1; - alarm_flag = 0; - } } - if (was_alarmed) + if (time_elapsed) { UNBLOCK_IO_AND_ALARM(); /* * Out here, signals are unblocked. Call timer routine * to process expiry. */ - timer(); - was_alarmed = 0; + timer(time_elapsed); + time_elapsed = 0; BLOCK_IO_AND_ALARM(); } --- ntp-4.2.4/ntpd/ntp_timer.c.sleep 2006-12-28 13:03:34.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_timer.c 2007-01-29 13:40:38.000000000 +0100 @@ -63,6 +63,7 @@ #define HOUR (60*60) u_long current_time; +l_fp timer_base; /* * Stats. Number of overflows and number of calls to transmit(). @@ -116,6 +117,8 @@ itimer.it_interval.tv_nsec = 0; timer_settime(ntpd_timerid, 0 /*!TIMER_ABSTIME*/, &itimer, NULL); # else + get_systime(&timer_base); + return; getitimer(ITIMER_REAL, &itimer); if (itimer.it_value.tv_sec < 0 || itimer.it_value.tv_sec > (1<next; +#ifdef REFCLOCK + if (peer->flags & FLAG_REFCLOCK) + return 1; +#endif /* REFCLOCK */ + if (peer->action && peer->nextaction < next) + next = peer->nextaction; + if (peer->nextdate < next) + next = peer->nextdate; + } + } + + if (auth_agekeys_is_needed() && keys_timer < next) + next = keys_timer; + if (huffpuff_enabled() && huffpuff_timer < next) + next = huffpuff_timer; +#ifdef OPENSSL + if (revoke_timer < next) + next = revoke_timer; +#endif /* OPENSSL */ + if (interface_interval && interface_timer < next) + next = interface_timer; + if (stats_timer < next) + next = stats_timer; + + next -= current_time; + if (next <= 0) + next = 1; + return next; +} + /* * timer - dispatch anyone who needs to be */ void -timer(void) +timer(int time_elapsed) { register struct peer *peer, *next_peer; #ifdef OPENSSL @@ -264,14 +309,14 @@ #endif /* OPENSSL */ u_int n; - current_time += (1< ['ntpq', 8, 'ntpd(8), ntpdc(8)'], 'ntpdate' => ['ntpdate', 8, 'ntpd(8)'], 'ntpdc' => ['ntpdc', 8, 'ntpd(8)'], @@ -8,7 +8,11 @@ + 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'], 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'], 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'], - 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], +- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], ++ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'], + 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'], + 'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'], + 'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'], @@ -34,17 +34,8 @@ 'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']); @@ -54,7 +58,7 @@ - print MANOUT "$name\n\n"; - - print MANOUT "$top_disclaimer\n"; -+ print MANOUT "$name\n.SH\n\n"; ++ print MANOUT "$name\n.SH \\ \n\n"; + @fontstack = (); + $deflevel = 0; Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/devel/ntp.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ntp.spec 23 Jan 2007 15:56:58 -0000 1.63 +++ ntp.spec 29 Jan 2007 13:33:45 -0000 1.64 @@ -3,7 +3,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -29,6 +29,10 @@ Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch Patch12: ntp-4.2.4-sprintf.patch Patch13: ntp-4.2.4-autoopts.patch +Patch14: ntp-4.2.4-mlock.patch +Patch15: ntp-4.2.4-optvalues.patch +Patch16: ntp-4.2.4-bcast.patch +Patch17: ntp-4.2.4-sleep.patch URL: http://www.ntp.org Requires(pre): shadow-utils @@ -65,6 +69,10 @@ %patch11 -p1 -b .keyfile %patch12 -p1 -b .sprintf %patch13 -p1 -b .autoopts +%patch14 -p1 -b .mlock +%patch15 -p1 -b .optvalues +%patch16 -p1 -b .bcast +%patch17 -p1 -b .sleep %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -176,6 +184,13 @@ %changelog +* Mon Jan 29 2007 Miroslav Lichvar 4.2.4-4 +- don't wake up every second (#204748) +- add option to enable memory locking (#195617) +- fix broadcast client +- use option values in ntp-keygen +- improve man pages + * Tue Jan 23 2007 Miroslav Lichvar 4.2.4-3 - disable autoopts option preset mechanisms for ntpd - document -I option of ntpd From fedora-cvs-commits at redhat.com Mon Jan 29 13:36:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:36:59 -0500 Subject: rpms/bind/devel bind.spec,1.156,1.157 Message-ID: <200701291336.l0TDaxx4010351@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10335/bind/devel Modified Files: bind.spec Log Message: redirected output from bind-chroot's prep & preun to /dev/null Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- bind.spec 25 Jan 2007 18:00:56 -0000 1.156 +++ bind.spec 29 Jan 2007 13:36:51 -0000 1.157 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.4 -Release: 1%{?prever}%{?dist} +Release: 2%{?prever}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -686,13 +686,13 @@ %post chroot if [ "$1" -gt 0 ]; then - . /usr/sbin/bind-chroot-admin --enable; + . /usr/sbin/bind-chroot-admin --enable > /dev/null 2>&1; fi; :; %preun chroot if [ "$1" -eq 0 ]; then - . /usr/sbin/bind-chroot-admin --disable; + . /usr/sbin/bind-chroot-admin --disable > /dev/null 2>&1; fi :; @@ -743,6 +743,9 @@ :; %changelog +* Mon Jan 29 2007 Adam Tkac 31:9.3.4-2.fc7 +- redirected output from bind-chroot prep and preun stages to /dev/null + * Wed Jan 25 2007 Adam Tkac 31:9.3.4-1.fc7 - updated to version 9.3.4 which contains security bugfixes From fedora-cvs-commits at redhat.com Mon Jan 29 13:41:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:41:42 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.4, 1.5 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.20, 1.21 openoffice.org.spec, 1.1012, 1.1013 Message-ID: <200701291341.l0TDfgrc010466@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10448 Modified Files: openoffice.org-1.9.114.rh161886.rpath.desktop.patch openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch Log Message: fix a few bugs openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch: bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 2 ++ source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 0 2 files changed, 2 insertions(+) --- NEW FILE openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch --- Index: source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx =================================================================== RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx,v retrieving revision 1.7 diff -u -r1.7 uno2cpp.cxx --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 1 Dec 2006 14:17:59 -0000 1.7 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 29 Jan 2007 11:21:29 -0000 @@ -295,9 +295,11 @@ *reinterpret_cast( pRegisterReturn ) = *reinterpret_cast( &aRet.i.rax ); break; case typelib_TypeClass_FLOAT: + aRet.f.xmm0 = d0; *reinterpret_cast( pRegisterReturn ) = *reinterpret_cast( &aRet.f.xmm0 ); break; case typelib_TypeClass_DOUBLE: + aRet.f.xmm0 = d0; *reinterpret_cast( pRegisterReturn ) = *reinterpret_cast( &aRet.f.xmm0 ); break; default: { openoffice.org-1.9.114.rh161886.rpath.desktop.patch: desktop/scripts/soffice.sh | 32 ++++++++++---------------------- scripts/soffice.sh | 0 2 files changed, 10 insertions(+), 22 deletions(-) Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openoffice.org-1.9.114.rh161886.rpath.desktop.patch 5 May 2006 10:27:57 -0000 1.4 +++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch 29 Jan 2007 13:41:40 -0000 1.5 @@ -5,7 +5,7 @@ diff -u -p -r1.17 soffice.sh --- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17 +++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000 -@@ -79,81 +79,6 @@ +@@ -77,28 +79,16 @@ # change back directory cd "$sd_cwd" @@ -17,102 +17,70 @@ - fi -fi - --# set search path for shared libraries + # set search path for shared libraries -add_moz_lib= -for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do - test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break; -done --case $sd_platform in -- AIX) -- # this is a temporary hack until we can live with the default search paths -- if [ $LIBPATH ]; then -- SYSTEM_LIBPATH=$LIBPATH -- export SYSTEM_LIBPATH + case $sd_platform in + AIX) + # this is a temporary hack until we can live with the default search paths + if [ $LIBPATH ]; then + SYSTEM_LIBPATH=$LIBPATH + export SYSTEM_LIBPATH - LIBPATH="$sd_prog$add_moz_lib":$LIBPATH -- else ++ LIBPATH="$sd_prog":$LIBPATH + else - LIBPATH="$sd_prog$add_moz_lib" -- fi -- export LIBPATH -- ;; -- -- Darwin) -- # this is a temporary hack until we can live with the default search paths -- if [ $DYLD_LIBRARY_PATH ]; then -- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH -- export SYSTEM_DYLD_LIBRARY_PATH ++ LIBPATH="$sd_prog" + fi + export LIBPATH + ;; +@@ -108,9 +98,9 @@ + if [ $DYLD_LIBRARY_PATH ]; then + SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH + export SYSTEM_DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH -- else ++ DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH + else - DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib" -- fi -- export DYLD_LIBRARY_PATH -- ;; -- -- HP-UX) -- # this is a temporary hack until we can live with the default search paths -- if [ $SHLIB_PATH ]; then -- SYSTEM_SHLIB_PATH=$SHLIB_PATH -- export SYSTEM_SHLIB_PATH ++ DYLD_LIBRARY_PATH="$sd_prog" + fi + export DYLD_LIBRARY_PATH + ;; +@@ -120,9 +110,9 @@ + if [ $SHLIB_PATH ]; then + SYSTEM_SHLIB_PATH=$SHLIB_PATH + export SYSTEM_SHLIB_PATH - SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH -- else ++ SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH + else - SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib -- fi -- export SHLIB_PATH -- ;; -- -- IRIX*) -- # this is a temporary hack until we can live with the default search paths -- if [ $LD_LIBRARYN32_PATH ]; then -- SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH -- export SYSTEM_LD_LIBRARYN32_PATH ++ SHLIB_PATH="$sd_prog":/usr/openwin/lib + fi + export SHLIB_PATH + ;; +@@ -132,9 +122,9 @@ + if [ $LD_LIBRARYN32_PATH ]; then + SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH + export SYSTEM_LD_LIBRARYN32_PATH - LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH -- else ++ LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH + else - LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib" -- fi -- export LD_LIBRARYN32_PATH -- ;; -- -- *) -- # this is a temporary hack until we can live with the default search paths -- if [ $LD_LIBRARY_PATH ]; then -- SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH -- export SYSTEM_LD_LIBRARY_PATH ++ LD_LIBRARYN32_PATH=:"$sd_prog" + fi + export LD_LIBRARYN32_PATH + ;; +@@ -144,9 +134,9 @@ + if [ $LD_LIBRARY_PATH ]; then + SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH + export SYSTEM_LD_LIBRARY_PATH - LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH -- else ++ LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH + else - LD_LIBRARY_PATH="$sd_prog$add_moz_lib" -- fi -- export LD_LIBRARY_PATH -- ;; --esac -- - #collect all bootstrap variables specified on the command line - #so that they can be passed as arguments to javaldx later on - for arg in $@ -@@ -167,23 +92,11 @@ - if [ -x "$sd_prog/javaldx" ] ; then - java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS` - if [ "$java_ld_library_path" != "" ] ; then -- case $sd_platform in -- AIX) -- LIBPATH=${java_ld_library_path}:${LIBPATH} -- ;; -- Darwin) -- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH} -- ;; -- HP-UX) -- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH} -- ;; -- IRIX*) -- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH} -- ;; -- *) -- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH} -- ;; -- esac -+ if [ $LD_LIBRARY_PATH ]; then -+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH} -+ else -+ LD_LIBRARY_PATH=${java_ld_library_path} -+ fi ++ LD_LIBRARY_PATH="$sd_prog" fi - fi - + export LD_LIBRARY_PATH + ;; openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/cupsmgr.hxx | 0 inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 inc/psprint/printerinfomanager.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 23 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 530 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 +++++ vcl/source/gdi/print.cxx | 11 30 files changed, 786 insertions(+), 15 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 28 Jan 2007 15:01:13 -0000 1.20 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 29 Jan 2007 13:41:40 -0000 1.21 @@ -351,7 +351,36 @@ diff -u -p -u -r1.12 cupsmgr.cxx --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000 -@@ -475,9 +475,10 @@ +@@ -407,10 +407,15 @@ + m_pDests( NULL ), + m_bNewDests( false ) + { ++ startsearch(); ++} ++ ++void CUPSManager::startsearch() ++{ + m_aDestThread = osl_createThread( run_dest_thread_stub, this ); + } + +-CUPSManager::~CUPSManager() ++void CUPSManager::stopsearch() + { + if( m_aDestThread ) + { +@@ -422,6 +427,11 @@ + + if( m_nDests && m_pDests ) + m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests ); ++} ++ ++CUPSManager::~CUPSManager() ++{ ++ stopsearch(); + delete m_pCUPSWrapper; + } + +@@ -475,9 +485,10 @@ // clear old stuff m_aCUPSDestMap.clear(); @@ -363,7 +392,7 @@ // check for CUPS server(?) > 1.2 // since there is no API to query, check for options that were -@@ -485,9 +486,9 @@ +@@ -485,9 +496,9 @@ // this is needed to check for %%IncludeFeature support // (#i65684#, #i65491#) cups_dest_t* pDest = ((cups_dest_t*)m_pDests); @@ -375,7 +404,7 @@ if( pOpt ) m_bUseIncludeFeature = true; -@@ -569,6 +570,10 @@ +@@ -569,6 +580,10 @@ m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback ); #endif // ENABLE_CUPS @@ -386,6 +415,40 @@ } #ifdef ENABLE_CUPS +Index: inc/cupsmgr.hxx +=================================================================== +RCS file: /cvs/gsl/psprint/inc/cupsmgr.hxx,v +retrieving revision 1.9 +diff -u -r1.9 cupsmgr.hxx +--- openoffice.org.orig/psprint/inc/cupsmgr.hxx 10 Jul 2006 16:29:13 -0000 1.9 ++++ openoffice.org/psprint/inc/cupsmgr.hxx 29 Jan 2007 13:36:19 -0000 +@@ -99,7 +99,9 @@ + virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + + // check if the printer configuration has changed ++ virtual void startsearch (); + virtual bool checkPrintersChanged( bool bWait ); ++ virtual void stopsearch (); + + // members for administration (->padmin) + // disable for CUPS +Index: inc/psprint/printerinfomanager.hxx +=================================================================== +RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v +retrieving revision 1.15.2.1 +diff -u -r1.15.2.1 printerinfomanager.hxx +--- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx 24 Jan 2007 15:06:04 -0000 1.15.2.1 ++++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx 29 Jan 2007 13:36:31 -0000 +@@ -188,7 +188,9 @@ + // check if the printer configuration has changed + // if bwait is true, then this method waits for eventual asynchronous + // printer discovery to finish ++ virtual void startsearch(); + virtual bool checkPrintersChanged( bool bWait ); ++ virtual void stopsearch(); + + // members for administration (->padmin) + Index: inc/printdlg.hxx =================================================================== RCS file: /cvs/util/svtools/inc/printdlg.hxx,v @@ -718,7 +781,7 @@ short PrintDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) -@@ -625,15 +908,231 @@ +@@ -625,15 +908,245 @@ ImplInitControls(); ImplModifyControlHdl( NULL ); @@ -899,15 +962,29 @@ + OUString sOldPrinterName(mpPrinter->GetName()); + if (sNewPrinterName != sOldPrinterName) + { -+ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false )) -+ { -+ Printer aTempPrinter(*pInfo); -+ mpPrinter->SetPrinterProps(&aTempPrinter); -+ } -+ else ++ for (int i = 0; i < 2; ++i) + { -+ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", -+ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr()); ++ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false )) ++ { ++ Printer aTempPrinter(*pInfo); ++ mpPrinter->SetPrinterProps(&aTempPrinter); ++ break; ++ } ++ else ++ { ++ if (!i) ++ { ++ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() ); ++ rManager.stopsearch(); ++ rManager.startsearch(); ++ rManager.checkPrintersChanged(true); ++ } ++ else ++ { ++ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", ++ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr()); ++ } ++ } + } + } + gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter); @@ -957,7 +1034,7 @@ } maStatusTimer.Stop(); -@@ -648,4 +1147,3 @@ +@@ -648,4 +1161,3 @@ mpPrinterImpl->m_bHelpDisabled = sal_True; maBtnHelp.Disable(); } Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1012 retrieving revision 1.1013 diff -u -r1.1012 -r1.1013 --- openoffice.org.spec 28 Jan 2007 15:01:13 -0000 1.1012 +++ openoffice.org.spec 29 Jan 2007 13:41:40 -0000 1.1013 @@ -1,6 +1,6 @@ %define oootag OOF680 %define ooomilestone 4 -%define rh_rpm_release 2 +%define rh_rpm_release 3 # gcc#19664# %define stlvisibilityfcked 1 @@ -116,13 +116,10 @@ Patch49: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch Patch50: openoffice.org-2.2.0.oooXXXXX.extensions.noxaw.patch Patch51: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch +Patch52: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch %define instdir %{_libdir}/openoffice.org -# rule of thumb of a poor help translations: check for "Working With -# %PRODUCTNAME Writer" in helpcontent2/source/text/swriter/localize.sdf -%define withlang --with-lang="%{langpack_langs}" --with-poor-help-localizations="cy fi ga gu-IN hr lt sr-CS ta-IN te-IN ur-IN" - %description OpenOffice.org is an Open Source, community-developed, multi-platform office productivity suite. It includes the key desktop applications, @@ -980,6 +977,7 @@ %patch49 -p1 -b .ooo73866.javaunohelper.parallel.patch %patch50 -p1 -b .oooXXXXX.extensions.noxaw.patch %patch51 -p1 -b .ooo73863.vcl.imcommit.patch +%patch52 -p1 -b .ooo73974.bridges.doublereturn.patch %if %{langpacks} tar xzf %{SOURCE1} @@ -997,10 +995,12 @@ fi fi fi +#don't build localized helps which are poorly translated +POORHELPS=`grep "Working With %PRODUCTNAME" helpcontent2/source/text/swriter/localize.sdf | cut -f 10 | xargs` cd config_office autoconf export PATH=$PATH:/usr/sbin -%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang} +%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" cd .. ./bootstrap source Linux*Env.Set.sh @@ -1047,19 +1047,7 @@ #get an unpackaged raw install export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}" echo start en-US install time is `date`, diskspace: `df -h . | tail -n 1` -if ! dmake openoffice_en-US; then - echo parallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build... - echo - ---dump log start--- - cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log - echo - ---dump log end--- - echo - ---debug jar start--- - for i in ../../solver/680/*/bin/*.jar; do unzip -l $i; done - echo - ---debug jar end--- - rm -rf ../../solver/680/*/bin/*.jar - unset MAXPROCESS - build --dlv_switch -link --all - dmake openoffice_en-US -fi +dmake openoffice_en-US echo end en-US install time is `date`, diskspace: `df -h . | tail -n 1` %if %{langpacks} echo start langpack install time is `date`, diskspace: `df -h . | tail -n 1` @@ -2584,6 +2572,11 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Mon Jan 29 2007 Caolan McNamara - 1:2.2.0-4.3 +- Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch +- Resolves: rhbz#225097 library path problems for extensions +- Resolves: rhbz#225143 detect newly added printers + * Sun Jan 28 2007 Caolan McNamara - 1:2.2.0-4.2 - fix CUPSManager::initialize From fedora-cvs-commits at redhat.com Mon Jan 29 13:42:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:42:28 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.4, 1.5 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.17, 1.18 openoffice.org.spec, 1.921, 1.922 Message-ID: <200701291342.l0TDgS5v010545@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10526 Modified Files: openoffice.org-1.9.114.rh161886.rpath.desktop.patch openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch openoffice.org.spec Added Files: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch Log Message: fix a few bugs openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch: bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 2 ++ source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 0 2 files changed, 2 insertions(+) --- NEW FILE openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch --- Index: source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx =================================================================== RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx,v retrieving revision 1.7 diff -u -r1.7 uno2cpp.cxx --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 1 Dec 2006 14:17:59 -0000 1.7 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 29 Jan 2007 11:21:29 -0000 @@ -295,9 +295,11 @@ *reinterpret_cast( pRegisterReturn ) = *reinterpret_cast( &aRet.i.rax ); break; case typelib_TypeClass_FLOAT: + aRet.f.xmm0 = d0; *reinterpret_cast( pRegisterReturn ) = *reinterpret_cast( &aRet.f.xmm0 ); break; case typelib_TypeClass_DOUBLE: + aRet.f.xmm0 = d0; *reinterpret_cast( pRegisterReturn ) = *reinterpret_cast( &aRet.f.xmm0 ); break; default: { openoffice.org-1.9.114.rh161886.rpath.desktop.patch: desktop/scripts/soffice.sh | 32 ++++++++++---------------------- scripts/soffice.sh | 0 2 files changed, 10 insertions(+), 22 deletions(-) Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openoffice.org-1.9.114.rh161886.rpath.desktop.patch 5 May 2006 10:27:57 -0000 1.4 +++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch 29 Jan 2007 13:42:26 -0000 1.5 @@ -5,7 +5,7 @@ diff -u -p -r1.17 soffice.sh --- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17 +++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000 -@@ -79,81 +79,6 @@ +@@ -77,28 +79,16 @@ # change back directory cd "$sd_cwd" @@ -17,102 +17,70 @@ - fi -fi - --# set search path for shared libraries + # set search path for shared libraries -add_moz_lib= -for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do - test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break; -done --case $sd_platform in -- AIX) -- # this is a temporary hack until we can live with the default search paths -- if [ $LIBPATH ]; then -- SYSTEM_LIBPATH=$LIBPATH -- export SYSTEM_LIBPATH + case $sd_platform in + AIX) + # this is a temporary hack until we can live with the default search paths + if [ $LIBPATH ]; then + SYSTEM_LIBPATH=$LIBPATH + export SYSTEM_LIBPATH - LIBPATH="$sd_prog$add_moz_lib":$LIBPATH -- else ++ LIBPATH="$sd_prog":$LIBPATH + else - LIBPATH="$sd_prog$add_moz_lib" -- fi -- export LIBPATH -- ;; -- -- Darwin) -- # this is a temporary hack until we can live with the default search paths -- if [ $DYLD_LIBRARY_PATH ]; then -- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH -- export SYSTEM_DYLD_LIBRARY_PATH ++ LIBPATH="$sd_prog" + fi + export LIBPATH + ;; +@@ -108,9 +98,9 @@ + if [ $DYLD_LIBRARY_PATH ]; then + SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH + export SYSTEM_DYLD_LIBRARY_PATH - DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH -- else ++ DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH + else - DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib" -- fi -- export DYLD_LIBRARY_PATH -- ;; -- -- HP-UX) -- # this is a temporary hack until we can live with the default search paths -- if [ $SHLIB_PATH ]; then -- SYSTEM_SHLIB_PATH=$SHLIB_PATH -- export SYSTEM_SHLIB_PATH ++ DYLD_LIBRARY_PATH="$sd_prog" + fi + export DYLD_LIBRARY_PATH + ;; +@@ -120,9 +110,9 @@ + if [ $SHLIB_PATH ]; then + SYSTEM_SHLIB_PATH=$SHLIB_PATH + export SYSTEM_SHLIB_PATH - SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH -- else ++ SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH + else - SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib -- fi -- export SHLIB_PATH -- ;; -- -- IRIX*) -- # this is a temporary hack until we can live with the default search paths -- if [ $LD_LIBRARYN32_PATH ]; then -- SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH -- export SYSTEM_LD_LIBRARYN32_PATH ++ SHLIB_PATH="$sd_prog":/usr/openwin/lib + fi + export SHLIB_PATH + ;; +@@ -132,9 +122,9 @@ + if [ $LD_LIBRARYN32_PATH ]; then + SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH + export SYSTEM_LD_LIBRARYN32_PATH - LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH -- else ++ LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH + else - LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib" -- fi -- export LD_LIBRARYN32_PATH -- ;; -- -- *) -- # this is a temporary hack until we can live with the default search paths -- if [ $LD_LIBRARY_PATH ]; then -- SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH -- export SYSTEM_LD_LIBRARY_PATH ++ LD_LIBRARYN32_PATH=:"$sd_prog" + fi + export LD_LIBRARYN32_PATH + ;; +@@ -144,9 +134,9 @@ + if [ $LD_LIBRARY_PATH ]; then + SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH + export SYSTEM_LD_LIBRARY_PATH - LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH -- else ++ LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH + else - LD_LIBRARY_PATH="$sd_prog$add_moz_lib" -- fi -- export LD_LIBRARY_PATH -- ;; --esac -- - #collect all bootstrap variables specified on the command line - #so that they can be passed as arguments to javaldx later on - for arg in $@ -@@ -167,23 +92,11 @@ - if [ -x "$sd_prog/javaldx" ] ; then - java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS` - if [ "$java_ld_library_path" != "" ] ; then -- case $sd_platform in -- AIX) -- LIBPATH=${java_ld_library_path}:${LIBPATH} -- ;; -- Darwin) -- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH} -- ;; -- HP-UX) -- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH} -- ;; -- IRIX*) -- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH} -- ;; -- *) -- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH} -- ;; -- esac -+ if [ $LD_LIBRARY_PATH ]; then -+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH} -+ else -+ LD_LIBRARY_PATH=${java_ld_library_path} -+ fi ++ LD_LIBRARY_PATH="$sd_prog" fi - fi - + export LD_LIBRARY_PATH + ;; openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/cupsmgr.hxx | 0 inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 inc/psprint/printerinfomanager.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 19 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 530 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 +++++ vcl/source/gdi/print.cxx | 11 30 files changed, 784 insertions(+), 13 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 12 Dec 2006 20:27:39 -0000 1.17 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 29 Jan 2007 13:42:26 -0000 1.18 @@ -5,16 +5,16 @@ diff -u -r1.40 printerjob.cxx --- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40 +++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000 -@@ -740,6 +744,9 @@ +@@ -740,6 +740,9 @@ if( ! pKey || ! pValue ) return true; + if (pValue->m_bCupsOnly) + return true; + - String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) ); - aFeature += pKey->getKey(); - aFeature += ' '; + OStringBuffer aFeature(256); + aFeature.append( "[{\n" ); + if( bUseIncluseFeature ) Index: inc/psprint/ppdparser.hxx =================================================================== RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v @@ -351,7 +351,36 @@ diff -u -p -u -r1.12 cupsmgr.cxx --- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12 +++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000 -@@ -475,9 +487,10 @@ void CUPSManager::initialize() +@@ -407,10 +407,15 @@ + m_pDests( NULL ), + m_bNewDests( false ) + { ++ startsearch(); ++} ++ ++void CUPSManager::startsearch() ++{ + m_aDestThread = osl_createThread( run_dest_thread_stub, this ); + } + +-CUPSManager::~CUPSManager() ++void CUPSManager::stopsearch() + { + if( m_aDestThread ) + { +@@ -422,6 +427,11 @@ + + if( m_nDests && m_pDests ) + m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests ); ++} ++ ++CUPSManager::~CUPSManager() ++{ ++ stopsearch(); + delete m_pCUPSWrapper; + } + +@@ -475,9 +485,10 @@ // clear old stuff m_aCUPSDestMap.clear(); @@ -360,10 +389,10 @@ if( ! (m_nDests && m_pDests ) ) return; +#endif - - rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); - int nPrinter = m_nDests; -@@ -550,6 +563,10 @@ void CUPSManager::initialize() + + // check for CUPS server(?) > 1.2 + // since there is no API to query, check for options that were +@@ -569,6 +580,10 @@ m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback ); #endif // ENABLE_CUPS @@ -374,6 +403,40 @@ } #ifdef ENABLE_CUPS +Index: inc/cupsmgr.hxx +=================================================================== +RCS file: /cvs/gsl/psprint/inc/cupsmgr.hxx,v +retrieving revision 1.9 +diff -u -r1.9 cupsmgr.hxx +--- openoffice.org.orig/psprint/inc/cupsmgr.hxx 10 Jul 2006 16:29:13 -0000 1.9 ++++ openoffice.org/psprint/inc/cupsmgr.hxx 29 Jan 2007 13:36:19 -0000 +@@ -99,7 +99,9 @@ + virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + + // check if the printer configuration has changed ++ virtual void startsearch (); + virtual bool checkPrintersChanged( bool bWait ); ++ virtual void stopsearch (); + + // members for administration (->padmin) + // disable for CUPS +Index: inc/psprint/printerinfomanager.hxx +=================================================================== +RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v +retrieving revision 1.15.2.1 +diff -u -r1.15.2.1 printerinfomanager.hxx +--- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx 24 Jan 2007 15:06:04 -0000 1.15.2.1 ++++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx 29 Jan 2007 13:36:31 -0000 +@@ -188,7 +188,9 @@ + // check if the printer configuration has changed + // if bwait is true, then this method waits for eventual asynchronous + // printer discovery to finish ++ virtual void startsearch(); + virtual bool checkPrintersChanged( bool bWait ); ++ virtual void stopsearch(); + + // members for administration (->padmin) + Index: inc/printdlg.hxx =================================================================== RCS file: /cvs/util/svtools/inc/printdlg.hxx,v @@ -648,7 +711,7 @@ + { + const PPDKey* pKey = 0; + -+ if (pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("Duplex")))) ++ if ((pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("Duplex"))))) + { + if (const PPDValue* pVal = aInfo.m_aContext.getValue( pKey )) + { @@ -668,7 +731,7 @@ + } + } + -+ if (pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("PageSize")))) ++ if ((pKey = aInfo.m_pParser->getKey(String(RTL_CONSTASCII_USTRINGPARAM("PageSize"))))) + { + int select = -1; + const PPDValue* pSelectValue = sSelectedPaper.Len() ? 0 : aInfo.m_aContext.getValue(pKey); @@ -706,7 +769,7 @@ short PrintDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) -@@ -623,15 +906,241 @@ +@@ -625,15 +908,245 @@ ImplInitControls(); ImplModifyControlHdl( NULL ); @@ -887,26 +950,30 @@ + OUString sOldPrinterName(mpPrinter->GetName()); + if (sNewPrinterName != sOldPrinterName) + { -+ USHORT i = 0; -+ USHORT nCount = Printer::GetQueueCount(); -+ if (nCount) ++ for (int i = 0; i < 2; ++i) + { -+ for (i = 0; i < nCount; ++i) ++ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false )) ++ { ++ Printer aTempPrinter(*pInfo); ++ mpPrinter->SetPrinterProps(&aTempPrinter); ++ break; ++ } ++ else + { -+ const QueueInfo& rInfo = Printer::GetQueueInfo(i, false); -+ if (OUString(rInfo.GetPrinterName()) == sNewPrinterName) ++ if (!i) ++ { ++ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() ); ++ rManager.stopsearch(); ++ rManager.startsearch(); ++ rManager.checkPrintersChanged(true); ++ } ++ else + { -+ Printer aTempPrinter(rInfo); -+ mpPrinter->SetPrinterProps(&aTempPrinter); -+ break; ++ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", ++ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr()); + } + } + } -+ if (i == nCount) -+ { -+ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n", -+ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr()); -+ } + } + gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter); + @@ -955,7 +1022,7 @@ } maStatusTimer.Stop(); -@@ -646,4 +1155,3 @@ +@@ -648,4 +1161,3 @@ mpPrinterImpl->m_bHelpDisabled = sal_True; maBtnHelp.Disable(); } Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v retrieving revision 1.921 retrieving revision 1.922 diff -u -r1.921 -r1.922 --- openoffice.org.spec 28 Jan 2007 14:57:45 -0000 1.921 +++ openoffice.org.spec 29 Jan 2007 13:42:26 -0000 1.922 @@ -154,6 +154,7 @@ Patch86: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch Patch87: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch Patch88: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch +Patch89: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -1042,6 +1043,7 @@ %patch86 -p1 -b .ooo73481.svx.longnotint32.patch %patch87 -p1 -b .ooo73863.vcl.imcommit.patch %patch88 -p1 -b .ooo71039.svx.purevirtual.patch +%patch89 -p1 -b .ooo73974.bridges.doublereturn.patch tar xzf %{SOURCE1} @@ -2567,11 +2569,14 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Jan 15 2007 Caolan McNamara - 1:2.0.4-5.5.11 +* Mon Jan 29 2007 Caolan McNamara - 1:2.0.4-5.5.11 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch - Resolves: rhbz#224230 mark sofficerc as config file - Resolves: rhbz#222779 openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch - Resolves: rhbz#224532 openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch +- Resolves: rhbz#225097 library path problems for extensions +- Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch +- Resolves: rhbz#225143 detect newly added printers * Mon Dec 18 2006 Caolan McNamara - 1:2.0.4-5.5.10 - Resolves: rhbz#219252 add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch From fedora-cvs-commits at redhat.com Mon Jan 29 13:51:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:51:21 -0500 Subject: rpms/netpbm/FC-6 netpbm-10.35-pbmtog3segfault.patch, NONE, 1.1 netpbm-10.23-security.patch, 1.16, 1.17 netpbm-10.27-bmptopnm.patch, 1.3, 1.4 netpbm.spec, 1.82, 1.83 Message-ID: <200701291351.l0TDpK4t031118@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31100 Modified Files: netpbm-10.23-security.patch netpbm-10.27-bmptopnm.patch netpbm.spec Added Files: netpbm-10.35-pbmtog3segfault.patch Log Message: - bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) - pbmtog3 won't segfault on 64bit arches (#220739) - remove bogus man pages (#220112, #220113) - overflow2() no more conflicts with libgd.so (#216116) - fix BuildRoot netpbm-10.35-pbmtog3segfault.patch: pbmtog3.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE netpbm-10.35-pbmtog3segfault.patch --- --- netpbm-10.35/converter/pbm/pbmtog3.c.pbmtog3segfault 2006-09-18 12:20:32.000000000 +0200 +++ netpbm-10.35/converter/pbm/pbmtog3.c 2006-12-28 11:43:19.000000000 +0100 @@ -371,7 +371,7 @@ r2 <<= c++; r2 <<= 1; k += c; } } - if (milepost[n - 1] != cols) + if (!n || milepost[n - 1] != cols) milepost[n++] = cols; *lengthP = n; } netpbm-10.23-security.patch: analyzer/pgmhist.c | 1 analyzer/pgmtexture.c | 9 ++++++ converter/other/gemtopnm.c | 1 converter/other/jpegtopnm.c | 1 converter/other/pbmtopgm.c | 1 converter/other/pngtopnm.c | 19 ++++++++----- converter/other/pnmtoddif.c | 2 + converter/other/pnmtojpeg.c | 9 +++++- converter/other/pnmtops.c | 12 +++++--- converter/other/pnmtorle.c | 2 + converter/other/pnmtosgi.c | 19 +++++++++++++ converter/other/rletopnm.c | 2 + converter/other/sgitopnm.c | 6 +++- converter/other/sirtopnm.c | 1 converter/other/tifftopnm.c | 3 +- converter/other/xwdtopnm.c | 8 +++++ converter/pbm/icontopbm.c | 6 ++++ converter/pbm/mdatopbm.c | 5 ++- converter/pbm/mgrtopbm.c | 2 + converter/pbm/pbmto10x.c | 2 - converter/pbm/pbmto4425.c | 3 +- converter/pbm/pbmtoascii.c | 2 + converter/pbm/pbmtocmuwm.c | 1 converter/pbm/pbmtogem.c | 1 converter/pbm/pbmtogo.c | 1 converter/pbm/pbmtoicon.c | 1 converter/pbm/pbmtolj.c | 4 ++ converter/pbm/pbmtomacp.c | 3 ++ converter/pbm/pbmtomda.c | 1 converter/pbm/pbmtomgr.c | 1 converter/pbm/pbmtoppa/pbm.c | 4 ++ converter/pbm/pbmtoppa/pbmtoppa.c | 1 converter/pbm/pbmtox10bm.c | 1 converter/pbm/pbmtoxbm.c | 1 converter/pbm/pbmtoybm.c | 1 converter/pbm/pbmtozinc.c | 1 converter/pbm/pktopbm.c | 1 converter/pbm/thinkjettopbm.l | 4 ++ converter/pbm/ybmtopbm.c | 1 converter/pgm/lispmtopgm.c | 5 ++- converter/pgm/psidtopgm.c | 1 converter/ppm/Makefile | 2 - converter/ppm/ilbmtoppm.c | 28 +++++++++++++++++++ converter/ppm/imgtoppm.c | 2 + converter/ppm/pcxtoppm.c | 2 + converter/ppm/picttoppm.c | 2 + converter/ppm/pjtoppm.c | 21 +++++++++----- converter/ppm/ppmtoeyuv.c | 1 converter/ppm/ppmtoicr.c | 2 - converter/ppm/ppmtoilbm.c | 8 ++++- converter/ppm/ppmtolj.c | 3 +- converter/ppm/ppmtomitsu.c | 2 + converter/ppm/ppmtompeg/iframe.c | 20 +++++++------- converter/ppm/ppmtompeg/parallel.c | 4 ++ converter/ppm/ppmtompeg/psearch.c | 18 ++++++++++++ converter/ppm/ppmtompeg/rgbtoycc.c | 2 + converter/ppm/ppmtopcx.c | 2 + converter/ppm/ppmtopict.c | 2 + converter/ppm/ppmtopj.c | 1 converter/ppm/ppmtopjxl.c | 8 +++++ converter/ppm/ppmtowinicon.c | 8 +++++ converter/ppm/ppmtoxpm.c | 2 + converter/ppm/qrttoppm.c | 2 - converter/ppm/sldtoppm.c | 4 ++ converter/ppm/ximtoppm.c | 4 ++ converter/ppm/xpmtoppm.c | 1 converter/ppm/yuvtoppm.c | 1 editor/pamcut.c | 2 + editor/pamoil.c | 1 editor/pbmclean.c | 2 - editor/pbmlife.c | 2 - editor/pbmpscale.c | 1 editor/pbmreduce.c | 1 editor/pnmcut.c | 1 editor/pnmgamma.c | 1 editor/pnmhisteq.c | 1 editor/pnmindex.csh | 3 ++ editor/pnmpad.c | 2 + editor/pnmpaste.c | 5 +++ editor/pnmremap.c | 2 + editor/pnmscalefixed.c | 7 ++++ editor/pnmshear.c | 6 ++++ editor/ppmdither.c | 6 +++- generator/pbmpage.c | 3 ++ generator/pbmtext.c | 15 ++++++++++ generator/pgmcrater.c | 2 - generator/pgmkernel.c | 2 - generator/ppmrainbow | 2 - lib/libpam.c | 3 +- lib/libpammap.c | 2 + lib/libpbm1.c | 1 lib/libpbmvms.c | 2 + lib/libpm.c | 52 ++++++++++++++++++++++++++++++++++++- lib/pm.h | 7 ++++ other/pnmcolormap.c | 1 urt/README | 5 +++ urt/Runput.c | 10 ++++--- urt/rle.h | 14 +++++++++ urt/rle_addhist.c | 15 +++++++++- urt/rle_getrow.c | 3 ++ urt/rle_hdr.c | 19 +++++++++++-- urt/rle_open_f.c | 8 ++++- urt/rle_putcom.c | 6 +++- urt/scanargs.c | 6 ++-- 104 files changed, 458 insertions(+), 65 deletions(-) Index: netpbm-10.23-security.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm-10.23-security.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- netpbm-10.23-security.patch 12 Oct 2006 10:31:25 -0000 1.16 +++ netpbm-10.23-security.patch 29 Jan 2007 13:51:18 -0000 1.17 @@ -1388,13 +1388,14 @@ } --- netpbm-10.34/lib/pm.h.security 2006-05-19 22:39:07.000000000 +0200 +++ netpbm-10.34/lib/pm.h 2006-06-22 12:45:18.000000000 +0200 -@@ -340,4 +340,10 @@ +@@ -340,4 +340,11 @@ #endif +void *malloc2(int, int); +void *malloc3(int, int, int); -+void overflow2(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++void __overflow2(int, int); +void overflow3(int, int, int); +void overflow_add(int, int); + @@ -1449,7 +1450,7 @@ + * Maths wrapping + */ + -+void overflow2(int a, int b) ++void __overflow2(int a, int b) +{ + if(a < 0 || b < 0) + pm_error("object too large"); @@ -1763,7 +1764,7 @@ */ /* * rle.h - Global declarations for Utah Raster Toolkit RLE programs. -@@ -166,6 +169,16 @@ +@@ -166,6 +169,17 @@ */ extern rle_hdr rle_dflt_hdr; @@ -1772,7 +1773,8 @@ + */ + +extern void overflow_add(int, int); -+extern void overflow2(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++extern void __overflow2(int, int); +extern void overflow3(int, int, int); +extern void *malloc2(int, int); +extern void *malloc3(int, int, int); netpbm-10.27-bmptopnm.patch: bmptopnm.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: netpbm-10.27-bmptopnm.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm-10.27-bmptopnm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- netpbm-10.27-bmptopnm.patch 28 Feb 2006 12:59:04 -0000 1.3 +++ netpbm-10.27-bmptopnm.patch 29 Jan 2007 13:51:18 -0000 1.4 @@ -1,6 +1,6 @@ ---- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm 2006-02-27 15:02:02.000000000 +0100 -+++ netpbm-10.32/converter/other/bmptopnm.c 2006-02-27 15:07:31.000000000 +0100 -@@ -1248,7 +1248,7 @@ readBmp(FILE * const ifP, +--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 ++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 +@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, xel ** const colormapP, bool const verbose) { @@ -9,12 +9,11 @@ unsigned int pos; /* Current byte position in the BMP file */ -@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) { - writeRasterGen(BMPraster, cols, rows, outputType, cBitCount, - pixelformat, colormap); +@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP, + BMPreadfileheader(ifP, &bytesRead, &offBits); + pos += bytesRead; } -- free(colormap); -+ if (colormap) free(colormap); - free(BMPraster); - - return 0; +- if(BMPheader.cmapsize != 0) + { + unsigned int bytesRead; + BMPreadinfoheader(ifP, &bytesRead, &BMPheader); Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- netpbm.spec 12 Oct 2006 10:31:25 -0000 1.82 +++ netpbm.spec 29 Jan 2007 13:51:18 -0000 1.83 @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm Version: 10.35 -Release: 7%{?dist} +Release: 8%{?dist} License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -22,7 +22,8 @@ Patch13: netpbm-10.33-multilib.patch Patch14: netpbm-10.34-pamscale.patch Patch15: netpbm-10.35-ppmquantall.patch -Buildroot: %{_tmppath}/%{name}-root +Patch16: netpbm-10.35-pbmtog3segfault.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex BuildRequires: libX11-devel Obsoletes: libgr @@ -81,6 +82,7 @@ %patch13 -p1 -b .multilib %patch14 -p1 -b .pamscale %patch15 -p1 -b .pqall +%patch16 -p1 -b .pbmtog3segfault ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -142,11 +144,14 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir} tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir} -# Don't ship man packages for non-existent binaries -for i in hpcdtoppm.1 pcdovtoppm.1 pnmtojbig.1 \ - ppmsvgalib.1 vidtoppm.1 picttoppm.1 jbigtopnm.1; do - rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i} +# Don't ship man pages for non-existent binaries and bogus ones +for i in hpcdtoppm pcdovtoppm pnmtojbig \ + ppmsvgalib vidtoppm picttoppm jbigtopnm \ + directory error extendedopacity \ + pam pbm pgm pnm ppm; do + rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1 done +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5 mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir} rm -rf $RPM_BUILD_ROOT/usr/README @@ -158,7 +163,6 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template - %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -185,6 +189,13 @@ %{_mandir}/man5/* %changelog +* Mon Jan 29 2007 Jindrich Novy 10.35-8 +- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) +- pbmtog3 won't segfault on 64bit arches (#220739) +- remove bogus man pages (#220112, #220113) +- overflow2() no more conflicts with libgd.so (#216116) +- fix BuildRoot + * Thu Oct 12 2006 Jindrich Novy 10.35-7 - remove note about OSL 1 licensing from COPYRIGHT.PATENT file From fedora-cvs-commits at redhat.com Mon Jan 29 13:51:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:51:23 -0500 Subject: rpms/ntp/FC-6 ntp-4.2.4-bcast.patch, NONE, 1.1 ntp-4.2.4-mlock.patch, NONE, 1.1 ntp-4.2.4-optvalues.patch, NONE, 1.1 ntp-4.2.4-html2man.patch, 1.2, 1.3 ntp.spec, 1.62, 1.63 Message-ID: <200701291351.l0TDpNS8031160@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/ntp/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31098 Modified Files: ntp-4.2.4-html2man.patch ntp.spec Added Files: ntp-4.2.4-bcast.patch ntp-4.2.4-mlock.patch ntp-4.2.4-optvalues.patch Log Message: - add option to enable memory locking (#195617) - fix broadcast client - use option values in ntp-keygen - improve man pages Resolves: #195617 ntp-4.2.4-bcast.patch: ntp_io.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ntp-4.2.4-bcast.patch --- Upstream bug #768 --- ntp-4.2.4/ntpd/ntp_io.c.bcast 2006-12-28 13:03:29.000000000 +0100 +++ ntp-4.2.4/ntpd/ntp_io.c 2007-01-29 13:02:20.000000000 +0100 @@ -1870,7 +1870,7 @@ */ interf->family = AF_INET; interf->bfd = open_socket(&interf->bcast, - INT_BROADCAST, 1, interf); + INT_BROADCAST, 0, interf); /* * If we succeeded then we use it otherwise ntp-4.2.4-mlock.patch: html/ntpd.html | 4 +++- ntpd/ntpd-opts.c | 23 ++++++++++++++++++++++- ntpd/ntpd-opts.h | 19 +++++++++++++------ ntpd/ntpd.c | 4 +++- 4 files changed, 41 insertions(+), 9 deletions(-) --- NEW FILE ntp-4.2.4-mlock.patch --- --- ntp-4.2.4/html/ntpd.html.mlock 2007-01-29 13:26:21.000000000 +0100 +++ ntp-4.2.4/html/ntpd.html 2007-01-29 13:26:22.000000000 +0100 @@ -34,7 +34,7 @@

    Synopsis

    - ntpd [ -46aAbdDgLnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -I iface ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ] + ntpd [ -46aAbdDgLmnNqx ] [ -c conffile ] [ -f driftfile ] [ -i jaildir ] [ -I iface ] [ -k keyfile ] [ -l logfile ] [ -p pidfile ] [ -P priority ] [ -r broadcastdelay ] [ -s statsdir ] [ -t key ] [ -u user[:group] ] [ -U interface_update_interval ] [ -v variable ] [ -V variable ]

    Description

    The ntpd program is an operating system daemon which sets and maintains the system time of day in synchronism with Internet standard time servers. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. ntpd does most computations in 64-bit floating point arithmetic and does relatively clumsy 64-bit fixed point operations only when necessary to preserve the ultimate precision, about 232 picoseconds. While the ultimate precision is not achievable with ordinary workstations and networks of today, it may be required with future gigahertz CPU clocks and gigabit LANs.

    How NTP Operates

    @@ -95,6 +95,8 @@
    Specify the name and path of the log file. The default is the system log file. This is the same operation as the logfile logfile configuration command.
    -L
    Do not listen to virtual IPs. The default is to listen. +
    -m +
    Lock memory.
    -n
    Don't fork.
    -N --- ntp-4.2.4/ntpd/ntpd.c.mlock 2007-01-29 13:26:21.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd.c 2007-01-29 13:26:22.000000000 +0100 @@ -704,7 +704,8 @@ } #endif -#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE) +#if defined(MCL_CURRENT) && defined(MCL_FUTURE) + if (HAVE_OPT( MLOCK )) { # ifdef HAVE_SETRLIMIT /* * Set the stack limit to something smaller, so that we don't lock a lot @@ -742,6 +743,7 @@ */ if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) msyslog(LOG_ERR, "mlockall(): %m"); + } #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */ # ifdef HAVE_PLOCK # ifdef PROCLOCK --- ntp-4.2.4/ntpd/ntpd-opts.c.mlock 2007-01-29 13:26:22.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd-opts.c 2007-01-29 13:26:22.000000000 +0100 @@ -265,6 +265,15 @@ #define NICE_FLAGS (OPTST_DISABLED) /* + * Mlock option description: + */ +tSCC zMlockText[] = + "Lock memory"; +tSCC zMlock_NAME[] = "MLOCK"; +tSCC zMlock_Name[] = "mlock"; +#define MLOCK_FLAGS (OPTST_DISABLED) + +/* * Pidfile option description: */ tSCC zPidfileText[] = @@ -796,6 +805,18 @@ /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name, /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ 29, VALUE_OPT_MLOCK, + /* equiv idx, value */ 29, VALUE_OPT_MLOCK, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ MLOCK_FLAGS, 0, + /* last opt argumnt */ { NULL }, + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name, + /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, @@ -913,7 +934,7 @@ NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 29 /* user option count */ + OPTION_CT, 30 /* user option count */ }; /* --- ntp-4.2.4/ntpd/ntpd-opts.h.mlock 2006-12-29 01:11:53.000000000 +0100 +++ ntp-4.2.4/ntpd/ntpd-opts.h 2007-01-29 13:26:22.000000000 +0100 @@ -82,14 +82,15 @@ INDEX_OPT_VAR = 26, INDEX_OPT_DVAR = 27, INDEX_OPT_SLEW = 28, - INDEX_OPT_VERSION = 29, - INDEX_OPT_HELP = 30, - INDEX_OPT_MORE_HELP = 31, - INDEX_OPT_SAVE_OPTS = 32, - INDEX_OPT_LOAD_OPTS = 33 + INDEX_OPT_MLOCK = 29, + INDEX_OPT_VERSION = 30, + INDEX_OPT_HELP = 31, + INDEX_OPT_MORE_HELP = 32, + INDEX_OPT_SAVE_OPTS = 33, + INDEX_OPT_LOAD_OPTS = 34 } teOptIndex; -#define OPTION_CT 34 +#define OPTION_CT 35 #define NTPD_VERSION "4.2.4" #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4" @@ -182,6 +183,10 @@ # warning undefining MODIFYMMTIMER due to option name conflict # undef MODIFYMMTIMER # endif +# ifdef MLOCK +# warning undefining MLOCK due to option name conflict +# undef MLOCK +# endif # ifdef NOFORK # warning undefining NOFORK due to option name conflict # undef NOFORK @@ -251,6 +256,7 @@ # undef LOGFILE # undef NOVIRTUALIPS # undef MODIFYMMTIMER +# undef MLOCK # undef NOFORK # undef NICE # undef PIDFILE @@ -293,6 +299,7 @@ #ifdef SYS_WINNT #define VALUE_OPT_MODIFYMMTIMER 'M' #endif /* SYS_WINNT */ +#define VALUE_OPT_MLOCK 'm' #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_NICE 'N' #define VALUE_OPT_PIDFILE 'p' ntp-4.2.4-optvalues.patch: ntp-keygen.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE ntp-4.2.4-optvalues.patch --- --- ntp-4.2.4/util/ntp-keygen.c.optvalues 2006-12-29 00:02:02.000000000 +0100 +++ ntp-4.2.4/util/ntp-keygen.c 2007-01-29 10:53:42.000000000 +0100 @@ -323,7 +323,7 @@ #ifdef OPENSSL if (HAVE_OPT( MODULUS )) - modulus = DESC(MODULUS).optOccCt; + modulus = OPT_VALUE_MODULUS; if (HAVE_OPT( PVT_CERT )) exten = EXT_KEY_PRIVATE; @@ -345,12 +345,12 @@ if (HAVE_OPT( MV_PARAMS )) { mvpar++; - nkeys = DESC(MV_PARAMS).optOccCt; + nkeys = OPT_VALUE_MV_PARAMS; } if (HAVE_OPT( MV_KEYS )) { mvkey++; - nkeys = DESC(MV_KEYS).optOccCt; + nkeys = OPT_VALUE_MV_KEYS; } #endif ntp-4.2.4-html2man.patch: html2man.in | 101 +++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 66 insertions(+), 35 deletions(-) Index: ntp-4.2.4-html2man.patch =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp-4.2.4-html2man.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ntp-4.2.4-html2man.patch 23 Jan 2007 16:00:00 -0000 1.2 +++ ntp-4.2.4-html2man.patch 29 Jan 2007 13:51:21 -0000 1.3 @@ -1,6 +1,6 @@ --- ntp-4.2.4/scripts/html2man.in.html2man 2006-06-06 22:17:10.000000000 +0200 +++ ntp-4.2.4/scripts/html2man.in 2007-01-08 12:47:31.000000000 +0100 -@@ -23,7 +23,7 @@ +@@ -23,10 +23,10 @@ 'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'], 'ntpdate' => ['ntpdate', 8, 'ntpd(8)'], 'ntpdc' => ['ntpdc', 8, 'ntpd(8)'], @@ -8,7 +8,11 @@ + 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'], 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'], 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'], - 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], +- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], ++ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'], + 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'], + 'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'], + 'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'], @@ -34,17 +34,8 @@ 'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']); @@ -54,7 +58,7 @@ - print MANOUT "$name\n\n"; - - print MANOUT "$top_disclaimer\n"; -+ print MANOUT "$name\n.SH\n\n"; ++ print MANOUT "$name\n.SH \\ \n\n"; + @fontstack = (); + $deflevel = 0; Index: ntp.spec =================================================================== RCS file: /cvs/dist/rpms/ntp/FC-6/ntp.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ntp.spec 23 Jan 2007 16:00:00 -0000 1.62 +++ ntp.spec 29 Jan 2007 13:51:21 -0000 1.63 @@ -3,7 +3,7 @@ Summary: Synchronizes system time using the Network Time Protocol (NTP). Name: ntp Version: 4.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: distributable Group: System Environment/Daemons Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz @@ -29,6 +29,9 @@ Patch11: ntp-stable-4.2.0a-20050816-keyfile.patch Patch12: ntp-4.2.4-sprintf.patch Patch13: ntp-4.2.4-autoopts.patch +Patch14: ntp-4.2.4-mlock.patch +Patch15: ntp-4.2.4-optvalues.patch +Patch16: ntp-4.2.4-bcast.patch URL: http://www.ntp.org Requires(pre): shadow-utils @@ -66,6 +69,9 @@ %patch11 -p1 -b .keyfile %patch12 -p1 -b .sprintf %patch13 -p1 -b .autoopts +%patch14 -p1 -b .mlock +%patch15 -p1 -b .optvalues +%patch16 -p1 -b .bcast %ifarch ia64 %patch5 -p1 -b .linkfastmath @@ -177,6 +183,12 @@ %changelog +* Mon Jan 29 2007 Miroslav Lichvar 4.2.4-3.fc6 +- add option to enable memory locking (#195617) +- fix broadcast client +- use option values in ntp-keygen +- improve man pages + * Tue Jan 23 2007 Miroslav Lichvar 4.2.4-2.fc6 - generate makewhatis friendly man pages From fedora-cvs-commits at redhat.com Mon Jan 29 13:54:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 08:54:09 -0500 Subject: rpms/netpbm/FC-6 netpbm.spec,1.83,1.84 Message-ID: <200701291354.l0TDs9x9031284@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv31270 Modified Files: netpbm.spec Log Message: - modify release to avoid devel/fc6 tag clashes Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-6/netpbm.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- netpbm.spec 29 Jan 2007 13:51:18 -0000 1.83 +++ netpbm.spec 29 Jan 2007 13:54:07 -0000 1.84 @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm Version: 10.35 -Release: 8%{?dist} +Release: 8.1%{?dist} License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -189,7 +189,7 @@ %{_mandir}/man5/* %changelog -* Mon Jan 29 2007 Jindrich Novy 10.35-8 +* Mon Jan 29 2007 Jindrich Novy 10.35-8.1 - bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) - pbmtog3 won't segfault on 64bit arches (#220739) - remove bogus man pages (#220112, #220113) From fedora-cvs-commits at redhat.com Mon Jan 29 14:18:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 09:18:27 -0500 Subject: rpms/mailman/devel mailman-2.1.9-LC_CTYPE.patch, NONE, 1.1 mailman.spec, 1.63, 1.64 Message-ID: <200701291418.l0TEIRRC019641@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/mailman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19626 Modified Files: mailman.spec Added Files: mailman-2.1.9-LC_CTYPE.patch Log Message: - mailman-2.1.9-LC_CTYPE.patch added (bug #132495) - Resolves: rhbz#132495 mailman-2.1.9-LC_CTYPE.patch: Mailman/MTA/Manual.py | 8 ++-- Mailman/MTA/Postfix.py | 14 +++---- Mailman/i18n.py | 27 +++++++++++++- bin/add_members | 17 ++++----- bin/arch | 10 ++--- bin/b4b5-archfix | 4 +- bin/change_pw | 13 +++---- bin/check_db | 12 +++--- bin/check_perms | 82 ++++++++++++++++++++++---------------------- bin/cleanarch | 10 ++--- bin/clone_member | 24 ++++++------- bin/config_list | 29 ++++++++------- bin/convert.py | 6 +-- bin/discard | 12 +++--- bin/dumpdb | 16 ++++---- bin/find_member | 14 +++---- bin/fix_url.py | 10 ++--- bin/genaliases | 4 +- bin/inject | 10 ++--- bin/list_admins | 8 ++-- bin/list_lists | 10 ++--- bin/list_members | 12 +++--- bin/list_owners | 4 +- bin/mailmanctl | 40 ++++++++++----------- bin/mmsitepass | 20 +++++----- bin/newlist | 23 ++++++------ bin/qrunner | 10 ++--- bin/rb-archfix | 4 +- bin/remove_members | 12 +++--- bin/rmlist | 28 +++++++-------- bin/show_qfiles | 4 +- bin/sync_members | 34 +++++++++--------- bin/transcheck | 4 +- bin/unshunt | 6 +-- bin/update | 90 ++++++++++++++++++++++++------------------------- bin/version | 4 +- bin/withlist | 22 +++++------ 37 files changed, 342 insertions(+), 315 deletions(-) --- NEW FILE mailman-2.1.9-LC_CTYPE.patch --- Nur in mailman-2.1.9-new: autom4te.cache. diff -ur mailman-2.1.9/bin/add_members mailman-2.1.9-new/bin/add_members --- mailman-2.1.9/bin/add_members 2005-08-27 03:40:17.000000000 +0200 +++ mailman-2.1.9-new/bin/add_members 2007-01-29 14:29:46.000000000 +0100 @@ -81,6 +81,7 @@ from Mailman import i18n _ = i18n._ +C_ = i18n.C_ @@ -89,7 +90,7 @@ fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(status) @@ -116,7 +117,7 @@ self.__outfp = outfp def write(self, msg): - sys.stdout.write(msg) + sys.stdout.write(i18n.tolocale(msg)) self.__outfp.write(msg) @@ -188,26 +189,26 @@ elif arg.lower()[0] == 'n': send_welcome_msg = 0 else: - usage(1, _('Bad argument to -w/--welcome-msg: %(arg)s')) + usage(1, C_('Bad argument to -w/--welcome-msg: %(arg)s')) elif opt in ('-a', '--admin-notify'): if arg.lower()[0] == 'y': admin_notif = 1 elif arg.lower()[0] == 'n': admin_notif = 0 else: - usage(1, _('Bad argument to -a/--admin-notify: %(arg)s')) + usage(1, C_('Bad argument to -a/--admin-notify: %(arg)s')) if dfile is None and nfile is None: usage(1) if dfile == "-" and nfile == "-": - usage(1, _('Cannot read both digest and normal members ' - 'from standard input.')) + usage(1, C_('Cannot read both digest and normal members ' + 'from standard input.')) try: mlist = MailList.MailList(listname) except Errors.MMUnknownListError: - usage(1, _('No such list: %(listname)s')) + usage(1, C_('No such list: %(listname)s')) # Set up defaults if send_welcome_msg is None: @@ -227,7 +228,7 @@ nmembers = readfile(nfile) if not dmembers and not nmembers: - usage(0, _('Nothing to do.')) + usage(0, C_('Nothing to do.')) s = StringIO() i18n.set_language(mlist.preferred_language) diff -ur mailman-2.1.9/bin/arch mailman-2.1.9-new/bin/arch --- mailman-2.1.9/bin/arch 2005-08-27 03:40:17.000000000 +0200 +++ mailman-2.1.9-new/bin/arch 2007-01-29 14:29:46.000000000 +0100 @@ -70,7 +70,7 @@ from Mailman.LockFile import LockFile from Mailman import i18n -_ = i18n._ +C_ = i18n.C_ PROGRAM = sys.argv[0] i18n.set_language(mm_cfg.DEFAULT_SERVER_LANGUAGE) @@ -82,7 +82,7 @@ fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -122,7 +122,7 @@ # grok arguments if len(args) < 1: - usage(1, _('listname is required')) + usage(1, C_('listname is required')) listname = args[0].lower().strip() if len(args) < 2: @@ -140,7 +140,7 @@ try: mlist = MailList(listname) except Errors.MMListError, e: - usage(2, _('No such list "%(listname)s"\n%(e)s')) + usage(2, C_('No such list "%(listname)s"\n%(e)s')) if mbox is None: mbox = mlist.ArchiveFileName() @@ -180,7 +180,7 @@ try: fp = open(mbox) except IOError, msg: - usage(3, _('Cannot open mbox file %(mbox)s: %(msg)s')) + usage(3, C_('Cannot open mbox file %(mbox)s: %(msg)s')) archiver = HyperArchive(mlist) archiver.VERBOSE = verbose Nur in mailman-2.1.9-new/bin: arch.orig. diff -ur mailman-2.1.9/bin/b4b5-archfix mailman-2.1.9-new/bin/b4b5-archfix --- mailman-2.1.9/bin/b4b5-archfix 2005-08-27 03:40:17.000000000 +0200 +++ mailman-2.1.9-new/bin/b4b5-archfix 2007-01-29 14:29:46.000000000 +0100 @@ -44,7 +44,7 @@ # Required to get the right classes for unpickling import paths -from Mailman.i18n import _ +from Mailman.i18n import C_ PROGRAM = sys.argv[0] @@ -55,7 +55,7 @@ fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) diff -ur mailman-2.1.9/bin/change_pw mailman-2.1.9-new/bin/change_pw --- mailman-2.1.9/bin/change_pw 2005-08-27 03:40:17.000000000 +0200 +++ mailman-2.1.9-new/bin/change_pw 2007-01-29 14:32:07.000000000 +0100 @@ -77,6 +77,7 @@ from Mailman import i18n _ = i18n._ +C_ = i18n.C_ SPACE = ' ' @@ -87,7 +88,7 @@ fd = sys.stderr else: fd = sys.stdout - print >> fd, _(__doc__) + print >> fd, C_(__doc__) if msg: print >> fd, msg sys.exit(code) @@ -103,7 +104,7 @@ try: mlist = MailList.MailList(listname, lock=0) except Errors.MMListError, e: - usage(1, _('No such list "%(listname)s"\n%(e)s')) + usage(1, C_('No such list "%(listname)s"\n%(e)s')) _listcache[listname] = mlist return mlist @@ -141,11 +142,11 @@ if args: strargs = SPACE.join(args) - usage(1, _('Bad arguments: %(strargs)s')) + usage(1, C_('Bad arguments: %(strargs)s')) if password is not None: if not password: - usage(1, _('Empty list passwords are not allowed')) + usage(1, C_('Empty list passwords are not allowed')) shapassword = sha.new(password).hexdigest() if domains: @@ -155,7 +156,7 @@ listnames[name] = 1 if not listnames: - print >> sys.stderr, _('Nothing to do.') + print >> sys.stderr, C_('Nothing to do.') sys.exit(0) # Set the password on the lists @@ -177,7 +178,7 @@ mlist.Unlock() # Notification - print _('New %(listname)s password: %(notifypassword)s') + print C_('New %(listname)s password: %(notifypassword)s') [...2145 lines suppressed...] except Errors.MMUnknownListError: - print >> sys.stderr, _('Unknown list: %(listname)s') + print >> sys.stderr, C_('Unknown list: %(listname)s') m = None # try to import the module and run the callable @@ -233,7 +233,7 @@ all = True if len(args) < 1 and not all: - warning = _('No list name supplied.') + warning = C_('No list name supplied.') if interact: # Let them keep going print warning @@ -242,7 +242,7 @@ usage(1, warning) if all and not run: - usage(1, _('--all requires --run')) + usage(1, C_('--all requires --run')) # The default for interact is 1 unless -r was given if interact is None: @@ -262,10 +262,10 @@ module = run[:i] callable = run[i+1:] if VERBOSE: - print >> sys.stderr, _('Importing %(module)s...') + print >> sys.stderr, C_('Importing %(module)s...') mod = __import__(module) if VERBOSE: - print >> sys.stderr, _('Running %(module)s.%(callable)s()...') + print >> sys.stderr, C_('Running %(module)s.%(callable)s()...') func = getattr(mod, callable) if all: diff -ur mailman-2.1.9/Mailman/i18n.py mailman-2.1.9-new/Mailman/i18n.py --- mailman-2.1.9/Mailman/i18n.py 2006-02-23 07:25:29.000000000 +0100 +++ mailman-2.1.9-new/Mailman/i18n.py 2007-01-29 14:29:45.000000000 +0100 @@ -15,6 +15,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +import locale import sys import time import gettext @@ -25,6 +26,15 @@ _translation = None + +def _get_ctype_charset(): + old = locale.setlocale(locale.LC_CTYPE, '') + charset = locale.nl_langinfo(locale.CODESET) + locale.setlocale(locale.LC_CTYPE, old) + return charset + +_ctype_charset = _get_ctype_charset() + def set_language(language=None): @@ -54,7 +64,7 @@ -def _(s): +def _(s, frame = 1): if s == '': return s assert s @@ -70,7 +80,7 @@ # original string is 1) locals dictionary, 2) globals dictionary. # # First, get the frame of the caller - frame = sys._getframe(1) + frame = sys._getframe(frame) # A `safe' dictionary is used so we won't get an exception if there's a # missing key in the dictionary. dict = SafeDict(frame.f_globals.copy()) @@ -91,6 +101,19 @@ +def tolocale(s): + global _ctype_charset + if isinstance(s, UnicodeType): + return s + source = _translation.charset () + if not source: + return s + return unicode(s, source, 'replace').encode(_ctype_charset, 'replace') + +def C_(s): + return tolocale(_(s, 2)) + + def ctime(date): # Don't make these module globals since we have to do runtime translation # of the strings anyway. Nur in mailman-2.1.9-new/Mailman: i18n.py.orig. Nur in mailman-2.1.9-new/Mailman/Logging: Makefile. Nur in mailman-2.1.9-new/Mailman: Makefile. Nur in mailman-2.1.9-new/Mailman: mm_cfg.py.dist. Nur in mailman-2.1.9-new/Mailman/MTA: Makefile. diff -ur mailman-2.1.9/Mailman/MTA/Manual.py mailman-2.1.9-new/Mailman/MTA/Manual.py --- mailman-2.1.9/Mailman/MTA/Manual.py 2005-12-30 19:50:08.000000000 +0100 +++ mailman-2.1.9-new/Mailman/MTA/Manual.py 2007-01-29 14:29:45.000000000 +0100 @@ -25,7 +25,7 @@ from Mailman import Message from Mailman import Utils from Mailman.Queue.sbcache import get_switchboard -from Mailman.i18n import _ +from Mailman.i18n import _, C_ from Mailman.MTA.Utils import makealiases try: @@ -74,12 +74,12 @@ outfp = sfp else: if not quiet: - print _("""\ + print C_("""\ To finish creating your mailing list, you must edit your /etc/aliases (or equivalent) file by adding the following lines, and possibly running the `newaliases' program: """) - print _("""\ + print C_("""\ ## %(listname)s mailing list""") outfp = sys.stdout # Common path @@ -120,7 +120,7 @@ """) outfp = sfp else: - print _(""" + print C_(""" To finish removing your mailing list, you must edit your /etc/aliases (or equivalent) file by removing the following lines, and possibly running the `newaliases' program: Nur in mailman-2.1.9-new/Mailman/MTA: Manual.py.orig. diff -ur mailman-2.1.9/Mailman/MTA/Postfix.py mailman-2.1.9-new/Mailman/MTA/Postfix.py --- mailman-2.1.9/Mailman/MTA/Postfix.py 2007-01-29 14:37:43.000000000 +0100 +++ mailman-2.1.9-new/Mailman/MTA/Postfix.py 2007-01-29 14:35:09.000000000 +0100 @@ -27,7 +27,7 @@ from Mailman import mm_cfg from Mailman import Utils from Mailman import LockFile -from Mailman.i18n import _ +from Mailman.i18n import C_ from Mailman.MTA.Utils import makealiases from Mailman.Logging.Syslog import syslog @@ -303,7 +303,7 @@ targetmode = S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP for file in ALIASFILE, VIRTFILE: if state.VERBOSE: - print _('checking permissions on %(file)s') + print C_('checking permissions on %(file)s') stat = None try: stat = os.stat(file) @@ -313,9 +313,9 @@ if stat and (stat[ST_MODE] & targetmode) <> targetmode: state.ERRORS += 1 octmode = oct(stat[ST_MODE]) - print _('%(file)s permissions must be 066x (got %(octmode)s)'), + print C_('%(file)s permissions must be 066x (got %(octmode)s)'), if state.FIX: - print _('(fixing)') + print C_('(fixing)') os.chmod(file, stat[ST_MODE] | targetmode) else: print @@ -331,7 +331,7 @@ raise continue if state.VERBOSE: - print _('checking ownership of %(dbfile)s') + print C_('checking ownership of %(dbfile)s') user = mm_cfg.MAILMAN_USER ownerok = stat[ST_UID] == pwd.getpwnam(user)[2] if not ownerok: @@ -339,10 +339,10 @@ owner = pwd.getpwuid(stat[ST_UID])[0] except KeyError: owner = 'uid %d' % stat[ST_UID] - print _('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), + print C_('%(dbfile)s owned by %(owner)s (must be owned by %(user)s'), state.ERRORS += 1 if state.FIX: - print _('(fixing)') + print C_('(fixing)') uid = pwd.getpwnam(user)[2] gid = grp.getgrnam(mm_cfg.MAILMAN_GROUP)[2] os.chown(dbfile, uid, gid) Index: mailman.spec =================================================================== RCS file: /cvs/dist/rpms/mailman/devel/mailman.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- mailman.spec 23 Jan 2007 13:55:57 -0000 1.63 +++ mailman.spec 29 Jan 2007 14:18:25 -0000 1.64 @@ -1,7 +1,7 @@ Summary: Mailing list manager with built in Web access. Name: mailman Version: 2.1.9 -Release: 4 +Release: 5 Epoch: 3 Group: Applications/Internet #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz @@ -20,6 +20,7 @@ Patch6: mailman-python-compile.patch Patch7: mailman-init.patch Patch8: mailman-archive-reply.patch +Patch9: mailman-2.1.9-LC_CTYPE.patch License: GPL URL: http://www.list.org/ @@ -94,6 +95,7 @@ %patch6 -p1 -b .python-compile %patch7 -p1 -b .inithelp %patch8 -p1 -b .archive-in-reply-to +%patch9 -p1 -b .lctype cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in @@ -326,6 +328,10 @@ %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in %changelog +* Mon Jan 29 2007 Harald Hoyer - 3:2.1.9-5 +- mailman-2.1.9-LC_CTYPE.patch added (bug #132495) +- Resolves: rhbz#132495 + * Tue Jan 23 2007 Florian La Roche - add fix from rhbz#219054: usage output mentions "status" option From fedora-cvs-commits at redhat.com Mon Jan 29 14:26:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 09:26:15 -0500 Subject: rpms/xdelta/devel xdelta-1.1.4-glib2.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xdelta.spec, 1.23, 1.24 xdelta-1.1.3-allocbug.patch, 1.1, NONE xdelta-1.1.3-freegen.patch, 1.1, NONE xdelta-1.1.3-gcc4.patch, 1.1, NONE xdelta-1.1.3-glib2.patch, 1.2, NONE Message-ID: <200701291426.l0TEQFcG019894@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/xdelta/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19879/xdelta/devel Modified Files: .cvsignore sources xdelta.spec Added Files: xdelta-1.1.4-glib2.patch Removed Files: xdelta-1.1.3-allocbug.patch xdelta-1.1.3-freegen.patch xdelta-1.1.3-gcc4.patch xdelta-1.1.3-glib2.patch Log Message: updated to 1.1.4pre1 xdelta-1.1.4-glib2.patch: configure.in | 4 - libedsio/edsio.c | 132 +------------------------------------------------------ libedsio/edsio.h | 43 ----------------- 3 files changed, 5 insertions(+), 174 deletions(-) --- NEW FILE xdelta-1.1.4-glib2.patch --- --- xdelta-1.1.4pre1/libedsio/edsio.c.glib2 2007-01-29 14:55:10.000000000 +0100 +++ xdelta-1.1.4pre1/libedsio/edsio.c 2007-01-29 14:56:52.000000000 +0100 @@ -179,9 +179,9 @@ } } - while (g_queue_get_size (queued) > 0) + while (g_queue_get_length (queued) > 0) { - DelayedEvent* de = g_queue_pop (queued); + DelayedEvent* de = g_queue_pop_head (queued); for (i = 0; i < all_event_watchers->len; i += 1) { @@ -211,7 +211,7 @@ de->def = def; de->msg = out->str; - g_queue_push (queued, de); + g_queue_push_tail (queued, de); g_ptr_array_add (free_strings, out); } @@ -1482,129 +1482,3 @@ g_free (source); } -/* Missing glib stuff - */ - -GQueue * -g_queue_new (void) -{ - GQueue *q = g_new (GQueue, 1); - - q->list = q->list_end = NULL; - q->list_size = 0; - - return q; -} - - -void -g_queue_free (GQueue *q) -{ - if (q) - { - if (q->list) - g_list_free (q->list); - g_free (q); - } -} - - -guint -g_queue_get_size (GQueue *q) -{ - return (q == NULL) ? 0 : q->list_size; -} - - -void -g_queue_push_front (GQueue *q, gpointer data) -{ - if (q) - { - q->list = g_list_prepend (q->list, data); - - if (q->list_end == NULL) - q->list_end = q->list; - - q->list_size++; - } -} - - -void -g_queue_push_back (GQueue *q, gpointer data) -{ - if (q) - { - q->list_end = g_list_append (q->list_end, data); - - if (! q->list) - q->list = q->list_end; - else - q->list_end = q->list_end->next; - - q->list_size++; - } -} - - -gpointer -g_queue_pop_front (GQueue *q) -{ - gpointer data = NULL; - - if ((q) && (q->list)) - { - GList *node; - - node = q->list; - data = node->data; - - if (! node->next) - { - q->list = q->list_end = NULL; - q->list_size = 0; - } - else - { - q->list = node->next; - q->list->prev = NULL; - q->list_size--; - } - - g_list_free_1 (node); - } - - return data; -} - - -gpointer -g_queue_pop_back (GQueue *q) -{ - gpointer data = NULL; - - if ((q) && (q->list)) - { - GList *node; - - node = q->list_end; - data = node->data; - - if (! node->prev) - { - q->list = q->list_end = NULL; - q->list_size = 0; - } - else - { - q->list_end = node->prev; - q->list_end->next = NULL; - q->list_size--; - } - - g_list_free_1 (node); - } - - return data; -} --- xdelta-1.1.4pre1/libedsio/edsio.h.glib2 2007-01-29 14:54:38.000000000 +0100 +++ xdelta-1.1.4pre1/libedsio/edsio.h 2007-01-29 14:55:00.000000000 +0100 @@ -481,49 +481,6 @@ #endif -/* Missing glib stuff - */ - -typedef struct _GQueue GQueue; - -struct _GQueue -{ - GList *list; - GList *list_end; - guint list_size; -}; - -/* Queues - */ - -GQueue * g_queue_new (void); -void g_queue_free (GQueue *q); -guint g_queue_get_size (GQueue *q); -void g_queue_push_front (GQueue *q, gpointer data); -void g_queue_push_back (GQueue *q, gpointer data); -gpointer g_queue_pop_front (GQueue *q); -gpointer g_queue_pop_back (GQueue *q); - -#define g_queue_empty(queue) \ - ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? FALSE : TRUE) - -#define g_queue_peek_front(queue) \ - ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \ - ((GQueue *)(queue))->list->data : NULL) - -#define g_queue_peek_back(queue) \ - ((((GQueue *)(queue)) && ((GQueue *)(queue))->list_end) ? \ - ((GQueue *)(queue))->list_end->data : NULL) - -#define g_queue_index(queue,ptr) \ - ((((GQueue *)(queue)) && ((GQueue *)(queue))->list) ? \ - g_list_index (((GQueue *)(queue))->list, (ptr)) : -1) - -#define g_queue_push g_queue_push_back -#define g_queue_pop g_queue_pop_front -#define g_queue_peek g_queue_peek_front - - #ifdef __cplusplus } #endif --- xdelta-1.1.4pre1/configure.in.glib2 2007-01-29 14:58:06.000000000 +0100 +++ xdelta-1.1.4pre1/configure.in 2007-01-29 14:59:18.000000000 +0100 @@ -71,8 +71,8 @@ top_srcdir_absolute=`cd $srcdir; pwd` AC_SUBST(top_srcdir_absolute) -AM_PATH_GLIB(1.2.8,, - AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/)) +AM_PATH_GLIB_2_0(2.10.0,, + AC_MSG_ERROR(Test for GLIB2.0 failed. Download it from ftp://ftp.gtk.org/pub/gtk/v2.10/)) dnl AC_CHECK_LIB(z, gzsetparams, */ dnl AC_CHECK_HEADER(zlib.h,, */ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xdelta/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2004 14:37:30 -0000 1.3 +++ .cvsignore 29 Jan 2007 14:26:13 -0000 1.4 @@ -1 +1 @@ -xdelta-1.1.3.tar.gz +xdelta-1.1.4pre1.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xdelta/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2004 14:37:30 -0000 1.3 +++ sources 29 Jan 2007 14:26:13 -0000 1.4 @@ -1 +1 @@ -08e964c28541605b6fe61c0dd6595516 xdelta-1.1.3.tar.gz +4a8e7ae9b963785c0d57a9a5c08661b6 xdelta-1.1.4pre1.tar.gz Index: xdelta.spec =================================================================== RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xdelta.spec 15 Jul 2006 03:04:20 -0000 1.23 +++ xdelta.spec 29 Jan 2007 14:26:13 -0000 1.24 @@ -1,16 +1,13 @@ Summary: A binary file delta generator and an RCS replacement library. Name: xdelta -Version: 1.1.3 -Release: 20 +Version: 1.1.4pre1 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz -Patch0: xdelta-1.1.3-freegen.patch Patch1: xdelta-1.1.3-aclocal.patch -Patch2: xdelta-1.1.3-gcc4.patch Patch3: xdelta-1.1.3-edsio.patch -Patch4: xdelta-1.1.3-glib2.patch -Patch5: xdelta-1.1.3-allocbug.patch +Patch4: xdelta-1.1.4-glib2.patch Patch6: xdelta-1.1.3-pkgconfig.patch Url: http://sourceforge.net/projects/xdelta/ BuildRequires: glib2-devel, zlib-devel, libtool >= 1.5.22, automake >= 1.9.6, autoconf >= 2.59, pkgconfig @@ -36,12 +33,9 @@ %prep %setup -q -%patch0 -p1 -b .freegen %patch1 -p1 -b .aclocal -%patch2 -p1 -b .gcc4 %patch3 -p1 -b .edsio %patch4 -p1 -b .glib2 -%patch5 -p1 -b .allocbug %patch6 -p1 -b .pkgconfig %build @@ -86,6 +80,10 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 29 2007 Adam Tkac 1.1.4pre1-1.fc7 +- started using dist macro +- updated to 1.1.4pre1 + * Fri Jul 14 2006 Jesse Keating 1.1.3-20 - rebuild --- xdelta-1.1.3-allocbug.patch DELETED --- --- xdelta-1.1.3-freegen.patch DELETED --- --- xdelta-1.1.3-gcc4.patch DELETED --- --- xdelta-1.1.3-glib2.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 14:32:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 09:32:51 -0500 Subject: rpms/netpbm/FC-5 netpbm-10.32-pnmdepth.patch, NONE, 1.1 netpbm-10.35-pbmtog3segfault.patch, NONE, 1.1 netpbm-10.35-ppmquantall.patch, NONE, 1.1 netpbm-10.23-security.patch, 1.14, 1.15 netpbm-10.27-bmptopnm.patch, 1.3, 1.4 netpbm-10.31-xwdfix.patch, 1.1, 1.2 netpbm-10.33-ppmtompeg.patch, 1.2, 1.3 netpbm.spec, 1.63, 1.64 sources, 1.23, 1.24 netpbm-10.28-legal.patch, 1.2, NONE netpbm-10.29-pnmtopng.patch, 1.4, NONE netpbm-10.30-rgbtxt.patch, 1.1, NONE Message-ID: <200701291432.l0TEWp77001717@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1460 Modified Files: netpbm-10.23-security.patch netpbm-10.27-bmptopnm.patch netpbm-10.31-xwdfix.patch netpbm-10.33-ppmtompeg.patch netpbm.spec sources Added Files: netpbm-10.32-pnmdepth.patch netpbm-10.35-pbmtog3segfault.patch netpbm-10.35-ppmquantall.patch Removed Files: netpbm-10.28-legal.patch netpbm-10.29-pnmtopng.patch netpbm-10.30-rgbtxt.patch Log Message: - bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) - pbmtog3 won't segfault on 64bit arches (#220739) - fix ppmquantall (#207799), thanks to Steve Grubb - remove bogus man pages (#220112, #220113) - overflow2() no more conflicts with libgd.so (#216116) - remove OSL 1.1 from security patch (#208587) - fix BuildRoot netpbm-10.32-pnmdepth.patch: Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.32-pnmdepth.patch --- --- netpbm-10.32/other/Makefile.pnmdepth 2006-01-03 23:47:15.000000000 +0100 +++ netpbm-10.32/other/Makefile 2006-04-03 14:53:17.000000000 +0200 @@ -66,7 +66,7 @@ $(SYMLINK) pamsplit$(EXE) pnmsplit # In February 2006, pamdepth replaced pnmdepth cd $(PKGDIR)/bin ; \ - rm -f pnmsdepth ; \ - $(SYMLINK) pnmsdepth$(EXE) pnmdepth + rm -f pnmdepth ; \ + $(SYMLINK) pamdepth$(EXE) pnmdepth FORCE: netpbm-10.35-pbmtog3segfault.patch: pbmtog3.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE netpbm-10.35-pbmtog3segfault.patch --- --- netpbm-10.35/converter/pbm/pbmtog3.c.pbmtog3segfault 2006-09-18 12:20:32.000000000 +0200 +++ netpbm-10.35/converter/pbm/pbmtog3.c 2006-12-28 11:43:19.000000000 +0100 @@ -371,7 +371,7 @@ r2 <<= c++; r2 <<= 1; k += c; } } - if (milepost[n - 1] != cols) + if (!n || milepost[n - 1] != cols) milepost[n++] = cols; *lengthP = n; } netpbm-10.35-ppmquantall.patch: ppmquantall | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.35-ppmquantall.patch --- diff -ur netpbm-10.35.orig/editor/ppmquantall netpbm-10.35/editor/ppmquantall --- netpbm-10.35.orig/editor/ppmquantall 2006-09-22 13:47:25.000000000 -0400 +++ netpbm-10.35/editor/ppmquantall 2006-09-22 13:48:07.000000000 -0400 @@ -62,8 +62,8 @@ # To be robust, we need to use Pnmfile to get that information, or # Put this program in C and use ppm_readppminit(). -set widths=() -set heights=() +set widths +set heights for i in ${files[@]}; do widths=(${widths[*]} `grep -v '^#' $i | sed '1d; s/ .*//; 2q'`) netpbm-10.23-security.patch: analyzer/pgmhist.c | 1 analyzer/pgmtexture.c | 9 ++++++ converter/other/gemtopnm.c | 1 converter/other/jpegtopnm.c | 1 converter/other/pbmtopgm.c | 1 converter/other/pngtopnm.c | 19 ++++++++----- converter/other/pnmtoddif.c | 2 + converter/other/pnmtojpeg.c | 9 +++++- converter/other/pnmtops.c | 12 +++++--- converter/other/pnmtorle.c | 2 + converter/other/pnmtosgi.c | 19 +++++++++++++ converter/other/rletopnm.c | 2 + converter/other/sgitopnm.c | 6 +++- converter/other/sirtopnm.c | 1 converter/other/tifftopnm.c | 3 +- converter/other/xwdtopnm.c | 8 +++++ converter/pbm/icontopbm.c | 6 ++++ converter/pbm/mdatopbm.c | 5 ++- converter/pbm/mgrtopbm.c | 2 + converter/pbm/pbmto10x.c | 2 - converter/pbm/pbmto4425.c | 3 +- converter/pbm/pbmtoascii.c | 2 + converter/pbm/pbmtocmuwm.c | 1 converter/pbm/pbmtogem.c | 1 converter/pbm/pbmtogo.c | 1 converter/pbm/pbmtoicon.c | 1 converter/pbm/pbmtolj.c | 4 ++ converter/pbm/pbmtomacp.c | 3 ++ converter/pbm/pbmtomda.c | 1 converter/pbm/pbmtomgr.c | 1 converter/pbm/pbmtoppa/pbm.c | 4 ++ converter/pbm/pbmtoppa/pbmtoppa.c | 1 converter/pbm/pbmtox10bm.c | 1 converter/pbm/pbmtoxbm.c | 1 converter/pbm/pbmtoybm.c | 1 converter/pbm/pbmtozinc.c | 1 converter/pbm/pktopbm.c | 1 converter/pbm/thinkjettopbm.l | 4 ++ converter/pbm/ybmtopbm.c | 1 converter/pgm/lispmtopgm.c | 5 ++- converter/pgm/psidtopgm.c | 1 converter/ppm/Makefile | 2 - converter/ppm/ilbmtoppm.c | 28 +++++++++++++++++++ converter/ppm/imgtoppm.c | 2 + converter/ppm/pcxtoppm.c | 2 + converter/ppm/picttoppm.c | 2 + converter/ppm/pjtoppm.c | 21 +++++++++----- converter/ppm/ppmtoeyuv.c | 1 converter/ppm/ppmtoicr.c | 2 - converter/ppm/ppmtoilbm.c | 8 ++++- converter/ppm/ppmtolj.c | 3 +- converter/ppm/ppmtomitsu.c | 2 + converter/ppm/ppmtompeg/iframe.c | 20 +++++++------- converter/ppm/ppmtompeg/parallel.c | 4 ++ converter/ppm/ppmtompeg/psearch.c | 18 ++++++++++++ converter/ppm/ppmtompeg/rgbtoycc.c | 2 + converter/ppm/ppmtopcx.c | 2 + converter/ppm/ppmtopict.c | 2 + converter/ppm/ppmtopj.c | 1 converter/ppm/ppmtopjxl.c | 8 +++++ converter/ppm/ppmtowinicon.c | 8 +++++ converter/ppm/ppmtoxpm.c | 2 + converter/ppm/qrttoppm.c | 2 - converter/ppm/sldtoppm.c | 4 ++ converter/ppm/ximtoppm.c | 4 ++ converter/ppm/xpmtoppm.c | 1 converter/ppm/yuvtoppm.c | 1 editor/pamcut.c | 2 + editor/pamoil.c | 1 editor/pbmclean.c | 2 - editor/pbmlife.c | 2 - editor/pbmpscale.c | 1 editor/pbmreduce.c | 1 editor/pnmcut.c | 1 editor/pnmgamma.c | 1 editor/pnmhisteq.c | 1 editor/pnmindex.csh | 3 ++ editor/pnmpad.c | 2 + editor/pnmpaste.c | 5 +++ editor/pnmremap.c | 2 + editor/pnmscalefixed.c | 7 ++++ editor/pnmshear.c | 6 ++++ editor/ppmdither.c | 6 +++- generator/pbmpage.c | 3 ++ generator/pbmtext.c | 15 ++++++++++ generator/pgmcrater.c | 2 - generator/pgmkernel.c | 2 - generator/ppmrainbow | 2 - lib/libpam.c | 3 +- lib/libpammap.c | 2 + lib/libpbm1.c | 1 lib/libpbmvms.c | 2 + lib/libpm.c | 52 ++++++++++++++++++++++++++++++++++++- lib/pm.h | 7 ++++ other/pnmcolormap.c | 1 urt/README | 5 +++ urt/Runput.c | 10 ++++--- urt/rle.h | 14 +++++++++ urt/rle_addhist.c | 15 +++++++++- urt/rle_getrow.c | 3 ++ urt/rle_hdr.c | 19 +++++++++++-- urt/rle_open_f.c | 8 ++++- urt/rle_putcom.c | 6 +++- urt/scanargs.c | 6 ++-- 104 files changed, 458 insertions(+), 65 deletions(-) Index: netpbm-10.23-security.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.23-security.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- netpbm-10.23-security.patch 12 Aug 2006 19:35:24 -0000 1.14 +++ netpbm-10.23-security.patch 29 Jan 2007 14:32:48 -0000 1.15 @@ -1,169 +1,3 @@ ---- /dev/null 2006-06-21 18:54:37.100867000 +0200 -+++ netpbm-10.34/OPENLICENSE 2006-06-22 12:45:18.000000000 +0200 -@@ -0,0 +1,163 @@ -+ The Open Software License -+ v. 1.1 -+ -+This Open Software License (the "License") applies to any original work of -+authorship (the "Original Work") whose owner (the "Licensor") has placed the -+following notice immediately following the copyright notice for the Original -+Work: -+ -+Licensed under the Open Software License version 1.1 -+ -+1) Grant of Copyright License. Licensor hereby grants You a world-wide, -+royalty-free, non-exclusive, perpetual, non-sublicenseable license to do the -+following: -+ -+a) to reproduce the Original Work in copies; -+ -+b) to prepare derivative works ("Derivative Works") based upon the Original -+Work; -+ -+c) to distribute copies of the Original Work and Derivative Works to the -+public, with the proviso that copies of Original Work or Derivative Works that -+You distribute shall be licensed under the Open Software License; -+ -+d) to perform the Original Work publicly; and -+ -+e) to display the Original Work publicly. -+ -+2) Grant of Patent License. Licensor hereby grants You a world-wide, -+royalty-free, non-exclusive, perpetual, non-sublicenseable license, under -+patent claims owned or controlled by the Licensor that are embodied in the -+Original Work as furnished by the Licensor ("Licensed Claims") to make, use, -+sell and offer for sale the Original Work. Licensor hereby grants You a -+world-wide, royalty-free, non-exclusive, perpetual, non-sublicenseable license -+under the Licensed Claims to make, use, sell and offer for sale Derivative Works. -+ -+3) Grant of Source Code License. The term "Source Code" means the preferred -+form of the Original Work for making modifications to it and all available -+documentation describing how to modify the Original Work. Licensor hereby -+agrees to provide a machine-readable copy of the Source Code of the Original -+Work along with each copy of the Original Work that Licensor distributes. -+Licensor reserves the right to satisfy this obligation by placing a -+machine-readable copy of the Source Code in an information repository reasonably -+calculated to permit inexpensive and convenient access by You for as long as -+ Licensor continues to distribute the Original Work, and by publishing the -+address of that information repository in a notice immediately following the -+copyright notice that applies to the Original Work. -+ -+ -+4) Exclusions From License Grant. Nothing in this License shall be deemed to -+grant any rights to trademarks, copyrights, patents, trade secrets or any -+other intellectual property of Licensor except as expressly stated herein. No -+patent license is granted to make, use, sell or offer to sell embodiments of -+any patent claims other than the Licensed Claims defined in Section 2. No -+right is granted to the trademarks of Licensor even if such marks are included -+in the Original Work. Nothing in this License shall be interpreted to prohibit -+Licensor from licensing under different terms from this License any Original -+Work that Licensor otherwise would have a right to license. -+ -+5) External Deployment. The term "External Deployment" means the use or -+distribution of the Original Work or Derivative Works in any way such that the -+Original Work or Derivative Works may be used by anyone other than You, -+whether the Original Work or Derivative Works are distributed to those persons -+or made available as an application intended for use over a computer network. -+As an express condition for the grants of license hereunder, You agree that -+any External Deployment by You of a Derivative Work shall be deemed a -+distribution and shall be licensed to all under the terms of this License, as -+prescribed in section 1(c) herein. -+ -+6) Attribution Rights. You must retain, in the Source Code of any Derivative -+Works that You create, all copyright, patent or trademark notices from the -+Source Code of the Original Work, as well as any notices of licensing and any -+descriptive text identified therein as an "Attribution Notice." You must cause -+the Source Code for any Derivative Works that You create to carry a prominent -+Attribution Notice reasonably calculated to inform recipients that You have -+modified the Original Work. -+ -+7) Warranty and Disclaimer of Warranty. Licensor warrants that the copyright -+in and to the Original Work is owned by the Licensor or that the Original Work -+is distributed by Licensor under a valid current license from the copyright -+owner. Except as expressly stated in the immediately proceeding sentence, the -+Original Work is provided under this License on an "AS IS" BASIS and WITHOUT -+WARRANTY, either express or implied, including, without limitation, the -+warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR -+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. -+This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No -+license to Original Work is granted hereunder except under this disclaimer. -+ -+8) Limitation of Liability. Under no circumstances and under no legal theory, -+whether in tort (including negligence), contract, or otherwise, shall the -+Licensor be liable to any person for any direct, indirect, special, incidental, -+or consequential damages of any character arising as a result of this License -+or the use of the Original Work including, without limitation, damages for -+loss of goodwill, work stoppage, computer failure or malfunction, or any and -+all other commercial damages or losses. This limitation of liability shall not -+apply to liability for death or personal injury resulting from Licensor's -+negligence to the extent applicable law prohibits such limitation. Some -+jurisdictions do not allow the exclusion or limitation of incidental or -+consequential damages, so this exclusion and limitation may not apply to You. -+ -+ -+9) Acceptance and Termination. If You distribute copies of the Original Work -+or a Derivative Work, You must make a reasonable effort under the circumstances -+to obtain the express and volitional assent of recipients to the terms of this -+License. Nothing else but this License (or another written agreement between -+Licensor and You) grants You permission to create Derivative Works based upon -+the Original Work or to exercise any of the rights granted in Sections 1 herein, -+and any attempt to do so except under the terms of this License (or another -+written agreement between Licensor and You) is expressly prohibited by U.S. -+copyright law, the equivalent laws of other countries, and by international -+treaty. Therefore, by exercising any of the rights granted to You in Sections -+1 herein, You indicate Your acceptance of this License and all of its terms and -+conditions. This License shall terminate immediately and you may no longer -+exercise any of the rights granted to You by this License upon Your failure to -+honor the proviso in Section 1(c) herein. -+ -+10) Mutual Termination for Patent Action. This License shall terminate -+automatically and You may no longer exercise any of the rights granted to You -+by this License if You file a lawsuit in any court alleging that any OSI -+Certified open source software that is licensed under any license containing -+this "Mutual Termination for Patent Action" clause infringes any patent claims -+that are essential to use that software. -+ -+11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this -+License may be brought only in the courts of a jurisdiction wherein the Licensor -+resides or in which Licensor conducts its primary business, and under the laws -+of that jurisdiction excluding its conflict-of-law provisions. The application -+of the United Nations Convention on Contracts for the International Sale of -+Goods is expressly excluded. Any use of the Original Work outside the scope of -+this License or after its termination shall be subject to the requirements and -+penalties of the U.S. Copyright Act, 17 U.S.C. ?? 101 et seq., the equivalent -+laws of other countries, and international treaty. This section shall survive -+the termination of this License. -+ -+12) Attorneys Fees. In any action to enforce the terms of this License or -+seeking damages relating thereto, the prevailing party shall be entitled to -+recover its costs and expenses, including, without limitation, reasonable -+attorneys' fees and costs incurred in connection with such action, including -+any appeal of such action. This section shall survive the termination of this -+License. -+ -+13) Miscellaneous. This License represents the complete agreement concerning -+the subject matter hereof. If any provision of this License is held to be -+unenforceable, such provision shall be reformed only to the extent necessary -+to make it enforceable. -+ -+14) Definition of "You" in This License. "You" throughout this License, -+whether in upper or lower case, means an individual or a legal entity exercising -+rights under, and complying with all of the terms of, this License. For legal -+entities, "You" includes any entity that controls, is controlled by, or is under -+common control with you. For purposes of this definition, "control" means (i) -+the power, direct or indirect, to cause the direction or management of such -+entity, whether by contract or otherwise, or (ii) ownership of fifty percent -+(50%) or more of the outstanding shares, or (iii) beneficial ownership of such -+entity. -+ -+15) Right to Use. You may use the Original Work in all ways not otherwise -+restricted or conditioned by this License or by law, and Licensor promises not -+to interfere with or be responsible for such uses by You. -+ -+This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved. -+Permission is hereby granted to copy and distribute this license without -+modification. This license may not be modified without the express written -+permission of its copyright owner. --- netpbm-10.34/generator/pbmtext.c.security 2005-07-18 03:14:10.000000000 +0200 +++ netpbm-10.34/generator/pbmtext.c 2006-06-22 12:45:18.000000000 +0200 @@ -89,12 +89,14 @@ @@ -285,20 +119,6 @@ } { unsigned int const intQuotient = colormap.size / pamP->width; ---- netpbm-10.34/doc/COPYRIGHT.PATENT.security 2004-05-01 01:54:22.000000000 +0200 -+++ netpbm-10.34/doc/COPYRIGHT.PATENT 2006-06-22 12:45:18.000000000 +0200 -@@ -33,6 +33,11 @@ - all the above to be modified by "to the best of the Netpbm - maintainer's knowledge." - -+These security fixes for netpbm are (c) Copyright 2002 Red Hat Inc. -+Red Hat has not fixed those items with patent claims or commercial -+use restrictions. These changes include NO WARRANTY and are provided -+under the Open Software License v.1 (see file OPENLICENSE). -+ - - - PATENTS --- netpbm-10.34/converter/pgm/psidtopgm.c.security 2005-08-27 20:38:40.000000000 +0200 +++ netpbm-10.34/converter/pgm/psidtopgm.c 2006-06-22 12:45:18.000000000 +0200 @@ -78,6 +78,7 @@ @@ -1568,13 +1388,14 @@ } --- netpbm-10.34/lib/pm.h.security 2006-05-19 22:39:07.000000000 +0200 +++ netpbm-10.34/lib/pm.h 2006-06-22 12:45:18.000000000 +0200 -@@ -340,4 +340,10 @@ +@@ -340,4 +340,11 @@ #endif +void *malloc2(int, int); +void *malloc3(int, int, int); -+void overflow2(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++void __overflow2(int, int); +void overflow3(int, int, int); +void overflow_add(int, int); + @@ -1629,7 +1450,7 @@ + * Maths wrapping + */ + -+void overflow2(int a, int b) ++void __overflow2(int a, int b) +{ + if(a < 0 || b < 0) + pm_error("object too large"); @@ -1943,7 +1764,7 @@ */ /* * rle.h - Global declarations for Utah Raster Toolkit RLE programs. -@@ -166,6 +169,16 @@ +@@ -166,6 +169,17 @@ */ extern rle_hdr rle_dflt_hdr; @@ -1952,7 +1773,8 @@ + */ + +extern void overflow_add(int, int); -+extern void overflow2(int, int); ++#define overflow2(a,b) __overflow2(a,b) ++extern void __overflow2(int, int); +extern void overflow3(int, int, int); +extern void *malloc2(int, int); +extern void *malloc3(int, int, int); netpbm-10.27-bmptopnm.patch: bmptopnm.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Index: netpbm-10.27-bmptopnm.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.27-bmptopnm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- netpbm-10.27-bmptopnm.patch 28 Feb 2006 12:59:04 -0000 1.3 +++ netpbm-10.27-bmptopnm.patch 29 Jan 2007 14:32:49 -0000 1.4 @@ -1,6 +1,6 @@ ---- netpbm-10.32/converter/other/bmptopnm.c.bmptopnm 2006-02-27 15:02:02.000000000 +0100 -+++ netpbm-10.32/converter/other/bmptopnm.c 2006-02-27 15:07:31.000000000 +0100 -@@ -1248,7 +1248,7 @@ readBmp(FILE * const ifP, +--- netpbm-10.35/converter/other/bmptopnm.c.bmptopnm 2007-01-29 13:08:46.000000000 +0100 ++++ netpbm-10.35/converter/other/bmptopnm.c 2007-01-29 13:32:21.000000000 +0100 +@@ -1262,7 +1262,7 @@ readBmp(FILE * const ifP, xel ** const colormapP, bool const verbose) { @@ -9,12 +9,11 @@ unsigned int pos; /* Current byte position in the BMP file */ -@@ -1455,7 +1455,7 @@ main(int argc, char ** argv) { - writeRasterGen(BMPraster, cols, rows, outputType, cBitCount, - pixelformat, colormap); +@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP, + BMPreadfileheader(ifP, &bytesRead, &offBits); + pos += bytesRead; } -- free(colormap); -+ if (colormap) free(colormap); - free(BMPraster); - - return 0; +- if(BMPheader.cmapsize != 0) + { + unsigned int bytesRead; + BMPreadinfoheader(ifP, &bytesRead, &BMPheader); netpbm-10.31-xwdfix.patch: xwdtopnm.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: netpbm-10.31-xwdfix.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.31-xwdfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.31-xwdfix.patch 14 Feb 2006 14:25:38 -0000 1.1 +++ netpbm-10.31-xwdfix.patch 29 Jan 2007 14:32:49 -0000 1.2 @@ -1,11 +1,11 @@ ---- netpbm-10.31/converter/other/xwdtopnm.c.xwdfix 2006-02-14 15:13:58.000000000 +0100 -+++ netpbm-10.31/converter/other/xwdtopnm.c 2006-02-14 15:15:37.000000000 +0100 -@@ -985,7 +985,7 @@ getpix(pixelReader * const rdrP) { +--- netpbm-10.35/converter/other/xwdtopnm.c.xwdfix 2006-09-18 13:24:50.000000000 +0200 ++++ netpbm-10.35/converter/other/xwdtopnm.c 2006-09-18 13:27:26.000000000 +0200 +@@ -945,7 +945,7 @@ getpix(pixelReader * const rdrP) { unsigned long const bitsToTakeMask = lsbmask[nBitsToTake]; /* E.g. if nbitsToTake is 4, this is 0x0000000F */ - unsigned long bitsToTake; + unsigned int bitsToTake; + /* The actual bits we take, in the 'nBitsToTake' low bits */ assert(nBitsToTake <= 32); - netpbm-10.33-ppmtompeg.patch: fsize.c | 3 +-- parallel.c | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) Index: netpbm-10.33-ppmtompeg.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm-10.33-ppmtompeg.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- netpbm-10.33-ppmtompeg.patch 12 Aug 2006 19:35:25 -0000 1.2 +++ netpbm-10.33-ppmtompeg.patch 29 Jan 2007 14:32:49 -0000 1.3 @@ -1,22 +1,23 @@ ---- netpbm-10.33/converter/ppm/ppmtompeg/fsize.c.ppmtompeg 1995-07-03 23:57:05.000000000 +0200 -+++ netpbm-10.33/converter/ppm/ppmtompeg/fsize.c 2006-04-05 12:44:04.000000000 +0200 -@@ -117,8 +117,8 @@ +--- netpbm-10.35/converter/ppm/ppmtompeg/fsize.c.ppmtompeg 2006-09-18 12:20:24.000000000 +0200 ++++ netpbm-10.35/converter/ppm/ppmtompeg/fsize.c 2006-09-18 13:35:53.000000000 +0200 +@@ -115,8 +115,7 @@ Fsize_Note(int const id, Fsize_Validate(&Fsize_x, &Fsize_y); - if ((Fsize_x==0) || (Fsize_y==0)) { -- fprintf(stderr,"Frame %d: size is zero!\n",id); --/* exit(1); */ -+ fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id); -+ exit(1); + if ((Fsize_x == 0) || (Fsize_y == 0)) { +- fprintf(stderr,"Frame %d: size is less than the minimum: %d x %d!\n", +- id, DCTSIZE*2, DCTSIZE*2); ++ fprintf(stderr,"Frame %d: image dimensions need to be integer multiples of 16 for ppmtompeg!\n",id); + exit(1); } - #ifdef BLEAH ---- netpbm-10.34/converter/ppm/ppmtompeg/parallel.c.ppmtompeg 2006-07-19 14:53:27.000000000 +0200 -+++ netpbm-10.34/converter/ppm/ppmtompeg/parallel.c 2006-07-19 15:11:42.000000000 +0200 -@@ -1315,8 +1315,6 @@ +--- netpbm-10.35/converter/ppm/ppmtompeg/parallel.c.ppmtompeg 2006-09-18 13:30:49.000000000 +0200 ++++ netpbm-10.35/converter/ppm/ppmtompeg/parallel.c 2006-09-18 13:32:24.000000000 +0200 +@@ -1316,8 +1316,6 @@ CombineServer(int const numFram TransmitPortNum(masterHostName, masterPortNum, combinePortNum); - + close(outputServerSocket); - -- fclose(ofp); +- fclose(ofP); } + + Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-5/netpbm.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- netpbm.spec 14 Aug 2006 08:59:07 -0000 1.63 +++ netpbm.spec 29 Jan 2007 14:32:49 -0000 1.64 @@ -1,13 +1,12 @@ Summary: A library for handling different graphics file formats. Name: netpbm -Version: 10.34 +Version: 10.35 Release: 1%{?dist} License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ -Source0: netpbm-%{version}.tar.bz2 -Source1: netpbmdoc-%{version}.tar.bz2 -Patch0: netpbm-10.28-legal.patch +Source0: netpbm-%{version}.l1.tar.bz2 +Source1: netpbmdoc-%{version}.l1.tar.bz2 Patch1: netpbm-10.17-time.patch Patch2: netpbm-9.24-strip.patch Patch3: netpbm-10.19-message.patch @@ -18,15 +17,15 @@ Patch8: netpbm-10.28-gcc4.patch Patch9: netpbm-10.27-bmptopnm.patch Patch10: netpbm-10.28-CAN-2005-2471.patch -Patch11: netpbm-10.29-pnmtopng.patch -Patch12: netpbm-10.30-rgbtxt.patch -Patch13: netpbm-10.31-xwdfix.patch -Patch14: netpbm-10.33-ppmtompeg.patch -Patch15: netpbm-10.33-multilib.patch -Patch16: netpbm-10.34-pamscale.patch -Buildroot: %{_tmppath}/%{name}-root +Patch11: netpbm-10.31-xwdfix.patch +Patch12: netpbm-10.33-ppmtompeg.patch +Patch13: netpbm-10.33-multilib.patch +Patch14: netpbm-10.34-pamscale.patch +Patch15: netpbm-10.35-ppmquantall.patch +Patch16: netpbm-10.35-pbmtog3segfault.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, perl, flex -BuildRequires: libX11-devel, libxml2-devel +BuildRequires: libX11-devel Obsoletes: libgr %description @@ -68,7 +67,6 @@ %prep %setup -q -%patch0 -p1 -b .legal %patch1 -p1 -b .time %patch2 -p1 -b .strip %patch3 -p1 -b .message @@ -79,12 +77,12 @@ %patch8 -p1 -b .gcc4 %patch9 -p1 -b .bmptopnm %patch10 -p1 -b .CAN-2005-2471 -%patch11 -p1 -b .pnmtopng -%patch12 -p1 -b .rgbtxt -%patch13 -p1 -b .xwdfix -%patch14 -p1 -b .ppmtompeg -%patch15 -p1 -b .multilib -%patch16 -p1 -b .pamscale +%patch11 -p1 -b .xwdfix +%patch12 -p1 -b .ppmtompeg +%patch13 -p1 -b .multilib +%patch14 -p1 -b .pamscale +%patch15 -p1 -b .pqall +%patch16 -p1 -b .pbmtog3segfault ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -125,13 +123,14 @@ PNGLIB_DIR=%{_libdir} \ TIFFLIB_DIR=%{_libdir} \ LINUXSVGALIB="NONE" \ - X11LIB=%{_libdir}/libX11.so + X11LIB=%{_libdir}/libX11.so \ + XML2LIBS="NONE" %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT -make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" +make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE" # Ugly hack to have libs in correct dir on 64bit archs. mkdir -p $RPM_BUILD_ROOT%{_libdir} @@ -145,11 +144,14 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir} tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir} -# Don't ship man packages for non-existent binaries -for i in hpcdtoppm.1 pcdovtoppm.1 pnmtojbig.1 \ - ppmsvgalib.1 vidtoppm.1 picttoppm.1 jbigtopnm.1; do - rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i} +# Don't ship man pages for non-existent binaries and bogus ones +for i in hpcdtoppm pcdovtoppm pnmtojbig \ + ppmsvgalib vidtoppm picttoppm jbigtopnm \ + directory error extendedopacity \ + pam pbm pgm pnm ppm; do + rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1 done +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5 mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir} rm -rf $RPM_BUILD_ROOT/usr/README @@ -161,7 +163,6 @@ rm -rf $RPM_BUILD_ROOT/usr/config_template - %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -188,6 +189,15 @@ %{_mandir}/man5/* %changelog +* Mon Jan 29 2007 Jindrich Novy 10.35-1.fc5 +- bmptopnm won't crash with "BMPlencolormap: internal error!" (#224554) +- pbmtog3 won't segfault on 64bit arches (#220739) +- fix ppmquantall (#207799), thanks to Steve Grubb +- remove bogus man pages (#220112, #220113) +- overflow2() no more conflicts with libgd.so (#216116) +- remove OSL 1.1 from security patch (#208587) +- fix BuildRoot + * Sat Aug 12 2006 Jindrich Novy 10.34-1.fc5 - update to 10.34 - drop .ppmtogif, .nstring patches @@ -198,7 +208,7 @@ - fix double free corruption in ppmtompeg (#199409), thanks to Milan Zazrivec - don't use svgalib by default (don't compile/ship ppmsvgalib) -- add BuildRequires libX11-devel, libxml2-deve, use %%{?dist} +- add BuildRequires libX11-devel, libxml2-devel, use %%{?dist} - fix build on x86_64 and ppc64 * Fri Apr 14 2006 Jindrich Novy 10.33-1.fc5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-5/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 12 Aug 2006 19:35:25 -0000 1.23 +++ sources 29 Jan 2007 14:32:49 -0000 1.24 @@ -1,2 +1,2 @@ -061ee465f4336d5191841362a64eaa50 netpbm-10.34.tar.bz2 -21f91a8f9e508b9428455cb24e0f41c1 netpbmdoc-10.34.tar.bz2 +90a5855e3f08bce4c239ffd205df2a37 netpbm-10.35.l1.tar.bz2 +8a76bd4a10ba0dd122e7fee759a2bdab netpbmdoc-10.35.l1.tar.bz2 --- netpbm-10.28-legal.patch DELETED --- --- netpbm-10.29-pnmtopng.patch DELETED --- --- netpbm-10.30-rgbtxt.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 15:17:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 10:17:16 -0500 Subject: rpms/arts/FC-6 arts.spec,1.66,1.67 sources,1.30,1.31 Message-ID: <200701291517.l0TFHG8V024299@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/arts/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22653 Modified Files: arts.spec sources Log Message: 1.5.6 Index: arts.spec =================================================================== RCS file: /cvs/dist/rpms/arts/FC-6/arts.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- arts.spec 25 Oct 2006 12:21:34 -0000 1.66 +++ arts.spec 29 Jan 2007 15:17:13 -0000 1.67 @@ -3,12 +3,12 @@ %define debug 0 %define final 0 -%define qt_version 3.3.6 +%define qt_version 3.3.7 %define make_cvs 1 -Version: 1.5.5 -Release: 0.1.fc6 +Version: 1.5.6 +Release: 0.1%{?dist} Summary: aRts (analog realtime synthesizer) - the KDE sound system Name: arts Group: System Environment/Daemons @@ -163,6 +163,12 @@ %{_libdir}/lib*.so %changelog +* Wed Jan 24 2007 Than Ngo - 6:1.5.6-0.1.fc6 +- 1.5.6 + +* Tue Nov 14 2006 Than Ngo - 6:1.5.5-1.fc7 +- rebuild + * Wed Oct 25 2006 Than Ngo 8:1.5.5-0.1.fc6 - 1.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/arts/FC-6/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 25 Oct 2006 12:16:19 -0000 1.30 +++ sources 29 Jan 2007 15:17:13 -0000 1.31 @@ -1 +1 @@ -3b0aa1ee08c6ef2aefd8d2d88d1ec146 arts-1.5.5.tar.bz2 +e986393a5827499bbad04a00b797add0 arts-1.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 29 15:23:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 10:23:54 -0500 Subject: rpms/sip/FC-6 .cvsignore, 1.15, 1.16 sip.spec, 1.33, 1.34 sources, 1.16, 1.17 Message-ID: <200701291523.l0TFNsbJ014810@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/sip/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14712 Modified Files: .cvsignore sip.spec sources Log Message: 4.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sip/FC-6/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 19 Jul 2006 20:38:00 -0000 1.15 +++ .cvsignore 29 Jan 2007 15:23:51 -0000 1.16 @@ -5,3 +5,4 @@ sip-4.3.1.tar.gz sip-4.4.3.tar.gz sip-4.4.5.tar.gz +sip-4.5.2.tar.gz Index: sip.spec =================================================================== RCS file: /cvs/dist/rpms/sip/FC-6/sip.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sip.spec 28 Nov 2006 15:26:44 -0000 1.33 +++ sip.spec 29 Jan 2007 15:23:51 -0000 1.34 @@ -14,7 +14,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.5 +Version: 4.5.2 Release: 0.1.fc6 License: GPL Group: Development/Tools @@ -92,6 +92,9 @@ %{_includedir}/python%{pythonver}/* %changelog +* Mon Jan 29 2007 Than Ngo - 4.5.2-0.1.fc6 +- 4.5.2 + * Tue Nov 28 2006 Than Ngo - 4.5-0.1.fc6 - update to 4.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/sip/FC-6/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 28 Nov 2006 15:26:44 -0000 1.16 +++ sources 29 Jan 2007 15:23:51 -0000 1.17 @@ -1 +1 @@ -8171a370e15b2bf7ed3a1b579c0e9ae1 sip-4.5.tar.gz +0fdb0cbdcbbe158009196437711eb8bd sip-4.5.2.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 15:50:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 10:50:50 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-_61symlink.patch, 1.1, 1.2 vixie-cron.spec, 1.86, 1.87 Message-ID: <200701291550.l0TFoo1i007205@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7179 Modified Files: vixie-cron-4.1-_61symlink.patch vixie-cron.spec Log Message: Modified symlink patch. vixie-cron-4.1-_61symlink.patch: cron.c | 8 +++++--- database.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) Index: vixie-cron-4.1-_61symlink.patch =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_61symlink.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vixie-cron-4.1-_61symlink.patch 12 Jan 2007 17:08:29 -0000 1.1 +++ vixie-cron-4.1-_61symlink.patch 29 Jan 2007 15:50:48 -0000 1.2 @@ -44,3 +44,14 @@ } if (got_sigchld) { +--- vixie-cron-4.1/database.c.orig 2007-01-17 11:13:28.000000000 +0100 ++++ vixie-cron-4.1/database.c 2007-01-29 16:39:25.000000000 +0100 +@@ -116,7 +116,7 @@ + if ( not_a_crontab( dp ) ) + continue; + +- if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/')) ++ if (!glue_strings(tabname, sizeof tabname, dir_name, dp->d_name, '/')) + continue; /* XXX log? */ + + process_crontab("root", NULL, tabname, Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- vixie-cron.spec 22 Jan 2007 12:46:14 -0000 1.86 +++ vixie-cron.spec 29 Jan 2007 15:50:48 -0000 1.87 @@ -10,7 +10,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 72%{?dist} +Release: 73%{?dist} Epoch: 4 License: distributable Group: System Environment/Base @@ -255,6 +255,10 @@ %config(noreplace) /etc/sysconfig/crond %changelog +* Mon Jan 29 2007 Marcela Maslanova - 4:4.1-73 +- symlinks again - change in symlinks.patch +- rhbz#225078 + * Mon Jan 22 2007 Marcela Maslanova - 4:4.1-72 - change in manual - rhbz#223532 From fedora-cvs-commits at redhat.com Mon Jan 29 15:56:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 10:56:11 -0500 Subject: rpms/xorg-x11-drv-trident/devel xorg-x11-drv-trident.spec, 1.14, 1.15 Message-ID: <200701291556.l0TFuBWW007510@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-trident/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7496 Modified Files: xorg-x11-drv-trident.spec Log Message: * Mon Jan 29 2007 Adam Jackson 1.2.3-2 - Rebuild for 6 to 7 upgrade path Index: xorg-x11-drv-trident.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-trident/devel/xorg-x11-drv-trident.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-trident.spec 24 Jan 2007 19:50:12 -0000 1.14 +++ xorg-x11-drv-trident.spec 29 Jan 2007 15:56:09 -0000 1.15 @@ -7,7 +7,7 @@ Summary: Xorg X11 trident video driver Name: xorg-x11-drv-trident Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -58,6 +58,9 @@ %{_mandir}/man4/trident.4* %changelog +* Mon Jan 29 2007 Adam Jackson 1.2.3-2 +- Rebuild for 6 to 7 upgrade path + * Wed Jan 24 2007 Adam Jackson 1.2.3-1 - Update to 1.2.3 From fedora-cvs-commits at redhat.com Mon Jan 29 15:57:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 10:57:54 -0500 Subject: rpms/kdelibs/devel kdelibs.spec,1.199,1.200 Message-ID: <200701291557.l0TFvsjY007633@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7616 Modified Files: kdelibs.spec Log Message: 3.5.6 Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- kdelibs.spec 25 Jan 2007 16:37:25 -0000 1.199 +++ kdelibs.spec 29 Jan 2007 15:57:52 -0000 1.200 @@ -13,7 +13,7 @@ %define qtdocdir %{_docdir}/qt-devel-%{qt_version} -%define make_cvs 0 +%define make_cvs 1 %define arts 1 Version: 3.5.6 From fedora-cvs-commits at redhat.com Mon Jan 29 16:02:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:02:13 -0500 Subject: rpms/totem/FC-6 .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 totem.spec, 1.79, 1.80 totem-0.99.19-feature-help-removal.patch, 1.1, NONE totem-1.2.0-gmoduledep.patch, 1.1, NONE totem-1.5.4-dbus-disconnect.patch, 1.1, NONE totem-1.5.4-firefox.patch, 1.1, NONE totem-1.5.91-gettext.patch, 1.1, NONE Message-ID: <200701291602.l0TG2DWH007893@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/totem/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7877 Modified Files: .cvsignore sources totem.spec Removed Files: totem-0.99.19-feature-help-removal.patch totem-1.2.0-gmoduledep.patch totem-1.5.4-dbus-disconnect.patch totem-1.5.4-firefox.patch totem-1.5.91-gettext.patch Log Message: * Mon Jan 29 2007 - Bastien Nocera - 2.16.5-1 - Make the -devel package own %{_includedir}/totem and below - Resolves: #212093 - Update homepage, and download URLs - Update to 2.16.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/totem/FC-6/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 14 Nov 2006 16:39:57 -0000 1.30 +++ .cvsignore 29 Jan 2007 16:02:11 -0000 1.31 @@ -1 +1 @@ -totem-2.16.3.tar.bz2 +totem-2.16.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/totem/FC-6/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 14 Nov 2006 16:39:57 -0000 1.30 +++ sources 29 Jan 2007 16:02:11 -0000 1.31 @@ -1 +1 @@ -8a7598e93705eed81e31acd02bfaf0df totem-2.16.3.tar.bz2 +fa8eb90b52d70d876e1d42ec43cf8448 totem-2.16.5.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/FC-6/totem.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- totem.spec 14 Nov 2006 16:39:57 -0000 1.79 +++ totem.spec 29 Jan 2007 16:02:11 -0000 1.80 @@ -4,14 +4,13 @@ Summary: Movie player for GNOME 2 Name: totem -Version: 2.16.3 +Version: 2.16.5 Release: 1%{?dist} License: GPL Group: Applications/Multimedia -URL: http://www.hadess.net/totem.php3 -Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/0.99/totem-%{version}.tar.bz2 +URL: http://www.gnome.org/projects/totem/ +Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.16/totem-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Patch1: totem-0.99.19-feature-help-removal.patch Requires(pre): GConf2 >= 2.14 Requires(post): GConf2 >= 2.14 @@ -76,7 +75,6 @@ %prep %setup -q -%patch1 -p1 -b .feature-help-removal %build # try to work around a problem where gst-inspect does @@ -183,11 +181,17 @@ %files devel %defattr(-, root, root) -%{_includedir}/%{name}/1/plparser +%{_includedir}/%{name} %{_libdir}/pkgconfig/*.pc %{_libdir}/*so %changelog +* Mon Jan 29 2007 - Bastien Nocera - 2.16.5-1 +- Make the -devel package own %{_includedir}/totem and below +- Resolves: #212093 +- Update homepage, and download URLs +- Update to 2.16.5 + * Tue Nov 14 2006 Matthias Clasen - 2.16.3-1 - Update to 2.16.3 --- totem-0.99.19-feature-help-removal.patch DELETED --- --- totem-1.2.0-gmoduledep.patch DELETED --- --- totem-1.5.4-dbus-disconnect.patch DELETED --- --- totem-1.5.4-firefox.patch DELETED --- --- totem-1.5.91-gettext.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 16:10:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:10:10 -0500 Subject: rpms/squid/devel .cvsignore, 1.24, 1.25 sources, 1.26, 1.27 squid.spec, 1.82, 1.83 Message-ID: <200701291610.l0TGAAR9008240@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/squid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8212 Modified Files: .cvsignore sources squid.spec Log Message: * Mon Jan 29 2007 Martin Bacovsky - 7:2.6.STABLE9-1.fc7 - update to the latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squid/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 14 Jan 2007 09:51:45 -0000 1.24 +++ .cvsignore 29 Jan 2007 16:10:08 -0000 1.25 @@ -1,11 +1 @@ -squid-2.5.STABLE9.tar.bz2 -squid-2.5.STABLE10.tar.bz2 -squid-2.5.STABLE11.tar.bz2 -squid-2.5.STABLE12.tar.bz2 -squid-2.5.STABLE13.tar.bz2 -squid-2.5.STABLE14.tar.bz2 -squid-2.6.STABLE3.tar.bz2 -squid-2.6.STABLE4.tar.bz2 -squid-2.6.STABLE5.tar.bz2 -squid-2.6.STABLE6.tar.bz2 -squid-2.6.STABLE7.tar.bz2 +squid-2.6.STABLE9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squid/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 14 Jan 2007 09:51:45 -0000 1.26 +++ sources 29 Jan 2007 16:10:08 -0000 1.27 @@ -1 +1 @@ -7e8eed297ceb4f3067c960d4c4d04e87 squid-2.6.STABLE7.tar.bz2 +95997d6cb38fdb562ecb790c553f9cfc squid-2.6.STABLE9.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- squid.spec 14 Jan 2007 09:51:45 -0000 1.82 +++ squid.spec 29 Jan 2007 16:10:08 -0000 1.83 @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.6.STABLE7 +Version: 2.6.STABLE9 Release: 1%{?dist} Epoch: 7 License: GPL @@ -324,6 +324,9 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Mon Jan 29 2007 Martin Bacovsky - 7:2.6.STABLE9-1.fc7 +- update to the latest upstream + * Sun Jan 14 2007 Martin Stransky - 7:2.6.STABLE7-1 - update to the latest upstream From fedora-cvs-commits at redhat.com Mon Jan 29 16:21:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:21:00 -0500 Subject: rpms/tk/devel tk.spec,1.25,1.26 Message-ID: <200701291621.l0TGL0om028886@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28872 Modified Files: tk.spec Log Message: Change in spec Index: tk.spec =================================================================== RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- tk.spec 25 Jan 2007 12:20:10 -0000 1.25 +++ tk.spec 29 Jan 2007 16:20:57 -0000 1.26 @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: tcl = %{version} Requires(post,postun): /sbin/ldconfig -BuildRequires: tcl-devel = %{version}, autoconf +BuildRequires: tcl-devel >= %{version}, autoconf BuildRequires: libX11-devel, sed # panedwindow.n from itcl conflicts Obsoletes: itcl <= 3.2 From fedora-cvs-commits at redhat.com Mon Jan 29 16:22:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:22:29 -0500 Subject: rpms/traceroute/FC-6 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 traceroute.spec, 1.27, 1.28 Message-ID: <200701291622.l0TGMTMP029034@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/traceroute/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28991 Modified Files: .cvsignore sources traceroute.spec Log Message: * Mon Jan 29 2007 Martin Bacovsky - 3:2.0.3-1.fc6 - Resolves: #221764: new traceroute breaks scripts - Resolves: #217974: /bin/tcptraceroute symlink occludes alternate tcptraceroute package Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/traceroute/FC-6/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Nov 2006 14:33:39 -0000 1.8 +++ .cvsignore 29 Jan 2007 16:22:27 -0000 1.9 @@ -1 +1 @@ -traceroute-2.0.2.tar.gz +traceroute-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/traceroute/FC-6/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Nov 2006 14:33:39 -0000 1.8 +++ sources 29 Jan 2007 16:22:27 -0000 1.9 @@ -1 +1 @@ -8fcdedf82086e7dca442e056aa737aea traceroute-2.0.2.tar.gz +3767369a10c17445510a05420f79380b traceroute-2.0.3.tar.gz Index: traceroute.spec =================================================================== RCS file: /cvs/dist/rpms/traceroute/FC-6/traceroute.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- traceroute.spec 21 Nov 2006 14:33:39 -0000 1.27 +++ traceroute.spec 29 Jan 2007 16:22:27 -0000 1.28 @@ -1,7 +1,7 @@ Summary: Traces the route taken by packets over an IPv4/IPv6 network Name: traceroute Epoch: 3 -Version: 2.0.2 +Version: 2.0.3 Release: 1%{dist} Group: Applications/Internet License: GPL @@ -38,11 +38,11 @@ pushd $RPM_BUILD_ROOT/bin ln -s traceroute traceroute6 ln -s traceroute tracert -ln -s traceroute tcptraceroute popd install -d $RPM_BUILD_ROOT%{_mandir}/man8 -install -p traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install -p -m644 traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8 +ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8 %clean @@ -56,6 +56,10 @@ %{_mandir}/*/* %changelog +* Mon Jan 29 2007 Martin Bacovsky - 3:2.0.3-1.fc6 +- Resolves: #221764: new traceroute breaks scripts +- Resolves: #217974: /bin/tcptraceroute symlink occludes alternate tcptraceroute package + * Tue Nov 21 2006 Martin Bacovsky - 3:2.0.2-1.fc6 - new source - more accurate check_expired() routine. From fedora-cvs-commits at redhat.com Mon Jan 29 16:25:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:25:49 -0500 Subject: rpms/curl/devel curl-7.16.0-privlibs.patch, 1.1, 1.2 curl.spec, 1.43, 1.44 Message-ID: <200701291625.l0TGPnWo029184@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/curl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29167 Modified Files: curl-7.16.0-privlibs.patch curl.spec Log Message: - update to 7.16.1 curl-7.16.0-privlibs.patch: libcurl.pc.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: curl-7.16.0-privlibs.patch =================================================================== RCS file: /cvs/dist/rpms/curl/devel/curl-7.16.0-privlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- curl-7.16.0-privlibs.patch 31 Oct 2006 16:25:49 -0000 1.1 +++ curl-7.16.0-privlibs.patch 29 Jan 2007 16:25:45 -0000 1.2 @@ -1,10 +1,11 @@ ---- curl-7.16.0/libcurl.pc.in.LIBS_PRIVATE 2004-12-11 12:46:40.000000000 -0600 -+++ curl-7.16.0/libcurl.pc.in 2006-10-31 10:05:30.000000000 -0600 -@@ -6,5 +6,6 @@ - Name: libcurl +--- curl-7.16.1/libcurl.pc.in.privlibs 2007-01-02 13:14:21.000000000 +0100 ++++ curl-7.16.1/libcurl.pc.in 2007-01-29 17:20:50.000000000 +0100 +@@ -33,6 +33,6 @@ + URL: http://curl.haxx.se/ Description: Library to transfer files with ftp, http, etc. Version: @VERSION@ --Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@ -+Libs: -L${libdir} -lcurl +-Libs: -L${libdir} -lcurl @LDFLAGS@ +-Libs.private: @LIBS@ ++Libs: -L${libdir} -lcurl +Libs.private: @LDFLAGS@ @LIBS@ Cflags: -I${includedir} Index: curl.spec =================================================================== RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- curl.spec 16 Jan 2007 13:11:48 -0000 1.43 +++ curl.spec 29 Jan 2007 16:25:45 -0000 1.44 @@ -2,8 +2,8 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.16.0 -Release: 5%{?dist} +Version: 7.16.1 +Release: 1%{?dist} License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 @@ -99,6 +99,9 @@ %{_mandir}/man3/* %changelog +* Mon Jan 29 2007 Jindrich Novy 7.16.1-1 +- update to 7.16.1 + * Tue Jan 16 2007 Jindrich Novy 7.16.0-5 - don't package generated makefiles for docs/examples to avoid multilib conflicts From fedora-cvs-commits at redhat.com Mon Jan 29 16:26:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:26:52 -0500 Subject: rpms/totem/devel .cvsignore, 1.34, 1.35 sources, 1.34, 1.35 totem.spec, 1.94, 1.95 totem-0.99.19-feature-help-removal.patch, 1.1, NONE totem-1.2.0-gmoduledep.patch, 1.1, NONE totem-1.5.4-dbus-disconnect.patch, 1.1, NONE totem-1.5.4-firefox.patch, 1.1, NONE totem-1.5.91-gettext.patch, 1.1, NONE totem-2.17.5-make-j.patch, 1.2, NONE Message-ID: <200701291626.l0TGQq4K029272@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29251 Modified Files: .cvsignore sources totem.spec Removed Files: totem-0.99.19-feature-help-removal.patch totem-1.2.0-gmoduledep.patch totem-1.5.4-dbus-disconnect.patch totem-1.5.4-firefox.patch totem-1.5.91-gettext.patch totem-2.17.5-make-j.patch Log Message: * Mon Jan 29 2007 - Bastien Nocera - 2.17.90-1 - Make the -devel package own %{_includedir}/totem and below - Resolves: #212093 - Update homepage, and download URLs - Update to 2.17.90, remove obsolete patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 16 Jan 2007 17:55:56 -0000 1.34 +++ .cvsignore 29 Jan 2007 16:26:46 -0000 1.35 @@ -1 +1 @@ -totem-2.17.5.tar.bz2 +totem-2.17.90.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/totem/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 16 Jan 2007 17:55:56 -0000 1.34 +++ sources 29 Jan 2007 16:26:46 -0000 1.35 @@ -1 +1 @@ -47e56b81b5acc4776de9cebc2c35406f totem-2.17.5.tar.bz2 +cb810c2c2d8c3093fc714c9b52813ebf totem-2.17.90.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- totem.spec 17 Jan 2007 16:22:53 -0000 1.94 +++ totem.spec 29 Jan 2007 16:26:46 -0000 1.95 @@ -4,14 +4,13 @@ Summary: Movie player for GNOME 2 Name: totem -Version: 2.17.5 +Version: 2.17.90 Release: 1%{?dist} License: GPL Group: Applications/Multimedia -URL: http://www.hadess.net/totem.php3 -Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/0.99/totem-%{version}.tar.bz2 +URL: http://www.gnome.org/projects/totem/ +Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.17/totem-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: totem-2.17.5-make-j.patch Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 @@ -86,7 +85,6 @@ %prep %setup -q -%patch0 -p1 -b .make-j %build # try to work around a problem where gst-inspect does @@ -102,9 +100,6 @@ --disable-scrollkeeper \ --disable-nvtv -#apparently someone forgot to autogen before disting 0.99.17 :) -#perl -pi -e 's/gstvideowidget.h//g' src/Makefile - make %{?_smp_mflags} %install @@ -200,11 +195,17 @@ %files devel %defattr(-, root, root) -%{_includedir}/%{name}/1/plparser +%{_includedir}/%{name} %{_libdir}/pkgconfig/*.pc %{_libdir}/*so %changelog +* Mon Jan 29 2007 - Bastien Nocera - 2.17.90-1 +- Make the -devel package own %{_includedir}/totem and below +- Resolves: #212093 +- Update homepage, and download URLs +- Update to 2.17.90, remove obsolete patch + * Tue Jan 16 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 --- totem-0.99.19-feature-help-removal.patch DELETED --- --- totem-1.2.0-gmoduledep.patch DELETED --- --- totem-1.5.4-dbus-disconnect.patch DELETED --- --- totem-1.5.4-firefox.patch DELETED --- --- totem-1.5.91-gettext.patch DELETED --- --- totem-2.17.5-make-j.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 16:30:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:30:41 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-_61symlink.patch,1.2,1.3 Message-ID: <200701291630.l0TGUfkn010178@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10003 Modified Files: vixie-cron-4.1-_61symlink.patch Log Message: Change in symlink patch. vixie-cron-4.1-_61symlink.patch: cron.c | 8 +++++--- database.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) Index: vixie-cron-4.1-_61symlink.patch =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_61symlink.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vixie-cron-4.1-_61symlink.patch 29 Jan 2007 15:50:48 -0000 1.2 +++ vixie-cron-4.1-_61symlink.patch 29 Jan 2007 16:30:39 -0000 1.3 @@ -44,14 +44,14 @@ } if (got_sigchld) { ---- vixie-cron-4.1/database.c.orig 2007-01-17 11:13:28.000000000 +0100 -+++ vixie-cron-4.1/database.c 2007-01-29 16:39:25.000000000 +0100 -@@ -116,7 +116,7 @@ - if ( not_a_crontab( dp ) ) +--- vixie-cron-4.1/database.c.symlinks 2007-01-28 17:12:24.000000000 +0000 ++++ vixie-cron-4.1/database.c 2007-01-28 17:12:34.000000000 +0000 +@@ -354,7 +354,7 @@ static void max_mtime( char *dir_name, s + if ( not_a_crontab ( dp ) ) continue; -- if (!glue_strings(tabname, sizeof tabname, RH_CROND_DIR, dp->d_name, '/')) +- if (!glue_strings(tabname, sizeof tabname, SPOOL_DIR, dp->d_name, '/')) + if (!glue_strings(tabname, sizeof tabname, dir_name, dp->d_name, '/')) continue; /* XXX log? */ - process_crontab("root", NULL, tabname, + if ( stat( tabname, &st ) < OK ) From fedora-cvs-commits at redhat.com Mon Jan 29 16:46:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:46:13 -0500 Subject: rpms/at/devel at-3.1.10-dont_fork.patch,1.1,1.2 Message-ID: <200701291646.l0TGkDBL021638@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21426 Modified Files: at-3.1.10-dont_fork.patch Log Message: Change in patch dont fork option. at-3.1.10-dont_fork.patch: atd.8.in | 4 atd.c | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- daemon.c | 8 + daemon.h | 1 4 files changed, 272 insertions(+), 18 deletions(-) Index: at-3.1.10-dont_fork.patch =================================================================== RCS file: /cvs/dist/rpms/at/devel/at-3.1.10-dont_fork.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-3.1.10-dont_fork.patch 24 Oct 2006 14:25:28 -0000 1.1 +++ at-3.1.10-dont_fork.patch 29 Jan 2007 16:46:11 -0000 1.2 @@ -1,5 +1,408 @@ ---- at-3.1.10/daemon.c.dontfork 2005-08-05 05:16:01.000000000 +0200 -+++ at-3.1.10/daemon.c 2006-09-12 13:53:10.000000000 +0200 +--- at-3.1.10/atd.8.in.dont_fork 2005-08-29 10:08:51.000000000 +0200 ++++ at-3.1.10/atd.8.in 2007-01-29 15:46:09.000000000 +0100 +@@ -10,6 +10,7 @@ + .IR batch_interval ] + .RB [ -d ] + .RB [ -s ] ++.RB [ -n ] + .SH DESCRIPTION + .B atd + runs jobs queued by +@@ -46,6 +47,9 @@ + is installed as + .B @prefix@/sbin/atrun + for backward compatibility. ++.TP 8 ++.B -n ++Don't fork option. + .SH WARNING + .B atd + won't work if its spool directory is mounted via NFS even if +--- at-3.1.10/atd.c.dont_fork 2007-01-29 15:46:09.000000000 +0100 ++++ at-3.1.10/atd.c 2007-01-29 16:31:27.000000000 +0100 +@@ -73,6 +73,42 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#ifdef WITH_PAM ++/* ++ * We must check if the atd daemon userid will be allowed to gain the job owner user's ++ * credentials with PAM . If not, the user has been denied at(1) usage, eg. with pam_access. ++ */ ++ setreuid(daemon_uid, daemon_uid); ++ setregid(daemon_gid, daemon_gid); ++ ++# define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ ++ fprintf(stderr,"PAM authentication failure: %s\n",pam_strerror(pamh, retcode)); \ ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); ++ pam_close_session(pamh,PAM_SILENT); \ ++ pam_end(pamh, retcode); \ ++ setregid(gid,egid); \ ++ setreuid(uid,euid); \ ++ return(0); \ ++ } ++ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); ++ PAM_FAIL_CHECK; ++ retcode = pam_set_item(pamh, PAM_TTY, "atd"); ++ PAM_FAIL_CHECK; ++ retcode = pam_acct_mgmt(pamh, PAM_SILENT); ++ PAM_FAIL_CHECK; ++ retcode = pam_open_session(pamh, PAM_SILENT); ++ PAM_FAIL_CHECK; ++ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); ++ PAM_FAIL_CHECK; ++ ++ pam_close_session(pamh,PAM_SILENT); ++ pam_end(pamh, PAM_ABORT); ++ ++ setregid(gid,egid); ++ setreuid(uid,euid); ++ ++#endif ++ + + /* Local headers */ + +@@ -83,6 +119,10 @@ + #include "getloadavg.h" + #endif + ++#ifndef LOG_ATD ++#define LOG_ATD LOG_DAEMON ++#endif ++ + /* Macros */ + + #define BATCH_INTERVAL_DEFAULT 60 +@@ -196,6 +236,19 @@ + #define fork myfork + #endif + ++#undef ATD_MAIL_PROGRAM ++#undef ATD_MAIL_NAME ++#if defined(SENDMAIL) ++#define ATD_MAIL_PROGRAM SENDMAIL ++#define ATD_MAIL_NAME "sendmail" ++#elif defined(MAILC) ++#define ATD_MAIL_PROGRAM MAILC ++#define ATD_MAIL_NAME "mail" ++#elif defined(MAILX) ++#define ATD_MAIL_PROGRAM MAILX ++#define ATD_MAIL_NAME "mailx" ++#endif ++ + static void + run_file(char *filename, uid_t uid, gid_t gid) + { +@@ -420,6 +473,8 @@ + PAM_FAIL_CHECK; + retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); + PAM_FAIL_CHECK; ++ closelog(); ++ openlog("atd", LOG_PID, LOG_ATD); + PRIV_END + #endif + +@@ -434,6 +489,14 @@ + else if (pid == 0) { + char *nul = NULL; + char **nenvp = &nul; ++ char **pam_envp=0L; ++ ++ PRIV_START ++ #ifdef WITH_PAM ++ pam_envp = pam_getenvlist(pamh); ++ if ( ( pam_envp != 0L ) && (pam_envp[0] != 0L) ) ++ nenvp = pam_envp; ++ #endif + + /* Set up things for the child; we want standard input from the + * input file, and standard output and error sent to our output file. +@@ -455,8 +518,6 @@ + if (chdir(ATJOB_DIR) < 0) + perr("Cannot chdir to " ATJOB_DIR); + +- PRIV_START +- + nice((tolower((int) queue) - 'a' + 1) * 2); + + if (initgroups(pentry->pw_name, pentry->pw_gid)) +@@ -472,10 +533,93 @@ + perr("Cannot reset signal handler to default"); + + chdir("/"); ++#ifdef WITH_SELINUX ++ if (selinux_enabled>0) { ++ security_context_t user_context=NULL; ++ security_context_t file_context=NULL; ++ int retval=0; ++ struct av_decision avd; ++ char *seuser=NULL; ++ char *level=NULL; ++ ++ if (getseuserbyname(pentry->pw_name, &seuser, &level) == 0) { ++ retval=get_default_context_with_level(seuser, level, NULL, &user_context); ++ free(seuser); ++ free(level); ++ if (retval) { ++ if (security_getenforce()==1) { ++ perr("execle: couldn't get security context for user %s\n", pentry->pw_name); ++ } else { ++ syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", pentry->pw_name); ++ goto out; ++ } ++ } ++ } ++ ++ /* ++ * Since crontab files are not directly executed, ++ * crond must ensure that the crontab file has ++ * a context that is appropriate for the context of ++ * the user cron job. It performs an entrypoint ++ * permission check for this purpose. ++ */ ++ if (fgetfilecon(STDIN_FILENO, &file_context) < 0) ++ perr("fgetfilecon FAILED %s", filename); ++ ++ retval = security_compute_av(user_context, ++ file_context, ++ SECCLASS_FILE, ++ FILE__ENTRYPOINT, ++ &avd); ++ freecon(file_context); ++ if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { ++ if (security_getenforce()==1) { ++ perr("Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ } else { ++ syslog(LOG_ERR, "Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ goto out; ++ } ++ } ++ ++ if (setexeccon(user_context) < 0) { ++ if (security_getenforce()==1) { ++ ++ perr("Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ } else { ++ syslog(LOG_ERR, "Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ } ++ } ++ out: ++ freecon(user_context); ++ } ++#endif ++ ++ + + if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) ++ + perr("Exec failed for /bin/sh"); + ++#ifdef WITH_SELINUX ++ if (selinux_enabled>0) { ++ if (setexeccon(NULL) < 0) ++ if (security_getenforce()==1) ++ perr("Could not resset exec context for user %s\n", pentry->pw_name); ++ } ++ } ++#endif ++ ++#ifdef WITH_PAM ++ if ( ( nenvp != &nul ) && (pam_envp != 0L) && (*pam_envp != 0L)) ++ { ++ for( nenvp = pam_envp; *nenvp != 0L; nenvp++) ++ free(*nenvp); ++ free( pam_envp ); ++ nenvp = &nul; ++ pam_envp=0L; ++ } ++#endif ++ + PRIV_END + } + /* We're the parent. Let's wait. +@@ -507,14 +651,43 @@ + unlink(filename); + } + ++#ifdef WITH_PAM ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); ++ pam_close_session(pamh, PAM_SILENT); ++ pam_end(pamh, PAM_ABORT); ++ closelog(); ++ openlog("atd", LOG_PID, LOG_ATD); ++#endif ++ + /* The job is now finished. We can delete its input file. + */ + chdir(ATJOB_DIR); + unlink(newname); + ++#ifdef ATD_MAIL_PROGRAM + if (((send_mail != -1) && (buf.st_size != size)) || (send_mail == 1)) { +- +- PRIV_START ++ int mail_pid = -1; ++#ifdef WITH_PAM ++ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); ++ PAM_FAIL_CHECK; ++ retcode = pam_set_item(pamh, PAM_TTY, "atd"); ++ PAM_FAIL_CHECK; ++ retcode = pam_acct_mgmt(pamh, PAM_SILENT); ++ PAM_FAIL_CHECK; ++ retcode = pam_open_session(pamh, PAM_SILENT); ++ PAM_FAIL_CHECK; ++ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); ++ PAM_FAIL_CHECK; ++ /* PAM has now re-opened our log to auth.info ! */ ++ closelog(); ++ openlog("atd", LOG_PID, LOG_ATD); ++#endif ++ ++ mail_pid = fork(); ++ ++ if ( mail_pid == 0 ) ++ { ++ PRIV_START + + if (initgroups(pentry->pw_name, pentry->pw_gid)) + perr("Cannot delete saved userids"); +@@ -527,16 +700,81 @@ + + chdir ("/"); + +-#if defined(SENDMAIL) +- execl(SENDMAIL, "sendmail", mailname, (char *) NULL); +-#else +-/*#error "No mail command specified."*/ +- perr("No mail command specified."); ++#ifdef WITH_SELINUX ++ if (selinux_enabled>0) { ++ security_context_t user_context=NULL; ++ security_context_t file_context=NULL; ++ int retval=0; ++ struct av_decision avd; ++ ++ if (get_default_context(pentry->pw_name, NULL, &user_context)) ++ perr("execle: couldn't get security context for user %s\n", pentry->pw_name); ++ /* ++ * Since crontab files are not directly executed, ++ * crond must ensure that the crontab file has ++ * a context that is appropriate for the context of ++ * the user cron job. It performs an entrypoint ++ * permission check for this purpose. ++ */ ++ if (fgetfilecon(STDIN_FILENO, &file_context) < 0) ++ perr("fgetfilecon FAILED %s", filename); ++ ++ retval = security_compute_av(user_context, ++ file_context, ++ SECCLASS_FILE, ++ FILE__ENTRYPOINT, ++ &avd); ++ freecon(file_context); ++ if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { ++ if (security_getenforce()==1) { ++ perr("Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ } else { ++ syslog(LOG_ERR, "Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ goto out; ++ } ++ } ++ ++ if (setexeccon(user_context) < 0) { ++ if (security_getenforce()==1) { ++ perr("Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ } else { ++ syslog(LOG_ERR, "Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); ++ } ++ } ++ freecon(user_context); ++ } ++#endif ++ ++ execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL); ++ perr("Exec failed for mail command"); ++ exit(-1); ++#ifdef WITH_SELINUX ++ if (selinux_enabled>0) { ++ if (setexeccon(NULL) < 0) ++ if (security_getenforce()==1) ++ perr("Could not resset exec context for user %s\n", pentry->pw_name); ++ } ++ } + #endif +- perr("Exec failed for mail command"); + +- PRIV_END ++ PRIV_END ++ } else ++ if ( mail_pid == -1 ) { ++ perr("fork of mailer failed"); ++ } else { ++ /* Parent */ ++ waitpid(mail_pid, (int *) NULL, 0); ++ ++#ifdef WITH_PAM ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); ++ pam_close_session(pamh, PAM_SILENT); ++ pam_end(pamh, PAM_ABORT); ++ closelog(); ++ openlog("atd", LOG_PID, LOG_ATD); ++#endif ++ } + } ++#endif + exit(EXIT_SUCCESS); + } + +@@ -736,6 +974,10 @@ + struct passwd *pwe; + struct group *ge; + ++#ifdef WITH_SELINUX ++ selinux_enabled=is_selinux_enabled(); ++#endif ++ + /* We don't need root privileges all the time; running under uid and gid + * daemon is fine. + */ +@@ -752,11 +994,7 @@ + + RELINQUISH_PRIVS_ROOT(daemon_uid, daemon_gid) + +-#ifndef LOG_CRON +-#define LOG_CRON LOG_DAEMON +-#endif +- +- openlog("atd", LOG_PID, LOG_CRON); ++ openlog("atd", LOG_PID, LOG_ATD); + + opterr = 0; + errno = 0; +@@ -784,6 +1022,9 @@ + run_as_daemon = 0; + break; + ++ case 'n': ++ daemon_nofork = 1; ++ break; + case '?': + pabort("unknown option"); + break; +@@ -806,6 +1047,10 @@ + act.sa_flags = SA_NOCLDSTOP; + sigaction(SIGCHLD, &act, NULL); + ++ if (daemon_nofork) { ++ daemon_setup(); ++ } ++ + if (!run_as_daemon) { + now = time(NULL); + run_loop(); +--- at-3.1.10/daemon.c.dont_fork 2005-08-05 05:16:01.000000000 +0200 ++++ at-3.1.10/daemon.c 2007-01-29 15:46:09.000000000 +0100 @@ -50,7 +50,8 @@ static const char *svnid = "$Id$"; @@ -30,28 +433,8 @@ PRIV_START ---- at-3.1.10/atd.8.in.dontfork 2005-08-29 10:08:51.000000000 +0200 -+++ at-3.1.10/atd.8.in 2006-09-12 13:53:10.000000000 +0200 -@@ -10,6 +10,7 @@ - .IR batch_interval ] - .RB [ -d ] - .RB [ -s ] -+.RB [ -n ] - .SH DESCRIPTION - .B atd - runs jobs queued by -@@ -46,6 +47,9 @@ - is installed as - .B @prefix@/sbin/atrun - for backward compatibility. -+.TP 8 -+.B -n -+Don't fork option. - .SH WARNING - .B atd - won't work if its spool directory is mounted via NFS even if ---- at-3.1.10/daemon.h.dontfork 2005-08-05 05:16:01.000000000 +0200 -+++ at-3.1.10/daemon.h 2006-09-12 13:54:43.000000000 +0200 +--- at-3.1.10/daemon.h.dont_fork 2005-08-05 05:16:01.000000000 +0200 ++++ at-3.1.10/daemon.h 2007-01-29 15:46:09.000000000 +0100 @@ -14,3 +14,4 @@ perr (const char *fmt, ...); From fedora-cvs-commits at redhat.com Mon Jan 29 16:59:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 11:59:35 -0500 Subject: rpms/crontabs/devel crontabs.spec,1.14,1.15 Message-ID: <200701291659.l0TGxZd0019955@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/crontabs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19395 Modified Files: crontabs.spec Log Message: Editing symlinks. Index: crontabs.spec =================================================================== RCS file: /cvs/dist/rpms/crontabs/devel/crontabs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- crontabs.spec 24 Jan 2007 14:58:18 -0000 1.14 +++ crontabs.spec 29 Jan 2007 16:59:33 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Root crontab files used to schedule the execution of programs. Name: crontabs Version: 1.10 -Release: 11%{?dist} +Release: 12%{?dist} License: Public Domain Group: System Environment/Base Source0: crontab @@ -28,7 +28,8 @@ install -m644 $RPM_SOURCE_DIR/crontab $RPM_BUILD_ROOT/etc/crontab install -m755 $RPM_SOURCE_DIR/run-parts $RPM_BUILD_ROOT/usr/bin/run-parts install -m755 $RPM_SOURCE_DIR/000-delay.cron $RPM_BUILD_ROOT/etc/cron.daily/000-delay.cron -ln -s ./etc/cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron +ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.weekly/000-delay.cron +ln -s ../cron.daily/000-delay.cron $RPM_BUILD_ROOT/etc/cron.monthly/000-delay.cron %clean rm -rf $RPM_BUILD_ROOT @@ -43,8 +44,13 @@ %dir /etc/cron.monthly %dir /etc/cron.daily/000-delay.cron %dir /etc/cron.weekly/000-delay.cron +%dir /etc/cron.monthly/000-delay.cron %changelog +* Mon Jan 29 2007 Marcela Maslanova 1.10-12 +- link daily,weekly,monthly +- rhbz#224687 + * Wed Jan 24 2007 Marcela Maslanova 1.10-11 - crontabs should ignore Cfengine files, rebuilt - Resolves: rhbz#223472 From fedora-cvs-commits at redhat.com Mon Jan 29 17:37:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 12:37:12 -0500 Subject: rpms/gnome-menus/devel gnome-menus.spec,1.49,1.50 Message-ID: <200701291737.l0THbCSs028869@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/gnome-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28854 Modified Files: gnome-menus.spec Log Message: * Mon Jan 29 2007 Adam Jackson - 2.17.5-2 - Fix the redhat-menus Requires: to a version where there's no System.directory conflict. Index: gnome-menus.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnome-menus.spec 10 Jan 2007 19:21:58 -0000 1.49 +++ gnome-menus.spec 29 Jan 2007 17:37:10 -0000 1.50 @@ -6,13 +6,13 @@ Summary: A menu system for the GNOME project Name: gnome-menus Version: 2.17.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: redhat-menus >= 6.5.4 +Requires: redhat-menus >= 7.8.9-2 BuildRequires: glib2-devel >= 2.6.0 BuildRequires: python2-devel >= 2.3.0 BuildRequires: gamin-devel @@ -98,6 +98,10 @@ %{_includedir}/gnome-menus %changelog +* Mon Jan 29 2007 Adam Jackson - 2.17.5-2 +- Fix the redhat-menus Requires: to a version where there's no + System.directory conflict. + * Wed Jan 10 2007 Matthias Clasen - 2.17.5-1 - Update to 2.17.5 - Remove traces of gmenu-simple-editor From fedora-cvs-commits at redhat.com Mon Jan 29 18:47:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 13:47:33 -0500 Subject: rpms/eclipse-cdt/FC-6 eclipse-cdt.spec,1.62,1.63 sources,1.26,1.27 Message-ID: <200701291847.l0TIlXFN018975@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15676 Modified Files: eclipse-cdt.spec sources Log Message: * Wed Jan 17 2007 Jeff Johnston 3.1.1-7 - Resolves: #222350 - Rebase autotools to 0.0.6.1 source. - Add comments. - Put arch-specific jars in library dir. Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/eclipse-cdt.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- eclipse-cdt.spec 12 Dec 2006 20:22:05 -0000 1.62 +++ eclipse-cdt.spec 29 Jan 2007 18:47:31 -0000 1.63 @@ -1,15 +1,12 @@ Epoch: 1 -%define gcj_support 1 -%define pkg_summary C/C++ Development Tools (CDT) plugin for Eclipse -%define section free -%define eclipse_name eclipse -%define major 3 -%define minor 1 -%define majmin %{major}.%{minor} -%define micro 1 -%define eclipse_base %{_datadir}/%{eclipse_name} -%define eclipse_lib_base %{_libdir}/%{eclipse_name} +%define gcj_support 1 +%define major 3 +%define minor 1 +%define majmin %{major}.%{minor} +%define micro 1 +%define eclipse_base %{_datadir}/eclipse +%define eclipse_lib_base %{_libdir}/eclipse # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -18,41 +15,77 @@ %define eclipse_arch %{_arch} %endif -Summary: %{pkg_summary} -Name: %{eclipse_name}-cdt -Version: %{majmin}.%{micro} -Release: 6%{dist} -License: Eclipse Public License - v 1.0 (EPL) -Group: Text Editors/Integrated Development Environments (IDE) -URL: http://www.eclipse.org/cdt -Requires: eclipse-platform +Summary: Eclipse C/C++ Development Tools (CDT) plugin +Name: eclipse-cdt +Version: %{majmin}.%{micro} +Release: 7%{?dist} +License: Eclipse Public License / CPL +Group: Development/Tools +URL: http://www.eclipse.org/cdt +Requires: eclipse-platform -# This tarball was generated like this: -# +# The following tarball was generated like this: +# # mkdir temp && cd temp # mkdir home -# cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co -r v200609270800 \ -# org.eclipse.cdt-releng/org.eclipse.cdt.releng +# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_3_1_1 \ +# org.eclipse.cdt-releng/org.eclipse.cdt.releng # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/ -# sed --in-place 's/@cdtTag@/v200609270800/' maps/cdt.map -# java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \ -# org.eclipse.core.launcher.Main \ +# sed --in-place 's/@cdtTag@/CDT_3_1_1/' maps/cdt.map +# sed --in-place 's/home/cvsroot/' maps/cdt.map +# eclipse -nosplash -Duser.home=../../home \ # -application org.eclipse.ant.core.antRunner \ # -buildfile build.xml -DbaseLocation=/usr/share/eclipse \ # -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \ # -DdontUnzip=true fetch # cd .. && tar jcf eclipse-cdt-fetched-src-3.1.1.tar.bz2 org.eclipse.cdt.releng + Source0: %{name}-fetched-src-%{version}.tar.bz2 -Source1: %{name}-autotools-0.0.6.tar.gz + +# The following tarball was generated thusly: +# +# mkdir temp && cd temp +# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \ +# autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \ +# autotools/com.redhat.eclipse.cdt.autotools.feature +# cd autotools +# tar -czvf eclipse-cdt-autotools-0.0.6.1.tar.gz com.redhat.eclipse.cdt.autotools* + +Source1: %{name}-autotools-0.0.6.1.tar.gz + +# The following tarball was generated thusly: +# +# mkdir temp && cd temp +# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CPPUnit_20061102 \ +# org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit \ +# org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit-feature +# cd org.eclipse.cdt-cppunit +# tar -czvf eclipse-cdt-cppunit-20061102.tar.gz org.eclipse.cdt.cppunit* + Source2: %{name}-cppunit-20061102.tar.gz +# Patch to add special "ForAllElements" targets to CDT sdk/customTargets.xml. Patch1: %{name}-no-cvs2-patch +# Patch to remove tests from CDT build.xml. Patch4: %{name}-no-tests.patch +# Patch to CDT to add the ability to specify a build subconsole. Subconsole is +# used by Autotools to display configuration output. Patch5: %{name}-subconsole.patch +# Patch to add new IScannerInfoPlus interface to CDT and add code to recognize it +# when opening header files via clicking on them in the outline view. This +# stops multiple include paths from being shown when the true path is already +# known by calculation from the build's Makefile. Patch6: %{name}-scannerinfoplus.patch +# Patch to CDT to add hover help for compiler defined symbols (i.e. -D flags). Patch7: %{name}-definedsymbolhover.patch +# Patch to cppunit code to support double-clicking on file names, classes, and +# member names in the Hierarchy and Failure views such that the appropriate +# file will be opened and the appropriate line will be selected. Patch8: %{name}-cppunit-ui.patch +# Patch to upgrade version number for cppunit feature. Patch9: %{name}-cppunit-feature.patch +# Patch to fix default paths used by cppunit wizards to find header files and +# libraries. Patch10: %{name}-cppunit-default-location.patch BuildRequires: eclipse-pde @@ -62,22 +95,23 @@ Requires(post): java-gcj-compat >= 1.0.64 Requires(postun): java-gcj-compat >= 1.0.64 %else -BuildRequires: java-devel >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 %endif -Requires: ctags gdb make -Requires: eclipse-platform >= 1:3.2.0 +Requires: gdb make gcc-c++ autoconf automake +Requires: eclipse-platform >= 1:3.2.0 +# Currently, upstream CDT only supports building on the platforms listed here. %if %{gcj_support} ExclusiveArch: %{ix86} x86_64 ppc ia64 %else ExclusiveArch: %{ix86} x86_64 ppc ia64 %endif -BuildRoot: %{_tmppath}/%{name}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package sdk -Summary: %{pkg_summary} SDK -Group: Text Editors/Integrated Development Environments (IDE) +Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin +Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name} = %{epoch}:%{version}-%{release} %description @@ -85,7 +119,7 @@ useful for C and C++ development. %description sdk -This is the SDK version of the eclipse-cdt package. +Source for Eclipse CDT for use within Eclipse. %prep %setup -q -c @@ -189,7 +223,7 @@ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -Dtype=feature \ - -Did=org.eclipse.cdt.cppunit \ + -Did=org.eclipse.cdt.cppunit \ -DsourceDirectory=$(pwd) \ -DbaseLocation=$SDK \ -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ @@ -204,15 +238,13 @@ tar -C ${RPM_BUILD_ROOT}/%{eclipse_base} --strip-components=1 -zxvf \ org.eclipse.cdt.releng/results/I.*/org.eclipse.cdt.sdk-*.tar.gz -# We move the libraries to libdir, leaving symlinks behind. And since -# zip doesn't preserve file permissions, we must also mark all the .so -# files as executable. +# We move arch-specific plugins to libdir. mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/eclipse pushd ${RPM_BUILD_ROOT} -for sofile in $(find .%{eclipse_base} -name \*.so); do - mv $sofile .%{_libdir}/eclipse - chmod -R 755 .%{_libdir}/eclipse/$(basename $sofile) - ln -s %{_libdir}/eclipse/$(basename $sofile) $sofile +mkdir -p .%{_libdir}/eclipse/plugins +for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do + mv $archplugin .%{_libdir}/eclipse/plugins + chmod -R 755 .%{_libdir}/eclipse/plugins/$(basename $archplugin) done popd @@ -261,10 +293,12 @@ %{eclipse_base}/plugins/org.eclipse.cdt.refactoring* %{eclipse_base}/plugins/org.eclipse.cdt.ui* %{eclipse_base}/plugins/com.redhat.eclipse.cdt* -%{_libdir}/eclipse/lib* +%{_libdir}/eclipse/plugins/org.eclipse.cdt.core* %if %{gcj_support} %{_libdir}/gcj/%{name} %endif +%doc %{eclipse_base}/features/org.eclipse.cdt.cppunit_*/cpl-v10.html +%doc %{eclipse_base}/features/org.eclipse.cdt_*/epl-v10.html %files sdk %defattr(-,root,root) @@ -272,11 +306,16 @@ %{eclipse_base}/features/org.eclipse.cdt.source* %{eclipse_base}/plugins/org.eclipse.cdt.source* %{eclipse_base}/plugins/org.eclipse.cdt.sdk* -%if %{gcj_support} -%{_libdir}/gcj/%{name} -%endif +%{_libdir}/eclipse/plugins/org.eclipse.cdt.source* +%doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog +* Wed Jan 17 2007 Jeff Johnston 3.1.1-7 +- Resolves: #222350 +- Rebase autotools to 0.0.6.1 source. +- Add comments. +- Put arch-specific jars in library dir. + * Mon Dec 11 2006 Jeff Johnston 3.1.1-6 - Rebase autotools to 0.0.6 source. @@ -442,7 +481,7 @@ - Added "if gcj_support" toggle - Fixed installing all arch fragments (now only installs one (correct) arch) - Redid BuildRequires and Requires to remove old/unneeded dependencies -- Cleaned %eclipse_arch declares. +- Cleaned %%eclipse_arch declares. * Thu Apr 21 2005 Phil Muldoon 3.0.0_fc-0.M6.4 - Added Chris Moller's libhover patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 13 Dec 2006 16:52:45 -0000 1.26 +++ sources 29 Jan 2007 18:47:31 -0000 1.27 @@ -1,3 +1,3 @@ -0c32e0a130f102727ba1c2a0645c483d eclipse-cdt-fetched-src-3.1.1.tar.bz2 -d66010506732482f48bd89775ebf1884 eclipse-cdt-cppunit-20061102.tar.gz -b83d1a201f8f981a09075289b31dbf73 eclipse-cdt-autotools-0.0.6.tar.gz +03800551796d05a68116ee0475240315 eclipse-cdt-autotools-0.0.6.1.tar.gz +922f65074113363570d0f5a0b56a1e70 eclipse-cdt-fetched-src-3.1.1.tar.bz2 +5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 18:51:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 13:51:51 -0500 Subject: rpms/eclipse-cdt/devel eclipse-cdt-managedbuild-failcheck.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 eclipse-cdt.spec, 1.71, 1.72 sources, 1.29, 1.30 Message-ID: <200701291851.l0TIpp81022384@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22266 Modified Files: .cvsignore eclipse-cdt.spec sources Added Files: eclipse-cdt-managedbuild-failcheck.patch Log Message: * Mon Jan 29 2007 Jeff Johnston 3.1.1-8 - Resolves: #214624, #224644 - Rebase autotools to 0.0.7 source. eclipse-cdt-managedbuild-failcheck.patch: GeneratedMakefileBuilder.java | 56 +++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 25 deletions(-) --- NEW FILE eclipse-cdt-managedbuild-failcheck.patch --- --- ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java.fix 2007-01-26 19:22:27.000000000 -0500 +++ ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java 2007-01-26 19:43:53.000000000 -0500 @@ -700,34 +700,40 @@ public class GeneratedMakefileBuilder ex } } } - - // Now call make - checkCancel(monitor); - statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$ - monitor.subTask(statusMsg); - IPath topBuildDir = generator.getBuildWorkingDir(); - if (topBuildDir != null) { - invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor); + + if (result.getCode() != IStatus.ERROR) { + // Now call make + checkCancel(monitor); + statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); + IPath topBuildDir = generator.getBuildWorkingDir(); + if (topBuildDir != null) { + invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor); + } else { + statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); + return; + } + + // Now regenerate the dependencies + checkCancel(monitor); + statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); + try { + generator.regenerateDependencies(false); + } catch (CoreException e) { + // Throw the exception back to the builder + throw e; + } + + // Build finished message + statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); } else { - statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$ + // Build finished message + statusMsg = ManagedMakeMessages.getFormattedString(BUILD_STOPPED_ERR, getProject().getName()); //$NON-NLS-1$ monitor.subTask(statusMsg); - return; - } - - // Now regenerate the dependencies - checkCancel(monitor); - statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$ - monitor.subTask(statusMsg); - try { - generator.regenerateDependencies(false); - } catch (CoreException e) { - // Throw the exception back to the builder - throw e; } - - // Build finished message - statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ - monitor.subTask(statusMsg); } /* (non-Javadoc) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 19 Jan 2007 16:37:53 -0000 1.24 +++ .cvsignore 29 Jan 2007 18:51:49 -0000 1.25 @@ -3,3 +3,4 @@ eclipse-cdt-cppunit-20061102.tar.gz eclipse-cdt-autotools-0.0.6.tar.gz eclipse-cdt-autotools-0.0.6.1.tar.gz +eclipse-cdt-autotools-0.0.7.tar.gz Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- eclipse-cdt.spec 19 Jan 2007 16:37:53 -0000 1.71 +++ eclipse-cdt.spec 29 Jan 2007 18:51:49 -0000 1.72 @@ -18,7 +18,7 @@ Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 7%{?dist} +Release: 8%{?dist} License: Eclipse Public License / CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -45,13 +45,13 @@ # The following tarball was generated thusly: # # mkdir temp && cd temp -# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \ +# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_7 \ # autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \ # autotools/com.redhat.eclipse.cdt.autotools.feature # cd autotools -# tar -czvf eclipse-cdt-autotools-0.0.6.1.tar.gz com.redhat.eclipse.cdt.autotools* +# tar -czvf eclipse-cdt-autotools-0.0.7.tar.gz com.redhat.eclipse.cdt.autotools* -Source1: %{name}-autotools-0.0.6.1.tar.gz +Source1: %{name}-autotools-0.0.7.tar.gz # The following tarball was generated thusly: # @@ -87,6 +87,9 @@ # Patch to fix default paths used by cppunit wizards to find header files and # libraries. Patch10: %{name}-cppunit-default-location.patch +# Patch to ManagedMake builder to prevent running make after Makefile generation +# failure. +Patch11: %{name}-managedbuild-failcheck.patch BuildRequires: eclipse-pde %if %{gcj_support} @@ -141,6 +144,7 @@ %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch11 -p0 popd # Autotools stuff @@ -310,6 +314,10 @@ %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog +* Mon Jan 29 2007 Jeff Johnston 3.1.1-8 +- Resolves: #214624, #224644 +- Rebase autotools to 0.0.7 source. + * Wed Jan 17 2007 Jeff Johnston 3.1.1-7 - Resolves: #222350 - Rebase autotools to 0.0.6.1 source. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 19 Jan 2007 16:37:53 -0000 1.29 +++ sources 29 Jan 2007 18:51:49 -0000 1.30 @@ -1,3 +1,3 @@ -03800551796d05a68116ee0475240315 eclipse-cdt-autotools-0.0.6.1.tar.gz 922f65074113363570d0f5a0b56a1e70 eclipse-cdt-fetched-src-3.1.1.tar.bz2 5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz +96b6a6542a4514832262c2fbd5b4cb09 eclipse-cdt-autotools-0.0.7.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 19:00:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 14:00:38 -0500 Subject: rpms/PyQt/FC-6 PyQt.spec,1.33,1.34 Message-ID: <200701291900.l0TJ0cun028986@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/PyQt/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28778 Modified Files: PyQt.spec Log Message: rebuild against sip-4.5.2 Index: PyQt.spec =================================================================== RCS file: /cvs/dist/rpms/PyQt/FC-6/PyQt.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- PyQt.spec 28 Nov 2006 15:21:03 -0000 1.33 +++ PyQt.spec 29 Jan 2007 19:00:31 -0000 1.34 @@ -6,7 +6,7 @@ %define qtversion 3.3.7 %define qtpkg qt -%define sip_version 4.5 +%define sip_version 4.5.2 %if "%{pythonver}" == "2.4" %define pythonprog /usr/bin/python2.4 @@ -17,7 +17,7 @@ Summary: Python bindings for Qt Name: PyQt Version: 3.17 -Release: 0.1.fc6 +Release: 0.2.fc6 License: GPL Group: Development/Languages Url: http://www.riverbankcomputing.co.uk/pyqt/ @@ -98,6 +98,9 @@ %doc examples/*.png examples/*.gif examples/*.bmp %changelog +* Mon Jan 29 2007 Than Ngo - 3.17-0.2.fc6 +- rebuild against sip-4.5.2 + * Tue Nov 28 2006 Than Ngo - 3.17-0.1.fc6 - update to 3.17 From fedora-cvs-commits at redhat.com Mon Jan 29 19:05:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 14:05:18 -0500 Subject: rpms/notification-daemon/devel .cvsignore, 1.2, 1.3 notification-daemon.spec, 1.10, 1.11 sources, 1.2, 1.3 Message-ID: <200701291905.l0TJ5Irl032541@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/notification-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32451 Modified Files: .cvsignore notification-daemon.spec sources Log Message: 0.3.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/notification-daemon/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jun 2006 17:45:11 -0000 1.2 +++ .cvsignore 29 Jan 2007 19:05:16 -0000 1.3 @@ -1 +1 @@ -notification-daemon-0.3.5.tar.bz2 +notification-daemon-0.3.6.tar.bz2 Index: notification-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/notification-daemon/devel/notification-daemon.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- notification-daemon.spec 18 Oct 2006 14:04:26 -0000 1.10 +++ notification-daemon.spec 29 Jan 2007 19:05:16 -0000 1.11 @@ -5,8 +5,8 @@ Summary: Notification Daemon Name: notification-daemon -Version: 0.3.5 -Release: 8%{?dist} +Version: 0.3.6 +Release: 1%{?dist} URL: http://www.galago-project.org/specs/notification/ License: GPL Group: System Environment/Libraries @@ -22,6 +22,7 @@ BuildRequires: libwnck-devel BuildRequires: libtool BuildRequires: intltool +BuildRequires: gettext Requires(preun): GConf2 >= %{gconf_version} Requires(pre): GConf2 >= %{gconf_version} @@ -54,6 +55,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/notification-daemon-1.0/engines/*.*a +%find_lang %{name} + %clean rm -rf %{buildroot} @@ -76,7 +79,7 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/notification-daemon.schemas > /dev/null || : -%files +%files -f %{name}.lang %defattr(-,root,root) %doc COPYING ChangeLog NEWS %dir %{_libdir}/notification-daemon-1.0 @@ -88,6 +91,10 @@ %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas %changelog +* Mon Jan 29 2007 Matthias Clasen - 0.3.6-1 +- Update to 0.3.6 +- Apply a patch by Thorsten Leemhuis to fix some spec issues + * Wed Oct 18 2006 Matthias Clasen - 0.3.5-8 - Fix scripts according to packaging guidelines Index: sources =================================================================== RCS file: /cvs/dist/rpms/notification-daemon/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jun 2006 17:45:11 -0000 1.2 +++ sources 29 Jan 2007 19:05:16 -0000 1.3 @@ -1 +1 @@ -f9a0aa1cba88cd325c968bc508b4a2c9 notification-daemon-0.3.5.tar.bz2 +3ef10532099f42129aa3b6e0381fa5ac notification-daemon-0.3.6.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 29 19:07:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 14:07:51 -0500 Subject: rpms/notification-daemon/FC-6 notification-daemon.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200701291907.l0TJ7p0k002035@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/notification-daemon/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv1869 Modified Files: notification-daemon.spec sources Log Message: 0.3.6 Index: notification-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/notification-daemon/FC-6/notification-daemon.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- notification-daemon.spec 18 Oct 2006 02:38:17 -0000 1.9 +++ notification-daemon.spec 29 Jan 2007 19:07:44 -0000 1.10 @@ -1,12 +1,12 @@ %define gtk2_version 2.4.0 %define dbus_version 0.90 %define dbus_glib_version 0.70 -%define gconf_version 2.14 +%define gconf_version 2.14 Summary: Notification Daemon Name: notification-daemon -Version: 0.3.5 -Release: 7%{?dist} +Version: 0.3.6 +Release: 1%{?dist} URL: http://www.galago-project.org/specs/notification/ License: GPL Group: System Environment/Libraries @@ -22,9 +22,11 @@ BuildRequires: libwnck-devel BuildRequires: libtool BuildRequires: intltool +BuildRequires: gettext -Requires(post): GConf2 -Requires(preun): GConf2 +Requires(preun): GConf2 >= %{gconf_version} +Requires(pre): GConf2 >= %{gconf_version} +Requires(post): GConf2 >= %{gconf_version} Obsoletes: notify-daemon @@ -53,11 +55,20 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/notification-daemon-1.0/engines/*.*a +%find_lang %{name} + %clean rm -rf %{buildroot} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || : +fi + %preun -if [ "$1" -gt 0 ]; then +if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || : @@ -68,7 +79,7 @@ gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/notification-daemon.schemas > /dev/null || : -%files +%files -f %{name}.lang %defattr(-,root,root) %doc COPYING ChangeLog NEWS %dir %{_libdir}/notification-daemon-1.0 @@ -80,6 +91,13 @@ %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas %changelog +* Mon Jan 29 2007 Matthias Clasen - 0.3.6-1 +- Update to 0.3.6 +- Apply a patch by Thorsten Leemhuis to fix some spec issues + +* Wed Oct 18 2006 Matthias Clasen - 0.3.5-8 +- Fix scripts according to packaging guidelines + * Tue Oct 17 2006 Matthias Clasen - 0.3.5-7 - Tighten up Requires (#203813) Index: sources =================================================================== RCS file: /cvs/dist/rpms/notification-daemon/FC-6/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jun 2006 17:45:11 -0000 1.2 +++ sources 29 Jan 2007 19:07:44 -0000 1.3 @@ -1 +1 @@ -f9a0aa1cba88cd325c968bc508b4a2c9 notification-daemon-0.3.5.tar.bz2 +3ef10532099f42129aa3b6e0381fa5ac notification-daemon-0.3.6.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 29 19:15:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 14:15:22 -0500 Subject: rpms/eclipse-cdt/FC-6 eclipse-cdt-managedbuild-failcheck.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 eclipse-cdt.spec, 1.63, 1.64 sources, 1.27, 1.28 Message-ID: <200701291915.l0TJFMuE007965@cvs.devel.redhat.com> Author: jjohnstn Update of /cvs/dist/rpms/eclipse-cdt/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7818 Modified Files: .cvsignore eclipse-cdt.spec sources Added Files: eclipse-cdt-managedbuild-failcheck.patch Log Message: * Mon Jan 29 2007 Jeff Johnston 3.1.1-8 - Resolves: #214624, #224644 - Rebase autotools to 0.0.7 source. eclipse-cdt-managedbuild-failcheck.patch: GeneratedMakefileBuilder.java | 56 +++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 25 deletions(-) --- NEW FILE eclipse-cdt-managedbuild-failcheck.patch --- --- ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java.fix 2007-01-26 19:22:27.000000000 -0500 +++ ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java 2007-01-26 19:43:53.000000000 -0500 @@ -700,34 +700,40 @@ public class GeneratedMakefileBuilder ex } } } - - // Now call make - checkCancel(monitor); - statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$ - monitor.subTask(statusMsg); - IPath topBuildDir = generator.getBuildWorkingDir(); - if (topBuildDir != null) { - invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor); + + if (result.getCode() != IStatus.ERROR) { + // Now call make + checkCancel(monitor); + statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); + IPath topBuildDir = generator.getBuildWorkingDir(); + if (topBuildDir != null) { + invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor); + } else { + statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); + return; + } + + // Now regenerate the dependencies + checkCancel(monitor); + statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); + try { + generator.regenerateDependencies(false); + } catch (CoreException e) { + // Throw the exception back to the builder + throw e; + } + + // Build finished message + statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); } else { - statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$ + // Build finished message + statusMsg = ManagedMakeMessages.getFormattedString(BUILD_STOPPED_ERR, getProject().getName()); //$NON-NLS-1$ monitor.subTask(statusMsg); - return; - } - - // Now regenerate the dependencies - checkCancel(monitor); - statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$ - monitor.subTask(statusMsg); - try { - generator.regenerateDependencies(false); - } catch (CoreException e) { - // Throw the exception back to the builder - throw e; } - - // Build finished message - statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ - monitor.subTask(statusMsg); } /* (non-Javadoc) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 12 Dec 2006 20:22:05 -0000 1.22 +++ .cvsignore 29 Jan 2007 19:15:20 -0000 1.23 @@ -2,3 +2,5 @@ eclipse-cdt-fetched-src-3.1.1.tar.bz2 eclipse-cdt-cppunit-20061102.tar.gz eclipse-cdt-autotools-0.0.6.tar.gz +eclipse-cdt-autotools-0.0.6.1.tar.gz +eclipse-cdt-autotools-0.0.7.tar.gz Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/eclipse-cdt.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- eclipse-cdt.spec 29 Jan 2007 18:47:31 -0000 1.63 +++ eclipse-cdt.spec 29 Jan 2007 19:15:20 -0000 1.64 @@ -18,7 +18,7 @@ Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 7%{?dist} +Release: 8%{?dist} License: Eclipse Public License / CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -45,13 +45,13 @@ # The following tarball was generated thusly: # # mkdir temp && cd temp -# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \ +# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_7 \ # autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \ # autotools/com.redhat.eclipse.cdt.autotools.feature # cd autotools -# tar -czvf eclipse-cdt-autotools-0.0.6.1.tar.gz com.redhat.eclipse.cdt.autotools* +# tar -czvf eclipse-cdt-autotools-0.0.7.tar.gz com.redhat.eclipse.cdt.autotools* -Source1: %{name}-autotools-0.0.6.1.tar.gz +Source1: %{name}-autotools-0.0.7.tar.gz # The following tarball was generated thusly: # @@ -87,6 +87,9 @@ # Patch to fix default paths used by cppunit wizards to find header files and # libraries. Patch10: %{name}-cppunit-default-location.patch +# Patch to ManagedMake builder to prevent running make after Makefile generation +# failure. +Patch11: %{name}-managedbuild-failcheck.patch BuildRequires: eclipse-pde %if %{gcj_support} @@ -141,6 +144,7 @@ %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch11 -p0 popd # Autotools stuff @@ -310,6 +314,10 @@ %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog +* Mon Jan 29 2007 Jeff Johnston 3.1.1-8 +- Resolves: #214624, #224644 +- Rebase autotools to 0.0.7 source. + * Wed Jan 17 2007 Jeff Johnston 3.1.1-7 - Resolves: #222350 - Rebase autotools to 0.0.6.1 source. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 29 Jan 2007 18:47:31 -0000 1.27 +++ sources 29 Jan 2007 19:15:20 -0000 1.28 @@ -1,3 +1,3 @@ -03800551796d05a68116ee0475240315 eclipse-cdt-autotools-0.0.6.1.tar.gz 922f65074113363570d0f5a0b56a1e70 eclipse-cdt-fetched-src-3.1.1.tar.bz2 5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz +96b6a6542a4514832262c2fbd5b4cb09 eclipse-cdt-autotools-0.0.7.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 19:39:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 14:39:33 -0500 Subject: rpms/libdrm/devel libdrm-2.3.0-default-mode.patch, NONE, 1.1 libdrm.spec, 1.21, 1.22 Message-ID: <200701291939.l0TJdX4o005375@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libdrm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5358 Modified Files: libdrm.spec Added Files: libdrm-2.3.0-default-mode.patch Log Message: * Mon Jan 29 2007 Adam Jackson 2.3.0-2 - Change default device mode to 0666. (#221545) libdrm-2.3.0-default-mode.patch: xf86drm.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libdrm-2.3.0-default-mode.patch --- --- libdrm-2.3.0/libdrm/xf86drm.h.jx 2006-11-08 16:55:14.000000000 -0500 +++ libdrm-2.3.0/libdrm/xf86drm.h 2007-01-29 14:35:36.000000000 -0500 @@ -46,7 +46,7 @@ /* Default /dev/dri directory permissions 0755 */ #define DRM_DEV_DIRMODE \ (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) -#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) +#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) #define DRM_DIR_NAME "/dev/dri" #define DRM_DEV_NAME "%s/card%d" Index: libdrm.spec =================================================================== RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libdrm.spec 17 Nov 2006 17:41:35 -0000 1.21 +++ libdrm.spec 29 Jan 2007 19:39:31 -0000 1.22 @@ -1,7 +1,7 @@ Summary: libdrm Direct Rendering Manager runtime library Name: libdrm Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -15,6 +15,7 @@ Obsoletes: XFree86-libs, xorg-x11-libs Patch0: nouveau-20061117.patch +Patch1: libdrm-2.3.0-default-mode.patch %description libdrm Direct Rendering Manager runtime library @@ -32,6 +33,7 @@ %prep %setup -q %patch0 -p1 -b .nouveau +%patch1 -p1 -b .666 %build aclocal ; automake ; autoconf @@ -81,6 +83,9 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Mon Jan 29 2007 Adam Jackson 2.3.0-2 +- Change default device mode to 0666. (#221545) + * Fri Nov 17 2006 Adam Jackson 2.3.0-1.fc7 - Update to 2.3.0 from upstream. - Add nouveau userspace header. From fedora-cvs-commits at redhat.com Mon Jan 29 19:41:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 14:41:07 -0500 Subject: rpms/control-center/devel control-center-2.17.90-search.patch, NONE, 1.1 control-center.spec, 1.218, 1.219 Message-ID: <200701291941.l0TJf72t005475@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5459 Modified Files: control-center.spec Added Files: control-center-2.17.90-search.patch Log Message: support tracker control-center-2.17.90-search.patch: gnome-settings-multimedia-keys.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletion(-) --- NEW FILE control-center-2.17.90-search.patch --- --- control-center-2.17.90/gnome-settings-daemon/gnome-settings-multimedia-keys.c.search 2007-01-08 14:51:22.000000000 -0500 +++ control-center-2.17.90/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2007-01-29 14:41:48.000000000 -0500 @@ -585,7 +585,15 @@ execute ("nautilus", FALSE); break; case SEARCH_KEY: - execute ("gnome-search-tool", FALSE); + cmd = NULL; + if ((cmd = g_find_program_in_path ("beagle-search"))) + execute ("beagle-search", FALSE); + else if ((cmd = g_find_program_in_path ("tracker-search-tool"))) + execute ("tracker-search-tool", FALSE); + else + execute ("gnome-search-tool", FALSE); + + g_free (cmd); break; case EMAIL_KEY: do_mail_action (acme); Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- control-center.spec 23 Jan 2007 19:25:16 -0000 1.218 +++ control-center.spec 29 Jan 2007 19:41:00 -0000 1.219 @@ -21,7 +21,7 @@ Summary: GNOME Control Center Name: control-center Version: 2.17.90 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -32,9 +32,9 @@ # it upstreamed or drop it I guess. Patch1: control-center-2.15.4-finish.patch -# Optionally bring up beagle if available +# Optionally bring up beagle or tracker if available # FIXME: need to get this filed upstream -Patch2: control-center-2.15.91-search.patch +Patch2: control-center-2.17.90-search.patch # drop help button from a dialog that doesn't have # help @@ -44,19 +44,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=376045 Patch5: control-center-2.15.91-compiz-support.patch -## FIXME -## these patches need to go to libgnomekbd -# http://bugzilla.gnome.org/show_bug.cgi?id=352777 -#Patch7: keyboard-drawing-rotated-text.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=352778 -#Patch8: keyboard-drawing-label-color.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=352779 -#Patch9: keyboard-drawing-primary.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=352781 -#Patch10: keyboard-drawing-corner.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=353163 -#Patch11: keyboard-drawing-redraw.patch - # ubuntu has a better patch for this in the works # apparently http://blog.omma.net/?p=16 # We should either wait for it to get upstream, or @@ -179,12 +166,6 @@ %patch3 -p1 -b .about-me-help %patch5 -p1 -b .compiz-support -#%patch7 -p1 -b .rotated-text -#%patch8 -p1 -b .label-color -#%patch9 -p1 -b .primary -#%patch10 -p1 -b .corner -#%patch11 -p1 -b .redraw - %patch12 -p1 -b .start-at-helper # vendor configuration patches @@ -346,6 +327,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 29 2007 Matthias Clasen - 2.17.90-3 +- Support tracker in the search keybinding (#216315) + * Tue Jan 23 2007 Matthias Clasen - 2.17.90-2 - Install gnomecc desktop file From fedora-cvs-commits at redhat.com Mon Jan 29 20:32:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 15:32:12 -0500 Subject: rpms/gtkhtml3/FC-6 .cvsignore, 1.43, 1.44 gtkhtml3.spec, 1.74, 1.75 sources, 1.43, 1.44 Message-ID: <200701292032.l0TKWCJI028411@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/gtkhtml3/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28131 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: * Mon Jan 29 2007 Matthew Barnes - 3.12.3-1.fc6 - Update to 3.12.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/FC-6/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 20 Nov 2006 18:03:58 -0000 1.43 +++ .cvsignore 29 Jan 2007 20:32:10 -0000 1.44 @@ -1 +1 @@ -gtkhtml-3.12.2.tar.bz2 +gtkhtml-3.12.3.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/FC-6/gtkhtml3.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gtkhtml3.spec 20 Nov 2006 18:03:58 -0000 1.74 +++ gtkhtml3.spec 29 Jan 2007 20:32:10 -0000 1.75 @@ -5,7 +5,7 @@ ### Abstract ### Name: gtkhtml3 -Version: 3.12.2 +Version: 3.12.3 Release: 1%{?dist} License: LGPL/GPL Group: System Environment/Libraries @@ -112,6 +112,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jan 29 2007 Matthew Barnes - 3.12.3-1.fc6 +- Update to 3.12.3 + * Mon Nov 20 2006 Matthew Barnes - 3.12.2-1.fc6 - Update to 3.12.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/FC-6/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 20 Nov 2006 18:03:58 -0000 1.43 +++ sources 29 Jan 2007 20:32:10 -0000 1.44 @@ -1 +1 @@ -8c943647fd26cf4594b2e97055e22584 gtkhtml-3.12.2.tar.bz2 +b580590014988b02e51b66be65319570 gtkhtml-3.12.3.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 29 20:34:39 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 15:34:39 -0500 Subject: rpms/dhcp/devel dhcp-3.0.5-dst.patch,1.3,1.4 Message-ID: <200701292034.l0TKYdJ5030124@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29895 Modified Files: dhcp-3.0.5-dst.patch Log Message: Make sure the prototype and function declaration for dst_hmac_md5_init() are the same. dhcp-3.0.5-dst.patch: dst_api.c | 16 +++++++++++++--- dst_support.c | 4 ++++ hmac_link.c | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) Index: dhcp-3.0.5-dst.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-dst.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dhcp-3.0.5-dst.patch 14 Nov 2006 03:48:34 -0000 1.3 +++ dhcp-3.0.5-dst.patch 29 Jan 2007 20:34:37 -0000 1.4 @@ -1,5 +1,5 @@ --- dhcp-3.0.5/dst/dst_api.c.dst 2001-02-22 02:22:08.000000000 -0500 -+++ dhcp-3.0.5/dst/dst_api.c 2006-11-13 17:31:45.000000000 -0500 ++++ dhcp-3.0.5/dst/dst_api.c 2007-01-23 21:33:04.000000000 -0500 @@ -58,6 +58,10 @@ #include "dst_internal.h" @@ -46,7 +46,7 @@ if (sscanf((char *)p, "%d", &alg) != 1) --- dhcp-3.0.5/dst/dst_support.c.dst 2001-02-22 02:22:08.000000000 -0500 -+++ dhcp-3.0.5/dst/dst_support.c 2006-11-13 17:32:00.000000000 -0500 ++++ dhcp-3.0.5/dst/dst_support.c 2007-01-23 21:33:04.000000000 -0500 @@ -32,6 +32,10 @@ #include "dst_internal.h" @@ -58,3 +58,23 @@ /* * dst_s_conv_bignum_u8_to_b64 * This function converts binary data stored as a u_char[] to a +--- dhcp-3.0.5/dst/hmac_link.c.dst 2001-02-22 02:22:08.000000000 -0500 ++++ dhcp-3.0.5/dst/hmac_link.c 2007-01-23 21:35:30.000000000 -0500 +@@ -459,7 +459,7 @@ + * related functions + */ + int +-dst_hmac_md5_init() ++dst_hmac_md5_init(void) + { + if (dst_t_func[KEY_HMAC_MD5] != NULL) + return (1); +@@ -481,7 +481,7 @@ + + #else + int +-dst_hmac_md5_init(){ ++dst_hmac_md5_init(void){ + return (0); + } + #endif From fedora-cvs-commits at redhat.com Mon Jan 29 20:34:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 15:34:53 -0500 Subject: rpms/dhcp/devel dhcptables.pl,1.1,NONE Message-ID: <200701292034.l0TKYrWS030292@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30227 Removed Files: dhcptables.pl Log Message: Removed. --- dhcptables.pl DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 21:01:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 16:01:18 -0500 Subject: rpms/sysklogd/devel sysklogd.spec,1.44,1.45 Message-ID: <200701292101.l0TL1Ilk005425@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/sysklogd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5336 Modified Files: sysklogd.spec Log Message: fix scriptlets Index: sysklogd.spec =================================================================== RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sysklogd.spec 13 Dec 2006 14:03:50 -0000 1.44 +++ sysklogd.spec 29 Jan 2007 21:01:16 -0000 1.45 @@ -1,7 +1,7 @@ Summary: System logging and kernel message trapping daemons Name: sysklogd Version: 1.4.1 -Release: 43%{?dist} +Release: 44%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.infodrom.org/projects/sysklogd/ @@ -9,8 +9,9 @@ Prereq: fileutils /sbin/chkconfig /etc/init.d Conflicts: logrotate < 3.5.2 Requires: bash >= 2.0 -Requires(post): /sbin/service -Requires(preun): /sbin/service +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service Provides: syslog BuildRoot: /var/tmp/syslog-root Patch0: sysklogd-1.4.1-siginterrupt.patch @@ -72,24 +73,27 @@ rm -rf $RPM_BUILD_ROOT %post -if [ "$1" -ge 1 ]; then - /sbin/chkconfig --add syslog - for n in /var/log/{messages,secure,maillog,spooler} - do +/sbin/chkconfig --add syslog +for n in /var/log/{messages,secure,maillog,spooler} +do [ -f $n ] && continue - (umask 066 && touch $n) - done - /sbin/service syslog condrestart > /dev/null 2>&1 -fi + umask 066 && touch $n) +done exit 0 %preun if [ $1 = 0 ]; then - /sbin/service syslog stop >/dev/null 2>&1 + /sbin/service syslog stop >/dev/null 2>&1 || : /sbin/chkconfig --del syslog fi exit 0 +%postun +if [ "$1" -ge "1" ]; then + /sbin/service syslog condrestart > /dev/null 2>&1 || : +fi +exit 0 + %triggerpostun -- sysklogd < 1.3.31-17 /sbin/chkconfig --add syslog || : @@ -107,6 +111,9 @@ %{_mandir}/*/* %changelog +* Mon Jan 29 2007 Peter Vrabec 1.4.1-44 +- fix scriptlets + * Wed Dec 13 2006 Peter Vrabec 1.4.1-43 - fix some rpmlint issues From fedora-cvs-commits at redhat.com Mon Jan 29 21:18:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 16:18:43 -0500 Subject: rpms/sysfsutils/devel sysfsutils.spec, 1.20, 1.21 sysfsutils-1.3.0-redhatify.patch, 1.1, NONE Message-ID: <200701292118.l0TLIhlY006653@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/sysfsutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6614 Modified Files: sysfsutils.spec Removed Files: sysfsutils-1.3.0-redhatify.patch Log Message: Update to sysfsutils 2.1.0 Index: sysfsutils.spec =================================================================== RCS file: /cvs/dist/rpms/sysfsutils/devel/sysfsutils.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sysfsutils.spec 11 Sep 2006 20:13:06 -0000 1.20 +++ sysfsutils.spec 29 Jan 2007 21:18:40 -0000 1.21 @@ -1,13 +1,15 @@ -Summary: sysfsutils, library interface to sysfs. -Name: sysfsutils -Version: 2.0.0 -Release: 6 -Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-redhatify.patch -Patch1: sysfsutils-2.0.0-class-dup.patch -License: GPL -Group: Development/Tools -Buildroot: %{_tmppath}/%{name}-root +Name: sysfsutils +URL: http://sourceforge.net/projects/linux-diag/ +License: GPL +Group: Development/Tools +Version: 2.1.0 +Release: 1%{?dist} + +Summary: sysfsutils and library interface to sysfs +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz +Patch0: sysfsutils-2.0.0-redhatify.patch +Patch1: sysfsutils-2.0.0-class-dup.patch %description This package's purpose is to provide a set of utilities for interfacing @@ -24,7 +26,7 @@ %package -n libsysfs-devel Summary: Static library and headers for libsysfs Group: Development/Libraries -Requires: libsysfs = %{version} +Requires: libsysfs = %{version}-%{release} Obsoletes: sysfsutils-devel %description -n libsysfs-devel @@ -38,15 +40,15 @@ %build %configure -make +make %{?_smp_mflags} %install -rm -fr %{buildroot} +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/%{_bindir}/dlist_test $RPM_BUILD_ROOT/%{_bindir}/get_bus_devices_list $RPM_BUILD_ROOT/%{_bindir}/get_class_dev $RPM_BUILD_ROOT/%{_bindir}/get_classdev_parent $RPM_BUILD_ROOT/%{_bindir}/get_device $RPM_BUILD_ROOT/%{_bindir}/get_driver $RPM_BUILD_ROOT/%{_bindir}/testlibsysfs $RPM_BUILD_ROOT/%{_bindir}/write_attr -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_bindir}/dlist_test $RPM_BUILD_ROOT%{_bindir}/get_bus_devices_list $RPM_BUILD_ROOT%{_bindir}/get_class_dev $RPM_BUILD_ROOT%{_bindir}/get_classdev_parent $RPM_BUILD_ROOT%{_bindir}/get_device $RPM_BUILD_ROOT%{_bindir}/get_driver $RPM_BUILD_ROOT%{_bindir}/testlibsysfs $RPM_BUILD_ROOT%{_bindir}/write_attr +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %post -p /sbin/ldconfig @@ -64,8 +66,7 @@ %files -n libsysfs %defattr(-,root,root) -%{_libdir}/libsysfs.so.2 -%{_libdir}/libsysfs.so.2.0.0 +%{_libdir}/libsysfs.so.* %doc COPYING AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt lib/LGPL %files -n libsysfs-devel @@ -78,6 +79,9 @@ %changelog +* Mon Sep 29 2007 Jarod Wilson - 2.1.0-1 +- Update to upstream release 2.1.0 + * Mon Sep 11 2006 Neil Horman - 2.0.0-6 - Integrate patch for bz 205808 --- sysfsutils-1.3.0-redhatify.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 29 21:22:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 16:22:06 -0500 Subject: rpms/sysfsutils/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200701292122.l0TLM6lQ009310@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/sysfsutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9269 Modified Files: .cvsignore sources Log Message: Must upload source tarball or build will fail... Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sysfsutils/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 May 2006 14:28:39 -0000 1.5 +++ .cvsignore 29 Jan 2007 21:22:04 -0000 1.6 @@ -1,2 +1,3 @@ sysfsutils-1.3.0.tar.gz sysfsutils-2.0.0.tar.gz +sysfsutils-2.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/sysfsutils/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 May 2006 14:28:39 -0000 1.5 +++ sources 29 Jan 2007 21:22:04 -0000 1.6 @@ -1,2 +1,3 @@ d11c99271531be3c1e6d36b53968cd2b sysfsutils-1.3.0.tar.gz b7857c045ef3b4810c9b8be965c05fb9 sysfsutils-2.0.0.tar.gz +14e7dcd0436d2f49aa403f67e1ef7ddc sysfsutils-2.1.0.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 29 21:29:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 16:29:27 -0500 Subject: rpms/evolution-data-server/FC-6 .cvsignore, 1.54, 1.55 evolution-data-server.spec, 1.135, 1.136 sources, 1.54, 1.55 Message-ID: <200701292129.l0TLTRkC015114@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-data-server/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14965 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: * Mon Jan 29 2007 Matthew Barnes - 1.8.3-1.fc6 - Update to 1.8.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 20 Nov 2006 19:08:41 -0000 1.54 +++ .cvsignore 29 Jan 2007 21:29:25 -0000 1.55 @@ -1 +1 @@ -evolution-data-server-1.8.2.tar.bz2 +evolution-data-server-1.8.3.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/evolution-data-server.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- evolution-data-server.spec 10 Jan 2007 16:04:07 -0000 1.135 +++ evolution-data-server.spec 29 Jan 2007 21:29:25 -0000 1.136 @@ -24,8 +24,8 @@ ### Abstract ### Name: evolution-data-server -Version: 1.8.2 -Release: 2%{?dist} +Version: 1.8.3 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -359,6 +359,9 @@ %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Mon Jan 29 2007 Matthew Barnes - 1.8.3-1.fc6 +- Update to 1.8.3 + * Wed Jan 10 2007 Matthew Barnes - 1.8.2-2.fc6 - Add patch for RH bug #208724 (hang on send/receive). Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/FC-6/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 20 Nov 2006 19:08:41 -0000 1.54 +++ sources 29 Jan 2007 21:29:25 -0000 1.55 @@ -1 +1 @@ -fe7545411f7417bd246e15ae07ae9f54 evolution-data-server-1.8.2.tar.bz2 +f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 29 21:40:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 16:40:27 -0500 Subject: rpms/sysfsutils/FC-6 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 sysfsutils.spec, 1.20, 1.21 Message-ID: <200701292140.l0TLeRoV014278@cvs.devel.redhat.com> Author: jwilson Update of /cvs/dist/rpms/sysfsutils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14261 Modified Files: .cvsignore sources sysfsutils.spec Log Message: New upstream release v2.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sysfsutils/FC-6/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 24 May 2006 14:28:39 -0000 1.5 +++ .cvsignore 29 Jan 2007 21:40:25 -0000 1.6 @@ -1,2 +1,3 @@ sysfsutils-1.3.0.tar.gz sysfsutils-2.0.0.tar.gz +sysfsutils-2.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/sysfsutils/FC-6/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 May 2006 14:28:39 -0000 1.5 +++ sources 29 Jan 2007 21:40:25 -0000 1.6 @@ -1,2 +1 @@ -d11c99271531be3c1e6d36b53968cd2b sysfsutils-1.3.0.tar.gz -b7857c045ef3b4810c9b8be965c05fb9 sysfsutils-2.0.0.tar.gz +14e7dcd0436d2f49aa403f67e1ef7ddc sysfsutils-2.1.0.tar.gz Index: sysfsutils.spec =================================================================== RCS file: /cvs/dist/rpms/sysfsutils/FC-6/sysfsutils.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sysfsutils.spec 11 Sep 2006 20:13:06 -0000 1.20 +++ sysfsutils.spec 29 Jan 2007 21:40:25 -0000 1.21 @@ -1,13 +1,15 @@ -Summary: sysfsutils, library interface to sysfs. -Name: sysfsutils -Version: 2.0.0 -Release: 6 -Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-redhatify.patch -Patch1: sysfsutils-2.0.0-class-dup.patch -License: GPL -Group: Development/Tools -Buildroot: %{_tmppath}/%{name}-root +Name: sysfsutils +URL: http://sourceforge.net/projects/linux-diag/ +License: GPL +Group: Development/Tools +Version: 2.1.0 +Release: 1%{?dist} + +Summary: sysfsutils and library interface to sysfs +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz +Patch0: sysfsutils-2.0.0-redhatify.patch +Patch1: sysfsutils-2.0.0-class-dup.patch %description This package's purpose is to provide a set of utilities for interfacing @@ -24,7 +26,7 @@ %package -n libsysfs-devel Summary: Static library and headers for libsysfs Group: Development/Libraries -Requires: libsysfs = %{version} +Requires: libsysfs = %{version}-%{release} Obsoletes: sysfsutils-devel %description -n libsysfs-devel @@ -38,15 +40,15 @@ %build %configure -make +make %{?_smp_mflags} %install -rm -fr %{buildroot} +rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/%{_bindir}/dlist_test $RPM_BUILD_ROOT/%{_bindir}/get_bus_devices_list $RPM_BUILD_ROOT/%{_bindir}/get_class_dev $RPM_BUILD_ROOT/%{_bindir}/get_classdev_parent $RPM_BUILD_ROOT/%{_bindir}/get_device $RPM_BUILD_ROOT/%{_bindir}/get_driver $RPM_BUILD_ROOT/%{_bindir}/testlibsysfs $RPM_BUILD_ROOT/%{_bindir}/write_attr -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_bindir}/dlist_test $RPM_BUILD_ROOT%{_bindir}/get_bus_devices_list $RPM_BUILD_ROOT%{_bindir}/get_class_dev $RPM_BUILD_ROOT%{_bindir}/get_classdev_parent $RPM_BUILD_ROOT%{_bindir}/get_device $RPM_BUILD_ROOT%{_bindir}/get_driver $RPM_BUILD_ROOT%{_bindir}/testlibsysfs $RPM_BUILD_ROOT%{_bindir}/write_attr +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %post -p /sbin/ldconfig @@ -64,8 +66,7 @@ %files -n libsysfs %defattr(-,root,root) -%{_libdir}/libsysfs.so.2 -%{_libdir}/libsysfs.so.2.0.0 +%{_libdir}/libsysfs.so.* %doc COPYING AUTHORS README NEWS CREDITS ChangeLog docs/libsysfs.txt lib/LGPL %files -n libsysfs-devel @@ -78,6 +79,9 @@ %changelog +* Mon Sep 29 2007 Jarod Wilson - 2.1.0-1 +- Update to upstream release 2.1.0 + * Mon Sep 11 2006 Neil Horman - 2.0.0-6 - Integrate patch for bz 205808 From fedora-cvs-commits at redhat.com Mon Jan 29 21:53:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 16:53:55 -0500 Subject: rpms/device-mapper/devel device-mapper.1.02.17.tgz.asc, NONE, 1.1 .cvsignore, 1.23, 1.24 device-mapper.spec, 1.51, 1.52 sources, 1.28, 1.29 upstream, 1.19, 1.20 Message-ID: <200701292153.l0TLrtdI002367@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2351 Modified Files: .cvsignore device-mapper.spec sources upstream Added Files: device-mapper.1.02.17.tgz.asc Log Message: new upstream --- NEW FILE device-mapper.1.02.17.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFvlKUIoGRwVZ+LBcRAia1AKCstsvv9ys+3Hk5oVXYeW6wArPhjgCgpYg7 g53ybw0cMdO5FZcL/XEW2BM= =FEpq -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 26 Jan 2007 14:24:29 -0000 1.23 +++ .cvsignore 29 Jan 2007 21:53:53 -0000 1.24 @@ -1 +1 @@ -device-mapper.1.02.16.tgz +device-mapper.1.02.17.tgz Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- device-mapper.spec 26 Jan 2007 14:24:29 -0000 1.51 +++ device-mapper.spec 29 Jan 2007 21:53:53 -0000 1.52 @@ -1,6 +1,6 @@ Summary: Device mapper library Name: device-mapper -Version: 1.02.16 +Version: 1.02.17 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -48,6 +48,12 @@ %changelog +* Mon Jan 29 2007 Alasdair Kergon - 1.02.17-1 +- Add recent reporting options to dmsetup man page. +- Add dmsetup 'help' command and update usage text. +- Revise some report fields names. +- Use fixed-size fields in report interface and reorder. + * Fri Jan 26 2007 Alasdair Kergon - 1.02.16-1 - Update dmsetup to use new libdevmapper reporting functionality. Index: sources =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 26 Jan 2007 14:24:29 -0000 1.28 +++ sources 29 Jan 2007 21:53:53 -0000 1.29 @@ -1 +1 @@ -8cf2d345a66c41d008e5fafd34e2dcb6 device-mapper.1.02.16.tgz +b7347565dd3deb2b5a963db5fe96394c device-mapper.1.02.17.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/upstream,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- upstream 26 Jan 2007 14:24:29 -0000 1.19 +++ upstream 29 Jan 2007 21:53:53 -0000 1.20 @@ -1 +1 @@ -device-mapper.1.02.16.tgz +device-mapper.1.02.17.tgz From fedora-cvs-commits at redhat.com Mon Jan 29 22:19:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:19:08 -0500 Subject: rpms/dhcp/devel dhcp-3.0.5-libdhcp4client.patch, 1.5, 1.6 dhcp.spec, 1.128, 1.129 Message-ID: <200701292219.l0TMJ8c8023675@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23659 Modified Files: dhcp-3.0.5-libdhcp4client.patch dhcp.spec Log Message: * Mon Jan 29 2007 David Cantrell - 12:3.0.5-9 - Remove dhcptables.pl from the source package - Mark libres.a symbols hidden (#198496) - Set DT_SONAME on libdhcp4client to libdhcp4client-VERSION.so.0 - Make function definition for dst_hmac_md5_init() match the prototype dhcp-3.0.5-libdhcp4client.patch: Makefile.dist | 2 client/dhclient.c | 311 +++++++++++++++++++++++++++++++++------ common/alloc.c | 16 -- common/discover.c | 26 +-- common/lpf.c | 4 configure | 2 dst/hmac_link.c | 32 +++- dst/md5_dgst.c | 5 libdhcp4client/Makefile.dist | 127 +++++++++++++++ libdhcp4client/dhcp4client.h | 24 +++ libdhcp4client/libdhcp_control.h | 102 ++++++++++++ minires/ns_date.c | 1 minires/ns_name.c | 8 + minires/ns_parse.c | 5 minires/ns_samedomain.c | 4 minires/ns_sign.c | 1 minires/ns_verify.c | 2 minires/res_comp.c | 3 minires/res_findzonecut.c | 1 minires/res_init.c | 1 minires/res_mkquery.c | 1 minires/res_mkupdate.c | 8 + minires/res_send.c | 5 minires/res_sendsigned.c | 1 omapip/alloc.c | 43 +++++ omapip/dispatch.c | 2 omapip/errwarn.c | 50 +++++- 27 files changed, 705 insertions(+), 82 deletions(-) Index: dhcp-3.0.5-libdhcp4client.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-libdhcp4client.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dhcp-3.0.5-libdhcp4client.patch 29 Nov 2006 15:55:39 -0000 1.5 +++ dhcp-3.0.5-libdhcp4client.patch 29 Jan 2007 22:19:06 -0000 1.6 @@ -1,5 +1,5 @@ ---- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2006-11-29 10:50:20.000000000 -0500 -+++ dhcp-3.0.5/client/dhclient.c 2006-11-29 10:50:20.000000000 -0500 +--- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/client/dhclient.c 2007-01-29 17:02:32.000000000 -0500 @@ -78,7 +78,9 @@ int extended_option_environment = 0; #endif @@ -587,8 +587,8 @@ ddns_dhcid, client_identifier; struct option_cache *oc; int ignorep; ---- dhcp-3.0.5/common/alloc.c.libdhcp4client 2006-11-29 10:50:20.000000000 -0500 -+++ dhcp-3.0.5/common/alloc.c 2006-11-29 10:50:20.000000000 -0500 +--- dhcp-3.0.5/common/alloc.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/common/alloc.c 2007-01-29 17:02:32.000000000 -0500 @@ -48,7 +48,6 @@ const char *file; int line; @@ -669,8 +669,8 @@ struct dns_zone *d; if (!ptr) { ---- dhcp-3.0.5/common/discover.c.libdhcp4client 2006-11-29 10:50:20.000000000 -0500 -+++ dhcp-3.0.5/common/discover.c 2006-11-29 10:50:20.000000000 -0500 +--- dhcp-3.0.5/common/discover.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/common/discover.c 2007-01-29 17:02:32.000000000 -0500 @@ -120,28 +120,30 @@ For each interface that's of type INET and not the loopback interface, register that interface with the network I/O software, figure out what @@ -761,7 +761,7 @@ if (h -> type != dhcp_type_interface) --- dhcp-3.0.5/common/lpf.c.libdhcp4client 2004-11-24 12:39:15.000000000 -0500 -+++ dhcp-3.0.5/common/lpf.c 2006-11-29 10:50:20.000000000 -0500 ++++ dhcp-3.0.5/common/lpf.c 2007-01-29 17:02:32.000000000 -0500 @@ -69,8 +69,6 @@ struct interface_info *info; { @@ -787,8 +787,8 @@ int length = 0; int offset = 0; unsigned char ibuf [1536]; ---- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2001-02-22 02:22:08.000000000 -0500 -+++ dhcp-3.0.5/dst/hmac_link.c 2006-11-29 10:50:20.000000000 -0500 +--- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/dst/hmac_link.c 2007-01-29 17:02:32.000000000 -0500 @@ -38,6 +38,10 @@ #include "dst_internal.h" @@ -875,8 +875,390 @@ if (dst_t_func[KEY_HMAC_MD5] == NULL) return (0); memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func)); +--- dhcp-3.0.5/dst/md5_dgst.c.libdhcp4client 2004-06-14 14:50:06.000000000 -0400 ++++ dhcp-3.0.5/dst/md5_dgst.c 2007-01-29 17:02:32.000000000 -0500 +@@ -65,7 +65,7 @@ + + #ifdef USE_MD5 /* Added by ogud at tis.com 1998/1/26 */ + +-const char *MD5_version="MD5 part of SSLeay 0.8.1 19-Jul-1997"; ++const char *MD5_version __attribute__((visibility ("hidden"))) ="MD5 part of SSLeay 0.8.1 19-Jul-1997"; + + /* Implemented from RFC1321 The MD5 Message-Digest Algorithm + */ +@@ -81,6 +81,7 @@ + static void md5_block(); + #endif + ++__attribute__((visibility ("hidden"))) + void MD5_Init(c) + MD5_CTX *c; + { +@@ -93,6 +94,7 @@ + c->num=0; + } + ++__attribute__((visibility ("hidden"))) + void MD5_Update(c, data, len) + MD5_CTX *c; + const register unsigned char *data; +@@ -298,6 +300,7 @@ + c->D+=D&0xffffffffL; + } + ++__attribute__((visibility ("hidden"))) + void MD5_Final(md, c) + unsigned char *md; + MD5_CTX *c; +--- dhcp-3.0.5/minires/ns_date.c.libdhcp4client 2004-06-10 13:59:40.000000000 -0400 ++++ dhcp-3.0.5/minires/ns_date.c 2007-01-29 17:02:32.000000000 -0500 +@@ -56,6 +56,7 @@ + 1 January 1970 (GMT assumed). Format is yyyymmddhhmmss, all + digits required, no spaces allowed. */ + ++__attribute__((visibility ("hidden"))) + u_int32_t + ns_datetosecs(const char *cp, int *errp) { + struct tm time; +--- dhcp-3.0.5/minires/ns_verify.c.libdhcp4client 2004-06-10 13:59:42.000000000 -0400 ++++ dhcp-3.0.5/minires/ns_verify.c 2007-01-29 17:05:45.000000000 -0500 +@@ -61,6 +61,7 @@ + + /* Public. */ + ++__attribute__((visibility ("hidden"))) + u_char * + ns_find_tsig(u_char *msg, u_char *eom) { + HEADER *hp = (HEADER *)msg; +@@ -137,6 +138,7 @@ + * - TSIG verification succeeds, error set to BADSIG (ns_r_badsig) + * - TSIG verification succeeds, error set to BADTIME (ns_r_badtime) + */ ++__attribute__((visibility ("hidden"))) + isc_result_t + ns_verify(u_char *msg, unsigned *msglen, void *k, + const u_char *querysig, unsigned querysiglen, +--- dhcp-3.0.5/minires/ns_parse.c.libdhcp4client 2004-06-10 13:59:40.000000000 -0400 ++++ dhcp-3.0.5/minires/ns_parse.c 2007-01-29 17:02:32.000000000 -0500 +@@ -47,7 +47,7 @@ + /* Public. */ + + /* These need to be in the same order as the nres.h:ns_flag enum. */ +-struct _ns_flagdata _ns_flagdata[16] = { ++struct _ns_flagdata _ns_flagdata[16] __attribute__((visibility ("hidden"))) = { + { 0x8000, 15 }, /* qr. */ + { 0x7800, 11 }, /* opcode. */ + { 0x0400, 10 }, /* aa. */ +@@ -66,6 +66,7 @@ + { 0x0000, 0 }, /* expansion (6/6). */ + }; + ++__attribute__((visibility ("hidden"))) + isc_result_t + ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count, + int *rc) { +@@ -94,6 +95,7 @@ + return ISC_R_SUCCESS; + } + ++__attribute__((visibility ("hidden"))) + isc_result_t + ns_initparse(const u_char *msg, unsigned msglen, ns_msg *handle) { + const u_char *eom = msg + msglen; +@@ -136,6 +138,7 @@ + return ISC_R_SUCCESS; + } + ++__attribute__((visibility ("hidden"))) + isc_result_t + ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) { + int b; +--- dhcp-3.0.5/minires/ns_samedomain.c.libdhcp4client 2004-06-10 13:59:41.000000000 -0400 ++++ dhcp-3.0.5/minires/ns_samedomain.c 2007-01-29 17:02:32.000000000 -0500 +@@ -53,6 +53,7 @@ + * but NOT in "bar.top" + */ + ++__attribute__((visibility ("hidden"))) + int + ns_samedomain(const char *a, const char *b) { + size_t la, lb; +@@ -152,6 +153,7 @@ + * ns_subdomain(a, b) + * is "a" a subdomain of "b"? + */ ++__attribute__((visibility ("hidden"))) + int + ns_subdomain(const char *a, const char *b) { + return (ns_samename(a, b) != 1 && ns_samedomain(a, b)); +@@ -169,6 +171,7 @@ + * foo\\. -> foo\\. + */ + ++__attribute__((visibility ("hidden"))) + isc_result_t + ns_makecanon(const char *src, char *dst, size_t dstsize) { + size_t n = strlen(src); +@@ -198,6 +201,7 @@ + * 1 if names are the same + */ + ++__attribute__((visibility ("hidden"))) + int + ns_samename(const char *a, const char *b) { + char ta[NS_MAXDNAME], tb[NS_MAXDNAME]; +--- dhcp-3.0.5/minires/ns_name.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_name.c 2007-01-29 17:02:32.000000000 -0500 +@@ -60,6 +60,7 @@ + * The root is returned as "." + * All other domains are returned in non absolute form + */ ++__attribute__((visibility ("hidden"))) + int + ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { + const u_char *cp; +@@ -146,6 +147,7 @@ + * Enforces label and domain length limits. + */ + ++__attribute__((visibility ("hidden"))) + int + ns_name_pton(const char *src, u_char *dst, size_t dstsiz) { + u_char *label, *bp, *eom; +@@ -255,6 +257,7 @@ + * Enforces label and domain length limits. + */ + ++__attribute__((visibility ("hidden"))) + int + ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) { + const u_char *cp; +@@ -299,6 +302,7 @@ + * return: + * -1 if it fails, or consumed octets if it succeeds. + */ ++__attribute__((visibility ("hidden"))) + int + ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, + u_char *dst, size_t dstsiz) +@@ -387,6 +391,7 @@ + * try to compress names. If 'lastdnptr' is NULL, we don't update the + * list. + */ ++__attribute__((visibility ("hidden"))) + int + ns_name_pack(const u_char *src, u_char *dst, unsigned dstsiz, + const u_char **dnptrs, const u_char **lastdnptr) +@@ -479,6 +484,7 @@ + * note: + * Root domain returns as "." not "". + */ ++__attribute__((visibility ("hidden"))) + int + ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, + char *dst, size_t dstsiz) +@@ -507,6 +513,7 @@ + * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' + * is NULL, we don't update the list. + */ ++__attribute__((visibility ("hidden"))) + int + ns_name_compress(const char *src, u_char *dst, size_t dstsiz, + const u_char **dnptrs, const u_char **lastdnptr) +@@ -524,6 +531,7 @@ + * return: + * 0 on success, -1 (with errno set) on failure. + */ ++__attribute__((visibility ("hidden"))) + int + ns_name_skip(const u_char **ptrptr, const u_char *eom) { + const u_char *cp; +--- dhcp-3.0.5/minires/ns_sign.c.libdhcp4client 2004-06-10 13:59:42.000000000 -0400 ++++ dhcp-3.0.5/minires/ns_sign.c 2007-01-29 17:02:32.000000000 -0500 +@@ -78,6 +78,7 @@ + * - bad key / sign failed (-BADKEY) + * - not enough space (NS_TSIG_ERROR_NO_SPACE) + */ ++__attribute__((visibility ("hidden"))) + isc_result_t + ns_sign(u_char *msg, unsigned *msglen, unsigned msgsize, int error, void *k, + const u_char *querysig, unsigned querysiglen, u_char *sig, +--- dhcp-3.0.5/minires/res_comp.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/minires/res_comp.c 2007-01-29 17:02:32.000000000 -0500 +@@ -103,6 +103,7 @@ + * 'exp_dn' is a pointer to a buffer of size 'length' for the result. + * Return size of compressed name or -1 if there was an error. + */ ++__attribute__((visibility ("hidden"))) + int + dn_expand(const u_char *msg, const u_char *eom, const u_char *src, + char *dst, unsigned dstsiz) +@@ -119,6 +120,7 @@ + * Return the size of the compressed name or -1. + * 'length' is the size of the array pointed to by 'comp_dn'. + */ ++__attribute__((visibility ("hidden"))) + int + dn_comp(const char *src, u_char *dst, unsigned dstsiz, + u_char **dnptrs, u_char **lastdnptr) +@@ -131,6 +133,7 @@ + /* + * Skip over a compressed domain name. Return the size or -1. + */ ++__attribute__((visibility ("hidden"))) + int + dn_skipname(const u_char *ptr, const u_char *eom) { + const u_char *saveptr = ptr; +--- dhcp-3.0.5/minires/res_mkupdate.c.libdhcp4client 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/res_mkupdate.c 2007-01-29 17:02:32.000000000 -0500 +@@ -936,6 +936,7 @@ + + static struct valuelist *servicelist, *protolist; + ++__attribute__((visibility ("hidden"))) + void + res_buildservicelist() { + struct servent *sp; +@@ -968,6 +969,7 @@ + endservent(); + } + ++__attribute__((visibility ("hidden"))) + void + res_destroyservicelist() { + struct valuelist *slp, *slp_next; +@@ -981,6 +983,7 @@ + servicelist = (struct valuelist *)0; + } + ++__attribute__((visibility ("hidden"))) + void + res_buildprotolist() { + struct protoent *pp; +@@ -1010,6 +1013,7 @@ + endprotoent(); + } + ++__attribute__((visibility ("hidden"))) + void + res_destroyprotolist() { + struct valuelist *plp, *plp_next; +@@ -1047,6 +1051,7 @@ + /* + * Convert service name or (ascii) number to int. + */ ++__attribute__((visibility ("hidden"))) + int + res_servicenumber(const char *p) { + if (servicelist == (struct valuelist *)0) +@@ -1057,6 +1062,7 @@ + /* + * Convert protocol name or (ascii) number to int. + */ ++__attribute__((visibility ("hidden"))) + int + res_protocolnumber(const char *p) { + if (protolist == (struct valuelist *)0) +@@ -1115,6 +1121,7 @@ + return (0); + } + ++__attribute__((visibility ("hidden"))) + const char * + res_protocolname(int num) { + static char number[8]; +@@ -1130,6 +1137,7 @@ + return (pp->p_name); + } + ++__attribute__((visibility ("hidden"))) + const char * + res_servicename(u_int16_t port, const char *proto) { /* Host byte order. */ + static char number[8]; +--- dhcp-3.0.5/minires/res_findzonecut.c.libdhcp4client 2004-06-10 13:59:43.000000000 -0400 ++++ dhcp-3.0.5/minires/res_findzonecut.c 2007-01-29 17:02:32.000000000 -0500 +@@ -139,6 +139,7 @@ + * keep going. for the NS and A queries this means we just give up. + */ + ++__attribute__((visibility ("hidden"))) + isc_result_t + res_findzonecut(res_state statp, const char *dname, ns_class class, int opts, + char *zname, size_t zsize, struct in_addr *addrs, int naddrs, +--- dhcp-3.0.5/minires/res_send.c.libdhcp4client 2004-06-10 13:59:44.000000000 -0400 ++++ dhcp-3.0.5/minires/res_send.c 2007-01-29 17:02:32.000000000 -0500 +@@ -128,6 +128,7 @@ + * author: + * paul vixie, 29may94 + */ ++__attribute__((visibility ("hidden"))) + int + res_ourserver_p(const res_state statp, const struct sockaddr_in *inp) { + struct sockaddr_in ina; +@@ -158,6 +159,7 @@ + * author: + * paul vixie, 29may94 + */ ++__attribute__((visibility ("hidden"))) + int + res_nameinquery(const char *name, int type, int class, + const u_char *buf, const u_char *eom) +@@ -195,6 +197,7 @@ + * author: + * paul vixie, 29may94 + */ ++__attribute__((visibility ("hidden"))) + int + res_queriesmatch(const u_char *buf1, const u_char *eom1, + const u_char *buf2, const u_char *eom2) +@@ -233,6 +236,7 @@ + return (1); + } + ++__attribute__((visibility ("hidden"))) + isc_result_t + res_nsend(res_state statp, + double *buf, unsigned buflen, +@@ -832,6 +836,7 @@ + * + * This routine is not expected to be user visible. + */ ++__attribute__((visibility ("hidden"))) + void + res_nclose(res_state statp) { + if (statp->_sock >= 0) { +--- dhcp-3.0.5/minires/res_mkquery.c.libdhcp4client 2004-06-10 13:59:43.000000000 -0400 ++++ dhcp-3.0.5/minires/res_mkquery.c 2007-01-29 17:02:32.000000000 -0500 +@@ -96,6 +96,7 @@ + * Form all types of queries. + * Returns the size of the result or -1. + */ ++__attribute__((visibility ("hidden"))) + isc_result_t + res_nmkquery(res_state statp, + int op, /* opcode of query */ +--- dhcp-3.0.5/minires/res_sendsigned.c.libdhcp4client 2004-06-10 13:59:44.000000000 -0400 ++++ dhcp-3.0.5/minires/res_sendsigned.c 2007-01-29 17:02:32.000000000 -0500 +@@ -41,6 +41,7 @@ + #include + + /* res_nsendsigned */ ++__attribute__((visibility ("hidden"))) + isc_result_t + res_nsendsigned(res_state statp, + double *msg, unsigned msglen, ns_tsig_key *key, +--- dhcp-3.0.5/minires/res_init.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/minires/res_init.c 2007-01-29 17:02:32.000000000 -0500 +@@ -484,6 +484,7 @@ + } + #endif + ++__attribute__((visibility ("hidden"))) + u_int + res_randomid(void) { + struct timeval now; --- dhcp-3.0.5/omapip/alloc.c.libdhcp4client 2006-02-22 17:43:27.000000000 -0500 -+++ dhcp-3.0.5/omapip/alloc.c 2006-11-29 10:50:20.000000000 -0500 ++++ dhcp-3.0.5/omapip/alloc.c 2007-01-29 17:02:32.000000000 -0500 @@ -40,6 +40,41 @@ #include @@ -948,8 +1330,8 @@ } #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ ---- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2006-11-29 10:50:20.000000000 -0500 -+++ dhcp-3.0.5/omapip/dispatch.c 2006-11-29 10:50:20.000000000 -0500 +--- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/omapip/dispatch.c 2007-01-29 17:02:32.000000000 -0500 @@ -34,7 +34,7 @@ #include @@ -959,8 +1341,8 @@ TIME cur_time; OMAPI_OBJECT_ALLOC (omapi_io, ---- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2006-11-29 10:50:20.000000000 -0500 -+++ dhcp-3.0.5/omapip/errwarn.c 2006-11-29 10:50:20.000000000 -0500 +--- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 ++++ dhcp-3.0.5/omapip/errwarn.c 2007-01-29 17:02:32.000000000 -0500 @@ -39,6 +39,11 @@ #include #include @@ -1083,7 +1465,7 @@ } --- dhcp-3.0.5/configure.libdhcp4client 2004-09-10 17:02:30.000000000 -0400 -+++ dhcp-3.0.5/configure 2006-11-29 10:50:20.000000000 -0500 ++++ dhcp-3.0.5/configure 2007-01-29 17:02:32.000000000 -0500 @@ -246,7 +246,7 @@ fi @@ -1093,9 +1475,9 @@ fi for foo in $dirs; do ---- /dev/null 2006-11-25 13:38:58.174646239 -0500 -+++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2006-11-29 10:51:12.000000000 -0500 -@@ -0,0 +1,104 @@ +--- /dev/null 2007-01-28 13:50:40.723776703 -0500 ++++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2007-01-29 17:02:32.000000000 -0500 +@@ -0,0 +1,127 @@ +# Makefile.dist for libdhcp4client +# +# We get the libdhcp4client library from the patched ISC source code. We @@ -1106,23 +1488,45 @@ +# +# David Cantrell + -+PROGS = libdhcp4client.a libdhcp4client.so.1 -+HDRS = dhcp4client.h libdhcp_control.h -+SRCS = client_dhclient.c common_alloc.c common_discover.c dst_hmac_link.c \ -+ omapip_alloc.c omapip_errwarn.c common_tables.c common_options.c \ -+ common_dispatch.c common_tree.c omapip_hash.c omapip_dispatch.c \ -+ omapip_support.c omapip_trace.c common_ctrace.c common_print.c \ -+ common_socket.c common_inet.c omapip_auth.c omapip_buffer.c \ -+ omapip_connection.c omapip_generic.c omapip_array.c omapip_listener.c \ -+ omapip_message.c omapip_protocol.c omapip_toisc.c omapip_mrtrace.c \ -+ client_clparse.c common_memory.c omapip_convert.c common_parse.c \ -+ common_conflex.c common_bpf.c common_dlpi.c common_lpf.c common_nit.c \ -+ common_upf.c common_packet.c common_dns.c common_comapi.c \ -+ dst_dst_api.c dst_base64.c common_ethernet.c common_tr.c \ -+ dst_dst_support.c common_execute.c omapip_result.c omapip_handle.c \ -+ dst_prandom.c dst_md5_dgst.c ++# What version of ISC DHCP is this? ++VER = $(shell grep DHCP_VERSION ../../includes/version.h | head -1 | cut -d '"' -f 2 | cut -d 'V' -f 2 | cut -d '-' -f 1) ++ ++PROGS = libdhcp4client.a libdhcp4client-$(VER).so.0 ++ ++# NOTE: The ordering of these file lists is important! We are using the ++# whole program optimization features of gcc, so the order matters here. ++ ++# Source files shared by all objects ++COMMON_SRCS = client_clparse.c client_dhclient.c common_alloc.c common_bpf.c \ ++ common_comapi.c common_conflex.c common_discover.c \ ++ common_dispatch.c common_dns.c common_ethernet.c \ ++ common_execute.c common_inet.c common_lpf.c common_memory.c \ ++ common_options.c common_packet.c common_parse.c common_print.c \ ++ common_socket.c common_tables.c common_tr.c common_tree.c \ ++ dst_dst_api.c dst_base64.c dst_hmac_link.c dst_md5_dgst.c \ ++ omapip_alloc.c omapip_array.c omapip_auth.c omapip_buffer.c \ ++ omapip_connection.c omapip_convert.c omapip_dispatch.c \ ++ omapip_errwarn.c omapip_handle.c omapip_hash.c \ ++ omapip_listener.c omapip_mrtrace.c omapip_result.c \ ++ omapip_support.c omapip_toisc.c omapip_trace.c ++ ++# Source files for libdhcp4client.o ++CLIENT_SRCS = common_ctrace.c common_dlpi.c common_nit.c common_upf.c \ ++ dst_dst_support.c dst_prandom.c omapip_generic.c \ ++ omapip_message.c omapip_protocol.c ++ ++# Source files for libres.o (minires) ++MINIRES_SRCS = minires_ns_date.c minires_ns_name.c minires_ns_parse.c \ ++ minires_ns_samedomain.c minires_ns_sign.c minires_ns_verify.c \ ++ minires_res_comp.c minires_res_findzonecut.c \ ++ minires_res_init.c minires_res_mkquery.c \ ++ minires_res_mkupdate.c minires_res_query.c minires_res_send.c \ ++ minires_res_sendsigned.c minires_res_update.c ++ ++HDRS = dhcp4client.h libdhcp_control.h ++SRCS = $(COMMON_SRCS) $(CLIENT_SRCS) ++OBJS = $(SRCS:.c=.o) + -+OBJS = $(SRCS:.c=.o) +INCLUDES = -I$(TOP) -I$(TOP)/includes -I$(TOP)/dst -I. +CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) \ + -DCLIENT_PATH=${CLIENT_PATH} -DLIBDHCP -DUSE_MD5 @@ -1130,8 +1534,8 @@ +all: $(PROGS) + +install: all -+ install -p -m 0755 -D libdhcp4client.so.1 $(DESTDIR)$(LIBDIR)/libdhcp4client.so.1 -+ ln -sf libdhcp4client.so.1 $(DESTDIR)/$(LIBDIR)/libdhcp4client.so ++ install -p -m 0755 -D libdhcp4client-$(VER).so.0 $(DESTDIR)$(LIBDIR)/libdhcp4client-$(VER).so.0 ++ ln -sf libdhcp4client-$(VER).so.0 $(DESTDIR)/$(LIBDIR)/libdhcp4client.so + install -p -m 0644 -D libdhcp4client.a $(DESTDIR)$(LIBDIR)/libdhcp4client.a + install -p -m 0644 -D dhcp4client.h $(DESTDIR)$(INCDIR)/dhcp4client/dhcp4client.h + install -p -m 0644 -D libdhcp_control.h $(DESTDIR)$(INCDIR)/dhcp4client/libdhcp_control.h @@ -1190,18 +1594,19 @@ + ln ../minires/libres.a .; \ + $(AR) x libres.a + ++# Create the libraries +# minires/res_query.o contains an undefined symbol __h_errno_set, is not +# used by any dhcp code, and is optimized out by the linker when producing +# the dhclient executable or a shared library +libdhcp4client.a: $(OBJS) libres.a + $(AR) crus $@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o` + -+libdhcp4client.so.1: $(OBJS) libres.a ++libdhcp4client-$(VER).so.0: $(OBJS) libres.a + $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o` + +# Dependencies (semi-automatically-generated) ---- /dev/null 2006-11-25 13:38:58.174646239 -0500 -+++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2006-11-29 10:50:20.000000000 -0500 +--- /dev/null 2007-01-28 13:50:40.723776703 -0500 ++++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2007-01-29 17:02:32.000000000 -0500 @@ -0,0 +1,24 @@ +/* dhcp4client.h + * @@ -1227,8 +1632,8 @@ +extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp); + /* The ISC IPv4 DHCP client main() function . + */ ---- /dev/null 2006-11-25 13:38:58.174646239 -0500 -+++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2006-11-29 10:50:20.000000000 -0500 +--- /dev/null 2007-01-28 13:50:40.723776703 -0500 ++++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2007-01-29 17:02:32.000000000 -0500 @@ -0,0 +1,102 @@ +/* libdhcp_control.h + * @@ -1333,7 +1738,7 @@ + +#endif --- dhcp-3.0.5/Makefile.dist.libdhcp4client 2004-06-10 13:59:10.000000000 -0400 -+++ dhcp-3.0.5/Makefile.dist 2006-11-29 10:50:20.000000000 -0500 ++++ dhcp-3.0.5/Makefile.dist 2007-01-29 17:02:32.000000000 -0500 @@ -22,7 +22,7 @@ # http://www.isc.org/ Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- dhcp.spec 29 Nov 2006 15:55:39 -0000 1.128 +++ dhcp.spec 29 Jan 2007 22:19:06 -0000 1.129 @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -19,7 +19,6 @@ Source3: dhcrelay.init Source4: dhcpd.conf Source5: libdhcp4client.pc -Source6: dhcptables.pl Patch0: dhcp-3.0.5-extended-new-option-info.patch Patch1: dhcp-3.0.5-Makefile.patch @@ -32,9 +31,11 @@ Patch8: dhcp-3.0.5-omapip.patch Patch9: dhcp-3.0.5-minires.patch Patch10: dhcp-3.0.5-server.patch -Patch11: dhcp-3.0.5-libdhcp4client.patch -Patch12: dhcp-3.0.5-timeouts.patch -Patch13: dhcp-3.0.5-fix-warnings.patch +Patch11: dhcp-3.0.5-timeouts.patch +Patch12: dhcp-3.0.5-fix-warnings.patch + +# adds libdhcp4client to the ISC code base +Patch50: dhcp-3.0.5-libdhcp4client.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires(post): chkconfig, coreutils @@ -134,14 +135,14 @@ # Patches for the server/ subdirectory %patch10 -p1 -b .server -# Add the libdhcp4client target (library version of dhclient) -%patch11 -p1 -b .libdhcp4client - # Fix up timeout handling in dhclient and libdhcp4client -%patch12 -p1 -b .timeouts +%patch11 -p1 -b .timeouts # Fix up anything that fails -Wall -Werror -%patch13 -p1 -b .warnings +%patch12 -p1 -b .warnings + +# Add the libdhcp4client target (library version of dhclient) +%patch50 -p1 -b .libdhcp4client %build cp %SOURCE1 . @@ -159,6 +160,9 @@ #define _PATH_DHCLIENT_DB "%{_localstatedir}/lib/dhclient/dhclient.leases" EOF +# Enable extended option info patch and set fortify source to 0 so that we +# don't get inline functions that we don't want (for libdhcp4client) +RPM_OPT_FLAGS="$(echo $RPM_OPT_FLAGS | sed -e 's/_FORTIFY_SOURCE=[0-9]/_FORTIFY_SOURCE=0/g')" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Werror -Dlint -DEXTENDED_NEW_OPTION_INFO" # DO NOT use the %%configure macro because this configure script is not autognu @@ -330,7 +334,7 @@ %files -n libdhcp4client %defattr(0755,root,root,0755) -%{_libdir}/libdhcp4client.so.* +%{_libdir}/libdhcp4client-%{version}.so.* %files -n libdhcp4client-devel %defattr(0644,root,root,0755) @@ -340,6 +344,12 @@ %{_libdir}/libdhcp4client.so %changelog +* Mon Jan 29 2007 David Cantrell - 12:3.0.5-9 +- Remove dhcptables.pl from the source package +- Mark libres.a symbols hidden (#198496) +- Set DT_SONAME on libdhcp4client to libdhcp4client-VERSION.so.0 +- Make function definition for dst_hmac_md5_init() match the prototype + * Wed Nov 29 2006 David Cantrell - 12:3.0.5-8 - Roll md5 patch in to libdhcp4client patch since it's related - Do not overwrite /etc/ntp/step-tickers (#217663) From fedora-cvs-commits at redhat.com Mon Jan 29 22:26:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:26:22 -0500 Subject: rpms/libdhcp/devel libdhcp.spec,1.40,1.41 Message-ID: <200701292226.l0TMQMqc023927@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/libdhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23913 Modified Files: libdhcp.spec Log Message: * Mon Jan 29 2007 David Cantrell - 1.19-2 - Rebuild for new libdhcp4client Index: libdhcp.spec =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- libdhcp.spec 12 Jan 2007 21:40:30 -0000 1.40 +++ libdhcp.spec 29 Jan 2007 22:26:20 -0000 1.41 @@ -1,7 +1,7 @@ Summary: A library for network interface configuration with DHCP Name: libdhcp Version: 1.19 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Development/Libraries URL: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2 @@ -60,6 +60,9 @@ %doc examples/ %changelog +* Mon Jan 29 2007 David Cantrell - 1.19-2 +- Rebuild for new libdhcp4client + * Fri Jan 12 2007 David Cantrell - 1.19-1 - Catch return value of asprintf() in ifxDHCPv6() and ifxDHCPv4() From fedora-cvs-commits at redhat.com Mon Jan 29 22:31:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:31:48 -0500 Subject: rpms/mkinitrd/devel mkinitrd.spec,1.188,1.189 Message-ID: <200701292231.l0TMVmtf005128@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5084 Modified Files: mkinitrd.spec Log Message: * Mon Jan 29 2007 David Cantrell - 6.0.6-3 - Rebuild for new libdhcp4client Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- mkinitrd.spec 16 Jan 2007 14:43:21 -0000 1.188 +++ mkinitrd.spec 29 Jan 2007 22:31:46 -0000 1.189 @@ -3,7 +3,7 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd Version: 6.0.6 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source0: mkinitrd-%{version}.tar.bz2 @@ -108,6 +108,9 @@ %{_libdir}/libbdevid.so.* %changelog +* Mon Jan 29 2007 David Cantrell - 6.0.6-3 +- Rebuild for new libdhcp4client + * Tue Jan 16 2007 Jesse Keating - 6.0.6-2 - rebuild for new parted From fedora-cvs-commits at redhat.com Mon Jan 29 22:33:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:33:17 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2898,1.2899 Message-ID: <200701292233.l0TMXHRR006254@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5965 Modified Files: kernel-2.6.spec Log Message: * Mon Jan 29 2007 Dave Jones - Fix attr2 corruption with btree data extents Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2898 retrieving revision 1.2899 diff -u -r1.2898 -r1.2899 --- kernel-2.6.spec 22 Jan 2007 23:08:26 -0000 1.2898 +++ kernel-2.6.spec 29 Jan 2007 22:33:15 -0000 1.2899 @@ -431,6 +431,7 @@ Patch1601: linux-2.6-sha_alignment.patch Patch1650: linux-2.6-serial-460800.patch Patch1681: linux-2.6-xfs-umount-fix.patch +Patch1682: linux-2.6-xfs_attr2.patch Patch1690: linux-2.6-PT_LOAD-align.patch Patch1720: linux-2.6-proc-self-maps-fix.patch Patch1731: linux-2.6-cpufreq-unload-smi.patch @@ -986,6 +987,8 @@ %patch1650 -p1 # Fix XFS umount bug. %patch1681 -p1 +# Fix attr2 corruption with btree data extents +%patch1682 -p1 # Align kernel data segment to page boundary. %patch1690 -p1 # setuid /proc/self/maps fix. @@ -2014,6 +2017,9 @@ %endif %changelog +* Mon Jan 29 2007 Dave Jones +- Fix attr2 corruption with btree data extents + * Tue Jan 23 2007 Juan Quintela - update xen kernel patch * pvfb is now included in it. From fedora-cvs-commits at redhat.com Mon Jan 29 22:34:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:34:32 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.402,1.403 Message-ID: <200701292234.l0TMYWTF007187@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6303 Modified Files: eclipse.spec Log Message: * Mon Jan 29 2007 Ben Konrath 3.2.1-33 - Check for features directory in sdk postun script. - Resolves: #224588. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.402 retrieving revision 1.403 diff -u -r1.402 -r1.403 --- eclipse.spec 27 Jan 2007 05:51:29 -0000 1.402 +++ eclipse.spec 29 Jan 2007 22:34:29 -0000 1.403 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 32%{?dist} +Release: 33%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1380,7 +1380,11 @@ # Only set the product back to platform.ide if the sdk is actually removed for # this arch. This SDKDIR check is to deal with the ordering of new %%post # before old %%postun -SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_") +if [ -d /usr/lib/eclipse/features]; then + SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_") +else + SDKDIR="" +fi if [ -z "$SDKDIR" -a -f %{_libdir}/%{name}/configuration/config.ini ]; then sed --in-place "s/[#]*eclipse.product=.*/eclipse.product=org.eclipse.platform.ide/" \ %{_libdir}/%{name}/configuration/config.ini @@ -1728,6 +1732,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Mon Jan 29 2007 Ben Konrath 3.2.1-33 +- Check for features directory in sdk postun script. +- Resolves: #224588. + * Fri Jan 26 2007 Ben Konrath 3.2.1-32 - Fix bug in ecj [] patch. From fedora-cvs-commits at redhat.com Mon Jan 29 22:44:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:44:00 -0500 Subject: rpms/pkgconfig/devel pkg-config-0.21-compat-loop.patch, NONE, 1.1 pkgconfig.spec, 1.36, 1.37 Message-ID: <200701292244.l0TMi00F014118@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/pkgconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13982 Modified Files: pkgconfig.spec Added Files: pkg-config-0.21-compat-loop.patch Log Message: Fix an infinite loop pkg-config-0.21-compat-loop.patch: parse.c | 56 +------------------------------------------------------- 1 files changed, 1 insertion(+), 55 deletions(-) --- NEW FILE pkg-config-0.21-compat-loop.patch --- --- pkg-config-0.21/parse.c.compat-loop 2007-01-29 16:31:15.000000000 -0500 +++ pkg-config-0.21/parse.c 2007-01-29 16:32:08.000000000 -0500 @@ -1186,61 +1186,7 @@ pkg->path_position = G_MAXINT; - if (strcmp (name, "glib") == 0) - { - char *output; - - debug_spew ("Calling glib-config\n"); - - pkg->version = backticks ("glib-config --version"); - if (pkg->version == NULL) - { - g_free (pkg); - return NULL; - } - - pkg->name = g_strdup ("GLib"); - pkg->key = g_strdup ("glib"); - pkg->description = g_strdup ("C Utility Library"); - - output = backticks ("glib-config --libs"); - parse_libs (pkg, output, "glib-config"); - g_free (output); - - output = backticks ("glib-config --cflags"); - parse_cflags (pkg, output, "glib-config"); - g_free (output); - - return pkg; - } - else if (strcmp (name, "gtk+") == 0) - { - char *output; - - debug_spew ("Calling gtk-config\n"); - - pkg->version = backticks ("gtk-config --version"); - if (pkg->version == NULL) - { - g_free (pkg); - return NULL; - } - - pkg->name = g_strdup ("GTK+"); - pkg->key = g_strdup ("gtk+"); - pkg->description = g_strdup ("GIMP Tool Kit"); - - output = backticks ("gtk-config --libs"); - parse_libs (pkg, output, "gtk-config"); - g_free (output); - - output = backticks ("gtk-config --cflags"); - parse_cflags (pkg, output, "gtk-config"); - g_free (output); - - return pkg; - } - else if (strcmp (name, "libgnomevfs") == 0) + if (strcmp (name, "libgnomevfs") == 0) { char *output; Index: pkgconfig.spec =================================================================== RCS file: /cvs/dist/rpms/pkgconfig/devel/pkgconfig.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- pkgconfig.spec 8 Dec 2006 04:43:30 -0000 1.36 +++ pkgconfig.spec 29 Jan 2007 22:43:58 -0000 1.37 @@ -1,7 +1,7 @@ Summary: A tool for determining compilation options Name: pkgconfig Version: 0.21 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL URL: http://pkgconfig.freedesktop.org @@ -9,6 +9,7 @@ Source: http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=2661 Patch1: pkgconfig-0.15.0-reqprov.patch +Patch2: pkg-config-0.21-compat-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,6 +20,7 @@ %prep %setup -n pkg-config-%{version} -q %patch1 -p1 -b .reqprov +%patch2 -p1 -b .compat-loop %build %configure --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig @@ -44,6 +46,10 @@ %{_datadir}/aclocal/* %changelog +* Mon Jan 29 2007 Matthias Clasen - 1:0.21-3 +- Fix a problem where calling glib-config can lead + to an infinite loop + * Thu Dec 7 2006 Matthias Clasen - 1:0.21-2 - Small spec file cleanups From fedora-cvs-commits at redhat.com Mon Jan 29 22:59:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 17:59:15 -0500 Subject: rpms/xorg-x11-server/FC-6 xserver-1.2.0-xephyr-keysym-madness.patch, NONE, 1.1 xorg-x11-server.spec, 1.185, 1.186 Message-ID: <200701292259.l0TMxFFD013505@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13460 Modified Files: xorg-x11-server.spec Added Files: xserver-1.2.0-xephyr-keysym-madness.patch Log Message: * Mon Jan 29 2007 Adam Jackson 1.1.1-47.5.fc6 - Fix Xephyr keysym init on LP64. (#224311) xserver-1.2.0-xephyr-keysym-madness.patch: hostx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE xserver-1.2.0-xephyr-keysym-madness.patch --- --- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx 2006-07-05 14:31:39.000000000 -0400 +++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c 2007-01-29 17:56:34.000000000 -0500 @@ -77,9 +77,10 @@ static int HostXWantDamageDebug = 0; -extern KeySym EphyrKeymap[]; +/* these two need to be 32-bits. do not say KeySym, that way lies madness */ +extern unsigned int EphyrKeymap[]; +extern unsigned int kdKeymap[]; -extern KeySym kdKeymap[]; extern int kdMinScanCode; extern int kdMaxScanCode; extern int kdMinKeyCode; @@ -668,7 +669,7 @@ void hostx_load_keymap(void) { - KeySym *keymap; + unsigned int *keymap; int mapWidth, min_keycode, max_keycode; int i,j; Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/FC-6/xorg-x11-server.spec,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- xorg-x11-server.spec 9 Jan 2007 22:54:00 -0000 1.185 +++ xorg-x11-server.spec 29 Jan 2007 22:59:12 -0000 1.186 @@ -3,7 +3,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.1.1 -Release: 47.4%{?dist} +Release: 47.5%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -27,6 +27,7 @@ Patch11: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch Patch12: xorg-x11-server-1.1.1-graphics-expose.patch Patch13: xorg-x11-server-1.1.1-xkb-vidmode-switch.patch +Patch14: xserver-1.2.0-xephyr-keysym-madness.patch # http://xorg.freedesktop.org/releases/X11R7.1/patches/xorg-xserver-1.1.0-dbe-render.diff Patch50: xorg-xserver-1.1.0-dbe-render.diff @@ -357,6 +358,7 @@ %patch11 -p1 -b .vt-activate %patch12 -p1 -b .graphics-expose %patch13 -p1 -b .xkb-vidmode-switch +%patch14 -p1 -b .xephyr-keysym %patch50 -p1 -b .alloca @@ -735,6 +737,9 @@ # ------------------------------------------------------------------- %changelog +* Mon Jan 29 2007 Adam Jackson 1.1.1-47.5.fc6 +- Fix Xephyr keysym init on LP64. (#224311) + * Tue Jan 09 2007 Adam Jackson 1.1.1-47.4.fc6 - xorg-xserver-1.1.0-dbe-render.diff: CVE #2006-6101. From fedora-cvs-commits at redhat.com Mon Jan 29 23:01:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 18:01:37 -0500 Subject: rpms/xorg-x11-server/devel xserver-1.2.0-geode-mmx.patch, NONE, 1.1 xserver-1.2.0-xephyr-keysym-madness.patch, NONE, 1.1 xorg-x11-server.spec, 1.199, 1.200 Message-ID: <200701292301.l0TN1b0R014893@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14848 Modified Files: xorg-x11-server.spec Added Files: xserver-1.2.0-geode-mmx.patch xserver-1.2.0-xephyr-keysym-madness.patch Log Message: * Wed Jan 24 2007 Adam Jackson 1.2.0-2 - Delete ModulePath lines rather than attempt to munge them. (#186338) xserver-1.2.0-geode-mmx.patch: fbpict.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE xserver-1.2.0-geode-mmx.patch --- --- a/fb/fbpict.c +++ a/fb/fbpict.c @@ -1516,7 +1516,9 @@ static unsigned int detectCPUFeatures(void) { features |= SSE; if (result & (1 << 26)) features |= SSE2; - if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) { + if ((features & MMX) && !(features & SSE) && + (strcmp(vendor, "AuthenticAMD") == 0 || + strcmp(vendor, "Geode by NSC") == 0)) { /* check for AMD MMX extensions */ unsigned int result; xserver-1.2.0-xephyr-keysym-madness.patch: hostx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE xserver-1.2.0-xephyr-keysym-madness.patch --- --- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx 2006-07-05 14:31:39.000000000 -0400 +++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c 2007-01-29 17:56:34.000000000 -0500 @@ -77,9 +77,10 @@ static int HostXWantDamageDebug = 0; -extern KeySym EphyrKeymap[]; +/* these two need to be 32-bits. do not say KeySym, that way lies madness */ +extern unsigned int EphyrKeymap[]; +extern unsigned int kdKeymap[]; -extern KeySym kdKeymap[]; extern int kdMinScanCode; extern int kdMaxScanCode; extern int kdMinKeyCode; @@ -668,7 +669,7 @@ void hostx_load_keymap(void) { - KeySym *keymap; + unsigned int *keymap; int mapWidth, min_keycode, max_keycode; int i,j; Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- xorg-x11-server.spec 24 Jan 2007 22:51:48 -0000 1.199 +++ xorg-x11-server.spec 29 Jan 2007 23:01:28 -0000 1.200 @@ -8,7 +8,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -45,8 +45,10 @@ Patch1006: xorg-x11-server-1.1.1-no-scanpci.patch Patch1007: xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch Patch1008: xorg-x11-server-1.2.0-xf86config-comment-less.patch +Patch1009: xorg-x11-server-1.2.0-maxpixclock-option.patch -Patch3001: xorg-x11-server-1.2.0-maxpixclock-option.patch +Patch2001: xserver-1.2.0-geode-mmx.patch +Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -323,7 +325,10 @@ %patch1006 -p1 -b .no-scanpci %patch1007 -p1 -b .xf1bpp %patch1008 -p1 -b .comment-less -%patch3001 -p1 -b .maxpixclock +%patch1009 -p1 -b .maxpixclock + +%patch2001 -p1 -b .geode-mmx +%patch2002 -p1 -b .xephyr-keysym %build #FONTDIR="${datadir}/X11/fonts" @@ -632,6 +637,10 @@ # ------------------------------------------------------------------- %changelog +* Mon Jan 29 2007 Adam Jackson 1.2.0-3 +- Fix MMX check on AMD CPUs. (#222332) +- Fix Xephyr keysym init on LP64. (#224311) + * Wed Jan 24 2007 Adam Jackson 1.2.0-2 - Delete ModulePath lines rather than attempt to munge them. (#186338) From fedora-cvs-commits at redhat.com Mon Jan 29 23:07:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 18:07:42 -0500 Subject: rpms/xorg-x11-server/devel xserver-1.2.0-xephyr-keysym-madness.patch, 1.1, 1.2 Message-ID: <200701292307.l0TN7gQl018442@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18360 Modified Files: xserver-1.2.0-xephyr-keysym-madness.patch Log Message: * Wed Jan 24 2007 Adam Jackson 1.2.0-2 - Delete ModulePath lines rather than attempt to munge them. (#186338) xserver-1.2.0-xephyr-keysym-madness.patch: hostx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: xserver-1.2.0-xephyr-keysym-madness.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xserver-1.2.0-xephyr-keysym-madness.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xserver-1.2.0-xephyr-keysym-madness.patch 29 Jan 2007 23:01:28 -0000 1.1 +++ xserver-1.2.0-xephyr-keysym-madness.patch 29 Jan 2007 23:07:35 -0000 1.2 @@ -1,5 +1,5 @@ ---- xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c.jx 2006-07-05 14:31:39.000000000 -0400 -+++ xorg-server-1.1.1/hw/kdrive/ephyr/hostx.c 2007-01-29 17:56:34.000000000 -0500 +--- xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c.xephyr-keysym 2007-01-22 22:13:14.000000000 -0500 ++++ xorg-server-1.2.0/hw/kdrive/ephyr/hostx.c 2007-01-29 17:58:00.000000000 -0500 @@ -77,9 +77,10 @@ static int HostXWantDamageDebug = 0; @@ -13,12 +13,12 @@ extern int kdMinScanCode; extern int kdMaxScanCode; extern int kdMinKeyCode; -@@ -668,7 +669,7 @@ +@@ -662,7 +663,7 @@ void hostx_load_keymap(void) { - KeySym *keymap; -+ unsigned int *keymap; - int mapWidth, min_keycode, max_keycode; ++ unsigned int *keymap; + int host_width, min_keycode, max_keycode, width; int i,j; From fedora-cvs-commits at redhat.com Mon Jan 29 23:28:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 18:28:34 -0500 Subject: rpms/gstreamer-plugins-good/FC-6 gstreamer-plugins-good.spec, 1.21, 1.22 Message-ID: <200701292328.l0TNSYkj018726@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/gstreamer-plugins-good/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18686 Modified Files: gstreamer-plugins-good.spec Log Message: * Mon Jan 29 2007 Adam Jackson 0.10.4-3 - Re-add the gdk-pixbuf loader. (#222837) Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/FC-6/gstreamer-plugins-good.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gstreamer-plugins-good.spec 18 Oct 2006 20:49:00 -0000 1.21 +++ gstreamer-plugins-good.spec 29 Jan 2007 23:28:31 -0000 1.22 @@ -6,7 +6,7 @@ Name: %{gstreamer}-plugins-good Version: 0.10.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer plug-ins with good code and licensing Group: Applications/Multimedia @@ -39,6 +39,7 @@ BuildRequires: mikmod BuildRequires: glibc-devel BuildRequires: speex-devel +BuildRequires: gtk2-devel %ifnarch s390 s390x BuildRequires: libdv-devel @@ -106,7 +107,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so %find_lang gst-plugins-good-%{majorminor} @@ -156,6 +156,7 @@ %{_libdir}/gstreamer-%{majorminor}/libgstcairo.so %{_libdir}/gstreamer-%{majorminor}/libgstesd.so %{_libdir}/gstreamer-%{majorminor}/libgstflac.so +%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so %{_libdir}/gstreamer-%{majorminor}/libgsthalelements.so %{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so # %{_libdir}/gstreamer-%{majorminor}/libgstmikmod.so @@ -198,6 +199,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || : %changelog +* Mon Jan 29 2007 Adam Jackson 0.10.4-3 +- Re-add the gdk-pixbuf loader. (#222837) + * Wed Oct 18 2006 Matthias Clasen - 0.10.4-2 - Fix scripts according to the packaging guidelines From fedora-cvs-commits at redhat.com Mon Jan 29 23:46:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 18:46:50 -0500 Subject: rpms/mcstrans/devel mcstrans.spec,1.23,1.24 Message-ID: <200701292346.l0TNkox6024166@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/mcstrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24152 Modified Files: mcstrans.spec Log Message: * Mon Jan 29 2007 Dan Walsh 0.1.10-2 - Cleanup memory when complete Index: mcstrans.spec =================================================================== RCS file: /cvs/dist/rpms/mcstrans/devel/mcstrans.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mcstrans.spec 4 Dec 2006 14:32:17 -0000 1.23 +++ mcstrans.spec 29 Jan 2007 23:46:47 -0000 1.24 @@ -1,10 +1,11 @@ Summary: SELinux Translation Daemon Name: mcstrans Version: 0.1.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons Source: http://fedora.redhat.com/projects/%{name}-%{version}.tgz +Patch: mcstrans-0.1.10-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.30.3-1 BuildRequires: libcap-devel @@ -30,6 +31,7 @@ %prep %setup -q +%patch -p1 -b .cleanup %build make clean @@ -70,6 +72,9 @@ %{_sysconfdir}/rc.d/init.d/mcstrans %changelog +* Mon Jan 29 2007 Dan Walsh 0.1.10-2 +- Cleanup memory when complete + * Mon Dec 4 2006 Dan Walsh 0.1.10-1 - Fix Memory Leak Resolves: #218173 From fedora-cvs-commits at redhat.com Tue Jan 30 00:07:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 19:07:18 -0500 Subject: rpms/xorg-x11-drv-savage/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-savage.spec, 1.16, 1.17 Message-ID: <200701300007.l0U07IAc012986@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-drv-savage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12959/devel Modified Files: .cvsignore sources xorg-x11-drv-savage.spec Log Message: auto-import xorg-x11-drv-savage-2.1.2-1.fc7 on branch devel from xorg-x11-drv-savage-2.1.2-1.fc7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 10 Apr 2006 03:24:45 -0000 1.7 +++ .cvsignore 30 Jan 2007 00:07:15 -0000 1.8 @@ -1 +1 @@ -xf86-video-savage-2.1.1.tar.bz2 +xf86-video-savage-2.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 10 Apr 2006 03:24:45 -0000 1.7 +++ sources 30 Jan 2007 00:07:15 -0000 1.8 @@ -1 +1 @@ -6e2c7da49d311f3e9fbf12e5ba527222 xf86-video-savage-2.1.1.tar.bz2 +6367e921a98f6a7fec9d0a9bc5ff0a47 xf86-video-savage-2.1.2.tar.bz2 Index: xorg-x11-drv-savage.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-savage/devel/xorg-x11-drv-savage.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-drv-savage.spec 25 Jul 2006 03:21:22 -0000 1.16 +++ xorg-x11-drv-savage.spec 30 Jan 2007 00:07:15 -0000 1.17 @@ -12,8 +12,8 @@ Summary: Xorg X11 savage video driver Name: xorg-x11-drv-savage -Version: 2.1.1 -Release: 5%{?dist} +Version: 2.1.2 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -40,7 +40,7 @@ %prep %setup -q -n %{tarball}-%{version} -%patch0 -p0 -b .savage-disable-dri-bug196011 +#%patch0 -p0 -b .savage-disable-dri-bug196011 %build %configure --disable-static \ @@ -76,6 +76,9 @@ %{_mandir}/man4/savage.4* %changelog +* Mon Jan 29 2007 Adam Jackson 2.1.2-1 +- Update to 2.1.2 + * Mon Jul 24 2006 Mike A. Harris 2.1.1-5.fc6 - Added savage-disable-dri-bug196011.patch to disable DRI by default on various Savage chipsets reported in bug (#196011) and (fdo#6357) From fedora-cvs-commits at redhat.com Tue Jan 30 00:09:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 19:09:16 -0500 Subject: rpms/eclipse/FC-6 eclipse-build.patch, 1.3, 1.4 eclipse-ecj-square-bracket-classpath.patch, 1.1, 1.2 eclipse-pde.build-add-package-build.patch, 1.1, 1.2 eclipse-tomcat55-build.patch, 1.12, 1.13 eclipse.spec, 1.348, 1.349 eclipse-16.gif, 1.1, NONE eclipse-48.png, 1.2, NONE eclipse-buildDocPlugins.patch, 1.1, NONE eclipse-compare-create-api.patch, 1.2, NONE eclipse-gnuformatterjdt.patch, 1.1, NONE eclipse-gnuformatterjdtui.patch, 1.2, NONE eclipse-libswt-enableallandO2.patch, 1.3, NONE eclipse-libswt-xpcomgcc4.patch, 1.1, NONE Message-ID: <200701300009.l0U09GSv013084@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13064 Modified Files: eclipse-build.patch eclipse-ecj-square-bracket-classpath.patch eclipse-pde.build-add-package-build.patch eclipse-tomcat55-build.patch eclipse.spec Removed Files: eclipse-16.gif eclipse-48.png eclipse-buildDocPlugins.patch eclipse-compare-create-api.patch eclipse-gnuformatterjdt.patch eclipse-gnuformatterjdtui.patch eclipse-libswt-enableallandO2.patch eclipse-libswt-xpcomgcc4.patch Log Message: * Mon Jan 29 2007 Ben Konrath 3.2.1-24.fc6 - Check for features directory in sdk postun script. - Fix bug in ecj [] patch. - Add bugzilla reference to remove jars bug in comment. - Update bugzilla refereces to [] bugs. - Fix %%postun problem in the sdk sub-package. - Rpmlint cleanups. - Use sed instead of patch for tomcat version. - Add BuildRequires desktop-file-utils. - Add %%{_libdir}/eclipse dir to files list of libswt-gtk2. - Specfile cleanups from review with Andrew Overholt. - Resolves: #224588, #211008, #225329. eclipse-build.patch: build.xml | 16 ++++++++++++++-- eclipse/buildConfigs/sdk/srcBuild/build.xml | 0 2 files changed, 14 insertions(+), 2 deletions(-) Index: eclipse-build.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-build.patch 2 Jun 2006 21:46:06 -0000 1.3 +++ eclipse-build.patch 30 Jan 2007 00:09:14 -0000 1.4 @@ -5,16 +5,13 @@ diff -u -r1.9 build.xml --- build.xml 11 May 2006 20:51:39 -0000 1.9 +++ build.xml 26 May 2006 23:06:38 -0000 -@@ -95,6 +95,21 @@ +@@ -95,6 +95,18 @@ + + + -+ -+ -+ + + + @@ -27,7 +24,7 @@ -@@ -265,8 +280,8 @@ +@@ -265,8 +277,8 @@ eclipse-ecj-square-bracket-classpath.patch: Main.java | 101 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 35 deletions(-) Index: eclipse-ecj-square-bracket-classpath.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-ecj-square-bracket-classpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-ecj-square-bracket-classpath.patch 8 Nov 2006 21:48:55 -0000 1.1 +++ eclipse-ecj-square-bracket-classpath.patch 30 Jan 2007 00:09:14 -0000 1.2 @@ -1,12 +1,10 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.jdt.core Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v retrieving revision 1.254.4.1 diff -u -r1.254.4.1 Main.java --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2 Jul 2006 10:11:58 -0000 1.254.4.1 -+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Oct 2006 21:45:05 -0000 ++++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 19 Jan 2007 19:22:57 -0000 @@ -28,9 +28,11 @@ import java.text.MessageFormat; import java.util.ArrayList; @@ -40,7 +38,7 @@ import org.eclipse.jdt.internal.compiler.util.Util; public class Main implements ProblemSeverities, SuffixConstants { -@@ -2989,56 +2991,73 @@ +@@ -2989,56 +2991,74 @@ ArrayList currentRuleSpecs = new ArrayList(defaultSize); StringTokenizer tokenizer = new StringTokenizer(currentPath, File.pathSeparator + "[]", true); //$NON-NLS-1$ @@ -90,6 +88,7 @@ - case readyToCloseEndingWithRules: case readyToCloseOrOtherEntry: - state = readyToCloseOrOtherEntry; ++ Collections.reverse(currentRuleSpecs); addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); currentRuleSpecs.clear(); + state = readyForPathOrRules; @@ -139,7 +138,7 @@ state = error; } -@@ -3046,24 +3065,25 @@ +@@ -3046,24 +3066,26 @@ // regular word switch (state) { case start: @@ -170,10 +169,11 @@ - case readyToCloseOrOtherEntry : + case readyForPathOrRules: + case readyToCloseOrOtherEntry: ++ Collections.reverse(currentRuleSpecs); addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); break; default : -@@ -3071,4 +3091,13 @@ +@@ -3071,4 +3093,13 @@ this.logger.logIncorrectClasspath(currentPath); } } eclipse-pde.build-add-package-build.patch: build.properties | 12 +++ customTargets-assemble-target.xml | 12 +++ customTargets.xml | 144 ++++++++++++++++++++++++++++++++++++++ prepare-build-dir.sh | 83 +++++++++++++++++++++ 4 files changed, 251 insertions(+) Index: eclipse-pde.build-add-package-build.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-pde.build-add-package-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-pde.build-add-package-build.patch 2 Jun 2006 21:46:07 -0000 1.1 +++ eclipse-pde.build-add-package-build.patch 30 Jan 2007 00:09:14 -0000 1.2 @@ -16,7 +16,7 @@ +javacDebugInfo=true +archiveName=${id}.zip +runPackager=false -+baseLocation=@eclipse_base@ ++baseLocation=/usr/share/eclipse Index: templates/package-build/customTargets-assemble-target.xml =================================================================== RCS file: templates/package-build/customTargets-assemble-target.xml eclipse-tomcat55-build.patch: build.xml | 94 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 50 insertions(+), 44 deletions(-) Index: eclipse-tomcat55-build.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-tomcat55-build.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- eclipse-tomcat55-build.patch 10 Aug 2006 19:27:15 -0000 1.12 +++ eclipse-tomcat55-build.patch 30 Jan 2007 00:09:14 -0000 1.13 @@ -1,14 +1,5 @@ --- build.xml.orig 2006-07-05 12:47:26.000000000 -0400 +++ build.xml 2006-07-05 12:50:49.000000000 -0400 -@@ -58,7 +58,7 @@ - - - -- -+ - - - @@ -144,50 +144,56 @@ @@ -110,61 +101,3 @@ -@@ -224,37 +230,37 @@ - - - -- -- -+ -+ - - -- -+ - - -- -+ - - - - - - -- -- -- -+ -+ -+ - - - - - -- -- -+ -+ - - - - - -- -- -+ -+ - - - -@@ -277,7 +283,7 @@ - - - -- -+ - - - Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- eclipse.spec 28 Nov 2006 20:05:45 -0000 1.348 +++ eclipse.spec 30 Jan 2007 00:09:14 -0000 1.349 @@ -1,22 +1,15 @@ -# TODO: -# - migrate compare API patch (patch33) to 3.2 final -# - migrate cairo patch (patch43) to 3.2 final -# - migrate GNU formatter patches (patch20, patch21) to 3.2 final -# - comment on this bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=126648 - -Epoch: 1 - -%define gcj_support 1 -%define tomcatsharedir %{_datadir}/tomcat5 -%define tomcatlibdir %{_var}/lib/tomcat5 -%define section free +Epoch: 1 + +%define gcj_support 1 +%define tomcatsharedir %{_datadir}/tomcat5 +%define tomcatlibdir %{_var}/lib/tomcat5 %define eclipse_major 3 %define eclipse_minor 2 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_micro 1 %define libname libswt3 -# All arches line up except i386 -> x86 +# All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} %define eclipse_arch x86 %else @@ -26,108 +19,100 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 23%{?dist} -License: EPL +Release: 24%{?dist} +License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-sourceBuild-srcIncluded-3.2.1.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-sourceBuild-srcIncluded-3.2.1.zip Source2: %{name}.desktop -Source5: %{name}-48.png -# FIXME: this should be in its own package -Source7: ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar -Source11: %{name}-fedora-splash-3.2.1.png +# The icu4j bits will be moved out into their own package for Fedora 7. See: +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199504 +Source7: ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar +Source11: %{name}-fedora-splash-3.2.1.png Source16: %{name}-copy-platform.sh Source17: efj.sh.in -Source18: ecj.sh.in -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 +Source18: ecj.sh.in +# This file contains the types of files we'd like to extract from the jars +# when using the FileInitializer Source19: %{name}-filenamepatterns.txt # cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer # tar cjf eclipse-fileinitializerapp.tar.bz2 equinox-incubator/ # (generated 2006-11-01 18:48 UTC) Source20: %{name}-fileinitializerapp.tar.bz2 - -# Build libswt-mozilla and libswt-cairo and use O2 -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 -Patch0: %{name}-libswt-enableallandO2.patch -# Build JNI libs -# FIXME: these should be built by upstream build method -# http://www.bagu.org/eclipse/plugin-source-drops.html -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848 -# GNU XML issue identified by Michael Koch -Patch2: %{name}-build.patch -Patch3: %{name}-icu4j-build-files.patch -Patch4: %{name}-libupdatebuild.patch -Patch5: %{name}-libupdatebuild2.patch +# Build liblocalfile and libupdate JNI libs in the main SDK build.xml +Patch0: %{name}-build.patch +# We need this because icu4j's Eclipse bits are dependent upon Eclipse +# but we don't want the icu4j RPM needing Eclipse to build +Patch1: %{name}-icu4j-build-files.patch +# These two patches need to go upstream +Patch2: %{name}-libupdatebuild.patch +Patch3: %{name}-libupdatebuild2.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 -Patch18: %{name}-swttools.patch -# GNU-style JDT formatter -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770 -#Patch20: %{name}-gnuformatterjdt.patch -#Patch21: %{name}-gnuformatterjdtui.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001 -Patch38: %{name}-helpindexbuilder.patch -Patch40: %{name}-usebuiltlauncher.patch -## Build cairo native libs -#Patch43: %{name}-libswt-cairo1.0-3.patch -Patch46: %{name}-libswt-xpcomgcc4.patch -Patch47: %{name}-launcher-set-install-dir-and-shared-config.patch +Patch4: %{name}-swttools.patch +# This is fixed post-3.3M1 +Patch10: %{name}-helpindexbuilder.patch +# This needs to go upstream +Patch11: %{name}-usebuiltlauncher.patch +# This does two things: +# 1. allows the launcher to be in /usr/bin and +# 2. ensures that the OSGi configuration directory +# (which contains the JNI .sos) is in %{_libdir} +# We should investigate whether or not this can go upstream +Patch12: %{name}-launcher-set-install-dir-and-shared-config.patch # Don't attempt to link to Sun's javadocs -Patch48: %{name}-javadoclinks.patch +# FIXME: could use sed instead +Patch13: %{name}-javadoclinks.patch # Always generate debug info when building RPMs (Andrew Haley) -Patch49: %{name}-ecj-rpmdebuginfo.patch +# This needs to be investigated for getEnv changes +Patch14: %{name}-ecj-rpmdebuginfo.patch # generic releng plugins that can be used to build plugins -# see this thread for deails: +# see this thread for details: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html -Patch53: %{name}-pde.build-add-package-build.patch +# This needs to be submitted upstream +Patch15: %{name}-pde.build-add-package-build.patch # We need to disable junit4 and apt until GCJ can handle Java5 code -Patch55: %{name}-disable-junit4-apt.patch - -# These patches need to go upstream +Patch16: %{name}-disable-junit4-apt.patch +# This tomcat stuff will change when they move to the equinox jetty provider # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 -Patch28: %{name}-tomcat55.patch -Patch29: %{name}-tomcat55-build.patch -Patch31: %{name}-webapp-tomcat55.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726 -Patch33: %{name}-compare-create-api.patch +Patch6: %{name}-tomcat55.patch +Patch7: %{name}-tomcat55-build.patch +Patch8: %{name}-webapp-tomcat55.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 -Patch22: %{name}-updatehomedir.patch -# JPackage []s in names of symlinks ... -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177 -Patch34: %{name}-ecj-square-bracket-classpath.patch +Patch5: %{name}-updatehomedir.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=161996 +Patch9: %{name}-ecj-square-bracket-classpath.patch # Use ecj for gcj -Patch57: %{name}-ecj-gcj.patch +# The patch to Main.java can go away with 3.2.2. +Patch17: %{name}-ecj-gcj.patch # Build against firefox: # - fix swt profile include path # - don't compile the mozilla 1.7 / firefox profile library -- build it inline # - don't use symbols not in our firefox builds -# FIXME: add reference(s) to discussion(s) and bug(s) +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=161310 +# FIXME: these can probably go away >= 3.3M4 # Note: I made this patch from within Eclipse and then did the following to # it due to spaces in the paths: # sed --in-place "s/Eclipse\ SWT\ Mozilla/Eclipse_SWT_Mozilla/g" eclipse-swt-firefox.patch # sed --in-place "s/Eclipse\ SWT\ PI/Eclipse_SWT_PI/g" eclipse-swt-firefox.patch -Patch59: %{name}-swt-firefox.patch -Patch60: %{name}-swt-firefox.2.patch +Patch18: %{name}-swt-firefox.patch +Patch19: %{name}-swt-firefox.2.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=209393 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853 -Patch61: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch -Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch +Patch20: %{name}-workaround-plugin.xml-parsing-bug-gcc-bz29853.patch +# This is already upstream in 3.3 builds. It *may* get into 3.2.2. +Patch21: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch # Add ppc64 to the list of arches with gre64.conf # part of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=207016 -Patch101: %{name}-ppc64gre64.patch -# This allows us to remove the configuration platform.xml in /usr/share/eclipse -# yet still maintain user-installed plugins in ~/.eclipse -Patch102: %{name}-launcher-addplatformtotildeeclipse.patch - +Patch22: %{name}-ppc64gre64.patch +# This patch allowed us to remove +# /usr/share/eclipse/configuration/org.eclipse.update/platform.xml -- which +# fixed a number of update-related bugs -- in an FC6 update. +# We can remove this patch for Fedora 8. +Patch23: %{name}-launcher-addplatformtotildeeclipse.patch -%if %{gcj_support} -%else -ExclusiveArch: %{ix86} x86_64 ppc ia64 sparc sparc64 -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5, make, gcc BuildRequires: gnome-vfs2-devel @@ -145,18 +130,19 @@ BuildRequires: unzip BuildRequires: java-javadoc BuildRequires: dos2unix +BuildRequires: desktop-file-utils %if %{gcj_support} -BuildRequires: gcc-java >= 4.0.2 -BuildRequires: java-gcj-compat-devel >= 1.0.64 -BuildRequires: gjdoc >= 0.7.7-14 +BuildRequires: gcc-java >= 4.0.2 +BuildRequires: java-gcj-compat-devel >= 1.0.64 +BuildRequires: gjdoc >= 0.7.7-14 %else -BuildRequires: java-devel >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 %endif -#BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging -BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging +# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in +# Fedora. When that's done, add it here and symlink below. # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 -#BuildRequires: ant-commons-net +BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch BuildRequires: jsch >= 0:0.1.28-1jpp BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool @@ -165,10 +151,12 @@ BuildRequires: tomcat5-jasper >= 5.5.17 BuildRequires: tomcat5-servlet-2.4-api >= 5.5.17 BuildRequires: lucene +BuildRequires: lucene-devel BuildRequires: regexp BuildRequires: junit >= 3.8.1-3jpp %if %{gcj_support} -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description @@ -180,186 +168,197 @@ %package ecj Summary: Eclipse Compiler for Java Group: Development/Languages -Obsoletes: ecj -Provides: ecj +Obsoletes: ecj <= 2.1.3 +Provides: ecj <= 2.1.3 %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires: libgcj >= 4.0.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %else -Requires: java >= 1.4.2 +Requires: java >= 1.4.2 %endif %description ecj Eclipse compiler for Java. %package -n %{libname}-gtk2 -Summary: SWT Library for GTK2 +Summary: SWT Library for GTK+-2.0 Group: Text Editors/Integrated Development Environments (IDE) %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires: libgcj >= 4.0.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif +Requires: gtk2 Requires: firefox -Conflicts: mozilla +Conflicts: mozilla %description -n %{libname}-gtk2 -SWT Library for GTK2. +SWT Library for GTK+-2.0. %package rcp Summary: Eclipse Rich Client Platform Group: Development/Languages Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release} -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar -Requires(post,postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} -%if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +# This file-level requirement is for the bi-arch multilib case +Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar +Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release} +Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} +%if %{gcj_support} +Requires: libgcj >= 4.0.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %else -Requires: java >= 1.4.2 +Requires: java >= 1.4.2 %endif %description rcp Eclipse Rich Client Platform %package rcp-sdk -Summary: Eclipse RCP Source +Summary: Eclipse Rich Client Platform SDK Group: Text Editors/Integrated Development Environments (IDE) # FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy Provides: %{name}-rcp-devel Obsoletes: %{name}-rcp-devel Requires: %{name}-rcp = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} -#FIXME: fix description to include docs %description rcp-sdk -Source for RCP for use within Eclipse. - +Source for Eclipse Rich Client Platform for use within Eclipse. %package platform Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires: java-gcj-compat >= 1.0.64 -Requires(post,postun): java-gcj-compat >= 1.0.64 -%else -Requires: java >= 1.4.2 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif -Requires: %{name}-rcp = %{epoch}:%{version}-%{release} -Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar -Requires(post,postun): %{name}-rcp = %{epoch}:%{version}-%{release} -BuildRequires: gtk2 >= 2.6 -Requires: gtk2 >= 2.6 -Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging -#Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging +Requires: %{name}-rcp = %{epoch}:%{version}-%{release} +# This file-level requirement is for the bi-arch multilib case +Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.2.1.v3235.jar +Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} +# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in +# Fedora. When that's done, add it here and symlink below. # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 -#Requires: ant-commons-net +#Requires: ant-apache-bsf ant-commons-net +Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool Requires: mx4j >= 2.1 Requires: tomcat5 >= 5.5.17 Requires: tomcat5-jasper >= 5.5.17 Requires: tomcat5-servlet-2.4-api >= 5.5.17 -Requires: lucene +Requires: lucene, lucene-devel Requires: regexp %description platform -Eclipse platform common files. This package now contains the GTK2 UI (the -former eclipse-gtk2 package). +The Eclipse Platform is the base of all IDE plugins. This does not include the +Java Development Tools or the Plugin Development Environment. %package platform-sdk -Summary: Eclipse platform Source +Summary: Eclipse Platform SDK Group: Text Editors/Integrated Development Environments (IDE) # FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy Provides: %{name}-platform-devel Obsoletes: %{name}-platform-devel Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release} -Requires: java-javadoc +Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(post): %{name}-rcp-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-rcp-sdk = %{epoch}:%{version}-%{release} -#FIXME: fix description to include docs %description platform-sdk -Source for Eclipse platform for use within Eclipse. +Source and docs for Eclipse Platform for use within Eclipse. %package jdt -Summary: Eclipse Java development tools +Summary: Eclipse Java Development Tools Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-ecj = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-ecj = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(post): %{name}-ecj = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release} Requires: junit >= 3.8.1-3jpp +Requires: java-javadoc %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description jdt -Eclipse Java developments tools. +Eclipse Java Development Tools. This package is required to use Eclipse for +developing software written in the Java programming language. %package jdt-sdk -Summary: Eclipse JDT Source +Summary: Eclipse Java Development Tools SDK Group: Text Editors/Integrated Development Environments (IDE) # FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy Provides: %{name}-jdt-devel Obsoletes: %{name}-jdt-devel Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-jdt = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires: java-javadoc - +Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} -#FIXME: fix description to include docs %description jdt-sdk -Source for JDT for use within Eclipse. +Source and docs for Eclipse Java Development Tools for use within Eclipse. %package pde -Summary: Eclipse PDE +Summary: Eclipse Plugin Development Environment Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-jdt = %{epoch}:%{version}-%{release} Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release} Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-jdt = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-jdt = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde-runtime = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-pde-runtime = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description pde -Eclipse Plug-in Development Environment. +Eclipse Plugin Development Environment. This package is required for +developing Eclipse plugins. %package pde-runtime -Summary: Eclipse PDE runtime plugin. +Summary: Eclipse Plugin Development Environment runtime plugin. Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release} %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post): java-gcj-compat >= 1.0.64 -Requires(postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif %description pde-runtime -Eclipse Plug-in Development Environment runtime plugin (org.eclipse.pde.runtime). +Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime). %package pde-sdk -Summary: Eclipse PDE Source +Summary: Eclipse Plugin Development Environment SDK Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-pde = %{epoch}:%{version}-%{release} Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-pde = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-pde = %{epoch}:%{version}-%{release} -#FIXME: fix description to include docs %description pde-sdk -Source for Eclipse Plug-in Development Environment for use within Eclipse. +Source and docs for Eclipse Plugin Development Environment for use within +Eclipse. %package sdk -Summary: Eclipse PDE Source +Summary: Eclipse SDK Group: Text Editors/Integrated Development Environments (IDE) # FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy Provides: %{name}-pde-devel @@ -367,141 +366,142 @@ Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release} Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release} Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-pde-sdk = %{epoch}:%{version}-%{release} -Requires(post,postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-platform-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-pde-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-pde-sdk = %{epoch}:%{version}-%{release} +Requires(post): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} +Requires(postun): %{name}-jdt-sdk = %{epoch}:%{version}-%{release} # This file requirement is to deal with the biarch installation case -Requires(post,postun): %{_libdir}/%{name}/configuration/config.ini +Requires(post): %{_libdir}/%{name}/configuration/config.ini +Requires(postun): %{_libdir}/%{name}/configuration/config.ini %if %{gcj_support} -Requires: libgcj >= 4.0.2 -Requires(post,postun): java-gcj-compat >= 1.0.64 +Requires(post): java-gcj-compat >= 1.0.64 +Requires(postun): java-gcj-compat >= 1.0.64 %endif -#FIXME: fix description to be better %description sdk -The Eclipse Plug-in Development Environment SDK. This package allows you -to create an IDE based on Eclipse. - +The Eclipse SDK. This package is similar to a meta-package which brings in +the Eclipse Platform SDK, the Eclipse Java Development Tools SDK, and the +Eclipse Plugin Development Environment SDK. It also contains the +org.eclipse.sdk plugin and feature. This package is only needed if you intend +to create Eclipse applications. %prep %setup -q -c -# I hate spaces in paths with patch! -pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library %patch0 -p0 -popd - %patch2 -p0 -%patch4 -p0 -%patch5 -p0 +%patch3 -p0 +# FIXME: investigate why we are pushd'ing here +# Build swttools.jar pushd plugins/org.eclipse.swt.gtk.linux.x86_64 -%patch18 -p0 +%patch4 -p0 popd -%patch22 -p0 +%patch5 -p0 # tomcat patches pushd plugins/org.eclipse.tomcat -%patch28 -p0 -%patch29 -p0 +%patch6 -p0 +%patch7 -p0 popd -sed --in-place "s/4.1.130/5.5.17/" \ +sed --in-place "s/4.1.130/5.5.17/g" \ features/org.eclipse.platform/build.xml \ plugins/org.eclipse.tomcat/build.xml \ assemble.*.xml pushd plugins/org.eclipse.help.webapp -%patch31 -p0 -popd -pushd plugins/org.eclipse.compare -#%patch33 -p0 +%patch8 -p0 popd + pushd plugins/org.eclipse.jdt.core -%patch34 -p0 -%patch57 -p0 -popd -%patch38 -p0 -%patch40 -p0 -#%patch43 -pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library -%patch46 +%patch9 -p0 +%patch17 -p0 popd +%patch10 -p0 +%patch11 -p0 # Because the launcher source is zipped up, we need to unzip, patch, and re-pack # FIXME: figure out why we need to patch and sed twice and fix upstream mkdir launchertmp unzip -qq -d launchertmp plugins/org.eclipse.platform/launchersrc.zip pushd launchertmp -%patch47 -p0 -%patch101 -p0 -%patch102 -p0 -# put the configuration directory in an arch specific location +%patch12 -p0 +%patch22 -p0 +%patch23 -p0 +# put the configuration directory in an arch-specific location sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c -# make the eclipse install relocatable +# make the eclipse binary relocatable sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c zip -q -9 -r ../launchersrc.zip * popd mv launchersrc.zip plugins/org.eclipse.platform rm -rf launchertmp pushd features/org.eclipse.platform.launchers -%patch47 -p0 -%patch101 -p0 -%patch102 -p0 -# put the configuration directory in an arch specific location +%patch12 -p0 +%patch22 -p0 +%patch23 -p0 + +# put the configuration directory in an arch-specific location sed --in-place "s:/usr/lib/eclipse:%{_libdir}/%{name}:" library/eclipse.c -# make the eclipse install relocatable +# make the eclipse binary relocatable sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c popd # Link against our system-installed javadocs -%patch48 -p0 +%patch13 -p0 sed --in-place "s:/usr/share/:%{_datadir}/:g" \ - plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt \ - plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ - plugins/org.eclipse.pde.doc.user/pdeOptions \ - plugins/org.eclipse.platform.doc.isv/platformOptions.txt -%patch49 -p0 + plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt \ + plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ + plugins/org.eclipse.pde.doc.user/pdeOptions \ + plugins/org.eclipse.platform.doc.isv/platformOptions.txt +%patch14 -p0 pwd pushd plugins/org.eclipse.pde.build -%patch53 -sed --in-place "s:@eclipse_base@:%{_datadir}/%{name}:" templates/package-build/build.properties +%patch15 +sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties popd -%patch55 -p0 +# Remove apt and junit4 until we have 1.5 +%patch16 -p0 rm plugins/org.junit4/junit-4.1.jar -# I love directories with spaces in their names +# Build against our firefox packages pushd plugins/org.eclipse.swt mv "Eclipse SWT Mozilla" Eclipse_SWT_Mozilla mv "Eclipse SWT PI" Eclipse_SWT_PI -%patch59 +%patch18 mv Eclipse_SWT_Mozilla "Eclipse SWT Mozilla" mv Eclipse_SWT_PI "Eclipse SWT PI" popd pushd plugins/org.eclipse.swt.tools mv "JNI Generation" JNI_Generation -%patch60 +%patch19 mv JNI_Generation "JNI Generation" popd -# workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853 +# workaround for GNU XML bug when parsing plugin.xml +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29853 pushd plugins/org.eclipse.pde.core -%patch61 +%patch20 popd -# FIXME check if this has been applied upstream +# customcallbacks fixes. They are upstream already. pushd plugins/org.eclipse.platform.doc.isv -%patch100 -p0 +%patch21 -p0 popd pushd plugins/org.eclipse.platform.doc.user -%patch100 -p0 +%patch21 -p0 popd +# Splashscreen pushd plugins/org.eclipse.platform cp %{SOURCE11} splash.bmp popd # FIXME this should be patched upstream with a flag to turn on and off # all output should be directed to stdout +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942 find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \; # Remove existing .sos @@ -566,7 +566,7 @@ rm plugins/org.apache.ant/lib/ant-xalan1src.zip rm plugins/org.apache.ant/lib/ant-xslp.jar rm plugins/org.apache.ant/lib/ant-xslpsrc.zip -# FIXME use build-jar-repository +# FIXME: use build-jar-repository ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar #ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar @@ -576,7 +576,7 @@ ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 -# the symlinks that are commented out are not currently shipped on Fedora +# the symlinks that are commented-out are not currently shipped on Fedora #ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar #ln -s %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant/lib/ant-icontract.jar #ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant/lib/ant-jai.jar @@ -598,15 +598,14 @@ #ln -s %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant/lib/ant-xalan1.jar #ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.jar ## END ANT ## + # BEGIN LUCENE ## rm plugins/org.apache.lucene/lucene-1.4.3.jar -# FIXME: Remove this zip until we have a lucene-devel package containing it. -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=170343 rm plugins/org.apache.lucene/lucene-1.4.3-src.zip +ln -s %{_usr}/src/lucene/lucene-1.4.3.jar plugins/org.apache.lucene/lucene-1.4.3-src.zip ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar # END LUCENE ## - ## BEGIN TOMCAT ## rm plugins/org.eclipse.tomcat/commons-beanutils.jar rm plugins/org.eclipse.tomcat/commons-collections.jar @@ -670,11 +669,10 @@ sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak popd -# FIXME: figure out what's going on with build.index +# FIXME: figure out what's going on with build.index. This is a gjdoc problem. find plugins -type f -name \*.xml -exec sed --in-place "s/\(\)/<\!-- \1 -->/" "{}" \; # the swt version is set to HEAD on ia64 but shouldn't be -# FIXME: file a bug about this # get swt version SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) @@ -682,18 +680,18 @@ swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \ - assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ - features/org.eclipse.rcp/build.xml + assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ + features/org.eclipse.rcp/build.xml -# nasty hack to get suppport for ppc64, s390(x) and sparc(64) -# move all of the ia64 directories to ppc64 or s390(x) or sparc(64) dirs and replace +# Nasty hack to get suppport for ppc64, s390{,x} and sparc{,64} +# Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace # the ia64 strings with ppc64 or s390(x) %ifarch ppc64 s390 s390x sparc sparc64 # there is only partial support for ppc64 in 3.2 so we have to remove this # partial support to get the replacemnt hack to work find -name \*ppc64\* | xargs rm -r - # remove remove ppc64 support from features/org.eclipse.platform.source/feature.xml + # remove ppc64 support from features/org.eclipse.platform.source/feature.xml # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \; # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq @@ -701,11 +699,11 @@ # replace final occurances with an existing arch sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml - # remove remove ppc64 support from features/org.eclipse.platform.source/feature.xml + # remove ppc64 support from features/org.eclipse.platform.source/feature.xml mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig - grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml + grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml - # finally the replacement hack + # finally, the replacement hack for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do mv $f $(echo $f | sed "s/ia64/%{_arch}/") done @@ -722,16 +720,7 @@ done popd -# setup the jsch plugin build -rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar -# FIXME remove version number, file a bug about this -pushd baseLocation/plugins -# get the Manifest file -unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\* -rm com.jcraft.jsch_*.jar -popd - -# setup with the icu4j plugins for building +# set the icu4j plugins for building pushd baseLocation/plugins rm com.ibm.icu.base_3.4.5.jar \ com.ibm.icu_3.4.5.jar \ @@ -752,17 +741,18 @@ # add build.xml patches pushd icu4j-build -%patch3 -p1 +%patch1 -p1 popd popd # delete included jars -# FIXME: file a bug about these +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662 rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \ plugins/org.eclipse.swt/extra_jars/exceptions.jar \ plugins/org.eclipse.swt.tools/swttools.jar \ - features/org.eclipse.platform.launchers/bin/startup.jar + features/org.eclipse.platform.launchers/bin/startup.jar \ + plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar # make sure there are no jars left JARS="" @@ -772,7 +762,7 @@ fi done if [ ! -z "$JARS" ]; then - echo "These jar should be deleted and symlinked to system jars: $JARS" + echo "These jars should be deleted and symlinked to system jars: $JARS" #FIXME: enable exit 1 fi @@ -782,24 +772,28 @@ env ORIGCLASSPATH=$CLASSPATH -# finish the jsch plugin build -# FIXME remove version numbers +# Build jsch +pushd baseLocation/plugins +# extract the Manifest file +unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\* +rm com.jcraft.jsch_*.jar +popd # FIXME jar -V does not work for proprietary VMs pushd baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build unzip -qq %{_javadir}/jsch.jar -x META-INF\* sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF jar -Mcf ../com.jcraft.jsch_0.1.28.jar * popd -# FXIME don't delete this, do what icu4j does +# FIXME don't delete this, do what icu4j does rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build -# finish the icu4j build +# Finish the icu4j build pushd baseLocation/plugins -# build the icu.base plugin +# Build the icu.base plugin zipfile=$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip pushd icu4j-build/com.ibm.icu.base/src -find -name \*.java | xargs touch --date=1/1/1970 +find -name \*.java | xargs touch --date=1/1/1980 zip -X -9 -r $zipfile . -i \*.java popd pushd icu4j-build/com.ibm.icu.base @@ -807,10 +801,10 @@ popd mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar . -# build the icu plugin +# Build the icu plugin zipfile=$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip pushd icu4j-build/com.ibm.icu/src -find -name \*.java | xargs touch --date=1/1/1970 +find -name \*.java | xargs touch --date=1/1/1980 zip -X -9 -r $zipfile . -i \*.java popd pushd icu4j-build/com.ibm.icu @@ -896,27 +890,6 @@ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ -Dlibsconfig=true -# Hack to get the -debuginfo source code references -# to be pointing to the right place: -# Hardlink all the org.* source we can find -# Presumably, all the zipped source gets unzipped before compilation? -#src_root=$PWD/plugins -#pushd result -#mkdir -p eclipse/org -#collected_src_dir=$PWD/eclipse -#cat >copyallsrc <<-EOF -# #! /bin/bash -peu -# cd "\$1" -# echo "Copying all .java source files from \$1 to $collected_src_dir..." -# find . -type f -name '*.java' -print0 \ -# | xargs -0 -r cp -l --parents --target-directory=$collected_src_dir/org -#EOF -#chmod u+x copyallsrc -## Special case logic for SWT - only copy linux-gtk source -#find $src_root -type d -a \( -name org.eclipse.swt -prune -o -name org -print0 \) | xargs -l -0 ./copyallsrc -#./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org -#popd - # Build the FileInitializer application SDK=$(cd eclipse && pwd) PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build | sed 's/org.eclipse.pde.build_//') @@ -925,6 +898,7 @@ mkdir -p home homedir=$(cd home && pwd) +# This can go away when package build handles plugins (not just features) echo "" > build/assemble.org.eclipse.equinox.initializer.all.xml echo "" > build/package.org.eclipse.equinox.initializer.all.xml @@ -952,52 +926,62 @@ %install rm -rf $RPM_BUILD_ROOT -# get swt version +# Get swt version SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER +# Some directories we need install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/links +install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} +install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/features + +# Explode the resulting SDK tarball tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz +# The FileInitializer app isn't part of the SDK (yet?) but we want it to be +# around for other RPMs cp equinox-incubator/org.eclipse.equinox.initializer/org.eclipse.equinox.initializer_*.jar \ $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} - -# Install the platform specific fragments in an arch specific dir -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/links +# Set up an extension location and a link file for the arch-specific dir echo "path:$RPM_BUILD_ROOT%{_libdir}" > $RPM_BUILD_ROOT%{_datadir}/%{name}/links/fragments.link echo "name=Eclipse Platform" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension echo "id=org.eclipse.platform" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension echo "version=%{eclipse_majmin}.%{eclipse_micro}" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipseextension -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/features -# Install the platform specific fragments in an arch specific dir -install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +# Install the platform-specific fragments in an arch-specific dir mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/*%{eclipse_arch}* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -# platform.source has the launcher src zip which is platform specific + +# platform.source has the launcher src zip which is platform-specific PLATFORMSOURCEVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.source_ | sed 's/org.eclipse.platform.source_//') mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform.source_$PLATFORMSOURCEVERSION \ $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins + # help.webapp generates web.xml with Apache Jakarta Tomcat JspC. This file is # generated differently for different arches. FIXME investigate this. HELPWEBAPPVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep help.webapp_ | sed 's/org.eclipse.help.webapp_//') mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_$HELPWEBAPPVERSION \ $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins + # update.core.linux is a fragment # FIXME: make a patch for upstream to change to swt fragment notation UPDATECORELINUXVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep update.core.linux_ | sed 's/org.eclipse.update.core.linux_//') mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPDATECORELINUXVERSION \ $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins + # FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug. mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.4.5.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -# FIXME: there is a problem with gjdoc with this plugin + +# FIXME: there is a problem with gjdoc generating different HTML on different +# architectures. This happens with this plugin. PLATFORMDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.doc.isv_ | sed 's/org.eclipse.platform.doc.isv_//') mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_$PLATFORMDOCISVVERSION \ $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins + # To ensure that the product is org.eclipse.sdk.ide when eclipse-sdk is # installed, we must check for its presence at %%post{,un} time. This does not # work in the biarch case, though, if it is not in an arch-specific location. @@ -1005,14 +989,17 @@ # better than always appearing in the about dialog as the Eclipse Platform with # the platform plugin version number instead of the actual SDK version number. # -- overholt, 2006-11-03 -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.sdk_* $RPM_BUILD_ROOT%{_libdir}/%{name}/features +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_* \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/features/org.eclipse.sdk_* \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/features -mkdir -p home -homedir=$(cd home && pwd) # FIXME: investigate why it doesn't work to set this -- configuration data is -# always written to /usr/share/eclipse/configuration -# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration \ +# always written to /usr/share/eclipse/configuration, even with +# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration +# Note (2006-12-05): upon looking at this again, we (bkonrath, overholt) don't +# know what we're doing with $libdir_path :) It requires some investigation. +# # Extract .so files # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 pushd $RPM_BUILD_ROOT @@ -1035,8 +1022,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/configuration $RPM_BUILD_ROOT%{_libdir}/%{name} rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.update rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.core.runtime -# Where did these go? -#rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/*.log # Set config.ini for the platform; no benefit to having it be sdk sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.eclipse.platform.ide/" \ @@ -1055,7 +1040,7 @@ # Create file listings for the extracted shared libraries echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install; for id in `ls configuration/org.eclipse.osgi/bundles`; do - if [ "Aconfiguration" = $(echo A`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then + if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install; else echo "%{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; @@ -1071,9 +1056,9 @@ popd # Install the SWT symlinks in libdir -swtjarversion=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") +SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") pushd $RPM_BUILD_ROOT%{_libdir}/%{name} -ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$swtjarversion.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar +ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar popd @@ -1090,22 +1075,28 @@ ln -s org.eclipse.pde.build_* org.eclipse.pde.build popd -# rh/freedesktop.org icons -install -p -D -m0644 %{SOURCE5} \ +# Icons +PLATFORMSUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//") +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps +ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse48.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps -ln -s ../icons/hicolor/48x48/apps/%{name}.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -ln -s ../../../../%{name}/plugins/org.eclipse.platform_%{eclipse_majmin}.%{eclipse_micro}/eclipse32.gif \ +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps +ln -s %{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse32.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps -ln -s ../../../../%{name}/plugins/org.eclipse.platform_%{eclipse_majmin}.%{eclipse_micro}/eclipse.gif \ +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps +ln -s ../../../../%{name}/plugins/org.eclipse.platform_$PLATFORMSUFFIX/eclipse.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps +ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png \ + $RPM_BUILD_ROOT%{_datadir}/pixmaps +%ifarch %{ix86} x86_64 # Remove unused icon.xpm -rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm +# This should be fixed in 3.3. +# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848 +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm +%endif -# install the efj wrapper script +# Install the efj wrapper script install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj sed --in-place "s:startup.jar:%{_datadir}/%{name}/startup.jar:" \ $RPM_BUILD_ROOT%{_bindir}/efj @@ -1118,18 +1109,20 @@ desktop-file-validate %{SOURCE2} # freedesktop.org menu entry -install -p -D -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +SDKPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep eclipse.sdk_ | sed "s/org.eclipse.sdk_//") # Put Fedora Core version into about.mappings of org.eclipse.sdk and # org.eclipse.platform to show it in # Eclipse about dialog. (courtesy Debian # Eclipse packagers) # FIXME use the third id -pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.sdk_%{eclipse_majmin}.* -OS_VERSION=`cat /etc/*-release | head -n 1` +pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.sdk_$SDKPLUGINVERSION +OS_VERSION=$(cat /etc/*-release | head -n 1) sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp mv about.mappings.tmp about.mappings popd -pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_%{eclipse_majmin}.* +PLATFORMPLUGINVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep eclipse.platform_ | sed "s/org.eclipse.platform_//") +pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_$PLATFORMPLUGINVERSION sed -e "s/\(0=.*\)/\1 ($OS_VERSION)/" < about.mappings > about.mappings.tmp mv about.mappings.tmp about.mappings popd @@ -1209,14 +1202,20 @@ #ln -s %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant_1.6.5/lib/ant-xalan1.jar #ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_1.6.5/lib/ant-xslp.jar ## END ANT ## + # BEGIN LUCENE ## -# FIXME: rm -f in ln -#rm plugins/org.apache.lucene_*/lucene-1.4.3.jar -ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar +LUCENEPLUGINVERSION=$(ls plugins | grep lucene | sed 's/org.apache.lucene_//') +rm plugins/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3.jar +ln -s %{_javadir}/lucene.jar \ + plugins/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3.jar +# org.eclipse.platform.source is in the arch-specific location +pushd $RPM_BUILD_ROOT%{_libdir}/%{name} +PLATFORMSOURCEVERSION=$(ls plugins | grep platform.source_ | sed 's/org.eclipse.platform.source_//') +rm plugins/org.eclipse.platform.source_$PLATFORMSOURCEVERSION/src/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3-src.zip +ln -s %{_usr}/src/lucene/lucene-1.4.3.jar \ + plugins/org.eclipse.platform.source_$PLATFORMSOURCEVERSION/src/org.apache.lucene_$LUCENEPLUGINVERSION/lucene-1.4.3-src.zip +popd # END LUCENE ## -# FIXME -#rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar -#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar ## BEGIN TOMCAT ## TOMCATPLUGINVERSION=$(ls plugins | grep tomcat | sed 's/org.eclipse.tomcat_//') @@ -1254,19 +1253,6 @@ build-jar-repository -s -p plugins/org.junit_* junit -# 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 %{gcj_support} -# # 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 - # Ensure that the zip files are the same across all builds. # This is needed to make these package multilib compatible. # FIXME: this needs to be re-written as a separate program @@ -1276,11 +1262,11 @@ # unpack every zip, set the date of the files and directories and repack the zip ZIPNAME=`basename $zip` TMPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.tmpdir.XXXXXXXXXX` - ZIPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.zipdir.XXXXXXXXXX` + ZIPDIR=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME.zipdir.XXXXXXXXXX` pushd $TMPDIR unzip -qq -o $zip - rm -f $zip + rm -f $zip # check if there are jars or zips inside the zip or jar zipsinside=`find $TMPDIR -type f -name \*.zip -o -name \*.jar` @@ -1355,7 +1341,7 @@ # exclude org.eclipse.ui.ide to work around # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547 UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//') -aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION +aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION %endif %clean @@ -1363,7 +1349,10 @@ %post platform %if %{gcj_support} -%{_bindir}/rebuild-gcj-db +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi %endif touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -1372,7 +1361,10 @@ %postun platform %if %{gcj_support} -%{_bindir}/rebuild-gcj-db +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi %endif touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -1381,7 +1373,10 @@ %post sdk %if %{gcj_support} -%{_bindir}/rebuild-gcj-db +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi %endif if [ -f %{_libdir}/%{name}/configuration/config.ini ]; then sed --in-place "s/[#]*eclipse.product=.*/eclipse.product=org.eclipse.sdk.ide/" \ @@ -1390,12 +1385,19 @@ %postun sdk %if %{gcj_support} -%{_bindir}/rebuild-gcj-db +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi %endif # Only set the product back to platform.ide if the sdk is actually removed for # this arch. This SDKDIR check is to deal with the ordering of new %%post # before old %%postun -SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_") +if [ -d /usr/lib/eclipse/features]; then + SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_") +else + SDKDIR="" +fi if [ -z "$SDKDIR" -a -f %{_libdir}/%{name}/configuration/config.ini ]; then sed --in-place "s/[#]*eclipse.product=.*/eclipse.product=org.eclipse.platform.ide/" \ %{_libdir}/%{name}/configuration/config.ini @@ -1449,6 +1451,7 @@ %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/plugins +%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/configuration %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi @@ -1748,12 +1751,25 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog -* Tue Nov 28 2006 Andrew Overholt 3.2.1-23 +* Mon Jan 29 2007 Ben Konrath 3.2.1-24.fc6 +- Check for features directory in sdk postun script. +- Fix bug in ecj [] patch. +- Add bugzilla reference to remove jars bug in comment. +- Update bugzilla refereces to [] bugs. +- Fix %%postun problem in the sdk sub-package. +- Rpmlint cleanups. +- Use sed instead of patch for tomcat version. +- Add BuildRequires desktop-file-utils. +- Add %%{_libdir}/eclipse dir to files list of libswt-gtk2. +- Specfile cleanups from review with Andrew Overholt. +- Resolves: #224588, #211008, #225329. + +* Tue Nov 28 2006 Andrew Overholt 3.2.1-23.fc6 - Add patch to add platform to ~/.eclipse's platform.xml. This maintains user-installed plugins but allows us to remove the pre-configured platform.xml in the OSGi configuration area. -* Fri Nov 24 2006 Andrew Overholt 3.2.1-22 +* Fri Nov 24 2006 Andrew Overholt 3.2.1-22.fc6 - FC6 update without work to move arch-specific stuff to %%{_libdir}. * Fri Nov 17 2006 Ben Konrath 3.2.1-21 @@ -1890,11 +1906,11 @@ - Use new swt-firefox patch and consolidate others into one. * Wed Sep 27 2006 Ben Konrath 3.2.1-0.RC.3 -- Fix typo in %postun of -sdk and -platform. +- Fix typo in %%postun of -sdk and -platform. - Disable help index generation on ia64. * Tue Sep 26 2006 Ben Konrath 3.2.1-0.RC.2 -- Don't set eclipse.product incorrectly in %postun of -sdk and -platform. +- Don't set eclipse.product incorrectly in %%postun of -sdk and -platform. * Mon Sep 25 2006 Ben Konrath 3.2.1-0.RC.1 - M20060921-0945 (3.2.1 pre-release). @@ -1934,7 +1950,7 @@ - Re-add customBuildCallbacks.xml-add-pre.gather.bin.parts.patch because it has not been applied upstream. - Minor spec file clean ups. -- Add %{name} to the -devel package Provides so that upgrading from +- Add %%{name} to the -devel package Provides so that upgrading from FC-5 to FC-6 works. - Re-enable natively compiling the ant.ui plugin. - Re-enable natively compiling the team.cvs.core plugin on ia64. --- eclipse-buildDocPlugins.patch DELETED --- --- eclipse-compare-create-api.patch DELETED --- --- eclipse-gnuformatterjdt.patch DELETED --- --- eclipse-gnuformatterjdtui.patch DELETED --- --- eclipse-libswt-enableallandO2.patch DELETED --- --- eclipse-libswt-xpcomgcc4.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 00:39:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 19:39:09 -0500 Subject: rpms/libX11/FC-6 libX11-fd-leak.patch, NONE, 1.1 libX11.spec, 1.32, 1.33 Message-ID: <200701300039.l0U0d99t020246@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libX11/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20196 Modified Files: libX11.spec Added Files: libX11-fd-leak.patch Log Message: * Mon Jan 29 2007 Adam Jackson 1.0.3-6.fc6 - Fix fd leak in xim. libX11-fd-leak.patch: imLcIm.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE libX11-fd-leak.patch --- diff -urNad libx11-1.0.3~/modules/im/ximcp/imLcIm.c libx11-1.0.3/modules/im/ximcp/imLcIm.c --- libx11-1.0.3~/modules/im/ximcp/imLcIm.c 2006-06-29 19:41:44.000000000 -0700 +++ libx11-1.0.3/modules/im/ximcp/imLcIm.c 2006-10-14 17:52:08.945540956 -0700 @@ -617,7 +617,6 @@ } #endif - fp = _XFopenFile (name, "r"); if (! (fp = _XFopenFile (name, "r"))) { if (tmpcachedir) Xfree (tmpcachedir); Index: libX11.spec =================================================================== RCS file: /cvs/dist/rpms/libX11/FC-6/libX11.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- libX11.spec 9 Nov 2006 07:27:29 -0000 1.32 +++ libX11.spec 30 Jan 2007 00:39:06 -0000 1.33 @@ -1,7 +1,7 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 Version: 1.0.3 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -16,6 +16,7 @@ Patch1: libX11-nls-indic-locales-bug185376.patch Patch2: dont-forward-keycode-0.patch Patch3: bug-201284.patch +Patch4: libX11-fd-leak.patch BuildRequires: pkgconfig # xproto >= 7.0.6 required @@ -57,6 +58,7 @@ %patch1 -p1 -b .nls-indic-locales-bug185376 %patch2 -p1 -b .dont-forward-keycode-0 %patch3 -p1 -b .3-bug201284 +%patch4 -p1 -b .xim-fd-leak # Disable static library creation by default. %define with_static 0 @@ -249,6 +251,9 @@ %{_mandir}/man3/*.3x* %changelog +* Mon Jan 29 2007 Adam Jackson 1.0.3-6.fc6 +- Fix fd leak in xim. + * Thu Nov 09 2006 Caius Chance 1.0.3-5.fc6 - Fix XIM hangs when switching input context (Soren Sandmann, #201284). - Add pkgconfig dependency for -devel package. From fedora-cvs-commits at redhat.com Tue Jan 30 00:41:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 19:41:55 -0500 Subject: rpms/libX11/devel libX11-fd-leak.patch, NONE, 1.1 libX11.spec, 1.32, 1.33 Message-ID: <200701300041.l0U0ftNs022403@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libX11/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22356 Modified Files: libX11.spec Added Files: libX11-fd-leak.patch Log Message: * Mon Jan 29 2007 Adam Jackson 1.0.3-7 - Fix xim fd leak. libX11-fd-leak.patch: imLcIm.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE libX11-fd-leak.patch --- diff -urNad libx11-1.0.3~/modules/im/ximcp/imLcIm.c libx11-1.0.3/modules/im/ximcp/imLcIm.c --- libx11-1.0.3~/modules/im/ximcp/imLcIm.c 2006-06-29 19:41:44.000000000 -0700 +++ libx11-1.0.3/modules/im/ximcp/imLcIm.c 2006-10-14 17:52:08.945540956 -0700 @@ -617,7 +617,6 @@ } #endif - fp = _XFopenFile (name, "r"); if (! (fp = _XFopenFile (name, "r"))) { if (tmpcachedir) Xfree (tmpcachedir); Index: libX11.spec =================================================================== RCS file: /cvs/dist/rpms/libX11/devel/libX11.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- libX11.spec 9 Nov 2006 03:51:13 -0000 1.32 +++ libX11.spec 30 Jan 2007 00:41:53 -0000 1.33 @@ -1,7 +1,7 @@ Summary: X.Org X11 libX11 runtime library Name: libX11 Version: 1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -16,6 +16,7 @@ Patch1: libX11-nls-indic-locales-bug185376.patch Patch2: dont-forward-keycode-0.patch Patch3: bug-201284.patch +Patch4: libX11-fd-leak.patch BuildRequires: pkgconfig # xproto >= 7.0.6 required @@ -57,6 +58,7 @@ %patch1 -p1 -b .nls-indic-locales-bug185376 %patch2 -p1 -b .dont-forward-keycode-0 %patch3 -p1 -b .3-bug201284 +%patch4 -p1 -b .xim-fd-leak # Disable static library creation by default. %define with_static 0 @@ -249,6 +251,9 @@ %{_mandir}/man3/*.3x* %changelog +* Mon Jan 29 2007 Adam Jackson 1.0.3-7 +- Fix xim fd leak. + * Thu Nov 09 2006 Caius Chance 1.0.3-6.fc7 - Fix XIM hangs when switching input context (Soren Sandmann, #201284) From fedora-cvs-commits at redhat.com Tue Jan 30 02:39:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 29 Jan 2007 21:39:24 -0500 Subject: rpms/dejavu-lgc-fonts/devel dejavu-lgc-fonts.spec,1.9,1.10 Message-ID: <200701300239.l0U2dOGZ028527@cvs.devel.redhat.com> Author: besfahbo Update of /cvs/dist/rpms/dejavu-lgc-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28428 Modified Files: dejavu-lgc-fonts.spec Log Message: - Define fontconffile and use it Index: dejavu-lgc-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/dejavu-lgc-fonts/devel/dejavu-lgc-fonts.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dejavu-lgc-fonts.spec 9 Jan 2007 21:11:33 -0000 1.9 +++ dejavu-lgc-fonts.spec 30 Jan 2007 02:39:22 -0000 1.10 @@ -1,6 +1,7 @@ %define archivename dejavu-lgc-ttf %define fontdir %{_datadir}/fonts/dejavu-lgc %define fontconfdir %{_sysconfdir}/fonts/conf.d +%define fontconffile %{fontconfdir}/59-%{name}.conf Name: dejavu-lgc-fonts Version: 2.13 @@ -33,7 +34,7 @@ install -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} #config install -d -m 0755 $RPM_BUILD_ROOT%{fontconfdir} -install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconfdir}/59-%{name}.conf +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{fontconffile} %clean /bin/rm -rf $RPM_BUILD_ROOT @@ -57,10 +58,12 @@ %doc AUTHORS BUGS LICENSE NEWS README langcover.txt unicover.txt %dir %{fontdir} %{fontdir}/*.ttf -%config %{fontconfdir}/59-%{name}.conf +%config %{fontconffile} %changelog +- Define fontconffile and use it + * Tue Jan 09 2007 Behdad Esfahbod - 2.13-1 - Update to 2.13 - Use .bz2 tarball From fedora-cvs-commits at redhat.com Tue Jan 30 08:51:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 03:51:32 -0500 Subject: rpms/im-chooser/devel .cvsignore, 1.7, 1.8 im-chooser.spec, 1.12, 1.13 sources, 1.6, 1.7 as.po, 1.1, NONE el.po, 1.1, NONE mr.po, 1.1, NONE Message-ID: <200701300851.l0U8pWKw017343@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/im-chooser/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17285 Modified Files: .cvsignore im-chooser.spec sources Removed Files: as.po el.po mr.po Log Message: * Tue Jan 30 2007 Akira TAGOH - 0.3.4-1 - Translations update release. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/im-chooser/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Oct 2006 12:54:00 -0000 1.7 +++ .cvsignore 30 Jan 2007 08:51:29 -0000 1.8 @@ -6,3 +6,4 @@ im-chooser-0.3.1.tar.gz im-chooser-0.3.2.tar.gz im-chooser-0.3.3.tar.gz +im-chooser-0.3.4.tar.gz Index: im-chooser.spec =================================================================== RCS file: /cvs/dist/rpms/im-chooser/devel/im-chooser.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- im-chooser.spec 2 Oct 2006 16:00:54 -0000 1.12 +++ im-chooser.spec 30 Jan 2007 08:51:29 -0000 1.13 @@ -1,21 +1,20 @@ Name: im-chooser -Version: 0.3.3 -Release: 2%{?dist} +Version: 0.3.4 +Release: 1%{?dist} License: GPL URL: http://trac.tagoh.net/projects/im-chooser/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel intltool gettext libgnomeui-devel +BuildRequires: desktop-file-utils Source0: http://trac.tagoh.net/download/%{name}/%{name}-%{version}.tar.gz -Source1: as.po -Source2: el.po -Source3: mr.po Summary: Desktop Input Method configuration tool Group: Applications/System Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives Requires: xorg-x11-xinit >= 1.0.2-5.fc6 +Obsoletes: system-switch-im %description im-chooser is an user GUI configuration tool to choose the Input Method @@ -23,9 +22,6 @@ %prep %setup -q -cp %{SOURCE1} po/ -cp %{SOURCE2} po/ -cp %{SOURCE3} po/ %build %configure --with-xinput-suffix=.conf @@ -36,6 +32,12 @@ make install DESTDIR=$RPM_BUILD_ROOT +desktop-file-install --vendor=fedora \ + --add-category=X-GNOME-PersonalSettings \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/im-chooser.desktop + %find_lang %{name} %clean @@ -56,10 +58,17 @@ %doc AUTHORS COPYING ChangeLog %{_bindir}/* %{_sysconfdir}/X11/xinit/xinput.d/* -%{_datadir}/applications/im-chooser.desktop +%{_datadir}/applications/fedora-im-chooser.desktop %{_datadir}/pixmaps/im-chooser.png %changelog +* Tue Jan 30 2007 Akira TAGOH - 0.3.4-1 +- Translations update release. + +* Wed Jan 24 2007 Matthias Clasen - 0.3.3-3 +- Add X-GNOME-PersonalSettings to the desktop file categories (#224159) +- Use desktop-file-install + * Mon Oct 2 2006 Akira TAGOH - 0.3.3-2 - added Assamese, Greek and Marathi translation. (#208258) Index: sources =================================================================== RCS file: /cvs/dist/rpms/im-chooser/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Oct 2006 12:54:00 -0000 1.6 +++ sources 30 Jan 2007 08:51:29 -0000 1.7 @@ -1 +1 @@ -c96f6bd7b4e2c7554a7819e72ff6c210 im-chooser-0.3.3.tar.gz +e921400d99ec18e8ed43150773c9eace im-chooser-0.3.4.tar.gz --- as.po DELETED --- --- el.po DELETED --- --- mr.po DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 08:53:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 03:53:02 -0500 Subject: rpms/tk/devel tk.spec,1.26,1.27 Message-ID: <200701300853.l0U8r2RA018557@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17241 Modified Files: tk.spec Log Message: Change in spec file. Index: tk.spec =================================================================== RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- tk.spec 29 Jan 2007 16:20:57 -0000 1.26 +++ tk.spec 30 Jan 2007 08:53:00 -0000 1.27 @@ -9,9 +9,9 @@ URL: http://tcl.sourceforge.net/ Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: tcl = %{version} +Requires: tcl Requires(post,postun): /sbin/ldconfig -BuildRequires: tcl-devel >= %{version}, autoconf +BuildRequires: tcl-devel, autoconf BuildRequires: libX11-devel, sed # panedwindow.n from itcl conflicts Obsoletes: itcl <= 3.2 From fedora-cvs-commits at redhat.com Tue Jan 30 09:13:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 04:13:31 -0500 Subject: rpms/tk/devel tk.spec,1.27,1.28 Message-ID: <200701300913.l0U9DV15001957@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/tk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1723 Modified Files: tk.spec Log Message: Change spec file again. Index: tk.spec =================================================================== RCS file: /cvs/dist/rpms/tk/devel/tk.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tk.spec 30 Jan 2007 08:53:00 -0000 1.27 +++ tk.spec 30 Jan 2007 09:13:29 -0000 1.28 @@ -9,9 +9,9 @@ URL: http://tcl.sourceforge.net/ Source0: http://download.sourceforge.net/tcl/%{name}%{version}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: tcl +Requires: tcl = %{version} Requires(post,postun): /sbin/ldconfig -BuildRequires: tcl-devel, autoconf +BuildRequires: tcl-devel >= %{version}, autoconf BuildRequires: libX11-devel, sed # panedwindow.n from itcl conflicts Obsoletes: itcl <= 3.2 From fedora-cvs-commits at redhat.com Tue Jan 30 10:04:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:04:00 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.21, 1.22 Message-ID: <200701301004.l0UA407K020636@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20620 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch Log Message: more goodies openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/cupsmgr.hxx | 0 inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 inc/psprint/printerinfomanager.hxx | 0 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 23 - psprint/source/printer/printerinfomanager.cxx | 8 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 530 +++++++++++++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/source/dialogs/printdlg.src | 10 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 +++++++++ vcl/source/gdi/print.cxx | 11 31 files changed, 794 insertions(+), 15 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 29 Jan 2007 13:41:40 -0000 1.21 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 10:03:58 -0000 1.22 @@ -1082,7 +1082,7 @@ RCS file: /cvs/util/svtools/source/dialogs/printdlg.src,v retrieving revision 1.45 diff -u -r1.45 printdlg.src ---- openoffice.org.orig/svtools/source/dialogs/printdlg.src 23 Sep 2005 14:52:41 -0000 1.45 +--- openoffice.org/svtools/source/dialogs/printdlg.src 23 Sep 2005 14:52:41 -0000 1.45 +++ openoffice.org.orig/svtools/source/dialogs/printdlg.src 16 Nov 2006 14:14:44 -0000 @@ -291,6 +291,16 @@ Text [ de ] = ""; @@ -1101,3 +1101,20 @@ Text [ x-comment ] = " "; }; +--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 10:03:20.000000000 +0000 ++++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-29 12:49:51.000000000 +0000 +@@ -137,6 +137,14 @@ + + // ----------------------------------------------------------------- + ++void PrinterInfoManager::startsearch() ++{ ++} ++ ++void PrinterInfoManager::stopsearch() ++{ ++} ++ + bool PrinterInfoManager::checkPrintersChanged( bool bWait ) + { + // check if files were created, deleted or modified since initialize() From fedora-cvs-commits at redhat.com Tue Jan 30 10:04:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:04:54 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.18, 1.19 Message-ID: <200701301004.l0UA4sOq020732@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv20716 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch Log Message: more goodies openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/cupsmgr.hxx | 0 inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 inc/psprint/ppdparser.hxx | 0 inc/psprint/printerinfomanager.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 19 psprint/source/printer/printerinfomanager.cxx | 8 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 source/printer/cupsmgr.cxx | 0 source/printergfx/printerjob.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 530 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 +++++ vcl/source/gdi/print.cxx | 11 31 files changed, 792 insertions(+), 13 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 29 Jan 2007 13:42:26 -0000 1.18 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 10:04:52 -0000 1.19 @@ -1088,4 +1088,21 @@ + }; Text [ x-comment ] = " "; }; + +--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 10:03:20.000000000 +0000 ++++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-29 12:49:51.000000000 +0000 +@@ -137,6 +137,14 @@ + // ----------------------------------------------------------------- + ++void PrinterInfoManager::startsearch() ++{ ++} ++ ++void PrinterInfoManager::stopsearch() ++{ ++} ++ + bool PrinterInfoManager::checkPrintersChanged( bool bWait ) + { + // check if files were created, deleted or modified since initialize() From fedora-cvs-commits at redhat.com Tue Jan 30 10:16:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:16:03 -0500 Subject: rpms/vsftpd/devel vsftpd-2.0.3-user_config.patch, NONE, 1.1 vsftpd-2.0.5-anon_umask.patch, NONE, 1.1 vsftpd.spec, 1.60, 1.61 vsfptd-2.0.3-user_config.patch, 1.1, NONE Message-ID: <200701301016.l0UAG3r2020947@cvs.devel.redhat.com> Author: mbarabas Update of /cvs/dist/rpms/vsftpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20929 Modified Files: vsftpd.spec Added Files: vsftpd-2.0.3-user_config.patch vsftpd-2.0.5-anon_umask.patch Removed Files: vsfptd-2.0.3-user_config.patch Log Message: fix file upload permission problem #190193 vsftpd-2.0.3-user_config.patch: twoprocess.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE vsftpd-2.0.3-user_config.patch --- --- vsftpd-2.0.3/twoprocess.c.test 2005-08-31 11:49:58.000000000 +0200 +++ vsftpd-2.0.3/twoprocess.c 2005-08-31 11:58:11.000000000 +0200 @@ -422,7 +424,7 @@ handle_per_user_config(const struct myst { vsf_parseconf_load_file(str_getbuf(&filename_str), 1); } - else + else if (vsf_sysutil_statbuf_get_uid(p_statbuf) != VSFTP_ROOT_UID) { die("reading non-root config file"); } vsftpd-2.0.5-anon_umask.patch: postlogin.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE vsftpd-2.0.5-anon_umask.patch --- --- vsftpd-2.0.5/postlogin.c.old 2007-01-19 12:52:52.000000000 +0100 +++ vsftpd-2.0.5/postlogin.c 2007-01-30 10:42:05.000000000 +0100 @@ -1016,7 +1016,6 @@ /* Are we required to chown() this file for security? */ if (p_sess->is_anonymous && tunable_chown_uploads) { - vsf_sysutil_fchmod(new_file_fd, 0600); if (tunable_one_process_model) { vsf_one_process_chown_upload(p_sess, new_file_fd); Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- vsftpd.spec 19 Jan 2007 12:17:08 -0000 1.60 +++ vsftpd.spec 30 Jan 2007 10:16:01 -0000 1.61 @@ -3,7 +3,7 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd Version: 2.0.5 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -28,7 +28,7 @@ Patch13: vsftpd-2.0.3-background.patch Patch14: vsftpd-2.0.3-daemonize_fds.patch Patch15: vsftpd-2.0.1-kickline.patch -Patch16: vsfptd-2.0.3-user_config.patch +Patch16: vsftpd-2.0.3-user_config.patch Patch17: vsftpd-2.0.3-pam_hostname.patch Patch18: vsftpd-close-std-fds.patch Patch19: vsftpd-2.0.5-default_ipv6.patch @@ -40,6 +40,7 @@ Patch25: vsftpd-2.0.5-confspell.patch Patch26: vsftpd-2.0.5-bind_denied.patch Patch27: vsftpd-2.0.5-uniq_rename.patch +Patch28: vsftpd-2.0.5-anon_umask.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %if %{tcp_wrappers} @@ -94,6 +95,7 @@ %patch25 -p1 %patch26 -p1 -b .bind_denied %patch27 -p1 -b .uniq_rename +%patch28 -p1 -b .anon_umask %build %ifarch s390x @@ -152,11 +154,16 @@ /var/ftp %changelog +* Tue Jan 30 2007 Maros Barabas - 2.0.5-14 +- remove file upload permission problem +- change name of patch vsfptd-2.0.3-user_config +- Resolves #190193 + * Fri Jan 19 2007 Maros Barabas - 2.0.5-13 - add lost patch: don't die when no user config file is present - Resolves #166986 -* Thu Jan 18 2007 Radek Vok??l - 2.0.5-12 +* Thu Jan 18 2007 Radek Vokal - 2.0.5-12 - add dist tag - add buildrequires tcp_wrappers-devel --- vsfptd-2.0.3-user_config.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 10:32:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:32:35 -0500 Subject: rpms/at/devel at-3.1.10-dont_fork.patch,1.2,1.3 at.spec,1.45,1.46 Message-ID: <200701301032.l0UAWZBp023191@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22536 Modified Files: at-3.1.10-dont_fork.patch at.spec Log Message: Changed patch. at-3.1.10-dont_fork.patch: at-3.1.10/atd.c | 9 +++++++-- at-3.1.10/daemon.c | 8 ++++++-- at-3.1.10/daemon.h | 1 + at-3.1.8/atd.8.in | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) Index: at-3.1.10-dont_fork.patch =================================================================== RCS file: /cvs/dist/rpms/at/devel/at-3.1.10-dont_fork.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- at-3.1.10-dont_fork.patch 29 Jan 2007 16:46:11 -0000 1.2 +++ at-3.1.10-dont_fork.patch 30 Jan 2007 10:32:28 -0000 1.3 @@ -1,408 +1,33 @@ ---- at-3.1.10/atd.8.in.dont_fork 2005-08-29 10:08:51.000000000 +0200 -+++ at-3.1.10/atd.8.in 2007-01-29 15:46:09.000000000 +0100 -@@ -10,6 +10,7 @@ - .IR batch_interval ] - .RB [ -d ] - .RB [ -s ] -+.RB [ -n ] - .SH DESCRIPTION - .B atd - runs jobs queued by -@@ -46,6 +47,9 @@ - is installed as - .B @prefix@/sbin/atrun - for backward compatibility. -+.TP 8 -+.B -n -+Don't fork option. - .SH WARNING - .B atd - won't work if its spool directory is mounted via NFS even if ---- at-3.1.10/atd.c.dont_fork 2007-01-29 15:46:09.000000000 +0100 -+++ at-3.1.10/atd.c 2007-01-29 16:31:27.000000000 +0100 -@@ -73,6 +73,42 @@ - #ifdef HAVE_UNISTD_H - #include - #endif -+#ifdef WITH_PAM -+/* -+ * We must check if the atd daemon userid will be allowed to gain the job owner user's -+ * credentials with PAM . If not, the user has been denied at(1) usage, eg. with pam_access. -+ */ -+ setreuid(daemon_uid, daemon_uid); -+ setregid(daemon_gid, daemon_gid); -+ -+# define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ -+ fprintf(stderr,"PAM authentication failure: %s\n",pam_strerror(pamh, retcode)); \ -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); -+ pam_close_session(pamh,PAM_SILENT); \ -+ pam_end(pamh, retcode); \ -+ setregid(gid,egid); \ -+ setreuid(uid,euid); \ -+ return(0); \ -+ } -+ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); -+ PAM_FAIL_CHECK; -+ retcode = pam_set_item(pamh, PAM_TTY, "atd"); -+ PAM_FAIL_CHECK; -+ retcode = pam_acct_mgmt(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_open_session(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); -+ PAM_FAIL_CHECK; -+ -+ pam_close_session(pamh,PAM_SILENT); -+ pam_end(pamh, PAM_ABORT); -+ -+ setregid(gid,egid); -+ setreuid(uid,euid); -+ -+#endif -+ - - /* Local headers */ - -@@ -83,6 +119,10 @@ - #include "getloadavg.h" - #endif - -+#ifndef LOG_ATD -+#define LOG_ATD LOG_DAEMON -+#endif -+ - /* Macros */ - - #define BATCH_INTERVAL_DEFAULT 60 -@@ -196,6 +236,19 @@ - #define fork myfork - #endif - -+#undef ATD_MAIL_PROGRAM -+#undef ATD_MAIL_NAME -+#if defined(SENDMAIL) -+#define ATD_MAIL_PROGRAM SENDMAIL -+#define ATD_MAIL_NAME "sendmail" -+#elif defined(MAILC) -+#define ATD_MAIL_PROGRAM MAILC -+#define ATD_MAIL_NAME "mail" -+#elif defined(MAILX) -+#define ATD_MAIL_PROGRAM MAILX -+#define ATD_MAIL_NAME "mailx" -+#endif -+ - static void - run_file(char *filename, uid_t uid, gid_t gid) - { -@@ -420,6 +473,8 @@ - PAM_FAIL_CHECK; - retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); - PAM_FAIL_CHECK; -+ closelog(); -+ openlog("atd", LOG_PID, LOG_ATD); - PRIV_END - #endif - -@@ -434,6 +489,14 @@ - else if (pid == 0) { - char *nul = NULL; - char **nenvp = &nul; -+ char **pam_envp=0L; -+ -+ PRIV_START -+ #ifdef WITH_PAM -+ pam_envp = pam_getenvlist(pamh); -+ if ( ( pam_envp != 0L ) && (pam_envp[0] != 0L) ) -+ nenvp = pam_envp; -+ #endif - - /* Set up things for the child; we want standard input from the - * input file, and standard output and error sent to our output file. -@@ -455,8 +518,6 @@ - if (chdir(ATJOB_DIR) < 0) - perr("Cannot chdir to " ATJOB_DIR); - -- PRIV_START -- - nice((tolower((int) queue) - 'a' + 1) * 2); - - if (initgroups(pentry->pw_name, pentry->pw_gid)) -@@ -472,10 +533,93 @@ - perr("Cannot reset signal handler to default"); - - chdir("/"); -+#ifdef WITH_SELINUX -+ if (selinux_enabled>0) { -+ security_context_t user_context=NULL; -+ security_context_t file_context=NULL; -+ int retval=0; -+ struct av_decision avd; -+ char *seuser=NULL; -+ char *level=NULL; -+ -+ if (getseuserbyname(pentry->pw_name, &seuser, &level) == 0) { -+ retval=get_default_context_with_level(seuser, level, NULL, &user_context); -+ free(seuser); -+ free(level); -+ if (retval) { -+ if (security_getenforce()==1) { -+ perr("execle: couldn't get security context for user %s\n", pentry->pw_name); -+ } else { -+ syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", pentry->pw_name); -+ goto out; -+ } -+ } -+ } -+ -+ /* -+ * Since crontab files are not directly executed, -+ * crond must ensure that the crontab file has -+ * a context that is appropriate for the context of -+ * the user cron job. It performs an entrypoint -+ * permission check for this purpose. -+ */ -+ if (fgetfilecon(STDIN_FILENO, &file_context) < 0) -+ perr("fgetfilecon FAILED %s", filename); -+ -+ retval = security_compute_av(user_context, -+ file_context, -+ SECCLASS_FILE, -+ FILE__ENTRYPOINT, -+ &avd); -+ freecon(file_context); -+ if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { -+ if (security_getenforce()==1) { -+ perr("Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ } else { -+ syslog(LOG_ERR, "Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ goto out; -+ } -+ } -+ -+ if (setexeccon(user_context) < 0) { -+ if (security_getenforce()==1) { -+ -+ perr("Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ } else { -+ syslog(LOG_ERR, "Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ } -+ } -+ out: -+ freecon(user_context); -+ } -+#endif -+ -+ - - if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) -+ - perr("Exec failed for /bin/sh"); - -+#ifdef WITH_SELINUX -+ if (selinux_enabled>0) { -+ if (setexeccon(NULL) < 0) -+ if (security_getenforce()==1) -+ perr("Could not resset exec context for user %s\n", pentry->pw_name); -+ } -+ } -+#endif -+ -+#ifdef WITH_PAM -+ if ( ( nenvp != &nul ) && (pam_envp != 0L) && (*pam_envp != 0L)) -+ { -+ for( nenvp = pam_envp; *nenvp != 0L; nenvp++) -+ free(*nenvp); -+ free( pam_envp ); -+ nenvp = &nul; -+ pam_envp=0L; -+ } -+#endif -+ - PRIV_END - } - /* We're the parent. Let's wait. -@@ -507,14 +651,43 @@ - unlink(filename); - } - -+#ifdef WITH_PAM -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); -+ pam_close_session(pamh, PAM_SILENT); -+ pam_end(pamh, PAM_ABORT); -+ closelog(); -+ openlog("atd", LOG_PID, LOG_ATD); -+#endif -+ - /* The job is now finished. We can delete its input file. - */ - chdir(ATJOB_DIR); - unlink(newname); - -+#ifdef ATD_MAIL_PROGRAM - if (((send_mail != -1) && (buf.st_size != size)) || (send_mail == 1)) { -- -- PRIV_START -+ int mail_pid = -1; -+#ifdef WITH_PAM -+ retcode = pam_start("atd", pentry->pw_name, &conv, &pamh); -+ PAM_FAIL_CHECK; -+ retcode = pam_set_item(pamh, PAM_TTY, "atd"); -+ PAM_FAIL_CHECK; -+ retcode = pam_acct_mgmt(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_open_session(pamh, PAM_SILENT); -+ PAM_FAIL_CHECK; -+ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); -+ PAM_FAIL_CHECK; -+ /* PAM has now re-opened our log to auth.info ! */ -+ closelog(); -+ openlog("atd", LOG_PID, LOG_ATD); -+#endif -+ -+ mail_pid = fork(); -+ -+ if ( mail_pid == 0 ) -+ { -+ PRIV_START - - if (initgroups(pentry->pw_name, pentry->pw_gid)) - perr("Cannot delete saved userids"); -@@ -527,16 +700,81 @@ - - chdir ("/"); - --#if defined(SENDMAIL) -- execl(SENDMAIL, "sendmail", mailname, (char *) NULL); --#else --/*#error "No mail command specified."*/ -- perr("No mail command specified."); -+#ifdef WITH_SELINUX -+ if (selinux_enabled>0) { -+ security_context_t user_context=NULL; -+ security_context_t file_context=NULL; -+ int retval=0; -+ struct av_decision avd; -+ -+ if (get_default_context(pentry->pw_name, NULL, &user_context)) -+ perr("execle: couldn't get security context for user %s\n", pentry->pw_name); -+ /* -+ * Since crontab files are not directly executed, -+ * crond must ensure that the crontab file has -+ * a context that is appropriate for the context of -+ * the user cron job. It performs an entrypoint -+ * permission check for this purpose. -+ */ -+ if (fgetfilecon(STDIN_FILENO, &file_context) < 0) -+ perr("fgetfilecon FAILED %s", filename); -+ -+ retval = security_compute_av(user_context, -+ file_context, -+ SECCLASS_FILE, -+ FILE__ENTRYPOINT, -+ &avd); -+ freecon(file_context); -+ if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { -+ if (security_getenforce()==1) { -+ perr("Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ } else { -+ syslog(LOG_ERR, "Not allowed to set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ goto out; -+ } -+ } -+ -+ if (setexeccon(user_context) < 0) { -+ if (security_getenforce()==1) { -+ perr("Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ } else { -+ syslog(LOG_ERR, "Could not set exec context to %s for user %s\n", user_context,pentry->pw_name); -+ } -+ } -+ freecon(user_context); -+ } -+#endif -+ -+ execl(ATD_MAIL_PROGRAM, ATD_MAIL_NAME, mailname, (char *) NULL); -+ perr("Exec failed for mail command"); -+ exit(-1); -+#ifdef WITH_SELINUX -+ if (selinux_enabled>0) { -+ if (setexeccon(NULL) < 0) -+ if (security_getenforce()==1) -+ perr("Could not resset exec context for user %s\n", pentry->pw_name); -+ } -+ } - #endif -- perr("Exec failed for mail command"); - -- PRIV_END -+ PRIV_END -+ } else -+ if ( mail_pid == -1 ) { -+ perr("fork of mailer failed"); -+ } else { -+ /* Parent */ -+ waitpid(mail_pid, (int *) NULL, 0); +--- at-3.1.10/atd.c.dont_fork 2007-01-30 11:02:37.000000000 +0100 ++++ at-3.1.10/atd.c 2007-01-30 11:07:23.000000000 +0100 +@@ -1001,7 +1001,7 @@ + run_as_daemon = 1; + batch_interval = BATCH_INTERVAL_DEFAULT; + +- while ((c = getopt(argc, argv, "sdl:b:")) != EOF) { ++ while ((c = getopt(argc, argv, "sdl:b:n")) != EOF) { + switch (c) { + case 'l': + if (sscanf(optarg, "%lf", &load_avg) != 1) +@@ -1014,10 +1014,15 @@ + if (sscanf(optarg, "%ud", &batch_interval) != 1) + pabort("garbled option -b"); + break; ++ + case 'd': + daemon_debug++; ++ /* go through another option*/ + -+#ifdef WITH_PAM -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT ); -+ pam_close_session(pamh, PAM_SILENT); -+ pam_end(pamh, PAM_ABORT); -+ closelog(); -+ openlog("atd", LOG_PID, LOG_ATD); -+#endif -+ } - } -+#endif - exit(EXIT_SUCCESS); - } - -@@ -736,6 +974,10 @@ - struct passwd *pwe; - struct group *ge; - -+#ifdef WITH_SELINUX -+ selinux_enabled=is_selinux_enabled(); -+#endif -+ - /* We don't need root privileges all the time; running under uid and gid - * daemon is fine. - */ -@@ -752,11 +994,7 @@ - - RELINQUISH_PRIVS_ROOT(daemon_uid, daemon_gid) - --#ifndef LOG_CRON --#define LOG_CRON LOG_DAEMON --#endif ++ case 'n': ++ daemon_nofork++; + break; - -- openlog("atd", LOG_PID, LOG_CRON); -+ openlog("atd", LOG_PID, LOG_ATD); - - opterr = 0; - errno = 0; -@@ -784,6 +1022,9 @@ ++ + case 's': run_as_daemon = 0; break; - -+ case 'n': -+ daemon_nofork = 1; -+ break; - case '?': - pabort("unknown option"); - break; -@@ -806,6 +1047,10 @@ - act.sa_flags = SA_NOCLDSTOP; - sigaction(SIGCHLD, &act, NULL); - -+ if (daemon_nofork) { -+ daemon_setup(); -+ } -+ - if (!run_as_daemon) { - now = time(NULL); - run_loop(); --- at-3.1.10/daemon.c.dont_fork 2005-08-05 05:16:01.000000000 +0200 -+++ at-3.1.10/daemon.c 2007-01-29 15:46:09.000000000 +0100 ++++ at-3.1.10/daemon.c 2007-01-30 11:06:19.000000000 +0100 @@ -50,7 +50,8 @@ static const char *svnid = "$Id$"; @@ -434,9 +59,29 @@ PRIV_START --- at-3.1.10/daemon.h.dont_fork 2005-08-05 05:16:01.000000000 +0200 -+++ at-3.1.10/daemon.h 2007-01-29 15:46:09.000000000 +0100 ++++ at-3.1.10/daemon.h 2007-01-30 11:07:54.000000000 +0100 @@ -14,3 +14,4 @@ perr (const char *fmt, ...); extern int daemon_debug; +extern int daemon_nofork; +--- at-3.1.8/atd.8.in.dontfork 2002-01-18 08:41:03.000000000 +0100 ++++ at-3.1.8/atd.8.in 2007-01-30 10:51:51.000000000 +0100 +@@ -10,6 +10,7 @@ + .IR batch_interval ] + .RB [ -d ] + .RB [ -s ] ++.RB [ -n ] + .SH DESCRIPTION + .B atd + runs jobs queued by +@@ -46,6 +47,9 @@ + is installed as + .B @prefix@/sbin/atrun + for backward compatibility. ++.TP 8 ++.B -n ++Don't fork option. + .SH WARNING + .B atd + won't work if its spool directory is mounted via NFS even if Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/devel/at.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- at.spec 14 Nov 2006 11:36:00 -0000 1.45 +++ at.spec 30 Jan 2007 10:32:28 -0000 1.46 @@ -42,8 +42,8 @@ #Patch32: at-3.1.8-pam_loginuid.patch #Patch33: at-3.1.8-getseuserbyname.patch #Patch34: at-3.1.8-install_no_chown.patch -Patch35: at-3.1.10-dont_fork.patch -Patch36: at-3.1.10-pam.patch +Patch35: at-3.1.10-pam.patch +Patch36: at-3.1.10-dont_fork.patch Patch37: at-3.1.10-makefile.patch Patch38: at-3.1.10-daylight.patch Patch39: at-3.1.10-perm.patch @@ -114,8 +114,8 @@ #%patch32 -p1 -b .pam_loginuid -> in pam.patch #%patch33 -p1 -b .getseuserbyname -> pam.patch #%patch34 -p1 -b .install_no_chown -> makefile.patch -%patch35 -p1 -b .dont_fork -%patch36 -p1 -b .pam +%patch35 -p1 -b .pam +%patch36 -p1 -b .dont_fork %patch37 -p1 -b .makefile %patch38 -p1 -b .daylight %patch39 -p1 -b .perm From fedora-cvs-commits at redhat.com Tue Jan 30 10:35:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:35:20 -0500 Subject: rpms/at/FC-6 at-3.1.8-dontfork.patch,1.1,1.2 at.spec,1.41,1.42 Message-ID: <200701301035.l0UAZKJM025214@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25050 Modified Files: at-3.1.8-dontfork.patch at.spec Log Message: Change patch. at-3.1.8-dontfork.patch: atd.8.in | 6 +++++- atd.c | 9 +++++++-- daemon.c | 8 ++++++-- daemon.h | 2 ++ 4 files changed, 20 insertions(+), 5 deletions(-) Index: at-3.1.8-dontfork.patch =================================================================== RCS file: /cvs/dist/rpms/at/FC-6/at-3.1.8-dontfork.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-3.1.8-dontfork.patch 23 Aug 2006 11:46:32 -0000 1.1 +++ at-3.1.8-dontfork.patch 30 Jan 2007 10:35:18 -0000 1.2 @@ -1,5 +1,5 @@ --- at-3.1.8/daemon.c.dontfork 2002-01-18 05:15:27.000000000 +0100 -+++ at-3.1.8/daemon.c 2006-08-23 12:13:11.000000000 +0200 ++++ at-3.1.8/daemon.c 2007-01-30 10:51:51.000000000 +0100 @@ -50,7 +50,8 @@ static char rcsid[] = "$Id$"; @@ -30,8 +30,44 @@ PRIV_START +--- at-3.1.8/atd.c.dontfork 2007-01-30 10:51:51.000000000 +0100 ++++ at-3.1.8/atd.c 2007-01-30 10:53:54.000000000 +0100 +@@ -950,7 +950,7 @@ + run_as_daemon = 1; + batch_interval = BATCH_INTERVAL_DEFAULT; + +- while ((c = getopt(argc, argv, "sdl:b:")) != EOF) { ++ while ((c = getopt(argc, argv, "sdl:b:n")) != EOF) { + switch (c) { + case 'l': + if (sscanf(optarg, "%lf", &load_avg) != 1) +@@ -963,10 +963,15 @@ + if (sscanf(optarg, "%ud", &batch_interval) != 1) + pabort("garbled option -b"); + break; ++ + case 'd': + daemon_debug++; ++ /*go through another options*/ ++ ++ case 'n': ++ daemon_nofork++; + break; +- ++ + case 's': + run_as_daemon = 0; + break; +--- at-3.1.8/daemon.h.dontfork 1997-05-06 10:28:18.000000000 +0200 ++++ at-3.1.8/daemon.h 2007-01-30 10:51:51.000000000 +0100 +@@ -14,3 +14,5 @@ + perr (const char *fmt, ...); + + extern int daemon_debug; ++extern int daemon_nofork; ++ --- at-3.1.8/atd.8.in.dontfork 2002-01-18 08:41:03.000000000 +0100 -+++ at-3.1.8/atd.8.in 2006-08-23 12:18:38.000000000 +0200 ++++ at-3.1.8/atd.8.in 2007-01-30 10:51:51.000000000 +0100 @@ -1,5 +1,5 @@ .Id $Id$ -.TH ATD 8 "Mar 1997" local "Linux Programmer's Manual" @@ -57,11 +93,3 @@ .SH WARNING .B atd won't work if its spool directory is mounted via NFS even if ---- at-3.1.8/daemon.h.dontfork 1997-05-06 10:28:18.000000000 +0200 -+++ at-3.1.8/daemon.h 2006-08-23 12:14:10.000000000 +0200 -@@ -14,3 +14,5 @@ - perr (const char *fmt, ...); - - extern int daemon_debug; -+extern int daemon_nofork; -+ Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/FC-6/at.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- at.spec 11 Dec 2006 14:36:43 -0000 1.41 +++ at.spec 30 Jan 2007 10:35:18 -0000 1.42 @@ -4,7 +4,7 @@ Summary: Job spooling tools. Name: at Version: 3.1.8 -Release: 84%{?dist} +Release: 85%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.debian.org/debian/pool/main/a/at/at_3.1.8-11.tar.gz @@ -195,6 +195,10 @@ %attr(4755,root,root) %{_bindir}/at %changelog +* Tue Jan 30 2007 Marcela Maslanova - 3.1.8-85.fc6 +- fix dont fork patch +- rhbz#224597 + * Mon Dec 11 2006 Marcela Maslanova - 3.1.8-84.fc6 - daylight-saving again, now correct for both time changes From fedora-cvs-commits at redhat.com Tue Jan 30 10:40:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:40:17 -0500 Subject: rpms/kdelibs/FC-6 kdelibs-3.5.6-utempter.patch, NONE, 1.1 kdelibs.spec, 1.201, 1.202 kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch, 1.1, NONE kdelibs-3.5.5-kde#135988.patch, 1.1, NONE kdelibs-3.5.5-kmcupsmanager.patch, 1.1, NONE kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch, 1.1, NONE Message-ID: <200701301040.l0UAeH1M028982@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv28892 Modified Files: kdelibs.spec Added Files: kdelibs-3.5.6-utempter.patch Removed Files: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch kdelibs-3.5.5-kde#135988.patch kdelibs-3.5.5-kmcupsmanager.patch kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch Log Message: 3.5.6 kdelibs-3.5.6-utempter.patch: configure.in | 2 +- configure.in.in | 2 +- kdecore/Makefile.am | 2 +- kdecore/Makefile.in | 2 +- kdecore/kpty.cpp | 30 ++++++------------------------ 5 files changed, 10 insertions(+), 28 deletions(-) --- NEW FILE kdelibs-3.5.6-utempter.patch --- --- kdelibs-3.5.6/kdecore/Makefile.am.utempter 2007-01-25 17:38:24.000000000 +0100 +++ kdelibs-3.5.6/kdecore/Makefile.am 2007-01-25 17:53:21.000000000 +0100 @@ -115,7 +115,7 @@ kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \ kqiodevicegzip_p.cpp ktimezones.cpp -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined +libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ --- kdelibs-3.5.6/kdecore/Makefile.in.utempter 2007-01-25 17:38:03.000000000 +0100 +++ kdelibs-3.5.6/kdecore/Makefile.in 2007-01-25 17:53:21.000000000 +0100 @@ -783,7 +783,7 @@ #>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined #>+ 1 -libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) +libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED) libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \ --- kdelibs-3.5.6/kdecore/kpty.cpp.utempter 2007-01-25 17:37:50.000000000 +0100 +++ kdelibs-3.5.6/kdecore/kpty.cpp 2007-01-25 17:53:21.000000000 +0100 @@ -80,6 +80,10 @@ # include #endif +#ifdef HAVE_UTEMPTER +# include +#endif + #ifdef HAVE_TERMIOS_H /* for HP-UX (some versions) the extern C is needed, and for other platforms it doesn't hurt */ @@ -138,21 +142,6 @@ // private functions // /////////////////////// -#ifdef HAVE_UTEMPTER -class KProcess_Utmp : public KProcess -{ -public: - int commSetupDoneC() - { - dup2(cmdFd, 0); - dup2(cmdFd, 1); - dup2(cmdFd, 3); - return 1; - } - int cmdFd; -}; -#endif - #define BASE_CHOWN "kgrantpty" @@ -399,12 +388,8 @@ void KPty::login(const char *user, const char *remotehost) { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; - utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << ""; - utmp.start(KProcess::Block); + utempter_add_record (d->masterFd, remotehost); Q_UNUSED(user); - Q_UNUSED(remotehost); #elif defined(USE_LOGIN) const char *str_ptr; struct utmp l_struct; @@ -442,10 +427,7 @@ void KPty::logout() { #ifdef HAVE_UTEMPTER - KProcess_Utmp utmp; - utmp.cmdFd = d->masterFd; - utmp << "/usr/sbin/utempter" << "-d" << d->ttyName; - utmp.start(KProcess::Block); + utempter_remove_record (d->masterFd); #elif defined(USE_LOGIN) const char *str_ptr = d->ttyName.data(); if (!memcmp(str_ptr, "/dev/", 5)) --- kdelibs-3.5.6/configure.in.in.utempter 2006-05-22 20:14:23.000000000 +0200 +++ kdelibs-3.5.6/configure.in.in 2007-01-25 18:15:25.000000000 +0100 @@ -395,7 +395,7 @@ [], with_utempter=check) if test "x$with_utempter" != xno; then kde_have_utempter=yes - AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) + AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) AC_SUBST(LIBUTEMPTER) if test "$kde_have_utempter" = "yes"; then AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment]) --- kdelibs-3.5.6/configure.in.utempter 2007-01-25 18:15:52.000000000 +0100 +++ kdelibs-3.5.6/configure.in 2007-01-25 18:15:39.000000000 +0100 @@ -399,7 +399,7 @@ [], with_utempter=check) if test "x$with_utempter" != xno; then kde_have_utempter=yes - AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) + AC_CHECK_LIB(utempter, utempter_add_record, [LIBUTEMPTER=-lutempter], kde_have_utempter=no) AC_SUBST(LIBUTEMPTER) if test "$kde_have_utempter" = "yes"; then AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment]) Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-6/kdelibs.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- kdelibs.spec 7 Dec 2006 15:40:45 -0000 1.201 +++ kdelibs.spec 30 Jan 2007 10:40:15 -0000 1.202 @@ -8,15 +8,15 @@ %define cups_epoch 1 %define qt_version 3.3.7 -%define arts_version 1.5.5 +%define arts_version 1.5.6 %define kde_major_version 3 %define qtdocdir %{_docdir}/qt-devel-%{qt_version} %define make_cvs 0 -Version: 3.5.5 -Release: 0.3%{?dist} +Version: 3.5.6 +Release: 0.1%{?dist} Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -44,14 +44,7 @@ Patch38: kdelibs-3.5.2-cupsdconf2-group.patch Patch39: kdelibs-3.5.4-kabc-make.patch Patch40: kdelibs-3.5.4-kdeprint-utf8.patch - -# upstream patches -Patch100: kdelibs-3.5.5-kmcupsmanager.patch -Patch101: kdelibs-3.5.5-kde#135988.patch -Patch102: kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch - -# security fixes -Patch500: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch +Patch41: kdelibs-3.5.6-utempter.patch Requires: arts >= %{arts_epoch}:%{arts_version} Requires: qt >= %{qt_epoch}:%{qt_version} @@ -174,14 +167,7 @@ %patch38 -p1 -b .cupsdconf2-group %patch39 -p1 -b .kabc-make %patch40 -p1 -b .kdeprint-utf8 - -# upstream pathces -%patch100 -p1 -b .kmcupsmanager -%patch101 -p0 -b .kde#135988 -%patch102 -p0 -b .vfolder-xdgMenuPrefix - -# security fixes -%patch500 -p1 -b .CVE-2006-4811 +%patch41 -p1 -b .utempter perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -206,7 +192,6 @@ %configure \ --disable-fast-malloc \ --enable-new-ldflags \ - --disable-dependency-tracking \ --with-qt-libraries=$QTLIB \ --enable-libsuffix="$suffix" \ --enable-cups \ @@ -217,20 +202,15 @@ --with-distribution="$VERSION" \ --with-alsa \ --includedir=%{_includedir}/kde \ -%if %{debug} == 0 - --disable-debug \ - --disable-warnings \ -%endif -%if %{final} -%ifnarch s390x - --enable-final \ -%endif -%endif --disable-libfam \ --enable-dnotify \ --enable-inotify \ --disable-rpath \ --with-utempter \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking --enable-final \ + %{?debug:--enable-debug --enable-warnings --disable-final} \ + %{!?arts:--without-arts} \ --with-rgbfile=%{_datadir}/X11/rgb.txt # ld breaks with -fPIC on ppc, workaround @@ -404,6 +384,9 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Tue Jan 30 2007 Than Ngo - 6:3.5.6-0.1 +- 3.5.6 + * Thu Dec 07 2006 Than Ngo - 6:3.5.5-0.3 - apply upstream patch to support XDG_MENU_PREFIX --- kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch DELETED --- --- kdelibs-3.5.5-kde#135988.patch DELETED --- --- kdelibs-3.5.5-kmcupsmanager.patch DELETED --- --- kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 10:41:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 05:41:52 -0500 Subject: rpms/kdelibs/FC-6 sources,1.49,1.50 Message-ID: <200701301041.l0UAfqrh030251@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv30161 Modified Files: sources Log Message: 3.5.6 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-6/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 25 Oct 2006 14:53:42 -0000 1.49 +++ sources 30 Jan 2007 10:41:50 -0000 1.50 @@ -1 +1 @@ -2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 +e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 11:28:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:28:38 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.19, 1.20 Message-ID: <200701301128.l0UBScB8008588@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8503 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch Log Message: more goodies openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 18 psprint/source/printer/printerinfomanager.cxx | 8 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 530 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 +++++ vcl/source/gdi/print.cxx | 11 26 files changed, 792 insertions(+), 12 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 10:04:52 -0000 1.19 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 11:28:36 -0000 1.20 @@ -1,45 +1,3 @@ -Index: source/printergfx/printerjob.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v -retrieving revision 1.40 -diff -u -r1.40 printerjob.cxx ---- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40 -+++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000 -@@ -740,6 +740,9 @@ - if( ! pKey || ! pValue ) - return true; - -+ if (pValue->m_bCupsOnly) -+ return true; -+ - OStringBuffer aFeature(256); - aFeature.append( "[{\n" ); - if( bUseIncluseFeature ) -Index: inc/psprint/ppdparser.hxx -=================================================================== -RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v -retrieving revision 1.9 -diff -u -r1.9 ppdparser.hxx ---- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx 8 Sep 2005 16:34:44 -0000 1.9 -+++ openoffice.org/psprint/inc/psprint/ppdparser.hxx 19 May 2006 13:15:15 -0000 -@@ -61,6 +61,8 @@ - String m_aOptionTranslation; - String m_aValue; - String m_aValueTranslation; -+ bool m_bCupsOnly; -+ PPDValue() : m_eType(eInvocation), m_bCupsOnly(false) {} - }; - - // ---------------------------------------------------------------------- -@@ -139,7 +141,7 @@ - - typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type; - typedef ::std::vector< PPDKey* > value_type; -- -+public: - void insertKey( const String& rKey, PPDKey* pKey ); - public: - struct PPDConstraint Index: source/dialogs/makefile.mk =================================================================== RCS file: /cvs/util/svtools/source/dialogs/makefile.mk,v @@ -344,99 +302,6 @@ } // ----------------------------------------------------------------------- -Index: source/printer/cupsmgr.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/printer/cupsmgr.cxx,v -retrieving revision 1.12 -diff -u -p -u -r1.12 cupsmgr.cxx ---- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12 -+++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000 -@@ -407,10 +407,15 @@ - m_pDests( NULL ), - m_bNewDests( false ) - { -+ startsearch(); -+} -+ -+void CUPSManager::startsearch() -+{ - m_aDestThread = osl_createThread( run_dest_thread_stub, this ); - } - --CUPSManager::~CUPSManager() -+void CUPSManager::stopsearch() - { - if( m_aDestThread ) - { -@@ -422,6 +427,11 @@ - - if( m_nDests && m_pDests ) - m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests ); -+} -+ -+CUPSManager::~CUPSManager() -+{ -+ stopsearch(); - delete m_pCUPSWrapper; - } - -@@ -475,9 +485,10 @@ - - // clear old stuff - m_aCUPSDestMap.clear(); -- -+#if 0 - if( ! (m_nDests && m_pDests ) ) - return; -+#endif - - // check for CUPS server(?) > 1.2 - // since there is no API to query, check for options that were -@@ -569,6 +580,10 @@ - - m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback ); - #endif // ENABLE_CUPS -+ -+ addPrinter(rtl::OUString::createFromAscii("Generic Printer"), -+ rtl::OUString::createFromAscii("SGENPRT")); -+ - } - - #ifdef ENABLE_CUPS -Index: inc/cupsmgr.hxx -=================================================================== -RCS file: /cvs/gsl/psprint/inc/cupsmgr.hxx,v -retrieving revision 1.9 -diff -u -r1.9 cupsmgr.hxx ---- openoffice.org.orig/psprint/inc/cupsmgr.hxx 10 Jul 2006 16:29:13 -0000 1.9 -+++ openoffice.org/psprint/inc/cupsmgr.hxx 29 Jan 2007 13:36:19 -0000 -@@ -99,7 +99,9 @@ - virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); - - // check if the printer configuration has changed -+ virtual void startsearch (); - virtual bool checkPrintersChanged( bool bWait ); -+ virtual void stopsearch (); - - // members for administration (->padmin) - // disable for CUPS -Index: inc/psprint/printerinfomanager.hxx -=================================================================== -RCS file: /cvs/gsl/psprint/inc/psprint/printerinfomanager.hxx,v -retrieving revision 1.15.2.1 -diff -u -r1.15.2.1 printerinfomanager.hxx ---- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx 24 Jan 2007 15:06:04 -0000 1.15.2.1 -+++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx 29 Jan 2007 13:36:31 -0000 -@@ -188,7 +188,9 @@ - // check if the printer configuration has changed - // if bwait is true, then this method waits for eventual asynchronous - // printer discovery to finish -+ virtual void startsearch(); - virtual bool checkPrintersChanged( bool bWait ); -+ virtual void stopsearch(); - - // members for administration (->padmin) - Index: inc/printdlg.hxx =================================================================== RCS file: /cvs/util/svtools/inc/printdlg.hxx,v @@ -1089,9 +954,111 @@ Text [ x-comment ] = " "; }; ---- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 10:03:20.000000000 +0000 -+++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-29 12:49:51.000000000 +0000 -@@ -137,6 +137,14 @@ +diff -ru psprint/inc/cupsmgr.hxx psprint/inc/cupsmgr.hxx +--- openoffice.org.orig/psprint/inc/cupsmgr.hxx 2007-01-30 06:18:23.000000000 -0500 ++++ openoffice.org/psprint/inc/cupsmgr.hxx 2007-01-30 06:22:54.000000000 -0500 +@@ -99,7 +99,9 @@ + virtual void changePrinterInfo( const ::rtl::OUString& rPrinter, const PrinterInfo& rNewInfo ); + + // check if the printer configuration has changed ++ virtual void startsearch (); + virtual bool checkPrintersChanged( bool bWait ); ++ virtual void stopsearch (); + + // members for administration (->padmin) + // disable for CUPS +diff -ru psprint/inc/psprint/ppdparser.hxx psprint/inc/psprint/ppdparser.hxx +--- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx 2007-01-30 06:18:23.000000000 -0500 ++++ openoffice.org/psprint/inc/psprint/ppdparser.hxx 2007-01-30 06:22:53.000000000 -0500 +@@ -61,6 +61,8 @@ + String m_aOptionTranslation; + String m_aValue; + String m_aValueTranslation; ++ bool m_bCupsOnly; ++ PPDValue() : m_eType(eInvocation), m_bCupsOnly(false) {} + }; + + // ---------------------------------------------------------------------- +@@ -139,7 +141,7 @@ + + typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type; + typedef ::std::vector< PPDKey* > value_type; +- ++public: + void insertKey( const String& rKey, PPDKey* pKey ); + public: + struct PPDConstraint +diff -ru psprint/inc/psprint/printerinfomanager.hxx psprint/inc/psprint/printerinfomanager.hxx +--- openoffice.org.orig/psprint/inc/psprint/printerinfomanager.hxx 2007-01-30 06:18:24.000000000 -0500 ++++ openoffice.org/psprint/inc/psprint/printerinfomanager.hxx 2007-01-30 06:22:54.000000000 -0500 +@@ -180,7 +180,9 @@ + // check if the printer configuration has changed + // if bwait is true, then this method waits for eventual asynchronous + // printer discovery to finish ++ virtual void startsearch(); + virtual bool checkPrintersChanged( bool bWait ); ++ virtual void stopsearch(); + + // members for administration (->padmin) + +diff -ru psprint/source/printer/cupsmgr.cxx psprint/source/printer/cupsmgr.cxx +--- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 2007-01-30 06:18:26.000000000 -0500 ++++ openoffice.org/psprint/source/printer/cupsmgr.cxx 2007-01-30 06:24:26.000000000 -0500 +@@ -397,10 +397,15 @@ + m_pDests( NULL ), + m_bNewDests( false ) + { ++ startsearch(); ++} ++ ++void CUPSManager::startsearch() ++{ + m_aDestThread = osl_createThread( run_dest_thread_stub, this ); + } + +-CUPSManager::~CUPSManager() ++void CUPSManager::stopsearch() + { + if( m_aDestThread ) + { +@@ -412,6 +417,11 @@ + + if( m_nDests && m_pDests ) + m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests ); ++} ++ ++CUPSManager::~CUPSManager() ++{ ++ stopsearch(); + delete m_pCUPSWrapper; + } + +@@ -466,8 +476,10 @@ + // clear old stuff + m_aCUPSDestMap.clear(); + ++#if 0 + if( ! (m_nDests && m_pDests ) ) + return; ++#endif + + rtl_TextEncoding aEncoding = osl_getThreadTextEncoding(); + int nPrinter = m_nDests; +@@ -547,6 +559,10 @@ + + m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback ); + #endif // ENABLE_CUPS ++ ++ addPrinter(rtl::OUString::createFromAscii("Generic Printer"), ++ rtl::OUString::createFromAscii("SGENPRT")); ++ + } + + #ifdef ENABLE_CUPS +diff -ru psprint/source/printer/printerinfomanager.cxx psprint/source/printer/printerinfomanager.cxx +--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 06:18:26.000000000 -0500 ++++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-30 06:22:54.000000000 -0500 +@@ -129,6 +129,14 @@ // ----------------------------------------------------------------- @@ -1106,3 +1073,16 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait ) { // check if files were created, deleted or modified since initialize() +diff -ru psprint/source/printergfx/printerjob.cxx psprint/source/printergfx/printerjob.cxx +--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 2007-01-30 06:18:27.000000000 -0500 ++++ openoffice.org/psprint/source/printergfx/printerjob.cxx 2007-01-30 06:23:54.000000000 -0500 +@@ -737,6 +737,9 @@ + if( ! pKey || ! pValue ) + return true; + ++ if (pValue->m_bCupsOnly) ++ return true; ++ + String aFeature( RTL_CONSTASCII_USTRINGPARAM( "[{\n%%BeginFeature: *" ) ); + aFeature += pKey->getKey(); + aFeature += ' '; From fedora-cvs-commits at redhat.com Tue Jan 30 11:31:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:31:17 -0500 Subject: rpms/bluez-libs/devel .cvsignore, 1.17, 1.18 bluez-libs.spec, 1.29, 1.30 sources, 1.17, 1.18 Message-ID: <200701301131.l0UBVHoQ010570@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-libs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10517 Modified Files: .cvsignore bluez-libs.spec sources Log Message: 3.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bluez-libs/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 30 Sep 2006 12:18:18 -0000 1.17 +++ .cvsignore 30 Jan 2007 11:31:15 -0000 1.18 @@ -1 +1 @@ -bluez-libs-3.7.tar.gz +bluez-libs-3.9.tar.gz Index: bluez-libs.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-libs/devel/bluez-libs.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- bluez-libs.spec 30 Sep 2006 12:18:18 -0000 1.29 +++ bluez-libs.spec 30 Jan 2007 11:31:15 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Bluetooth libraries Name: bluez-libs -Version: 3.7 -Release: 1 +Version: 3.9 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/bluez.pc %changelog +* Tue Jan 30 2007 David Woodhouse 3.9-1 +- Update to bluez-libs 3.9 + * Wed Sep 27 2006 David Woodhouse 3.7-1 - Update to bluez-libs 3.7 Index: sources =================================================================== RCS file: /cvs/dist/rpms/bluez-libs/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 30 Sep 2006 12:18:18 -0000 1.17 +++ sources 30 Jan 2007 11:31:15 -0000 1.18 @@ -1 +1 @@ -d384893177b4241462a591668cc439d6 bluez-libs-3.7.tar.gz +53275e1824886368f11f586899707e08 bluez-libs-3.9.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 30 11:35:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:35:19 -0500 Subject: rpms/squid/FC-6 .cvsignore, 1.21, 1.22 sources, 1.26, 1.27 squid.spec, 1.80, 1.81 Message-ID: <200701301135.l0UBZJXN008048@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/squid/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8020 Modified Files: .cvsignore sources squid.spec Log Message: * Tue Jan 30 2007 Martin Bacovsky - 7:2.6.STABLE9-1.fc7 - update to the latest upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squid/FC-6/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Oct 2006 10:13:18 -0000 1.21 +++ .cvsignore 30 Jan 2007 11:35:17 -0000 1.22 @@ -1,8 +1 @@ -squid-2.5.STABLE9.tar.bz2 -squid-2.5.STABLE10.tar.bz2 -squid-2.5.STABLE11.tar.bz2 -squid-2.5.STABLE12.tar.bz2 -squid-2.5.STABLE13.tar.bz2 -squid-2.5.STABLE14.tar.bz2 -squid-2.6.STABLE3.tar.bz2 -squid-2.6.STABLE4.tar.bz2 +squid-2.6.STABLE9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squid/FC-6/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 14 Jan 2007 10:22:24 -0000 1.26 +++ sources 30 Jan 2007 11:35:17 -0000 1.27 @@ -1 +1 @@ -7e8eed297ceb4f3067c960d4c4d04e87 squid-2.6.STABLE7.tar.bz2 +95997d6cb38fdb562ecb790c553f9cfc squid-2.6.STABLE9.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/FC-6/squid.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- squid.spec 14 Jan 2007 10:22:24 -0000 1.80 +++ squid.spec 30 Jan 2007 11:35:17 -0000 1.81 @@ -4,7 +4,7 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.6.STABLE7 +Version: 2.6.STABLE9 Release: 1%{?dist} Epoch: 7 License: GPL @@ -324,6 +324,9 @@ chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || : %changelog +* Tue Jan 30 2007 Martin Bacovsky - 7:2.6.STABLE9-1.fc7 +- update to the latest upstream + * Sun Jan 14 2007 Martin Stransky - 7:2.6.STABLE7-1 - update to the latest upstream From fedora-cvs-commits at redhat.com Tue Jan 30 11:47:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:47:49 -0500 Subject: rpms/procps/devel procps-3.2.3-FAQ.patch, 1.2, 1.3 procps.spec, 1.56, 1.57 Message-ID: <200701301147.l0UBlndj020935@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/procps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19169 Modified Files: procps-3.2.3-FAQ.patch procps.spec Log Message: * Tue Jan 30 2007 Karel Zak 3.2.7-9 - fix procps_version in FAQ patch (thanks to Ian Kent) procps-3.2.3-FAQ.patch: proc/library.map | 2 +- proc/version.c | 4 +++- proc/version.h | 1 + ps/parser.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) Index: procps-3.2.3-FAQ.patch =================================================================== RCS file: /cvs/dist/rpms/procps/devel/procps-3.2.3-FAQ.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- procps-3.2.3-FAQ.patch 1 Nov 2005 10:37:33 -0000 1.2 +++ procps-3.2.3-FAQ.patch 30 Jan 2007 11:47:47 -0000 1.3 @@ -17,7 +17,7 @@ +const char procps_number_version[] = VERSION "." SUBVERSION "." MINORVERSION; #else -const char procps_version[] = "procps version " VERSION "." SUBVERSION; -+const char procps__version[] = "procps version " VERSION "." SUBVERSION; ++const char procps_version[] = "procps version " VERSION "." SUBVERSION; +const char procps_number_version[] = VERSION "." SUBVERSION; #endif Index: procps.spec =================================================================== RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- procps.spec 27 Sep 2006 15:37:35 -0000 1.56 +++ procps.spec 30 Jan 2007 11:47:47 -0000 1.57 @@ -1,7 +1,7 @@ Summary: System and process monitoring utilities. Name: procps Version: 3.2.7 -Release: 8 +Release: 9 License: GPL Group: Applications/System Source: http://procps.sourceforge.net/procps-%{version}.tar.gz @@ -124,6 +124,9 @@ %attr(0644,root,root) %{_mandir}/man5/* %changelog +* Tue Jan 30 2007 Karel Zak 3.2.7-9 +- fix procps_version in FAQ patch (thanks to Ian Kent) + * Wed Sep 27 2006 Karel Zak 3.2.7-8 - remove zombie patch (needs more investigation) - fix #208100 - top command with '-c' option become not to display list of tasks From fedora-cvs-commits at redhat.com Tue Jan 30 11:48:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:48:59 -0500 Subject: rpms/brltty/devel brltty-3.7.2-debuginfo.patch, NONE, 1.1 brltty.spec, 1.20, 1.21 Message-ID: <200701301148.l0UBmxOG028739@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/brltty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28721 Modified Files: brltty.spec Added Files: brltty-3.7.2-debuginfo.patch Log Message: * Tue Jan 30 2007 Tomas Janousek - 3.7.2-2 - failsafe postinstall script, fixes #224570 - makefile fix - debuginfo extraction now works brltty-3.7.2-debuginfo.patch: config.mk.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE brltty-3.7.2-debuginfo.patch --- --- brltty-3.7.2/config.mk.in.debuginfo 2005-12-26 13:58:07.000000000 +0100 +++ brltty-3.7.2/config.mk.in 2007-01-30 12:39:10.000000000 +0100 @@ -89,7 +89,7 @@ INSTALL = @INSTALL@ INSTALL_SCRIPT = $(INSTALL) -INSTALL_PROGRAM = $(INSTALL_SCRIPT) -s +INSTALL_PROGRAM = $(INSTALL_SCRIPT) INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DIRECTORY = $(INSTALL) -d Index: brltty.spec =================================================================== RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- brltty.spec 25 Jan 2007 11:05:26 -0000 1.20 +++ brltty.spec 30 Jan 2007 11:48:57 -0000 1.21 @@ -1,12 +1,13 @@ Name: brltty Version: 3.7.2 -Release: 1.1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://mielke.cc/brltty/ Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz Patch0: brltty-3.7.2-linux-compiler-h.patch Patch1: brltty-3.7.2-vt-buildfix.patch +Patch2: brltty-3.7.2-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot Summary: Braille display driver for Linux/Unix. Requires(post): coreutils @@ -55,6 +56,7 @@ %setup -n brltty-3.7.2 %patch0 -p1 -b .linux-compiler-h %patch1 -p1 -b .vt-buildfix +%patch2 -p1 -b .debuginfo %build %configure --with-install-root="${RPM_BUILD_ROOT}" --with-braille-driver=-tt @@ -95,6 +97,7 @@ chown root.tty "${device}" echo "done." fi +exit 0 %files %defattr(-,root,root) @@ -124,6 +127,10 @@ %doc Documents/BrlAPIref-HTML %changelog +* Tue Jan 30 2007 Tomas Janousek - 3.7.2-2 +- failsafe postinstall script, fixes #224570 +- makefile fix - debuginfo extraction now works + * Thu Jan 25 2007 Tomas Janousek - 3.7.2-1.1 - fix building with newer kernel-headers (#224149) From fedora-cvs-commits at redhat.com Tue Jan 30 11:51:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:51:09 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec, 1.53, 1.54 bluez-utils-3.7-newconn-name.patch, 1.1, NONE bluez-utils-3.7-pcmcia.patch, 1.1, NONE Message-ID: <200701301151.l0UBp9vQ028856@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28841 Modified Files: bluez-utils.spec Removed Files: bluez-utils-3.7-newconn-name.patch bluez-utils-3.7-pcmcia.patch Log Message: 3.9 Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- bluez-utils.spec 30 Sep 2006 22:56:23 -0000 1.53 +++ bluez-utils.spec 30 Jan 2007 11:51:07 -0000 1.54 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils -Version: 3.7 -Release: 2 +Version: 3.9 +Release: 1%{?dist} License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -14,8 +14,6 @@ Source8: hidd.conf Source9: bluetooth.conf Patch0: bluez-utils-2.3-conf.patch -Patch1: bluez-utils-3.7-newconn-name.patch -Patch2: bluez-utils-3.7-pcmcia.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ @@ -56,8 +54,6 @@ %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \ @@ -110,6 +106,7 @@ %{_bindir}/* %{_sbindir}/* %{_mandir}/man*/* +%{_libdir}/bluetooth %dir %{_sysconfdir}/bluetooth/ %config(noreplace) %{_sysconfdir}/bluetooth/* %config(noreplace) %{_sysconfdir}/sysconfig/* @@ -123,6 +120,9 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Tue Jan 30 2007 David Woodhouse 3.9-1 +- Update to bluez-utils 3.9 + * Sat Sep 30 2006 David Woodhouse 3.7-2 - Fix udev handling of PCMCIA serial+bluetooth devices --- bluez-utils-3.7-newconn-name.patch DELETED --- --- bluez-utils-3.7-pcmcia.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 11:53:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:53:13 -0500 Subject: rpms/bluez-utils/devel sources,1.15,1.16 .cvsignore,1.15,1.16 Message-ID: <200701301153.l0UBrD5T028989@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28973 Modified Files: sources .cvsignore Log Message: update sources too Index: sources =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 30 Sep 2006 13:52:04 -0000 1.15 +++ sources 30 Jan 2007 11:53:11 -0000 1.16 @@ -1 +1 @@ -89f7290907d098163a2fa59a55dfafe7 bluez-utils-3.7.tar.gz +023a5e6a436f86a28baeec91e4c62736 bluez-utils-3.9.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 30 Sep 2006 13:52:04 -0000 1.15 +++ .cvsignore 30 Jan 2007 11:53:11 -0000 1.16 @@ -1 +1 @@ -bluez-utils-3.7.tar.gz +bluez-utils-3.9.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 30 11:57:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:57:07 -0500 Subject: rpms/bluez-hcidump/devel .cvsignore, 1.14, 1.15 bluez-hcidump.spec, 1.23, 1.24 sources, 1.14, 1.15 bluez-hcidump-1.32-ipv6.patch, 1.1, NONE Message-ID: <200701301157.l0UBv7q3029128@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-hcidump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29111 Modified Files: .cvsignore bluez-hcidump.spec sources Removed Files: bluez-hcidump-1.32-ipv6.patch Log Message: 1.33 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bluez-hcidump/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 30 Sep 2006 13:52:56 -0000 1.14 +++ .cvsignore 30 Jan 2007 11:57:04 -0000 1.15 @@ -1 +1 @@ -bluez-hcidump-1.32.tar.gz +bluez-hcidump-1.33.tar.gz Index: bluez-hcidump.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- bluez-hcidump.spec 30 Sep 2006 13:52:56 -0000 1.23 +++ bluez-hcidump.spec 30 Jan 2007 11:57:04 -0000 1.24 @@ -1,11 +1,10 @@ Summary: Bluetooth HCI protocol analyser Name: bluez-hcidump -Version: 1.32 +Version: 1.33 Release: 1 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz -Patch1: bluez-hcidump-1.32-ipv6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ Requires: glibc >= 2.2.4 @@ -23,7 +22,6 @@ %prep %setup -q -%patch1 -p1 %build %configure @@ -43,6 +41,9 @@ %{_mandir}/man8/hcidump.8.gz %changelog +* Tue Jan 30 2007 David Woodhouse - 1.33-1 +- update to bluez-hcidump 1.33 + * Sat Sep 30 2006 David Woodhouse - 1.32-1 - update to bluez-hcidump 1.32 - Fix BNEP IPv6 parsing (#196879) Index: sources =================================================================== RCS file: /cvs/dist/rpms/bluez-hcidump/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 30 Sep 2006 13:52:56 -0000 1.14 +++ sources 30 Jan 2007 11:57:04 -0000 1.15 @@ -1 +1 @@ -3320121113cf31fe9180470edff2c71d bluez-hcidump-1.32.tar.gz +58fff2bc38594fe8ab0803f66cce2325 bluez-hcidump-1.33.tar.gz --- bluez-hcidump-1.32-ipv6.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 11:57:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 06:57:42 -0500 Subject: rpms/bluez-hcidump/devel bluez-hcidump.spec,1.24,1.25 Message-ID: <200701301157.l0UBvged029166@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-hcidump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29151 Modified Files: bluez-hcidump.spec Log Message: disttag Index: bluez-hcidump.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-hcidump/devel/bluez-hcidump.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- bluez-hcidump.spec 30 Jan 2007 11:57:04 -0000 1.24 +++ bluez-hcidump.spec 30 Jan 2007 11:57:40 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Bluetooth HCI protocol analyser Name: bluez-hcidump Version: 1.33 -Release: 1 +Release: 1%{?dist} License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 30 12:00:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:00:59 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec,1.54,1.55 Message-ID: <200701301200.l0UC0xrP029305@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29290 Modified Files: bluez-utils.spec Log Message: Use glib Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- bluez-utils.spec 30 Jan 2007 11:51:07 -0000 1.54 +++ bluez-utils.spec 30 Jan 2007 12:00:52 -0000 1.55 @@ -20,7 +20,7 @@ BuildRequires: bluez-libs-devel >= %{version} BuildRequires: flex BuildRequires: dbus-devel >= 0.90 -BuildRequires: libusb-devel +BuildRequires: libusb-devel, glib2-devel ExcludeArch: s390 s390x Obsoletes: bluez-pan, bluez-sdp Requires: initscripts, bluez-libs >= %{version} @@ -58,7 +58,7 @@ %build %configure --with-bluez-libs=%{_libdir} --enable-pie --enable-debug \ --enable-all --disable-bcm203x --enable-alsa --enable-bccmd \ - --enable-bccmd --enable-avctrl + --enable-bccmd --enable-avctrl --enable-glib make %install From fedora-cvs-commits at redhat.com Tue Jan 30 12:10:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:10:28 -0500 Subject: rpms/at/devel at-3.1.10-newpam.patch, NONE, 1.1 at-3.1.10-nodebug.patch, NONE, 1.1 at-3.1.10-pam.patch, 1.1, 1.2 at.spec, 1.46, 1.47 Message-ID: <200701301210.l0UCASKW029581@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29561 Modified Files: at-3.1.10-pam.patch at.spec Added Files: at-3.1.10-newpam.patch at-3.1.10-nodebug.patch Log Message: Add patches at-3.1.10-newpam.patch: pam_atd | 15 +++++++++++++++ 1 files changed, 15 insertions(+) --- NEW FILE at-3.1.10-newpam.patch --- --- at-3.1.10/pam_atd.newpam 2007-01-30 13:04:19.000000000 +0100 +++ at-3.1.10/pam_atd 2007-01-30 13:02:09.000000000 +0100 @@ -0,0 +1,15 @@ +# The PAM configuration file for the at daemon +# +# +auth sufficient pam_rootok.so +auth required pam_stack.so +auth include system-auth +auth required pam_env.so +account required pam_stack.so +account include system-auth +session required pam_stack.so +session include system-auth +# Sets up user limits, please uncomment and read /etc/security/limits.conf +# to enable this functionality. +# session required pam_limits.so +# at-3.1.10-nodebug.patch: Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE at-3.1.10-nodebug.patch --- --- at-3.1.10/Makefile.in.debug 2007-01-30 11:30:50.000000000 +0100 +++ at-3.1.10/Makefile.in 2007-01-30 12:41:08.000000000 +0100 @@ -104,14 +104,14 @@ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(ATJOB_DIR) $(IROOT)$(ATSPOOL_DIR) test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -m 600 at.deny $(IROOT)$(etcdir)/ $(INSTALL) -o $(INSTALL_ROOT_USER) -g $(DAEMON_GROUPNAME) pam_atd $(IROOT)$(etcdir)/pam.d/atd - $(INSTALL) -m 4755 -s at $(IROOT)$(bindir) + $(INSTALL) -m 4755 at $(IROOT)$(bindir) $(LN_S) -f at $(IROOT)$(bindir)/atq $(LN_S) -f at $(IROOT)$(bindir)/atrm $(INSTALL) -m 755 batch $(IROOT)$(bindir) $(INSTALL) -m 755 -d $(IROOT)$(man1dir) $(INSTALL) -m 755 -d $(IROOT)$(man5dir) $(INSTALL) -m 755 -d $(IROOT)$(man8dir) - $(INSTALL) -m 755 -s atd $(IROOT)$(sbindir) + $(INSTALL) -m 755 atd $(IROOT)$(sbindir) $(INSTALL) -m 755 atrun $(IROOT)$(sbindir) $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/ cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 at-3.1.10-pam.patch: atd.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- config.h.in | 6 + configure.in | 3 perm.c | 54 +++++++++++ 4 files changed, 314 insertions(+), 19 deletions(-) Index: at-3.1.10-pam.patch =================================================================== RCS file: /cvs/dist/rpms/at/devel/at-3.1.10-pam.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- at-3.1.10-pam.patch 24 Oct 2006 14:25:28 -0000 1.1 +++ at-3.1.10-pam.patch 30 Jan 2007 12:10:25 -0000 1.2 @@ -439,22 +439,6 @@ allow = user_in_file(ETCDIR "/at.allow", pentry->pw_name); if (allow==0 || allow==1) return allow; ---- at-3.1.8/pam_atd.pam 2005-01-25 16:16:41.842416000 -0500 -+++ at-3.1.8/pam_atd 2005-01-25 16:01:10.000000000 -0500 -@@ -0,0 +1,13 @@ -+# -+# The PAM configuration file for the at daemon -+# -+# -+auth sufficient /lib/security/$ISA/pam_rootok.so -+auth required /lib/security/$ISA/pam_stack.so service=system-auth -+auth required pam_env.so -+account required /lib/security/$ISA/pam_stack.so service=system-auth -+session required /lib/security/$ISA/pam_stack.so service=system-auth -+# Sets up user limits, please uncomment and read /etc/security/limits.conf -+# to enable this functionality. -+# session required pam_limits.so -+# --- at-3.1.10/config.h.in.__ 2006-09-07 18:47:06.000000000 +0200 +++ at-3.1.10/config.h.in 2006-09-07 18:48:12.000000000 +0200 @@ -181,3 +181,9 @@ Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/devel/at.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- at.spec 30 Jan 2007 10:32:28 -0000 1.46 +++ at.spec 30 Jan 2007 12:10:25 -0000 1.47 @@ -6,7 +6,7 @@ Summary: Job spooling tools. Name: at Version: 3.1.10 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons Source: http://ftp.debian.org/debian/pool/main/a/at/at-%{major_ver}.tar.gz @@ -47,6 +47,8 @@ Patch37: at-3.1.10-makefile.patch Patch38: at-3.1.10-daylight.patch Patch39: at-3.1.10-perm.patch +Patch40: at-3.1.10-nodebug.patch +Patch41: at-3.1.10-newpam.patch Prereq: fileutils chkconfig /etc/init.d BuildPrereq: flex bison autoconf @@ -60,6 +62,7 @@ BuildPrereq: smtpdaemon Buildroot: %{_tmppath}/%{name}-root +%define debug_package %{nil} %description At and batch read commands from standard input or from a specified file. At allows you to specify that a command will be run at a @@ -119,6 +122,8 @@ %patch37 -p1 -b .makefile %patch38 -p1 -b .daylight %patch39 -p1 -b .perm +%patch40 -p1 -b .nodebug +%patch41 -p1 -b .newpam %build # patch10 touches configure.in @@ -205,6 +210,11 @@ %attr(4755,root,root) %{_bindir}/at %changelog +* Tue Jan 30 2007 Marcela Maslanova - 3.1.10-7 +- no debug file - useless +- new pam configuration +- rhbz#224597 + * Tue Oct 27 2006 Marcela Maslanova - 3.1.10-6 - fix daylight-saving again - fix #214759 - problem with seteuid From fedora-cvs-commits at redhat.com Tue Jan 30 12:16:40 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:16:40 -0500 Subject: rpms/curl/devel .cvsignore,1.22,1.23 sources,1.23,1.24 Message-ID: <200701301216.l0UCGe5H029829@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/curl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29808 Modified Files: .cvsignore sources Log Message: - upload new source tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/curl/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 30 Oct 2006 09:18:31 -0000 1.22 +++ .cvsignore 30 Jan 2007 12:16:38 -0000 1.23 @@ -1,3 +1,4 @@ curl-7.15.4.tar.bz2 curl-7.15.5.tar.bz2 curl-7.16.0.tar.bz2 +curl-7.16.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/curl/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 30 Oct 2006 09:18:31 -0000 1.23 +++ sources 30 Jan 2007 12:16:38 -0000 1.24 @@ -1 +1 @@ -5819f56e93d04cde2992fe88b54cbfad curl-7.16.0.tar.bz2 +acdab0b0467c55e10ed02d2afed80575 curl-7.16.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 12:20:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:20:05 -0500 Subject: rpms/at/devel at.spec,1.47,1.48 at-3.1.10-nodebug.patch,1.1,NONE Message-ID: <200701301220.l0UCK5s8017878@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17860 Modified Files: at.spec Removed Files: at-3.1.10-nodebug.patch Log Message: Remove patch Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/devel/at.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- at.spec 30 Jan 2007 12:10:25 -0000 1.47 +++ at.spec 30 Jan 2007 12:20:03 -0000 1.48 @@ -47,8 +47,7 @@ Patch37: at-3.1.10-makefile.patch Patch38: at-3.1.10-daylight.patch Patch39: at-3.1.10-perm.patch -Patch40: at-3.1.10-nodebug.patch -Patch41: at-3.1.10-newpam.patch +Patch40: at-3.1.10-newpam.patch Prereq: fileutils chkconfig /etc/init.d BuildPrereq: flex bison autoconf @@ -122,8 +121,7 @@ %patch37 -p1 -b .makefile %patch38 -p1 -b .daylight %patch39 -p1 -b .perm -%patch40 -p1 -b .nodebug -%patch41 -p1 -b .newpam +%patch40 -p1 -b .newpam %build # patch10 touches configure.in --- at-3.1.10-nodebug.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 12:22:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:22:12 -0500 Subject: rpms/aspell-nl/devel aspell-nl.spec,1.19,1.20 Message-ID: <200701301222.l0UCMCAR017958@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-nl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17944 Modified Files: aspell-nl.spec Log Message: - remove debuginfo Index: aspell-nl.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-nl/devel/aspell-nl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- aspell-nl.spec 17 Aug 2006 14:36:37 -0000 1.19 +++ aspell-nl.spec 30 Jan 2007 12:22:10 -0000 1.20 @@ -3,7 +3,7 @@ # Have to bump this to make it newer than the old, bad version. Epoch: 51 Version: 0.1e -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Text URL: http://packages.debian.org/unstable/text/%{name} @@ -14,6 +14,8 @@ Requires: aspell >= 12:0.60 BuildRoot: %{_tmppath}/%{name}-%{version}-root +%define debug_package %{nil} + %description Provides the word list/dictionaries for the following: Dutch @@ -54,6 +56,9 @@ %{_libdir}/aspell-0.60/* %changelog +* Tue Jan 30 2007 Ivana Varekova - 51:0.1e-2 +- remove debuginfo + * Mon Jul 31 2006 Tom "spot" Callaway - 51:0.1e-1 - move to GPL dictionary From fedora-cvs-commits at redhat.com Tue Jan 30 12:32:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:32:42 -0500 Subject: rpms/brltty/devel brltty.spec,1.21,1.22 Message-ID: <200701301232.l0UCWgHP032203@cvs.devel.redhat.com> Author: tjanouse Update of /cvs/dist/rpms/brltty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32158 Modified Files: brltty.spec Log Message: * Tue Jan 30 2007 Tomas Janousek - 3.7.2-2.1 - quiet postinstall scriptlet, really fixes #224570 Index: brltty.spec =================================================================== RCS file: /cvs/dist/rpms/brltty/devel/brltty.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- brltty.spec 30 Jan 2007 11:48:57 -0000 1.21 +++ brltty.spec 30 Jan 2007 12:32:40 -0000 1.22 @@ -1,6 +1,6 @@ Name: brltty Version: 3.7.2 -Release: 2%{?dist} +Release: 2.1%{?dist} License: GPL Group: System Environment/Daemons URL: http://mielke.cc/brltty/ @@ -90,12 +90,10 @@ if $install then device="$(set -- ${devices} && echo "${1}")" - echo -n "Creating screen inspection device ${device}..." mkdir -p "${device%/*}" mknod -m o= "${device}" c 7 128 chmod 660 "${device}" chown root.tty "${device}" - echo "done." fi exit 0 @@ -127,6 +125,9 @@ %doc Documents/BrlAPIref-HTML %changelog +* Tue Jan 30 2007 Tomas Janousek - 3.7.2-2.1 +- quiet postinstall scriptlet, really fixes #224570 + * Tue Jan 30 2007 Tomas Janousek - 3.7.2-2 - failsafe postinstall script, fixes #224570 - makefile fix - debuginfo extraction now works From fedora-cvs-commits at redhat.com Tue Jan 30 12:36:19 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:36:19 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec,1.55,1.55.2.1 Message-ID: <200701301236.l0UCaJb6002338@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2289 Modified Files: Tag: private-flex-fuckage-branch bluez-utils.spec Log Message: exclude ia64 since it seems to work in mock on ppc Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.55 retrieving revision 1.55.2.1 diff -u -r1.55 -r1.55.2.1 --- bluez-utils.spec 30 Jan 2007 12:00:52 -0000 1.55 +++ bluez-utils.spec 30 Jan 2007 12:36:17 -0000 1.55.2.1 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.9 -Release: 1%{?dist} +Release: 1%{?dist}.noia64 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -21,7 +21,7 @@ BuildRequires: flex BuildRequires: dbus-devel >= 0.90 BuildRequires: libusb-devel, glib2-devel -ExcludeArch: s390 s390x +ExcludeArch: s390 s390x ia64 Obsoletes: bluez-pan, bluez-sdp Requires: initscripts, bluez-libs >= %{version} Requires: dbus >= 0.60 From fedora-cvs-commits at redhat.com Tue Jan 30 12:38:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:38:57 -0500 Subject: rpms/kdelibs/FC-6 kdelibs.spec,1.202,1.203 Message-ID: <200701301238.l0UCcvbE004417@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4327 Modified Files: kdelibs.spec Log Message: 3.5.6 Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-6/kdelibs.spec,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- kdelibs.spec 30 Jan 2007 10:40:15 -0000 1.202 +++ kdelibs.spec 30 Jan 2007 12:38:55 -0000 1.203 @@ -14,6 +14,7 @@ %define qtdocdir %{_docdir}/qt-devel-%{qt_version} %define make_cvs 0 +%define arts 1 Version: 3.5.6 Release: 0.1%{?dist} From fedora-cvs-commits at redhat.com Tue Jan 30 12:47:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:47:53 -0500 Subject: rpms/busybox/devel busybox.spec,1.53,1.54 Message-ID: <200701301247.l0UClrt7011118@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/busybox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10971 Modified Files: busybox.spec Log Message: - remove debuginfo Index: busybox.spec =================================================================== RCS file: /cvs/dist/rpms/busybox/devel/busybox.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- busybox.spec 22 Jan 2007 12:49:39 -0000 1.53 +++ busybox.spec 30 Jan 2007 12:47:51 -0000 1.54 @@ -1,7 +1,7 @@ Summary: Statically linked binary providing simplified versions of system commands Name: busybox Version: 1.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPL Group: System Environment/Shells @@ -21,6 +21,8 @@ BuildRequires: libselinux-devel >= 1.27.7-2 BuildRequires: libsepol-devel +%define debug_package %{nil} + %package anaconda Group: System Environment/Shells Summary: Version of busybox configured for use with anaconda @@ -90,6 +92,8 @@ /sbin/busybox.anaconda %changelog +* Tue Jan 30 2007 Ivana Varekova - 1:1.2.2-4 +- remove debuginfo * Mon Jan 22 2007 Ivana Varekova - 1:1.2.2-3 - Resolves: 223620 From fedora-cvs-commits at redhat.com Tue Jan 30 12:54:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:54:46 -0500 Subject: rpms/sysstat/devel sysstat.spec,1.46,1.47 Message-ID: <200701301254.l0UCskk2004269@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/sysstat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4053 Modified Files: sysstat.spec Log Message: - remove debuginfo Index: sysstat.spec =================================================================== RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sysstat.spec 18 Dec 2006 15:14:36 -0000 1.46 +++ sysstat.spec 30 Jan 2007 12:54:44 -0000 1.47 @@ -1,6 +1,6 @@ Name: sysstat Version: 7.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The sar and iostat system monitoring commands. License: GPL Group: Applications/System @@ -21,6 +21,8 @@ BuildRequires: perl %{_includedir}/linux/if.h gettext Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id +%define debug_package %{nil} + %description This package provides the sar and iostat commands for Linux. Sar and iostat enable system monitoring of disk, network, and other IO @@ -111,7 +113,10 @@ /var/log/sa %changelog -* Mon Dec 18 2006 Ivana Varekova -7.0.3-1 +* Tue Jan 30 2007 Ivana Varekova - 7.0.3-2 +- remove debuginfo + +* Mon Dec 18 2006 Ivana Varekova - 7.0.3-1 - update to 7.0.3 * Tue Nov 21 2006 Ivana Varekova - 7.0.2-3 From fedora-cvs-commits at redhat.com Tue Jan 30 12:54:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 07:54:48 -0500 Subject: rpms/at/devel at-3.1.10-dont_fork.patch,1.3,1.4 at.spec,1.48,1.49 Message-ID: <200701301254.l0UCsmv3004313@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/at/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4145 Modified Files: at-3.1.10-dont_fork.patch at.spec Log Message: changes in spec file at-3.1.10-dont_fork.patch: at-3.1.10/atd.c | 9 +++++++-- at-3.1.10/daemon.c | 8 ++++++-- at-3.1.10/daemon.h | 1 + at-3.1.8/atd.8.in | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) Index: at-3.1.10-dont_fork.patch =================================================================== RCS file: /cvs/dist/rpms/at/devel/at-3.1.10-dont_fork.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- at-3.1.10-dont_fork.patch 30 Jan 2007 10:32:28 -0000 1.3 +++ at-3.1.10-dont_fork.patch 30 Jan 2007 12:54:46 -0000 1.4 @@ -5,7 +5,7 @@ batch_interval = BATCH_INTERVAL_DEFAULT; - while ((c = getopt(argc, argv, "sdl:b:")) != EOF) { -+ while ((c = getopt(argc, argv, "sdl:b:n")) != EOF) { ++ while ((c = getopt(argc, argv, "sdl:b:n:")) != EOF) { switch (c) { case 'l': if (sscanf(optarg, "%lf", &load_avg) != 1) Index: at.spec =================================================================== RCS file: /cvs/dist/rpms/at/devel/at.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- at.spec 30 Jan 2007 12:20:03 -0000 1.48 +++ at.spec 30 Jan 2007 12:54:46 -0000 1.49 @@ -121,7 +121,7 @@ %patch37 -p1 -b .makefile %patch38 -p1 -b .daylight %patch39 -p1 -b .perm -%patch40 -p1 -b .newpam +##%patch40 -p1 -b .newpam %build # patch10 touches configure.in From fedora-cvs-commits at redhat.com Tue Jan 30 13:00:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:00:59 -0500 Subject: rpms/openoffice.org/FC-6 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.20, 1.21 Message-ID: <200701301300.l0UD0x0n008716@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv8658 Modified Files: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch Log Message: api different in 2.0.X openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch: inc/jobset.hxx | 0 inc/print.hxx | 0 inc/printdlg.hxx | 0 openoffice.org.orig/svtools/source/dialogs/printdlg.src | 10 psprint/inc/cupsmgr.hxx | 2 psprint/inc/psprint/ppdparser.hxx | 4 psprint/inc/psprint/printerinfomanager.hxx | 2 psprint/source/printer/cupsmgr.cxx | 18 psprint/source/printer/printerinfomanager.cxx | 8 psprint/source/printergfx/printerjob.cxx | 3 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/dialogs/printdlg.hrc | 0 source/dialogs/printdlg.src | 0 source/gdi/jobset.cxx | 0 source/gdi/print.cxx | 0 svtools/inc/printdlg.hxx | 2 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 541 +++++++++++++++- svtools/source/dialogs/printdlg.hrc | 2 svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 3 vcl/inc/print.hxx | 3 vcl/source/gdi/jobset.cxx | 194 +++++ vcl/source/gdi/print.cxx | 11 26 files changed, 803 insertions(+), 12 deletions(-) Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 11:28:36 -0000 1.20 +++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 30 Jan 2007 13:00:53 -0000 1.21 @@ -634,7 +634,7 @@ short PrintDialog::Execute() { if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) -@@ -625,15 +908,245 @@ +@@ -625,15 +908,256 @@ ImplInitControls(); ImplModifyControlHdl( NULL ); @@ -817,7 +817,18 @@ + { + for (int i = 0; i < 2; ++i) + { -+ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false )) ++ const QueueInfo* pInfo = 0; ++ USHORT nCount = Printer::GetQueueCount(); ++ for (USHORT j = 0; j < nCount; ++j) ++ { ++ const QueueInfo& rInfo = Printer::GetQueueInfo(j, false); ++ if (OUString(rInfo.GetPrinterName()) == sNewPrinterName) ++ { ++ pInfo = &rInfo; ++ break; ++ } ++ } ++ if (pInfo) + { + Printer aTempPrinter(*pInfo); + mpPrinter->SetPrinterProps(&aTempPrinter); From fedora-cvs-commits at redhat.com Tue Jan 30 13:02:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:02:16 -0500 Subject: rpms/ftp/devel netkit-ftp-0.17-nodebug.patch, NONE, 1.1 ftp.spec, 1.30, 1.31 Message-ID: <200701301302.l0UD2Ggn009709@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/ftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9555 Modified Files: ftp.spec Added Files: netkit-ftp-0.17-nodebug.patch Log Message: Change spec, add patch. netkit-ftp-0.17-nodebug.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE netkit-ftp-0.17-nodebug.patch --- --- netkit-ftp-0.17/ftp/Makefile.nodebug 2006-11-14 15:02:36.000000000 +0100 +++ netkit-ftp-0.17/ftp/Makefile 2007-01-30 13:58:15.000000000 +0100 @@ -17,7 +17,7 @@ install: ftp install -d $(INSTALLROOT)$(BINDIR) - install -s -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR) + install -m$(BINMODE) ftp $(INSTALLROOT)$(BINDIR) ln -sf ftp $(INSTALLROOT)$(BINDIR)/pftp install -d $(INSTALLROOT)$(MANDIR)/man1 install -m$(MANMODE) ftp.1 $(INSTALLROOT)$(MANDIR)/man1 Index: ftp.spec =================================================================== RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- ftp.spec 13 Sep 2006 06:37:40 -0000 1.30 +++ ftp.spec 30 Jan 2007 13:02:14 -0000 1.31 @@ -1,7 +1,7 @@ Summary: The standard UNIX FTP (File Transfer Protocol) client. Name: ftp Version: 0.17 -Release: 33%{?dist} +Release: 34%{?dist} License: BSD Group: Applications/Internet Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2 @@ -20,10 +20,13 @@ Patch13: netkit-ftp-0.17-multihome.patch Patch14: netkit-ftp-0.17-longnames.patch Patch15: netkit-ftp-0.17-multiipv6.patch +Patch16: netkit-ftp-0.17-nodebug.patch BuildRoot: /var/tmp/%{name}-root BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl +%define debug_package %{nil} + %description The ftp package provides the standard UNIX command-line FTP (File Transfer Protocol) client. FTP is a widely used protocol for @@ -49,6 +52,7 @@ %patch13 -p1 -b .multihome %patch14 -p1 -b .patch %patch15 -p1 -b .multiipv6 +%patch16 -p1 -b .nodebug %build sh configure --with-c-compiler=gcc --enable-ipv6 @@ -82,6 +86,9 @@ %{_mandir}/man5/netrc.* %changelog +* Tue Jan 30 2007 Marcela Maslanova - 0.17-34 +- nodebug package + * Wed Sep 13 2006 Marcela Maslanova - 0.17-33 - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 30 13:24:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:24:41 -0500 Subject: rpms/ftp/devel ftp.spec,1.31,1.32 Message-ID: <200701301324.l0UDOfvf014766@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/ftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14485 Modified Files: ftp.spec Log Message: Removed nodebug. Index: ftp.spec =================================================================== RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- ftp.spec 30 Jan 2007 13:02:14 -0000 1.31 +++ ftp.spec 30 Jan 2007 13:24:34 -0000 1.32 @@ -25,8 +25,6 @@ BuildRoot: /var/tmp/%{name}-root BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl -%define debug_package %{nil} - %description The ftp package provides the standard UNIX command-line FTP (File Transfer Protocol) client. FTP is a widely used protocol for From fedora-cvs-commits at redhat.com Tue Jan 30 13:25:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:25:24 -0500 Subject: rpms/ftp/devel ftp.spec,1.32,1.33 Message-ID: <200701301325.l0UDPOvZ015305@cvs.devel.redhat.com> Author: mmaslano Update of /cvs/dist/rpms/ftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15187 Modified Files: ftp.spec Log Message: Removed no debug. Index: ftp.spec =================================================================== RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ftp.spec 30 Jan 2007 13:24:34 -0000 1.32 +++ ftp.spec 30 Jan 2007 13:25:18 -0000 1.33 @@ -1,7 +1,7 @@ Summary: The standard UNIX FTP (File Transfer Protocol) client. Name: ftp Version: 0.17 -Release: 34%{?dist} +Release: 35%{?dist} License: BSD Group: Applications/Internet Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2 @@ -84,7 +84,7 @@ %{_mandir}/man5/netrc.* %changelog -* Tue Jan 30 2007 Marcela Maslanova - 0.17-34 +* Tue Jan 30 2007 Marcela Maslanova - 0.17-35 - nodebug package * Wed Sep 13 2006 Marcela Maslanova - 0.17-33 From fedora-cvs-commits at redhat.com Tue Jan 30 13:30:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:30:23 -0500 Subject: rpms/sysstat/devel sysstat-7.0.3-debuginfo.patch, NONE, 1.1 sysstat.spec, 1.47, 1.48 Message-ID: <200701301330.l0UDUNKb019333@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/sysstat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19223 Modified Files: sysstat.spec Added Files: sysstat-7.0.3-debuginfo.patch Log Message: remove -s flag sysstat-7.0.3-debuginfo.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE sysstat-7.0.3-debuginfo.patch --- --- sysstat-7.0.3/Makefile.pom 2006-10-22 18:27:26.000000000 +0200 +++ sysstat-7.0.3/Makefile 2007-01-30 14:25:01.000000000 +0100 @@ -38,7 +38,7 @@ # Compiler flags CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce -LFLAGS = -s +LFLAGS = # SAS_DFLAGS may also contain SMP_RACE definition SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\" Index: sysstat.spec =================================================================== RCS file: /cvs/dist/rpms/sysstat/devel/sysstat.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sysstat.spec 30 Jan 2007 12:54:44 -0000 1.47 +++ sysstat.spec 30 Jan 2007 13:30:21 -0000 1.48 @@ -1,6 +1,6 @@ Name: sysstat Version: 7.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The sar and iostat system monitoring commands. License: GPL Group: Applications/System @@ -13,6 +13,7 @@ Patch3: sysstat-5.0.5-statreset.patch Patch6: sysstat-5.0.5-append-msg.patch Patch9: sysstat-7.0.0-tmp.patch +Patch10: sysstat-7.0.3-debuginfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -21,8 +22,6 @@ BuildRequires: perl %{_includedir}/linux/if.h gettext Requires: %__cp %__mv %__chmod %__grep %__mkdir %__install %__id -%define debug_package %{nil} - %description This package provides the sar and iostat commands for Linux. Sar and iostat enable system monitoring of disk, network, and other IO @@ -34,6 +33,7 @@ %patch3 -p1 -b .statreset %patch6 -p1 -b .append-msg %patch9 -p1 -b .tmp +%patch10 -p1 -b .db %build # FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and @@ -113,8 +113,8 @@ /var/log/sa %changelog -* Tue Jan 30 2007 Ivana Varekova - 7.0.3-2 -- remove debuginfo +* Tue Jan 30 2007 Ivana Varekova - 7.0.3-3 +- remove -s flag * Mon Dec 18 2006 Ivana Varekova - 7.0.3-1 - update to 7.0.3 From fedora-cvs-commits at redhat.com Tue Jan 30 13:31:26 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:31:26 -0500 Subject: rpms/kdebase/FC-6 kdebase-3.5.6-1-redhat-startkde.patch, NONE, 1.1 kdebase.spec, 1.244, 1.245 sources, 1.75, 1.76 kdebase-3.3.1-pam_krb5-bz#191049.patch, 1.1, NONE kdebase-3.5.5-1-redhat-startkde.patch, 1.1, NONE kdebase-3.5.5-kde#134816.patch, 1.1, NONE kdebase-3.5.5-kde#135250.patch, 1.1, NONE kdebase-3.5.5-kde#137889.patch, 1.1, NONE kdebase-3.5.5-kde#88506.patch, 1.1, NONE Message-ID: <200701301331.l0UDVQLd020103@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19949 Modified Files: kdebase.spec sources Added Files: kdebase-3.5.6-1-redhat-startkde.patch Removed Files: kdebase-3.3.1-pam_krb5-bz#191049.patch kdebase-3.5.5-1-redhat-startkde.patch kdebase-3.5.5-kde#134816.patch kdebase-3.5.5-kde#135250.patch kdebase-3.5.5-kde#137889.patch kdebase-3.5.5-kde#88506.patch Log Message: 3.5.6 kdebase-3.5.6-1-redhat-startkde.patch: startkde | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 9 deletions(-) --- NEW FILE kdebase-3.5.6-1-redhat-startkde.patch --- --- kdebase-3.5.5/startkde.redhat 2006-10-02 13:13:29.000000000 +0200 +++ kdebase-3.5.5/startkde 2006-10-10 17:35:53.000000000 +0200 @@ -1,7 +1,54 @@ #!/bin/sh # # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.6 ) -# +# 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=`LANG=C df /tmp | xargs | cut -d" " -f11` +homedir_mount=`LANG=C df "$HOME" | xargs | cut -d" " -f8` + +if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then + # check for AFS + space_home=`LANG=C fs df "$HOME" | xargs | cut -d" " -f10` +else + # check regular mounts + space_home=`LANG=C 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. @@ -14,12 +61,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 @@ -61,7 +108,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` @@ -170,9 +217,10 @@ # better use the Autostart folder. exepath=`kde-config --path exe | tr : '\n'` +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 @@ -378,7 +426,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-6/kdebase.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- kdebase.spec 30 Nov 2006 15:47:40 -0000 1.244 +++ kdebase.spec 30 Jan 2007 13:31:24 -0000 1.245 @@ -6,9 +6,9 @@ %define redhatify 1 %define include_kappfinder 0 -%define qt_version 3.3.6 -%define arts_version 1.5.5 -%define kde_version 3.5.5 +%define qt_version 3.3.7 +%define arts_version 1.5.6 +%define kde_version 3.5.6 %define kdelibs_epoch 6 %define arts_epoch 8 %define make_cvs 1 @@ -17,8 +17,8 @@ Summary: K Desktop Environment - core files Name: kdebase -Version: 3.5.5 -Release: 0.6%{?dist} +Version: 3.5.6 +Release: 0.1%{?dist} Epoch: 6 Url: http://www.kde.org Group: User Interface/Desktops @@ -38,7 +38,7 @@ Source11: cr48-app-package_games_kids.png Patch0: kdebase-3.5.5-redhat-pam.patch -Patch1: kdebase-3.5.5-1-redhat-startkde.patch +Patch1: kdebase-3.5.6-1-redhat-startkde.patch Patch2: kdebase-3.3.92-vroot.patch Patch3: kdebase-3.x-shortcuts.patch Patch4: kdebase-3.2.0-keymap.patch @@ -51,7 +51,6 @@ Patch13: kdebase-3.5.5-dbus.patch Patch14: kdebase-3.5.1-kdm-readme.patch Patch15: kdebase-3.5.1-konsole-fonts.patch -Patch17: kdebase-3.3.1-pam_krb5-bz#191049.patch Patch18: kdebase-3.5.2-kconf_update-klipper.patch Patch20: kdebase-3.5.5-keyinit.patch Patch21: kdebase-3.5.3-khelpcenter-sort.patch @@ -61,12 +60,6 @@ Patch25: kdebase-3.5.4-konqueror-shortcut.patch Patch26: kdebase-3.5.5-suspend.patch -# upstream patches -Patch500: kdebase-3.5.5-kde#134816.patch -Patch501: kdebase-3.5.5-kde#135250.patch -Patch502: kdebase-3.5.5-kde#88506.patch -Patch503: kdebase-3.5.5-kde#137889.patch - Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch} Requires(post): /sbin/ldconfig @@ -132,6 +125,7 @@ BuildRequires: libXtst-devel BuildRequires: libXxf86misc-devel BuildRequires: libxkbfile-devel +BuildRequires: libutempter-devel %ifnarch s390 s390x BuildRequires: libraw1394-devel %endif @@ -176,7 +170,6 @@ %patch13 -p1 -b .dbus %patch14 -p1 -b .kdm-readme %patch15 -p1 -b .konsole-fonts -%patch17 -p1 -b .pam_krb5-bz#191049 %patch18 -p1 -b .klipper %patch20 -p1 -b .keyinit %patch21 -p1 -b .khelpcenter-sort @@ -186,12 +179,6 @@ %patch25 -p1 -b .konqueror-shortcut %patch26 -p1 -b .suspend -# upstream patches -%patch500 -p0 -b .kde#134816 -%patch501 -p1 -b .kde#135250 -%patch502 -p1 -b .kde#88506 -%patch503 -p1 -b .kde#137889 - %if %{rhel} rm -rf kdeprint/kdeprintfax perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am @@ -395,10 +382,6 @@ # exclude fonts.dir rm -f %{buildroot}%{_datadir}/fonts/override/fonts.dir -# rename to kde-games-kids as it's defined in applications.menu -mv %{buildroot}%{_datadir}/desktop-directories/kde-games-kidsgames.directory \ - %{buildroot}%{_datadir}/desktop-directories/kde-games-kids.directory - %clean rm -rf %{buildroot} @@ -569,6 +552,9 @@ %exclude %{_libdir}/libkdeinit_*.so %changelog +* Tue Jan 30 2007 Than Ngo - 6:3.5.6-0.1.fc6 +- 3.5.6 + * Thu Nov 30 2006 Than Ngo - 6:3.5.5-0.6.fc6 - apply upstream fix: #88506, dragged window follows mouse but on wrong screen (dual-head non-xinerama) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-6/sources,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sources 26 Oct 2006 15:36:19 -0000 1.75 +++ sources 30 Jan 2007 13:31:24 -0000 1.76 @@ -1,2 +1,2 @@ 61b60ed4ea41b30dfc18579cac48d20c kde-redhat-config-3.5-fc5-0.5.tar.bz2 -0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 +a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 --- kdebase-3.3.1-pam_krb5-bz#191049.patch DELETED --- --- kdebase-3.5.5-1-redhat-startkde.patch DELETED --- --- kdebase-3.5.5-kde#134816.patch DELETED --- --- kdebase-3.5.5-kde#135250.patch DELETED --- --- kdebase-3.5.5-kde#137889.patch DELETED --- --- kdebase-3.5.5-kde#88506.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 13:50:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:50:52 -0500 Subject: rpms/dev86/devel dev86-nostrip.patch,NONE,1.1 dev86.spec,1.20,1.21 Message-ID: <200701301350.l0UDoqDJ005710@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/dev86/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5692 Modified Files: dev86.spec Added Files: dev86-nostrip.patch Log Message: - don't strip debuginfo dev86-nostrip.patch: makefile.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dev86-nostrip.patch --- --- dev86-0.16.17/makefile.in.nostrip 2007-01-30 14:28:38.000000000 +0100 +++ dev86-0.16.17/makefile.in 2007-01-30 14:40:56.000000000 +0100 @@ -78,7 +78,7 @@ # Install files with the userid of the currently running process. INDAT=-m 644 -INEXE=-m 755 -s +INEXE=-m 755 INSCR=-m 755 #ifdef __CYGWIN__ Index: dev86.spec =================================================================== RCS file: /cvs/dist/rpms/dev86/devel/dev86.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dev86.spec 27 Dec 2006 17:01:16 -0000 1.20 +++ dev86.spec 30 Jan 2007 13:50:50 -0000 1.21 @@ -1,7 +1,7 @@ Summary: A real mode 80x86 assembler and linker Name: dev86 Version: 0.16.17 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Development/Languages URL: http://homepage.ntlworld.com/robert.debath/ @@ -10,6 +10,7 @@ %ifarch x86_64 Patch1: dev86-x86_64.patch %endif +Patch2: dev86-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: bin86 ExclusiveArch: i386 x86_64 @@ -31,6 +32,7 @@ %ifarch x86_64 %patch1 -p1 -b .x86_64 %endif +%patch2 -p1 -b .nostrip %build make < - 0.16.17-5 +- don't strip debuginfo + * Wed Dec 27 2006 Jindrich Novy - 0.16.17-4 - bcc now searches in correct path for bcc-cpp on x86_64 (#219697) From fedora-cvs-commits at redhat.com Tue Jan 30 13:57:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 08:57:49 -0500 Subject: rpms/bind/FC-5 .cvsignore, 1.21, 1.22 bind.spec, 1.114, 1.115 sources, 1.28, 1.29 Message-ID: <200701301357.l0UDvnjH005956@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5936/bind/FC-5 Modified Files: .cvsignore bind.spec sources Log Message: updated to 9.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 16 Oct 2006 10:00:01 -0000 1.21 +++ .cvsignore 30 Jan 2007 13:57:47 -0000 1.22 @@ -1,13 +1,3 @@ -bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 -bind-9.2.4rc7.tar.gz +bind-9.3.4.tar.gz bind-chroot.tar.gz -bind-manpages-2.tar.bz2 -bind-manpages.patch.bz2 -bind-9.2.4rc8.tar.gz -bind-9.3.0.tar.gz -bind-9.3.1rc1.tar.gz libbind-man.tar.gz -bind-9.3.1.tar.gz -bind-9.3.2rc1.tar.gz -bind-9.3.2.tar.gz -bind-9.3.3rc2.tar.gz Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- bind.spec 21 Nov 2006 12:39:03 -0000 1.114 +++ bind.spec 30 Jan 2007 13:57:47 -0000 1.115 @@ -12,19 +12,18 @@ %{?!selinux: %define selinux 1} %define bind_dir /var/named %define chroot_prefix %{bind_dir}/chroot -%define prever rc3 # Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. Name: bind License: BSD-like -Version: 9.3.3 -Release: 0.2.%{prever}%{?dist} +Version: 9.3.4 +Release: 1%{?dist} 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}%{prever}.tar.gz +Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz Source1: named.sysconfig Source2: named.init Source3: named.logrotate @@ -229,7 +228,7 @@ %prep -%setup -q -n %{name}-%{version}%{prever} +%setup -q -n %{name}-%{version} %patch -p1 -b .varrun %patch1 -p1 -b .key %patch2 -p1 -b .openssl_suffix @@ -777,6 +776,9 @@ :; %changelog +* Tue Jan 30 2007 Adam Tkac - 30:9.3.4-1.fc5 +- updated to 9.3.4 which contains bugfixes & security updates + * Tue Nov 21 2006 Martin Stransky - 30:9.3.3-0.2.rc3 - update to the latest upstream (RC3), removed already merged patches - added a timeout to restart Index: sources =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 16 Oct 2006 10:00:01 -0000 1.28 +++ sources 30 Jan 2007 13:57:47 -0000 1.29 @@ -1,3 +1,3 @@ +df5417e7e7cf017fa28b65d0a3d6e999 bind-9.3.4.tar.gz 3567c35a24cb83a8a69443a399bbb6c8 bind-chroot.tar.gz 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz -e68a8211f7e2dc9acda4d279a123379c bind-9.3.3rc2.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 30 14:18:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:18:27 -0500 Subject: rpms/openoffice.org/devel sources,1.219,1.220 Message-ID: <200701301418.l0UEIRlW026900@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26885 Modified Files: sources Log Message: new sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- sources 27 Jan 2007 16:14:16 -0000 1.219 +++ sources 30 Jan 2007 14:18:25 -0000 1.220 @@ -10,4 +10,4 @@ b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz -47e92cd8ead74e13c9e56050a98fadb5 OOF680_m4.tar.bz2 +adebed9c98fe2fbfaa5b9d90a30707b7 OOF680_m5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 14:20:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:20:01 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.1013,1.1014 Message-ID: <200701301420.l0UEK1qE026936@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26919 Modified Files: openoffice.org.spec Log Message: next candidate Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1013 retrieving revision 1.1014 diff -u -r1.1013 -r1.1014 --- openoffice.org.spec 29 Jan 2007 13:41:40 -0000 1.1013 +++ openoffice.org.spec 30 Jan 2007 14:19:59 -0000 1.1014 @@ -1,6 +1,6 @@ %define oootag OOF680 -%define ooomilestone 4 -%define rh_rpm_release 3 +%define ooomilestone 5 +%define rh_rpm_release 1 # gcc#19664# %define stlvisibilityfcked 1 @@ -2572,6 +2572,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Tue Jan 30 2007 Caolan McNamara - 1:2.2.0-5.1 +- next candidate + * Mon Jan 29 2007 Caolan McNamara - 1:2.2.0-4.3 - Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch - Resolves: rhbz#225097 library path problems for extensions From fedora-cvs-commits at redhat.com Tue Jan 30 14:26:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:26:22 -0500 Subject: rpms/passwd/devel passwd.spec,1.28,1.29 Message-ID: <200701301426.l0UEQMwG027055@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/passwd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27041 Modified Files: passwd.spec Log Message: * Tue Jan 30 2007 Tomas Mraz 0.74-2 - do not explicitly strip the binary Index: passwd.spec =================================================================== RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- passwd.spec 12 Dec 2006 21:54:13 -0000 1.28 +++ passwd.spec 30 Jan 2007 14:26:19 -0000 1.29 @@ -7,7 +7,7 @@ Summary: The passwd utility for setting/changing passwords using PAM Name: passwd Version: 0.74 -Release: 1 +Release: 2 License: BSD Group: System Environment/Base Source: %{name}-%{version}.tar.bz2 @@ -41,8 +41,9 @@ %endif %install +rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_bindir} mandir=%{_mandir} -strip $RPM_BUILD_ROOT%{_bindir}/passwd install -m 755 -d $RPM_BUILD_ROOT/etc/pam.d/ install -m 644 passwd.pamd $RPM_BUILD_ROOT/etc/pam.d/passwd %find_lang %{name} @@ -57,6 +58,9 @@ %{_mandir}/man1/passwd.1* %changelog +* Tue Jan 30 2007 Tomas Mraz 0.74-2 +- do not explicitly strip the binary + * Tue Dec 12 2006 Tomas Mraz 0.74-1 - minor fixes in error reporting - localize messages (#204022) @@ -185,7 +189,7 @@ - automatic rebuild * Mon Jun 5 2000 Nalin Dahyabhai -- move man pages to %{_mandir} +- move man pages to _mandir * Thu Jun 1 2000 Nalin Dahyabhai - modify PAM setup to use system-auth From fedora-cvs-commits at redhat.com Tue Jan 30 14:27:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:27:07 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec,1.55.2.1,1.55.2.2 Message-ID: <200701301427.l0UER7MQ027115@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27100 Modified Files: Tag: private-flex-fuckage-branch bluez-utils.spec Log Message: require m4 Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.55.2.1 retrieving revision 1.55.2.2 diff -u -r1.55.2.1 -r1.55.2.2 --- bluez-utils.spec 30 Jan 2007 12:36:17 -0000 1.55.2.1 +++ bluez-utils.spec 30 Jan 2007 14:27:05 -0000 1.55.2.2 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 3.9 -Release: 1%{?dist}.noia64 +Release: 1%{?dist}.m4 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -18,10 +18,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ BuildRequires: bluez-libs-devel >= %{version} -BuildRequires: flex +BuildRequires: flex m4 BuildRequires: dbus-devel >= 0.90 BuildRequires: libusb-devel, glib2-devel -ExcludeArch: s390 s390x ia64 +ExcludeArch: s390 s390x Obsoletes: bluez-pan, bluez-sdp Requires: initscripts, bluez-libs >= %{version} Requires: dbus >= 0.60 From fedora-cvs-commits at redhat.com Tue Jan 30 14:32:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:32:00 -0500 Subject: rpms/dump/devel dump-0.4b37-2TB.patch,NONE,1.1 dump.spec,1.39,1.40 Message-ID: <200701301432.l0UEW0HU008433@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8203/dump/devel Modified Files: dump.spec Added Files: dump-0.4b37-2TB.patch Log Message: fixed dumping of 2TB systems dump-0.4b37-2TB.patch: tape.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) --- NEW FILE dump-0.4b37-2TB.patch --- --- dump-0.4b37/dump/tape.c.2TB 2004-07-07 13:07:29.000000000 +0200 +++ dump-0.4b37/dump/tape.c 2005-08-22 09:57:45.000000000 +0200 @@ -475,10 +475,14 @@ } blks = 0; - if (spcl.c_type != TS_END) { - for (i = 0; i < spcl.c_count; i++) - if (spcl.c_addr[i] != 0) - blks++; + if (spcl.c_type == TS_CLRI || spcl.c_type == TS_BITS) { + blks = spcl.c_count; + } else { + if (spcl.c_type != TS_END) { + for (i = 0; i < spcl.c_count; i++) + if (spcl.c_addr[i] != 0) + blks++; + } } slp->count = lastspclrec + blks + 1 - spcl.c_tapea; slp->tapea = spcl.c_tapea; Index: dump.spec =================================================================== RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- dump.spec 29 Jan 2007 12:24:01 -0000 1.39 +++ dump.spec 30 Jan 2007 14:31:57 -0000 1.40 @@ -3,7 +3,7 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b41 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ @@ -11,6 +11,7 @@ Patch0: dump-selinux.patch Patch1: dump-dmfix.patch Patch2: dump-immutable.patch +Patch3: dump-0.4b37-2TB.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: zlib-devel, bzip2-devel, ncurses-devel @@ -48,6 +49,7 @@ %patch0 -p1 -b .selinux %patch1 -p1 -b .dmfix %patch2 -p1 -b .orig +%patch3 -p1 -b .2TB %build @@ -119,6 +121,9 @@ %{_mandir}/man8/rmt.8* %changelog +* Tue Jan 30 2007 Adam Tkac 0.4b41-5.fc7 +- fixed dumping of 2TB systems + * Mon Jan 29 2007 Adam Tkac 0.4b41-4.fc7 - added Andrew Kroeger's patch. Immutable files are restored correctly From fedora-cvs-commits at redhat.com Tue Jan 30 14:39:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:39:33 -0500 Subject: rpms/flex/devel flex.spec,1.33,1.34 Message-ID: <200701301439.l0UEdXG6013955@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13758 Modified Files: flex.spec Log Message: - Add Requires:m4. Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- flex.spec 24 Jan 2007 17:22:38 -0000 1.33 +++ flex.spec 30 Jan 2007 14:39:31 -0000 1.34 @@ -1,12 +1,13 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.33 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ Source: http://puzzle.dl.sourceforge.net/sourceforge/flex/flex-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: m4 BuildRequires: gettext info bison m4 Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -74,6 +75,9 @@ %{_datadir}/locale/* %changelog +* Tue Jan 30 2007 Petr Machata - 2.5.33-2 +- Add Requires:m4. + * Fri Jan 19 2007 Petr Machata - 2.5.33-1 - Rebase to 2.5.33 From fedora-cvs-commits at redhat.com Tue Jan 30 14:42:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:42:34 -0500 Subject: rpms/xdelta/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xdelta.spec, 1.24, 1.25 Message-ID: <200701301442.l0UEgYVf016248@cvs.devel.redhat.com> Author: atkac Update of /cvs/dist/rpms/xdelta/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15968/xdelta/devel Modified Files: .cvsignore sources xdelta.spec Log Message: updated to final 1.1.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xdelta/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Jan 2007 14:26:13 -0000 1.4 +++ .cvsignore 30 Jan 2007 14:42:32 -0000 1.5 @@ -1 +1 @@ -xdelta-1.1.4pre1.tar.gz +xdelta-1.1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xdelta/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Jan 2007 14:26:13 -0000 1.4 +++ sources 30 Jan 2007 14:42:32 -0000 1.5 @@ -1 +1 @@ -4a8e7ae9b963785c0d57a9a5c08661b6 xdelta-1.1.4pre1.tar.gz +1b896c01ebf0e353b7e3c3071b05f496 xdelta-1.1.4.tar.gz Index: xdelta.spec =================================================================== RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xdelta.spec 29 Jan 2007 14:26:13 -0000 1.24 +++ xdelta.spec 30 Jan 2007 14:42:32 -0000 1.25 @@ -1,6 +1,6 @@ Summary: A binary file delta generator and an RCS replacement library. Name: xdelta -Version: 1.1.4pre1 +Version: 1.1.4 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -80,6 +80,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 30 2007 Adam Tkac 1.1.4-1.fc7 +- version 1.1.4 has been marked as final 1.1.4 version + * Mon Jan 29 2007 Adam Tkac 1.1.4pre1-1.fc7 - started using dist macro - updated to 1.1.4pre1 From fedora-cvs-commits at redhat.com Tue Jan 30 14:50:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:50:16 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.280, 1.281 config-powerpc-generic, 1.36, 1.37 config-x86-generic, 1.74, 1.75 config-x86_64-generic, 1.61, 1.62 Message-ID: <200701301450.l0UEoG35009923@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv9564/configs Modified Files: config-generic config-powerpc-generic config-x86-generic config-x86_64-generic Log Message: rebase to 2.6.20-rc6-git1 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.280 retrieving revision 1.281 diff -u -r1.280 -r1.281 --- config-generic 26 Jan 2007 22:46:56 -0000 1.280 +++ config-generic 30 Jan 2007 14:50:14 -0000 1.281 @@ -211,6 +211,7 @@ # CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_CAFE is not set CONFIG_MTD_NAND_IDS=m CONFIG_MTD_NAND_NANDSIM=m # CONFIG_MTD_ONENAND is not set @@ -534,6 +535,7 @@ # CONFIG_SCSI_IPR is not set # CONFIG_SCSI_DPT_I2O is not set CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_SEAGATE is not set # # PCMCIA SCSI adapter support Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- config-powerpc-generic 19 Dec 2006 18:55:12 -0000 1.36 +++ config-powerpc-generic 30 Jan 2007 14:50:14 -0000 1.37 @@ -184,4 +184,4 @@ # CONFIG_BLK_DEV_HD is not set # CONFIG_SATA_INTEL_COMBINED is not set # CONFIG_USB_STORAGE_ISD200 is not set - +CONFIG_MTD_PHYSMAP_OF=m Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- config-x86-generic 8 Jan 2007 01:41:22 -0000 1.74 +++ config-x86-generic 30 Jan 2007 14:50:14 -0000 1.75 @@ -317,3 +317,7 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m + +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m +CONFIG_MTD_NAND_CAFE=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- config-x86_64-generic 13 Dec 2006 19:11:14 -0000 1.61 +++ config-x86_64-generic 30 Jan 2007 14:50:14 -0000 1.62 @@ -200,3 +200,6 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m + +CONFIG_MTD_ESB2ROM=m +CONFIG_MTD_CK804XROM=m From fedora-cvs-commits at redhat.com Tue Jan 30 14:50:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 09:50:16 -0500 Subject: rpms/kernel/devel patch-2.6.20-rc6-git1.bz2.sign, NONE, 1.1 patch-2.6.20-rc6.bz2.sign, NONE, 1.1 .cvsignore, 1.562, 1.563 kernel-2.6.spec, 1.2914, 1.2915 linux-2.6-execshield.patch, 1.48, 1.49 linux-2.6-module_version.patch, 1.2, 1.3 linux-2.6-softlockup-disable.patch, 1.2, 1.3 sources, 1.525, 1.526 upstream, 1.453, 1.454 linux-2.6-maple-ide.patch, 1.1, NONE patch-2.6.20-rc4-git4.bz2.sign, 1.1, NONE patch-2.6.20-rc4.bz2.sign, 1.1, NONE Message-ID: <200701301450.l0UEoGOu009912@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9564 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-execshield.patch linux-2.6-module_version.patch linux-2.6-softlockup-disable.patch sources upstream Added Files: patch-2.6.20-rc6-git1.bz2.sign patch-2.6.20-rc6.bz2.sign Removed Files: linux-2.6-maple-ide.patch patch-2.6.20-rc4-git4.bz2.sign patch-2.6.20-rc4.bz2.sign Log Message: rebase to 2.6.20-rc6-git1 --- NEW FILE patch-2.6.20-rc6-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFvS68yGugalF9Dw4RAsoaAJ4ocENUSYd5EOY5mlwKv8pVvnCNQwCfc1OT DBay2IVnwtBvMoaFa7I832c= =uKrL -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.20-rc6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFuDUayGugalF9Dw4RAi7zAKCCTj3KT1u679RjTndgYXNDI6+PSACbBedH rPTQVwTSt2Ffo29ppwWhvwA= =vDjd -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.562 retrieving revision 1.563 diff -u -r1.562 -r1.563 --- .cvsignore 10 Jan 2007 23:31:50 -0000 1.562 +++ .cvsignore 30 Jan 2007 14:50:14 -0000 1.563 @@ -4,5 +4,5 @@ kernel-2.6.19 xen-11633.tar.bz2 linux-2.6.19.tar.bz2 -patch-2.6.20-rc4.bz2 -patch-2.6.20-rc4-git4.bz2 +patch-2.6.20-rc6.bz2 +patch-2.6.20-rc6-git1.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2914 retrieving revision 1.2915 diff -u -r1.2914 -r1.2915 --- kernel-2.6.spec 26 Jan 2007 22:46:55 -0000 1.2914 +++ kernel-2.6.spec 30 Jan 2007 14:50:14 -0000 1.2915 @@ -300,8 +300,8 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.20-rc4.bz2 -Patch2: patch-2.6.20-rc4-git4.bz2 +Patch1: patch-2.6.20-rc6.bz2 +Patch2: patch-2.6.20-rc6-git1.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -325,7 +325,6 @@ Patch302: linux-2.6-systemsim-work.patch Patch303: linux-2.6-ppc32-ucmpdi2.patch Patch304: linux-2.6-ibmvscsi-schizo.patch -Patch305: linux-2.6-maple-ide.patch Patch310: linux-2.6-common-uevent.patch Patch311: linux-2.6-uevent-macio.patch @@ -818,8 +817,6 @@ %patch303 -p1 # Fix up ibmvscsi for combined pSeries/iSeries build %patch304 -p1 -# Fix legacy mode IDE IRQ on Maple -%patch305 -p1 # uevent support for of_platform device %patch310 -p1 @@ -2003,6 +2000,9 @@ # - tux. %changelog +* Mon Jan 29 2007 Chuck Ebbert +- 2.6.20rc6-git1 + * Fri Jan 26 2007 Bill Nottingham - turn on CONFIG_SYSFS_DEPRECATED so that things actually work. *sigh* linux-2.6-execshield.patch: linux-2.6.19.noarch/drivers/char/random.c | 8 + linux-2.6.19.noarch/include/asm-i386/desc.h | 14 ++ linux-2.6.19.noarch/include/asm-i386/elf.h | 6 + linux-2.6/arch/i386/kernel/cpu/common.c | 7 + linux-2.6/arch/i386/kernel/process.c | 59 ++++++++++++ linux-2.6/arch/i386/kernel/smp.c | 3 linux-2.6/arch/i386/kernel/sysenter.c | 6 - linux-2.6/arch/i386/kernel/traps.c | 93 +++++++++++++++++++ linux-2.6/arch/i386/mm/init.c | 6 + linux-2.6/arch/i386/mm/mmap.c | 6 - linux-2.6/arch/i386/mm/pageattr.c | 8 + linux-2.6/arch/ia64/ia32/binfmt_elf32.c | 2 linux-2.6/arch/powerpc/kernel/vdso.c | 3 linux-2.6/arch/x86_64/ia32/ia32_binfmt.c | 6 - linux-2.6/arch/x86_64/ia32/syscall32.c | 4 linux-2.6/arch/x86_64/kernel/process.c | 6 - linux-2.6/arch/x86_64/kernel/setup64.c | 40 -------- linux-2.6/arch/x86_64/mm/fault.c | 2 linux-2.6/arch/x86_64/mm/mmap.c | 98 ++++++++++++++++---- linux-2.6/fs/binfmt_elf.c | 131 ++++++++++++++++++++++------ linux-2.6/fs/proc/array.c | 8 + linux-2.6/fs/proc/base.c | 8 - linux-2.6/fs/proc/task_mmu.c | 29 +++++- linux-2.6/include/asm-i386/a.out.h | 2 linux-2.6/include/asm-i386/mmu.h | 4 linux-2.6/include/asm-i386/pgalloc.h | 1 linux-2.6/include/asm-i386/processor.h | 8 + linux-2.6/include/asm-ia64/pgalloc.h | 4 linux-2.6/include/asm-powerpc/elf.h | 3 linux-2.6/include/asm-powerpc/pgalloc.h | 5 + linux-2.6/include/asm-ppc/pgalloc.h | 5 + linux-2.6/include/asm-s390/pgalloc.h | 4 linux-2.6/include/asm-sparc/pgalloc.h | 4 linux-2.6/include/asm-sparc64/pgalloc.h | 4 linux-2.6/include/asm-x86_64/pgalloc.h | 7 + linux-2.6/include/linux/mm.h | 11 +- linux-2.6/include/linux/resource.h | 5 - linux-2.6/include/linux/sched.h | 9 + linux-2.6/include/linux/sysctl.h | 2 linux-2.6/kernel/signal.c | 33 +++++++ linux-2.6/kernel/sysctl.c | 36 +++++++ linux-2.6/mm/mmap.c | 105 ++++++++++++++++++++-- linux-2.6/mm/mprotect.c | 6 + linux-2.6/mm/mremap.c | 4 44 files changed, 677 insertions(+), 138 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- linux-2.6-execshield.patch 14 Jan 2007 05:44:01 -0000 1.48 +++ linux-2.6-execshield.patch 30 Jan 2007 14:50:14 -0000 1.49 @@ -1349,18 +1349,18 @@ /* Index: linux-2.6/include/asm-i386/elf.h =================================================================== ---- linux-2.6.orig/include/asm-i386/elf.h -+++ linux-2.6/include/asm-i386/elf.h -@@ -159,7 +159,8 @@ extern void __kernel_vsyscall; +--- linux-2.6.19.noarch/include/asm-i386/elf.h~ 2007-01-29 11:28:35.000000000 -0500 ++++ linux-2.6.19.noarch/include/asm-i386/elf.h 2007-01-29 11:32:29.000000000 -0500 +@@ -157,7 +157,8 @@ 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); + int executable_stack, unsigned long start_code, + unsigned long interp_map_address); + #endif extern unsigned int vdso_enabled; - @@ -215,4 +216,7 @@ do { \ #endif linux-2.6-module_version.patch: linux-1720/drivers/block/DAC960.c | 1 + linux-1720/drivers/block/cpqarray.c | 1 + linux-1720/drivers/net/b44.c | 1 + linux-1720/drivers/net/ns83820.c | 1 + linux-1720/drivers/scsi/gdth.c | 1 + linux-2.6.13/drivers/block/cciss.c | 1 + 6 files changed, 6 insertions(+) Index: linux-2.6-module_version.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-module_version.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-module_version.patch 16 Feb 2006 20:37:27 -0000 1.2 +++ linux-2.6-module_version.patch 30 Jan 2007 14:50:14 -0000 1.3 @@ -27,17 +27,6 @@ MODULE_LICENSE("GPL"); +MODULE_VERSION(DAC960_DriverVersion); -diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/message/fusion/mptbase.c linux-1720/drivers/message/fusion/mptbase.c ---- linux-1700/drivers/message/fusion/mptbase.c -+++ linux-1720/drivers/message/fusion/mptbase.c -@@ -119,6 +119,7 @@ - MODULE_AUTHOR(MODULEAUTHOR); - MODULE_DESCRIPTION(my_NAME); - MODULE_LICENSE("GPL"); -+MODULE_VERSION(MPT_LINUX_VERSION_COMMON); - - /* - * cmd line parameters diff -urNp --exclude-from=/home/davej/.exclude linux-1700/drivers/net/b44.c linux-1720/drivers/net/b44.c --- linux-1700/drivers/net/b44.c +++ linux-1720/drivers/net/b44.c 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-softlockup-disable.patch 6 Mar 2006 07:49:29 -0000 1.2 +++ linux-2.6-softlockup-disable.patch 30 Jan 2007 14:50:14 -0000 1.3 @@ -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,15 @@ static void __init do_basic_setup(void) +@@ -732,6 +732,15 @@ static void __init do_basic_setup(void) do_initcalls(); } @@ -13,7 +13,7 @@ +} +__setup("nosoftlockup", nosoftlockup_setup); + - static void do_pre_smp_initcalls(void) + static void __init do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); @@ -649,7 +657,8 @@ static void do_pre_smp_initcalls(void) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.525 retrieving revision 1.526 diff -u -r1.525 -r1.526 --- sources 10 Jan 2007 23:31:51 -0000 1.525 +++ sources 30 Jan 2007 14:50:14 -0000 1.526 @@ -1,4 +1,4 @@ 93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 -9b325c6086ad2a3fcde643f01a4c4640 patch-2.6.20-rc4.bz2 -a56a8f4c97cc30ee49e70125e46ca119 patch-2.6.20-rc4-git4.bz2 +7c6dca292f886e7f79df72501f7bfac4 patch-2.6.20-rc6.bz2 +862c1198c918f933d189da0360acb39d patch-2.6.20-rc6-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.453 retrieving revision 1.454 diff -u -r1.453 -r1.454 --- upstream 10 Jan 2007 23:31:51 -0000 1.453 +++ upstream 30 Jan 2007 14:50:14 -0000 1.454 @@ -1,3 +1,3 @@ linux-2.6.19.tar.bz2 -patch-2.6.20-rc4.bz2 -patch-2.6.20-rc4-git4.bz2 +patch-2.6.20-rc6.bz2 +patch-2.6.20-rc6-git1.bz2 --- linux-2.6-maple-ide.patch DELETED --- --- patch-2.6.20-rc4-git4.bz2.sign DELETED --- --- patch-2.6.20-rc4.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 15:03:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 10:03:17 -0500 Subject: rpms/openoffice.org/devel ooobuild.VBAObjects.patch, 1.13, 1.14 openoffice.org.spec, 1.1014, 1.1015 Message-ID: <200701301503.l0UF3HBk019816@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19524 Modified Files: ooobuild.VBAObjects.patch openoffice.org.spec Log Message: workspace.npower5 integrated ooobuild.VBAObjects.patch: basic/inc/sberrors.hxx | 3 basic/inc/sbx.hxx | 3 basic/source/classes/errobject.cxx | 179 basic/source/classes/makefile.mk | 7 basic/source/classes/sb.cxx | 1 basic/source/classes/sb.src | 6 basic/source/classes/sbunoobj.cxx | 242 basic/source/classes/sbxmod.cxx | 8 basic/source/comp/codegen.cxx | 2 basic/source/comp/dim.cxx | 18 basic/source/comp/makefile.mk | 4 basic/source/comp/parser.cxx | 2 basic/source/comp/scanner.cxx | 14 basic/source/comp/token.cxx | 1 basic/source/inc/errobject.hxx | 16 basic/source/inc/parser.hxx | 2 basic/source/inc/runtime.hxx | 6 basic/source/inc/scanner.hxx | 5 basic/source/inc/token.hxx | 2 basic/source/runtime/makefile.mk | 3 basic/source/runtime/runtime.cxx | 36 basic/source/runtime/stdobj.cxx | 6 basic/source/runtime/step0.cxx | 66 basic/source/runtime/step1.cxx | 4 basic/source/runtime/step2.cxx | 20 basic/source/sbx/sbxarray.cxx | 3 basic/source/sbx/sbxvalue.cxx | 12 com/sun/star/script/makefile.mk | 1 config_office/configure.in | 13 config_office/set_soenv.in | 1 inc/basmgr.hxx | 5 inc/sbmod.hxx | 1 inc/sbstar.hxx | 4 offapi/org/openoffice/vba/Excel/Constants.idl | 20 offapi/org/openoffice/vba/Excel/VBA.idl | 25 offapi/org/openoffice/vba/Excel/XlApplicationInternational.idl | 54 offapi/org/openoffice/vba/Excel/XlApplyNamesOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlArabicModes.idl | 13 offapi/org/openoffice/vba/Excel/XlArrangeStyle.idl | 13 offapi/org/openoffice/vba/Excel/XlArrowHeadLength.idl | 12 offapi/org/openoffice/vba/Excel/XlArrowHeadStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlArrowHeadWidth.idl | 12 offapi/org/openoffice/vba/Excel/XlAutoFilterOperator.idl | 15 offapi/org/openoffice/vba/Excel/XlAxisCrosses.idl | 13 offapi/org/openoffice/vba/Excel/XlAxisGroup.idl | 11 offapi/org/openoffice/vba/Excel/XlAxisType.idl | 12 offapi/org/openoffice/vba/Excel/XlBackground.idl | 12 offapi/org/openoffice/vba/Excel/XlBarShape.idl | 15 offapi/org/openoffice/vba/Excel/XlBorderWeight.idl | 13 offapi/org/openoffice/vba/Excel/XlBordersIndex.idl | 17 offapi/org/openoffice/vba/Excel/XlBuildInDialog.idl | 251 offapi/org/openoffice/vba/Excel/XlCVError.idl | 16 offapi/org/openoffice/vba/Excel/XlCalculatedMemberType.idl | 11 offapi/org/openoffice/vba/Excel/XlCalculation.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationInterruptKey.idl | 12 offapi/org/openoffice/vba/Excel/XlCalculationState.idl | 12 offapi/org/openoffice/vba/Excel/XlCategoryType.idl | 12 offapi/org/openoffice/vba/Excel/XlCellInsertionMode.idl | 12 offapi/org/openoffice/vba/Excel/XlCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlChartGallery.idl | 13 offapi/org/openoffice/vba/Excel/XlChartItem.idl | 40 offapi/org/openoffice/vba/Excel/XlChartLocation.idl | 12 offapi/org/openoffice/vba/Excel/XlChartPicturePlacement.idl | 16 offapi/org/openoffice/vba/Excel/XlChartPictureType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartSplitType.idl | 13 offapi/org/openoffice/vba/Excel/XlChartType.idl | 82 offapi/org/openoffice/vba/Excel/XlClipboardFormat.idl | 42 offapi/org/openoffice/vba/Excel/XlCmdType.idl | 14 offapi/org/openoffice/vba/Excel/XlColorIndex.idl | 11 offapi/org/openoffice/vba/Excel/XlColumnDataType.idl | 20 offapi/org/openoffice/vba/Excel/XlCommandUnderlines.idl | 12 offapi/org/openoffice/vba/Excel/XlCommentDisplayMode.idl | 13 offapi/org/openoffice/vba/Excel/XlConsolidationFunction.idl | 21 offapi/org/openoffice/vba/Excel/XlCopyPictureFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlCorruptLoad.idl | 12 offapi/org/openoffice/vba/Excel/XlCreator.idl | 10 offapi/org/openoffice/vba/Excel/XlCubeFieldType.idl | 12 offapi/org/openoffice/vba/Excel/XlCutCopyMode.idl | 11 offapi/org/openoffice/vba/Excel/XlDVAlertStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVAlterStyle.idl | 12 offapi/org/openoffice/vba/Excel/XlDVType.idl | 17 offapi/org/openoffice/vba/Excel/XlDataLabelPosition.idl | 21 offapi/org/openoffice/vba/Excel/XlDataLabelSeparator.idl | 10 offapi/org/openoffice/vba/Excel/XlDataLabelsType.idl | 15 offapi/org/openoffice/vba/Excel/XlDataSeriesDate.idl | 13 offapi/org/openoffice/vba/Excel/XlDataSeriesType.idl | 12 offapi/org/openoffice/vba/Excel/XlDeleteShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlDirection.idl | 13 offapi/org/openoffice/vba/Excel/XlDisplayBlanksAs.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayDrawingObjects.idl | 12 offapi/org/openoffice/vba/Excel/XlDisplayUnit.idl | 18 offapi/org/openoffice/vba/Excel/XlEditionFormat.idl | 10 offapi/org/openoffice/vba/Excel/XlEditionOptionsOption.idl | 17 offapi/org/openoffice/vba/Excel/XlEditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlEnableCancelKey.idl | 12 offapi/org/openoffice/vba/Excel/XlEnableSelection.idl | 12 offapi/org/openoffice/vba/Excel/XlEndStyleCap.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlErrorBarInclude.idl | 13 offapi/org/openoffice/vba/Excel/XlErrorBarType.idl | 14 offapi/org/openoffice/vba/Excel/XlErrorChecks.idl | 17 offapi/org/openoffice/vba/Excel/XlFileAccess.idl | 11 offapi/org/openoffice/vba/Excel/XlFileFormat.idl | 52 offapi/org/openoffice/vba/Excel/XlFillWith.idl | 12 offapi/org/openoffice/vba/Excel/XlFilterAction.idl | 11 offapi/org/openoffice/vba/Excel/XlFindLookIn.idl | 12 offapi/org/openoffice/vba/Excel/XlFormControl.idl | 19 offapi/org/openoffice/vba/Excel/XlFormatConditionOperator.idl | 17 offapi/org/openoffice/vba/Excel/XlFormatConditionType.idl | 11 offapi/org/openoffice/vba/Excel/XlFormulaLabel.idl | 13 offapi/org/openoffice/vba/Excel/XlHAlign.idl | 17 offapi/org/openoffice/vba/Excel/XlHebrewModes.idl | 13 offapi/org/openoffice/vba/Excel/XlHighlightChangesTime.idl | 12 offapi/org/openoffice/vba/Excel/XlHtmlType.idl | 13 offapi/org/openoffice/vba/Excel/XlIMEMode.idl | 20 offapi/org/openoffice/vba/Excel/XlImportDataAs.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertFormatOrigin.idl | 11 offapi/org/openoffice/vba/Excel/XlInsertShiftDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlLayoutFormType.idl | 11 offapi/org/openoffice/vba/Excel/XlLegendPosition.idl | 14 offapi/org/openoffice/vba/Excel/XlLineStyle.idl | 17 offapi/org/openoffice/vba/Excel/XlLink.idl | 13 offapi/org/openoffice/vba/Excel/XlLinkInfo.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkInfoType.idl | 12 offapi/org/openoffice/vba/Excel/XlLinkStatus.idl | 20 offapi/org/openoffice/vba/Excel/XlLinkType.idl | 11 offapi/org/openoffice/vba/Excel/XlListConflict.idl | 13 offapi/org/openoffice/vba/Excel/XlListDataType.idl | 22 offapi/org/openoffice/vba/Excel/XlListObjectSourceType.idl | 12 offapi/org/openoffice/vba/Excel/XlLocationInTable.idl | 22 offapi/org/openoffice/vba/Excel/XlLookAt.idl | 11 offapi/org/openoffice/vba/Excel/XlMSApplication.idl | 16 offapi/org/openoffice/vba/Excel/XlMailSystem.idl | 12 offapi/org/openoffice/vba/Excel/XlMarkerStyle.idl | 21 offapi/org/openoffice/vba/Excel/XlMouseButton.idl | 12 offapi/org/openoffice/vba/Excel/XlMousePointer.idl | 13 offapi/org/openoffice/vba/Excel/XlOLEType.idl | 12 offapi/org/openoffice/vba/Excel/XlOLEVerb.idl | 11 offapi/org/openoffice/vba/Excel/XlObjectSize.idl | 12 offapi/org/openoffice/vba/Excel/XlOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlOrientation.idl | 13 offapi/org/openoffice/vba/Excel/XlPTSelectionMode.idl | 16 offapi/org/openoffice/vba/Excel/XlPageBreak.idl | 12 offapi/org/openoffice/vba/Excel/XlPageBreakExtent.idl | 11 offapi/org/openoffice/vba/Excel/XlPageOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlPaperSize.idl | 50 offapi/org/openoffice/vba/Excel/XlParameterDataType.idl | 30 offapi/org/openoffice/vba/Excel/XlParameterType.idl | 12 offapi/org/openoffice/vba/Excel/XlPasteSpecialOperation.idl | 14 offapi/org/openoffice/vba/Excel/XlPasteType.idl | 19 offapi/org/openoffice/vba/Excel/XlPattern.idl | 29 offapi/org/openoffice/vba/Excel/XlPhoneticAlignment.idl | 13 offapi/org/openoffice/vba/Excel/XlPictureAppearance.idl | 11 offapi/org/openoffice/vba/Excel/XlPictureConvertorType.idl | 22 offapi/org/openoffice/vba/Excel/XlPivotCellType.idl | 19 offapi/org/openoffice/vba/Excel/XlPivotFieldCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlPivotFieldDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotFieldOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotFormatType.idl | 31 offapi/org/openoffice/vba/Excel/XlPivotTableMissingItems.idl | 12 offapi/org/openoffice/vba/Excel/XlPivotTableSourceType.idl | 14 offapi/org/openoffice/vba/Excel/XlPivotTableVersionList.idl | 12 offapi/org/openoffice/vba/Excel/XlPlacement.idl | 12 offapi/org/openoffice/vba/Excel/XlPlatform.idl | 11 offapi/org/openoffice/vba/Excel/XlPrintErrors.idl | 13 offapi/org/openoffice/vba/Excel/XlPrintLocation.idl | 13 offapi/org/openoffice/vba/Excel/XlPriority.idl | 12 offapi/org/openoffice/vba/Excel/XlQueryType.idl | 15 offapi/org/openoffice/vba/Excel/XlRangeAutoFormat.idl | 53 offapi/org/openoffice/vba/Excel/XlRangeValueDataType.idl | 12 offapi/org/openoffice/vba/Excel/XlReferenceStyle.idl | 11 offapi/org/openoffice/vba/Excel/XlReferenceType.idl | 13 offapi/org/openoffice/vba/Excel/XlRobustConnect.idl | 12 offapi/org/openoffice/vba/Excel/XlRoutingSlipDelivery.idl | 11 offapi/org/openoffice/vba/Excel/XlRoutingSlipStatus.idl | 12 offapi/org/openoffice/vba/Excel/XlRowCol.idl | 11 offapi/org/openoffice/vba/Excel/XlRunAutoMacro.idl | 13 offapi/org/openoffice/vba/Excel/XlSaveAction.idl | 11 offapi/org/openoffice/vba/Excel/XlSaveAsAccessMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSaveConflictResolution.idl | 12 offapi/org/openoffice/vba/Excel/XlScaleType.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSearchWithin.idl | 11 offapi/org/openoffice/vba/Excel/XlSheetType.idl | 14 offapi/org/openoffice/vba/Excel/XlSheetVisibility.idl | 12 offapi/org/openoffice/vba/Excel/XlSizeRepresents.idl | 11 offapi/org/openoffice/vba/Excel/XlSmartTagControlType.idl | 23 offapi/org/openoffice/vba/Excel/XlSmartTagDisplayMode.idl | 12 offapi/org/openoffice/vba/Excel/XlSortDataOption.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethod.idl | 11 offapi/org/openoffice/vba/Excel/XlSortMethodOld.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrder.idl | 11 offapi/org/openoffice/vba/Excel/XlSortOrientation.idl | 11 offapi/org/openoffice/vba/Excel/XlSortType.idl | 11 offapi/org/openoffice/vba/Excel/XlSourceType.idl | 17 offapi/org/openoffice/vba/Excel/XlSpeakDirection.idl | 11 offapi/org/openoffice/vba/Excel/XlSpecialCellsValue.idl | 13 offapi/org/openoffice/vba/Excel/XlSubscribeToFormat.idl | 11 offapi/org/openoffice/vba/Excel/XlSubtototalLocationType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryColumn.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryReportType.idl | 11 offapi/org/openoffice/vba/Excel/XlSummaryRow.idl | 11 offapi/org/openoffice/vba/Excel/XlTabPosition.idl | 11 offapi/org/openoffice/vba/Excel/XlTextParsingType.idl | 11 offapi/org/openoffice/vba/Excel/XlTextQualifier.idl | 12 offapi/org/openoffice/vba/Excel/XlTextVisualLayoutType.idl | 11 offapi/org/openoffice/vba/Excel/XlTickLabelOrientation.idl | 14 offapi/org/openoffice/vba/Excel/XlTickLabelPosition.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeMark.idl | 13 offapi/org/openoffice/vba/Excel/XlTimeUnit.idl | 12 offapi/org/openoffice/vba/Excel/XlToolbarProtection.idl | 15 offapi/org/openoffice/vba/Excel/XlTotalsCalculation.idl | 18 offapi/org/openoffice/vba/Excel/XlTrendlineType.idl | 15 offapi/org/openoffice/vba/Excel/XlUnderlineStyle.idl | 14 offapi/org/openoffice/vba/Excel/XlUpdateLinks.idl | 12 offapi/org/openoffice/vba/Excel/XlVAlign.idl | 14 offapi/org/openoffice/vba/Excel/XlWBATemplate.idl | 14 offapi/org/openoffice/vba/Excel/XlWebFormatting.idl | 12 offapi/org/openoffice/vba/Excel/XlWebSectionType.idl | 12 offapi/org/openoffice/vba/Excel/XlWindowState.idl | 11 offapi/org/openoffice/vba/Excel/XlWindowType.idl | 13 offapi/org/openoffice/vba/Excel/XlWindowView.idl | 10 offapi/org/openoffice/vba/Excel/XlXLMMacroType.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlExportResult.idl | 10 offapi/org/openoffice/vba/Excel/XlXmlImportResult.idl | 11 offapi/org/openoffice/vba/Excel/XlXmlLoadOption.idl | 12 offapi/org/openoffice/vba/Excel/XlYesNoGuess.idl | 12 offapi/org/openoffice/vba/Excel/makefile.mk | 218 offapi/org/openoffice/vba/MSFormReturnTypes.idl | 25 offapi/org/openoffice/vba/XApplication.idl | 54 offapi/org/openoffice/vba/XArrayWrapper.idl | 26 offapi/org/openoffice/vba/XBorder.idl | 29 offapi/org/openoffice/vba/XBorders.idl | 27 offapi/org/openoffice/vba/XCharacters.idl | 32 offapi/org/openoffice/vba/XChart.idl | 26 offapi/org/openoffice/vba/XChartObject.idl | 27 offapi/org/openoffice/vba/XChartObjects.idl | 30 offapi/org/openoffice/vba/XCollection.idl | 28 offapi/org/openoffice/vba/XComboBox.idl | 29 offapi/org/openoffice/vba/XComment.idl | 38 offapi/org/openoffice/vba/XComments.idl | 24 offapi/org/openoffice/vba/XDialog.idl | 28 offapi/org/openoffice/vba/XDialogs.idl | 26 offapi/org/openoffice/vba/XErrObject.idl | 63 offapi/org/openoffice/vba/XFont.idl | 39 offapi/org/openoffice/vba/XGlobals.idl | 34 offapi/org/openoffice/vba/XInterior.idl | 27 offapi/org/openoffice/vba/XOutline.idl | 28 offapi/org/openoffice/vba/XPivotCache.idl | 25 offapi/org/openoffice/vba/XPivotTable.idl | 28 offapi/org/openoffice/vba/XPivotTables.idl | 27 offapi/org/openoffice/vba/XRange.idl | 115 offapi/org/openoffice/vba/XSeries.idl | 28 offapi/org/openoffice/vba/XSeriesCollection.idl | 30 offapi/org/openoffice/vba/XVBAToOOEventDescGen.idl | 20 offapi/org/openoffice/vba/XValidation.idl | 36 offapi/org/openoffice/vba/XWindow.idl | 35 offapi/org/openoffice/vba/XWindows.idl | 24 offapi/org/openoffice/vba/XWorkbook.idl | 38 offapi/org/openoffice/vba/XWorkbooks.idl | 24 offapi/org/openoffice/vba/XWorksheet.idl | 61 offapi/org/openoffice/vba/XWorksheetFunction.idl | 26 offapi/org/openoffice/vba/XWorksheets.idl | 29 offapi/org/openoffice/vba/XlBuiltInDialog.idl | 35 offapi/org/openoffice/vba/XlPasteSpecialOperation.idl | 29 offapi/org/openoffice/vba/XlPasteType.idl | 34 offapi/org/openoffice/vba/makefile.mk | 58 offapi/prj/build.lst | 4 offapi/prj/d.lst | 8 offapi/util/makefile.mk | 5 offuh/prj/d.lst | 15 sc/inc/cellsuno.hxx | 5 sc/inc/document.hxx | 14 sc/inc/docuno.hxx | 1 sc/inc/drwlayer.hxx | 4 sc/inc/global.hxx | 1 sc/inc/sc.hrc | 8 sc/inc/shapeuno.hxx | 9 sc/inc/sortparam.hxx | 1 sc/inc/userdat.hxx | 16 sc/prj/build.lst | 3 sc/sdi/drawsh.sdi | 6 sc/sdi/scalc.sdi | 101 sc/source/core/data/column3.cxx | 12 sc/source/core/data/drwlayer.cxx | 19 sc/source/core/data/sortparam.cxx | 1 sc/source/core/data/userdat.cxx | 16 sc/source/filter/excel/makefile.mk | 4 sc/source/filter/excel/xicontent.cxx | 18 sc/source/filter/excel/xiescher.cxx | 128 sc/source/filter/excel/xistyle.cxx | 63 sc/source/filter/excel/xlocx.cxx | 151 sc/source/filter/inc/xicontent.hxx | 1 sc/source/filter/inc/xiescher.hxx | 10 sc/source/filter/inc/xistyle.hxx | 2 sc/source/filter/inc/xlocx.hxx | 11 sc/source/ui/docshell/docsh.cxx | 202 sc/source/ui/drawfunc/drawsh.cxx | 130 sc/source/ui/drawfunc/drawsh2.cxx | 14 sc/source/ui/drawfunc/drawsh5.cxx | 18 sc/source/ui/drawfunc/fudraw.cxx | 19 sc/source/ui/drawfunc/fusel.cxx | 81 sc/source/ui/drawfunc/objdraw.src | 64 sc/source/ui/inc/drawsh.hxx | 2 sc/source/ui/src/sc.src | 8 sc/source/ui/unoobj/appluno.cxx | 36 sc/source/ui/unoobj/cellsuno.cxx | 11 sc/source/ui/unoobj/docuno.cxx | 41 sc/source/ui/unoobj/makefile.mk | 4 sc/source/ui/unoobj/shapeuno.cxx | 162 sc/source/ui/vba//vbavalidation.cxx | 286 sc/source/ui/vba//vbavalidation.hxx | 43 sc/source/ui/vba/makefile.mk | 62 sc/source/ui/vba/vbaapplication.cxx | 548 + sc/source/ui/vba/vbaapplication.hxx | 56 sc/source/ui/vba/vbaarraywrapper.cxx | 22 sc/source/ui/vba/vbaarraywrapper.hxx | 20 sc/source/ui/vba/vbaborders.cxx | 472 + sc/source/ui/vba/vbaborders.hxx | 49 sc/source/ui/vba/vbacharacters.cxx | 88 sc/source/ui/vba/vbacharacters.hxx | 45 sc/source/ui/vba/vbachart.cxx | 29 sc/source/ui/vba/vbachart.hxx | 23 sc/source/ui/vba/vbachartobject.cxx | 74 sc/source/ui/vba/vbachartobject.hxx | 24 sc/source/ui/vba/vbachartobjects.cxx | 52 sc/source/ui/vba/vbachartobjects.hxx | 29 sc/source/ui/vba/vbacollectionimpl.cxx | 107 sc/source/ui/vba/vbacollectionimpl.hxx | 72 sc/source/ui/vba/vbacombobox.cxx | 159 sc/source/ui/vba/vbacombobox.hxx | 64 sc/source/ui/vba/vbacomment.cxx | 199 sc/source/ui/vba/vbacomment.hxx | 49 sc/source/ui/vba/vbacomments.cxx | 58 sc/source/ui/vba/vbacomments.hxx | 31 sc/source/ui/vba/vbadialog.cxx | 104 sc/source/ui/vba/vbadialog.hxx | 35 sc/source/ui/vba/vbadialogs.cxx | 70 sc/source/ui/vba/vbadialogs.hxx | 34 sc/source/ui/vba/vbafont.cxx | 367 + sc/source/ui/vba/vbafont.hxx | 57 sc/source/ui/vba/vbaglobals.cxx | 203 sc/source/ui/vba/vbaglobals.hxx | 54 sc/source/ui/vba/vbahelper.cxx | 492 + sc/source/ui/vba/vbahelper.hxx | 46 sc/source/ui/vba/vbainterior.cxx | 95 sc/source/ui/vba/vbainterior.hxx | 37 sc/source/ui/vba/vbaobj.xml | 26 sc/source/ui/vba/vbaoutline.cxx | 20 sc/source/ui/vba/vbaoutline.hxx | 24 sc/source/ui/vba/vbapalette.cxx | 72 sc/source/ui/vba/vbapalette.hxx | 20 sc/source/ui/vba/vbapivotcache.cxx | 16 sc/source/ui/vba/vbapivotcache.hxx | 22 sc/source/ui/vba/vbapivottable.cxx | 16 sc/source/ui/vba/vbapivottable.hxx | 20 sc/source/ui/vba/vbapivottables.cxx | 49 sc/source/ui/vba/vbapivottables.hxx | 35 sc/source/ui/vba/vbarange.cxx | 3619 ++++++++++ sc/source/ui/vba/vbarange.hxx | 234 sc/source/ui/vba/vbaseriescollection.cxx | 74 sc/source/ui/vba/vbaseriescollection.hxx | 33 sc/source/ui/vba/vbawindow.cxx | 423 + sc/source/ui/vba/vbawindow.hxx | 39 sc/source/ui/vba/vbawindows.cxx | 208 sc/source/ui/vba/vbawindows.hxx | 37 sc/source/ui/vba/vbaworkbook.cxx | 233 sc/source/ui/vba/vbaworkbook.hxx | 49 sc/source/ui/vba/vbaworkbooks.cxx | 374 + sc/source/ui/vba/vbaworkbooks.hxx | 39 sc/source/ui/vba/vbaworksheet.cxx | 626 + sc/source/ui/vba/vbaworksheet.hxx | 93 sc/source/ui/vba/vbaworksheets.cxx | 219 sc/source/ui/vba/vbaworksheets.hxx | 51 sc/source/ui/vba/vbawsfunction.cxx | 104 sc/source/ui/vba/vbawsfunction.hxx | 33 sc/source/ui/view/gridwin5.cxx | 22 sc/source/ui/view/tabview5.cxx | 22 sc/util/makefile.mk | 4 sc/util/vbaobj.map | 10 scp2/source/ooo/file_library_ooo.scp | 18 scp2/source/ooo/makefile.mk | 4 scripting/prj/build.lst | 3 scripting/source/vbaevents/eventhelper.cxx | 1005 ++ scripting/source/vbaevents/makefile.mk | 50 scripting/source/vbaevents/service.cxx | 99 scripting/source/vbaevents/vbaevents.map | 10 scripting/source/vbaevents/vbaevents.xml | 26 sfx2/inc/objsh.hxx | 3 sfx2/inc/topfrm.hxx | 6 sfx2/source/doc/objmisc.cxx | 4 source/basmgr/basicmanagerrepository.cxx | 4 source/basmgr/basmgr.cxx | 8 source/classes/sb.cxx | 5 source/classes/sbunoobj.cxx | 12 source/classes/sbxmod.cxx | 10 source/comp/dim.cxx | 8 source/comp/parser.cxx | 7 source/inc/opcodes.hxx | 2 source/inc/runtime.hxx | 6 source/msfilter/svxmsbas.cxx | 3 source/runtime/runtime.cxx | 2 source/runtime/step0.cxx | 4 source/runtime/step1.cxx | 41 source/runtime/step2.cxx | 70 source/sbx/sbxvalue.cxx | 17 stoc/source/registry_tdprovider/makefile.mk | 4 stoc/source/registry_tdprovider/rdbtdp.xml | 1 stoc/source/registry_tdprovider/tdprovider.cxx | 167 stoc/source/tdmanager/makefile.mk | 4 stoc/source/tdmanager/tdmgr.cxx | 48 stoc/source/tdmanager/tdmgr.xml | 1 svx/source/form/fmscriptingenv.cxx | 7 svx/source/form/fmundo.cxx | 102 svx/source/form/makefile.mk | 4 svx/source/inc/fmundo.hxx | 4 svx/source/msfilter/svxmsbas.cxx | 1 udkapi/com/sun/star/script/XNULLWrapper.idl | 66 unoil/util/makefile.mk | 4 xmloff/inc/shapeexport.hxx | 5 xmloff/source/draw/eventimp.cxx | 416 - xmloff/source/draw/shapeexport.cxx | 3 xmloff/source/draw/shapeexport2.cxx | 451 - 424 files changed, 20094 insertions(+), 571 deletions(-) Index: ooobuild.VBAObjects.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/ooobuild.VBAObjects.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ooobuild.VBAObjects.patch 23 Jan 2007 20:06:51 -0000 1.13 +++ ooobuild.VBAObjects.patch 30 Jan 2007 15:03:14 -0000 1.14 @@ -23135,25 +23135,6 @@ { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); ---- basic.orig/source/classes/sb.cxx 2006-11-10 14:45:24.000000000 +0000 -+++ basic/source/classes/sb.cxx 2006-11-13 17:09:45.000000000 +0000 -@@ -845,8 +845,16 @@ void StarBASIC::InitAllModules( StarBASI - SbModule* pModule = (SbModule*)pModules->Get( nMod ); - if( !pModule->IsCompiled() ) - pModule->Compile(); -+ } -+ // compile modules first then RunInit ( otherwise there is -+ // can be order dependency, e.g. classmodule A has a member -+ // of of type classmodule B and classmodule B hasn't been compiled yet ) -+ for ( USHORT nMod = 0; nMod < pModules->Count(); nMod++ ) -+ { -+ SbModule* pModule = (SbModule*)pModules->Get( nMod ); - pModule->RunInit(); - } -+ - // Alle Objekte ueberpruefen, ob es sich um ein Basic handelt - // Wenn ja, auch dort initialisieren - for ( USHORT nObj = 0; nObj < pObjs->Count(); nObj++ ) --- basic.orig/source/classes/sbunoobj.cxx 2006-10-23 12:11:14.000000000 +0100 +++ basic/source/classes/sbunoobj.cxx 2006-10-26 12:55:51.000000000 +0100 @@ -72,6 +72,7 @@ @@ -23261,60 +23242,6 @@ +#endif + + ---- basic.orig/source/classes/sb.cxx 2006-10-27 09:39:26.000000000 +0100 -+++ basic/source/classes/sb.cxx 2006-10-27 15:50:43.000000000 +0100 -@@ -1548,11 +1548,12 @@ void BasicCollection::SFX_NOTIFY( SfxBro - ULONG nId = p->GetId(); - BOOL bRead = BOOL( nId == SBX_HINT_DATAWANTED ); - BOOL bWrite = BOOL( nId == SBX_HINT_DATACHANGED ); -+ BOOL bRequestInfo = BOOL( nId == SBX_HINT_INFOWANTED ); - SbxVariable* pVar = p->GetVar(); - SbxArray* pArg = pVar->GetParameters(); -+ XubString aVarName( pVar->GetName() ); - if( bRead || bWrite ) - { -- XubString aVarName( pVar->GetName() ); - if( pVar->GetHashCode() == nCountHash - && aVarName.EqualsIgnoreCaseAscii( pCountStr ) ) - pVar->PutLong( xItemArray->Count32() ); -@@ -1569,6 +1570,27 @@ void BasicCollection::SFX_NOTIFY( SfxBro - SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 ); - return; - } -+ else if ( bRequestInfo ) -+ { -+ if( pVar->GetHashCode() == nAddHash -+ && aVarName.EqualsIgnoreCaseAscii( pAddStr ) ) -+ { -+ SbxInfo* pInfo_ = new SbxInfo; -+ pInfo_->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Item") ), SbxVARIANT, SBX_READ ); -+ pInfo_->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Key") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); -+ pInfo_->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Before") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); -+ pInfo_->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("After") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL ); -+ pVar->SetInfo( pInfo_ ); -+ } -+ else if( pVar->GetHashCode() == nItemHash -+ && aVarName.EqualsIgnoreCaseAscii( pItemStr ) ) -+ { -+ SbxInfo* pInfo_ = new SbxInfo; -+ pInfo_->AddParam( String( RTL_CONSTASCII_USTRINGPARAM("Index") ), SbxVARIANT, SBX_READ | SBX_OPTIONAL); -+ pVar->SetInfo( pInfo_ ); -+ -+ } -+ } - } - SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 ); - } -@@ -1693,7 +1715,8 @@ void BasicCollection::CollItem( SbxArray - pRes = xItemArray->Get32( nIndex ); - if( !pRes ) - SetError( SbxERR_BAD_INDEX ); -- *(pPar_->Get(0)) = *pRes; -+ else -+ *(pPar_->Get(0)) = *pRes; - } - - void BasicCollection::CollRemove( SbxArray* pPar_ ) --- svx.orig/source/msfilter/svxmsbas.cxx 2006-10-27 11:46:56.000000000 +0100 +++ svx/source/msfilter/svxmsbas.cxx 2006-11-01 22:02:58.000000000 +0000 @@ -353,7 +353,10 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( @@ -23829,208 +23756,6 @@ + pInst->Error( error ); } ---- /data4/sles/ooo-build-NEWEST-Latest/ooo-build/build/ooe680-m2/basic/source/runtime/runtime.cxx 2006-11-28 12:26:41.000000000 +0000 -+++ basic/source/runtime/runtime.cxx 2006-11-28 12:02:58.000000000 +0000 -@@ -717,81 +864,88 @@ BOOL SbiRuntime::Step() - SbError err = nError; - ClearExprStack(); - nError = 0; -+ pInst->nErr = err; -+ pInst->nErl = nLine; -+ pErrCode = pCode; -+ pErrStmnt = pStmnt; -+ // An error occured in an error handler -+ // force parent handler ( if there is one ) -+ // to handle the error -+ bool bLetParentHandleThis = false; -+ - // Im Error Handler? Dann Std-Error -- if( bInError ) -- { -- StepSTDERROR(); -- pInst->Abort(); -- } -- else -+ if ( !bInError ) - { - bInError = TRUE; - -- pInst->nErr = err; -- pInst->nErl = nLine; -- pErrCode = pCode; -- pErrStmnt = pStmnt; - if( !bError ) // On Error Resume Next - StepRESUME( 1 ); - else if( pError ) // On Error Goto ... - pCode = pError; -- else // Standard-Fehlerbehandlung -- { -- // AB 13.2.1997, neues Error-Handling: -- // Uebergeordnete Error-Handler beruecksichtigen -+ else -+ bLetParentHandleThis = true; -+ } -+ else -+ { -+ bLetParentHandleThis = true; -+ pError = NULL; //terminate the handler -+ } -+ if ( bLetParentHandleThis ) -+ { -+ // AB 13.2.1997, neues Error-Handling: -+ // Uebergeordnete Error-Handler beruecksichtigen - -- // Wir haben keinen Error-Handler -> weiter oben suchen -- SbiRuntime* pRtErrHdl = NULL; -- SbiRuntime* pRt = this; -- while( NULL != (pRt = pRt->pNext) ) -+ // Wir haben keinen Error-Handler -> weiter oben suchen -+ SbiRuntime* pRtErrHdl = NULL; -+ SbiRuntime* pRt = this; -+ while( NULL != (pRt = pRt->pNext) ) -+ { -+ // Gibt es einen Error-Handler? -+ if( pRt->bError == FALSE || pRt->pError != NULL ) - { -- // Gibt es einen Error-Handler? -- if( pRt->bError == FALSE || pRt->pError != NULL ) -- { -- pRtErrHdl = pRt; -- break; -- } -+ pRtErrHdl = pRt; -+ break; - } -+ } - -- // Error-Hdl gefunden? -- if( pRtErrHdl ) -- { -- // (Neuen) Error-Stack anlegen -- SbErrorStack*& rErrStack = GetSbData()->pErrStack; -- if( rErrStack ) -- delete rErrStack; -- rErrStack = new SbErrorStack(); -- -- // Alle im Call-Stack darunter stehenden RTs manipulieren -- pRt = this; -- do -- { -- // Fehler setzen -- pRt->nError = err; -- if( pRt != pRtErrHdl ) -- pRt->bRun = FALSE; -- -- // In Error-Stack eintragen -- SbErrorStackEntry *pEntry = new SbErrorStackEntry -- ( pRt->pMeth, pRt->nLine, pRt->nCol1, pRt->nCol2 ); -- rErrStack->C40_INSERT(SbErrorStackEntry, pEntry, rErrStack->Count() ); -- -- // Nach RT mit Error-Handler aufhoeren -- if( pRt == pRtErrHdl ) -- break; -- pRt = pRt->pNext; -- } -- while( pRt ); -- } -- // Kein Error-Hdl gefunden -> altes Vorgehen -- else -+ // Error-Hdl gefunden? -+ if( pRtErrHdl ) -+ { -+ // (Neuen) Error-Stack anlegen -+ SbErrorStack*& rErrStack = GetSbData()->pErrStack; -+ if( rErrStack ) -+ delete rErrStack; -+ rErrStack = new SbErrorStack(); -+ -+ // Alle im Call-Stack darunter stehenden RTs manipulieren -+ pRt = this; -+ do - { -- pInst->Abort(); -- } -+ // Fehler setzen -+ pRt->nError = err; -+ if( pRt != pRtErrHdl ) -+ pRt->bRun = FALSE; -+ -+ // In Error-Stack eintragen -+ SbErrorStackEntry *pEntry = new SbErrorStackEntry -+ ( pRt->pMeth, pRt->nLine, pRt->nCol1, pRt->nCol2 ); -+ rErrStack->C40_INSERT(SbErrorStackEntry, pEntry, rErrStack->Count() ); - -- // ALT: Nur -- // pInst->Abort(); -+ // Nach RT mit Error-Handler aufhoeren -+ if( pRt == pRtErrHdl ) -+ break; -+ pRt = pRt->pNext; -+ } -+ while( pRt ); -+ } -+ // Kein Error-Hdl gefunden -> altes Vorgehen -+ else -+ { -+ pInst->Abort(); - } -+ -+ // ALT: Nur -+ // pInst->Abort(); - } - } - } ---- /data4/sles/ooo-build-NEWEST-Latest/ooo-build/build/ooe680-m2/basic/source/classes/sbunoobj.cxx 2006-11-28 12:26:41.000000000 +0000 -+++ basic/source/classes/sbunoobj.cxx 2006-11-29 14:36:06.000000000 +0000 -@@ -510,7 +510,7 @@ SbxDataType unoToSbxType( const Referenc - return eRetType; - } - void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); --static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex ) -+static void implSequenceToMultiDimArray( SbxDimArray*& pArray, Sequence< sal_Int32 >& indices, Sequence< sal_Int32 >& sizes, const Any& aValue, sal_Int32& dimension, sal_Bool bIsZeroIndex, Type* pType = NULL ) - { - Type aType = aValue.getValueType(); - TypeClass eTypeClass = aType.getTypeClass(); -@@ -522,6 +522,11 @@ static void implSequenceToMultiDimArray( - { - Reference< XIdlClass > xIdlTargetClass = TypeToIdlClass( aType ); - Reference< XIdlArray > xIdlArray = xIdlTargetClass->getArray(); -+ typelib_TypeDescription * pTD = 0; -+ aType.getDescription( &pTD ); -+ Type aElementType( ((typelib_IndirectTypeDescription *)pTD)->pType ); -+ ::typelib_typedescription_release( pTD ); -+ - sal_Int32 nLen = xIdlArray->getLen( aValue ); - for ( sal_Int32 index = 0; index < nLen; ++index ) - { -@@ -544,7 +549,7 @@ static void implSequenceToMultiDimArray( - else - indices[ dimCopy - 1] = index + 1; - -- implSequenceToMultiDimArray( pArray, indices, sizes, aElementAny, dimCopy, bIsZeroIndex ); -+ implSequenceToMultiDimArray( pArray, indices, sizes, aElementAny, dimCopy, bIsZeroIndex, &aElementType ); - } - - } -@@ -560,9 +565,9 @@ static void implSequenceToMultiDimArray( - return; - } - -+ SbxDataType eSbxElementType = unoToSbxType( pType ? pType->getTypeClass() : aValue.getValueTypeClass() ); - if ( !pArray ) - { -- SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() ); - pArray = new SbxDimArray( eSbxElementType ); - sal_Int32 nIndexLen = indices.getLength(); - -@@ -579,7 +584,6 @@ static void implSequenceToMultiDimArray( - - if ( pArray ) - { -- SbxDataType eSbxElementType = unoToSbxType( aValue.getValueTypeClass() ); - SbxVariableRef xVar = new SbxVariable( eSbxElementType ); - unoToSbxValue( (SbxVariable*)xVar, aValue ); - diff -rup basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx --- basic/source/classes/sbxmod.cxx 2007-01-02 17:08:45.000000000 +0000 +++ basic/source/classes/sbxmod.cxx 2007-01-02 13:01:06.000000000 +0000 Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1014 retrieving revision 1.1015 diff -u -r1.1014 -r1.1015 --- openoffice.org.spec 30 Jan 2007 14:19:59 -0000 1.1014 +++ openoffice.org.spec 30 Jan 2007 15:03:15 -0000 1.1015 @@ -2574,6 +2574,7 @@ %changelog * Tue Jan 30 2007 Caolan McNamara - 1:2.2.0-5.1 - next candidate +- workspace.npower5 integrated * Mon Jan 29 2007 Caolan McNamara - 1:2.2.0-4.3 - Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch From fedora-cvs-commits at redhat.com Tue Jan 30 15:06:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 10:06:33 -0500 Subject: rpms/kde-i18n/FC-6 .cvsignore, 1.37, 1.38 kde-i18n.spec, 1.69, 1.70 sources, 1.40, 1.41 Message-ID: <200701301506.l0UF6XCA022388@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kde-i18n/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22299 Modified Files: .cvsignore kde-i18n.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/FC-6/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 8 Aug 2006 16:34:06 -0000 1.37 +++ .cvsignore 30 Jan 2007 15:06:31 -0000 1.38 @@ -336,3 +336,42 @@ kde-i18n-uk-3.5.4.tar.bz2 kde-i18n-zh_CN-3.5.4.tar.bz2 kde-i18n-zh_TW-3.5.4.tar.bz2 +kde-i18n-ar-3.5.6.tar.bz2 +kde-i18n-bg-3.5.6.tar.bz2 +kde-i18n-bn-3.5.6.tar.bz2 +kde-i18n-ca-3.5.6.tar.bz2 +kde-i18n-cs-3.5.6.tar.bz2 +kde-i18n-da-3.5.6.tar.bz2 +kde-i18n-de-3.5.6.tar.bz2 +kde-i18n-el-3.5.6.tar.bz2 +kde-i18n-en_GB-3.5.6.tar.bz2 +kde-i18n-es-3.5.6.tar.bz2 +kde-i18n-et-3.5.6.tar.bz2 +kde-i18n-fi-3.5.6.tar.bz2 +kde-i18n-fr-3.5.6.tar.bz2 +kde-i18n-he-3.5.6.tar.bz2 +kde-i18n-hi-3.5.6.tar.bz2 +kde-i18n-hu-3.5.6.tar.bz2 +kde-i18n-is-3.5.6.tar.bz2 +kde-i18n-it-3.5.6.tar.bz2 +kde-i18n-ja-3.5.6.tar.bz2 +kde-i18n-ko-3.5.6.tar.bz2 +kde-i18n-lt-3.5.6.tar.bz2 +kde-i18n-nb-3.5.6.tar.bz2 +kde-i18n-nl-3.5.6.tar.bz2 +kde-i18n-nn-3.5.6.tar.bz2 +kde-i18n-pa-3.5.6.tar.bz2 +kde-i18n-pl-3.5.6.tar.bz2 +kde-i18n-pt-3.5.6.tar.bz2 +kde-i18n-pt_BR-3.5.6.tar.bz2 +kde-i18n-ro-3.5.6.tar.bz2 +kde-i18n-ru-3.5.6.tar.bz2 +kde-i18n-sk-3.5.6.tar.bz2 +kde-i18n-sl-3.5.6.tar.bz2 +kde-i18n-sr-3.5.6.tar.bz2 +kde-i18n-sv-3.5.6.tar.bz2 +kde-i18n-ta-3.5.6.tar.bz2 +kde-i18n-tr-3.5.6.tar.bz2 +kde-i18n-uk-3.5.6.tar.bz2 +kde-i18n-zh_CN-3.5.6.tar.bz2 +kde-i18n-zh_TW-3.5.6.tar.bz2 Index: kde-i18n.spec =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/FC-6/kde-i18n.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- kde-i18n.spec 26 Oct 2006 16:23:13 -0000 1.69 +++ kde-i18n.spec 30 Jan 2007 15:06:31 -0000 1.70 @@ -3,7 +3,7 @@ %define redhatify 1 Name: kde-i18n -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{dist} Url: http://www.kde.org Summary: Internationalization support for KDE @@ -1148,6 +1148,9 @@ %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW %changelog +* Tue Jan 30 2007 Than Ngo - 1:3.5.6-0.1.fc6 +- 3.5.6 + * Thu Oct 26 2006 Than Ngo 1:3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/FC-6/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 26 Oct 2006 16:23:13 -0000 1.40 +++ sources 30 Jan 2007 15:06:31 -0000 1.41 @@ -1,39 +1,39 @@ -237879698e967ba9384b6800f8517ce2 kde-i18n-ar-3.5.5.tar.bz2 -28871147d247f33072a278f0d16a96be kde-i18n-bg-3.5.5.tar.bz2 -bfd5159743442c47a02ee5af4bd17c68 kde-i18n-bn-3.5.5.tar.bz2 -fec16708dc8c3e9a864d5ad9e45f06b8 kde-i18n-ca-3.5.5.tar.bz2 -aaace6da2097b2f98f163a5da7667752 kde-i18n-cs-3.5.5.tar.bz2 -70c041ca96330834c6f988255d7bd6ae kde-i18n-da-3.5.5.tar.bz2 -a99bf0e5d298fce191ad2c938af3afdb kde-i18n-de-3.5.5.tar.bz2 -a2cb7afd4c5883bc2eb5d9c8a96d04c0 kde-i18n-el-3.5.5.tar.bz2 -50af460c4b69e5cd91b820ed656f99bd kde-i18n-en_GB-3.5.5.tar.bz2 -d8dc649138fe136c57a808eac1fdd719 kde-i18n-es-3.5.5.tar.bz2 -d3065d66591fa0ea4e304e9bcbb6dc10 kde-i18n-et-3.5.5.tar.bz2 -5693b184f6d3e2d79c78248a9506ba11 kde-i18n-fi-3.5.5.tar.bz2 -0a0e9ba98b33e81a092110563def9ca4 kde-i18n-fr-3.5.5.tar.bz2 -2099f23192fe79f1e94c0da2184871c0 kde-i18n-he-3.5.5.tar.bz2 -a046a16fd6575ee67a9086702414bac1 kde-i18n-hi-3.5.5.tar.bz2 -9638821a380cf7a8697b03dca2f3513d kde-i18n-hu-3.5.5.tar.bz2 -4bdd95af464b36e7d52b4848291c9717 kde-i18n-is-3.5.5.tar.bz2 -a69220e5a700a277238924a3675d9dbd kde-i18n-it-3.5.5.tar.bz2 -3b89aa140388f7b0e3beb80ef2b8b247 kde-i18n-ja-3.5.5.tar.bz2 -7a364e95e894e9c58d56054edab21142 kde-i18n-ko-3.5.5.tar.bz2 -aa799b8fac440c0b70188e0f9df16350 kde-i18n-lt-3.5.5.tar.bz2 -1b3edcfa11bb648e98bab07f93e898a9 kde-i18n-nb-3.5.5.tar.bz2 -44b404fc4d0b9d12714fdf2357fa3f56 kde-i18n-nl-3.5.5.tar.bz2 -964c91710f2b28cdde7b8cdfef961791 kde-i18n-nn-3.5.5.tar.bz2 -1881a7e5b1fc6b75ca74dc4c504ad16d kde-i18n-pa-3.5.5.tar.bz2 -7444560d7d6cb3221e8f0907218157de kde-i18n-pl-3.5.5.tar.bz2 -af8b477236f98e0fa7fcae21db3df5cc kde-i18n-pt-3.5.5.tar.bz2 -d9359ccc0040a5c6ac88d5cad12d4fcf kde-i18n-pt_BR-3.5.5.tar.bz2 -b31d031cbf2deae408c94a665677dfd2 kde-i18n-ro-3.5.5.tar.bz2 -4bfa140a22122446fd8ab356d32fee40 kde-i18n-ru-3.5.5.tar.bz2 -0a1bccde30cf25cf37974362585b118a kde-i18n-sk-3.5.5.tar.bz2 -3574861dc47aa09ada8cc6c7bca2307e kde-i18n-sl-3.5.5.tar.bz2 -e308f4f37c5509bd5583f7fcd90bcb32 kde-i18n-sr-3.5.5.tar.bz2 -0a614fc596f082a1a11d7ee91b1bae2a kde-i18n-sv-3.5.5.tar.bz2 -4ab3c05628fc635609218d17cce6d138 kde-i18n-ta-3.5.5.tar.bz2 -001d5909b3fd8121b1f4f7970d88215b kde-i18n-tr-3.5.5.tar.bz2 -fc18b699825837e49e3062e5acc0a3f5 kde-i18n-uk-3.5.5.tar.bz2 -c0df78b39982a1ba117539e86c0dabb8 kde-i18n-zh_CN-3.5.5.tar.bz2 -6c1051a985f68563380844dec9080248 kde-i18n-zh_TW-3.5.5.tar.bz2 +e79ef203dfc9196ea75089dfcd99339d kde-i18n-ar-3.5.6.tar.bz2 +a34d5e307d418fc87bcbb6ab150bc046 kde-i18n-bg-3.5.6.tar.bz2 +f5153ad329e8d7305aefa12f7ddfdfa3 kde-i18n-bn-3.5.6.tar.bz2 +84b3a011b9d594ce26fdee77cccdfb52 kde-i18n-ca-3.5.6.tar.bz2 +b2dab45ea572efbb2569781211c2a7fc kde-i18n-cs-3.5.6.tar.bz2 +913550e6604b9423cea605d95a8a664f kde-i18n-da-3.5.6.tar.bz2 +c8a52e825c610ae5779ef84d1bf7e3c5 kde-i18n-de-3.5.6.tar.bz2 +f395db170010c2a4ee9a7e27b1c8772e kde-i18n-el-3.5.6.tar.bz2 +6b81bfa733c5e1c8ae4d16208093f648 kde-i18n-en_GB-3.5.6.tar.bz2 +75f2b236131bcf89b6f2302c1fb8780f kde-i18n-es-3.5.6.tar.bz2 +55647fdaf91b9626618015017be954b4 kde-i18n-et-3.5.6.tar.bz2 +227d47ad0232daf190653b4f8d9cd508 kde-i18n-fi-3.5.6.tar.bz2 +f700524f68cf6d34770784c69f9cc293 kde-i18n-fr-3.5.6.tar.bz2 +b416073a3503a01056e14107fc797dae kde-i18n-he-3.5.6.tar.bz2 +25f0b08c99c952f443f32a86d5d4d4ad kde-i18n-hi-3.5.6.tar.bz2 +575734a98fa2984f47adb49d6c023cc0 kde-i18n-hu-3.5.6.tar.bz2 +f41752647ef59cb9fd179e2e1f77738c kde-i18n-is-3.5.6.tar.bz2 +3a9bea48fb5ac7d3703abfdaa8a50c3c kde-i18n-it-3.5.6.tar.bz2 +79b62e00ae4bbcc0d874588ccba177be kde-i18n-ja-3.5.6.tar.bz2 +eb47d4c6f46c161835c5255f399e1ac9 kde-i18n-ko-3.5.6.tar.bz2 +2769c90376add2e49addcaa2f39df577 kde-i18n-lt-3.5.6.tar.bz2 +bf087b3c116770dcffa008da74e767e2 kde-i18n-nb-3.5.6.tar.bz2 +6f4eea25839984463e70d1c635813a11 kde-i18n-nl-3.5.6.tar.bz2 +9dc810b75c2cb7c864ec5bf82a2bed2f kde-i18n-nn-3.5.6.tar.bz2 +6a9be2176930ceb07600913cbee525e3 kde-i18n-pa-3.5.6.tar.bz2 +71852ce8f2549cfc19ffe71468a82349 kde-i18n-pl-3.5.6.tar.bz2 +ee8322ab521d796fbfafef471d845d6d kde-i18n-pt-3.5.6.tar.bz2 +29836d3d914f41a2cab1567d1df6feff kde-i18n-pt_BR-3.5.6.tar.bz2 +af2fc2dbc745614c7286a430a7874a54 kde-i18n-ro-3.5.6.tar.bz2 +348d72dfa83d51cbb65f6c7e964d64b3 kde-i18n-ru-3.5.6.tar.bz2 +3a7b1b8bd44c92713d5e4db52655915b kde-i18n-sk-3.5.6.tar.bz2 +2064f33c3f76ee60ddf1aef010d92399 kde-i18n-sl-3.5.6.tar.bz2 +e38ff9abe6f68bc69e0df5891e7bce69 kde-i18n-sr-3.5.6.tar.bz2 +a826fb26b9378b12dae31b15ac22d995 kde-i18n-sv-3.5.6.tar.bz2 +11da7704ec348481c392cfd47af85caa kde-i18n-ta-3.5.6.tar.bz2 +b56062b9908ecb6909bc4a7e4c4bb62a kde-i18n-tr-3.5.6.tar.bz2 +82f0f3f3567d551307c03ebad12f3a1c kde-i18n-uk-3.5.6.tar.bz2 +a74fb6fee6d36a8bd975bb7b1b97fb4c kde-i18n-zh_CN-3.5.6.tar.bz2 +f6211661d09cf7dcc381147d084537a7 kde-i18n-zh_TW-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 15:28:04 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 10:28:04 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.1015, 1.1016 pseudoworkspace.valgrind1.patch, 1.15, 1.16 Message-ID: <200701301528.l0UFS4wH026659@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26560 Modified Files: openoffice.org.spec pseudoworkspace.valgrind1.patch Log Message: some valgrind fixes integrated Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.1015 retrieving revision 1.1016 diff -u -r1.1015 -r1.1016 --- openoffice.org.spec 30 Jan 2007 15:03:15 -0000 1.1015 +++ openoffice.org.spec 30 Jan 2007 15:28:02 -0000 1.1016 @@ -2575,6 +2575,7 @@ * Tue Jan 30 2007 Caolan McNamara - 1:2.2.0-5.1 - next candidate - workspace.npower5 integrated +- some valgrind fixes integrated * Mon Jan 29 2007 Caolan McNamara - 1:2.2.0-4.3 - Resolves: rhbz#225061 openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch pseudoworkspace.valgrind1.patch: bf_sfx2/source/explorer/sfx2_nochaos.cxx | 0 binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx | 4 ++-- source/core/txtnode/swfont.cxx | 0 source/dialog/numpages.cxx | 0 svx/source/dialog/numpages.cxx | 1 + sw/source/core/txtnode/swfont.cxx | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) Index: pseudoworkspace.valgrind1.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pseudoworkspace.valgrind1.patch 26 Jan 2007 09:00:39 -0000 1.15 +++ pseudoworkspace.valgrind1.patch 30 Jan 2007 15:28:02 -0000 1.16 @@ -1,44 +1,3 @@ -Index: source/dialog/dlgctrl.cxx -=================================================================== -RCS file: /cvs/graphics/svx/source/dialog/dlgctrl.cxx,v -retrieving revision 1.27 -diff -u -r1.27 dlgctrl.cxx ---- openoffice.org.orig/svx/source/dialog/dlgctrl.cxx 17 Sep 2006 04:17:40 -0000 1.27 -+++ openoffice.org/svx/source/dialog/dlgctrl.cxx 5 Jan 2007 13:10:40 -0000 -@@ -907,6 +907,7 @@ - - nSquares = nLines * nLines; - pPixel = new USHORT[ nSquares ]; -+ rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); - - // Reset(); <-- wird vom Dialog aufgerufen - } -@@ -1062,8 +1063,7 @@ - void SvxPixelCtl::Reset() - { - // Initialisierung des Arrays -- for( USHORT i = 0; i < nSquares; i++) -- *(pPixel + i) = 0; -+ rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); - Invalidate(); - } - -Index: inc/xhatch.hxx -=================================================================== -RCS file: /cvs/graphics/svx/inc/xhatch.hxx,v -retrieving revision 1.5 -diff -u -r1.5 xhatch.hxx ---- openoffice.org.orig/svx/inc/xhatch.hxx 12 Oct 2006 11:59:49 -0000 1.5 -+++ openoffice.org/svx/inc/xhatch.hxx 5 Jan 2007 13:11:35 -0000 -@@ -59,7 +59,7 @@ - long nAngle; - - public: -- XHatch() {} -+ XHatch() : eStyle(XHATCH_SINGLE), nDistance(0), nAngle(0) {} - XHatch(const Color& rCol, XHatchStyle eStyle = XHATCH_SINGLE, - long nDistance = 20, long nAngle = 0); - Index: source/dialog/numpages.cxx =================================================================== RCS file: /cvs/graphics/svx/source/dialog/numpages.cxx,v From fedora-cvs-commits at redhat.com Tue Jan 30 15:28:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 10:28:14 -0500 Subject: rpms/kdepim/FC-6 kdepim-3.5.6-kmail-kde#140660.patch, NONE, 1.1 kdepim-3.5.6-kmail-templates.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 kdepim.spec, 1.113, 1.114 sources, 1.37, 1.38 Message-ID: <200701301528.l0UFSEKX026819@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdepim/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26718 Modified Files: .cvsignore kdepim.spec sources Added Files: kdepim-3.5.6-kmail-kde#140660.patch kdepim-3.5.6-kmail-templates.patch Log Message: 3.5.6 kdepim-3.5.6-kmail-kde#140660.patch: 0 files changed --- NEW FILE kdepim-3.5.6-kmail-kde#140660.patch --- --- kdepim/kmail/kmfolder.cpp (revision 627528) +++ kdepim/kmail/kmfolder.cpp (working copy) @@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrListfind( msg ); + return mStorage ? mStorage->find( msg ) : 0; } int KMFolder::find( const KMMessage* msg ) const { - return mStorage->find( msg ); + return mStorage ? mStorage->find( msg ) : 0; } int KMFolder::count( bool cache ) const kdepim-3.5.6-kmail-templates.patch: kmfolder.cpp | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) --- NEW FILE kdepim-3.5.6-kmail-templates.patch --- --- kdepim/kmail/kmfolder.cpp 2006/10/28 17:04:18 599816 +++ kdepim/kmail/kmfolder.cpp 2007/01/27 00:32:53 627548 @@ -631,11 +631,13 @@ mWhoField = "From"; if ( this == kmkernel->outboxFolder() || this == kmkernel->sentFolder() || - this == kmkernel->draftsFolder() ) + this == kmkernel->draftsFolder() || + this == kmkernel->templatesFolder() ) mWhoField = "To"; - } else if ( identity.drafts() == idString() - || identity.fcc() == idString() ) - // drafts or sent of the identity + } else if ( identity.drafts() == idString() || + identity.templates() == idString() || + identity.fcc() == idString() ) + // drafts, templates or sent of the identity mWhoField = "To"; else mWhoField = "From"; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdepim/FC-6/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 10 Aug 2006 15:20:37 -0000 1.33 +++ .cvsignore 30 Jan 2007 15:28:12 -0000 1.34 @@ -12,3 +12,4 @@ kdepim-3.5.2.tar.bz2 kdepim-3.5.3.tar.bz2 kdepim-3.5.4.tar.bz2 +kdepim-3.5.6.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/dist/rpms/kdepim/FC-6/kdepim.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- kdepim.spec 10 Nov 2006 21:21:59 -0000 1.113 +++ kdepim.spec 30 Jan 2007 15:28:12 -0000 1.114 @@ -4,13 +4,13 @@ %define kdelibs_epoch 6 %define kdebase_epoch 6 %define qt_version 1:3.3.7 -%define arts_version 8:1.5.5 +%define arts_version 8:1.5.6 %define make_cvs 1 %define appdir %{_datadir}/applications/kde -Version: 3.5.5 -Release: 0.2%{?dist} +Version: 3.5.6 +Release: 0.1%{?dist} Name: kdepim Summary: PIM (Personal Information Manager) for KDE Epoch: 6 @@ -29,7 +29,8 @@ Patch4: kdepim-3.4.92-libz.patch # upstream patches -Patch100: kdepim-3.5.5-kde#135513.patch +Patch100: kdepim-3.5.6-kmail-kde#140660.patch +Patch101: kdepim-3.5.6-kmail-templates.patch Requires: kdebase >= %{kdebase_epoch}:%{version} Requires(post): /sbin/ldconfig @@ -82,7 +83,8 @@ %patch4 -p1 -b .libz # upstream patches -%patch100 -p0 -b .kde#135513 +%patch100 -p1 -b .kde#140660 +%patch101 -p1 -b .kmail-templates %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -194,6 +196,9 @@ %exclude %{_libdir}/libremotekonnector.so %changelog +* Tue Jan 30 2007 Than Ngo - 6:3.5.6-0.1.fc7 +- 3.5.6 + * Fri Nov 10 2006 Than Ngo 6:3.5.5-0.2.fc6 - apply upstream patch to fix bz#215081 (kde#135513) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdepim/FC-6/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 26 Oct 2006 18:44:26 -0000 1.37 +++ sources 30 Jan 2007 15:28:12 -0000 1.38 @@ -1 +1 @@ -3f2127f74cb496899bb3f1f6f702353b kdepim-3.5.5.tar.bz2 +e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 16:07:53 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 11:07:53 -0500 Subject: rpms/kernel/FC-6 linux-2.6-xfs_attr2.patch,NONE,1.1 Message-ID: <200701301607.l0UG7rnu015775@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15701 Added Files: linux-2.6-xfs_attr2.patch Log Message: add xfs fix linux-2.6-xfs_attr2.patch: xfs_attr.c | 19 +++++++++++-------- xfs_attr_leaf.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- xfs_bmap.c | 1 + 3 files changed, 54 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6-xfs_attr2.patch --- Log: Fix attr2 corruption with btree data extents Merge of xfs-linux-melb:xfs-kern:27792a by kenmcd. ------------------------------------------------- Fix up initial creation of shortform attributes Members: xfs_attr.c:1.140->1.141 ------------------------------------------------- Lock forkoff when data extent is in btree form. Members: xfs_bmap.c:1.359->1.360 ------------------------------------------------- Lock forkoff when data extent is in btree form. Also allow more space for attr if extents must convert to btree form. Members: xfs_attr_leaf.c:1.104->1.105 Signed-off-by: Barry Naujok Signed-off-by: Timothy Shimmin Signed-off-by: Russell Cattelan Signed-off-by: Eric Sandeen Index: linux-2.6.18.noarch/fs/xfs/xfs_attr.c =================================================================== --- linux-2.6.18.noarch.orig/fs/xfs/xfs_attr.c 2006-09-19 23:42:06.000000000 -0400 +++ linux-2.6.18.noarch/fs/xfs/xfs_attr.c 2006-12-21 18:34:12.864403389 -0500 @@ -200,18 +200,14 @@ xfs_attr_set_int(xfs_inode_t *dp, const return (error); /* - * Determine space new attribute will use, and if it would be - * "local" or "remote" (note: local != inline). - */ - size = xfs_attr_leaf_newentsize(namelen, valuelen, - mp->m_sb.sb_blocksize, &local); - - /* * If the inode doesn't have an attribute fork, add one. * (inode must not be locked when we call this routine) */ if (XFS_IFORK_Q(dp) == 0) { - if ((error = xfs_bmap_add_attrfork(dp, size, rsvd))) + int sf_size = sizeof(xfs_attr_sf_hdr_t) + + XFS_ATTR_SF_ENTSIZE_BYNAME(namelen, valuelen); + + if ((error = xfs_bmap_add_attrfork(dp, sf_size, rsvd))) return(error); } @@ -232,6 +228,13 @@ xfs_attr_set_int(xfs_inode_t *dp, const args.addname = 1; args.oknoent = 1; + /* + * Determine space new attribute will use, and if it would be + * "local" or "remote" (note: local != inline). + */ + size = xfs_attr_leaf_newentsize(namelen, valuelen, + mp->m_sb.sb_blocksize, &local); + nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); if (local) { if (size > (mp->m_sb.sb_blocksize >> 1)) { Index: linux-2.6.18.noarch/fs/xfs/xfs_attr_leaf.c =================================================================== --- linux-2.6.18.noarch.orig/fs/xfs/xfs_attr_leaf.c 2006-09-19 23:42:06.000000000 -0400 +++ linux-2.6.18.noarch/fs/xfs/xfs_attr_leaf.c 2006-12-21 18:34:12.936404440 -0500 @@ -113,6 +113,7 @@ xfs_attr_shortform_bytesfit(xfs_inode_t int offset; int minforkoff; /* lower limit on valid forkoff locations */ int maxforkoff; /* upper limit on valid forkoff locations */ + int dsize; xfs_mount_t *mp = dp->i_mount; offset = (XFS_LITINO(mp) - bytes) >> 3; /* rounded down */ @@ -132,8 +133,43 @@ xfs_attr_shortform_bytesfit(xfs_inode_t return 0; } - /* data fork btree root can have at least this many key/ptr pairs */ - minforkoff = MAX(dp->i_df.if_bytes, XFS_BMDR_SPACE_CALC(MINDBTPTRS)); + dsize = dp->i_df.if_bytes; + + switch (dp->i_d.di_format) { + case XFS_DINODE_FMT_EXTENTS: + /* + * If there is no attr fork and the data fork is extents, + * determine if creating the default attr fork will result + * in the extents form migrating to btree. If so, the + * minimum offset only needs to be the space required for + * the btree root. + */ + if (!dp->i_d.di_forkoff && dp->i_df.if_bytes > mp->m_attroffset) + dsize = XFS_BMDR_SPACE_CALC(MINDBTPTRS); + break; + + case XFS_DINODE_FMT_BTREE: + /* + * If have data btree then keep forkoff if we have one, + * otherwise we are adding a new attr, so then we set + * minforkoff to where the btree root can finish so we have + * plenty of room for attrs + */ + if (dp->i_d.di_forkoff) { + if (offset < dp->i_d.di_forkoff) + return 0; + else + return dp->i_d.di_forkoff; + } else + dsize = XFS_BMAP_BROOT_SPACE(dp->i_df.if_broot); + break; + } + + /* + * A data fork btree root must have space for at least + * MINDBTPTRS key/ptr pairs if the data fork is small or empty. + */ + minforkoff = MAX(dsize, XFS_BMDR_SPACE_CALC(MINDBTPTRS)); minforkoff = roundup(minforkoff, 8) >> 3; /* attr fork btree root can have at least this many key/ptr pairs */ @@ -308,7 +344,8 @@ xfs_attr_shortform_remove(xfs_da_args_t */ totsize -= size; if (totsize == sizeof(xfs_attr_sf_hdr_t) && !args->addname && - (mp->m_flags & XFS_MOUNT_ATTR2)) { + (mp->m_flags & XFS_MOUNT_ATTR2) && + (dp->i_d.di_format != XFS_DINODE_FMT_BTREE)) { /* * Last attribute now removed, revert to original * inode format making all literal area available @@ -729,6 +766,7 @@ xfs_attr_shortform_allfit(xfs_dabuf_t *b + be16_to_cpu(name_loc->valuelen); } if ((dp->i_mount->m_flags & XFS_MOUNT_ATTR2) && + (dp->i_d.di_format != XFS_DINODE_FMT_BTREE) && (bytes == sizeof(struct xfs_attr_sf_hdr))) return(-1); return(xfs_attr_shortform_bytesfit(dp, bytes)); @@ -767,6 +805,7 @@ xfs_attr_leaf_to_shortform(xfs_dabuf_t * if (forkoff == -1) { ASSERT(dp->i_mount->m_flags & XFS_MOUNT_ATTR2); + ASSERT(dp->i_d.di_format != XFS_DINODE_FMT_BTREE); /* * Last attribute was removed, revert to original Index: linux-2.6.18.noarch/fs/xfs/xfs_bmap.c =================================================================== --- linux-2.6.18.noarch.orig/fs/xfs/xfs_bmap.c 2006-09-19 23:42:06.000000000 -0400 +++ linux-2.6.18.noarch/fs/xfs/xfs_bmap.c 2006-12-21 18:34:12.932404381 -0500 @@ -3541,6 +3541,7 @@ xfs_bmap_forkoff_reset( if (whichfork == XFS_ATTR_FORK && (ip->i_d.di_format != XFS_DINODE_FMT_DEV) && (ip->i_d.di_format != XFS_DINODE_FMT_UUID) && + (ip->i_d.di_format != XFS_DINODE_FMT_BTREE) && ((mp->m_attroffset >> 3) > ip->i_d.di_forkoff)) { ip->i_d.di_forkoff = mp->m_attroffset >> 3; ip->i_df.if_ext_max = XFS_IFORK_DSIZE(ip) / From fedora-cvs-commits at redhat.com Tue Jan 30 16:34:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 11:34:49 -0500 Subject: rpms/automake15/devel automake-1.5-depconf2.patch, NONE, 1.1 automake15.spec, 1.14, 1.15 Message-ID: <200701301634.l0UGYnEf019549@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/automake15/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19499 Modified Files: automake15.spec Added Files: automake-1.5-depconf2.patch Log Message: -drop obsolete check automake-1.5-depconf2.patch: Makefile.am | 1 - Makefile.in | 1 - 2 files changed, 2 deletions(-) --- NEW FILE automake-1.5-depconf2.patch --- --- automake-1.5/tests/Makefile.in.depc2 2007-01-30 11:15:19.000000000 -0500 +++ automake-1.5/tests/Makefile.in 2007-01-30 11:15:28.000000000 -0500 @@ -174,7 +174,6 @@ depacl.test \ depacl2.test \ depcomp.test \ -depcomp2.test \ depdist.test \ depend.test \ depend2.test \ --- automake-1.5/tests/Makefile.am.depc2 2007-01-30 11:14:58.000000000 -0500 +++ automake-1.5/tests/Makefile.am 2007-01-30 11:15:09.000000000 -0500 @@ -105,7 +105,6 @@ depacl.test \ depacl2.test \ depcomp.test \ -depcomp2.test \ depdist.test \ depend.test \ depend2.test \ Index: automake15.spec =================================================================== RCS file: /cvs/dist/rpms/automake15/devel/automake15.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- automake15.spec 9 Jun 2006 12:36:37 -0000 1.14 +++ automake15.spec 30 Jan 2007 16:34:46 -0000 1.15 @@ -1,7 +1,7 @@ Summary: A GNU tool for automatically creating Makefiles. Name: automake15 Version: 1.5 -Release: 16 +Release: 17 License: GPL Group: Development/Tools URL: http://sources.redhat.com/automake @@ -15,6 +15,7 @@ Patch5: dirnames.test-1.6.patch Patch6: automake-1.5-ppc-ccnoco-test-91853.patch Patch7: automake-1.5-tailfix.patch +Patch8: automake-1.5-depconf2.patch Requires: perl Buildrequires: autoconf, bison BuildArchitectures: noarch @@ -47,6 +48,7 @@ %patch6 -p1 -b .ppc %endif %patch7 -p1 -b .tailfix +%patch8 -p1 -b .depc2 %build # patch 2 touches configure.in @@ -85,6 +87,9 @@ %dir %{_datadir}/aclocal %changelog +* Tue Jan 30 2007 Karsten Hopp 1.5-17 +- drop obsolete check + * Fri Jun 09 2006 Karsten Hopp 1.5-16 - filter self provided dependencies From fedora-cvs-commits at redhat.com Tue Jan 30 17:00:55 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 12:00:55 -0500 Subject: rpms/expat/devel expat-1.95.8-pedantic.patch, NONE, 1.1 expat.spec, 1.23, 1.24 Message-ID: <200701301700.l0UH0t3w026936@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/expat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26894 Modified Files: expat.spec Added Files: expat-1.95.8-pedantic.patch Log Message: * Tue Jan 30 2007 Joe Orton 1.95.8-9 - regenerate configure/libtool correctly (#199361) - strip DSP files from examples (#186889) - fix expat.h compilation with g++ -pedantic (#190244) expat-1.95.8-pedantic.patch: expat.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE expat-1.95.8-pedantic.patch --- --- expat-1.95.8/lib/expat.h.pedantic +++ expat-1.95.8/lib/expat.h @@ -43,7 +43,7 @@ #define XML_STATUS_ERROR XML_STATUS_ERROR XML_STATUS_OK = 1, #define XML_STATUS_OK XML_STATUS_OK - XML_STATUS_SUSPENDED = 2, + XML_STATUS_SUSPENDED = 2 #define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED }; Index: expat.spec =================================================================== RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- expat.spec 12 Jul 2006 05:47:22 -0000 1.23 +++ expat.spec 30 Jan 2007 17:00:48 -0000 1.24 @@ -1,9 +1,10 @@ Summary: A library for parsing XML. Name: expat Version: 1.95.8 -Release: 8.2.1 +Release: 9 Group: System Environment/Libraries Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz +Patch0: expat-1.95.8-pedantic.patch URL: http://www.libexpat.org/ License: BSD BuildRoot: %{_tmppath}/%{name}-root @@ -27,8 +28,12 @@ %prep %setup -q +%patch0 -p1 -b .pedantic %build +rm -rf autom4te*.cache +cp `aclocal --print-ac-dir`/libtool.m4 conftools || exit 1 +libtoolize --copy --force --automake && aclocal && autoheader && autoconf export CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make %{?_smp_mflags} @@ -36,18 +41,16 @@ %install rm -rf ${RPM_BUILD_ROOT} +rm -f examples/*.dsp + %makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \ libdir=$RPM_BUILD_ROOT/%{_lib} mkdir -p $RPM_BUILD_ROOT%{_libdir} +mv $RPM_BUILD_ROOT/%{_lib}/libexpat.{so,a,la} $RPM_BUILD_ROOT%{_libdir} lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*` - -ln -s ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so - -rm -f $RPM_BUILD_ROOT/%{_lib}/*.so - -mv $RPM_BUILD_ROOT/%{_lib}/*.*a $RPM_BUILD_ROOT%{_libdir}/ +ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so %clean rm -rf ${RPM_BUILD_ROOT} @@ -70,6 +73,11 @@ %{_includedir}/*.h %changelog +* Tue Jan 30 2007 Joe Orton 1.95.8-9 +- regenerate configure/libtool correctly (#199361) +- strip DSP files from examples (#186889) +- fix expat.h compilation with g++ -pedantic (#190244) + * Wed Jul 12 2006 Jesse Keating - 1.95.8-8.2.1 - rebuild From fedora-cvs-commits at redhat.com Tue Jan 30 17:14:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 12:14:59 -0500 Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.25, 1.26 Message-ID: <200701301714.l0UHExB6005107@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5064 Modified Files: xorg-x11-server-utils.spec Log Message: * Tue Jan 30 2007 Adam Jackson 7.1-5 - Fix man page globs and rebuild for FC7. 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xorg-x11-server-utils.spec 4 Aug 2006 21:29:18 -0000 1.25 +++ xorg-x11-server-utils.spec 30 Jan 2007 17:14:57 -0000 1.26 @@ -3,7 +3,7 @@ Summary: X.Org X11 X server utilities Name: xorg-x11-%{pkgname} Version: 7.1 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -178,32 +178,35 @@ %dir %{_datadir}/X11 %{_datadir}/X11/rgb.txt %{_datadir}/X11/app-defaults/Xvidtune -%{_mandir}/man1/iceauth.1x* -%{_mandir}/man1/sessreg.1x* -%{_mandir}/man1/showrgb.1x* -%{_mandir}/man1/xcmsdb.1x* -%{_mandir}/man1/xgamma.1x* -%{_mandir}/man1/xhost.1x* -%{_mandir}/man1/xmodmap.1x* -%{_mandir}/man1/xrandr.1x* -%{_mandir}/man1/xrdb.1x* -%{_mandir}/man1/xrefresh.1x* -%{_mandir}/man1/xset.1x* -%{_mandir}/man1/xsetmode.1x* -%{_mandir}/man1/xsetpointer.1x* -%{_mandir}/man1/xsetroot.1x* -%{_mandir}/man1/xstdcmap.1x* -%{_mandir}/man1/xtrap.1x* -%{_mandir}/man1/xtrapchar.1x* -%{_mandir}/man1/xtrapin.1x* -%{_mandir}/man1/xtrapinfo.1x* -%{_mandir}/man1/xtrapout.1x* -%{_mandir}/man1/xtrapproto.1x* -%{_mandir}/man1/xtrapreset.1x* -%{_mandir}/man1/xtrapstats.1x* -%{_mandir}/man1/xvidtune.1x* +%{_mandir}/man1/iceauth.1* +%{_mandir}/man1/sessreg.1* +%{_mandir}/man1/showrgb.1* +%{_mandir}/man1/xcmsdb.1* +%{_mandir}/man1/xgamma.1* +%{_mandir}/man1/xhost.1* +%{_mandir}/man1/xmodmap.1* +%{_mandir}/man1/xrandr.1* +%{_mandir}/man1/xrdb.1* +%{_mandir}/man1/xrefresh.1* +%{_mandir}/man1/xset.1* +%{_mandir}/man1/xsetmode.1* +%{_mandir}/man1/xsetpointer.1* +%{_mandir}/man1/xsetroot.1* +%{_mandir}/man1/xstdcmap.1* +%{_mandir}/man1/xtrap.1* +%{_mandir}/man1/xtrapchar.1* +%{_mandir}/man1/xtrapin.1* +%{_mandir}/man1/xtrapinfo.1* +%{_mandir}/man1/xtrapout.1* +%{_mandir}/man1/xtrapproto.1* +%{_mandir}/man1/xtrapreset.1* +%{_mandir}/man1/xtrapstats.1* +%{_mandir}/man1/xvidtune.1* %changelog +* Tue Jan 30 2007 Adam Jackson 7.1-5 +- Fix man page globs and rebuild for FC7. + * Fri Aug 4 2006 Adam Jackson 7.1-4.fc6 - xvidtune-1.0.1-buffer-stomp.patch: Fix a heap smash. (#189146) From fedora-cvs-commits at redhat.com Tue Jan 30 17:27:38 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 12:27:38 -0500 Subject: rpms/php/devel php-5.2.0-includedir.patch, NONE, 1.1 php.spec, 1.130, 1.131 Message-ID: <200701301727.l0UHRcnr002494@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2437 Modified Files: php.spec Added Files: php-5.2.0-includedir.patch Log Message: * Tue Jan 30 2007 Joe Orton 5.2.0-9 - add php(api), php(zend-abi) provides (#221302) - package /usr/share/php and append to default include_path (#225434) php-5.2.0-includedir.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE php-5.2.0-includedir.patch --- --- php-5.2.0/configure.in.includedir +++ php-5.2.0/configure.in @@ -1101,7 +1101,7 @@ EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR +INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php exec_prefix=$old_exec_prefix libdir=$old_libdir Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- php.spec 5 Dec 2006 15:58:21 -0000 1.130 +++ php.spec 30 Jan 2007 17:27:36 -0000 1.131 @@ -6,7 +6,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.2.0 -Release: 8 +Release: 9 License: The PHP License v3.01 Group: Development/Languages URL: http://www.php.net/ @@ -23,6 +23,7 @@ Patch5: php-5.0.2-phpize64.patch Patch6: php-5.1.6-curl716.patch Patch7: php-5.2.0-filterm4.patch +Patch8: php-5.2.0-includedir.patch # Fixes for extension modules Patch21: php-4.3.1-odbc.patch @@ -79,6 +80,7 @@ Group: Development/Languages Summary: Common files for PHP Provides: php-api = %{apiver}, php-zend-abi = %{zendver} +Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver} # Provides for all builtin modules: Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml @@ -297,6 +299,7 @@ %patch5 -p1 -b .phpize64 %patch6 -p1 -b .curl716 %patch7 -p1 -b .filterm4 +%patch8 -p1 -b .includedir %patch21 -p1 -b .odbc %patch22 -p1 -b .shutdown @@ -511,8 +514,9 @@ install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons install -m 644 *.gif $RPM_BUILD_ROOT%{contentdir}/icons/ -# For PEAR packaging: -install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear +# For third-party packaging: +install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear \ + $RPM_BUILD_ROOT%{_datadir}/php # Use correct libdir sed -i -e 's|%{_prefix}/lib|%{_libdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini @@ -597,6 +601,7 @@ %dir %{_libdir}/php/modules %dir %{_localstatedir}/lib/php %dir %{_libdir}/php/pear +%dir %{_datadir}/php %files cli %defattr(-,root,root) @@ -631,6 +636,10 @@ %files pdo -f files.pdo %changelog +* Tue Jan 30 2007 Joe Orton 5.2.0-9 +- add php(api), php(zend-abi) provides (#221302) +- package /usr/share/php and append to default include_path (#225434) + * Tue Dec 5 2006 Joe Orton 5.2.0-8 - fix filter.h installation path - fix php-zend-abi version (Remi Collet, #212804) From fedora-cvs-commits at redhat.com Tue Jan 30 17:54:15 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 12:54:15 -0500 Subject: rpms/xen/devel xen-pygrub-memcorruption.patch, NONE, 1.1 xen.spec, 1.164, 1.165 Message-ID: <200701301754.l0UHsF92023351@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23335 Modified Files: xen.spec Added Files: xen-pygrub-memcorruption.patch Log Message: Fix pygrub memory corruption problems xen-pygrub-memcorruption.patch: fsimage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE xen-pygrub-memcorruption.patch --- diff -r 82c306ad212e tools/pygrub/src/fsimage/fsimage.c --- a/tools/pygrub/src/fsimage/fsimage.c Thu Jan 25 10:34:17 2007 +0000 +++ b/tools/pygrub/src/fsimage/fsimage.c Tue Jan 30 12:18:30 2007 -0500 @@ -125,7 +125,7 @@ fsimage_file_dealloc(fsimage_file_t *fil if (file->file != NULL) fsi_close_file(file->file); Py_XDECREF(file->fs); - PyMem_DEL(file); + PyObject_DEL(file); } static char fsimage_file_type__doc__[] = "Filesystem image file"; @@ -226,7 +226,7 @@ fsimage_fs_dealloc (fsimage_fs_t *fs) { if (fs->fs != NULL) fsi_close_fsimage(fs->fs); - PyMem_DEL(fs); + PyObject_DEL(fs); } PyDoc_STRVAR(fsimage_fs_type__doc__, "Filesystem image"); Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- xen.spec 23 Jan 2007 17:35:26 -0000 1.164 +++ xen.spec 30 Jan 2007 17:54:13 -0000 1.165 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.4 -Release: 3%{dist} +Release: 4%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -13,6 +13,7 @@ Patch3: xen-compile-fixes.patch Patch6: xen-network-iptables-bridge.patch Patch13: xen-dumpdir.patch +Patch14: xen-pygrub-memcorruption.patch Patch20: xen-blktap-no-aio-epoll.patch Patch21: xen-blktap-error-returns.patch @@ -90,6 +91,7 @@ %patch3 -p1 -b .compile %patch6 -p1 %patch13 -p1 +%patch14 -p1 # blktap patches %patch20 -p1 @@ -223,7 +225,10 @@ %{_libdir}/*.a %changelog -* Tue Jan 23 2007 Daniel Berrange - 3.0.4-3.fc7 +* Tue Jan 30 2007 Daniel P. Berrange - 3.0.4-4.fc7 +- Fix pygrub memory corruption + +* Tue Jan 23 2007 Daniel P. Berrange - 3.0.4-3.fc7 - Added PVFB back compat for FC5/6 guests * Mon Jan 22 2007 Daniel P. Berrange - 3.0.4-2.fc7 From fedora-cvs-commits at redhat.com Tue Jan 30 17:57:16 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 12:57:16 -0500 Subject: rpms/expat/devel expat.spec,1.24,1.25 Message-ID: <200701301757.l0UHvGxN023449@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/expat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23433 Modified Files: expat.spec Log Message: - add missing BRs Index: expat.spec =================================================================== RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- expat.spec 30 Jan 2007 17:00:48 -0000 1.24 +++ expat.spec 30 Jan 2007 17:57:14 -0000 1.25 @@ -8,6 +8,7 @@ URL: http://www.libexpat.org/ License: BSD BuildRoot: %{_tmppath}/%{name}-root +BuildRequires: autoconf, automake, libtool %description This is expat, the C library for parsing XML, written by James Clark. Expat From fedora-cvs-commits at redhat.com Tue Jan 30 18:13:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:13:21 -0500 Subject: rpms/pm-utils/devel pm-utils-0.19-emacs.patch,1.1,1.2 Message-ID: <200701301813.l0UIDLt4023926@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23910 Modified Files: pm-utils-0.19-emacs.patch Log Message: - fix a typo that stops resume hooks from working... pm-utils-0.19-emacs.patch: pm/functions | 3 ++- src/pm-powersave | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Index: pm-utils-0.19-emacs.patch =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19-emacs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pm-utils-0.19-emacs.patch 28 Sep 2006 21:29:15 -0000 1.1 +++ pm-utils-0.19-emacs.patch 30 Jan 2007 18:13:18 -0000 1.2 @@ -13,7 +13,7 @@ files="/etc/pm/hooks/*" if [ "$2" = "reverse" ]; then - files=$(echo $files | awk '{ for (i=NF; i>=1; i--) print $i }') -+ files=$(echo $files | awk '{ for (i=NF; i>=1; i--) if ($i !~ /~$/ { print $i } }') ++ files=$(echo $files | awk '{ for (i=NF; i>=1; i--) if ($i !~ /~$/) { print $i } }') fi for file in $files ; do [ -x $file ] && $file $1 From fedora-cvs-commits at redhat.com Tue Jan 30 18:14:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:14:12 -0500 Subject: rpms/pm-utils/devel pm-utils-0.19-vidhooks.patch,1.5,1.6 Message-ID: <200701301814.l0UIECWY023956@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23938 Modified Files: pm-utils-0.19-vidhooks.patch Log Message: - fix a typo in the intel video hook (parens around a variable name...) pm-utils-0.19-vidhooks.patch: Makefile.am | 3 + Makefile.in | 3 + functions | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++ functions-ati | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ functions-intel | 32 ++++++++++++++++++ functions-nvidia | 30 +++++++++++++++++ hooks/20video | 34 +++++++------------ 7 files changed, 268 insertions(+), 21 deletions(-) Index: pm-utils-0.19-vidhooks.patch =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.19-vidhooks.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pm-utils-0.19-vidhooks.patch 8 Aug 2006 20:35:48 -0000 1.5 +++ pm-utils-0.19-vidhooks.patch 30 Jan 2007 18:14:09 -0000 1.6 @@ -259,7 +259,7 @@ +resume_video() +{ + TTY=$(tty) -+ /usr/sbin/vbetool post < $(TTY) >/dev/null 2>&1 ++ /usr/sbin/vbetool post < $TTY >/dev/null 2>&1 + usleep 100000 +# /usr/sbin/vbetool vbestate restore < /var/run/vbestate +} From fedora-cvs-commits at redhat.com Tue Jan 30 18:20:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:20:25 -0500 Subject: rpms/lvm2/devel LVM2.2.02.21.tgz.asc, NONE, 1.1 .cvsignore, 1.46, 1.47 lvm2.spec, 1.99, 1.100 sources, 1.49, 1.50 upstream, 1.39, 1.40 LVM2.2.02.20.tgz.asc, 1.1, NONE Message-ID: <200701301820.l0UIKPsR012098@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12081 Modified Files: .cvsignore lvm2.spec sources upstream Added Files: LVM2.2.02.21.tgz.asc Removed Files: LVM2.2.02.20.tgz.asc Log Message: new upstream --- NEW FILE LVM2.2.02.21.tgz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQBFv4orIoGRwVZ+LBcRAqk6AKD8eeDpT8UnKwSKIIEqgvmwlNGqlACgs8xZ KnmiCP5zQ1l+wi6zekjiq+A= =hASl -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 26 Jan 2007 14:29:32 -0000 1.46 +++ .cvsignore 30 Jan 2007 18:20:18 -0000 1.47 @@ -1 +1 @@ -LVM2.2.02.20.tgz +LVM2.2.02.21.tgz Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- lvm2.spec 26 Jan 2007 14:29:32 -0000 1.99 +++ lvm2.spec 30 Jan 2007 18:20:18 -0000 1.100 @@ -1,8 +1,8 @@ -%define device_mapper_version 1.02.16-1 +%define device_mapper_version 1.02.17-1 Summary: Userland logical volume management tools Name: lvm2 -Version: 2.02.20 +Version: 2.02.21 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -112,6 +112,12 @@ %changelog +* Tue Jan 30 2007 Alasdair Kergon - 2.02.21-1 +- Fix vgsplit to handle mirrors. +- Reorder fields in reporting field definitions. +- Fix vgs to treat args as VGs even when PV fields are displayed. +- Fix md signature check to handle both endiannesses. + * Fri Jan 26 2007 Alasdair Kergon - 2.02.20-1 - Fix exit statuses of reporting tools. - Add some missing close() and fclose() return code checks. Index: sources =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 26 Jan 2007 14:29:32 -0000 1.49 +++ sources 30 Jan 2007 18:20:18 -0000 1.50 @@ -1 +1 @@ -edaef626b1a6487bbc9b2acabf036cda LVM2.2.02.20.tgz +3bd758564012805f1243fc39b8dace31 LVM2.2.02.21.tgz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/upstream,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- upstream 26 Jan 2007 14:29:32 -0000 1.39 +++ upstream 30 Jan 2007 18:20:18 -0000 1.40 @@ -1 +1 @@ -LVM2.2.02.20.tgz +LVM2.2.02.21.tgz --- LVM2.2.02.20.tgz.asc DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 18:21:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:21:30 -0500 Subject: rpms/pm-utils/devel pm-utils.spec,1.46,1.47 Message-ID: <200701301821.l0UILUqH012195@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12179 Modified Files: pm-utils.spec Log Message: - put the patch disabling the bluetooth hook back in. Index: pm-utils.spec =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- pm-utils.spec 26 Jan 2007 14:21:51 -0000 1.46 +++ pm-utils.spec 30 Jan 2007 18:21:28 -0000 1.47 @@ -107,6 +107,7 @@ ln -sf consolehelper $x done popd +chmod -x $RPM_BUILD_ROOT/etc/pm/hooks/49bluetooth # Symlink the config file to /etc/sysconfig mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig From fedora-cvs-commits at redhat.com Tue Jan 30 18:37:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:37:23 -0500 Subject: rpms/dhcp/devel dhcp-3.0.5-xen-checksum.patch, NONE, 1.1 dhcp-3.0.5-libdhcp4client.patch, 1.6, 1.7 dhcp.spec, 1.129, 1.130 Message-ID: <200701301837.l0UIbN6J030390@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30338 Modified Files: dhcp-3.0.5-libdhcp4client.patch dhcp.spec Added Files: dhcp-3.0.5-xen-checksum.patch Log Message: * Tue Jan 30 2007 David Cantrell - 12:3.0.5-10 - Fix Xen networking problems with partial checksums (#221964) dhcp-3.0.5-xen-checksum.patch: common/bpf.c | 3 +- common/dlpi.c | 2 - common/lpf.c | 79 +++++++++++++++++++++++++++++++++++++++++++------------ common/nit.c | 2 - common/packet.c | 5 ++- common/upf.c | 2 - includes/dhcpd.h | 2 - 7 files changed, 71 insertions(+), 24 deletions(-) --- NEW FILE dhcp-3.0.5-xen-checksum.patch --- diff -urN dhcp-3.0.5.xen/common/bpf.c dhcp-3.0.5/common/bpf.c --- dhcp-3.0.5.xen/common/bpf.c 2004-11-24 12:39:15.000000000 -0500 +++ dhcp-3.0.5/common/bpf.c 2007-01-30 13:23:57.000000000 -0500 @@ -478,7 +478,8 @@ interface -> rbuf, interface -> rbuf_offset, from, - hdr.bh_caplen); + hdr.bh_caplen, + 0); /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) { diff -urN dhcp-3.0.5.xen/common/dlpi.c dhcp-3.0.5/common/dlpi.c --- dhcp-3.0.5.xen/common/dlpi.c 2004-11-24 12:39:15.000000000 -0500 +++ dhcp-3.0.5/common/dlpi.c 2007-01-30 13:23:57.000000000 -0500 @@ -679,7 +679,7 @@ length -= offset; #endif offset = decode_udp_ip_header (interface, dbuf, bufix, - from, length); + from, length, 0); /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) { diff -urN dhcp-3.0.5.xen/common/lpf.c dhcp-3.0.5/common/lpf.c --- dhcp-3.0.5.xen/common/lpf.c 2004-11-24 12:39:15.000000000 -0500 +++ dhcp-3.0.5/common/lpf.c 2007-01-30 13:27:39.000000000 -0500 @@ -34,16 +34,31 @@ #include "dhcpd.h" #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE) #include +#include #include #include #include #include +#include #include #include "includes/netinet/ip.h" #include "includes/netinet/udp.h" #include "includes/netinet/if_ether.h" +#ifndef PACKET_AUXDATA +#define PACKET_AUXDATA 8 + +struct tpacket_auxdata +{ + __u32 tp_status; + __u32 tp_len; + __u32 tp_snaplen; + __u16 tp_mac; + __u16 tp_net; +}; +#endif + /* Reinitializes the specified interface after an address change. This is not required for packet-filter APIs. */ @@ -69,12 +84,16 @@ struct interface_info *info; { int sock; + union { + struct sockaddr_ll ll; + struct sockaddr common; + } sa; + struct ifreq ifr; char filename[50]; int b; - struct sockaddr sa; /* Make an LPF socket. */ - if ((sock = socket(PF_PACKET, SOCK_PACKET, + if ((sock = socket(PF_PACKET, SOCK_RAW, htons((short)ETH_P_ALL))) < 0) { if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || @@ -89,11 +108,16 @@ log_fatal ("Open a socket for LPF: %m"); } + memset (&ifr, 0, sizeof ifr); + strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name); + if (ioctl (sock, SIOCGIFINDEX, &ifr)) + log_fatal ("Failed to get interface index: %m"); + /* Bind to the interface name */ memset (&sa, 0, sizeof sa); - sa.sa_family = AF_PACKET; - strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data); - if (bind (sock, &sa, sizeof sa)) { + sa.ll.sll_family = AF_PACKET; + sa.ll.sll_ifindex = ifr.ifr_ifindex; + if (bind (sock, &sa.common, sizeof sa)) { if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || errno == EAFNOSUPPORT || errno == EINVAL) { @@ -173,9 +197,18 @@ void if_register_receive (info) struct interface_info *info; { + int val; + /* Open a LPF device and hang it on this interface... */ info -> rfdesc = if_register_lpf (info); + val = 1; + if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val, + sizeof val) < 0) { + if (errno != ENOPROTOOPT) + log_fatal ("Failed to set auxiliary packet data: %m"); + } + #if defined (HAVE_TR_SUPPORT) if (info -> hw_address.hbuf [0] == HTYPE_IEEE802) lpf_tr_filter_setup (info); @@ -293,7 +326,6 @@ double hh [16]; double ih [1536 / sizeof (double)]; unsigned char *buf = (unsigned char *)ih; - struct sockaddr sa; int result; int fudge; @@ -311,15 +343,7 @@ (unsigned char *)raw, len); memcpy (buf + ibufp, raw, len); - /* For some reason, SOCK_PACKET sockets can't be connected, - so we have to do a sentdo every time. */ - memset (&sa, 0, sizeof sa); - sa.sa_family = AF_PACKET; - strncpy (sa.sa_data, - (const char *)interface -> ifp, sizeof sa.sa_data); - - result = sendto (interface -> wfdesc, - buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa); + result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge); if (result < 0) log_error ("send_packet: %m"); return result; @@ -337,13 +361,34 @@ int nread; int length = 0; int offset = 0; + int nocsum = 0; unsigned char ibuf [1536]; unsigned bufix = 0; + unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))]; + struct iovec iov = { + .iov_base = ibuf, + .iov_len = sizeof ibuf, + }; + struct msghdr msg = { + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = cmsgbuf, + .msg_controllen = sizeof(cmsgbuf), + }; + struct cmsghdr *cmsg; - length = read (interface -> rfdesc, ibuf, sizeof ibuf); + length = recvmsg (interface -> rfdesc, &msg, 0); if (length <= 0) return length; + for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { + if (cmsg->cmsg_level == SOL_PACKET && + cmsg->cmsg_type == PACKET_AUXDATA) { + struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg); + nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY; + } + } + bufix = 0; /* Decode the physical header... */ offset = decode_hw_header (interface, ibuf, bufix, hfrom); @@ -360,7 +405,7 @@ /* Decode the IP and UDP headers... */ offset = decode_udp_ip_header (interface, ibuf, bufix, from, - (unsigned)length); + (unsigned)length, nocsum); /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) diff -urN dhcp-3.0.5.xen/common/nit.c dhcp-3.0.5/common/nit.c --- dhcp-3.0.5.xen/common/nit.c 2004-11-24 12:39:15.000000000 -0500 +++ dhcp-3.0.5/common/nit.c 2007-01-30 13:23:57.000000000 -0500 @@ -370,7 +370,7 @@ /* Decode the IP and UDP headers... */ offset = decode_udp_ip_header (interface, ibuf, bufix, - from, length); + from, length, 0); /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) diff -urN dhcp-3.0.5.xen/common/packet.c dhcp-3.0.5/common/packet.c --- dhcp-3.0.5.xen/common/packet.c 2007-01-30 13:23:27.000000000 -0500 +++ dhcp-3.0.5/common/packet.c 2007-01-30 13:23:57.000000000 -0500 @@ -211,12 +211,13 @@ /* UDP header and IP header decoded together for convenience. */ -ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen) +ssize_t decode_udp_ip_header (interface, buf, bufix, from, buflen, nocsum) struct interface_info *interface; unsigned char *buf; unsigned bufix; struct sockaddr_in *from; unsigned buflen; + int nocsum; { unsigned char *data; struct ip ip; @@ -319,7 +320,7 @@ (u_int32_t)ulen)))); udp_packets_seen++; - if (usum && usum != sum) { + if (!nocsum && usum && usum != sum) { udp_packets_bad_checksum++; if (udp_packets_seen > 4 && (udp_packets_seen / udp_packets_bad_checksum) < 2) { diff -urN dhcp-3.0.5.xen/common/upf.c dhcp-3.0.5/common/upf.c --- dhcp-3.0.5.xen/common/upf.c 2004-11-24 12:39:16.000000000 -0500 +++ dhcp-3.0.5/common/upf.c 2007-01-30 13:23:57.000000000 -0500 @@ -321,7 +321,7 @@ /* Decode the IP and UDP headers... */ offset = decode_udp_ip_header (interface, ibuf, bufix, - from, length); + from, length, 0); /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) diff -urN dhcp-3.0.5.xen/includes/dhcpd.h dhcp-3.0.5/includes/dhcpd.h --- dhcp-3.0.5.xen/includes/dhcpd.h 2007-01-30 13:23:28.000000000 -0500 +++ dhcp-3.0.5/includes/dhcpd.h 2007-01-30 13:23:57.000000000 -0500 @@ -1948,7 +1948,7 @@ unsigned, struct hardware *)); ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *, unsigned, struct sockaddr_in *, - unsigned)); + unsigned, int)); /* ethernet.c */ void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *, dhcp-3.0.5-libdhcp4client.patch: Makefile.dist | 2 client/dhclient.c | 311 +++++++++++++++++++++++++++++++++------ common/alloc.c | 16 -- common/discover.c | 26 +-- common/lpf.c | 4 configure | 2 dst/hmac_link.c | 32 +++- dst/md5_dgst.c | 5 libdhcp4client/Makefile.dist | 127 +++++++++++++++ libdhcp4client/dhcp4client.h | 24 +++ libdhcp4client/libdhcp_control.h | 102 ++++++++++++ minires/ns_date.c | 1 minires/ns_name.c | 8 + minires/ns_parse.c | 5 minires/ns_samedomain.c | 4 minires/ns_sign.c | 1 minires/ns_verify.c | 2 minires/res_comp.c | 3 minires/res_findzonecut.c | 1 minires/res_init.c | 1 minires/res_mkquery.c | 1 minires/res_mkupdate.c | 8 + minires/res_send.c | 5 minires/res_sendsigned.c | 1 omapip/alloc.c | 43 +++++ omapip/dispatch.c | 2 omapip/errwarn.c | 50 +++++- 27 files changed, 705 insertions(+), 82 deletions(-) Index: dhcp-3.0.5-libdhcp4client.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.5-libdhcp4client.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dhcp-3.0.5-libdhcp4client.patch 29 Jan 2007 22:19:06 -0000 1.6 +++ dhcp-3.0.5-libdhcp4client.patch 30 Jan 2007 18:37:21 -0000 1.7 @@ -1,5 +1,5 @@ ---- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/client/dhclient.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/client/dhclient.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/client/dhclient.c 2007-01-30 13:29:31.000000000 -0500 @@ -78,7 +78,9 @@ int extended_option_environment = 0; #endif @@ -587,8 +587,8 @@ ddns_dhcid, client_identifier; struct option_cache *oc; int ignorep; ---- dhcp-3.0.5/common/alloc.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/common/alloc.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/common/alloc.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/common/alloc.c 2007-01-30 13:29:31.000000000 -0500 @@ -48,7 +48,6 @@ const char *file; int line; @@ -669,8 +669,8 @@ struct dns_zone *d; if (!ptr) { ---- dhcp-3.0.5/common/discover.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/common/discover.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/common/discover.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/common/discover.c 2007-01-30 13:29:31.000000000 -0500 @@ -120,28 +120,30 @@ For each interface that's of type INET and not the loopback interface, register that interface with the network I/O software, figure out what @@ -760,18 +760,18 @@ isc_result_t status; if (h -> type != dhcp_type_interface) ---- dhcp-3.0.5/common/lpf.c.libdhcp4client 2004-11-24 12:39:15.000000000 -0500 -+++ dhcp-3.0.5/common/lpf.c 2007-01-29 17:02:32.000000000 -0500 -@@ -69,8 +69,6 @@ - struct interface_info *info; - { - int sock; +--- dhcp-3.0.5/common/lpf.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/common/lpf.c 2007-01-30 13:30:23.000000000 -0500 +@@ -89,8 +89,6 @@ + struct sockaddr common; + } sa; + struct ifreq ifr; - char filename[50]; - int b; - struct sockaddr sa; /* Make an LPF socket. */ -@@ -216,6 +214,7 @@ + if ((sock = socket(PF_PACKET, SOCK_RAW, +@@ -249,6 +247,7 @@ struct interface_info *info; { struct sock_fprog p; @@ -779,16 +779,16 @@ /* Set up the bpf filter program structure. This is defined in bpf.c */ -@@ -334,7 +333,6 @@ +@@ -358,7 +357,6 @@ struct sockaddr_in *from; struct hardware *hfrom; { - int nread; int length = 0; int offset = 0; - unsigned char ibuf [1536]; ---- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/dst/hmac_link.c 2007-01-29 17:02:32.000000000 -0500 + int nocsum = 0; +--- dhcp-3.0.5/dst/hmac_link.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/dst/hmac_link.c 2007-01-30 13:29:31.000000000 -0500 @@ -38,6 +38,10 @@ #include "dst_internal.h" @@ -876,7 +876,7 @@ return (0); memset(dst_t_func[KEY_HMAC_MD5], 0, sizeof(struct dst_func)); --- dhcp-3.0.5/dst/md5_dgst.c.libdhcp4client 2004-06-14 14:50:06.000000000 -0400 -+++ dhcp-3.0.5/dst/md5_dgst.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/dst/md5_dgst.c 2007-01-30 13:29:31.000000000 -0500 @@ -65,7 +65,7 @@ #ifdef USE_MD5 /* Added by ogud at tis.com 1998/1/26 */ @@ -911,7 +911,7 @@ unsigned char *md; MD5_CTX *c; --- dhcp-3.0.5/minires/ns_date.c.libdhcp4client 2004-06-10 13:59:40.000000000 -0400 -+++ dhcp-3.0.5/minires/ns_date.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_date.c 2007-01-30 13:29:31.000000000 -0500 @@ -56,6 +56,7 @@ 1 January 1970 (GMT assumed). Format is yyyymmddhhmmss, all digits required, no spaces allowed. */ @@ -921,7 +921,7 @@ ns_datetosecs(const char *cp, int *errp) { struct tm time; --- dhcp-3.0.5/minires/ns_verify.c.libdhcp4client 2004-06-10 13:59:42.000000000 -0400 -+++ dhcp-3.0.5/minires/ns_verify.c 2007-01-29 17:05:45.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_verify.c 2007-01-30 13:29:31.000000000 -0500 @@ -61,6 +61,7 @@ /* Public. */ @@ -939,7 +939,7 @@ ns_verify(u_char *msg, unsigned *msglen, void *k, const u_char *querysig, unsigned querysiglen, --- dhcp-3.0.5/minires/ns_parse.c.libdhcp4client 2004-06-10 13:59:40.000000000 -0400 -+++ dhcp-3.0.5/minires/ns_parse.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_parse.c 2007-01-30 13:29:31.000000000 -0500 @@ -47,7 +47,7 @@ /* Public. */ @@ -974,7 +974,7 @@ ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) { int b; --- dhcp-3.0.5/minires/ns_samedomain.c.libdhcp4client 2004-06-10 13:59:41.000000000 -0400 -+++ dhcp-3.0.5/minires/ns_samedomain.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_samedomain.c 2007-01-30 13:29:31.000000000 -0500 @@ -53,6 +53,7 @@ * but NOT in "bar.top" */ @@ -1007,8 +1007,8 @@ int ns_samename(const char *a, const char *b) { char ta[NS_MAXDNAME], tb[NS_MAXDNAME]; ---- dhcp-3.0.5/minires/ns_name.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/minires/ns_name.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/minires/ns_name.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_name.c 2007-01-30 13:29:31.000000000 -0500 @@ -60,6 +60,7 @@ * The root is returned as "." * All other domains are returned in non absolute form @@ -1074,7 +1074,7 @@ ns_name_skip(const u_char **ptrptr, const u_char *eom) { const u_char *cp; --- dhcp-3.0.5/minires/ns_sign.c.libdhcp4client 2004-06-10 13:59:42.000000000 -0400 -+++ dhcp-3.0.5/minires/ns_sign.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/ns_sign.c 2007-01-30 13:29:31.000000000 -0500 @@ -78,6 +78,7 @@ * - bad key / sign failed (-BADKEY) * - not enough space (NS_TSIG_ERROR_NO_SPACE) @@ -1083,8 +1083,8 @@ isc_result_t ns_sign(u_char *msg, unsigned *msglen, unsigned msgsize, int error, void *k, const u_char *querysig, unsigned querysiglen, u_char *sig, ---- dhcp-3.0.5/minires/res_comp.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/minires/res_comp.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/minires/res_comp.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/minires/res_comp.c 2007-01-30 13:29:31.000000000 -0500 @@ -103,6 +103,7 @@ * 'exp_dn' is a pointer to a buffer of size 'length' for the result. * Return size of compressed name or -1 if there was an error. @@ -1109,8 +1109,8 @@ int dn_skipname(const u_char *ptr, const u_char *eom) { const u_char *saveptr = ptr; ---- dhcp-3.0.5/minires/res_mkupdate.c.libdhcp4client 2007-01-29 17:02:32.000000000 -0500 -+++ dhcp-3.0.5/minires/res_mkupdate.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/minires/res_mkupdate.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/minires/res_mkupdate.c 2007-01-30 13:29:31.000000000 -0500 @@ -936,6 +936,7 @@ static struct valuelist *servicelist, *protolist; @@ -1176,7 +1176,7 @@ res_servicename(u_int16_t port, const char *proto) { /* Host byte order. */ static char number[8]; --- dhcp-3.0.5/minires/res_findzonecut.c.libdhcp4client 2004-06-10 13:59:43.000000000 -0400 -+++ dhcp-3.0.5/minires/res_findzonecut.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/res_findzonecut.c 2007-01-30 13:29:31.000000000 -0500 @@ -139,6 +139,7 @@ * keep going. for the NS and A queries this means we just give up. */ @@ -1186,7 +1186,7 @@ res_findzonecut(res_state statp, const char *dname, ns_class class, int opts, char *zname, size_t zsize, struct in_addr *addrs, int naddrs, --- dhcp-3.0.5/minires/res_send.c.libdhcp4client 2004-06-10 13:59:44.000000000 -0400 -+++ dhcp-3.0.5/minires/res_send.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/res_send.c 2007-01-30 13:29:31.000000000 -0500 @@ -128,6 +128,7 @@ * author: * paul vixie, 29may94 @@ -1228,7 +1228,7 @@ res_nclose(res_state statp) { if (statp->_sock >= 0) { --- dhcp-3.0.5/minires/res_mkquery.c.libdhcp4client 2004-06-10 13:59:43.000000000 -0400 -+++ dhcp-3.0.5/minires/res_mkquery.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/res_mkquery.c 2007-01-30 13:29:31.000000000 -0500 @@ -96,6 +96,7 @@ * Form all types of queries. * Returns the size of the result or -1. @@ -1238,7 +1238,7 @@ res_nmkquery(res_state statp, int op, /* opcode of query */ --- dhcp-3.0.5/minires/res_sendsigned.c.libdhcp4client 2004-06-10 13:59:44.000000000 -0400 -+++ dhcp-3.0.5/minires/res_sendsigned.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/minires/res_sendsigned.c 2007-01-30 13:29:31.000000000 -0500 @@ -41,6 +41,7 @@ #include @@ -1247,8 +1247,8 @@ isc_result_t res_nsendsigned(res_state statp, double *msg, unsigned msglen, ns_tsig_key *key, ---- dhcp-3.0.5/minires/res_init.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/minires/res_init.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/minires/res_init.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/minires/res_init.c 2007-01-30 13:29:31.000000000 -0500 @@ -484,6 +484,7 @@ } #endif @@ -1258,7 +1258,7 @@ res_randomid(void) { struct timeval now; --- dhcp-3.0.5/omapip/alloc.c.libdhcp4client 2006-02-22 17:43:27.000000000 -0500 -+++ dhcp-3.0.5/omapip/alloc.c 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/omapip/alloc.c 2007-01-30 13:29:31.000000000 -0500 @@ -40,6 +40,41 @@ #include @@ -1330,8 +1330,8 @@ } #if defined (DEBUG_MEMORY_LEAKAGE) || defined (DEBUG_MALLOC_POOL) || \ ---- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/omapip/dispatch.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/omapip/dispatch.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/omapip/dispatch.c 2007-01-30 13:29:31.000000000 -0500 @@ -34,7 +34,7 @@ #include @@ -1341,8 +1341,8 @@ TIME cur_time; OMAPI_OBJECT_ALLOC (omapi_io, ---- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2007-01-29 17:02:31.000000000 -0500 -+++ dhcp-3.0.5/omapip/errwarn.c 2007-01-29 17:02:32.000000000 -0500 +--- dhcp-3.0.5/omapip/errwarn.c.libdhcp4client 2007-01-30 13:29:31.000000000 -0500 ++++ dhcp-3.0.5/omapip/errwarn.c 2007-01-30 13:29:31.000000000 -0500 @@ -39,6 +39,11 @@ #include #include @@ -1465,7 +1465,7 @@ } --- dhcp-3.0.5/configure.libdhcp4client 2004-09-10 17:02:30.000000000 -0400 -+++ dhcp-3.0.5/configure 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/configure 2007-01-30 13:29:31.000000000 -0500 @@ -246,7 +246,7 @@ fi @@ -1475,8 +1475,8 @@ fi for foo in $dirs; do ---- /dev/null 2007-01-28 13:50:40.723776703 -0500 -+++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2007-01-29 17:02:32.000000000 -0500 +--- /dev/null 2007-01-30 11:05:20.939899920 -0500 ++++ dhcp-3.0.5/libdhcp4client/Makefile.dist 2007-01-30 13:29:31.000000000 -0500 @@ -0,0 +1,127 @@ +# Makefile.dist for libdhcp4client +# @@ -1605,8 +1605,8 @@ + $(CC) -shared -o $@ -Wl,-soname,$@ $(OBJS) `$(AR) t libres.a | grep -v res_query.o` + +# Dependencies (semi-automatically-generated) ---- /dev/null 2007-01-28 13:50:40.723776703 -0500 -+++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2007-01-29 17:02:32.000000000 -0500 +--- /dev/null 2007-01-30 11:05:20.939899920 -0500 ++++ dhcp-3.0.5/libdhcp4client/dhcp4client.h 2007-01-30 13:29:31.000000000 -0500 @@ -0,0 +1,24 @@ +/* dhcp4client.h + * @@ -1632,8 +1632,8 @@ +extern int dhcpv4_client( struct libdhcp_control_s *dhc_ctl, int argc, char **argv, char **envp); + /* The ISC IPv4 DHCP client main() function . + */ ---- /dev/null 2007-01-28 13:50:40.723776703 -0500 -+++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2007-01-29 17:02:32.000000000 -0500 +--- /dev/null 2007-01-30 11:05:20.939899920 -0500 ++++ dhcp-3.0.5/libdhcp4client/libdhcp_control.h 2007-01-30 13:29:31.000000000 -0500 @@ -0,0 +1,102 @@ +/* libdhcp_control.h + * @@ -1738,7 +1738,7 @@ + +#endif --- dhcp-3.0.5/Makefile.dist.libdhcp4client 2004-06-10 13:59:10.000000000 -0400 -+++ dhcp-3.0.5/Makefile.dist 2007-01-29 17:02:32.000000000 -0500 ++++ dhcp-3.0.5/Makefile.dist 2007-01-30 13:29:31.000000000 -0500 @@ -22,7 +22,7 @@ # http://www.isc.org/ Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- dhcp.spec 29 Jan 2007 22:19:06 -0000 1.129 +++ dhcp.spec 30 Jan 2007 18:37:21 -0000 1.130 @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -33,6 +33,7 @@ Patch10: dhcp-3.0.5-server.patch Patch11: dhcp-3.0.5-timeouts.patch Patch12: dhcp-3.0.5-fix-warnings.patch +Patch13: dhcp-3.0.5-xen-checksum.patch # adds libdhcp4client to the ISC code base Patch50: dhcp-3.0.5-libdhcp4client.patch @@ -141,6 +142,9 @@ # Fix up anything that fails -Wall -Werror %patch12 -p1 -b .warnings +# Fix Xen host networking problems (partial checksums) +%patch13 -p1 -b .xen + # Add the libdhcp4client target (library version of dhclient) %patch50 -p1 -b .libdhcp4client @@ -344,6 +348,9 @@ %{_libdir}/libdhcp4client.so %changelog +* Tue Jan 30 2007 David Cantrell - 12:3.0.5-10 +- Fix Xen networking problems with partial checksums (#221964) + * Mon Jan 29 2007 David Cantrell - 12:3.0.5-9 - Remove dhcptables.pl from the source package - Mark libres.a symbols hidden (#198496) From fedora-cvs-commits at redhat.com Tue Jan 30 18:43:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:43:36 -0500 Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.22,1.23 Message-ID: <200701301843.l0UIhaOY002423@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-apps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2377 Modified Files: xorg-x11-apps.spec Log Message: * Tue Jan 30 2007 Adam Jackson 7.1-4 - Fix man page globs and rebuild for FC7. Index: xorg-x11-apps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-apps.spec 2 Oct 2006 19:37:28 -0000 1.22 +++ xorg-x11-apps.spec 30 Jan 2007 18:43:34 -0000 1.23 @@ -5,7 +5,7 @@ # NOTE: The package version should be set to the X11 major release from which # the OS release is based upon. Version: 7.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -155,29 +155,32 @@ %{_datadir}/X11/x11perfcomp/perfboth %{_datadir}/X11/x11perfcomp/perfratio #%dir %{_mandir}/man1x -%{_mandir}/man1/xcursorgen.1x* -%{_mandir}/man1/Xmark.1x* -%{_mandir}/man1/luit.1x* -%{_mandir}/man1/oclock.1x* -%{_mandir}/man1/x11perf.1x* -%{_mandir}/man1/x11perfcomp.1x* -%{_mandir}/man1/xbiff.1x* -%{_mandir}/man1/xclipboard.1x* -%{_mandir}/man1/xclock.1x* -%{_mandir}/man1/xconsole.1x* -%{_mandir}/man1/xcutsel.1x* -%{_mandir}/man1/xdpr.1x* -%{_mandir}/man1/xeyes.1x* -%{_mandir}/man1/xkill.1x* -%{_mandir}/man1/xload.1x* -%{_mandir}/man1/xlogo.1x* -%{_mandir}/man1/xmag.1x* -%{_mandir}/man1/xmessage.1x* -%{_mandir}/man1/xpr.1x* -%{_mandir}/man1/xwd.1x* -%{_mandir}/man1/xwud.1x* +%{_mandir}/man1/xcursorgen.1* +%{_mandir}/man1/Xmark.1* +%{_mandir}/man1/luit.1* +%{_mandir}/man1/oclock.1* +%{_mandir}/man1/x11perf.1* +%{_mandir}/man1/x11perfcomp.1* +%{_mandir}/man1/xbiff.1* +%{_mandir}/man1/xclipboard.1* +%{_mandir}/man1/xclock.1* +%{_mandir}/man1/xconsole.1* +%{_mandir}/man1/xcutsel.1* +%{_mandir}/man1/xdpr.1* +%{_mandir}/man1/xeyes.1* +%{_mandir}/man1/xkill.1* +%{_mandir}/man1/xload.1* +%{_mandir}/man1/xlogo.1* +%{_mandir}/man1/xmag.1* +%{_mandir}/man1/xmessage.1* +%{_mandir}/man1/xpr.1* +%{_mandir}/man1/xwd.1* +%{_mandir}/man1/xwud.1* %changelog +* Tue Jan 30 2007 Adam Jackson 7.1-4 +- Fix man page globs and rebuild for FC7. + * Mon Oct 2 2006 Soren Sandmann 7.1-3.fc6 - Fix race condition in luit (Bug 197165). From fedora-cvs-commits at redhat.com Tue Jan 30 18:59:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 13:59:31 -0500 Subject: rpms/xen/devel xen-pvfb-compat-nohvm.patch, NONE, 1.1 xen-vnclisten-config.patch, NONE, 1.1 xen.spec, 1.165, 1.166 Message-ID: <200701301859.l0UIxV8H002307@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2264 Modified Files: xen.spec Added Files: xen-pvfb-compat-nohvm.patch xen-vnclisten-config.patch Log Message: Fixes to disable pvfb on hvm, and enable vnclisten config param xen-pvfb-compat-nohvm.patch: create.py | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xen-pvfb-compat-nohvm.patch --- --- tools/python/xen/xm/create.py~ 2007-01-23 07:43:13.000000000 +0100 +++ tools/python/xen/xm/create.py 2007-01-30 16:33:47.000000000 +0100 @@ -585,7 +585,7 @@ def configure_vfbs(config_devs, vals): # old config compatibility - if vals.vfb == [] and (vals.sdl or vals.vnc): + if vals.vfb == [] and (vals.sdl or vals.vnc) and vals.builder != 'hvm': if vals.vnc: cfg = 'type=vnc' if vals.vncdisplay: xen-vnclisten-config.patch: XendConfig.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE xen-vnclisten-config.patch --- diff -r 37141c3a3d39 tools/python/xen/xend/XendConfig.py --- a/tools/python/xen/xend/XendConfig.py Mon Dec 11 15:06:53 2006 +0000 +++ b/tools/python/xen/xend/XendConfig.py Tue Jan 30 13:36:15 2007 -0500 @@ -229,7 +229,8 @@ LEGACY_IMAGE_CFG = [ ('sdl', int), ('vncdisplay', int), ('vncunused', int), - ('vncpasswd', str), + ('vncpasswd', str), + ('vnclisten', str), ] LEGACY_IMAGE_HVM_CFG = [ Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- xen.spec 30 Jan 2007 17:54:13 -0000 1.165 +++ xen.spec 30 Jan 2007 18:59:29 -0000 1.166 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.4 -Release: 4%{dist} +Release: 5%{dist} Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -14,6 +14,7 @@ Patch6: xen-network-iptables-bridge.patch Patch13: xen-dumpdir.patch Patch14: xen-pygrub-memcorruption.patch +Patch15: xen-vnclisten-config.patch Patch20: xen-blktap-no-aio-epoll.patch Patch21: xen-blktap-error-returns.patch @@ -25,6 +26,7 @@ # Hack to support guest kernels using old PVFB protocol # from FC5/6 days. Can kill off once FC6 is EOL'd Patch150: xen-pvfb-compat.patch +Patch151: xen-pvfb-compat-nohvm.patch Patch251: pygrub-manykernels.patch @@ -92,6 +94,7 @@ %patch6 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # blktap patches %patch20 -p1 @@ -104,6 +107,7 @@ # pvfb compat %patch150 -p1 +%patch151 -p0 # upstream patches %patch251 -p1 @@ -225,6 +229,10 @@ %{_libdir}/*.a %changelog +* Tue Jan 30 2007 Daniel P. Berrange - 3.0.4-5.fc7 +- Don't run the pvfb daemons for HVM guests (bz 225413) +- Fix handling of vnclisten parameter for HVM guests + * Tue Jan 30 2007 Daniel P. Berrange - 3.0.4-4.fc7 - Fix pygrub memory corruption From fedora-cvs-commits at redhat.com Tue Jan 30 19:13:29 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 14:13:29 -0500 Subject: rpms/xen/FC-5 xen-3.0.4-vncpassword-pvfb-backport.patch, NONE, 1.1 xen-console.patch, NONE, 1.1 xen-pvfb-compat.patch, NONE, 1.1 xen-pvfb-fixes.patch, NONE, 1.1 xen-pvfb.patch, 1.1, 1.2 xen.spec, 1.120, 1.121 xen-pvfb-nocursor.patch, 1.1, NONE xen-pvfb-sigpipe.patch, 1.1, NONE xen-vnclisten-pvfb.patch, 1.1, NONE xen-vncpassword-pvfb-2.patch, 1.1, NONE Message-ID: <200701301913.l0UJDTbd012666@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/xen/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12439 Modified Files: xen-pvfb.patch xen.spec Added Files: xen-3.0.4-vncpassword-pvfb-backport.patch xen-console.patch xen-pvfb-compat.patch xen-pvfb-fixes.patch Removed Files: xen-pvfb-nocursor.patch xen-pvfb-sigpipe.patch xen-vnclisten-pvfb.patch xen-vncpassword-pvfb-2.patch Log Message: - Update Xen paravirt framebuffer patch to upstream xen-unstable changeset 13066. This changes the protocol to the one accepted upstream. - Add compatibility with guests running our initial protocol. xen-3.0.4-vncpassword-pvfb-backport.patch: .hgignore | 1 tools/python/xen/xend/server/vfbif.py | 12 ++++ tools/python/xen/xm/create.py | 6 +- tools/xenfb/vncfb.c | 88 ++++++++++++++++++++++++++++++---- 4 files changed, 97 insertions(+), 10 deletions(-) --- NEW FILE xen-3.0.4-vncpassword-pvfb-backport.patch --- diff -ruNp xen-3.0.3_0-src.orig/.hgignore xen-3.0.3_0-src.new/.hgignore --- xen-3.0.3_0-src.orig/.hgignore 2006-12-11 10:51:14.000000000 -0500 +++ xen-3.0.3_0-src.new/.hgignore 2006-12-11 10:43:32.000000000 -0500 @@ -212,3 +212,4 @@ ^unmodified_drivers/linux-2.6/.*\.cmd$ ^unmodified_drivers/linux-2.6/.*\.ko$ ^unmodified_drivers/linux-2.6/.*\.mod\.c$ +^LibVNCServer.* diff -ruNp xen-3.0.3_0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.0.3_0-src.new/tools/python/xen/xend/server/vfbif.py --- xen-3.0.3_0-src.orig/tools/python/xen/xend/server/vfbif.py 2006-12-11 10:51:14.000000000 -0500 +++ xen-3.0.3_0-src.new/tools/python/xen/xend/server/vfbif.py 2006-12-11 11:08:10.000000000 -0500 @@ -1,4 +1,5 @@ from xen.xend.server.DevController import DevController +from xen.xend.XendLogging import log from xen.xend.XendError import VmError from xen.xend import sxp @@ -79,6 +80,17 @@ class VfbifController(DevController): "--title", self.vm.getName() ] t = sxp.child_value(config, "type") if t == "vnc": + passwd = None + if sxp.child_value(config, "vncpasswd") != None: + passwd = sxp.child_value(config, "vncpasswd") + else: + passwd = xen.xend.XendRoot.instance().get_vncpasswd_default() + if not(passwd is None or passwd == ""): + self.vm.storeVm("vncpasswd", passwd) + log.debug("Stored a VNC password for vfb access") + else: + log.debug("No VNC passwd configured for vfb access") + # Try to start the vnc backend args = [xen.util.auxbin.pathTo("xen-vncfb")] if sxp.child_value(config, "vncunused") is not None: diff -ruNp xen-3.0.3_0-src.orig/tools/python/xen/xm/create.py xen-3.0.3_0-src.new/tools/python/xen/xm/create.py --- xen-3.0.3_0-src.orig/tools/python/xen/xm/create.py 2006-12-11 10:51:14.000000000 -0500 +++ xen-3.0.3_0-src.new/tools/python/xen/xm/create.py 2006-12-11 11:08:21.000000000 -0500 @@ -280,7 +280,7 @@ gopts.var('usbport', val='PATH', use="""Add a physical USB port to a domain, as specified by the path to that port. This option may be repeated to add more than one port.""") -gopts.var('vfb', val="type={vnc,sdl},vncunused=1,vncdisplay=N,vnclisten=ADDR,display=DISPLAY,xauthority=XAUTHORITY", +gopts.var('vfb', val="type={vnc,sdl},vncunused=1,vncdisplay=N,vnclisten=ADDR,display=DISPLAY,xauthority=XAUTHORITY,vncpasswd=PASSWORD", fn=append_value, default=[], use="""Make the domain a framebuffer backend. The backend type should be either sdl or vnc. @@ -563,6 +563,8 @@ def configure_vfbs(config_devs, vals): cfg += ',vncunused=%s' % vals.vncunused if vals.vnclisten: cfg += ',vnclisten=%s' % vals.vnclisten + if vals.vncpasswd: + cfg += ',vncpasswd=%s' % vals.vncpasswd else: cfg = 'type=sdl' if vals.xauthority: @@ -578,7 +580,7 @@ def configure_vfbs(config_devs, vals): d['type'] = 'sdl' for (k,v) in d.iteritems(): if not k in [ 'vnclisten', 'vncunused', 'vncdisplay', 'display', - 'xauthority', 'type' ]: + 'xauthority', 'type', 'vncpasswd' ]: err("configuration option %s unknown to vfbs" % k) config.append([k,v]) if not d.has_key("display") and os.environ.has_key("DISPLAY"): diff -ruNp xen-3.0.3_0-src.orig/tools/xenfb/vncfb.c xen-3.0.3_0-src.new/tools/xenfb/vncfb.c --- xen-3.0.3_0-src.orig/tools/xenfb/vncfb.c 2006-12-11 10:51:14.000000000 -0500 +++ xen-3.0.3_0-src.new/tools/xenfb/vncfb.c 2006-12-11 11:48:19.000000000 -0500 @@ -205,15 +205,10 @@ static void on_ptr_event(int buttonMask, last_y = y; } -static void xenstore_write_vncport(int port, int domid) +static void xenstore_write_vncport(struct xs_handle *xsh, int port, int domid) { - char *buf = NULL, *path; + char *buf, *path; char portstr[10]; - struct xs_handle *xsh = NULL; - - xsh = xs_daemon_open(); - if (xsh == NULL) - return; path = xs_get_domain_path(xsh, domid); if (path == NULL) { @@ -241,6 +236,54 @@ static void xenstore_write_vncport(int p } +static int xenstore_read_vncpasswd(struct xs_handle *xsh, int domid, char *pwbuf, int pwbuflen) +{ + char buf[256], *path, *uuid = NULL, *passwd = NULL; + unsigned int len, rc = 0; + + if (xsh == NULL) { + return -1; + } + + path = xs_get_domain_path(xsh, domid); + if (path == NULL) { + fprintf(stderr, "xs_get_domain_path() error\n"); + return -1; + } + + snprintf(buf, sizeof(buf), "%s/vm", path); + uuid = xs_read(xsh, XBT_NULL, buf, &len); + if (uuid == NULL) { + fprintf(stderr, "xs_read(): uuid get error\n"); + free(path); + return -1; + } + + snprintf(buf, sizeof(buf), "%s/vncpasswd", uuid); + passwd = xs_read(xsh, XBT_NULL, buf, &len); + if (passwd == NULL) { + free(uuid); + free(path); + return rc; + } + + strncpy(pwbuf, passwd, pwbuflen-1); + pwbuf[pwbuflen-1] = '\0'; + + passwd[0] = '\0'; + snprintf(buf, sizeof(buf), "%s/vncpasswd", uuid); + if (xs_write(xsh, XBT_NULL, buf, passwd, len) == 0) { + fprintf(stderr, "xs_write() vncpasswd failed\n"); + rc = -1; + } + + free(passwd); + free(uuid); + free(path); + + return rc; +} + static void vnc_update(struct xenfb *xenfb, int x, int y, int w, int h) { rfbScreenInfoPtr server = xenfb->user_data; @@ -275,6 +318,10 @@ int main(int argc, char **argv) char portstr[10]; char *endp; int r; + struct xs_handle *xsh; + char vncpasswd[1024]; + + vncpasswd[0] = '\0'; while ((opt = getopt_long(argc, argv, "d:p:t:u", options, NULL)) != -1) { @@ -355,6 +402,19 @@ int main(int argc, char **argv) } } + xsh = xs_daemon_open(); + if (xsh == NULL) { + fprintf(stderr, "cannot open connection to xenstore\n"); + exit(1); + } + + + if (xenstore_read_vncpasswd(xsh, domid, vncpasswd, sizeof(vncpasswd)) < 0) { + fprintf(stderr, "cannot read VNC password from xenstore\n"); + exit(1); + } + + server = rfbGetScreen(&fake_argc, fake_argv, xenfb->width, xenfb->height, 8, 3, xenfb->depth / 8); @@ -369,6 +429,18 @@ int main(int argc, char **argv) if (unused) server->autoPort = true; + if (vncpasswd[0]) { + char **passwds = malloc(sizeof(char**)*2); + if (!passwds) { + fprintf(stderr, "cannot allocate memory (%s)\n", strerror(errno)); + exit(1); + } + passwds[0] = vncpasswd; + passwds[1] = NULL; + + server->authPasswdData = passwds; + server->passwordCheck = rfbCheckPasswordByList; + } server->serverFormat.redShift = 16; server->serverFormat.greenShift = 8; server->serverFormat.blueShift = 0; @@ -381,7 +453,7 @@ int main(int argc, char **argv) rfbRunEventLoop(server, -1, true); - xenstore_write_vncport(server->port, domid); + xenstore_write_vncport(xsh, server->port, domid); for (;;) { FD_ZERO(&readfds); xen-console.patch: console.c | 70 ++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 26 deletions(-) --- NEW FILE xen-console.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Date 1164800279 0 # Node ID 8832712b0b3740daf9c2d5993fcc1d640ff1564e # Parent 15e80a946a6a7b8f865416e0c9c707d3ce413e3d [LINUX] console: Add option to use /dev/xvc0, major=204, minor=191. The major/minor has now been allocated to us by lanana.org. This is based on previous patches from: Jeremy Katz Amos Waterland Signed-off-by: Keir Fraser diff -r 15e80a946a6a -r 8832712b0b37 linux-2.6-xen-sparse/drivers/xen/console/console.c --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 11:07:51 2006 +0000 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 11:37:59 2006 +0000 @@ -64,13 +64,20 @@ * 'xencons=off' [XC_OFF]: Console is disabled. * 'xencons=tty' [XC_TTY]: Console attached to '/dev/tty[0-9]+'. * 'xencons=ttyS' [XC_SERIAL]: Console attached to '/dev/ttyS[0-9]+'. + * 'xencons=xvc' [XC_SERIAL]: Console attached to '/dev/xvc0'. * [XC_DEFAULT]: DOM0 -> XC_SERIAL ; all others -> XC_TTY. * * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses * warnings from standard distro startup scripts. */ -static enum { XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL } xc_mode = XC_DEFAULT; +static enum { + XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL, XC_XVC +} xc_mode = XC_DEFAULT; static int xc_num = -1; + +/* /dev/xvc0 device number allocated by lanana.org. */ +#define XEN_XVC_MAJOR 204 +#define XEN_XVC_MINOR 191 #ifdef CONFIG_MAGIC_SYSRQ static unsigned long sysrq_requested; @@ -82,27 +89,23 @@ static int __init xencons_setup(char *st char *q; int n; - if (!strncmp(str, "ttyS", 4)) + if (!strncmp(str, "ttyS", 4)) { xc_mode = XC_SERIAL; - else if (!strncmp(str, "tty", 3)) + str += 4; + } else if (!strncmp(str, "tty", 3)) { xc_mode = XC_TTY; - else if (!strncmp(str, "off", 3)) + str += 3; + } else if (!strncmp(str, "xvc", 3)) { + xc_mode = XC_XVC; + str += 3; + } else if (!strncmp(str, "off", 3)) { xc_mode = XC_OFF; - - switch (xc_mode) { - case XC_SERIAL: - n = simple_strtol(str+4, &q, 10); - if (q > (str + 4)) - xc_num = n; - break; - case XC_TTY: - n = simple_strtol(str+3, &q, 10); - if (q > (str + 3)) - xc_num = n; - break; - default: - break; - } + str += 3; + } + + n = simple_strtol(str, &q, 10); + if (q != str) + xc_num = n; return 1; } @@ -201,6 +204,12 @@ static int __init xen_console_init(void) } switch (xc_mode) { + case XC_XVC: + strcpy(kcons_info.name, "xvc"); + if (xc_num == -1) + xc_num = 0; + break; + case XC_SERIAL: strcpy(kcons_info.name, "ttyS"); if (xc_num == -1) @@ -305,7 +314,7 @@ void dom0_init_screen_info(const struct /******************** User-space console driver (/dev/console) ************/ #define DRV(_d) (_d) -#define DUMMY_TTY(_tty) ((xc_mode != XC_SERIAL) && \ +#define DUMMY_TTY(_tty) ((xc_mode == XC_TTY) && \ ((_tty)->index != (xc_num - 1))) static struct termios *xencons_termios[MAX_NR_CONSOLES]; @@ -628,8 +637,8 @@ static int __init xencons_init(void) return rc; } - xencons_driver = alloc_tty_driver((xc_mode == XC_SERIAL) ? - 1 : MAX_NR_CONSOLES); + xencons_driver = alloc_tty_driver((xc_mode == XC_TTY) ? + MAX_NR_CONSOLES : 1); if (xencons_driver == NULL) return -ENOMEM; @@ -644,14 +653,23 @@ static int __init xencons_init(void) DRV(xencons_driver)->termios = xencons_termios; DRV(xencons_driver)->termios_locked = xencons_termios_locked; - if (xc_mode == XC_SERIAL) { + switch (xc_mode) { + case XC_XVC: + DRV(xencons_driver)->name = "xvc"; + DRV(xencons_driver)->major = XEN_XVC_MAJOR; + DRV(xencons_driver)->minor_start = XEN_XVC_MINOR; + DRV(xencons_driver)->name_base = xc_num; + break; + case XC_SERIAL: DRV(xencons_driver)->name = "ttyS"; DRV(xencons_driver)->minor_start = 64 + xc_num; - DRV(xencons_driver)->name_base = 0 + xc_num; - } else { + DRV(xencons_driver)->name_base = xc_num; + break; + default: DRV(xencons_driver)->name = "tty"; DRV(xencons_driver)->minor_start = 1; DRV(xencons_driver)->name_base = 1; + break; } tty_set_operations(xencons_driver, &xencons_ops); # HG changeset patch # User kfraser at localhost.localdomain # Date 1164801889 0 # Node ID f32abd365ae006e4dfda7ec206a9955b3cd57da2 # Parent 4876e7ebca6eff15ea297d762400dd17d5d693b1 [LINUX] console: Fix comment. Signed-off-by: Keir Fraser diff -r 4876e7ebca6e -r f32abd365ae0 linux-2.6-xen-sparse/drivers/xen/console/console.c --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 11:40:10 2006 +0000 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 12:04:49 2006 +0000 @@ -64,7 +64,7 @@ * 'xencons=off' [XC_OFF]: Console is disabled. * 'xencons=tty' [XC_TTY]: Console attached to '/dev/tty[0-9]+'. * 'xencons=ttyS' [XC_SERIAL]: Console attached to '/dev/ttyS[0-9]+'. - * 'xencons=xvc' [XC_SERIAL]: Console attached to '/dev/xvc0'. + * 'xencons=xvc' [XC_XVC]: Console attached to '/dev/xvc0'. * [XC_DEFAULT]: DOM0 -> XC_SERIAL ; all others -> XC_TTY. * * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses xen-pvfb-compat.patch: b/tools/xenfb/oldxenfb.c | 611 ++++++++++++++++++++++++++++++++++ b/tools/xenfb/oldxenfb.h | 108 ++++++ b/tools/xenfb/oldxenkbd.h | 92 +++++ tools/python/xen/xend/server/vfbif.py | 3 tools/python/xen/xm/create.py | 18 + tools/xenfb/Makefile | 15 tools/xenfb/sdlfb.c | 11 tools/xenfb/vncfb.c | 11 tools/xenfb/xenfb.c | 57 +++ tools/xenfb/xenfb.h | 2 10 files changed, 925 insertions(+), 3 deletions(-) --- NEW FILE xen-pvfb-compat.patch --- diff -r a2618d3912e7 tools/python/xen/xend/server/vfbif.py --- a/tools/python/xen/xend/server/vfbif.py Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/python/xen/xend/server/vfbif.py Tue Dec 05 10:29:17 2006 +0100 @@ -37,5 +37,8 @@ class VfbifController(DevController): def createDevice(self, config): DevController.createDevice(self, config) + # old frontend compatibility + self.vm.writeDom("console/use_graphics", "1") + # /old std_args = [ "--domid", "%d" % self.vm.getDomid(), "--title", self.vm.getName() ] t = config.get("type", None) diff -r 7df4d8cfba3b tools/python/xen/xm/create.py --- a/tools/python/xen/xm/create.py Tue Dec 05 12:42:29 2006 +0000 +++ b/tools/python/xen/xm/create.py Thu Dec 07 15:50:07 2006 +0100 @@ -577,6 +577,24 @@ def configure_usb(config_devs, vals): config_devs.append(['device', config_usb]) def configure_vfbs(config_devs, vals): + # old config compatibility + if vals.vfb == [] and (vals.sdl or vals.vnc) and vals.builder != 'hvm': + if vals.vnc: + cfg = 'type=vnc' + if vals.vncdisplay: + cfg += ',vncdisplay=%s' % vals.vncdisplay + if vals.vncunused: + cfg += ',vncunused=%s' % vals.vncunused + if vals.vnclisten: + cfg += ',vnclisten=%s' % vals.vnclisten + else: + cfg = 'type=sdl' + if vals.xauthority: + cfg += ',xauthority=%s' % vals.xauthority + if vals.display: + cfg += ',display=%s' % vals.display + vals.vfb = [ cfg, ] + # /old for f in vals.vfb: d = comma_sep_kv_to_dict(f) config = ['vfb'] diff -r a2618d3912e7 tools/xenfb/Makefile --- a/tools/xenfb/Makefile Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/Makefile Tue Dec 05 10:26:52 2006 +0100 @@ -13,12 +17,14 @@ all: build .PHONY: build build: mk-symlinks - $(MAKE) vncfb sdlfb + $(MAKE) vncfb sdlfb vncfbo sdlfbo install: all $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)/xen/bin $(INSTALL_PROG) vncfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfb $(INSTALL_PROG) sdlfb $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfb + $(INSTALL_PROG) vncfbo $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-vncfbo + $(INSTALL_PROG) sdlfbo $(DESTDIR)/usr/$(LIBDIR)/xen/bin/xen-sdlfbo sdlfb: sdlfb.o xenfb.o @@ -33,3 +39,14 @@ vncfb: LDLIBS += $(shell libvncserver-co vncfb: LDLIBS += $(shell libvncserver-config --libs) -lxenctrl -lxenstore sdlfb.o xenfb.o vncfb.o: xenfb.h + +sdlfbo vncfbo: + $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS) + +sdlfbo: sdlfb.o oldxenfb.o +sdlfbo: LDLIBS += $(shell sdl-config --libs) -lxenctrl -lxenstore + +vncfbo: vncfb.o oldxenfb.o +vncfbo: LDLIBS += $(shell libvncserver-config --libs) -lxenctrl -lxenstore + +oldxenfb.o: xenfb.h oldxenfb.h oldxenkbd.h diff -r a2618d3912e7 tools/xenfb/sdlfb.c --- a/tools/xenfb/sdlfb.c Tue Dec 05 12:42:29 2006 +0000 +++ b/tools/xenfb/sdlfb.c Thu Dec 07 19:45:51 2006 +0100 @@ -212,6 +212,7 @@ int main(int argc, char **argv) struct xenfb *xenfb; int domid = -1; char * title = NULL; + int ret; fd_set readfds; int nfds; struct SDLFBData data; @@ -256,11 +257,19 @@ int main(int argc, char **argv) exit(1); } - if (xenfb_attach_dom(xenfb, domid) < 0) { + ret = xenfb_attach_dom(xenfb, domid); + if (ret < 0) { fprintf(stderr, "Could not connect to domain (%s)\n", strerror(errno)); exit(1); } + if (ret > 0) { + if (xenfb_switch_to_old_protocol(argv) < 0) { + fprintf(stderr, "Could not switch to old protocol (%s)\n", + strerror(errno)); + exit(1); + } + } if (SDL_Init(SDL_INIT_VIDEO) < 0) { fprintf(stderr, "Could not initialize SDL\n"); diff -r a2618d3912e7 tools/xenfb/vncfb.c --- a/tools/xenfb/vncfb.c Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/vncfb.c Tue Dec 05 10:26:52 2006 +0100 @@ -269,6 +269,7 @@ int main(int argc, char **argv) bool unused = false; int opt; struct xenfb *xenfb; + int ret; fd_set readfds; int nfds; char portstr[10]; @@ -340,10 +341,18 @@ int main(int argc, char **argv) exit(1); } - if (xenfb_attach_dom(xenfb, domid) < 0) { + ret = xenfb_attach_dom(xenfb, domid); + if (ret < 0) { fprintf(stderr, "Could not connect to domain (%s)\n", strerror(errno)); exit(1); + } + if (ret > 0) { + if (xenfb_switch_to_old_protocol(argv) < 0) { + fprintf(stderr, "Could not switch to old protocol (%s)\n", + strerror(errno)); + exit(1); + } } server = rfbGetScreen(&fake_argc, fake_argv, diff -r a2618d3912e7 tools/xenfb/xenfb.c --- a/tools/xenfb/xenfb.c Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/xenfb.c Tue Dec 05 10:26:52 2006 +0100 @@ -290,6 +301,60 @@ static int xenfb_hotplug(struct xenfb_de return 0; } +static int xenfb_using_old_protocol(struct xenfb_private *xenfb) +{ + struct xs_handle *xsh = xenfb->xsh; + char buf[64]; + char *p, *v, **vec; + enum xenbus_state state; + unsigned dummy; + int ret; + + p = xenfb_path_in_dom(xsh, buf, sizeof(buf), + xenfb->fb.otherend_id, "vfb/page-ref"); + if (!xs_watch(xsh, p, "")) + return -1; + + for (;;) { + state = xenfb_read_state(xsh, xenfb->fb.otherend); + if (state > XenbusStateInitialising) { + ret = 0; /* frontend talks xenbus protocol */ + break; + } + + v = xs_read(xsh, XBT_NULL, p, NULL); + free(v); + if (v) { + ret = 1; /* frontend talks old protocol */ + break; + } + + vec = xs_read_watch(xsh, &dummy); + if (!vec) { + ret = -1; + break; + } + free(vec); + } + + xs_unwatch(xsh, p, ""); + return ret; +} + +int xenfb_switch_to_old_protocol(char **argv) +{ + size_t len = strlen(argv[0]); + char *prog; + + prog = malloc(len + 2); + if (!prog) + return -1; + strcpy(prog, argv[0]); + strcpy(prog + len, "o"); + argv[0] = prog; + return execv(prog, argv); +} + static int xenfb_wait_for_frontend_initialised(struct xenfb_device *dev) { switch (xenfb_wait_for_state(dev->xenfb->xsh, dev->otherend, @@ -473,6 +534,9 @@ int xenfb_attach_dom(struct xenfb *xenfb goto error; if (!xs_watch(xsh, xenfb->kbd.otherend, "")) goto error; + + if (xenfb_using_old_protocol(xenfb)) + return 1; if (xenfb_wait_for_frontend_initialised(&xenfb->fb) < 0) goto error; diff -r a2618d3912e7 tools/xenfb/xenfb.h --- a/tools/xenfb/xenfb.h Mon Dec 04 19:13:55 2006 +0000 +++ b/tools/xenfb/xenfb.h Tue Dec 05 10:26:52 2006 +0100 @@ -32,4 +32,6 @@ int xenfb_send_motion(struct xenfb *xenf int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y); int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y); +int xenfb_switch_to_old_protocol(char **); + #endif diff -r 3f0ca90351e2 tools/xenfb/oldxenfb.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/xenfb/oldxenfb.c Fri Dec 08 16:31:34 2006 +0100 @@ -0,0 +1,611 @@ +#include +#include +#include +#include +#include +#include +#include +#include "oldxenfb.h" +#include "oldxenkbd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "xenfb.h" + +// FIXME defend against malicious frontend? + +struct xenfb_device { + const char *devicetype; + char nodename[64]; /* backend xenstore dir */ + char otherend[64]; /* frontend xenstore dir */ + int otherend_id; /* frontend domid */ + enum xenbus_state state; /* backend state */ + void *page; /* shared page */ + evtchn_port_t port; + struct xenfb_private *xenfb; +}; + +struct xenfb_private { + struct xenfb pub; + int evt_xch; /* event channel driver handle */ + int xc; /* hypervisor interface handle */ + struct xs_handle *xsh; /* xs daemon handle */ + struct xenfb_device fb, kbd; + size_t fb_len; /* size of framebuffer */ +}; + +static void xenfb_detach_dom(struct xenfb_private *); +static int xenfb_fb_event(struct xenfb_private *, union xenfb_in_event *); + +static char *xenfb_path_in_dom(struct xs_handle *xsh, + char *buf, size_t size, + unsigned domid, const char *fmt, ...) +{ + va_list ap; + char *domp = xs_get_domain_path(xsh, domid); + int n; + + if (domp == NULL) + return NULL; + + n = snprintf(buf, size, "%s/", domp); + free(domp); + if (n >= size) + return NULL; + + va_start(ap, fmt); + n += vsnprintf(buf + n, size - n, fmt, ap); + va_end(ap); + if (n >= size) + return NULL; + + return buf; +} + +static int xenfb_xs_scanf1(struct xs_handle *xsh, + const char *dir, const char *node, + const char *fmt, void *dest) +{ + char buf[1024]; + char *p; + int ret; + + if (snprintf(buf, sizeof(buf), "%s/%s", dir, node) >= sizeof(buf)) { + errno = ENOENT; + return -1; + } + p = xs_read(xsh, XBT_NULL, buf, NULL); + if (!p) { + errno = ENOENT; + return -1; + } + ret = sscanf(p, fmt, dest); + free(p); + if (ret != 1) { + errno = EDOM; + return -1; + } + return ret; +} + +static int xenfb_xs_printf(struct xs_handle *xsh, + const char *dir, const char *node, char *fmt, ...) +{ + va_list ap; + char key[1024]; + char val[1024]; + int n; + + if (snprintf(key, sizeof(key), "%s/%s", dir, node) >= sizeof(key)) { + errno = ENOENT; + return -1; + } + + va_start(ap, fmt); + n = vsnprintf(val, sizeof(val), fmt, ap); + va_end(ap); + if (n >= sizeof(val)) { + errno = ENOSPC; /* close enough */ + return -1; + } + + if (!xs_write(xsh, XBT_NULL, key, val, n)) + return -1; + return 0; +} + +static void xenfb_device_init(struct xenfb_device *dev, + const char *type, + struct xenfb_private *xenfb) +{ + dev->devicetype = type; + dev->otherend_id = -1; + dev->port = -1; + dev->xenfb = xenfb; +} + +int xenfb_device_set_domain(struct xenfb_device *dev, int domid) +{ + struct xenfb_private *xenfb = dev->xenfb; + + dev->otherend_id = domid; + + if (!xenfb_path_in_dom(xenfb->xsh, + dev->otherend, sizeof(dev->otherend), + domid, "device/%s/0", dev->devicetype)) { + errno = ENOENT; + return -1; + } + if (!xenfb_path_in_dom(xenfb->xsh, + dev->nodename, sizeof(dev->nodename), + 0, "backend/%s/%d/0", dev->devicetype, domid)) { + errno = ENOENT; + return -1; + } + + return 0; +} + +struct xenfb *xenfb_new(void) +{ + struct xenfb_private *xenfb = malloc(sizeof(*xenfb)); + int serrno; + + if (xenfb == NULL) + return NULL; + + memset(xenfb, 0, sizeof(*xenfb)); + xenfb->evt_xch = xenfb->xc = -1; + xenfb_device_init(&xenfb->fb, "vfb", xenfb); + xenfb_device_init(&xenfb->kbd, "vkbd", xenfb); + + xenfb->evt_xch = xc_evtchn_open(); + if (xenfb->evt_xch == -1) + goto fail; + + xenfb->xc = xc_interface_open(); + if (xenfb->xc == -1) + goto fail; + + xenfb->xsh = xs_daemon_open(); + if (!xenfb->xsh) + goto fail; + + return &xenfb->pub; + + fail: + serrno = errno; + xenfb_delete(&xenfb->pub); + errno = serrno; + return NULL; +} + +/* Remove the backend area in xenbus since the framebuffer really is + going away. */ +void xenfb_teardown(struct xenfb *xenfb_pub) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + + xs_rm(xenfb->xsh, XBT_NULL, xenfb->fb.nodename); + xs_rm(xenfb->xsh, XBT_NULL, xenfb->kbd.nodename); +} + + +void xenfb_delete(struct xenfb *xenfb_pub) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + + xenfb_detach_dom(xenfb); + if (xenfb->xc >= 0) + xc_interface_close(xenfb->xc); + if (xenfb->evt_xch >= 0) + xc_evtchn_close(xenfb->evt_xch); + if (xenfb->xsh) + xs_daemon_close(xenfb->xsh); + free(xenfb); +} + +static enum xenbus_state xenfb_read_state(struct xs_handle *xsh, + const char *dir) +{ + int ret, state; + + ret = xenfb_xs_scanf1(xsh, dir, "state", "%d", &state); + if (ret < 0) + return XenbusStateUnknown; + + if ((unsigned)state > XenbusStateClosed) + state = XenbusStateUnknown; + return state; +} + +static int xenfb_switch_state(struct xenfb_device *dev, + enum xenbus_state state) +{ + struct xs_handle *xsh = dev->xenfb->xsh; + + if (xenfb_xs_printf(xsh, dev->nodename, "state", "%d", state) < 0) + return -1; + dev->state = state; + return 0; +} + +int xenfb_switch_to_old_protocol(char **argv) +{ + abort(); +} + +static int xenfb_map_fb(struct xenfb_private *xenfb, int domid) +{ + struct xenfb_page *page = xenfb->fb.page; + int n_fbmfns; + int n_fbdirs; + unsigned long *fbmfns; + + n_fbmfns = (xenfb->fb_len + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; + n_fbdirs = n_fbmfns * sizeof(unsigned long); + n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; + + /* + * Bug alert: xc_map_foreign_batch() can fail partly and + * return a non-null value. This is a design flaw. When it + * happens, we happily continue here, and later crash on + * access. + */ + fbmfns = xc_map_foreign_batch(xenfb->xc, domid, + PROT_READ, page->pd, n_fbdirs); + if (fbmfns == NULL) + return -1; + + xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid, + PROT_READ | PROT_WRITE, fbmfns, n_fbmfns); + if (xenfb->pub.pixels == NULL) { + munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE); + return -1; + } + + return munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE); +} + +static int xenfb_bind(struct xenfb_device *dev) +{ + struct xenfb_private *xenfb = dev->xenfb; + unsigned long mfn; + evtchn_port_t evtchn; + char buf[64]; + char *p, **vec; + unsigned dummy; + + p = xenfb_path_in_dom(xenfb->xsh, buf, sizeof(buf), + dev->otherend_id, dev->devicetype); + if (!xs_watch(xenfb->xsh, p, "")) + return -1; + for (;;) { + if (xenfb_xs_scanf1(xenfb->xsh, p, "page-ref", "%lu", + &mfn) < 0) { + if (errno == ENOENT || errno == EAGAIN) + goto wait; + return -1; + } + if (xenfb_xs_scanf1(xenfb->xsh, p, "event-channel", "%u", + &evtchn) < 0) { + if (errno == ENOENT || errno == EAGAIN) + goto wait; + return -1; + } + break; + + wait: + printf("Waiting...\n"); + vec = xs_read_watch(xenfb->xsh, &dummy); + if (!vec) + return -1; + free(vec); + } + + dev->port = xc_evtchn_bind_interdomain(xenfb->evt_xch, + dev->otherend_id, evtchn); + if (dev->port == -1) + return -1; + + dev->page = xc_map_foreign_range(xenfb->xc, dev->otherend_id, + XC_PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); + if (dev->page == NULL) + return -1; + + return 0; +} + +static void xenfb_unbind(struct xenfb_device *dev) +{ + if (dev->page) { + munmap(dev->page, XC_PAGE_SIZE); + dev->page = NULL; + } + if (dev->port >= 0) { + xc_evtchn_unbind(dev->xenfb->evt_xch, dev->port); + dev->port = -1; + } +} + +static void xenfb_dev_fatal(struct xenfb_device *dev, int err, + const char *fmt, ...) +{ + struct xs_handle *xsh = dev->xenfb->xsh; + va_list ap; + char errdir[80]; + char buf[1024]; + int n; + + fprintf(stderr, "%s ", dev->nodename); /* somewhat crude */ + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + if (err) + fprintf(stderr, " (%s)", strerror(err)); + putc('\n', stderr); + + if (!xenfb_path_in_dom(xsh, errdir, sizeof(errdir), 0, + "error/%s", dev->nodename)) + goto out; /* FIXME complain */ + + va_start(ap, fmt); + n = snprintf(buf, sizeof(buf), "%d ", err); + snprintf(buf + n, sizeof(buf) - n, fmt, ap); + va_end(ap); + + if (xenfb_xs_printf(xsh, buf, "error", "%s", buf) < 0) + goto out; /* FIXME complain */ + + out: + xenfb_switch_state(dev, XenbusStateClosing); +} + +int xenfb_attach_dom(struct xenfb *xenfb_pub, int domid) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + struct xs_handle *xsh = xenfb->xsh; + int val, serrno; + struct xenfb_page *fb_page; + union xenfb_in_event event; + + xenfb_detach_dom(xenfb); + + xenfb_device_set_domain(&xenfb->fb, domid); + xenfb_device_set_domain(&xenfb->kbd, domid); + + if (!xs_watch(xsh, xenfb->fb.otherend, "")) + goto error; + if (!xs_watch(xsh, xenfb->kbd.otherend, "")) + goto error; + + if (xenfb_bind(&xenfb->fb) < 0) + goto error; + if (xenfb_bind(&xenfb->kbd) < 0) + goto error; + + /* TODO check for permitted ranges */ + fb_page = xenfb->fb.page; + xenfb->pub.depth = fb_page->depth; + xenfb->pub.width = fb_page->width; + xenfb->pub.height = fb_page->height; + /* TODO check for consistency with the above */ + xenfb->fb_len = fb_page->mem_length; + xenfb->pub.row_stride = fb_page->line_length; + + if (xenfb_map_fb(xenfb, domid) < 0) + goto error; + + event.type = XENFB_TYPE_SET_EVENTS; + event.set_events.flags = XENFB_FLAG_UPDATE; + if (xenfb_fb_event(xenfb, &event)) + goto error; + + return 0; + + error: + serrno = errno; + xenfb_detach_dom(xenfb); + xenfb_dev_fatal(&xenfb->fb, serrno, "on fire"); + xenfb_dev_fatal(&xenfb->kbd, serrno, "on fire"); + errno = serrno; + return -1; +} + +static void xenfb_detach_dom(struct xenfb_private *xenfb) +{ + xenfb_unbind(&xenfb->fb); + xenfb_unbind(&xenfb->kbd); + if (xenfb->pub.pixels) { + munmap(xenfb->pub.pixels, xenfb->fb_len); + xenfb->pub.pixels = NULL; + } +} + +static void xenfb_on_fb_event(struct xenfb_private *xenfb) +{ + uint32_t prod, cons; + struct xenfb_page *page = xenfb->fb.page; + + prod = page->out_prod; + if (prod == page->out_cons) + return; + rmb(); /* ensure we see ring contents up to prod */ + for (cons = page->out_cons; cons != prod; cons++) { + union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + + switch (event->type) { + case XENFB_TYPE_UPDATE: + if (xenfb->pub.update) + xenfb->pub.update(&xenfb->pub, + event->update.x, event->update.y, + event->update.width, event->update.height); + break; + } + } + mb(); /* ensure we're done with ring contents */ + page->out_cons = cons; + xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port); +} + +static void xenfb_on_kbd_event(struct xenfb_private *xenfb) +{ + struct xenkbd_info *page = xenfb->kbd.page; + + /* We don't understand any keyboard events, so just ignore them. */ + if (page->out_prod == page->out_cons) + return; + page->out_cons = page->out_prod; + xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port); +} + +static int xenfb_on_state_change(struct xenfb_device *dev) +{ + enum xenbus_state state; + + state = xenfb_read_state(dev->xenfb->xsh, dev->otherend); + + switch (state) { + case XenbusStateUnknown: + /* There was an error reading the frontend state. The + domain has probably gone away; in any case, there's + not much point in us continuing. */ + return -1; + case XenbusStateInitialising: + case XenbusStateInitWait: + case XenbusStateInitialised: + case XenbusStateConnected: + break; + case XenbusStateClosing: + xenfb_unbind(dev); + xenfb_switch_state(dev, state); + break; + case XenbusStateClosed: + xenfb_switch_state(dev, state); + } + return 0; +} + +/* Returns 0 normally, -1 on error, or -2 if the domain went away. */ +int xenfb_poll(struct xenfb *xenfb_pub, fd_set *readfds) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + evtchn_port_t port; + unsigned dummy; + char **vec; + int r; + + if (FD_ISSET(xc_evtchn_fd(xenfb->evt_xch), readfds)) { + port = xc_evtchn_pending(xenfb->evt_xch); + if (port == -1) + return -1; + + if (port == xenfb->fb.port) + xenfb_on_fb_event(xenfb); + else if (port == xenfb->kbd.port) + xenfb_on_kbd_event(xenfb); + + if (xc_evtchn_unmask(xenfb->evt_xch, port) == -1) + return -1; + } + + if (FD_ISSET(xs_fileno(xenfb->xsh), readfds)) { + vec = xs_read_watch(xenfb->xsh, &dummy); + free(vec); + r = xenfb_on_state_change(&xenfb->fb); + if (r == 0) + r = xenfb_on_state_change(&xenfb->kbd); + if (r == -1) + return -2; + } + + return 0; +} + +int xenfb_select_fds(struct xenfb *xenfb_pub, fd_set *readfds) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + int fd1 = xc_evtchn_fd(xenfb->evt_xch); + int fd2 = xs_fileno(xenfb->xsh); + + FD_SET(fd1, readfds); + FD_SET(fd2, readfds); + return fd1 > fd2 ? fd1 + 1 : fd2 + 1; +} + +static int xenfb_fb_event(struct xenfb_private *xenfb, + union xenfb_in_event *event) +{ + uint32_t prod; + struct xenfb_page *page = xenfb->fb.page; + + prod = page->in_prod; + if (prod - page->in_cons == XENFB_IN_RING_LEN) { + errno = EAGAIN; + return -1; + } + + mb(); /* ensure ring space available */ + XENFB_IN_RING_REF(page, prod) = *event; + wmb(); /* ensure ring contents visible */ + page->in_prod = prod + 1; + return xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port); +} + +static int xenfb_kbd_event(struct xenfb_private *xenfb, + union xenkbd_in_event *event) +{ + uint32_t prod; + struct xenkbd_info *page = xenfb->kbd.page; + + prod = page->in_prod; + if (prod - page->in_cons == XENKBD_IN_RING_LEN) { + errno = EAGAIN; + return -1; + } + + mb(); /* ensure ring space available */ + XENKBD_IN_RING_REF(page, prod) = *event; + wmb(); /* ensure ring contents visible */ + page->in_prod = prod + 1; + return xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port); +} + +int xenfb_send_key(struct xenfb *xenfb_pub, bool down, int keycode) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + union xenkbd_in_event event; + + memset(&event, 0, XENKBD_IN_EVENT_SIZE); + event.type = XENKBD_TYPE_KEY; + event.key.pressed = down ? 1 : 0; + event.key.keycode = keycode; + + return xenfb_kbd_event(xenfb, &event); +} + +int xenfb_send_motion(struct xenfb *xenfb_pub, int rel_x, int rel_y) +{ + struct xenfb_private *xenfb = (struct xenfb_private *)xenfb_pub; + union xenkbd_in_event event; + + memset(&event, 0, XENKBD_IN_EVENT_SIZE); + event.type = XENKBD_TYPE_MOTION; + event.motion.rel_x = rel_x; + event.motion.rel_y = rel_y; + + return xenfb_kbd_event(xenfb, &event); +} + +int xenfb_send_position(struct xenfb *xenfb_pub, int abs_x, int abs_y) +{ + abort(); +} diff -r 7df4d8cfba3b tools/xenfb/oldxenfb.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/xenfb/oldxenfb.h Tue Dec 05 10:26:52 2006 +0100 @@ -0,0 +1,108 @@ +/* + * linux/include/linux/xenfb.h -- Xen virtual frame buffer device + * + * Copyright (C) 2005 + * + * Anthony Liguori + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef _LINUX_XENFB_H +#define _LINUX_XENFB_H + +#include + +/* out events */ + +#define XENFB_OUT_EVENT_SIZE 40 + +#define XENFB_TYPE_MOTION 1 +#define XENFB_TYPE_UPDATE 2 + +struct xenfb_motion /* currently unused */ +{ + __u8 type; /* XENFB_TYPE_MOTION */ + __u16 x; /* The new x coordinate */ + __u16 y; /* The new y coordinate */ +}; + +struct xenfb_update +{ + __u8 type; /* XENFB_TYPE_UPDATE */ + __u16 x; /* source x */ + __u16 y; /* source y */ + __u16 width; /* rect width */ + __u16 height; /* rect height */ +}; + +union xenfb_out_event +{ + __u8 type; + struct xenfb_motion motion; + struct xenfb_update update; + char _[XENFB_OUT_EVENT_SIZE]; +}; + +/* in events */ + +#define XENFB_IN_EVENT_SIZE 40 + +#define XENFB_TYPE_SET_EVENTS 1 + +#define XENFB_FLAG_MOTION 1 +#define XENFB_FLAG_UPDATE 2 +#define XENFB_FLAG_COPY 4 +#define XENFB_FLAG_FILL 8 + +struct xenfb_set_events +{ + __u8 type; /* XENFB_TYPE_SET_EVENTS */ + __u32 flags; /* combination of XENFB_FLAG_* */ +}; + +union xenfb_in_event +{ + __u8 type; + struct xenfb_set_events set_events; + char _[XENFB_OUT_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENFB_IN_RING_SIZE 1024 +#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE) +#define XENFB_IN_RING_OFFS 1024 +#define XENFB_IN_RING(page) \ + ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS)) +#define XENFB_IN_RING_REF(page, idx) \ + (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN]) + +#define XENFB_OUT_RING_SIZE 2048 +#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE) +#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE) +#define XENFB_OUT_RING(page) \ + ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS)) +#define XENFB_OUT_RING_REF(page, idx) \ + (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN]) + +struct xenfb_page +{ + __u16 width; /* the width of the framebuffer (in pixels) */ + __u16 height; /* the height of the framebuffer (in pixels) */ + __u32 line_length; /* the length of a row of pixels (in bytes) */ + __u32 mem_length; /* the length of the framebuffer (in bytes) */ + __u8 depth; /* the depth of a pixel (in bits) */ + + unsigned long pd[2]; /* FIXME rename to pgdir? */ + /* FIXME pd[1] unused at this time, shrink? */ + + __u32 in_cons, in_prod; + __u32 out_cons, out_prod; +}; + +void xenfb_resume(void); + +#endif diff -r 7df4d8cfba3b tools/xenfb/oldxenkbd.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/xenfb/oldxenkbd.h Tue Dec 05 10:26:52 2006 +0100 @@ -0,0 +1,92 @@ +/* + * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse + * + * Copyright (C) 2005 + * + * Anthony Liguori + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive for + * more details. + */ + +#ifndef _LINUX_XENKBD_H +#define _LINUX_XENKBD_H + +#include + +/* in events */ + +#define XENKBD_IN_EVENT_SIZE 40 + +#define XENKBD_TYPE_MOTION 1 /* mouse movement event */ +#define XENKBD_TYPE_BUTTON 2 /* mouse button event */ +#define XENKBD_TYPE_KEY 3 /* keyboard event */ + +struct xenkbd_motion +{ + __u8 type; /* XENKBD_TYPE_MOTION */ + __s16 rel_x; /* relative X motion */ + __s16 rel_y; /* relative Y motion */ +}; + +struct xenkbd_button +{ + __u8 type; /* XENKBD_TYPE_BUTTON */ + __u8 pressed; /* 1 if pressed; 0 otherwise */ + __u8 button; /* the button (0, 1, 2 is right, middle, left) */ +}; + +struct xenkbd_key +{ + __u8 type; /* XENKBD_TYPE_KEY */ + __u8 pressed; /* 1 if pressed; 0 otherwise */ + __u16 keycode; /* KEY_* from linux/input.h */ +}; + +union xenkbd_in_event +{ + __u8 type; + struct xenkbd_motion motion; + struct xenkbd_button button; + struct xenkbd_key key; + char _[XENKBD_IN_EVENT_SIZE]; +}; + +/* out events */ + +#define XENKBD_OUT_EVENT_SIZE 40 + +union xenkbd_out_event +{ + __u8 type; + char _[XENKBD_OUT_EVENT_SIZE]; +}; + +/* shared page */ + +#define XENKBD_IN_RING_SIZE 2048 +#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE) +#define XENKBD_IN_RING_OFFS 1024 +#define XENKBD_IN_RING(page) \ + ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS)) +#define XENKBD_IN_RING_REF(page, idx) \ + (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN]) + +#define XENKBD_OUT_RING_SIZE 1024 +#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE) +#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE) +#define XENKBD_OUT_RING(page) \ + ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS)) +#define XENKBD_OUT_RING_REF(page, idx) \ + (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN]) + +struct xenkbd_info +{ + __u32 in_cons, in_prod; + __u32 out_cons, out_prod; +}; + +void xenkbd_resume(void); + +#endif xen-pvfb-fixes.patch: xenfb.c | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 9 deletions(-) --- NEW FILE xen-pvfb-fixes.patch --- diff -rup a/tools/xenfb/xenfb.c b/tools/xenfb/xenfb.c --- a/tools/xenfb/xenfb.c 2006-12-19 19:40:21.000000000 +0100 +++ b/tools/xenfb/xenfb.c 2006-12-19 19:37:53.000000000 +0100 @@ -378,6 +378,48 @@ static int xenfb_wait_for_frontend_initi return 0; } +static void *xenfb_map_foreign_range(int xc_handle, uint32_t dom, + int size, int prot, + unsigned long mfn) +{ + int rc; + + rc = xc_domain_translate_gpfn_list(xc_handle, dom, 1, &mfn, &mfn); + if (rc < 0 && errno != EINVAL) + return NULL; + return xc_map_foreign_range(xc_handle, dom, size, prot, mfn); +} + +static void *xenfb_map_foreign_batch(int xc_handle, uint32_t dom, int prot, + xen_pfn_t *arr, int num) +{ + xen_pfn_t *buf; + int rc; + void *ret; + + /* make a copy to avoid clobbering arr[] */ + buf = malloc(num * sizeof(*buf)); + if (!buf) + return NULL; + memcpy(buf, arr, num * sizeof(*buf)); + + rc = xc_domain_translate_gpfn_list(xc_handle, dom, num, buf, buf); + if (rc < 0 && errno != EINVAL) { + free(buf); + return NULL; + } + + /* + * Bug alert: xc_map_foreign_batch() can fail partly and + * return a non-null value. This is a design flaw. When it + * happens, we happily continue here, and later crash on + * access. + */ + ret = xc_map_foreign_batch(xc_handle, dom, prot, buf, num); + free(buf); + return ret; +} + static int xenfb_map_fb(struct xenfb_private *xenfb, int domid) { struct xenfb_page *page = xenfb->fb.page; @@ -389,18 +431,12 @@ static int xenfb_map_fb(struct xenfb_pri n_fbdirs = n_fbmfns * sizeof(unsigned long); n_fbdirs = (n_fbdirs + (XC_PAGE_SIZE - 1)) / XC_PAGE_SIZE; - /* - * Bug alert: xc_map_foreign_batch() can fail partly and - * return a non-null value. This is a design flaw. When it - * happens, we happily continue here, and later crash on - * access. - */ - fbmfns = xc_map_foreign_batch(xenfb->xc, domid, + fbmfns = xenfb_map_foreign_batch(xenfb->xc, domid, PROT_READ, page->pd, n_fbdirs); if (fbmfns == NULL) return -1; - xenfb->pub.pixels = xc_map_foreign_batch(xenfb->xc, domid, + xenfb->pub.pixels = xenfb_map_foreign_batch(xenfb->xc, domid, PROT_READ | PROT_WRITE, fbmfns, n_fbmfns); if (xenfb->pub.pixels == NULL) { munmap(fbmfns, n_fbdirs * XC_PAGE_SIZE); @@ -428,7 +464,7 @@ static int xenfb_bind(struct xenfb_devic if (dev->port == -1) return -1; - dev->page = xc_map_foreign_range(xenfb->xc, dev->otherend_id, + dev->page = xenfb_map_foreign_range(xenfb->xc, dev->otherend_id, XC_PAGE_SIZE, PROT_READ | PROT_WRITE, mfn); if (dev->page == NULL) return -1; xen-pvfb.patch: Config.mk | 2 a/linux-2.6-xen-sparse/drivers/char/tty_io.c | 3264 -------------------- b/linux-2.6-xen-sparse/drivers/xen/fbfront/Makefile | 2 b/linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c | 682 ++++ b/linux-2.6-xen-sparse/drivers/xen/fbfront/xenkbd.c | 300 + b/tools/check/check_libvncserver | 21 b/tools/check/check_sdl | 21 b/tools/python/xen/xend/server/vfbif.py | 29 b/tools/xenfb/Makefile | 35 b/tools/xenfb/sdlfb.c | 334 ++ b/tools/xenfb/vncfb.c | 393 ++ b/tools/xenfb/xenfb.c | 691 ++++ b/tools/xenfb/xenfb.h | 34 b/xen/include/public/io/fbif.h | 116 b/xen/include/public/io/kbdif.h | 108 buildconfigs/linux-defconfig_xen_ia64 | 2 buildconfigs/linux-defconfig_xen_x86_32 | 2 buildconfigs/linux-defconfig_xen_x86_64 | 2 linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c | 5 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | 4 linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c | 7 linux-2.6-xen-sparse/drivers/xen/Kconfig | 23 linux-2.6-xen-sparse/drivers/xen/Makefile | 2 linux-2.6-xen-sparse/drivers/xen/console/console.c | 10 tools/Makefile | 3 tools/check/Makefile | 6 tools/check/check_libvncserver | 6 tools/check/check_sdl | 6 tools/python/xen/xend/XendDomainInfo.py | 42 tools/python/xen/xend/image.py | 148 tools/python/xen/xend/server/vfbif.py | 130 tools/python/xen/xm/create.py | 88 tools/xenfb/sdlfb.c | 10 tools/xenfb/vncfb.c | 21 tools/xenfb/xenfb.c | 32 tools/xenfb/xenfb.h | 1 36 files changed, 3149 insertions(+), 3433 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 xen-pvfb.patch Index: xen-pvfb.patch =================================================================== RCS file: /cvs/dist/rpms/xen/FC-5/xen-pvfb.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen-pvfb.patch 30 Oct 2006 23:48:17 -0000 1.1 +++ xen-pvfb.patch 30 Jan 2007 19:13:26 -0000 1.2 @@ -1,22 +1,69 @@ -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c ---- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Tue Aug 15 19:53:55 2006 +0100 -+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Fri Aug 18 16:17:58 2006 -0400 -@@ -1871,8 +1871,12 @@ void __init setup_arch(char **cmdline_p) +Derived from: +# HG changeset patch +# User Steven Smith +# Date 1164966512 0 +# Node ID 260426e3924f922719b392d1f2a7e9776dc7a15f +# Parent 697b0203e68fd5b54944ba947c3e3b8d78fae88d +This is Anthony Liguori's virtual framebuffer forward ported and +extensively hacked based on feedback from xen-devel. + +Its architecture is comparable to the common split device driver +architecture: xenfb and xenkbd modules serve as frontend in domU, and +the user space vncfb or sdlfb process serves as backend in dom0. + +Signed-off-by: Markus Armbruster +Signed-off-by: Anthony Liguori + +diff -r 2773c39df9a6 linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Wed Nov 29 12:16:19 2006 +0000 ++++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Thu Nov 30 15:13:53 2006 +0100 +@@ -1850,8 +1850,9 @@ void __init setup_arch(char **cmdline_p) #endif #endif } else { +- extern int console_use_vt; +- console_use_vt = 0; +#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE) + conswitchp = &dummy_con; -+#else - extern int console_use_vt; - console_use_vt = 0; +#endif } } -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/Kconfig ---- a/linux-2.6-xen-sparse/drivers/xen/Kconfig Tue Aug 15 19:53:55 2006 +0100 -+++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig Fri Aug 18 16:17:58 2006 -0400 +diff -r 2773c39df9a6 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Wed Nov 29 12:16:19 2006 +0000 ++++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Thu Nov 30 15:13:53 2006 +0100 +@@ -550,9 +550,9 @@ setup_arch (char **cmdline_p) + xen_start_info->nr_pages, xen_start_info->flags); + + if (!is_initial_xendomain()) { +- extern int console_use_vt; ++#if !defined(CONFIG_VT) || !defined(CONFIG_DUMMY_CONSOLE) + conswitchp = NULL; +- console_use_vt = 0; ++#endif + } + } + #endif +diff -r 2773c39df9a6 linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Wed Nov 29 12:16:19 2006 +0000 ++++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Thu Nov 30 15:13:53 2006 +0100 +@@ -970,9 +970,10 @@ void __init setup_arch(char **cmdline_p) + #endif + #endif + } else { +- extern int console_use_vt; +- console_use_vt = 0; +- } ++#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE) ++ conswitchp = &dummy_con; ++#endif ++ } + } + #else /* CONFIG_XEN */ + +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/Kconfig +--- a/linux-2.6-xen-sparse/drivers/xen/Kconfig Wed Nov 29 12:16:19 2006 +0000 ++++ b/linux-2.6-xen-sparse/drivers/xen/Kconfig Thu Nov 30 15:13:53 2006 +0100 @@ -172,6 +172,29 @@ config XEN_NETDEV_FRONTEND dedicated device-driver domain, or your master control domain (domain 0), then you almost certainly want to say Y here. @@ -36,7 +83,7 @@ + +config XEN_KEYBOARD + tristate "Keyboard-device frontend driver" -+ depends on XEN ++ depends on XEN && XEN_FRAMEBUFFER && INPUT + default y + help + The keyboard-device frontend driver allows the kernel to create a @@ -47,41 +94,285 @@ config XEN_SCRUB_PAGES bool "Scrub memory before freeing it to Xen" default y -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/Makefile ---- a/linux-2.6-xen-sparse/drivers/xen/Makefile Tue Aug 15 19:53:55 2006 +0100 -+++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Fri Aug 18 16:17:58 2006 -0400 +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/Makefile +--- a/linux-2.6-xen-sparse/drivers/xen/Makefile Wed Nov 29 12:16:19 2006 +0000 ++++ b/linux-2.6-xen-sparse/drivers/xen/Makefile Thu Nov 30 15:13:53 2006 +0100 @@ -15,3 +15,5 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += net obj-$(CONFIG_XEN_NETDEV_FRONTEND) += netfront/ obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += pcifront/ -+obj-$(CONFIG_XEN_FRAMEBUFFER) += xenfb/ -+obj-$(CONFIG_XEN_KEYBOARD) += xenkbd/ -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/mm/memory.c ---- a/linux-2.6-xen-sparse/mm/memory.c Tue Aug 15 19:53:55 2006 +0100 -+++ b/linux-2.6-xen-sparse/mm/memory.c Fri Aug 18 16:17:58 2006 -0400 -@@ -881,6 +881,7 @@ unsigned long zap_page_range(struct vm_a - tlb_finish_mmu(tlb, address, end); - return end; - } -+EXPORT_SYMBOL(zap_page_range); ++obj-$(CONFIG_XEN_FRAMEBUFFER) += fbfront/ ++obj-$(CONFIG_XEN_KEYBOARD) += fbfront/ +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/console/console.c +--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 12:16:19 2006 +0000 ++++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Thu Nov 30 15:13:53 2006 +0100 +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include /* - * Do a quick page-table lookup for a single page. -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/xenfb/Makefile +@@ -698,6 +699,15 @@ static int __init xencons_init(void) + printk("Xen virtual console successfully installed as %s%d\n", + DRV(xencons_driver)->name, xc_num); + ++ /* Check about framebuffer messing up the console */ ++ if (!is_initial_xendomain() && ++ !xenbus_exists(XBT_NIL, "device", "vfb")) { ++ /* FIXME: this is ugly */ ++ unregister_console(&kcons_info); ++ kcons_info.flags |= CON_CONSDEV; ++ register_console(&kcons_info); ++ } ++ + return 0; + } + +diff -r 2773c39df9a6 tools/Makefile +--- a/tools/Makefile Wed Nov 29 12:16:19 2006 +0000 ++++ b/tools/Makefile Wed Nov 29 13:56:23 2006 +0100 +@@ -19,4 +19,5 @@ SUBDIRS-y += libaio + SUBDIRS-y += libaio + SUBDIRS-y += blktap ++SUBDIRS-y += xenfb + + # These don't cross-compile +diff -r 2773c39df9a6 tools/python/xen/xend/XendDomainInfo.py +--- a/tools/python/xen/xend/XendDomainInfo.py Wed Nov 29 12:16:19 2006 +0000 ++++ b/tools/python/xen/xend/XendDomainInfo.py Wed Nov 29 13:56:25 2006 +0100 +@@ -458,7 +458,7 @@ class XendDomainInfo: + try: + vm.construct() + vm.storeVmDetails() +- vm.createDevices() ++ vm.restoreDomain() + vm.createChannels() + vm.storeDomDetails() + vm.endRestore() +@@ -1330,6 +1330,23 @@ class XendDomainInfo: + + ## public: + ++ ++ def restoreDomain(self): ++ log.debug('XendDomainInfo.restoreDomain: %s %s', ++ self.domid, ++ self.info['cpu_weight']) ++ ++ if not self.infoIsSet('image'): ++ raise VmError('Missing image in configuration') ++ ++ try: ++ self.image = image.create(self, ++ self.info['image'], ++ self.info['device']) ++ ++ self._createDevices() ++ except RuntimeError, exn: ++ raise VmError(str(exn)) + + def cleanupDomain(self): + """Cleanup domain resources; release devices. Idempotent. Nothrow +@@ -1796,7 +1796,7 @@ def addControllerClass(device_class, cls + controllerClasses[device_class] = cls + [...9416 lines suppressed...] +--- a/buildconfigs/linux-defconfig_xen_ia64 Mon Dec 04 09:20:12 2006 +0000 ++++ b/buildconfigs/linux-defconfig_xen_ia64 Mon Dec 04 09:21:10 2006 +0000 +@@ -1548,6 +1548,8 @@ CONFIG_XEN_PCIDEV_BACKEND_SLOT=y + # CONFIG_XEN_TPMDEV_BACKEND is not set + CONFIG_XEN_BLKDEV_FRONTEND=y + CONFIG_XEN_NETDEV_FRONTEND=y ++CONFIG_XEN_FRAMEBUFFER=y ++CONFIG_XEN_KEYBOARD=y + # CONFIG_XEN_SCRUB_PAGES is not set + CONFIG_XEN_DISABLE_SERIAL=y + CONFIG_XEN_SYSFS=y +diff -r 275a8f9a0710 -r d8befb109c39 buildconfigs/linux-defconfig_xen_x86_32 +--- a/buildconfigs/linux-defconfig_xen_x86_32 Mon Dec 04 09:20:12 2006 +0000 ++++ b/buildconfigs/linux-defconfig_xen_x86_32 Mon Dec 04 09:21:10 2006 +0000 +@@ -3034,6 +3034,8 @@ CONFIG_XEN_NETDEV_LOOPBACK=y + # CONFIG_XEN_TPMDEV_BACKEND is not set + CONFIG_XEN_BLKDEV_FRONTEND=y + CONFIG_XEN_NETDEV_FRONTEND=y ++CONFIG_XEN_FRAMEBUFFER=y ++CONFIG_XEN_KEYBOARD=y + CONFIG_XEN_SCRUB_PAGES=y + CONFIG_XEN_DISABLE_SERIAL=y + CONFIG_XEN_SYSFS=y +diff -r 275a8f9a0710 -r d8befb109c39 buildconfigs/linux-defconfig_xen_x86_64 +--- a/buildconfigs/linux-defconfig_xen_x86_64 Mon Dec 04 09:20:12 2006 +0000 ++++ b/buildconfigs/linux-defconfig_xen_x86_64 Mon Dec 04 09:21:10 2006 +0000 +@@ -2866,6 +2866,8 @@ CONFIG_XEN_TPMDEV_BACKEND=m + # CONFIG_XEN_TPMDEV_CLOSE_IF_VTPM_FAILS is not set + CONFIG_XEN_BLKDEV_FRONTEND=y + CONFIG_XEN_NETDEV_FRONTEND=y ++CONFIG_XEN_FRAMEBUFFER=y ++CONFIG_XEN_KEYBOARD=y + CONFIG_XEN_SCRUB_PAGES=y + CONFIG_XEN_DISABLE_SERIAL=y + CONFIG_XEN_SYSFS=y +Backport of upstream's changes to 3.0.3: +--- a/tools/python/xen/xend/server/vfbif.py 2006-12-05 16:03:11.000000000 +0100 ++++ b/tools/python/xen/xend/server/vfbif.py 2006-12-05 16:33:45.000000000 +0100 +@@ -1,6 +1,7 @@ + from xen.xend.server.DevController import DevController + from xen.xend.XendError import VmError ++from xen.xend import sxp + import xen.xend + import os + +@@ -19,45 +20,79 @@ class VfbifController(DevController): + + def __init__(self, vm): + DevController.__init__(self, vm) +- self.config = {} +- ++ + def getDeviceDetails(self, config): + """@see DevController.getDeviceDetails""" ++ type = sxp.child_value(config, 'type') ++ vncunused = sxp.child_value(config, 'vncunused') ++ vncdisplay = sxp.child_value(config, 'vncdisplay') ++ vnclisten = sxp.child_value(config, 'vnclisten') ++ display = sxp.child_value(config, 'display') ++ xauthority = sxp.child_value(config, 'xauthority') ++ + devid = 0 +- back = {} ++ ++ if type not in ('sdl', 'vnc'): ++ raise VmError('Unknown vfb type %s (%s)' % (type, repr(config))) ++ + front = {} ++ ++ back = { 'type' : type } ++ if vncunused: ++ back['vncunused'] = vncunused ++ if vncdisplay: ++ back['vncdisplay'] = vncdisplay ++ if vnclisten: ++ back['vnclisten'] = vnclisten ++ if display: ++ back['display'] = display ++ if xauthority: ++ back['xauthority'] = xauthority ++ + return (devid, back, front) + +- def getDeviceConfiguration(self, devid): +- r = DevController.getDeviceConfiguration(self, devid) +- for (k,v) in self.config.iteritems(): +- r[k] = v ++ def configuration(self, devid): ++ r = DevController.configuration(self, devid) ++ (type, vncunused, vncdisplay, vnclisten, display, xauthority) \ ++ = self.readBackend(devid, 'type', 'vncunused', 'vncdisplay', ++ 'vnclisten', 'display', 'xauthority') ++ if type: ++ r.append(['type', type]), ++ if vncunused: ++ r.append(['vncunused', vncunused]) ++ if vncdisplay: ++ r.append(['vncdisplay', vncdisplay]) ++ if vnclisten: ++ r.append(['vnclisten', vnclisten]) ++ if display: ++ r.append(['display', display]) ++ if xauthority: ++ r.append(['xauthority', xauthority]) + return r +- ++ + def createDevice(self, config): + DevController.createDevice(self, config) +- self.config = config + std_args = [ "--domid", "%d" % self.vm.getDomid(), + "--title", self.vm.getName() ] +- t = config.get("type", None) ++ t = sxp.child_value(config, "type") + if t == "vnc": + # Try to start the vnc backend + args = [xen.util.auxbin.pathTo("xen-vncfb")] +- if config.has_key("vncunused"): ++ if sxp.child_value(config, "vncunused") is not None: + args += ["--unused"] +- elif config.has_key("vncdisplay"): +- args += ["--vncport", "%d" % (5900 + config["vncdisplay"])] +- vnclisten = config.get("vnclisten", +- xen.xend.XendRoot.instance().get_vnclisten_address()) ++ elif sxp.child_value(config, "vncdisplay") is not None: ++ args += ["--vncport", "%d" % (5900 + sxp.child_value(config, "vncdisplay"))] ++ vnclisten = sxp.child_value(config, 'vnclisten', ++ xen.xend.XendRoot.instance().get_vnclisten_address()) + args += [ "--listen", vnclisten ] + spawn_detached(args[0], args + std_args, os.environ) + elif t == "sdl": + args = [xen.util.auxbin.pathTo("xen-sdlfb")] + env = dict(os.environ) +- if config.has_key("display"): +- env['DISPLAY'] = config["display"] +- if config.has_key("xauthority"): +- env['XAUTHORITY'] = config["xauthority"] ++ if sxp.child_value(config, "display") is not None: ++ env['DISPLAY'] = sxp.child_value(config, "display") ++ if sxp.child_value(config, "xauthority") is not None: ++ env['XAUTHORITY'] = sxp.child_value(config, "xauthority") + spawn_detached(args[0], args + std_args, env) + else: + raise VmError('Unknown vfb type %s (%s)' % (t, repr(config))) +# HG changeset patch +# User kfraser at localhost.localdomain +# Date 1166203851 0 +# Node ID 96b047d22ad5866d66508e64aac22b99b3a5dcd2 +# Parent 1b6354023e64af6d02909ac81dfe4b5f4e930dda +Fix pointer encoding in vncfb (middle and right button were swapped). + +Signed-off-by: Markus Armbruster + +diff -r 1b6354023e64 -r 96b047d22ad5 tools/xenfb/vncfb.c +--- a/tools/xenfb/vncfb.c Fri Dec 15 17:29:25 2006 +0000 ++++ b/tools/xenfb/vncfb.c Fri Dec 15 17:30:51 2006 +0000 +@@ -148,6 +148,10 @@ static int xk2linux[0x10000] = { + [XK_plus] = KEY_EQUAL, + }; -+def configure_graphics(config_image, vals): -+ """Create the config for graphic consoles. -+ """ -+ args = [ 'vnc', 'vncdisplay', 'vncconsole', 'vncunused', -+ 'sdl', 'display', 'xauthority', 'vnclisten' ] -+ for a in args: -+ if (vals.__dict__[a]): -+ config_image.append([a, vals.__dict__[a]]) ++static int btnmap[] = { ++ BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, BTN_FORWARD, BTN_BACK ++}; + - def configure_hvm(config_image, vals): - """Create the config for HVM devices. - """ - args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb', - 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw', -- 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten', -- 'sdl', 'display', 'xauthority', - 'acpi', 'apic', 'usb', 'usbdevice' ] - for a in args: - if (vals.__dict__[a]): + static void on_kbd_event(rfbBool down, rfbKeySym keycode, rfbClientPtr cl) + { + /* +@@ -184,8 +188,11 @@ static void on_ptr_event(int buttonMask, + down = buttonMask & (1 << i); + if (down == last_down) + continue; +- /* FIXME this assumes buttons are numbered the same; verify they are */ +- if (xenfb_send_key(xenfb, down != 0, BTN_MOUSE + i) < 0) ++ if (i >= sizeof(btnmap) / sizeof(*btnmap)) ++ break; ++ if (btnmap[i] == 0) ++ break; ++ if (xenfb_send_key(xenfb, down != 0, btnmap[i]) < 0) + fprintf(stderr, "Button %d %s lost (%s)\n", + i, down ? "down" : "up", strerror(errno)); + } Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- xen.spec 11 Jan 2007 18:28:14 -0000 1.120 +++ xen.spec 30 Jan 2007 19:13:26 -0000 1.121 @@ -52,15 +52,15 @@ Patch102: xen-3.0.2-config-allow-unix-server.patch Patch103: xen-3.0.2-config-disable-reloc.patch -# patches going upstream (pv framebuffer) -Patch200: xen-pvfb.patch -Patch201: xen-pvfb-nocursor.patch -Patch202: xen-pvfb-sigpipe.patch +# pv framebuffer patches +Patch200: xen-console.patch +Patch201: xen-pvfb.patch +Patch202: xen-pvfb-compat.patch +Patch203: xen-pvfb-fixes.patch # patches to make VNC only listen on localhost by default / use passwords -Patch221: xen-vnclisten-pvfb.patch +Patch220: xen-3.0.4-vncpassword-pvfb-backport.patch Patch222: xen-vncpassword-5.patch -Patch223: xen-vncpassword-pvfb-2.patch Patch251: pygrub-manykernels.patch Patch252: pygrub-cosmetics.patch @@ -173,11 +173,11 @@ %patch200 -p1 %patch201 -p1 %patch202 -p1 +%patch203 -p1 # vnclisten/password patches -%patch221 -p1 +%patch220 -p1 %patch222 -p1 -%patch223 -p1 # upstream patches %patch251 -p1 @@ -200,11 +200,11 @@ popd sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/xenfb/Makefile -CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs +CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs %install rm -rf %{buildroot} -make XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs +make XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/migrate @@ -286,6 +286,12 @@ %dir %attr(0700,root,root) /var/log/xen %changelog +* Tue Jan 30 2007 Markus Armbruster +- Update Xen paravirt framebuffer patch to upstream xen-unstable + changeset 13066. This changes the protocol to the one accepted + upstream. +- Add compatibility with guests running our initial protocol. + * Tue Jan 9 2007 Daniel P. Berrange - 3.0.3-3.fc5 - fix core dumps of 32 bit guests >2GB RAM (bz 215796) - write the /local/domain/vm node early in the startup process (bz 215269) --- xen-pvfb-nocursor.patch DELETED --- --- xen-pvfb-sigpipe.patch DELETED --- --- xen-vnclisten-pvfb.patch DELETED --- --- xen-vncpassword-pvfb-2.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 19:14:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 14:14:20 -0500 Subject: rpms/kernel/FC-5/configs config-xen-generic,1.20,1.21 Message-ID: <200701301914.l0UJEKE5013314@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel/FC-5/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv13155/configs Modified Files: config-xen-generic Log Message: - Update Xen paravirt framebuffer patch to upstream xen-unstable changeset 13066, less changeset 12680, because that breaks with console=tty console=xvc. Also change default domU console back to /dev/xcv0. This changes the protocol to the one accepted upstream. - Add compatibility with guests running our initial protocol. - Update Xen console major/minor to lanana.org-assigned numbers. Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-generic,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- config-xen-generic 10 Nov 2006 12:55:49 -0000 1.20 +++ config-xen-generic 30 Jan 2007 19:14:18 -0000 1.21 @@ -26,8 +26,8 @@ # CONFIG_XEN_TPMDEV_BACKEND is not set CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m -# CONFIG_XEN_FRAMEBUFFER is not set -# CONFIG_XEN_KEYBOARD is not set +CONFIG_XEN_FRAMEBUFFER=y +CONFIG_XEN_KEYBOARD=y CONFIG_XEN_SCRUB_PAGES=y # CONFIG_XEN_DISABLE_SERIAL is not set CONFIG_XEN_SYSFS=y From fedora-cvs-commits at redhat.com Tue Jan 30 19:14:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 14:14:20 -0500 Subject: rpms/kernel/FC-5 linux-2.6-xen-console.patch, NONE, 1.1 linux-2.6-xen-pvfb-fixes.patch, NONE, 1.1 kernel-2.6.spec, 1.2262, 1.2263 linux-2.6-xen-pvfb.patch, 1.2, 1.3 Message-ID: <200701301914.l0UJEKVf013296@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv13155 Modified Files: kernel-2.6.spec linux-2.6-xen-pvfb.patch Added Files: linux-2.6-xen-console.patch linux-2.6-xen-pvfb-fixes.patch Log Message: - Update Xen paravirt framebuffer patch to upstream xen-unstable changeset 13066, less changeset 12680, because that breaks with console=tty console=xvc. Also change default domU console back to /dev/xcv0. This changes the protocol to the one accepted upstream. - Add compatibility with guests running our initial protocol. - Update Xen console major/minor to lanana.org-assigned numbers. linux-2.6-xen-console.patch: console.c | 70 ++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 26 deletions(-) --- NEW FILE linux-2.6-xen-console.patch --- # HG changeset patch # User kfraser at localhost.localdomain # Date 1164800279 0 # Node ID 8832712b0b3740daf9c2d5993fcc1d640ff1564e # Parent 15e80a946a6a7b8f865416e0c9c707d3ce413e3d [LINUX] console: Add option to use /dev/xvc0, major=204, minor=191. The major/minor has now been allocated to us by lanana.org. This is based on previous patches from: Jeremy Katz Amos Waterland Signed-off-by: Keir Fraser diff -r 15e80a946a6a -r 8832712b0b37 linux-2.6-xen-sparse/drivers/xen/console/console.c --- linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 11:07:51 2006 +0000 +++ linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 11:37:59 2006 +0000 @@ -64,13 +64,20 @@ * 'xencons=off' [XC_OFF]: Console is disabled. * 'xencons=tty' [XC_TTY]: Console attached to '/dev/tty[0-9]+'. * 'xencons=ttyS' [XC_SERIAL]: Console attached to '/dev/ttyS[0-9]+'. + * 'xencons=xvc' [XC_SERIAL]: Console attached to '/dev/xvc0'. * [XC_DEFAULT]: DOM0 -> XC_SERIAL ; all others -> XC_TTY. * * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses * warnings from standard distro startup scripts. */ -static enum { XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL } xc_mode = XC_DEFAULT; +static enum { + XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL, XC_XVC +} xc_mode = XC_DEFAULT; static int xc_num = -1; + +/* /dev/xvc0 device number allocated by lanana.org. */ +#define XEN_XVC_MAJOR 204 +#define XEN_XVC_MINOR 191 #ifdef CONFIG_MAGIC_SYSRQ static unsigned long sysrq_requested; @@ -82,27 +89,23 @@ static int __init xencons_setup(char *st char *q; int n; - if (!strncmp(str, "ttyS", 4)) + if (!strncmp(str, "ttyS", 4)) { xc_mode = XC_SERIAL; - else if (!strncmp(str, "tty", 3)) + str += 4; + } else if (!strncmp(str, "tty", 3)) { xc_mode = XC_TTY; - else if (!strncmp(str, "off", 3)) + str += 3; + } else if (!strncmp(str, "xvc", 3)) { + xc_mode = XC_XVC; + str += 3; + } else if (!strncmp(str, "off", 3)) { xc_mode = XC_OFF; - - switch (xc_mode) { - case XC_SERIAL: - n = simple_strtol(str+4, &q, 10); - if (q > (str + 4)) - xc_num = n; - break; - case XC_TTY: - n = simple_strtol(str+3, &q, 10); - if (q > (str + 3)) - xc_num = n; - break; - default: - break; - } + str += 3; + } + + n = simple_strtol(str, &q, 10); + if (q != str) + xc_num = n; return 1; } @@ -201,6 +204,12 @@ static int __init xen_console_init(void) } switch (xc_mode) { + case XC_XVC: + strcpy(kcons_info.name, "xvc"); + if (xc_num == -1) + xc_num = 0; + break; + case XC_SERIAL: strcpy(kcons_info.name, "ttyS"); if (xc_num == -1) @@ -305,7 +314,7 @@ void dom0_init_screen_info(const struct /******************** User-space console driver (/dev/console) ************/ #define DRV(_d) (_d) -#define DUMMY_TTY(_tty) ((xc_mode != XC_SERIAL) && \ +#define DUMMY_TTY(_tty) ((xc_mode == XC_TTY) && \ ((_tty)->index != (xc_num - 1))) static struct termios *xencons_termios[MAX_NR_CONSOLES]; @@ -628,8 +637,8 @@ static int __init xencons_init(void) return rc; } - xencons_driver = alloc_tty_driver((xc_mode == XC_SERIAL) ? - 1 : MAX_NR_CONSOLES); + xencons_driver = alloc_tty_driver((xc_mode == XC_TTY) ? + MAX_NR_CONSOLES : 1); if (xencons_driver == NULL) return -ENOMEM; @@ -644,14 +653,23 @@ static int __init xencons_init(void) DRV(xencons_driver)->termios = xencons_termios; DRV(xencons_driver)->termios_locked = xencons_termios_locked; - if (xc_mode == XC_SERIAL) { + switch (xc_mode) { + case XC_XVC: + DRV(xencons_driver)->name = "xvc"; + DRV(xencons_driver)->major = XEN_XVC_MAJOR; + DRV(xencons_driver)->minor_start = XEN_XVC_MINOR; + DRV(xencons_driver)->name_base = xc_num; + break; + case XC_SERIAL: DRV(xencons_driver)->name = "ttyS"; DRV(xencons_driver)->minor_start = 64 + xc_num; - DRV(xencons_driver)->name_base = 0 + xc_num; - } else { + DRV(xencons_driver)->name_base = xc_num; + break; + default: DRV(xencons_driver)->name = "tty"; DRV(xencons_driver)->minor_start = 1; DRV(xencons_driver)->name_base = 1; + break; } tty_set_operations(xencons_driver, &xencons_ops); # HG changeset patch # User kfraser at localhost.localdomain # Date 1164801889 0 # Node ID f32abd365ae006e4dfda7ec206a9955b3cd57da2 # Parent 4876e7ebca6eff15ea297d762400dd17d5d693b1 [LINUX] console: Fix comment. Signed-off-by: Keir Fraser diff -r 4876e7ebca6e -r f32abd365ae0 linux-2.6-xen-sparse/drivers/xen/console/console.c --- linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 11:40:10 2006 +0000 +++ linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 12:04:49 2006 +0000 @@ -64,7 +64,7 @@ * 'xencons=off' [XC_OFF]: Console is disabled. * 'xencons=tty' [XC_TTY]: Console attached to '/dev/tty[0-9]+'. * 'xencons=ttyS' [XC_SERIAL]: Console attached to '/dev/ttyS[0-9]+'. - * 'xencons=xvc' [XC_SERIAL]: Console attached to '/dev/xvc0'. + * 'xencons=xvc' [XC_XVC]: Console attached to '/dev/xvc0'. * [XC_DEFAULT]: DOM0 -> XC_SERIAL ; all others -> XC_TTY. * * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses linux-2.6-xen-pvfb-fixes.patch: console/console.c | 2 +- fbfront/xenfb.c | 34 +++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 16 deletions(-) --- NEW FILE linux-2.6-xen-pvfb-fixes.patch --- diff -r 5c452351be21 -r d49bc30b6b27 linux-2.6-xen-sparse/drivers/xen/console/console.c --- linux-2.6-xen-sparse/drivers/xen/console/console.c Fri Aug 18 16:20:59 2006 -0400 +++ linux-2.6-xen-sparse/drivers/xen/console/console.c Fri Aug 18 16:26:39 2006 -0400 @@ -194,7 +209,7 @@ static int __init xen_console_init(void) if (!xen_start_info->console.domU.evtchn) goto out; if (xc_mode == XC_DEFAULT) - xc_mode = XC_TTY; + xc_mode = XC_XVC; kcons_info.write = kcons_write; } diff -r 37141c3a3d39 linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c --- linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c Mon Dec 11 15:06:53 2006 +0000 +++ linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c Thu Dec 14 16:45:39 2006 +0100 @@ -49,8 +49,9 @@ struct xenfb_info struct timer_list refresh; int dirty; int x1, y1, x2, y2; /* dirty rectangle, - protected by mm_lock */ - spinlock_t mm_lock; + protected by dirty_lock */ + spinlock_t dirty_lock; + struct mutex mm_lock; int nr_pages; struct page **pages; struct list_head mappings; /* protected by mm_lock */ @@ -114,14 +115,16 @@ static void xenfb_update_screen(struct x if (xenfb_queue_full(info)) return; - spin_lock_irqsave(&info->mm_lock, flags); + mutex_lock(&info->mm_lock); + spin_lock_irqsave(&info->dirty_lock, flags); y1 = info->y1; y2 = info->y2; x1 = info->x1; x2 = info->x2; info->x1 = info->y1 = INT_MAX; info->x2 = info->y2 = 0; + spin_unlock_irqrestore(&info->dirty_lock, flags); list_for_each_entry(map, &info->mappings, link) { if (!map->faults) @@ -131,7 +134,7 @@ static void xenfb_update_screen(struct x map->faults = 0; } - spin_unlock_irqrestore(&info->mm_lock, flags); + mutex_unlock(&info->mm_lock); xenfb_do_update(info, x1, y1, x2 - x1, y2 - y1); } @@ -216,9 +219,9 @@ static void xenfb_refresh(struct xenfb_i { unsigned long flags; - spin_lock_irqsave(&info->mm_lock, flags); + spin_lock_irqsave(&info->dirty_lock, flags); __xenfb_refresh(info, x1, y1, w, h); - spin_unlock_irqrestore(&info->mm_lock, flags); + spin_unlock_irqrestore(&info->dirty_lock, flags); } static void xenfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) @@ -255,14 +258,13 @@ static void xenfb_vm_close(struct vm_are { struct xenfb_mapping *map = vma->vm_private_data; struct xenfb_info *info = map->info; - unsigned long flags; - spin_lock_irqsave(&info->mm_lock, flags); + mutex_lock(&info->mm_lock); if (atomic_dec_and_test(&map->map_refs)) { list_del(&map->link); kfree(map); } - spin_unlock_irqrestore(&info->mm_lock, flags); + mutex_unlock(&info->mm_lock); } static struct page *xenfb_vm_nopage(struct vm_area_struct *vma, @@ -278,7 +280,8 @@ static struct page *xenfb_vm_nopage(stru if (pgnr >= info->nr_pages) return NOPAGE_SIGBUS; - spin_lock_irqsave(&info->mm_lock, flags); + mutex_lock(&info->mm_lock); + spin_lock_irqsave(&info->dirty_lock, flags); page = info->pages[pgnr]; get_page(page); map->faults++; @@ -288,7 +291,8 @@ static struct page *xenfb_vm_nopage(stru if (y2 > info->fb_info->var.yres) y2 = info->fb_info->var.yres; __xenfb_refresh(info, 0, y1, info->fb_info->var.xres, y2 - y1); - spin_unlock_irqrestore(&info->mm_lock, flags); + spin_unlock_irqrestore(&info->dirty_lock, flags); + mutex_unlock(&info->mm_lock); if (type) *type = VM_FAULT_MINOR; @@ -305,7 +309,6 @@ static struct vm_operations_struct xenfb static int xenfb_mmap(struct fb_info *fb_info, struct vm_area_struct *vma) { struct xenfb_info *info = fb_info->par; - unsigned long flags; struct xenfb_mapping *map; int map_pages; @@ -329,9 +332,9 @@ static int xenfb_mmap(struct fb_info *fb map->info = info; atomic_set(&map->map_refs, 1); - spin_lock_irqsave(&info->mm_lock, flags); + mutex_lock(&info->mm_lock); list_add(&map->link, &info->mappings); - spin_unlock_irqrestore(&info->mm_lock, flags); + mutex_unlock(&info->mm_lock); vma->vm_ops = &xenfb_vm_ops; vma->vm_flags |= (VM_DONTEXPAND | VM_RESERVED); @@ -388,7 +391,8 @@ static int __devinit xenfb_probe(struct info->xbdev = dev; info->irq = -1; info->x1 = info->y1 = INT_MAX; - spin_lock_init(&info->mm_lock); + spin_lock_init(&info->dirty_lock); + mutex_init(&info->mm_lock); init_waitqueue_head(&info->wq); init_timer(&info->refresh); info->refresh.function = xenfb_timer; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2262 retrieving revision 1.2263 diff -u -r1.2262 -r1.2263 --- kernel-2.6.spec 26 Jan 2007 12:17:26 -0000 1.2262 +++ kernel-2.6.spec 30 Jan 2007 19:14:18 -0000 1.2263 @@ -297,7 +297,9 @@ Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch Patch959: linux-2.6-xen-x86-unwinder.patch -Patch990: linux-2.6-xen-pvfb.patch +Patch990: linux-2.6-xen-console.patch +Patch991: linux-2.6-xen-pvfb.patch +Patch992: linux-2.6-xen-pvfb-fixes.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -814,6 +816,8 @@ # xen framebuffer patches %patch990 -p1 +%patch991 -p1 +%patch992 -p1 %endif @@ -1643,6 +1647,14 @@ %endif %changelog +* Tue Jan 30 2007 Markus Armbruster +- Update Xen paravirt framebuffer patch to upstream xen-unstable + changeset 13066, less changeset 12680, because that breaks with + console=tty console=xvc. Also change default domU console back to + /dev/xcv0. This changes the protocol to the one accepted upstream. +- Add compatibility with guests running our initial protocol. +- Update Xen console major/minor to lanana.org-assigned numbers. + * Wed Dec 20 2006 Dave Jones - Update to 2.6.18.6 final (no changes since rc2) - Reenable squashfs (#220293) linux-2.6-xen-pvfb.patch: arch/i386/kernel/setup-xen.c | 5 arch/ia64/kernel/setup.c | 4 arch/x86_64/kernel/setup-xen.c | 7 drivers/char/tty_io.c | 6 drivers/xen/Kconfig | 23 + drivers/xen/Makefile | 2 drivers/xen/console/console.c | 10 drivers/xen/fbfront/Makefile | 2 drivers/xen/fbfront/xenfb.c | 682 +++++++++++++++++++++++++++++++++++++++ drivers/xen/fbfront/xenkbd.c | 300 +++++++++++++++++ include/xen/interface/io/fbif.h | 116 ++++++ include/xen/interface/io/kbdif.h | 108 ++++++ 12 files changed, 1253 insertions(+), 12 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-xen-pvfb.patch Index: linux-2.6-xen-pvfb.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-pvfb.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-xen-pvfb.patch 14 Oct 2006 20:19:50 -0000 1.2 +++ linux-2.6-xen-pvfb.patch 30 Jan 2007 19:14:18 -0000 1.3 @@ -1,22 +1,69 @@ -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c ---- linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Tue Aug 15 19:53:55 2006 +0100 -+++ linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Fri Aug 18 16:17:58 2006 -0400 -@@ -1871,8 +1871,12 @@ void __init setup_arch(char **cmdline_p) +Derived from: +# HG changeset patch +# User Steven Smith +# Date 1164966512 0 +# Node ID 260426e3924f922719b392d1f2a7e9776dc7a15f +# Parent 697b0203e68fd5b54944ba947c3e3b8d78fae88d +This is Anthony Liguori's virtual framebuffer forward ported and +extensively hacked based on feedback from xen-devel. + +Its architecture is comparable to the common split device driver +architecture: xenfb and xenkbd modules serve as frontend in domU, and +the user space vncfb or sdlfb process serves as backend in dom0. + +Signed-off-by: Markus Armbruster +Signed-off-by: Anthony Liguori + +diff -r 2773c39df9a6 linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +--- linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Wed Nov 29 12:16:19 2006 +0000 ++++ linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Thu Nov 30 15:13:53 2006 +0100 +@@ -1850,8 +1850,9 @@ void __init setup_arch(char **cmdline_p) #endif #endif } else { +- extern int console_use_vt; +- console_use_vt = 0; +#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE) + conswitchp = &dummy_con; -+#else - extern int console_use_vt; - console_use_vt = 0; +#endif } } -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/Kconfig ---- linux-2.6-xen-sparse/drivers/xen/Kconfig Tue Aug 15 19:53:55 2006 +0100 -+++ linux-2.6-xen-sparse/drivers/xen/Kconfig Fri Aug 18 16:17:58 2006 -0400 +diff -r 2773c39df9a6 linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +--- linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Wed Nov 29 12:16:19 2006 +0000 ++++ linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Thu Nov 30 15:13:53 2006 +0100 +@@ -550,9 +550,9 @@ setup_arch (char **cmdline_p) + xen_start_info->nr_pages, xen_start_info->flags); + + if (!is_initial_xendomain()) { +- extern int console_use_vt; ++#if !defined(CONFIG_VT) || !defined(CONFIG_DUMMY_CONSOLE) + conswitchp = NULL; +- console_use_vt = 0; ++#endif + } + } + #endif +diff -r 2773c39df9a6 linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +--- linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Wed Nov 29 12:16:19 2006 +0000 ++++ linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Thu Nov 30 15:13:53 2006 +0100 +@@ -970,9 +970,10 @@ void __init setup_arch(char **cmdline_p) + #endif + #endif + } else { +- extern int console_use_vt; +- console_use_vt = 0; +- } ++#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE) ++ conswitchp = &dummy_con; ++#endif ++ } + } + #else /* CONFIG_XEN */ + +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/Kconfig +--- linux-2.6-xen-sparse/drivers/xen/Kconfig Wed Nov 29 12:16:19 2006 +0000 ++++ linux-2.6-xen-sparse/drivers/xen/Kconfig Thu Nov 30 15:13:53 2006 +0100 @@ -172,6 +172,29 @@ config XEN_NETDEV_FRONTEND dedicated device-driver domain, or your master control domain (domain 0), then you almost certainly want to say Y here. @@ -36,7 +83,7 @@ + +config XEN_KEYBOARD + tristate "Keyboard-device frontend driver" -+ depends on XEN ++ depends on XEN && XEN_FRAMEBUFFER && INPUT + default y + help + The keyboard-device frontend driver allows the kernel to create a @@ -47,30 +94,57 @@ config XEN_SCRUB_PAGES bool "Scrub memory before freeing it to Xen" default y -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/Makefile ---- linux-2.6-xen-sparse/drivers/xen/Makefile Tue Aug 15 19:53:55 2006 +0100 -+++ linux-2.6-xen-sparse/drivers/xen/Makefile Fri Aug 18 16:17:58 2006 -0400 +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/Makefile +--- linux-2.6-xen-sparse/drivers/xen/Makefile Wed Nov 29 12:16:19 2006 +0000 ++++ linux-2.6-xen-sparse/drivers/xen/Makefile Thu Nov 30 15:13:53 2006 +0100 @@ -15,3 +15,5 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += net obj-$(CONFIG_XEN_NETDEV_FRONTEND) += netfront/ obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback/ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += pcifront/ -+obj-$(CONFIG_XEN_FRAMEBUFFER) += xenfb/ -+obj-$(CONFIG_XEN_KEYBOARD) += xenkbd/ -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/xenfb/Makefile ++obj-$(CONFIG_XEN_FRAMEBUFFER) += fbfront/ ++obj-$(CONFIG_XEN_KEYBOARD) += fbfront/ +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/console/console.c +--- linux-2.6-xen-sparse/drivers/xen/console/console.c Wed Nov 29 12:16:19 2006 +0000 ++++ linux-2.6-xen-sparse/drivers/xen/console/console.c Thu Nov 30 15:13:53 2006 +0100 +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include + + /* +@@ -698,6 +699,15 @@ static int __init xencons_init(void) + printk("Xen virtual console successfully installed as %s%d\n", + DRV(xencons_driver)->name, xc_num); + ++ /* Check about framebuffer messing up the console */ ++ if (!is_initial_xendomain() && ++ !xenbus_exists(XBT_NIL, "device", "vfb")) { ++ /* FIXME: this is ugly */ ++ unregister_console(&kcons_info); ++ kcons_info.flags |= CON_CONSDEV; ++ register_console(&kcons_info); ++ } ++ + return 0; + } + +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/fbfront/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ linux-2.6-xen-sparse/drivers/xen/xenfb/Makefile Fri Aug 18 16:17:58 2006 -0400 -@@ -0,0 +1,1 @@ ++++ linux-2.6-xen-sparse/drivers/xen/fbfront/Makefile Thu Nov 30 15:13:53 2006 +0100 +@@ -0,0 +1,2 @@ +obj-$(CONFIG_XEN_FRAMEBUFFER) := xenfb.o -diff -r ec03b24a2d83 -r 6ca424e1867e linux-2.6-xen-sparse/drivers/xen/xenfb/xenfb.c ++obj-$(CONFIG_XEN_KEYBOARD) += xenkbd.o +diff -r 2773c39df9a6 linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ linux-2.6-xen-sparse/drivers/xen/xenfb/xenfb.c Fri Aug 18 16:17:58 2006 -0400 -@@ -0,0 +1,568 @@ ++++ linux-2.6-xen-sparse/drivers/xen/fbfront/xenfb.c Thu Nov 30 15:13:53 2006 +0100 +@@ -0,0 +1,682 @@ +/* + * linux/drivers/video/xenfb.c -- Xen para-virtual frame buffer device + * -+ * Copyright (C) 2005-2006 -+ * -+ * Anthony Liguori ++ * Copyright (C) 2005-2006 Anthony Liguori ++ * Copyright (C) 2006 Red Hat, Inc., Markus Armbruster + * + * Based on linux/drivers/video/q40fb.c + * @@ -79,6 +153,13 @@ + * more details. + */ + ++/* ++ * TODO: ++ * ++ * Switch to grant tables when they become capable of dealing with the ++ * frame buffer. ++ */ ++ +#include +#include +#include @@ -87,16 +168,13 @@ +#include +#include +#include ++#include +#include -+#include +#include + -+static int xenfb_fps = 20; -+static unsigned long xenfb_mem_len = 2 * 1024 * 1024; -+ +struct xenfb_mapping +{ -+ struct list_head next; ++ struct list_head link; + struct vm_area_struct *vma; [...2105 lines suppressed...] - return ret; -@@ -162,50 +155,21 @@ int __init xenkbd_init(void) - xenbus_transaction_end(xbt, 1); - error_unreg: - input_unregister_device(input_dev); -- unbind_from_irqhandler(xenkbd_irq, dev); -- xenkbd_irq = 0; -+ unbind_from_irqhandler(dev->irq, dev); - error_freep: - free_page((unsigned long)dev->info); - error: - kfree(dev); -- xenkbd_dev = NULL; - return ret; - } - - static void __exit xenkbd_cleanup(void) - { - input_unregister_device(xenkbd_dev->dev); -- unbind_from_irqhandler(xenkbd_irq, xenkbd_dev); -- xenkbd_irq = 0; -+ unbind_from_irqhandler(xenkbd_dev->irq, xenkbd_dev); - free_page((unsigned long)xenkbd_dev->info); - kfree(xenkbd_dev); - xenkbd_dev = NULL; --} -- --void xenkbd_resume(void) --{ --#if 0 /* FIXME */ -- int ret; -- -- if (xenkbd_dev && xen_start_info->kbd_evtchn) { -- if (xenkbd_irq) -- unbind_from_irqhandler(xenkbd_irq, NULL); -- -- ret = bind_evtchn_to_irqhandler(xen_start_info->kbd_evtchn, -- input_handler, -- 0, -- "xenkbd", -- xenkbd_dev); -- -- if (ret <= 0) -- return; -- -- xenkbd_irq = ret; -- xenkbd_dev->info = mfn_to_virt(xen_start_info->kbd_mfn); -- } --#else -- printk(KERN_DEBUG "xenkbd_resume not implemented\n"); --#endif - } - - module_init(xenkbd_init); -diff -r 158f57cd19f6 -r 74930c9686ba linux-2.6-xen-sparse/include/linux/xenfb.h ---- linux-2.6-xen-sparse/include/linux/xenfb.h Sat Sep 02 11:25:27 2006 -0400 -+++ linux-2.6-xen-sparse/include/linux/xenfb.h Sat Sep 02 12:12:25 2006 -0400 -@@ -17,10 +17,12 @@ - - /* out events */ - -+#define XENFB_OUT_EVENT_SIZE 40 -+ - #define XENFB_TYPE_MOTION 1 - #define XENFB_TYPE_UPDATE 2 - --struct xenfb_motion -+struct xenfb_motion /* currently unused */ - { - __u8 type; /* XENFB_TYPE_MOTION */ - __u16 x; /* The new x coordinate */ -@@ -41,10 +43,12 @@ union xenfb_out_event - __u8 type; - struct xenfb_motion motion; - struct xenfb_update update; -- char _[40]; -+ char _[XENFB_OUT_EVENT_SIZE]; - }; - - /* in events */ -+ -+#define XENFB_IN_EVENT_SIZE 40 - - #define XENFB_TYPE_SET_EVENTS 1 - -@@ -63,33 +67,40 @@ union xenfb_in_event - { - __u8 type; - struct xenfb_set_events set_events; -- char _[40]; -+ char _[XENFB_OUT_EVENT_SIZE]; - }; - - /* shared page */ - --#define XENFB_IN_RING_SIZE (1024 / 40) --#define XENFB_OUT_RING_SIZE (2048 / 40) -+#define XENFB_IN_RING_SIZE 1024 -+#define XENFB_IN_RING_LEN (XENFB_IN_RING_SIZE / XENFB_IN_EVENT_SIZE) -+#define XENFB_IN_RING_OFFS 1024 -+#define XENFB_IN_RING(page) \ -+ ((union xenfb_in_event *)((char *)(page) + XENFB_IN_RING_OFFS)) -+#define XENFB_IN_RING_REF(page, idx) \ -+ (XENFB_IN_RING((page))[(idx) % XENFB_IN_RING_LEN]) - --#define XENFB_RING_SIZE(ring) (sizeof((ring)) / sizeof(*(ring))) --#define XENFB_RING_REF(ring, idx) (ring)[(idx) % XENFB_RING_SIZE((ring))] -+#define XENFB_OUT_RING_SIZE 2048 -+#define XENFB_OUT_RING_LEN (XENFB_OUT_RING_SIZE / XENFB_OUT_EVENT_SIZE) -+#define XENFB_OUT_RING_OFFS (XENFB_IN_RING_OFFS + XENFB_IN_RING_SIZE) -+#define XENFB_OUT_RING(page) \ -+ ((union xenfb_out_event *)((char *)(page) + XENFB_OUT_RING_OFFS)) -+#define XENFB_OUT_RING_REF(page, idx) \ -+ (XENFB_OUT_RING((page))[(idx) % XENFB_OUT_RING_LEN]) - - struct xenfb_page - { -- __u8 initialized; - __u16 width; /* the width of the framebuffer (in pixels) */ - __u16 height; /* the height of the framebuffer (in pixels) */ - __u32 line_length; /* the length of a row of pixels (in bytes) */ - __u32 mem_length; /* the length of the framebuffer (in bytes) */ - __u8 depth; /* the depth of a pixel (in bits) */ - -- unsigned long pd[2]; -+ unsigned long pd[2]; /* FIXME rename to pgdir? */ -+ /* FIXME pd[1] unused at this time, shrink? */ - - __u32 in_cons, in_prod; - __u32 out_cons, out_prod; -- -- union xenfb_in_event in[XENFB_IN_RING_SIZE]; -- union xenfb_out_event out[XENFB_OUT_RING_SIZE]; - }; - - void xenfb_resume(void); -diff -r 158f57cd19f6 -r 74930c9686ba linux-2.6-xen-sparse/include/linux/xenkbd.h ---- linux-2.6-xen-sparse/include/linux/xenkbd.h Sat Sep 02 11:25:27 2006 -0400 -+++ linux-2.6-xen-sparse/include/linux/xenkbd.h Sat Sep 02 12:12:25 2006 -0400 -@@ -16,6 +16,8 @@ - #include - - /* in events */ -+ -+#define XENKBD_IN_EVENT_SIZE 40 - - #define XENKBD_TYPE_MOTION 1 /* mouse movement event */ - #define XENKBD_TYPE_BUTTON 2 /* mouse button event */ -@@ -48,33 +50,41 @@ union xenkbd_in_event - struct xenkbd_motion motion; - struct xenkbd_button button; - struct xenkbd_key key; -- char _[40]; -+ char _[XENKBD_IN_EVENT_SIZE]; - }; - - /* out events */ - -+#define XENKBD_OUT_EVENT_SIZE 40 -+ - union xenkbd_out_event - { - __u8 type; -- char _[40]; -+ char _[XENKBD_OUT_EVENT_SIZE]; - }; - - /* shared page */ - --#define XENKBD_IN_RING_SIZE (2048 / 40) --#define XENKBD_OUT_RING_SIZE (1024 / 40) -+#define XENKBD_IN_RING_SIZE 2048 -+#define XENKBD_IN_RING_LEN (XENKBD_IN_RING_SIZE / XENKBD_IN_EVENT_SIZE) -+#define XENKBD_IN_RING_OFFS 1024 -+#define XENKBD_IN_RING(page) \ -+ ((union xenkbd_in_event *)((char *)(page) + XENKBD_IN_RING_OFFS)) -+#define XENKBD_IN_RING_REF(page, idx) \ -+ (XENKBD_IN_RING((page))[(idx) % XENKBD_IN_RING_LEN]) - --#define XENKBD_RING_SIZE(ring) (sizeof((ring)) / sizeof(*(ring))) --#define XENKBD_RING_REF(ring, idx) (ring)[(idx) % XENKBD_RING_SIZE((ring))] -+#define XENKBD_OUT_RING_SIZE 1024 -+#define XENKBD_OUT_RING_LEN (XENKBD_OUT_RING_SIZE / XENKBD_OUT_EVENT_SIZE) -+#define XENKBD_OUT_RING_OFFS (XENKBD_IN_RING_OFFS + XENKBD_IN_RING_SIZE) -+#define XENKBD_OUT_RING(page) \ -+ ((union xenkbd_out_event *)((char *)(page) + XENKBD_OUT_RING_OFFS)) -+#define XENKBD_OUT_RING_REF(page, idx) \ -+ (XENKBD_OUT_RING((page))[(idx) % XENKBD_OUT_RING_LEN]) - - struct xenkbd_info - { -- __u8 initialized; - __u32 in_cons, in_prod; - __u32 out_cons, out_prod; -- -- union xenkbd_in_event in[XENKBD_IN_RING_SIZE]; -- union xenkbd_out_event out[XENKBD_OUT_RING_SIZE]; - }; - - void xenkbd_resume(void); From fedora-cvs-commits at redhat.com Tue Jan 30 19:19:45 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 14:19:45 -0500 Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.16,1.17 Message-ID: <200701301919.l0UJJjvu005287@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5245 Modified Files: xorg-x11-utils.spec Log Message: * Tue Jan 30 2007 Adam Jackson 7.1-3 - Fix man page glob and rebuild for FC7. Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-utils.spec 19 Jul 2006 22:45:40 -0000 1.16 +++ xorg-x11-utils.spec 30 Jan 2007 19:19:43 -0000 1.17 @@ -3,7 +3,7 @@ Summary: X.Org X11 X client utilities Name: xorg-x11-%{pkgname} Version: 7.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -109,19 +109,22 @@ %dir %{_datadir}/X11 %{_datadir}/X11/app-defaults/XFontSel %{_datadir}/X11/app-defaults/Xfd -%{_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* +%{_mandir}/man1/xdpyinfo.1* +%{_mandir}/man1/xdriinfo.1* +%{_mandir}/man1/xev.1* +%{_mandir}/man1/xfd.1* +%{_mandir}/man1/xfontsel.1* +%{_mandir}/man1/xlsatoms.1* +%{_mandir}/man1/xlsclients.1* +%{_mandir}/man1/xlsfonts.1* +%{_mandir}/man1/xprop.1* +%{_mandir}/man1/xvinfo.1* +%{_mandir}/man1/xwininfo.1* %changelog +* Tue Jan 30 2007 Adam Jackson 7.1-3 +- Fix man page glob and rebuild for FC7. + * Wed Jul 19 2006 Mike A. Harris 7.1-2.fc6 - Remove app-defaults dir from file manifest, as it is owned by libXt (#174021) - Add 'dist' tag to package release string. From fedora-cvs-commits at redhat.com Tue Jan 30 19:22:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 14:22:54 -0500 Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.14,1.15 Message-ID: <200701301922.l0UJMsjc007801@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xfwp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7757 Modified Files: xorg-x11-xfwp.spec Log Message: * Tue Jan 30 2007 Adam Jackson 1.0.1-4 - Fix man page globs and rebuild for FC7. Index: xorg-x11-xfwp.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-xfwp.spec 12 Jul 2006 09:22:16 -0000 1.14 +++ xorg-x11-xfwp.spec 30 Jan 2007 19:22:52 -0000 1.15 @@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname} # NOTE: The package version should always be the upstream xfwp tarball version. Version: %{xfwp_version} -Release: 3.1 +Release: 4%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -86,11 +86,14 @@ %dir %{_libdir}/X11/proxymngr %{_libdir}/X11/proxymngr/pmconfig #%dir %{_mandir}/man1x -%{_mandir}/man1/proxymngr.1x* -%{_mandir}/man1/xfindproxy.1x* -%{_mandir}/man1/xfwp.1x* +%{_mandir}/man1/proxymngr.1* +%{_mandir}/man1/xfindproxy.1* +%{_mandir}/man1/xfwp.1* %changelog +* Tue Jan 30 2007 Adam Jackson 1.0.1-4 +- Fix man page globs and rebuild for FC7. + * Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control - rebuild From fedora-cvs-commits at redhat.com Tue Jan 30 19:50:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 14:50:08 -0500 Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.16,1.17 Message-ID: <200701301950.l0UJo89N032272@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xsm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32258 Modified Files: xorg-x11-xsm.spec Log Message: * Tue Jan 30 2007 Adam Jackson 1.0.2-5 - Fix man page globs and rebuild for FC7. Index: xorg-x11-xsm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-xsm.spec 19 Jul 2006 23:08:05 -0000 1.16 +++ xorg-x11-xsm.spec 30 Jan 2007 19:50:06 -0000 1.17 @@ -5,7 +5,7 @@ # NOTE: The Version field should be the version of the xsm tarball. Version: 1.0.2 # Bump the release on rebuilds/bugfixes/etc. -Release: 4%{?dist} +Release: 5%{?dist} License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -121,10 +121,10 @@ # NOTE: This binary can and probably should sit in /usr/sbin, but oh well. %{_libdir}/X11/rstart/rstartd.real #%dir %{_mandir}/man1x -%{_mandir}/man1/rstart.1x* -%{_mandir}/man1/rstartd.1x* -%{_mandir}/man1/smproxy.1x* -%{_mandir}/man1/xsm.1x* +%{_mandir}/man1/rstart.1* +%{_mandir}/man1/rstartd.1* +%{_mandir}/man1/smproxy.1* +%{_mandir}/man1/xsm.1* %dir %{_sysconfdir}/X11 %dir %{_sysconfdir}/X11/rstart %config %{_sysconfdir}/X11/rstart/config @@ -132,6 +132,9 @@ %config %{_sysconfdir}/X11/xsm/system.xsm %changelog +* Tue Jan 30 2007 Adam Jackson 1.0.2-5 +- Fix man page globs and rebuild for FC7. + * Wed Jul 19 2006 Mike A. Harris 1.0.2-4.fc6 - Remove app-defaults dir from file manifest, as it is owned by libXt (#174021) - Add 'dist' tag to package release string. From fedora-cvs-commits at redhat.com Tue Jan 30 20:11:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 15:11:31 -0500 Subject: rpms/parted/devel parted-1.8.1-bz221600.patch, NONE, 1.1 parted.spec, 1.95, 1.96 Message-ID: <200701302011.l0UKBVwT000728@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/parted/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv712 Modified Files: parted.spec Added Files: parted-1.8.1-bz221600.patch Log Message: * Tue Jan 30 2007 David Cantrell - 1.8.2-4 - Patched parted.8 man page to show partition names apply to GPT disklabels as well as Mac and PC98 disklabels (#221600) parted-1.8.1-bz221600.patch: parted.8 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE parted-1.8.1-bz221600.patch --- --- parted-1.8.1/doc/C/parted.8.221600 2006-12-03 17:27:47.000000000 -0500 +++ parted-1.8.1/doc/C/parted.8 2007-01-30 14:15:35.000000000 -0500 @@ -75,8 +75,8 @@ never changes the minor number .TP .B name \fIpartition\fP \fIname\fP -set the name of \fIpartition\fP to \fIname\fP. This option works only on Mac -and PC98 disklabels. The name can be placed in quotes, if necessary +set the name of \fIpartition\fP to \fIname\fP. This option works only on Mac, +PC98, and GPT disklabels. The name can be placed in quotes, if necessary .TP .B print displays the partition table Index: parted.spec =================================================================== RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- parted.spec 22 Jan 2007 21:13:16 -0000 1.95 +++ parted.spec 30 Jan 2007 20:11:29 -0000 1.96 @@ -4,10 +4,11 @@ Summary: The GNU disk partition manipulation program. Name: parted Version: 1.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 Patch0: parted-1.8.2-vista.patch +Patch1: parted-1.8.1-bz221600.patch Buildroot: %{_tmppath}/%{name}-root License: GPL @@ -37,6 +38,7 @@ %prep %setup -q %patch0 -p 1 -b .vista +%patch1 -p 1 -b .bz221600 aclocal autoconf @@ -92,6 +94,10 @@ %{_libdir}/*.so %changelog +* Tue Jan 30 2007 David Cantrell - 1.8.2-4 +- Patched parted.8 man page to show partition names apply to GPT disklabels + as well as Mac and PC98 disklabels (#221600) + * Mon Jan 22 2007 David Cantrell - 1.8.2-3 - Remove BR for libtermcap-devel - Specifically preserve starting alignment of 0x800 on Windows Vista From fedora-cvs-commits at redhat.com Tue Jan 30 20:13:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 15:13:06 -0500 Subject: rpms/net-tools/devel net-tools.spec,1.80,1.81 Message-ID: <200701302013.l0UKD6oO000830@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv815 Modified Files: net-tools.spec Log Message: - touch /etc/ethers (#225381) Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- net-tools.spec 27 Dec 2006 08:34:03 -0000 1.80 +++ net-tools.spec 30 Jan 2007 20:13:04 -0000 1.81 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 75%{?dist} +Release: 77%{?dist} License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -215,6 +215,8 @@ rm %{buildroot}%{_mandir}/fr/man8/rarp.8* rm %{buildroot}%{_mandir}/pt/man8/rarp.8* +touch %{buildroot}%{_sysconfdir}/ethers + %find_lang %{name} %clean @@ -246,10 +248,14 @@ %lang(pt) %{_mandir}/pt/man[158]/* %dir %{_sysconfdir}/netplug %config %{_sysconfdir}/netplug/netplugd.conf +%config %{_sysconfdir}/ethers %{_sysconfdir}/netplug.d %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Tue Jan 30 2007 Radek Vok??l - 1.60-77 +- touch /etc/ethers (#225381) + * Wed Dec 27 2006 Radek Vok??l - 1.60-76 - fix arp unaligned access (#220438) From fedora-cvs-commits at redhat.com Tue Jan 30 21:06:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 16:06:11 -0500 Subject: rpms/libdhcp/devel libdhcp.spec,1.41,1.42 Message-ID: <200701302106.l0UL6Bak017107@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/libdhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17071 Modified Files: libdhcp.spec Log Message: * Tue Jan 30 2007 David Cantrell - 1.19-3 - Rebuild Index: libdhcp.spec =================================================================== RCS file: /cvs/dist/rpms/libdhcp/devel/libdhcp.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- libdhcp.spec 29 Jan 2007 22:26:20 -0000 1.41 +++ libdhcp.spec 30 Jan 2007 21:06:09 -0000 1.42 @@ -1,7 +1,7 @@ Summary: A library for network interface configuration with DHCP Name: libdhcp Version: 1.19 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Libraries URL: http://people.redhat.com/dcantrel/%{name}/%{name}-%{version}.tar.bz2 @@ -60,6 +60,9 @@ %doc examples/ %changelog +* Tue Jan 30 2007 David Cantrell - 1.19-3 +- Rebuild + * Mon Jan 29 2007 David Cantrell - 1.19-2 - Rebuild for new libdhcp4client From fedora-cvs-commits at redhat.com Tue Jan 30 21:16:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 16:16:22 -0500 Subject: rpms/evolution/FC-6 evolution-2.8.3-implicit-function-declaration.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 evolution.spec, 1.205, 1.206 sources, 1.60, 1.61 evolution-2.8.0-more-deprecated.patch, 1.1, NONE Message-ID: <200701302116.l0ULGMaJ024949@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24727 Modified Files: .cvsignore evolution.spec sources Added Files: evolution-2.8.3-implicit-function-declaration.patch Removed Files: evolution-2.8.0-more-deprecated.patch Log Message: * Tue Jan 30 2007 Matthew Barnes - 2.8.3-1.fc6 - Update to 2.8.3 - Add patch for GNOME bug #402606 (impliction function declaration). - Remove patch for GNOME bug #357970 (fixed upstream). evolution-2.8.3-implicit-function-declaration.patch: junk-settings.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE evolution-2.8.3-implicit-function-declaration.patch --- --- evolution-2.8.3/plugins/groupwise-features/junk-settings.c.implicit-function-declaration 2007-01-30 12:04:36.000000000 -0500 +++ evolution-2.8.3/plugins/groupwise-features/junk-settings.c 2007-01-30 12:04:50.000000000 -0500 @@ -25,6 +25,7 @@ #include #include "junk-settings.h" #include +#include #include #include #include Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/FC-6/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 21 Nov 2006 15:06:43 -0000 1.60 +++ .cvsignore 30 Jan 2007 21:16:20 -0000 1.61 @@ -1 +1 @@ -evolution-2.8.2.1.tar.bz2 +evolution-2.8.3.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/FC-6/evolution.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- evolution.spec 26 Jan 2007 18:50:36 -0000 1.205 +++ evolution.spec 30 Jan 2007 21:16:20 -0000 1.206 @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.8.2.1 -Release: 4%{?dist} +Version: 2.8.3 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -82,29 +82,29 @@ # We do not ship gnome-common (or at least we're not supposed to). Patch17: evolution-2.7.1-no-gnome-common.patch -# RH bug #157400 / Gnome.org bug #303877 +# RH bug #157400 / GNOME bug #303877 Patch18: evolution-2.7.4-candidate-window-position-task.patch -# RH bug #157505 / Gnome.org bug #303878 +# RH bug #157505 / GNOME bug #303878 Patch19: evolution-2.7.4-candidate-window-position-calendar.patch -# RH bug #166231 / Gnome.org bug #264485 +# RH bug #166231 / GNOME bug #264485 Patch20: evolution-2.7.3-replicated-cjk-input.patch -# RH bug #178295 / Gnome.org bug #348638 +# RH bug #178295 / GNOME bug #348638 Patch21: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #202289 Patch22: evolution-2.7.92-fix-prgname.patch -# RH bug #161885 / Gnome.org bug #309166 +# RH bug #161885 / GNOME bug #309166 Patch23: evolution-2.8.0-indic-cursor-movement.patch -# Gnome.org bug #357216 +# GNOME bug #357216 Patch24: evolution-2.8.0-deprecated-gdk-font.patch -# Gnome.org bug #357970 -Patch25: evolution-2.8.0-more-deprecated.patch +# GNOME bug #402606 +Patch25: evolution-2.8.3-implicit-function-declaration.patch ### Dependencies ### @@ -233,7 +233,7 @@ %patch22 -p1 -b .fix-prgname %patch23 -p1 -b .indic-cursor-movement %patch24 -p1 -b .deprecated-gdk-font -%patch25 -p1 -b .more-deprecated +#%patch25 -p1 -b .implicit-function-declaration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -367,8 +367,8 @@ # remove upstream desktop file; use the symlinks from above (#103826) rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.keys -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.mime +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 @@ -636,6 +636,11 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Jan 30 2007 Matthew Barnes - 2.8.3-1.fc6 +- Update to 2.8.3 +- Add patch for GNOME bug #402606 (impliction function declaration). +- Remove patch for GNOME bug #357970 (fixed upstream). + * Fri Jan 26 2007 Matthew Barnes - 2.8.2.1-4.fc6 - Compile with the -fno-strict-aliasing flag, which will hopefully improve reliablity until the illegal type-punning is fixed (RH bug #224552). Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/FC-6/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 21 Nov 2006 15:06:44 -0000 1.60 +++ sources 30 Jan 2007 21:16:20 -0000 1.61 @@ -1 +1 @@ -3c860b732d4087843da4bbf5fc8f03b6 evolution-2.8.2.1.tar.bz2 +099876b347b114ec08ce6998b4a48d8c evolution-2.8.3.tar.bz2 --- evolution-2.8.0-more-deprecated.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 21:33:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 16:33:22 -0500 Subject: rpms/evolution-connector/FC-6 .cvsignore, 1.41, 1.42 evolution-connector.spec, 1.83, 1.84 sources, 1.41, 1.42 evolution-exchange-2.8.0-deprecated-glib.patch, 1.1, NONE Message-ID: <200701302133.l0ULXMPF025697@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution-connector/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25445 Modified Files: .cvsignore evolution-connector.spec sources Removed Files: evolution-exchange-2.8.0-deprecated-glib.patch Log Message: * Tue Jan 30 2007 Matthew Barnes - 2.8.3-1.fc6 - Update to 2.8.3 - Remove patch for GNOME bug #357660 (fixed upstream). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/FC-6/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 20 Nov 2006 20:29:39 -0000 1.41 +++ .cvsignore 30 Jan 2007 21:33:20 -0000 1.42 @@ -1 +1 @@ -evolution-exchange-2.8.2.tar.bz2 +evolution-exchange-2.8.3.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/FC-6/evolution-connector.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- evolution-connector.spec 27 Nov 2006 19:04:16 -0000 1.83 +++ evolution-connector.spec 30 Jan 2007 21:33:20 -0000 1.84 @@ -21,8 +21,8 @@ ### Abstract ### Name: evolution-connector -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.3 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: Evolution plugin to interact with MS Exchange Server @@ -39,9 +39,6 @@ # We do not ship gnome-common (or at least we're not supposed to). Patch102: evolution-exchange-2.7.2-no_gnome_common.patch -# Gnome.org bug #357660 -Patch103: evolution-exchange-2.8.0-deprecated-glib.patch - ### Dependencies ### Requires: evolution >= %{evo_version} @@ -75,7 +72,6 @@ %patch100 -p1 -b .64bit-fix-acinclude.m4 %patch101 -p1 -b .fix-marshaller %patch102 -p1 -b .no_gnome_common -%patch103 -p1 -b .deprecated-glib %build export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" @@ -144,6 +140,10 @@ %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml %changelog +* Tue Jan 30 2007 Matthew Barnes - 2.8.3-1.fc6 +- Update to 2.8.3 +- Remove patch for GNOME bug #357660 (fixed upstream). + * Mon Nov 27 2006 Matthew Barnes - 2.8.2-2.fc6 - Require evolution-data-server-1.8.2, since libcamel's API changed. Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/FC-6/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 20 Nov 2006 20:29:39 -0000 1.41 +++ sources 30 Jan 2007 21:33:20 -0000 1.42 @@ -1 +1 @@ -0830eedc84e19ea97c22a30daefd7506 evolution-exchange-2.8.2.tar.bz2 +8a6be6640c7824285088f6a2e98f12a4 evolution-exchange-2.8.3.tar.bz2 --- evolution-exchange-2.8.0-deprecated-glib.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 21:39:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 16:39:35 -0500 Subject: rpms/evolution/FC-6 evolution.spec,1.206,1.207 Message-ID: <200701302139.l0ULdZfY022023@cvs.devel.redhat.com> Author: mbarnes Update of /cvs/dist/rpms/evolution/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22007 Modified Files: evolution.spec Log Message: - Fix a typo. Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/FC-6/evolution.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- evolution.spec 30 Jan 2007 21:16:20 -0000 1.206 +++ evolution.spec 30 Jan 2007 21:39:33 -0000 1.207 @@ -233,7 +233,7 @@ %patch22 -p1 -b .fix-prgname %patch23 -p1 -b .indic-cursor-movement %patch24 -p1 -b .deprecated-gdk-font -#%patch25 -p1 -b .implicit-function-declaration +%patch25 -p1 -b .implicit-function-declaration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From fedora-cvs-commits at redhat.com Tue Jan 30 21:57:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 16:57:33 -0500 Subject: rpms/kernel/devel patch-2.6.20-rc6-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.563, 1.564 kernel-2.6.spec, 1.2915, 1.2916 sources, 1.526, 1.527 upstream, 1.454, 1.455 patch-2.6.20-rc6-git1.bz2.sign, 1.1, NONE Message-ID: <200701302157.l0ULvX28010722@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10705 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.20-rc6-git2.bz2.sign Removed Files: patch-2.6.20-rc6-git1.bz2.sign Log Message: * Tue Jan 30 2007 Dave Jones - 2.6.20rc6-git2 --- NEW FILE patch-2.6.20-rc6-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFvvFGyGugalF9Dw4RAlBwAJ0fasx+KiCoj++hnIZUAAxb9Bg9LQCeM3Qc vQQwAVtgKyQtsxJEY/VYPTQ= =zVP6 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.563 retrieving revision 1.564 diff -u -r1.563 -r1.564 --- .cvsignore 30 Jan 2007 14:50:14 -0000 1.563 +++ .cvsignore 30 Jan 2007 21:57:31 -0000 1.564 @@ -5,4 +5,4 @@ xen-11633.tar.bz2 linux-2.6.19.tar.bz2 patch-2.6.20-rc6.bz2 -patch-2.6.20-rc6-git1.bz2 +patch-2.6.20-rc6-git2.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2915 retrieving revision 1.2916 diff -u -r1.2915 -r1.2916 --- kernel-2.6.spec 30 Jan 2007 14:50:14 -0000 1.2915 +++ kernel-2.6.spec 30 Jan 2007 21:57:31 -0000 1.2916 @@ -301,7 +301,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.20-rc6.bz2 -Patch2: patch-2.6.20-rc6-git1.bz2 +Patch2: patch-2.6.20-rc6-git2.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -2000,6 +2000,9 @@ # - tux. %changelog +* Tue Jan 30 2007 Dave Jones +- 2.6.20rc6-git2 + * Mon Jan 29 2007 Chuck Ebbert - 2.6.20rc6-git1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.526 retrieving revision 1.527 diff -u -r1.526 -r1.527 --- sources 30 Jan 2007 14:50:14 -0000 1.526 +++ sources 30 Jan 2007 21:57:31 -0000 1.527 @@ -1,4 +1,4 @@ 93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 7c6dca292f886e7f79df72501f7bfac4 patch-2.6.20-rc6.bz2 -862c1198c918f933d189da0360acb39d patch-2.6.20-rc6-git1.bz2 +a1b2df5a782b53e0838201a7f4d43551 patch-2.6.20-rc6-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.454 retrieving revision 1.455 diff -u -r1.454 -r1.455 --- upstream 30 Jan 2007 14:50:14 -0000 1.454 +++ upstream 30 Jan 2007 21:57:31 -0000 1.455 @@ -1,3 +1,3 @@ linux-2.6.19.tar.bz2 patch-2.6.20-rc6.bz2 -patch-2.6.20-rc6-git1.bz2 +patch-2.6.20-rc6-git2.bz2 --- patch-2.6.20-rc6-git1.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 30 22:09:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:09:47 -0500 Subject: rpms/kernel/FC-6 kernel-2.6.spec,1.2899,1.2900 Message-ID: <200701302209.l0UM9lxD011195@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11173 Modified Files: kernel-2.6.spec Log Message: * Tue Jan 30 2007 Chuck Ebbert - Minor config file changes Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2899 retrieving revision 1.2900 diff -u -r1.2899 -r1.2900 --- kernel-2.6.spec 29 Jan 2007 22:33:15 -0000 1.2899 +++ kernel-2.6.spec 30 Jan 2007 22:09:44 -0000 1.2900 @@ -2017,6 +2017,9 @@ %endif %changelog +* Tue Jan 30 2007 Chuck Ebbert +- Minor config file changes + * Mon Jan 29 2007 Dave Jones - Fix attr2 corruption with btree data extents From fedora-cvs-commits at redhat.com Tue Jan 30 22:09:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:09:47 -0500 Subject: rpms/kernel/FC-6/configs config-i686, 1.3, 1.4 config-x86-generic, 1.69, 1.70 config-x86_64-generic, 1.57, 1.58 Message-ID: <200701302209.l0UM9lBg011204@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-6/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv11173/configs Modified Files: config-i686 config-x86-generic config-x86_64-generic Log Message: * Tue Jan 30 2007 Chuck Ebbert - Minor config file changes Index: config-i686 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-i686,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-i686 10 Apr 2006 19:14:07 -0000 1.3 +++ config-i686 30 Jan 2007 22:09:45 -0000 1.4 @@ -2,3 +2,6 @@ # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=y +CONFIG_CRYPTO_DEV_PADLOCK_SHA=y Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-x86-generic,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- config-x86-generic 21 Dec 2006 21:45:14 -0000 1.69 +++ config-x86-generic 30 Jan 2007 22:09:45 -0000 1.70 @@ -196,8 +196,6 @@ # CONFIG_CRYPTO_AES_586 is not set # CONFIG_CRYPTO_TWOFISH_586 is not set # CONFIG_CRYPTO_DEV_PADLOCK is not set -# CONFIG_CRYPTO_DEV_PADLOCK_AES is not set -# CONFIG_CRYPTO_DEV_PADLOCK_SHA is not set CONFIG_GENERIC_ISA_DMA=y CONFIG_SCHED_SMT=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-x86_64-generic,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- config-x86_64-generic 21 Dec 2006 21:45:14 -0000 1.57 +++ config-x86_64-generic 30 Jan 2007 22:09:45 -0000 1.58 @@ -114,8 +114,6 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV_AMD74XX=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=y CONFIG_CRYPTO_AES_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64=m @@ -188,7 +186,6 @@ # CONFIG_CC_STACKPROTECTOR_ALL is not set CONFIG_SGI_IOC4=m -# CONFIG_SGI_IOC4 is not set CONFIG_MSI_LAPTOP=m # CONFIG_SMSC37B787_WDT is not set From fedora-cvs-commits at redhat.com Tue Jan 30 22:11:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:11:48 -0500 Subject: rpms/kde-i18n/FC-6 kde-i18n.spec,1.70,1.71 Message-ID: <200701302211.l0UMBmbR011252@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kde-i18n/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11238 Modified Files: kde-i18n.spec Log Message: 3.5.6 Index: kde-i18n.spec =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/FC-6/kde-i18n.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- kde-i18n.spec 30 Jan 2007 15:06:31 -0000 1.70 +++ kde-i18n.spec 30 Jan 2007 22:11:46 -0000 1.71 @@ -773,6 +773,7 @@ %lang(de) %{_datadir}/apps/ktuberling/sounds/de/* %lang(de) %{_datadir}/apps/khangman/data/de %lang(de) %{_datadir}/apps/khangman/de.txt +%lang(de) %{_datadir}/apps/kanagram/data/de %lang(de) %{_datadir}/apps/katepart/syntax/logohighlightstyle.de_DE.xml %lang(de) %{_datadir}/apps/kturtle/data/*.de_DE.xml %lang(de) %{_datadir}/apps/kturtle/examples/de_DE @@ -788,6 +789,7 @@ %lang(en_GB) %{_datadir}/apps/katepart/syntax/logohighlightstyle.en_GB.xml %lang(en_GB) %{_datadir}/apps/kturtle/data/*.en_GB.xml %lang(en_GB) %{_datadir}/apps/kturtle/examples/en_GB +%lang(en_GB) %{_datadir}/apps/klettres/en_GB %if %{buildall} %files Esperanto @@ -847,6 +849,7 @@ %lang(fr) %{_datadir}/apps/ktuberling/sounds/fr/* %lang(fr) %{_datadir}/apps/khangman/data/fr %lang(fr) %{_datadir}/apps/khangman/fr.txt +%lang(fr) %{_datadir}/apps/kanagram/data/fr %lang(fr) %{_datadir}/apps/katepart/syntax/logohighlightstyle.fr_FR.xml %lang(fr) %{_datadir}/apps/kturtle/data/*.fr_FR.xml %lang(fr) %{_datadir}/apps/kturtle/examples/fr_FR @@ -1050,7 +1053,10 @@ %lang(sk) %{_datadir}/locale/sk/* %lang(sk) %doc %{_docdir}/HTML/sk %lang(sk) %{_datadir}/apps/ktuberling/sounds/sk/* +%lang(sk) %{_datadir}/apps/kturtle/data/logokeywords.sk.xml +%lang(sk) %{_datadir}/apps/kturtle/examples/sk %lang(sk) %{_datadir}/apps/klettres/sk +%lang(sk) %{_datadir}/apps/katepart/syntax/logohighlightstyle.sk.xml %files Slovenian %defattr(-,root,root) From fedora-cvs-commits at redhat.com Tue Jan 30 22:35:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:35:23 -0500 Subject: rpms/kdegraphics/FC-6 .cvsignore, 1.33, 1.34 kdegraphics.spec, 1.96, 1.97 sources, 1.36, 1.37 Message-ID: <200701302235.l0UMZN8V015458@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegraphics/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15383 Modified Files: .cvsignore kdegraphics.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/FC-6/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 10 Aug 2006 13:19:15 -0000 1.33 +++ .cvsignore 30 Jan 2007 22:35:21 -0000 1.34 @@ -12,3 +12,4 @@ kdegraphics-3.5.1.tar.bz2 kdegraphics-3.5.3.tar.bz2 kdegraphics-3.5.4.tar.bz2 +kdegraphics-3.5.6.tar.bz2 Index: kdegraphics.spec =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/FC-6/kdegraphics.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- kdegraphics.spec 26 Oct 2006 21:06:53 -0000 1.96 +++ kdegraphics.spec 30 Jan 2007 22:35:21 -0000 1.97 @@ -15,7 +15,7 @@ %define no_scanner_archs s390 s390x -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Name: kdegraphics Summary: K Desktop Environment - Graphics Applications @@ -199,6 +199,9 @@ %exclude %{_libdir}/libkfaximage.so %changelog +* Wed Jan 31 2007 Than Ngo 7:3.5.6--0.1.fc6 +- 3.5.6 + * Tue Sep 12 2006 Than Ngo 7:3.5.4-2 - apply upstream patches fix #113635, kpdf crash Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/FC-6/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 26 Oct 2006 21:02:52 -0000 1.36 +++ sources 30 Jan 2007 22:35:21 -0000 1.37 @@ -1 +1 @@ -cdbe15afc01c5da7af9557e803bbb7e6 kdegraphics-3.5.5.tar.bz2 +79a1ffb7ae89bede1410411a30be3210 kdegraphics-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 22:36:33 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:36:33 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.370, 1.371 anaconda.spec, 1.497, 1.498 sources, 1.494, 1.495 Message-ID: <200701302236.l0UMaXgr016326@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16271/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.2.0.19-1 on branch devel from anaconda-11.2.0.19-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- .cvsignore 26 Jan 2007 20:09:13 -0000 1.370 +++ .cvsignore 30 Jan 2007 22:36:31 -0000 1.371 @@ -1 +1 @@ -anaconda-11.2.0.18.tar.bz2 +anaconda-11.2.0.19.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.497 retrieving revision 1.498 diff -u -r1.497 -r1.498 --- anaconda.spec 27 Jan 2007 04:25:42 -0000 1.497 +++ anaconda.spec 30 Jan 2007 22:36:31 -0000 1.498 @@ -1,6 +1,6 @@ Name: anaconda -Version: 11.2.0.18 -Release: 2 +Version: 11.2.0.19 +Release: 1 License: GPL Summary: Graphical system installer Group: Applications/System @@ -109,8 +109,14 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog -* Fri Jan 26 2007 Jeremy Katz - 11.2.0.18-2 -- rebuild against older pciutils +* Tue Jan 30 2007 Jeremy Katz - 11.2.0.19-1 +- pkgorder cleanup for various tree layouts (jkeating) +- Use $TMPDIR in scripts (Steve Pritchard, #224438) +- Wrap timezone label when it's long (clumens, #225444) +- Map Fedora -> Fedora Core (notting) +- Give a useful error when there's no comps information +- Fix localboot from boot disks (pjones) +- Kickstart fixes (clumens) * Fri Jan 26 2007 Jeremy Katz - 11.2.0.18-1 - Fix pkgorder Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.494 retrieving revision 1.495 diff -u -r1.494 -r1.495 --- sources 26 Jan 2007 20:09:13 -0000 1.494 +++ sources 30 Jan 2007 22:36:31 -0000 1.495 @@ -1 +1 @@ -b6dee317339b1eea0470c1bba0592b6c anaconda-11.2.0.18.tar.bz2 +c536526c502f74c57dfc507aaa192c1f anaconda-11.2.0.19.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 30 22:51:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:51:35 -0500 Subject: rpms/dhcp/devel dhcp.spec,1.130,1.131 Message-ID: <200701302251.l0UMpZVK015243@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15201 Modified Files: dhcp.spec Log Message: * Tue Jan 30 2007 David Cantrell - 12:3.0.5-11 - Remove FORTIFY_SOURCE=0 leftovers from testing last week (whoops) Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- dhcp.spec 30 Jan 2007 18:37:21 -0000 1.130 +++ dhcp.spec 30 Jan 2007 22:51:33 -0000 1.131 @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -348,6 +348,9 @@ %{_libdir}/libdhcp4client.so %changelog +* Tue Jan 30 2007 David Cantrell - 12:3.0.5-11 +- Remove FORTIFY_SOURCE=0 leftovers from testing last week (whoops) + * Tue Jan 30 2007 David Cantrell - 12:3.0.5-10 - Fix Xen networking problems with partial checksums (#221964) From fedora-cvs-commits at redhat.com Tue Jan 30 22:55:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:55:07 -0500 Subject: rpms/libIDL/devel libIDL.spec,1.25,1.26 Message-ID: <200701302255.l0UMt7fm017974@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libIDL/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17820 Modified Files: libIDL.spec Log Message: Fix scriptlets Index: libIDL.spec =================================================================== RCS file: /cvs/dist/rpms/libIDL/devel/libIDL.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libIDL.spec 2 Aug 2006 21:22:49 -0000 1.25 +++ libIDL.spec 30 Jan 2007 22:55:04 -0000 1.26 @@ -1,12 +1,12 @@ Summary: Library for parsing IDL (Interface Definition Language) Name: libIDL Version: 0.8.7 -Release: 1%{?dist} +Release: 2%{?dist} Source: ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/%{name}-%{version}.tar.bz2 Patch0: libIDL-0.8.6-multilib.patch Group: System Environment/Libraries License: LGPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 0.8 BuildRequires: glib2-devel >= 2.0 BuildRequires: flex bison @@ -18,7 +18,7 @@ %package devel Summary: Development libraries and header files for libIDL Group: Development/Libraries -Requires: libIDL = %{version} +Requires: libIDL = %{version}-%{release} Requires: pkgconfig >= 1:0.8 Requires: glib2-devel >= 2.0 Prereq: /sbin/install-info @@ -50,11 +50,11 @@ %postun -p /sbin/ldconfig %post devel -/sbin/install-info --quiet %{_infodir}/libIDL2.info.gz %{_infodir}/dir +/sbin/install-info --quiet %{_infodir}/libIDL2.info.gz %{_infodir}/dir || : %preun devel if [ $1 = 0 ]; then - /sbin/install-info --quiet --delete %{_infodir}/libIDL2.info.gz %{_infodir}/dir + /sbin/install-info --quiet --delete %{_infodir}/libIDL2.info.gz %{_infodir}/dir || : fi %clean @@ -75,6 +75,9 @@ %{_infodir}/libIDL2.info.gz %changelog +* Tue Jan 30 2007 Matthias Clasen - 0.8.7-2 +- Fix scriptlets to be failsafe (#223706) + * Wed Aug 2 2006 Matthias Clasen - 0.8.7-1.fc6 - Update to 0.8.7 From fedora-cvs-commits at redhat.com Tue Jan 30 22:59:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 17:59:56 -0500 Subject: rpms/kdeutils/FC-6 .cvsignore, 1.34, 1.35 kdeutils.spec, 1.79, 1.80 sources, 1.36, 1.37 Message-ID: <200701302259.l0UMxuq6021889@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeutils/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21810 Modified Files: .cvsignore kdeutils.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdeutils/FC-6/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 10 Aug 2006 16:06:11 -0000 1.34 +++ .cvsignore 30 Jan 2007 22:59:54 -0000 1.35 @@ -11,3 +11,4 @@ kdeutils-3.5.1.tar.bz2 kdeutils-3.5.3.tar.bz2 kdeutils-3.5.4.tar.bz2 +kdeutils-3.5.6.tar.bz2 Index: kdeutils.spec =================================================================== RCS file: /cvs/dist/rpms/kdeutils/FC-6/kdeutils.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- kdeutils.spec 26 Oct 2006 21:25:19 -0000 1.79 +++ kdeutils.spec 30 Jan 2007 22:59:54 -0000 1.80 @@ -10,7 +10,7 @@ %define appdir %{_datadir}/applications/kde -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Name: kdeutils Summary: K Desktop Environment - Utilities @@ -205,6 +205,9 @@ %exclude %{_libdir}/libkdeinit*.so %changelog +* Wed Jan 31 2007 Than Ngo 6:3.5.6-0.1.fc6 +- 3.5.6 + * Thu Oct 26 2006 Than Ngo 6:3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeutils/FC-6/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 26 Oct 2006 21:25:19 -0000 1.36 +++ sources 30 Jan 2007 22:59:54 -0000 1.37 @@ -1 +1 @@ -a20a732284a3dcb735665e45f5be532e kdeutils-3.5.5.tar.bz2 +e0ea2c15ccf2bd3d8be5f2bf57cfe14a kdeutils-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 03:04:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 22:04:52 -0500 Subject: rpms/fonts-chinese/devel fonts-chinese.spec,1.27,1.28 Message-ID: <200701310304.l0V34qjW008884@cvs.devel.redhat.com> Author: cchance Update of /cvs/dist/rpms/fonts-chinese/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8777 Modified Files: fonts-chinese.spec Log Message: * Wed Jan 31 2007 Caius Chance - 3.03-2.fc7 - Cannot use Chinese fonts on Java application with JRE (porting el5 => rawhide) Index: fonts-chinese.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- fonts-chinese.spec 9 Nov 2006 00:35:51 -0000 1.27 +++ fonts-chinese.spec 31 Jan 2007 03:04:50 -0000 1.28 @@ -11,7 +11,7 @@ Summary: Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face. Name: fonts-chinese Version: 3.03 -Release: 1%{?dist} +Release: 2%{?dist} License: Arphic Public License (GPL-like) Group: User Interface/X BuildArch: noarch @@ -61,6 +61,8 @@ install -d $RPM_BUILD_ROOT%{ttfontdir} install -d $RPM_BUILD_ROOT%{miscfontdir} +install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType +install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType install -m 0644 ttf-arphic-ukai-%{ver}.%{minor}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/ install -m 0644 ttf-arphic-uming-%{ver}.%{minor}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/ install -m 644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir} @@ -88,6 +90,8 @@ touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.dir touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale +touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf +touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf %clean rm -rf $RPM_BUILD_ROOT @@ -106,6 +110,11 @@ done #Update fontconfig cache [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache 2> /dev/null + + # make symlinks for java referring to old path and fonts + ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf || : + ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf || : + } %postun @@ -128,6 +137,10 @@ %dir %{cidmapdir} %{ttfontdir} %{miscfontdir} +%dir %{_datadir}/fonts/zh_CN +%dir %{_datadir}/fonts/zh_TW +%dir %{_datadir}/fonts/zh_CN/TrueType +%dir %{_datadir}/fonts/zh_TW/TrueType %ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1 %ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.cache-1 %ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.dir @@ -135,12 +148,17 @@ %ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.dir %ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.scale %ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1 +%ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf +%ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf %{cidmapdir}/FAPIcidfmap.zh_TW %{cidmapdir}/FAPIcidfmap.zh_CN %{cidmapdir}/cidfmap.zh_TW %{cidmapdir}/cidfmap.zh_CN %changelog +* Wed Jan 31 2007 Caius Chance - 3.03-2.fc7 +- Cannot use Chinese fonts on Java application with JRE (porting el5 => rawhide) + * Thu Nov 09 2006 Caius Chance - 3.03-1.fc7 - Included new release of arphic uming & ukai (20060928). From fedora-cvs-commits at redhat.com Wed Jan 31 04:36:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 23:36:25 -0500 Subject: rpms/thunderbird/devel firefox-1.5-dnd-nograb.patch, NONE, 1.1 thunderbird.spec, 1.90, 1.91 Message-ID: <200701310436.l0V4aPre007584@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7536 Modified Files: thunderbird.spec Added Files: firefox-1.5-dnd-nograb.patch Log Message: * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-6 - Fix the DND implementation to not grab, so it works with new GTK+. firefox-1.5-dnd-nograb.patch: nsDragService.cpp | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE firefox-1.5-dnd-nograb.patch --- See https://bugzilla.mozilla.org/show_bug.cgi?id=367203 Index: mozilla/widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.9.10.1 diff -d -u -p -r1.9.10.1 nsDragService.cpp --- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1 +++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000 @@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void) void nsDragService::GetTargetDragData(GdkAtom aFlavor) { - gtk_grab_add(mHiddenWidget); PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor)); PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n", mTargetWidget, mTargetDragContext)); @@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom gtk_main_iteration(); } PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n")); - gtk_grab_remove(mHiddenWidget); } void Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- thunderbird.spec 23 Dec 2006 21:05:09 -0000 1.90 +++ thunderbird.spec 31 Jan 2007 04:36:22 -0000 1.91 @@ -8,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5.0.9 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL Group: Applications/Internet @@ -57,6 +57,7 @@ # Other Patch102: firefox-1.5-theme-change.patch Patch103: thunderbird-1.5-profile-migrator.patch +Patch104: firefox-1.5-dnd-nograb.patch %if %{official_branding} # Required by Mozilla Corporation @@ -134,6 +135,7 @@ %patch102 -p0 -b .theme-change %patch103 -p1 -b .profile-migrator +%patch104 -p1 -b .dnd-nograb %if %{official_branding} # Required by Mozilla Corporation @@ -273,6 +275,9 @@ #=============================================================================== %changelog +* Tue Jan 30 2007 Christopher Aillon 1.5.0.9-6 +- Fix the DND implementation to not grab, so it works with new GTK+. + * Thu Dec 21 2006 Behdad Esfahbod 1.5.0.9-5 - Added firefox-1.5-pango-underline.patch From fedora-cvs-commits at redhat.com Wed Jan 31 04:40:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 23:40:14 -0500 Subject: rpms/firefox/devel firefox-1.5-dnd-nograb.patch, NONE, 1.1 firefox.spec, 1.167, 1.168 Message-ID: <200701310440.l0V4eEso010432@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10378 Modified Files: firefox.spec Added Files: firefox-1.5-dnd-nograb.patch Log Message: * Tue Jan 30 2007 Christopher Aillon 2.0.0.1-4 - Fix the DND implementation to not grab, so it works with new GTK+. firefox-1.5-dnd-nograb.patch: nsDragService.cpp | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE firefox-1.5-dnd-nograb.patch --- See https://bugzilla.mozilla.org/show_bug.cgi?id=367203 Index: mozilla/widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.9.10.1 diff -d -u -p -r1.9.10.1 nsDragService.cpp --- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1 +++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000 @@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void) void nsDragService::GetTargetDragData(GdkAtom aFlavor) { - gtk_grab_add(mHiddenWidget); PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor)); PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n", mTargetWidget, mTargetDragContext)); @@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom gtk_main_iteration(); } PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n")); - gtk_grab_remove(mHiddenWidget); } void Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- firefox.spec 18 Jan 2007 20:19:46 -0000 1.167 +++ firefox.spec 31 Jan 2007 04:40:11 -0000 1.168 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 2.0.0.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -64,6 +64,7 @@ Patch100: firefox-1.5-gtk-key-theme-crash.patch Patch101: firefox-1.5-embedwindow-visibility.patch Patch102: firefox-1.5-theme-change.patch +Patch103: firefox-1.5-dnd-nograb.patch %if %{official_branding} # Required by Mozilla Corporation @@ -157,6 +158,7 @@ #%patch100 -p0 -b .gtk-key-theme-crash %patch101 -p0 -b .embedwindow-visibility %patch102 -p0 -b .theme-change +%patch103 -p1 -b .dnd-nograb # For branding specific patches. @@ -408,6 +410,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Jan 30 2007 Christopher Aillon 2.0.0.1-4 +- Fix the DND implementation to not grab, so it works with new GTK+. + * Thu Jan 18 2007 Christopher Aillon 2.0.0.1-3 - Remove the XLIB_SKIP_ARGB_VISUALS=1 workaround; the plugin got fixed. From fedora-cvs-commits at redhat.com Wed Jan 31 04:42:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 23:42:56 -0500 Subject: rpms/fonts-chinese/devel CIDFnmap.zh_CN, 1.3, 1.4 CIDFnmap.zh_TW, 1.3, 1.4 fonts-chinese.spec, 1.28, 1.29 Message-ID: <200701310442.l0V4gu7Q012438@cvs.devel.redhat.com> Author: cchance Update of /cvs/dist/rpms/fonts-chinese/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12140 Modified Files: fonts-chinese.spec Added Files: CIDFnmap.zh_CN CIDFnmap.zh_TW Log Message: Fixed bug 225526: [zh_*] need to add CIDFnmap file back (port el5=>rawhide) Index: CIDFnmap.zh_CN =================================================================== RCS file: CIDFnmap.zh_CN diff -N CIDFnmap.zh_CN --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ CIDFnmap.zh_CN 31 Jan 2007 04:42:54 -0000 1.4 @@ -0,0 +1,32 @@ +%! +% Copyright (C) 2001 Taiji Yamada and gs-cjk project +% +% This file is part of GNU Ghostscript. +% +% GNU Ghostscript is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY. No author or distributor accepts responsibility +% to anyone for the consequences of using it or for whether it serves any +% particular purpose or works at all, unless he says so in writing. Refer +% to the GNU General Public License for full details. +% +% Everyone is granted permission to copy, modify and redistribute GNU +% Ghostscript, but only under the conditions described in the GNU General +% Public License. A copy of this license is supposed to have been given +% to you along with GNU Ghostscript so you can know your rights and +% responsibilities. It should be in a file named COPYING. Among other +% things, the copyright notice and this notice must be preserved on all +% copies. + +% $Id$ +% CID fontmap for the Arphic trutype fonts + +% See ftp://ftp.gnu.org/pub/non-gnu/chinese-fonts-truetype/LICENSE +% for license information regarding these fonts. + +% Adobe-GB1 + +/BousungEG-Light-GB (/usr/share/fonts/chinese/TrueType/uming.ttf) ; +/GBZenKai-Medium (/usr/share/fonts/chinese/TrueType/ukai.ttf) ; + +/Adobe-GB1 /BousungEG-Light-GB ; +/MSungGBK-Light /BousungEG-Light-GB ; Index: CIDFnmap.zh_TW =================================================================== RCS file: CIDFnmap.zh_TW diff -N CIDFnmap.zh_TW --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ CIDFnmap.zh_TW 31 Jan 2007 04:42:54 -0000 1.4 @@ -0,0 +1,32 @@ +%! +% Copyright (C) 2001 Taiji Yamada and gs-cjk project +% +% This file is part of GNU Ghostscript. +% +% GNU Ghostscript is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY. No author or distributor accepts responsibility +% to anyone for the consequences of using it or for whether it serves any +% particular purpose or works at all, unless he says so in writing. Refer +% to the GNU General Public License for full details. +% +% Everyone is granted permission to copy, modify and redistribute GNU +% Ghostscript, but only under the conditions described in the GNU General +% Public License. A copy of this license is supposed to have been given +% to you along with GNU Ghostscript so you can know your rights and +% responsibilities. It should be in a file named COPYING. Among other +% things, the copyright notice and this notice must be preserved on all +% copies. + +% $Id$ +% CID fontmap for the Arphic trutype fonts + +% See ftp://ftp.gnu.org/pub/non-gnu/chinese-fonts-truetype/LICENSE +% for license information regarding these fonts. + +% Adobe-CNS1 + +/ZenKai-Medium (/usr/share/fonts/chinese/TrueType/ukai.ttf) ; +/ShanHeiSun-Light (/usr/share/fonts/chinese/TrueType/uming.ttf) ; + +/Adobe-CNS1 /ShanHeiSun-Light ; + Index: fonts-chinese.spec =================================================================== RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- fonts-chinese.spec 31 Jan 2007 03:04:50 -0000 1.28 +++ fonts-chinese.spec 31 Jan 2007 04:42:54 -0000 1.29 @@ -11,7 +11,7 @@ Summary: Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face. Name: fonts-chinese Version: 3.03 -Release: 2%{?dist} +Release: 3%{?dist} License: Arphic Public License (GPL-like) Group: User Interface/X BuildArch: noarch @@ -34,6 +34,8 @@ Source21: FAPIcidfmap.zh_CN Source22: cidfmap.zh_TW Source23: cidfmap.zh_CN +Source24: CIDFnmap.zh_TW +Source25: CIDFnmap.zh_CN Requires(post): ttmkfdir >= 3.0.6, mkfontdir, fontconfig, /usr/sbin/chkfontpath Requires(postun): fontconfig, /usr/sbin/chkfontpath @@ -78,10 +80,13 @@ install -m 0644 %{SOURCE21} $RPM_BUILD_ROOT%{cidmapdir}/ install -m 0644 %{SOURCE22} $RPM_BUILD_ROOT%{cidmapdir}/ install -m 0644 %{SOURCE23} $RPM_BUILD_ROOT%{cidmapdir}/ +install -m 0644 %{SOURCE24} $RPM_BUILD_ROOT%{cidmapdir}/ +install -m 0644 %{SOURCE25} $RPM_BUILD_ROOT%{cidmapdir}/ cp %{SOURCE10} %{SOURCE11} %{SOURCE12} $RPM_BUILD_DIR/%{name}-%{version}/doc/ cp %{SOURCE13} $RPM_BUILD_DIR/%{name}-%{version}/doc/release.txt + # for dummy touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1 touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1 @@ -154,10 +159,17 @@ %{cidmapdir}/FAPIcidfmap.zh_CN %{cidmapdir}/cidfmap.zh_TW %{cidmapdir}/cidfmap.zh_CN +%{cidmapdir}/CIDFnmap.zh_TW +%{cidmapdir}/CIDFnmap.zh_CN + %changelog +* Wed Jan 31 2007 Caius Chance - 3.03-3.fc7 +- Fixed bz#225526: [zh_*] need to add CIDFnmap file back (port el5=>rawhide) + * Wed Jan 31 2007 Caius Chance - 3.03-2.fc7 -- Cannot use Chinese fonts on Java application with JRE (porting el5 => rawhide) +- Fixed bz#225523: Cannot use Chinese fonts on Java application with JRE + (porting el5 => rawhide) * Thu Nov 09 2006 Caius Chance - 3.03-1.fc7 - Included new release of arphic uming & ukai (20060928). From fedora-cvs-commits at redhat.com Wed Jan 31 04:44:02 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 23:44:02 -0500 Subject: rpms/gtk2/devel gtk+-2.10.8-search.patch, 1.1, 1.2 gtk2.spec, 1.210, 1.211 Message-ID: <200701310444.l0V4i2JB013239@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13062 Modified Files: gtk+-2.10.8-search.patch gtk2.spec Log Message: fix filechooser search gtk+-2.10.8-search.patch: Makefile.am | 10 gtkfilechooserdefault.c | 1511 ++++++++++++++++++++++++++++++++++++----------- gtkfilechooserprivate.h | 35 - gtkquery.c | 142 ++++ gtkquery.h | 74 ++ gtksearchengine.c | 197 ++++++ gtksearchengine.h | 91 ++ gtksearchenginebeagle.c | 420 +++++++++++++ gtksearchenginebeagle.h | 59 + gtksearchenginesimple.c | 376 +++++++++++ gtksearchenginesimple.h | 59 + gtksearchenginetracker.c | 362 +++++++++++ gtksearchenginetracker.h | 59 + 13 files changed, 3050 insertions(+), 345 deletions(-) Index: gtk+-2.10.8-search.patch =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.10.8-search.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk+-2.10.8-search.patch 17 Jan 2007 06:21:30 -0000 1.1 +++ gtk+-2.10.8-search.patch 31 Jan 2007 04:44:00 -0000 1.2 @@ -1,5 +1,5 @@ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginetracker.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginetracker.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Mr Jamie McCracken @@ -60,8 +60,8 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchengine.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchengine.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -154,8 +154,8 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginebeagle.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginebeagle.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -216,8 +216,8 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_BEAGLE_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchengine.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchengine.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -416,8 +416,8 @@ + + g_signal_emit (engine, signals[ERROR], 0, error_message); +} ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginetracker.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginetracker.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,362 @@ +/* + * Copyright (C) 2005 Mr Jamie McCracken @@ -781,8 +781,8 @@ + + return GTK_SEARCH_ENGINE (engine); +} ---- gtk+-2.10.8/gtk/Makefile.am.search 2007-01-16 22:14:43.000000000 -0500 -+++ gtk+-2.10.8/gtk/Makefile.am 2007-01-17 01:21:08.000000000 -0500 +--- gtk+-2.10.9/gtk/Makefile.am.search 2007-01-22 10:48:04.000000000 -0500 ++++ gtk+-2.10.9/gtk/Makefile.am 2007-01-30 23:27:42.000000000 -0500 @@ -332,6 +332,11 @@ # GTK+ header files that don't get installed @@ -807,8 +807,8 @@ fnmatch.c \ gtkaboutdialog.c \ gtkaccelgroup.c \ ---- gtk+-2.10.8/gtk/gtkfilechooserdefault.c.search 2007-01-16 22:14:43.000000000 -0500 -+++ gtk+-2.10.8/gtk/gtkfilechooserdefault.c 2007-01-17 01:21:08.000000000 -0500 +--- gtk+-2.10.9/gtk/gtkfilechooserdefault.c.search 2007-01-22 10:48:04.000000000 -0500 ++++ gtk+-2.10.9/gtk/gtkfilechooserdefault.c 2007-01-30 23:27:42.000000000 -0500 @@ -78,6 +78,8 @@ #include #include @@ -2308,7 +2308,7 @@ else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry) { /* The focus is on a dialog's action area button, *and* the widget that -@@ -7913,15 +8202,452 @@ +@@ -7913,15 +8202,453 @@ gtk_widget_grab_focus (widget); } @@ -2657,6 +2657,7 @@ + + impl->search_query = _gtk_query_new (); + _gtk_query_set_text (impl->search_query, query_text); ++ _gtk_search_engine_set_query (impl->search_engine, impl->search_query); + + g_signal_connect (impl->search_engine, "hits-added", + G_CALLBACK (search_engine_hits_added_cb), impl); @@ -2767,7 +2768,7 @@ */ filter_index = g_slist_index (impl->filters, filter); if (impl->filters && filter && filter_index < 0) -@@ -7961,28 +8687,44 @@ +@@ -7961,28 +8688,44 @@ { GtkTreePath *cursor_path; const GtkFilePath *new_path; @@ -2829,7 +2830,7 @@ } if (new_path != impl->preview_path && -@@ -7998,7 +8740,7 @@ +@@ -7998,7 +8741,7 @@ if (new_path) { impl->preview_path = gtk_file_path_copy (new_path); @@ -2838,7 +2839,7 @@ } else { -@@ -8067,6 +8809,8 @@ +@@ -8067,6 +8810,8 @@ { GtkFilePath *path; @@ -2847,7 +2848,7 @@ /* We ref the file chooser since volume_mount() may run a main loop, and the * user could close the file chooser window in the meantime. */ -@@ -8087,6 +8831,8 @@ +@@ -8087,6 +8832,8 @@ if (path != NULL) { change_folder_and_display_error (impl, path); @@ -2856,7 +2857,7 @@ gtk_file_path_free (path); } } -@@ -8119,7 +8865,10 @@ +@@ -8119,7 +8866,10 @@ goto out; if (!error && gtk_file_info_get_is_folder (info)) @@ -2868,7 +2869,7 @@ else gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL); -@@ -8136,26 +8885,25 @@ +@@ -8136,26 +8886,25 @@ GtkTreeIter *iter) { gpointer col_data; @@ -2900,7 +2901,7 @@ { GtkFileSystemVolume *volume; -@@ -8163,7 +8911,7 @@ +@@ -8163,7 +8912,7 @@ shortcuts_activate_volume (impl, volume); } @@ -2909,7 +2910,7 @@ { struct ShortcutsActivateData *data; -@@ -8176,6 +8924,10 @@ +@@ -8176,6 +8925,10 @@ GTK_FILE_INFO_IS_FOLDER, shortcuts_activate_get_info_cb, data); } @@ -2920,7 +2921,7 @@ } /* Callback used when a row in the shortcuts list is activated */ -@@ -8188,15 +8940,13 @@ +@@ -8188,15 +8941,13 @@ GtkTreeIter iter; GtkTreeIter child_iter; @@ -2938,7 +2939,7 @@ } /* Handler for GtkWidget::key-press-event on the shortcuts list */ -@@ -8236,8 +8986,15 @@ +@@ -8236,8 +8987,15 @@ gpointer data) { GtkFileChooserDefault *impl = data; @@ -2955,7 +2956,7 @@ } static gboolean -@@ -8249,6 +9006,9 @@ +@@ -8249,6 +9007,9 @@ { GtkFileChooserDefault *impl = data; @@ -2965,7 +2966,7 @@ if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) { -@@ -8274,7 +9034,7 @@ +@@ -8274,7 +9035,7 @@ GtkFileChooserDefault *impl) { /* See if we are in the new folder editable row for Save mode */ @@ -2974,7 +2975,7 @@ { const GtkFileInfo *info; gboolean had_selection; -@@ -8289,6 +9049,8 @@ +@@ -8289,6 +9050,8 @@ out: @@ -2983,7 +2984,7 @@ update_chooser_entry (impl); check_preview_change (impl); bookmarks_check_add_sensitivity (impl); -@@ -8306,6 +9068,12 @@ +@@ -8306,6 +9069,12 @@ GtkTreeIter iter, child_iter; const GtkFileInfo *info; @@ -2996,7 +2997,7 @@ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path)) return; -@@ -8376,6 +9144,15 @@ +@@ -8376,6 +9145,15 @@ const GtkFileInfo *info; gboolean sensitive = TRUE; @@ -3012,7 +3013,7 @@ profile_start ("start", NULL); info = get_list_file_info (impl, iter); -@@ -8425,13 +9202,33 @@ +@@ -8425,13 +9203,33 @@ gpointer data) { GtkFileChooserDefault *impl = data; @@ -3048,7 +3049,7 @@ NULL); return; -@@ -8447,6 +9244,7 @@ +@@ -8447,6 +9245,7 @@ g_object_set (cell, "text", gtk_file_info_get_display_name (info), "sensitive", sensitive, @@ -3056,7 +3057,7 @@ NULL); } -@@ -8508,7 +9306,6 @@ +@@ -8508,7 +9307,6 @@ gpointer data) { GtkFileChooserDefault *impl; @@ -3064,7 +3065,7 @@ GtkFileTime time_mtime; GDate mtime, now; int days_diff; -@@ -8517,17 +9314,35 @@ +@@ -8517,17 +9315,35 @@ impl = data; @@ -3108,7 +3109,7 @@ if (time_mtime == 0) strcpy (buf, _("Unknown")); -@@ -8558,10 +9373,6 @@ +@@ -8558,10 +9374,6 @@ } } @@ -3119,7 +3120,7 @@ g_object_set (cell, "text", buf, "sensitive", sensitive, -@@ -8587,7 +9398,23 @@ +@@ -8587,7 +9399,23 @@ static void location_popup_handler (GtkFileChooserDefault *impl, const gchar *path) @@ -3144,7 +3145,7 @@ if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { -@@ -8656,6 +9483,7 @@ +@@ -8656,6 +9484,7 @@ g_assert_not_reached (); shortcuts_activate_iter (impl, &iter); @@ -3152,7 +3153,7 @@ } /* Handler for the "home-folder" keybinding signal */ -@@ -8700,26 +9528,26 @@ +@@ -8700,26 +9529,26 @@ /* Drag and drop interfaces */ static void @@ -3185,7 +3186,7 @@ pos = *gtk_tree_path_get_indices (path); bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS); -@@ -8729,13 +9557,13 @@ +@@ -8729,13 +9558,13 @@ /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */ static gboolean @@ -3204,7 +3205,7 @@ /* FIXME */ -@@ -8744,30 +9572,30 @@ +@@ -8744,30 +9573,30 @@ /* Fill the GtkTreeDragSourceIface vtable */ static void @@ -3246,8 +3247,8 @@ "child-model", child_model, "virtual-root", root, NULL); ---- gtk+-2.10.8/gtk/gtkfilechooserprivate.h.search 2007-01-16 22:14:43.000000000 -0500 -+++ gtk+-2.10.8/gtk/gtkfilechooserprivate.h 2007-01-17 01:23:26.000000000 -0500 +--- gtk+-2.10.9/gtk/gtkfilechooserprivate.h.search 2007-01-22 10:48:04.000000000 -0500 ++++ gtk+-2.10.9/gtk/gtkfilechooserprivate.h 2007-01-30 23:27:42.000000000 -0500 @@ -25,6 +25,8 @@ #include "gtkfilesystem.h" #include "gtkfilesystemmodel.h" @@ -3344,8 +3345,8 @@ guint expand_folders : 1; #if 0 ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginesimple.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginesimple.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Red Hat, Inc @@ -3406,9 +3407,9 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_SIMPLE_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginesimple.c 2007-01-17 01:21:08.000000000 -0500 -@@ -0,0 +1,378 @@ +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginesimple.c 2007-01-30 23:29:14.000000000 -0500 +@@ -0,0 +1,376 @@ +/* + * Copyright (C) 2005 Red Hat, Inc + * @@ -3488,8 +3489,6 @@ + simple->priv->query = NULL; + } + -+ g_free (simple->priv); -+ + G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object); +} + @@ -3787,8 +3786,8 @@ + + return engine; +} ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginebeagle.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginebeagle.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,420 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -4210,8 +4209,8 @@ + + return GTK_SEARCH_ENGINE (engine); +} ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtkquery.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtkquery.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -4355,8 +4354,8 @@ + g_strdup (mime_type)); +} + ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtkquery.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtkquery.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2005 Novell, Inc. Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- gtk2.spec 22 Jan 2007 19:24:32 -0000 1.210 +++ gtk2.spec 31 Jan 2007 04:44:00 -0000 1.211 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 @@ -295,6 +295,9 @@ %doc tmpdocs/examples %changelog +* Tue Jan 30 2007 Matthias Clasen - 2.10.9-2 +- Fix filechooser search support + * Mon Jan 22 2007 Matthias Clasen - 2.10.9-1 - Update to 2.10.9 From fedora-cvs-commits at redhat.com Wed Jan 31 04:52:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 23:52:57 -0500 Subject: rpms/thunderbird/FC-6 firefox-1.5-dnd-nograb.patch, NONE, 1.1 firefox-1.5-pango-cursor-position-more.patch, NONE, 1.1 firefox-1.5-pango-justified-range.patch, NONE, 1.1 firefox-1.5-pango-underline.patch, NONE, 1.1 thunderbird.spec, 1.91, 1.92 Message-ID: <200701310452.l0V4quIF007760@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7685 Modified Files: thunderbird.spec Added Files: firefox-1.5-dnd-nograb.patch firefox-1.5-pango-cursor-position-more.patch firefox-1.5-pango-justified-range.patch firefox-1.5-pango-underline.patch Log Message: * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-7 - Updated cursor position patch from tagoh to fix issue with "jumping" cursor when in a textfield with tabs. * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-6 - Fix the DND implementation to not grab, so it works with new GTK+. * Thu Dec 21 2006 Behdad Esfahbod 1.5.0.9-5 - Added firefox-1.5-pango-underline.patch * Wed Dec 20 2006 Behdad Esfahbod 1.5.0.9-4 - Added firefox-1.5-pango-justified-range.patch * Tue Dec 19 2006 Behdad Esfahbod 1.5.0.9-3 - Added firefox-1.5-pango-cursor-position-more.patch firefox-1.5-dnd-nograb.patch: nsDragService.cpp | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE firefox-1.5-dnd-nograb.patch --- See https://bugzilla.mozilla.org/show_bug.cgi?id=367203 Index: mozilla/widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.9.10.1 diff -d -u -p -r1.9.10.1 nsDragService.cpp --- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1 +++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000 @@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void) void nsDragService::GetTargetDragData(GdkAtom aFlavor) { - gtk_grab_add(mHiddenWidget); PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor)); PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n", mTargetWidget, mTargetDragContext)); @@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom gtk_main_iteration(); } PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n")); - gtk_grab_remove(mHiddenWidget); } void firefox-1.5-pango-cursor-position-more.patch: nsTextFrame.cpp | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- NEW FILE firefox-1.5-pango-cursor-position-more.patch --- diff -pruN -x '.moz*' -x .deps -x 'firefox*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-08-26 13:33:35.000000000 +0900 +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-13 20:54:32.000000000 +0900 @@ -4261,12 +4261,10 @@ nsTextFrame::GetPointFromOffset(nsPresCo if (tc) { totalLength = tc->Text()->GetLength(); // raw value which includes whitespace } - if ((hitLength == textLength) && (inOffset = mContentLength) && - (mContentOffset + mContentLength == totalLength)) { - // no need to re-measure when at the end of the last-in-flow - } + if (hitLength > 0) + inRendContext->GetRangeWidth(paintBuffer.mBuffer, textLength, 0, hitLength, (PRUint32&)width); else - inRendContext->GetWidth(paintBuffer.mBuffer, hitLength, width); + width = 0; } if ((hitLength == textLength) && (TEXT_TRIMMED_WS & mState)) { // firefox-1.5-pango-justified-range.patch: nsTextFrame.cpp | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) --- NEW FILE firefox-1.5-pango-justified-range.patch --- diff -pruN -x '.moz*' -x .deps -x 'thunderbird*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' -x 'firefox*' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-12-20 12:15:38.000000000 +0900 +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-20 21:29:39.000000000 +0900 @@ -2973,15 +2973,16 @@ nsTextFrame::RenderString(nsIRenderingCo nsIFontMetrics* lastFont = aTextStyle.mLastFont; PRInt32 pendingCount; - PRUnichar* runStart = bp; + PRUnichar* runStart = bp, *top = aBuffer; nscoord charWidth, width = 0; PRInt32 countSoFar = 0; + PRUint32 offset; // Save the color we want to use for the text, since calls to // PaintTextDecorations in this method will call SetColor() on the rendering // context. nscolor textColor; aRenderingContext.GetColor(textColor); - for (; --aLength >= 0; aBuffer++) { + for (offset = 0; offset < aLength; aBuffer++, offset++) { nsIFontMetrics* nextFont; nscoord glyphWidth = 0; PRUnichar ch = *aBuffer; @@ -3038,7 +3039,7 @@ nsTextFrame::RenderString(nsIRenderingCo else if (ch == ' ') { glyphWidth += aTextStyle.mSpaceWidth + aTextStyle.mWordSpacing + aTextStyle.mLetterSpacing; } - else if (IS_HIGH_SURROGATE(ch) && aLength > 0 && + else if (IS_HIGH_SURROGATE(ch) && (offset + 1) < aLength && IS_LOW_SURROGATE(*(aBuffer+1))) { // special handling for surrogate pair @@ -3046,7 +3047,7 @@ nsTextFrame::RenderString(nsIRenderingCo glyphWidth += charWidth + aTextStyle.mLetterSpacing; // copy the surrogate low *bp++ = ch; - --aLength; + offset++; aBuffer++; ch = *aBuffer; // put the width into the space buffer @@ -3058,10 +3059,10 @@ nsTextFrame::RenderString(nsIRenderingCo glyphWidth = 0; } else { - aRenderingContext.GetWidth(ch, charWidth); + aRenderingContext.GetRangeWidth(top, aLength, offset, offset + 1, (PRUint32&)charWidth); glyphWidth += charWidth + aTextStyle.mLetterSpacing; } - if (justifying && (!isEndOfLine || aLength > 0) + if (justifying && (!isEndOfLine || (offset + 1) < aLength) && IsJustifiableCharacter(ch, isCJ)) { glyphWidth += aTextStyle.mExtraSpacePerJustifiableCharacter; if ((PRUint32)--aTextStyle.mNumJustifiableCharacterToRender firefox-1.5-pango-underline.patch: nsTextFrame.cpp | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) --- NEW FILE firefox-1.5-pango-underline.patch --- diff -pruN -x '.moz*' -x .deps -x 'thunderbird*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-12-20 12:53:26.000000000 +0900 +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-20 15:43:14.000000000 +0900 @@ -2097,11 +2097,11 @@ nsTextFrame::PaintTextDecorations(nsIRen nsRect rect = GetRect(); while(aDetails){ const nscoord* sp= aSpacing; - PRInt32 startOffset = 0; - PRInt32 textWidth = 0; - PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex)); - PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex)); - PRInt32 i; + PRUint32 startOffset = 0; + PRUint32 textWidth = 0; + PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex)); + PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex)); + PRUint32 i; if ((start < end) && ((aLength - start) > 0)) { //aDetails allready processed to have offsets from frame start not content offsets @@ -2117,7 +2117,7 @@ nsTextFrame::PaintTextDecorations(nsIRen } } else - aRenderingContext.GetWidth(aText, start, startOffset); + aRenderingContext.GetRangeWidth(aText, aLength, 0, start, startOffset); } if (sp){ for (i = start; i < end;i ++){ @@ -2125,8 +2125,7 @@ nsTextFrame::PaintTextDecorations(nsIRen } } else - aRenderingContext.GetWidth(aText + start, - PRUint32(end - start), textWidth); + aRenderingContext.GetRangeWidth(aText, aLength, start, end, textWidth); } nscoord offset, size; Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/FC-6/thunderbird.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- thunderbird.spec 19 Dec 2006 21:29:31 -0000 1.91 +++ thunderbird.spec 31 Jan 2007 04:52:54 -0000 1.92 @@ -8,8 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5.0.9 -Release: 2%{?dist} -Epoch: 0 +Release: 7%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL Group: Applications/Internet @@ -51,10 +50,14 @@ Patch82: firefox-1.5-pango-mathml.patch Patch83: firefox-1.5-pango-cursor-position.patch Patch84: firefox-1.5-pango-printing.patch +Patch85: firefox-1.5-pango-cursor-position-more.patch +Patch86: firefox-1.5-pango-justified-range.patch +Patch87: firefox-1.5-pango-underline.patch # Other Patch102: firefox-1.5-theme-change.patch Patch103: thunderbird-1.5-profile-migrator.patch +Patch104: firefox-1.5-dnd-nograb.patch %if %{official_branding} # Required by Mozilla Corporation @@ -118,6 +121,9 @@ %patch82 -p1 -b .pango-mathml %patch83 -p1 -b .pango-cursor-position %patch84 -p1 -b .pango-printing +%patch85 -p1 -b .pango-cursor-position-more +%patch86 -p1 -b .pango-justified-range +%patch87 -p1 -b .pango-underline pushd gfx/src/ps # This sort of sucks, but it works for now. ln -s ../gtk/nsFontMetricsPango.h . @@ -129,6 +135,7 @@ %patch102 -p0 -b .theme-change %patch103 -p1 -b .profile-migrator +%patch104 -p1 -b .dnd-nograb %if %{official_branding} # Required by Mozilla Corporation @@ -268,6 +275,22 @@ #=============================================================================== %changelog +* Tue Jan 30 2007 Christopher Aillon 1.5.0.9-7 +- Updated cursor position patch from tagoh to fix issue with "jumping" + cursor when in a textfield with tabs. + +* Tue Jan 30 2007 Christopher Aillon 1.5.0.9-6 +- Fix the DND implementation to not grab, so it works with new GTK+. + +* Thu Dec 21 2006 Behdad Esfahbod 1.5.0.9-5 +- Added firefox-1.5-pango-underline.patch + +* Wed Dec 20 2006 Behdad Esfahbod 1.5.0.9-4 +- Added firefox-1.5-pango-justified-range.patch + +* Tue Dec 19 2006 Behdad Esfahbod 1.5.0.9-3 +- Added firefox-1.5-pango-cursor-position-more.patch + * Tue Dec 19 2006 Matthias Clasen 1.5.0.9-2 - Add a Requires: launchmail (#219884) From fedora-cvs-commits at redhat.com Wed Jan 31 04:54:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 30 Jan 2007 23:54:44 -0500 Subject: rpms/thunderbird/devel firefox-1.5-pango-cursor-position-more.patch, 1.1, 1.2 thunderbird.spec, 1.91, 1.92 Message-ID: <200701310454.l0V4siHQ009143@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9091 Modified Files: firefox-1.5-pango-cursor-position-more.patch thunderbird.spec Log Message: * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-7 - Updated cursor position patch from tagoh to fix issue with "jumping" cursor when in a textfield with tabs. firefox-1.5-pango-cursor-position-more.patch: nsTextFrame.cpp | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) Index: firefox-1.5-pango-cursor-position-more.patch =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/firefox-1.5-pango-cursor-position-more.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- firefox-1.5-pango-cursor-position-more.patch 23 Dec 2006 21:05:09 -0000 1.1 +++ firefox-1.5-pango-cursor-position-more.patch 31 Jan 2007 04:54:42 -0000 1.2 @@ -10,7 +10,7 @@ - // no need to re-measure when at the end of the last-in-flow - } + if (hitLength > 0) -+ inRendContext->GetRangeWidth(paintBuffer.mBuffer, mContentLength, 0, hitLength, (PRUint32&)width); ++ inRendContext->GetRangeWidth(paintBuffer.mBuffer, textLength, 0, hitLength, (PRUint32&)width); else - inRendContext->GetWidth(paintBuffer.mBuffer, hitLength, width); + width = 0; Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- thunderbird.spec 31 Jan 2007 04:36:22 -0000 1.91 +++ thunderbird.spec 31 Jan 2007 04:54:42 -0000 1.92 @@ -8,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5.0.9 -Release: 6%{?dist} +Release: 7%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPL Group: Applications/Internet @@ -275,6 +275,10 @@ #=============================================================================== %changelog +* Tue Jan 30 2007 Christopher Aillon 1.5.0.9-7 +- Updated cursor position patch from tagoh to fix issue with "jumping" + cursor when in a textfield with tabs. + * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-6 - Fix the DND implementation to not grab, so it works with new GTK+. From fedora-cvs-commits at redhat.com Wed Jan 31 05:01:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 00:01:34 -0500 Subject: rpms/gtk2/FC-6 gtk+-2.10.8-search.patch, 1.1, 1.2 gtk2.spec, 1.201, 1.202 Message-ID: <200701310501.l0V51YfR014139@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13938 Modified Files: gtk+-2.10.8-search.patch gtk2.spec Log Message: Fix filechooser search gtk+-2.10.8-search.patch: Makefile.am | 10 gtkfilechooserdefault.c | 1511 ++++++++++++++++++++++++++++++++++++----------- gtkfilechooserprivate.h | 35 - gtkquery.c | 142 ++++ gtkquery.h | 74 ++ gtksearchengine.c | 197 ++++++ gtksearchengine.h | 91 ++ gtksearchenginebeagle.c | 420 +++++++++++++ gtksearchenginebeagle.h | 59 + gtksearchenginesimple.c | 376 +++++++++++ gtksearchenginesimple.h | 59 + gtksearchenginetracker.c | 362 +++++++++++ gtksearchenginetracker.h | 59 + 13 files changed, 3050 insertions(+), 345 deletions(-) Index: gtk+-2.10.8-search.patch =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk+-2.10.8-search.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtk+-2.10.8-search.patch 17 Jan 2007 14:14:07 -0000 1.1 +++ gtk+-2.10.8-search.patch 31 Jan 2007 05:01:31 -0000 1.2 @@ -1,5 +1,5 @@ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginetracker.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginetracker.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Mr Jamie McCracken @@ -60,8 +60,8 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_TRACKER_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchengine.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchengine.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -154,8 +154,8 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginebeagle.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginebeagle.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -216,8 +216,8 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_BEAGLE_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchengine.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchengine.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -416,8 +416,8 @@ + + g_signal_emit (engine, signals[ERROR], 0, error_message); +} ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginetracker.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginetracker.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,362 @@ +/* + * Copyright (C) 2005 Mr Jamie McCracken @@ -781,8 +781,8 @@ + + return GTK_SEARCH_ENGINE (engine); +} ---- gtk+-2.10.8/gtk/Makefile.am.search 2007-01-16 22:14:43.000000000 -0500 -+++ gtk+-2.10.8/gtk/Makefile.am 2007-01-17 01:21:08.000000000 -0500 +--- gtk+-2.10.9/gtk/Makefile.am.search 2007-01-22 10:48:04.000000000 -0500 ++++ gtk+-2.10.9/gtk/Makefile.am 2007-01-30 23:27:42.000000000 -0500 @@ -332,6 +332,11 @@ # GTK+ header files that don't get installed @@ -807,8 +807,8 @@ fnmatch.c \ gtkaboutdialog.c \ gtkaccelgroup.c \ ---- gtk+-2.10.8/gtk/gtkfilechooserdefault.c.search 2007-01-16 22:14:43.000000000 -0500 -+++ gtk+-2.10.8/gtk/gtkfilechooserdefault.c 2007-01-17 01:21:08.000000000 -0500 +--- gtk+-2.10.9/gtk/gtkfilechooserdefault.c.search 2007-01-22 10:48:04.000000000 -0500 ++++ gtk+-2.10.9/gtk/gtkfilechooserdefault.c 2007-01-30 23:27:42.000000000 -0500 @@ -78,6 +78,8 @@ #include #include @@ -2308,7 +2308,7 @@ else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry) { /* The focus is on a dialog's action area button, *and* the widget that -@@ -7913,15 +8202,452 @@ +@@ -7913,15 +8202,453 @@ gtk_widget_grab_focus (widget); } @@ -2657,6 +2657,7 @@ + + impl->search_query = _gtk_query_new (); + _gtk_query_set_text (impl->search_query, query_text); ++ _gtk_search_engine_set_query (impl->search_engine, impl->search_query); + + g_signal_connect (impl->search_engine, "hits-added", + G_CALLBACK (search_engine_hits_added_cb), impl); @@ -2767,7 +2768,7 @@ */ filter_index = g_slist_index (impl->filters, filter); if (impl->filters && filter && filter_index < 0) -@@ -7961,28 +8687,44 @@ +@@ -7961,28 +8688,44 @@ { GtkTreePath *cursor_path; const GtkFilePath *new_path; @@ -2829,7 +2830,7 @@ } if (new_path != impl->preview_path && -@@ -7998,7 +8740,7 @@ +@@ -7998,7 +8741,7 @@ if (new_path) { impl->preview_path = gtk_file_path_copy (new_path); @@ -2838,7 +2839,7 @@ } else { -@@ -8067,6 +8809,8 @@ +@@ -8067,6 +8810,8 @@ { GtkFilePath *path; @@ -2847,7 +2848,7 @@ /* We ref the file chooser since volume_mount() may run a main loop, and the * user could close the file chooser window in the meantime. */ -@@ -8087,6 +8831,8 @@ +@@ -8087,6 +8832,8 @@ if (path != NULL) { change_folder_and_display_error (impl, path); @@ -2856,7 +2857,7 @@ gtk_file_path_free (path); } } -@@ -8119,7 +8865,10 @@ +@@ -8119,7 +8866,10 @@ goto out; if (!error && gtk_file_info_get_is_folder (info)) @@ -2868,7 +2869,7 @@ else gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL); -@@ -8136,26 +8885,25 @@ +@@ -8136,26 +8886,25 @@ GtkTreeIter *iter) { gpointer col_data; @@ -2900,7 +2901,7 @@ { GtkFileSystemVolume *volume; -@@ -8163,7 +8911,7 @@ +@@ -8163,7 +8912,7 @@ shortcuts_activate_volume (impl, volume); } @@ -2909,7 +2910,7 @@ { struct ShortcutsActivateData *data; -@@ -8176,6 +8924,10 @@ +@@ -8176,6 +8925,10 @@ GTK_FILE_INFO_IS_FOLDER, shortcuts_activate_get_info_cb, data); } @@ -2920,7 +2921,7 @@ } /* Callback used when a row in the shortcuts list is activated */ -@@ -8188,15 +8940,13 @@ +@@ -8188,15 +8941,13 @@ GtkTreeIter iter; GtkTreeIter child_iter; @@ -2938,7 +2939,7 @@ } /* Handler for GtkWidget::key-press-event on the shortcuts list */ -@@ -8236,8 +8986,15 @@ +@@ -8236,8 +8987,15 @@ gpointer data) { GtkFileChooserDefault *impl = data; @@ -2955,7 +2956,7 @@ } static gboolean -@@ -8249,6 +9006,9 @@ +@@ -8249,6 +9007,9 @@ { GtkFileChooserDefault *impl = data; @@ -2965,7 +2966,7 @@ if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) { -@@ -8274,7 +9034,7 @@ +@@ -8274,7 +9035,7 @@ GtkFileChooserDefault *impl) { /* See if we are in the new folder editable row for Save mode */ @@ -2974,7 +2975,7 @@ { const GtkFileInfo *info; gboolean had_selection; -@@ -8289,6 +9049,8 @@ +@@ -8289,6 +9050,8 @@ out: @@ -2983,7 +2984,7 @@ update_chooser_entry (impl); check_preview_change (impl); bookmarks_check_add_sensitivity (impl); -@@ -8306,6 +9068,12 @@ +@@ -8306,6 +9069,12 @@ GtkTreeIter iter, child_iter; const GtkFileInfo *info; @@ -2996,7 +2997,7 @@ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, path)) return; -@@ -8376,6 +9144,15 @@ +@@ -8376,6 +9145,15 @@ const GtkFileInfo *info; gboolean sensitive = TRUE; @@ -3012,7 +3013,7 @@ profile_start ("start", NULL); info = get_list_file_info (impl, iter); -@@ -8425,13 +9202,33 @@ +@@ -8425,13 +9203,33 @@ gpointer data) { GtkFileChooserDefault *impl = data; @@ -3048,7 +3049,7 @@ NULL); return; -@@ -8447,6 +9244,7 @@ +@@ -8447,6 +9245,7 @@ g_object_set (cell, "text", gtk_file_info_get_display_name (info), "sensitive", sensitive, @@ -3056,7 +3057,7 @@ NULL); } -@@ -8508,7 +9306,6 @@ +@@ -8508,7 +9307,6 @@ gpointer data) { GtkFileChooserDefault *impl; @@ -3064,7 +3065,7 @@ GtkFileTime time_mtime; GDate mtime, now; int days_diff; -@@ -8517,17 +9314,35 @@ +@@ -8517,17 +9315,35 @@ impl = data; @@ -3108,7 +3109,7 @@ if (time_mtime == 0) strcpy (buf, _("Unknown")); -@@ -8558,10 +9373,6 @@ +@@ -8558,10 +9374,6 @@ } } @@ -3119,7 +3120,7 @@ g_object_set (cell, "text", buf, "sensitive", sensitive, -@@ -8587,7 +9398,23 @@ +@@ -8587,7 +9399,23 @@ static void location_popup_handler (GtkFileChooserDefault *impl, const gchar *path) @@ -3144,7 +3145,7 @@ if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { -@@ -8656,6 +9483,7 @@ +@@ -8656,6 +9484,7 @@ g_assert_not_reached (); shortcuts_activate_iter (impl, &iter); @@ -3152,7 +3153,7 @@ } /* Handler for the "home-folder" keybinding signal */ -@@ -8700,26 +9528,26 @@ +@@ -8700,26 +9529,26 @@ /* Drag and drop interfaces */ static void @@ -3185,7 +3186,7 @@ pos = *gtk_tree_path_get_indices (path); bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS); -@@ -8729,13 +9557,13 @@ +@@ -8729,13 +9558,13 @@ /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */ static gboolean @@ -3204,7 +3205,7 @@ /* FIXME */ -@@ -8744,30 +9572,30 @@ +@@ -8744,30 +9573,30 @@ /* Fill the GtkTreeDragSourceIface vtable */ static void @@ -3246,8 +3247,8 @@ "child-model", child_model, "virtual-root", root, NULL); ---- gtk+-2.10.8/gtk/gtkfilechooserprivate.h.search 2007-01-16 22:14:43.000000000 -0500 -+++ gtk+-2.10.8/gtk/gtkfilechooserprivate.h 2007-01-17 01:23:26.000000000 -0500 +--- gtk+-2.10.9/gtk/gtkfilechooserprivate.h.search 2007-01-22 10:48:04.000000000 -0500 ++++ gtk+-2.10.9/gtk/gtkfilechooserprivate.h 2007-01-30 23:27:42.000000000 -0500 @@ -25,6 +25,8 @@ #include "gtkfilesystem.h" #include "gtkfilesystemmodel.h" @@ -3344,8 +3345,8 @@ guint expand_folders : 1; #if 0 ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginesimple.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginesimple.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2005 Red Hat, Inc @@ -3406,9 +3407,9 @@ +G_END_DECLS + +#endif /* __GTK_SEARCH_ENGINE_SIMPLE_H__ */ ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginesimple.c 2007-01-17 01:21:08.000000000 -0500 -@@ -0,0 +1,378 @@ +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginesimple.c 2007-01-30 23:29:14.000000000 -0500 +@@ -0,0 +1,376 @@ +/* + * Copyright (C) 2005 Red Hat, Inc + * @@ -3488,8 +3489,6 @@ + simple->priv->query = NULL; + } + -+ g_free (simple->priv); -+ + G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object); +} + @@ -3787,8 +3786,8 @@ + + return engine; +} ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtksearchenginebeagle.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtksearchenginebeagle.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,420 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -4210,8 +4209,8 @@ + + return GTK_SEARCH_ENGINE (engine); +} ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtkquery.c 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtkquery.c 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2005 Novell, Inc. @@ -4355,8 +4354,8 @@ + g_strdup (mime_type)); +} + ---- /dev/null 2007-01-16 08:16:47.736226048 -0500 -+++ gtk+-2.10.8/gtk/gtkquery.h 2007-01-17 01:21:08.000000000 -0500 +--- /dev/null 2007-01-30 22:42:40.851021051 -0500 ++++ gtk+-2.10.9/gtk/gtkquery.h 2007-01-30 23:27:42.000000000 -0500 @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2005 Novell, Inc. Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- gtk2.spec 17 Jan 2007 15:10:45 -0000 1.201 +++ gtk2.spec 31 Jan 2007 05:01:31 -0000 1.202 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -299,6 +299,9 @@ %doc tmpdocs/examples %changelog +* Tue Jan 30 2007 Matthias Clasen - 2.10.8-2 +- Fix filechooser search support (#225149) + * Wed Jan 17 2007 Matthias Clasen - 2.10.8-1 - Update to 2.10.8 From fedora-cvs-commits at redhat.com Wed Jan 31 05:08:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 00:08:10 -0500 Subject: rpms/firefox/FC-6 firefox-1.5-dnd-nograb.patch, NONE, 1.1 firefox-1.5-pango-cursor-position-more.patch, NONE, 1.1 firefox-1.5-pango-justified-range.patch, NONE, 1.1 firefox-1.5-pango-underline.patch, NONE, 1.1 firefox.sh.in, 1.14, 1.15 firefox.spec, 1.161, 1.162 Message-ID: <200701310508.l0V58A8M016617@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv16557 Modified Files: firefox.sh.in firefox.spec Added Files: firefox-1.5-dnd-nograb.patch firefox-1.5-pango-cursor-position-more.patch firefox-1.5-pango-justified-range.patch firefox-1.5-pango-underline.patch Log Message: * Tue Jan 30 2007 Christopher Aillon 1.5.0.9-2 - Fix the DND implementation to not grab, so it works with new GTK+. - Multilib -devel and -debuginfo fixes - Various pango fixes from behdad and tagoh - Some minor langpack fixes firefox-1.5-dnd-nograb.patch: nsDragService.cpp | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE firefox-1.5-dnd-nograb.patch --- See https://bugzilla.mozilla.org/show_bug.cgi?id=367203 Index: mozilla/widget/src/gtk2/nsDragService.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v retrieving revision 1.9.10.1 diff -d -u -p -r1.9.10.1 nsDragService.cpp --- mozilla/widget/src/gtk2/nsDragService.cpp 22 Jun 2006 21:37:45 -0000 1.9.10.1 +++ mozilla/widget/src/gtk2/nsDragService.cpp 31 Jan 2007 04:27:43 -0000 @@ -799,7 +799,6 @@ nsDragService::IsTargetContextList(void) void nsDragService::GetTargetDragData(GdkAtom aFlavor) { - gtk_grab_add(mHiddenWidget); PR_LOG(sDragLm, PR_LOG_DEBUG, ("getting data flavor %d\n", aFlavor)); PR_LOG(sDragLm, PR_LOG_DEBUG, ("mLastWidget is %p and mLastContext is %p\n", mTargetWidget, mTargetDragContext)); @@ -817,7 +816,6 @@ nsDragService::GetTargetDragData(GdkAtom gtk_main_iteration(); } PR_LOG(sDragLm, PR_LOG_DEBUG, ("finished inner iteration\n")); - gtk_grab_remove(mHiddenWidget); } void firefox-1.5-pango-cursor-position-more.patch: nsTextFrame.cpp | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- NEW FILE firefox-1.5-pango-cursor-position-more.patch --- diff -pruN -x '.moz*' -x .deps -x 'firefox*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-08-26 13:33:35.000000000 +0900 +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-13 20:54:32.000000000 +0900 @@ -4261,12 +4261,10 @@ nsTextFrame::GetPointFromOffset(nsPresCo if (tc) { totalLength = tc->Text()->GetLength(); // raw value which includes whitespace } - if ((hitLength == textLength) && (inOffset = mContentLength) && - (mContentOffset + mContentLength == totalLength)) { - // no need to re-measure when at the end of the last-in-flow - } + if (hitLength > 0) + inRendContext->GetRangeWidth(paintBuffer.mBuffer, textLength, 0, hitLength, (PRUint32&)width); else - inRendContext->GetWidth(paintBuffer.mBuffer, hitLength, width); + width = 0; } if ((hitLength == textLength) && (TEXT_TRIMMED_WS & mState)) { // firefox-1.5-pango-justified-range.patch: nsTextFrame.cpp | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) --- NEW FILE firefox-1.5-pango-justified-range.patch --- diff -pruN -x '.moz*' -x .deps -x 'thunderbird*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' -x 'firefox*' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-12-20 12:15:38.000000000 +0900 +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-20 21:29:39.000000000 +0900 @@ -2973,15 +2973,16 @@ nsTextFrame::RenderString(nsIRenderingCo nsIFontMetrics* lastFont = aTextStyle.mLastFont; PRInt32 pendingCount; - PRUnichar* runStart = bp; + PRUnichar* runStart = bp, *top = aBuffer; nscoord charWidth, width = 0; PRInt32 countSoFar = 0; + PRUint32 offset; // Save the color we want to use for the text, since calls to // PaintTextDecorations in this method will call SetColor() on the rendering // context. nscolor textColor; aRenderingContext.GetColor(textColor); - for (; --aLength >= 0; aBuffer++) { + for (offset = 0; offset < aLength; aBuffer++, offset++) { nsIFontMetrics* nextFont; nscoord glyphWidth = 0; PRUnichar ch = *aBuffer; @@ -3038,7 +3039,7 @@ nsTextFrame::RenderString(nsIRenderingCo else if (ch == ' ') { glyphWidth += aTextStyle.mSpaceWidth + aTextStyle.mWordSpacing + aTextStyle.mLetterSpacing; } - else if (IS_HIGH_SURROGATE(ch) && aLength > 0 && + else if (IS_HIGH_SURROGATE(ch) && (offset + 1) < aLength && IS_LOW_SURROGATE(*(aBuffer+1))) { // special handling for surrogate pair @@ -3046,7 +3047,7 @@ nsTextFrame::RenderString(nsIRenderingCo glyphWidth += charWidth + aTextStyle.mLetterSpacing; // copy the surrogate low *bp++ = ch; - --aLength; + offset++; aBuffer++; ch = *aBuffer; // put the width into the space buffer @@ -3058,10 +3059,10 @@ nsTextFrame::RenderString(nsIRenderingCo glyphWidth = 0; } else { - aRenderingContext.GetWidth(ch, charWidth); + aRenderingContext.GetRangeWidth(top, aLength, offset, offset + 1, (PRUint32&)charWidth); glyphWidth += charWidth + aTextStyle.mLetterSpacing; } - if (justifying && (!isEndOfLine || aLength > 0) + if (justifying && (!isEndOfLine || (offset + 1) < aLength) && IsJustifiableCharacter(ch, isCJ)) { glyphWidth += aTextStyle.mExtraSpacePerJustifiableCharacter; if ((PRUint32)--aTextStyle.mNumJustifiableCharacterToRender firefox-1.5-pango-underline.patch: nsTextFrame.cpp | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) --- NEW FILE firefox-1.5-pango-underline.patch --- diff -pruN -x '.moz*' -x .deps -x 'thunderbird*' -x '*.mk' -x 'config*' -x dist -x build -x toolkit -x '*o' -x '*a' -x '*html' mozilla.orig/layout/generic/nsTextFrame.cpp mozilla/layout/generic/nsTextFrame.cpp --- mozilla.orig/layout/generic/nsTextFrame.cpp 2006-12-20 12:53:26.000000000 +0900 +++ mozilla/layout/generic/nsTextFrame.cpp 2006-12-20 15:43:14.000000000 +0900 @@ -2097,11 +2097,11 @@ nsTextFrame::PaintTextDecorations(nsIRen nsRect rect = GetRect(); while(aDetails){ const nscoord* sp= aSpacing; - PRInt32 startOffset = 0; - PRInt32 textWidth = 0; - PRInt32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex)); - PRInt32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex)); - PRInt32 i; + PRUint32 startOffset = 0; + PRUint32 textWidth = 0; + PRUint32 start = PR_MAX(0,(aDetails->mStart - (PRInt32)aIndex)); + PRUint32 end = PR_MIN((PRInt32)aLength,(aDetails->mEnd - (PRInt32)aIndex)); + PRUint32 i; if ((start < end) && ((aLength - start) > 0)) { //aDetails allready processed to have offsets from frame start not content offsets @@ -2117,7 +2117,7 @@ nsTextFrame::PaintTextDecorations(nsIRen } } else - aRenderingContext.GetWidth(aText, start, startOffset); + aRenderingContext.GetRangeWidth(aText, aLength, 0, start, startOffset); } if (sp){ for (i = start; i < end;i ++){ @@ -2125,8 +2125,7 @@ nsTextFrame::PaintTextDecorations(nsIRen } } else - aRenderingContext.GetWidth(aText + start, - PRUint32(end - start), textWidth); + aRenderingContext.GetRangeWidth(aText, aLength, start, end, textWidth); } nscoord offset, size; Index: firefox.sh.in =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.sh.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- firefox.sh.in 3 Sep 2006 22:24:52 -0000 1.14 +++ firefox.sh.in 31 Jan 2007 05:08:01 -0000 1.15 @@ -42,6 +42,7 @@ MOZ_LIB_DIR="/usr/lib64" fi MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION" +MOZ_EXTENSIONS_DIR="$MOZ_DIST_BIN/extensions" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client" MOZ_CLIENT_PROGRAM_PARAM="-a firefox" @@ -137,9 +138,13 @@ # check system locale MOZARGS= -MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"` -[ -f $MOZILLA_FIVE_HOME/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE" +# Try without a local variant first, then with a local variant +# So that pt-BR doesn't try to use pt for example +SHORTMOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*||g"` +[ -f $MOZ_EXTENSIONS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ] && MOZARGS="-UILocale $SHORTMOZLOCALE" +MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"` +[ -f $MOZ_EXTENSIONS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE" # if there's no command line argument and there's not a running # instance then just fire up a new copy of the browser Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- firefox.spec 19 Dec 2006 18:30:28 -0000 1.161 +++ firefox.spec 31 Jan 2007 05:08:01 -0000 1.162 @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.9 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -58,9 +58,13 @@ Patch82: firefox-1.5-pango-mathml.patch Patch83: firefox-1.5-pango-cursor-position.patch Patch84: firefox-1.5-pango-printing.patch +Patch85: firefox-1.5-pango-cursor-position-more.patch +Patch86: firefox-1.5-pango-justified-range.patch +Patch87: firefox-1.5-pango-underline.patch # Other Patch102: firefox-1.5-theme-change.patch +Patch103: firefox-1.5-dnd-nograb.patch %if %{official_branding} # Required by Mozilla Corporation @@ -130,7 +134,9 @@ #--------------------------------------------------------------------- %prep -%setup -q -n mozilla +%setup -q -c %{name}-%{version} +cd mozilla + %patch3 -p1 %patch4 -p1 #%patch5 -p1 -b .visibility @@ -151,6 +157,9 @@ %patch82 -p1 -b .pango-mathml %patch83 -p1 -b .pango-cursor-position %patch84 -p1 -b .pango-printing +%patch85 -p1 -b .pango-cursor-position-more +%patch86 -p1 -b .pango-justified-range +%patch87 -p1 -b .pango-underline pushd gfx/src/ps # This sort of sucks, but it works for now. ln -s ../gtk/nsFontMetricsPango.h . @@ -160,6 +169,7 @@ popd %patch102 -p0 -b .theme-change +%patch103 -p1 -b .dnd-nograb # For branding specific patches. @@ -180,12 +190,13 @@ %endif # set up our default bookmarks -%{__cp} %{SOURCE12} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html +%{__cp} %{SOURCE12} profile/defaults/bookmarks.html #--------------------------------------------------------------------- %build +cd mozilla # Build with -Os as it helps the browser; also, don't override mozilla's warning # level; they use -Wall but disable a few warnings that show up _everywhere_ @@ -208,6 +219,7 @@ #--------------------------------------------------------------------- %install +cd mozilla %{__rm} -rf $RPM_BUILD_ROOT cd browser/installer @@ -273,6 +285,7 @@ # Install langpacks %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions %{__tar} xjf %{SOURCE2} + for langpack in `ls firefox-langpacks/*.xpi`; do language=`basename $langpack .xpi` extensiondir=$RPM_BUILD_ROOT%{mozappdir}/extensions/langpack-$language at firefox.mozilla.org @@ -284,7 +297,12 @@ %{__mkdir_p} $langtmp jarfile=$extensiondir/chrome/$language.jar unzip $jarfile -d $langtmp - sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" $langtmp/locale/browser-region/region.properties + + sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \ + -e "s|homePageDefault.*$|homePageDefault=%{indexhtml}|g;" \ + -e "s|startup.homepage_override_url.*$|startup.homepage_override_url=%{indexhtml}|g;" \ + $langtmp/locale/browser-region/region.properties + find $langtmp -type f | xargs chmod 644 %{__rm} -rf $jarfile cd $langtmp @@ -296,6 +314,25 @@ # Prepare our devel package %if %{build_devel_package} +# Fix multilib devel conflicts... +%ifarch x86_64 ia64 s390x ppc64 +%define mozbits 64 +%else +%define mozbits 32 +%endif + +for genheader in js/jsautocfg mozilla-config; do +mv dist/include/${genheader}.h dist/include/${genheader}%{mozbits}.h +cat > dist/include/${genheader}.h << EOF +// This file exists to fix multilib conflicts +#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__ppc64__) +#include "${genheader}64.h" +#else +#include "${genheader}32.h" +#endif +EOF +done + %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/firefox-%{version} %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/firefox-%{version} %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig @@ -415,6 +452,12 @@ #--------------------------------------------------------------------- %changelog +* Tue Jan 30 2007 Christopher Aillon 1.5.0.9-2 +- Fix the DND implementation to not grab, so it works with new GTK+. +- Multilib -devel and -debuginfo fixes +- Various pango fixes from behdad and tagoh +- Some minor langpack fixes + * Tue Dec 19 2006 Christopher Aillon 1.5.0.9-1 - Update to 1.5.0.9 From fedora-cvs-commits at redhat.com Wed Jan 31 07:26:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 02:26:25 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.403,1.404 Message-ID: <200701310726.l0V7QPuA029645@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29303 Modified Files: eclipse.spec Log Message: * Tue Jan 30 2007 Ben Konrath 3.2.1-34 - Create symlinks to the SWT JNI libs in %%{_libdir}/eclipse with sane versions. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.403 retrieving revision 1.404 diff -u -r1.403 -r1.404 --- eclipse.spec 29 Jan 2007 22:34:29 -0000 1.403 +++ eclipse.spec 31 Jan 2007 07:26:23 -0000 1.404 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 33%{?dist} +Release: 34%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1036,7 +1036,16 @@ done popd -# Install the SWT symlinks in libdir +# Install symlinks to the SWT JNI shared libraries in /usr/lib/eclipse with sane +# versions +pushd $RPM_BUILD_ROOT%{_libdir}/%{name} +for lib in $(find configuration -name libswt\*.so); do + ln -s %{_libdir}/%{name}/$lib `basename $lib | sed "s/-gtk-.*.so/-gtk-%{eclipse_majmin}.so/"` + ln -s %{_libdir}/%{name}/$lib `basename $lib | sed "s/-gtk-.*.so/-gtk-%{eclipse_majmin}.%{eclipse_micro}.so/"` +done +popd + +# Install the SWT jar symlinks in libdir SWTJARVERSION=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\"/>:\1:") pushd $RPM_BUILD_ROOT%{_libdir}/%{name} ln -s %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar @@ -1431,6 +1440,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/plugins %dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/libswt-*.so %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/configuration %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi @@ -1732,6 +1742,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue Jan 30 2007 Ben Konrath 3.2.1-34 +- Create symlinks to the SWT JNI libs in %%{_libdir}/eclipse with sane + versions. + * Mon Jan 29 2007 Ben Konrath 3.2.1-33 - Check for features directory in sdk postun script. - Resolves: #224588. From fedora-cvs-commits at redhat.com Wed Jan 31 09:10:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 04:10:03 -0500 Subject: rpms/kernel/FC-6 linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch, NONE, 1.1 xen-oprofile-on-intel-core.patch, NONE, 1.1 kernel-2.6.spec, 1.2900, 1.2901 Message-ID: <200701310910.l0V9A3Sp007372@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7208 Modified Files: kernel-2.6.spec Added Files: linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch xen-oprofile-on-intel-core.patch Log Message: - Xenoprof for intel core (#215519). - Fix iSCSI root oops on x86_64 xen domU. linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch: pci-dma-xen.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+) --- NEW FILE linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch --- From: Rik van Riel Subject: [PATCH][RHEL5] fix iSCSI root oops on x86_64 xen domU Date: Tue, 14 Nov 2006 15:46:28 -0500 Bugzilla: 215581 Message-Id: <455A2B24.1090002 at redhat.com> Changelog: Xen: fix iSCSI root oops on x86_64 xen domU With iSCSI root on x86-64 domU, the kernel oopses in scsi_calculate_bounce_limit() because dma_ops is NULL. The attached patch (from upstream) initializes the iommu operations pointer. Even though the patch is to arch/i386/ it is x86-64 only, because this is inside the big x86-64 #ifdef in arch/i386/kernel/pci-dma-xen.c. Thanks to Mark McLoughlin for noticing the issue and finding the fix in the upstream tree. Fixes bug #215581 -- Who do you trust? The people with all the right answers? Or the people with the right questions? # HG changeset patch # User chrisw at sous-sol.org # Date Tue Oct 03 13:44:38 2006 -0400 # Node ID e5a7f30e1db3f1084f6789d21ea2a6fdaafdb96d # parent: 6cd0fae5d84c4a4b15546ceaade74b7d7f044404 Make sure no_iommu_init is called when needed on x86_64. Thanks to Mark McLoughlin for spotting the issue and proposing a fix. Index: latest/arch/i386/kernel/pci-dma-xen.c =================================================================== --- latest.orig/arch/i386/kernel/pci-dma-xen.c +++ latest/arch/i386/kernel/pci-dma-xen.c @@ -20,6 +20,9 @@ #include #ifdef __x86_64__ +#include +#include + int iommu_merge __read_mostly = 0; EXPORT_SYMBOL(iommu_merge); @@ -70,6 +73,23 @@ __init int iommu_setup(char *p) { return 1; } + +static int __init pci_iommu_init(void) +{ +#ifdef CONFIG_CALGARY_IOMMU + calgary_iommu_init(); +#endif + +#ifdef CONFIG_IOMMU + gart_iommu_init(); +#endif + + no_iommu_init(); + return 0; +} + +/* Must execute after PCI subsystem */ +fs_initcall(pci_iommu_init); #endif struct dma_coherent_mem { xen-oprofile-on-intel-core.patch: nmi_int.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) --- NEW FILE xen-oprofile-on-intel-core.patch --- From: Glauber de Oliveira Costa Subject: [PATCH RHEL-5] oprofile on Intel CORE Date: Tue, 5 Dec 2006 16:49:13 -0200 Bugzilla: 213964 Message-Id: <20061205184913.GD13991 at redhat.com> Changelog: xen: oprofile on Intel CORE (with the patch _really_ following this time) xen oprofile is not currently working on intel core and core 2 archs. ( BZ 213964 ). Upstream took the patch that follows, and the patch looks sane. It seems it was mostly a matter of matching the cpuid of the new archs. It's also very low risk, since it just add new cases, without interferring in the old ones. It's neither a blocker nor we know if it is going to get the blocker flag, but just in case, ACKs ? ;-) -- Glauber de Oliveira Costa Red Hat Inc. "Free as in Freedom" # HG changeset patch # User kfraser at localhost.localdomain # Node ID ca9b569ffb634604e6da477ab0b7a26004fe26bf # Parent 7f7aeaa0cba6ec12a7230573b3bb8c32a26071c4 [OPROFILE] Add support for core and core2 chips. Tested on Woodcrest processors. Requires Oprofile 0.9.2. Signed-off-by: Andrew Theurer diff -r 7f7aeaa0cba6 -r ca9b569ffb63 xen/arch/x86/oprofile/nmi_int.c --- xen/arch/x86/oprofile/nmi_int.c Fri Nov 17 10:02:54 2006 +++ xen/arch/x86/oprofile/nmi_int.c Fri Nov 17 10:05:12 2006 @@ -305,22 +305,24 @@ { __u8 cpu_model = current_cpu_data.x86_model; - if (cpu_model > 0xd) { + if (cpu_model > 15) { printk("xenoprof: Initialization failed. " "Intel processor model %d for P6 class family is not " "supported\n", cpu_model); return 0; } - - if (cpu_model == 9) { + else if (cpu_model == 15) + strncpy (cpu_type, "i386/core_2", XENOPROF_CPU_TYPE_SIZE - 1); + else if (cpu_model == 14) + strncpy (cpu_type, "i386/core", XENOPROF_CPU_TYPE_SIZE - 1); + else if (cpu_model == 9) strncpy (cpu_type, "i386/p6_mobile", XENOPROF_CPU_TYPE_SIZE - 1); - } else if (cpu_model > 5) { + else if (cpu_model > 5) strncpy (cpu_type, "i386/piii", XENOPROF_CPU_TYPE_SIZE - 1); - } else if (cpu_model > 2) { + else if (cpu_model > 2) strncpy (cpu_type, "i386/pii", XENOPROF_CPU_TYPE_SIZE - 1); - } else { + else strncpy (cpu_type, "i386/ppro", XENOPROF_CPU_TYPE_SIZE - 1); - } model = &op_ppro_spec; return 1; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v retrieving revision 1.2900 retrieving revision 1.2901 diff -u -r1.2900 -r1.2901 --- kernel-2.6.spec 30 Jan 2007 22:09:44 -0000 1.2900 +++ kernel-2.6.spec 31 Jan 2007 09:10:00 -0000 1.2901 @@ -370,6 +370,7 @@ Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch +Patch959: linux-2.6-xen-iscsi-oops-on-x86_64-xen-domu.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -495,6 +496,7 @@ Patch20000: xen-printf-rate-limit.patch Patch20001: xen-version-strings.patch Patch20002: xen-grant-security.patch +Patch20015: xen-oprofile-on-intel-core.patch # END OF PATCH DEFINITIONS @@ -898,6 +900,8 @@ %patch955 -p1 # ia64 xen cleanups for kexec/kdump %patch958 -p1 + +%patch959 -p1 %endif # @@ -1145,6 +1149,7 @@ %patch20000 -p1 %patch20001 -p1 %patch20002 -p1 +%patch20015 -p1 # Update the Makefile version strings sed -i -e 's/\(^export XEN_BUILDER.*$\)/\1'%{?dist}'/' Makefile @@ -2017,6 +2022,10 @@ %endif %changelog +* Wed Jan 31 2007 Markus Armbruster +- Xenoprof for intel core (#215519). +- Fix iSCSI root oops on x86_64 xen domU. + * Tue Jan 30 2007 Chuck Ebbert - Minor config file changes From fedora-cvs-commits at redhat.com Wed Jan 31 10:49:30 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 05:49:30 -0500 Subject: rpms/radvd/devel .cvsignore, 1.9, 1.10 radvd.spec, 1.32, 1.33 sources, 1.9, 1.10 radvd-0.7.2-shutup-103543.patch, 1.1, NONE radvd-0.7.2-srcmac-103469.patch, 1.1, NONE Message-ID: <200701311049.l0VAnUjB031410@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/radvd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31219 Modified Files: .cvsignore radvd.spec sources Removed Files: radvd-0.7.2-shutup-103543.patch radvd-0.7.2-srcmac-103469.patch Log Message: * Wed Jan 31 2007 Martin Bacovsky - 1.0-1.fc7 - Resolves: #225542: radvd 1.0 released Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Jan 2006 16:35:29 -0000 1.9 +++ .cvsignore 31 Jan 2007 10:49:27 -0000 1.10 @@ -1,5 +1 @@ -radvd-0.7.2.tar.gz -radvd-0.7.3.tar.gz -radvd-0.8.tar.gz -radvd-0.9.tar.gz -radvd-0.9.1.tar.gz +radvd-1.0.tar.gz Index: radvd.spec =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- radvd.spec 18 Aug 2006 20:17:21 -0000 1.32 +++ radvd.spec 31 Jan 2007 10:49:27 -0000 1.33 @@ -2,8 +2,8 @@ %define RADVD_UID 75 Summary: A Router Advertisement daemon Name: radvd -Version: 0.9.1 -Release: 4 +Version: 1.0 +Release: 1%{?dist} License: BSD-style Group: System Environment/Daemons Source: http://www.litech.org/radvd/radvd-%{version}.tar.gz @@ -83,6 +83,9 @@ %{_sbindir}/radvdump %changelog +* Wed Jan 31 2007 Martin Bacovsky - 1.0-1.fc7 +- Resolves: #225542: radvd 1.0 released + * Fri Aug 18 2006 Jesse Keating - 0.9.1-4 - rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc* (#203001) Index: sources =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Jan 2006 16:35:29 -0000 1.9 +++ sources 31 Jan 2007 10:49:27 -0000 1.10 @@ -1 +1 @@ -d5d24abd3dddc2b702e621ebf6b9cfdc radvd-0.9.1.tar.gz +8bce4a21757cf069f5a69e2f9bee9e5b radvd-1.0.tar.gz --- radvd-0.7.2-shutup-103543.patch DELETED --- --- radvd-0.7.2-srcmac-103469.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 11:00:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:00:13 -0500 Subject: rpms/system-config-services/devel .cvsignore, 1.29, 1.30 sources, 1.39, 1.40 system-config-services.spec, 1.40, 1.41 Message-ID: <200701311100.l0VB0Dma007204@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6989 Modified Files: .cvsignore sources system-config-services.spec Log Message: use "install -m" to install a lot of files without executable bits (#222579) Resolves: #222579 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 17 Jan 2007 14:40:11 -0000 1.29 +++ .cvsignore 31 Jan 2007 11:00:06 -0000 1.30 @@ -1 +1 @@ -system-config-services-0.9.4.tar.bz2 +system-config-services-0.9.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 17 Jan 2007 14:40:11 -0000 1.39 +++ sources 31 Jan 2007 11:00:06 -0000 1.40 @@ -1 +1 @@ -b2862f83dae15ecc172f41671c53e422 system-config-services-0.9.4.tar.bz2 +2bcf681fc71efec5c0a77f52c0e58bea system-config-services-0.9.5.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- system-config-services.spec 17 Jan 2007 14:40:11 -0000 1.40 +++ system-config-services.spec 31 Jan 2007 11:00:06 -0000 1.41 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.bz2 @@ -76,6 +76,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Wed Jan 31 2007 Nils Philippsen - 0.9.5 +- use "install -m" to install a lot of files without executable bits (#222579) + * Wed Dec 6 2006 Harald Hoyer - 0.9.4 - fixed service start/stop (#218429) - translation update (#216558) From fedora-cvs-commits at redhat.com Wed Jan 31 11:10:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:10:46 -0500 Subject: rpms/kdelibs/FC-6 kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch, NONE, 1.1 kdelibs.spec, 1.203, 1.204 Message-ID: <200701311110.l0VBAktG015201@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv15076 Modified Files: kdelibs.spec Added Files: kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch Log Message: - apply patch to fix #225420, CVE-2007-0537 Konqueror improper HTML comment rendering, thanks to Dirk M??ller, KDE security team kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch: htmltokenizer.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE kdelibs-3.5.6-bz#225420-CVE-2007-0537.patch --- Index: khtml/html/htmltokenizer.cpp =================================================================== --- khtml/html/htmltokenizer.cpp (Revision 626790) +++ khtml/html/htmltokenizer.cpp (Revision 626791) @@ -316,7 +316,7 @@ while ( !src.isEmpty() ) { checkScriptBuffer(); unsigned char ch = src->latin1(); - if ( !scriptCodeResync && !brokenComments && !textarea && !xmp && !title && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "= %{arts_epoch}:%{arts_version} Requires: qt >= %{qt_epoch}:%{qt_version} Requires: cups-libs >= %{cups_epoch}:1.1.12 @@ -170,6 +174,9 @@ %patch40 -p1 -b .kdeprint-utf8 %patch41 -p1 -b .utempter +# security +%patch1000 -p0 -b .bz#225420-CVE-2007-0537 + perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h %build @@ -385,7 +392,11 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog -* Tue Jan 30 2007 Than Ngo - 6:3.5.6-0.1 +* Wed Jan 31 2007 Than Ngo 6:3.5.6-0.2.fc6 +- apply patch to fix #225420, CVE-2007-0537 Konqueror improper + HTML comment rendering, thanks to Dirk M??ller, KDE security team + +* Tue Jan 30 2007 Than Ngo - 6:3.5.6-0.1.fc6 - 3.5.6 * Thu Dec 07 2006 Than Ngo - 6:3.5.5-0.3 From fedora-cvs-commits at redhat.com Wed Jan 31 11:12:28 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:12:28 -0500 Subject: rpms/system-config-users/devel .cvsignore, 1.39, 1.40 sources, 1.39, 1.40 system-config-users.spec, 1.45, 1.46 Message-ID: <200701311112.l0VBCSOl016606@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-users/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15327 Modified Files: .cvsignore sources system-config-users.spec Log Message: use "install -m" to install a lot of files without executable bits (#222580) fix warning about all-digit usernames fix typos (#142122, #224444) check passwords with cracklib if available (#82723) add BR: find-utils Resolves: #82723, #142122, #222580, #224444 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 21 Dec 2006 12:37:18 -0000 1.39 +++ .cvsignore 31 Jan 2007 11:12:26 -0000 1.40 @@ -1 +1 @@ -system-config-users-1.2.51.tar.bz2 +system-config-users-1.2.52.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 21 Dec 2006 12:37:18 -0000 1.39 +++ sources 31 Jan 2007 11:12:26 -0000 1.40 @@ -1 +1 @@ -b640332a5e1f273a4eddcf362b9fa251 system-config-users-1.2.51.tar.bz2 +9da8f621e017e15ee424f41bed37c73b system-config-users-1.2.52.tar.bz2 Index: system-config-users.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- system-config-users.spec 21 Dec 2006 12:37:18 -0000 1.45 +++ system-config-users.spec 31 Jan 2007 11:12:26 -0000 1.46 @@ -1,6 +1,6 @@ Summary: A graphical interface for administering users and groups Name: system-config-users -Version: 1.2.51 +Version: 1.2.52 Release: 1%{?dist} URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -12,6 +12,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool +BuildRequires: find-utils Obsoletes: redhat-config-users Requires: libuser >= 0.53.1 Requires: python2 @@ -24,6 +25,14 @@ Requires: rhpl Requires(post): hicolor-icon-theme Requires(postun): hicolor-icon-theme +%if 0%{?fedora} >= 7 || 0%{?redhat} >= 6 +Requires: cracklib-python +%else +%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5 +Requires: cracklib >= 2.8.6 +%endif +%endif + BuildPrereq: python2 %description @@ -77,6 +86,21 @@ %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users %changelog +* Wed Jan 31 2007 Nils Philippsen - 1.2.52 +- use "install -m" to install a lot of files without executable bits (#222580) + +* Tue Jan 30 2007 Nils Philippsen +- fix warning about all-digit usernames + +* Mon Jan 29 2007 Nils Philippsen +- fix typos (#142122, #224444) + +* Thu Jan 25 2007 Nils Philippsen +- check passwords with cracklib if available (#82723) + +* Wed Jan 10 2007 Nils Philippsen +- add BR: find-utils + * Thu Dec 21 2006 Nils Philippsen - 1.2.51 - pick up updated translations (#216396) From fedora-cvs-commits at redhat.com Wed Jan 31 11:14:43 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:14:43 -0500 Subject: rpms/ed/devel ed.spec,1.23,1.24 Message-ID: <200701311114.l0VBEhFi018148@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/ed/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18108 Modified Files: ed.spec Log Message: - use RPM_OPT_FLAGS, this fixes debuginfo Index: ed.spec =================================================================== RCS file: /cvs/dist/rpms/ed/devel/ed.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ed.spec 23 Jan 2007 14:55:04 -0000 1.23 +++ ed.spec 31 Jan 2007 11:14:40 -0000 1.24 @@ -1,7 +1,7 @@ Summary: The GNU line editor. Name: ed Version: 0.4 -Release: 1 +Release: 2 License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.bz2 @@ -26,7 +26,7 @@ %build %configure --exec-prefix=/ -make %{?_smp_mflags} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 @@ -56,6 +56,9 @@ %attr(0644,root,root) %{_mandir}/*/* %changelog +* Wed Jan 31 2007 Karsten Hopp 0.4-2 +- use RPM_OPT_FLAGS, this fixes debuginfo + * Tue Jan 23 2007 Karsten Hopp 0.4-1 - new upstream version From fedora-cvs-commits at redhat.com Wed Jan 31 11:32:23 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:32:23 -0500 Subject: rpms/radvd/devel radvd.spec,1.33,1.34 Message-ID: <200701311132.l0VBWNJ6019254@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/radvd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18604 Modified Files: radvd.spec Log Message: * Wed Jan 31 2007 Martin Bacovsky - 1.0-1.fc7 - FPIE flag droped Index: radvd.spec =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- radvd.spec 31 Jan 2007 10:49:27 -0000 1.33 +++ radvd.spec 31 Jan 2007 11:32:20 -0000 1.34 @@ -1,9 +1,12 @@ %define initdir /etc/rc.d/init.d +#%(if test -d /etc/init.d/. ; then echo /etc/init.d ; else echo /etc/rc.d/init.d ; fi) + %define RADVD_UID 75 Summary: A Router Advertisement daemon Name: radvd Version: 1.0 Release: 1%{?dist} +# The code includes the advertising clause, so it's GPL-incompatible License: BSD-style Group: System Environment/Daemons Source: http://www.litech.org/radvd/radvd-%{version}.tar.gz @@ -26,8 +29,7 @@ %setup %build -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" -export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen' +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure --with-pidfile=/var/run/radvd/radvd.pid make # make %{?_smp_mflags} @@ -37,6 +39,7 @@ %install [ $RPM_BUILD_ROOT != "/" ] && rm -rf $RPM_BUILD_ROOT + %makeinstall mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{initdir} From fedora-cvs-commits at redhat.com Wed Jan 31 11:35:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:35:47 -0500 Subject: rpms/system-config-users/devel sources, 1.40, 1.41 system-config-users.spec, 1.46, 1.47 Message-ID: <200701311135.l0VBZlr5015991@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-users/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15976 Modified Files: sources system-config-users.spec Log Message: fix BZ number in changelog Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 31 Jan 2007 11:12:26 -0000 1.40 +++ sources 31 Jan 2007 11:35:45 -0000 1.41 @@ -1 +1 @@ -9da8f621e017e15ee424f41bed37c73b system-config-users-1.2.52.tar.bz2 +0f75d3ecfd8b882a144e3784c97386a4 system-config-users-1.2.52.tar.bz2 Index: system-config-users.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- system-config-users.spec 31 Jan 2007 11:12:26 -0000 1.46 +++ system-config-users.spec 31 Jan 2007 11:35:45 -0000 1.47 @@ -93,7 +93,7 @@ - fix warning about all-digit usernames * Mon Jan 29 2007 Nils Philippsen -- fix typos (#142122, #224444) +- fix typos (#217247, #224444) * Thu Jan 25 2007 Nils Philippsen - check passwords with cracklib if available (#82723) From fedora-cvs-commits at redhat.com Wed Jan 31 11:42:35 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 06:42:35 -0500 Subject: rpms/sysklogd/devel sysklogd.spec,1.45,1.46 Message-ID: <200701311142.l0VBgZOi016136@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/sysklogd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16118 Modified Files: sysklogd.spec Log Message: fix typo in %post scriptlet Index: sysklogd.spec =================================================================== RCS file: /cvs/dist/rpms/sysklogd/devel/sysklogd.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sysklogd.spec 29 Jan 2007 21:01:16 -0000 1.45 +++ sysklogd.spec 31 Jan 2007 11:42:33 -0000 1.46 @@ -1,7 +1,7 @@ Summary: System logging and kernel message trapping daemons Name: sysklogd Version: 1.4.1 -Release: 44%{?dist} +Release: 45%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.infodrom.org/projects/sysklogd/ @@ -77,7 +77,7 @@ for n in /var/log/{messages,secure,maillog,spooler} do [ -f $n ] && continue - umask 066 && touch $n) + umask 066 && touch $n done exit 0 @@ -111,6 +111,9 @@ %{_mandir}/*/* %changelog +* Wed Jan 31 2007 Nils Philippsen 1.4.1-45 +- fix typo in %%post scriptlet + * Mon Jan 29 2007 Peter Vrabec 1.4.1-44 - fix scriptlets From fedora-cvs-commits at redhat.com Wed Jan 31 12:09:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 07:09:10 -0500 Subject: rpms/rhythmbox/devel rhythmbox-0.9.7-mmkeys-plugin.patch, NONE, 1.1 rhythmbox.spec, 1.93, 1.94 rhythmbox-0.9.2-dbus-api.patch, 1.1, NONE rhythmbox-0.9.3.1-playlist.patch, 1.1, NONE rhythmbox-0.9.3.1-trayicon.patch, 1.1, NONE rhythmbox-0.9.3.1-use-icon-name.patch, 1.1, NONE rhythmbox-0.9.4.1-ncb.patch, 1.1, NONE rhythmbox-0.9.4.1-notify.patch, 1.1, NONE rhythmbox-0.9.5-dbus-deprecated.patch, 1.1, NONE rhythmbox-0.9.5-missing-radio-crash.patch, 1.1, NONE rhythmbox-0.9.5-transparent.patch, 1.1, NONE rhythmbox-0.9.6-fix-keybinding.patch, 1.2, NONE rhythmbox-0.9.6-use-icon-name.patch, 1.1, NONE Message-ID: <200701311209.l0VC9AHn004729@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4712 Modified Files: rhythmbox.spec Added Files: rhythmbox-0.9.7-mmkeys-plugin.patch Removed Files: rhythmbox-0.9.2-dbus-api.patch rhythmbox-0.9.3.1-playlist.patch rhythmbox-0.9.3.1-trayicon.patch rhythmbox-0.9.3.1-use-icon-name.patch rhythmbox-0.9.4.1-ncb.patch rhythmbox-0.9.4.1-notify.patch rhythmbox-0.9.5-dbus-deprecated.patch rhythmbox-0.9.5-missing-radio-crash.patch rhythmbox-0.9.5-transparent.patch rhythmbox-0.9.6-fix-keybinding.patch rhythmbox-0.9.6-use-icon-name.patch Log Message: * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-8.fc7 - Add patch to make the multimedia keys work with the new control-center way of doing things (#197540) rhythmbox-0.9.7-mmkeys-plugin.patch: configure.ac | 1 data/rhythmbox.schemas | 22 + plugins/Makefile.am | 1 plugins/mmkeys/Makefile.am | 52 +++ plugins/mmkeys/mmkeys.rb-plugin.desktop.in | 8 plugins/mmkeys/rb-mmkeys-plugin.c | 419 +++++++++++++++++++++++++++++ shell/rb-shell-player.c | 137 --------- 7 files changed, 503 insertions(+), 137 deletions(-) --- NEW FILE rhythmbox-0.9.7-mmkeys-plugin.patch --- diff -urN rhythmbox-0.9.7/configure.ac rhythmbox-0.9.7.mmkeys/configure.ac --- rhythmbox-0.9.7/configure.ac 2006-12-17 12:38:33.000000000 +0000 +++ rhythmbox-0.9.7.mmkeys/configure.ac 2007-01-31 12:01:13.000000000 +0000 @@ -956,6 +956,7 @@ plugins/generic-player/Makefile plugins/rb/Makefile plugins/power-manager/Makefile +plugins/mmkeys/Makefile bindings/Makefile bindings/python/Makefile help/Makefile diff -urN rhythmbox-0.9.7/data/rhythmbox.schemas rhythmbox-0.9.7.mmkeys/data/rhythmbox.schemas --- rhythmbox-0.9.7/data/rhythmbox.schemas 2006-12-18 12:26:46.000000000 +0000 +++ rhythmbox-0.9.7.mmkeys/data/rhythmbox.schemas 2007-01-31 12:02:16.000000000 +0000 @@ -978,5 +978,27 @@ True if the DAAP plugin is hidden. + + /schemas/apps/rhythmbox/plugins/mmkeys/active + /apps/rhythmbox/plugins/mmkeys/active + rhythmbox + bool + TRUE + + True if the media player keys plugin is enabled. + True if the media player keys plugin is enabled. + + + + /schemas/apps/rhythmbox/plugins/mmkeys/hidden + /apps/rhythmbox/plugins/mmkeys/hidden + rhythmbox + bool + TRUE + + True if the media player keys plugin is hidden. + True if the media player keys plugin is hidden. + + diff -urN rhythmbox-0.9.7/plugins/Makefile.am rhythmbox-0.9.7.mmkeys/plugins/Makefile.am --- rhythmbox-0.9.7/plugins/Makefile.am 2006-12-11 12:36:58.000000000 +0000 +++ rhythmbox-0.9.7.mmkeys/plugins/Makefile.am 2007-01-31 12:00:42.000000000 +0000 @@ -3,6 +3,7 @@ SUBDIRS = \ generic-player \ iradio \ + mmkeys \ sample if WITH_AUDIOSCROBBLER diff -urN rhythmbox-0.9.7/plugins/mmkeys/Makefile.am rhythmbox-0.9.7.mmkeys/plugins/mmkeys/Makefile.am --- rhythmbox-0.9.7/plugins/mmkeys/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ rhythmbox-0.9.7.mmkeys/plugins/mmkeys/Makefile.am 2007-01-31 12:00:42.000000000 +0000 @@ -0,0 +1,52 @@ +NULL = + +plugindir = $(PLUGINDIR)/mmkeys +plugin_LTLIBRARIES = libmmkeys.la + +libmmkeys_la_SOURCES = \ + rb-mmkeys-plugin.c \ + $(NULL) + +libmmkeys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + +libmmkeys_la_LIBADD = \ + $(top_builddir)/corelib/librhythmbox-core.la \ + $(NULL) + +INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"Rhythmbox\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/player \ + -I$(top_srcdir)/rhythmdb \ + -I$(top_srcdir)/widgets \ + -I$(top_srcdir)/sources \ + -I$(top_srcdir)/plugins \ + -I$(top_srcdir)/shell \ + -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DDATADIR=\""$(datadir)"\" \ + $(RHYTHMBOX_CFLAGS) \ + $(WARN_CFLAGS) \ + -D_XOPEN_SOURCE -D_BSD_SOURCE \ + $(NULL) + +if WITH_DBUS +INCLUDES += $(DBUS_CFLAGS) +libmmkeys_la_LIBADD += $(DBUS_LIBS) +endif + +gladedir = $(datadir)/rhythmbox/glade +glade_DATA = + +plugin_in_files = mmkeys.rb-plugin.desktop.in + +%.rb-plugin: %.rb-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +plugin_DATA = $(plugin_in_files:.rb-plugin.desktop.in=.rb-plugin) + +EXTRA_DIST = $(glade_DATA) $(plugin_in_files) + +CLEANFILES = $(plugin_DATA) +DISTCLEANFILES = $(plugin_DATA) diff -urN rhythmbox-0.9.7/plugins/mmkeys/mmkeys.rb-plugin.desktop.in rhythmbox-0.9.7.mmkeys/plugins/mmkeys/mmkeys.rb-plugin.desktop.in --- rhythmbox-0.9.7/plugins/mmkeys/mmkeys.rb-plugin.desktop.in 1970-01-01 01:00:00.000000000 +0100 +++ rhythmbox-0.9.7.mmkeys/plugins/mmkeys/mmkeys.rb-plugin.desktop.in 2007-01-31 12:00:42.000000000 +0000 @@ -0,0 +1,8 @@ +[RB Plugin] +Module=mmkeys +IAge=1 +_Name=Media Player Keys +_Description=Control Rhythmbox using key shortcuts +Authors=Rhythmbox authors +Copyright=Copyright ?? 2002-2007 Rhythmbox authors +Website=http://www.rhythmbox.org/ diff -urN rhythmbox-0.9.7/plugins/mmkeys/rb-mmkeys-plugin.c rhythmbox-0.9.7.mmkeys/plugins/mmkeys/rb-mmkeys-plugin.c --- rhythmbox-0.9.7/plugins/mmkeys/rb-mmkeys-plugin.c 1970-01-01 01:00:00.000000000 +0100 +++ rhythmbox-0.9.7.mmkeys/plugins/mmkeys/rb-mmkeys-plugin.c 2007-01-31 12:00:42.000000000 +0000 @@ -0,0 +1,419 @@ +/* + * rb-mmkeys-plugin.c + * + * Copyright (C) 2002, 2003 Jorn Baayen + * Copyright (C) 2002,2003 Colin Walters + * Copyright (C) 2007 James Livingston + * Copyright (C) 2007 Jonathan Matthew + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include /* For strlen */ +#include +#include +#include +#include +#include + +#include "rb-plugin.h" +#include "rb-debug.h" +#include "rb-shell.h" +#include "rb-shell-player.h" +#include "rb-marshal.h" + +#ifdef WITH_DBUS +#include +#endif + +#ifdef HAVE_MMKEYS +#include +#include +#include +#endif /* HAVE_MMKEYS */ + +#define RB_TYPE_MMKEYS_PLUGIN (rb_mmkeys_plugin_get_type ()) +#define RB_MMKEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), RB_TYPE_MMKEYS_PLUGIN, RBMMKeysPlugin)) +#define RB_MMKEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), RB_TYPE_MMKEYS_PLUGIN, RBMMKeysPluginClass)) +#define RB_IS_MMKEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), RB_TYPE_MMKEYS_PLUGIN)) +#define RB_IS_MMKEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), RB_TYPE_MMKEYS_PLUGIN)) +#define RB_MMKEYS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), RB_TYPE_MMKEYS_PLUGIN, RBMMKeysPluginClass)) + +typedef struct +{ + RBPlugin parent; + + enum { + NONE = 0, + SETTINGS_DAEMON, + X_KEY_GRAB + } grab_type; + RBShellPlayer *shell_player; +#ifdef WITH_DBUS + DBusGProxy *proxy; +#endif +} RBMMKeysPlugin; + +typedef struct +{ + RBPluginClass parent_class; +} RBMMKeysPluginClass; + + +G_MODULE_EXPORT GType register_rb_plugin (GTypeModule *module); +GType rb_mmkeys_plugin_get_type (void) G_GNUC_CONST; + +RB_PLUGIN_REGISTER(RBMMKeysPlugin, rb_mmkeys_plugin) +#define RB_MMKEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), RB_TYPE_MMKEYS_PLUGIN, RBMMKeysPluginPrivate)) + + +static void +rb_mmkeys_plugin_init (RBMMKeysPlugin *plugin) +{ + rb_debug ("RBMMKeysPlugin initialising"); +} + +#ifdef WITH_DBUS +static void +media_player_key_pressed (DBusGProxy *proxy, + const gchar *application, + const gchar *key, + RBMMKeysPlugin *plugin) +{ + rb_debug ("got media key '%s' for application '%s'", + key, application); + + if (strcmp (application, "Rhythmbox")) + return; + + if (strcmp (key, "Play") == 0) { + rb_shell_player_playpause (plugin->shell_player, FALSE, NULL); + } else if (strcmp (key, "Pause") == 0 || + strcmp (key, "Stop") == 0) { + rb_shell_player_pause (plugin->shell_player, NULL); + } else if (strcmp (key, "Previous") == 0) { + rb_shell_player_do_previous (plugin->shell_player, NULL); + } else if (strcmp (key, "Next") == 0) { + rb_shell_player_do_next (plugin->shell_player, NULL); + } +} + +static gboolean +window_focus_cb (GtkWidget *window, + GdkEventFocus *event, + RBMMKeysPlugin *plugin) +{ + rb_debug ("window got focus, re-grabbing media keys"); + + dbus_g_proxy_call (plugin->proxy, + "GrabMediaPlayerKeys", NULL, + G_TYPE_STRING, "Rhythmbox", + G_TYPE_UINT, 0, + G_TYPE_INVALID, G_TYPE_INVALID); + + return FALSE; +} + +#endif + +#ifdef HAVE_MMKEYS + +static void +grab_mmkey (int key_code, + GdkWindow *root) +{ + gdk_error_trap_push (); + + XGrabKey (GDK_DISPLAY (), key_code, + 0, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + Mod2Mask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + Mod5Mask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + LockMask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + Mod2Mask | Mod5Mask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + Mod2Mask | LockMask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + Mod5Mask | LockMask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + XGrabKey (GDK_DISPLAY (), key_code, + Mod2Mask | Mod5Mask | LockMask, + GDK_WINDOW_XID (root), True, + GrabModeAsync, GrabModeAsync); + + gdk_flush (); + if (gdk_error_trap_pop ()) { + rb_debug ("Error grabbing key"); + } +} + +static void +ungrab_mmkey (int key_code, + GdkWindow *root) +{ + gdk_error_trap_push (); + + XUngrabKey (GDK_DISPLAY (), key_code, 0, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, Mod2Mask, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, Mod5Mask, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, LockMask, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, Mod2Mask | Mod5Mask, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, Mod2Mask | LockMask, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, Mod5Mask | LockMask, GDK_WINDOW_XID (root)); + XUngrabKey (GDK_DISPLAY (), key_code, Mod2Mask | Mod5Mask | LockMask, GDK_WINDOW_XID (root)); + + gdk_flush (); + if (gdk_error_trap_pop ()) { + rb_debug ("Error grabbing key"); + } +} + + +static GdkFilterReturn +filter_mmkeys (GdkXEvent *xevent, + GdkEvent *event, + gpointer data) +{ + XEvent *xev; + XKeyEvent *key; + RBShellPlayer *player; + xev = (XEvent *) xevent; + if (xev->type != KeyPress) { + return GDK_FILTER_CONTINUE; + } + + key = (XKeyEvent *) xevent; + + player = (RBShellPlayer *)data; + + if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPlay) == key->keycode) { + rb_shell_player_playpause (player, FALSE, NULL); + return GDK_FILTER_REMOVE; + } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause) == key->keycode) { + rb_shell_player_pause (player, NULL); + return GDK_FILTER_REMOVE; + } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioStop) == key->keycode) { + rb_shell_player_stop (player); + return GDK_FILTER_REMOVE; + } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev) == key->keycode) { + rb_shell_player_do_previous (player, NULL); + return GDK_FILTER_REMOVE; + } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext) == key->keycode) { + rb_shell_player_do_next (player, NULL); + return GDK_FILTER_REMOVE; + } else { + return GDK_FILTER_CONTINUE; + } +} + +static void +mmkeys_grab (RBMMKeysPlugin *plugin, gboolean grab) +{ + gint keycodes[] = {0, 0, 0, 0, 0}; + GdkDisplay *display; + GdkScreen *screen; + GdkWindow *root; + guint i, j; + + keycodes[0] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPlay); + keycodes[1] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioStop); + keycodes[2] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev); + keycodes[3] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext); + keycodes[4] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause); + + display = gdk_display_get_default (); + + for (i = 0; i < gdk_display_get_n_screens (display); i++) { + screen = gdk_display_get_screen (display, i); + + if (screen != NULL) { + root = gdk_screen_get_root_window (screen); + + for (j = 0; j < G_N_ELEMENTS (keycodes) ; j++) { + if (keycodes[j] != 0) { + if (grab) + grab_mmkey (keycodes[j], root); + else + ungrab_mmkey (keycodes[j], root); + } + } + + if (grab) + gdk_window_add_filter (root, filter_mmkeys, + (gpointer) plugin->shell_player); + else + gdk_window_remove_filter (root, filter_mmkeys, + (gpointer) plugin->shell_player); + } + } +} + +#endif + +static void +impl_activate (RBPlugin *bplugin, + RBShell *shell) +{ +#ifdef WITH_DBUS + DBusGConnection *bus; +#endif + RBMMKeysPlugin *plugin; + + rb_debug ("activating media player keys plugin"); + + plugin = RB_MMKEYS_PLUGIN (bplugin); + g_object_get (shell, + "shell-player", &plugin->shell_player, + NULL); + +#ifdef WITH_DBUS + bus = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); + if (plugin->grab_type == NONE && bus != NULL) { + GError *error = NULL; + + plugin->proxy = dbus_g_proxy_new_for_name (bus, + "org.gnome.SettingsDaemon", + "/org/gnome/SettingsDaemon", + "org.gnome.SettingsDaemon"); + if (plugin->proxy != NULL) { + dbus_g_proxy_call (plugin->proxy, + "GrabMediaPlayerKeys", &error, + G_TYPE_STRING, "Rhythmbox", + G_TYPE_UINT, 0, + G_TYPE_INVALID, + G_TYPE_INVALID); + if (error == NULL) { + GtkWindow *window; + + rb_debug ("created dbus proxy for org.gnome.SettingsDaemon; grabbing keys"); + dbus_g_object_register_marshaller (rb_marshal_VOID__STRING_STRING, + G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); + + dbus_g_proxy_add_signal (plugin->proxy, + "MediaPlayerKeyPressed", + G_TYPE_STRING,G_TYPE_STRING,G_TYPE_INVALID); + + dbus_g_proxy_connect_signal (plugin->proxy, + "MediaPlayerKeyPressed", + G_CALLBACK (media_player_key_pressed), + plugin, NULL); + + /* re-grab keys when the main window gains focus */ + g_object_get (shell, "window", &window, NULL); + g_signal_connect_object (window, "focus-in-event", + G_CALLBACK (window_focus_cb), + plugin, 0); + g_object_unref (window); + + plugin->grab_type = SETTINGS_DAEMON; + + } else if (error->domain == DBUS_GERROR && + (error->code != DBUS_GERROR_NAME_HAS_NO_OWNER || + error->code != DBUS_GERROR_SERVICE_UNKNOWN)) { + /* settings daemon dbus service doesn't exist. + * just silently fail. + */ + rb_debug ("org.gnome.SettingsDaemon dbus service not found"); + g_error_free (error); + } else { + g_warning ("Unable to grab media player keys: %s", error->message); + g_error_free (error); + } + } + } else { + rb_debug ("couldn't get dbus session bus"); + } +#endif + +#ifdef HAVE_MMKEYS + if (plugin->grab_type == NONE) { + rb_debug ("attempting old-style key grabs"); + mmkeys_grab (plugin, TRUE); + plugin->grab_type = X_KEY_GRAB; + } +#endif +} + +static void +impl_deactivate (RBPlugin *bplugin, + RBShell *shell) +{ + RBMMKeysPlugin *plugin; + + plugin = RB_MMKEYS_PLUGIN (bplugin); + if (plugin->shell_player != NULL) { + g_object_unref (plugin->shell_player); + plugin->shell_player = NULL; + } + +#ifdef WITH_DBUS + if (plugin->proxy != NULL) { + GError *error = NULL; + + if (plugin->grab_type == SETTINGS_DAEMON) { + dbus_g_proxy_call (plugin->proxy, + "ReleaseMediaPlayerKeys", &error, + G_TYPE_STRING, "Rhythmbox", + G_TYPE_INVALID, G_TYPE_INVALID); + if (error != NULL) { + g_warning ("Could not release media player keys: %s", error->message); + g_error_free (error); + } + plugin->grab_type = NONE; + } + + g_object_unref (plugin->proxy); + plugin->proxy = NULL; + } +#endif +#ifdef HAVE_MMKEYS + if (plugin->grab_type == X_KEY_GRAB) { + rb_debug ("undoing old-style key grabs"); + mmkeys_grab (plugin, FALSE); + plugin->grab_type = NONE; + } +#endif +} + + +static void +rb_mmkeys_plugin_class_init (RBMMKeysPluginClass *klass) +{ + RBPluginClass *plugin_class = RB_PLUGIN_CLASS (klass); + + plugin_class->activate = impl_activate; + plugin_class->deactivate = impl_deactivate; +} + diff -urN rhythmbox-0.9.7/shell/rb-shell-player.c rhythmbox-0.9.7.mmkeys/shell/rb-shell-player.c --- rhythmbox-0.9.7/shell/rb-shell-player.c 2006-12-18 12:27:34.000000000 +0000 +++ rhythmbox-0.9.7.mmkeys/shell/rb-shell-player.c 2007-01-31 12:00:42.000000000 +0000 @@ -35,12 +35,6 @@ #include #include -#ifdef HAVE_MMKEYS -#include -#include -#include -#endif /* HAVE_MMKEYS */ - #include "rb-property-view.h" #include "rb-shell-player.h" #include "rb-stock-icons.h" @@ -154,14 +148,6 @@ static gboolean rb_shell_player_jump_to_current_idle (RBShellPlayer *player); -#ifdef HAVE_MMKEYS -static void grab_mmkey (int key_code, GdkWindow *root); -static GdkFilterReturn filter_mmkeys (GdkXEvent *xevent, - GdkEvent *event, - gpointer data); -static void rb_shell_player_init_mmkeys (RBShellPlayer *shell_player); -#endif /* HAVE_MMKEYS */ - #define CONF_STATE CONF_PREFIX "/state" struct RBShellPlayerPrivate @@ -735,11 +721,6 @@ eel_gconf_notification_add (CONF_UI_SONG_POSITION_SLIDER_HIDDEN, (GConfClientNotifyFunc) gconf_song_position_slider_visibility_changed, player); - -#ifdef HAVE_MMKEYS - /* Enable Multimedia Keys */ - rb_shell_player_init_mmkeys (player); -#endif /* HAVE_MMKEYS */ } static void @@ -2844,124 +2825,6 @@ return TRUE; } -#ifdef HAVE_MMKEYS -static void -grab_mmkey (int key_code, - GdkWindow *root) -{ - gdk_error_trap_push (); - - XGrabKey (GDK_DISPLAY (), key_code, - 0, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - Mod2Mask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - Mod5Mask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - LockMask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - Mod2Mask | Mod5Mask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - Mod2Mask | LockMask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - Mod5Mask | LockMask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - XGrabKey (GDK_DISPLAY (), key_code, - Mod2Mask | Mod5Mask | LockMask, - GDK_WINDOW_XID (root), True, - GrabModeAsync, GrabModeAsync); - - gdk_flush (); - if (gdk_error_trap_pop ()) { - rb_debug ("Error grabbing key"); - } -} - -static GdkFilterReturn -filter_mmkeys (GdkXEvent *xevent, - GdkEvent *event, - gpointer data) -{ - XEvent *xev; - XKeyEvent *key; - RBShellPlayer *player; - xev = (XEvent *) xevent; - if (xev->type != KeyPress) { - return GDK_FILTER_CONTINUE; - } - - key = (XKeyEvent *) xevent; - - player = (RBShellPlayer *)data; - - if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPlay) == key->keycode) { - rb_shell_player_playpause (player, FALSE, NULL); - return GDK_FILTER_REMOVE; - } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause) == key->keycode) { - rb_shell_player_pause (player, NULL); - return GDK_FILTER_REMOVE; - } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioStop) == key->keycode) { - rb_shell_player_stop (player); - return GDK_FILTER_REMOVE; - } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev) == key->keycode) { - rb_shell_player_cmd_previous (NULL, player); - return GDK_FILTER_REMOVE; - } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext) == key->keycode) { - rb_shell_player_cmd_next (NULL, player); - return GDK_FILTER_REMOVE; - } else { - return GDK_FILTER_CONTINUE; - } -} - -static void -rb_shell_player_init_mmkeys (RBShellPlayer *shell_player) -{ - gint keycodes[] = {0, 0, 0, 0, 0}; - GdkDisplay *display; - GdkScreen *screen; - GdkWindow *root; - guint i, j; - - keycodes[0] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPlay); - keycodes[1] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioStop); - keycodes[2] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev); - keycodes[3] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext); - keycodes[4] = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause); - - display = gdk_display_get_default (); - - for (i = 0; i < gdk_display_get_n_screens (display); i++) { - screen = gdk_display_get_screen (display, i); - - if (screen != NULL) { - root = gdk_screen_get_root_window (screen); - - for (j = 0; j < G_N_ELEMENTS (keycodes) ; j++) { - if (keycodes[j] != 0) - grab_mmkey (keycodes[j], root); - } - - gdk_window_add_filter (root, filter_mmkeys, - (gpointer) shell_player); - } - } -} -#endif /* HAVE_MMKEYS */ - static gboolean _idle_unblock_signal_cb (gpointer data) { Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- rhythmbox.spec 22 Jan 2007 08:48:31 -0000 1.93 +++ rhythmbox.spec 31 Jan 2007 12:09:08 -0000 1.94 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.7 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -39,6 +39,7 @@ BuildRequires: hal-devel BuildRequires: perl-XML-Parser +Patch1: rhythmbox-0.9.7-mmkeys-plugin.patch Patch2: rhythmbox-0.9.7-use-icon-name.patch %description @@ -49,6 +50,7 @@ %prep %setup -q +%patch1 -p1 -b .mmkeys-plugin %patch2 -p1 -b .use-icon-name %build @@ -56,6 +58,9 @@ # work around a gstreamer bug /usr/bin/gst-inspect-0.10 --print-all > /dev/null +# For Patch1 +autoconf + %configure \ --with-ipod \ --with-dbus \ @@ -133,6 +138,10 @@ %{_libexecdir}/rhythmbox-metadata %changelog +* Wed Jan 31 2007 - Bastien Nocera - 0.9.7-8.fc7 +- Add patch to make the multimedia keys work with the new control-center + way of doing things (#197540) + * Mon Jan 22 2007 Alexander Larsson - 0.9.7-7.fc7 - Specfile cleanups from Todd Zullinger - Buildrequire gnome-media-devel for gnome-media-profiles.pc --- rhythmbox-0.9.2-dbus-api.patch DELETED --- --- rhythmbox-0.9.3.1-playlist.patch DELETED --- --- rhythmbox-0.9.3.1-trayicon.patch DELETED --- --- rhythmbox-0.9.3.1-use-icon-name.patch DELETED --- --- rhythmbox-0.9.4.1-ncb.patch DELETED --- --- rhythmbox-0.9.4.1-notify.patch DELETED --- --- rhythmbox-0.9.5-dbus-deprecated.patch DELETED --- --- rhythmbox-0.9.5-missing-radio-crash.patch DELETED --- --- rhythmbox-0.9.5-transparent.patch DELETED --- --- rhythmbox-0.9.6-fix-keybinding.patch DELETED --- --- rhythmbox-0.9.6-use-icon-name.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 12:14:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 07:14:11 -0500 Subject: rpms/openoffice.org/devel sources,1.220,1.221 Message-ID: <200701311214.l0VCEBDQ004877@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4863 Modified Files: sources Log Message: fix pagebreak issue Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- sources 30 Jan 2007 14:18:25 -0000 1.220 +++ sources 31 Jan 2007 12:14:09 -0000 1.221 @@ -10,4 +10,4 @@ b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz -adebed9c98fe2fbfaa5b9d90a30707b7 OOF680_m5.tar.bz2 +9a15573854fb4be7f945bc5e417fb752 OOF680_m5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 13:29:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 08:29:13 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.94,1.95 Message-ID: <200701311329.l0VDTDXB025503@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25058 Modified Files: rhythmbox.spec Log Message: * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-9.fc7 - Exclude s390* from the builds, as there's no gnome-media there Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- rhythmbox.spec 31 Jan 2007 12:09:08 -0000 1.94 +++ rhythmbox.spec 31 Jan 2007 13:29:11 -0000 1.95 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.7 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -39,6 +39,8 @@ BuildRequires: hal-devel BuildRequires: perl-XML-Parser +ExcludeArch: s390 s390x + Patch1: rhythmbox-0.9.7-mmkeys-plugin.patch Patch2: rhythmbox-0.9.7-use-icon-name.patch @@ -138,6 +140,9 @@ %{_libexecdir}/rhythmbox-metadata %changelog +* Wed Jan 31 2007 - Bastien Nocera - 0.9.7-9.fc7 +- Exclude s390* from the builds, as there's no gnome-media there + * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-8.fc7 - Add patch to make the multimedia keys work with the new control-center way of doing things (#197540) From fedora-cvs-commits at redhat.com Wed Jan 31 13:41:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 08:41:44 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.95,1.96 Message-ID: <200701311341.l0VDfi5A024138@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24121 Modified Files: rhythmbox.spec Log Message: * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 - Require autoconf in the BuildRequires, as it's not in the minimum build environment Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- rhythmbox.spec 31 Jan 2007 13:29:11 -0000 1.95 +++ rhythmbox.spec 31 Jan 2007 13:41:42 -0000 1.96 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.7 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -38,6 +38,8 @@ BuildRequires: libsoup-devel BuildRequires: hal-devel BuildRequires: perl-XML-Parser +# For Patch1 +BuildRequires: autoconf ExcludeArch: s390 s390x @@ -140,6 +142,10 @@ %{_libexecdir}/rhythmbox-metadata %changelog +* Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 +- Require autoconf in the BuildRequires, as it's not in the minimum build + environment + * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-9.fc7 - Exclude s390* from the builds, as there's no gnome-media there From fedora-cvs-commits at redhat.com Wed Jan 31 14:08:17 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 09:08:17 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.96,1.97 Message-ID: <200701311408.l0VE8H2n012566@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12550 Modified Files: rhythmbox.spec Log Message: * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 - Require automake in the BuildRequires as well, as we need to generate plugins/power-manager/Makefile.in Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- rhythmbox.spec 31 Jan 2007 13:41:42 -0000 1.96 +++ rhythmbox.spec 31 Jan 2007 14:08:15 -0000 1.97 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.7 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.gnome.org/projects/rhythmbox/ @@ -39,7 +39,7 @@ BuildRequires: hal-devel BuildRequires: perl-XML-Parser # For Patch1 -BuildRequires: autoconf +BuildRequires: autoconf automake ExcludeArch: s390 s390x @@ -64,6 +64,7 @@ # For Patch1 autoconf +automake %configure \ --with-ipod \ @@ -143,6 +144,10 @@ %changelog * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 +- Require automake in the BuildRequires as well, as we need to generate + plugins/power-manager/Makefile.in + +* Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 - Require autoconf in the BuildRequires, as it's not in the minimum build environment From fedora-cvs-commits at redhat.com Wed Jan 31 14:55:24 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 09:55:24 -0500 Subject: rpms/newt/devel .cvsignore, 1.19, 1.20 newt.spec, 1.44, 1.45 sources, 1.20, 1.21 newt-objfree.patch, 1.1, NONE Message-ID: <200701311455.l0VEtOge019996@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/newt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19458 Modified Files: .cvsignore newt.spec sources Removed Files: newt-objfree.patch Log Message: - provide option to change text of buttons (#126768) - don't add escape key to hot keys by default (#216157) - fix cursor position in checkboxtree, radio button and checkbox - don't force monochrome terminals to output colors - highlight active compact button on monochrome terminals - update translations from debian Resolves: #126768 #216157 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/newt/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 13 Oct 2006 14:01:03 -0000 1.19 +++ .cvsignore 31 Jan 2007 14:55:21 -0000 1.20 @@ -1 +1 @@ -newt-0.52.4.tar.gz +newt-0.52.5.tar.gz Index: newt.spec =================================================================== RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- newt.spec 6 Jan 2007 20:26:22 -0000 1.44 +++ newt.spec 31 Jan 2007 14:55:21 -0000 1.45 @@ -1,11 +1,10 @@ Summary: A development library for text mode user interfaces. Name: newt -Version: 0.52.4 -Release: 3%{?dist} +Version: 0.52.5 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: newt-%{version}.tar.gz -Patch0: newt-objfree.patch BuildRequires: python, python-devel, slang-devel Provides: snack = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,7 +34,6 @@ %prep %setup -q -%patch0 -p0 %build # gpm support seems to smash the stack w/ we use help in anaconda?? @@ -73,6 +71,14 @@ %{_libdir}/libnewt.so %changelog +* Wed Jan 31 2007 Miroslav Lichvar - 0.52.5-1 +- provide option to change text of buttons (#126768) +- don't add escape key to hot keys by default (#216157) +- fix cursor position in checkboxtree, radio button and checkbox +- don't force monochrome terminals to output colors +- highlight active compact button on monochrome terminals +- update translations from debian + * Sat Jan 6 2007 Jeremy Katz - 0.52.4-3 - fix memory allocation in snack to be consistent (#212780) Index: sources =================================================================== RCS file: /cvs/dist/rpms/newt/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 13 Oct 2006 14:01:03 -0000 1.20 +++ sources 31 Jan 2007 14:55:22 -0000 1.21 @@ -1 +1 @@ -0818c0d397fb6b5ee61a6747327599e4 newt-0.52.4.tar.gz +492e09cc6845a476074c5817038cbdd8 newt-0.52.5.tar.gz --- newt-objfree.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 15:01:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:01:42 -0500 Subject: rpms/flex/devel flex-2.5.33-pic.patch,NONE,1.1 flex.spec,1.34,1.35 Message-ID: <200701311501.l0VF1gjS024638@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24514 Modified Files: flex.spec Added Files: flex-2.5.33-pic.patch Log Message: - Compile with -fPIC. flex-2.5.33-pic.patch: flex-2.5.33-pm/Makefile.in | 1 flex-2.5.33-pm/Makefile.in~ |only flex-2.5.33-pm/config.guess | 41 +------- flex-2.5.33-pm/config.sub | 46 ++++------ flex-2.5.33/Makefile |only flex-2.5.33/buf.o |only flex-2.5.33/ccl.o |only flex-2.5.33/config.h |only flex-2.5.33/config.log |only flex-2.5.33/config.status |only flex-2.5.33/debugfiles.list |only flex-2.5.33/debugsources.list |only flex-2.5.33/dfa.o |only flex-2.5.33/doc/Makefile |only flex-2.5.33/ecs.o |only flex-2.5.33/examples/Makefile |only flex-2.5.33/examples/fastwc/Makefile |only flex-2.5.33/examples/manual/Makefile |only flex-2.5.33/filter.o |only flex-2.5.33/flex |only flex-2.5.33/flex.lang |only flex-2.5.33/gen.o |only flex-2.5.33/libfl.a |only flex-2.5.33/libmain.o |only flex-2.5.33/libyywrap.o |only flex-2.5.33/m4/Makefile |only flex-2.5.33/main.o |only flex-2.5.33/misc.o |only flex-2.5.33/nfa.o |only flex-2.5.33/options.o |only flex-2.5.33/parse.o |only flex-2.5.33/po/Makefile |only flex-2.5.33/po/Makefile.in |only flex-2.5.33/po/POTFILES |only flex-2.5.33/regex.o |only flex-2.5.33/scan.o |only flex-2.5.33/scanopt.o |only flex-2.5.33/skel.o |only flex-2.5.33/stamp-h1 |only flex-2.5.33/sym.o |only flex-2.5.33/tables.o |only flex-2.5.33/tables_shared.o |only flex-2.5.33/tblcmp.o |only flex-2.5.33/tests/Makefile |only flex-2.5.33/tests/TEMPLATE/Makefile |only flex-2.5.33/tests/test-array-nr/Makefile |only flex-2.5.33/tests/test-array-nr/OUTPUT |only flex-2.5.33/tests/test-array-nr/scanner.c |only flex-2.5.33/tests/test-array-nr/scanner.o |only flex-2.5.33/tests/test-array-nr/test-array-nr |only flex-2.5.33/tests/test-array-r/Makefile |only flex-2.5.33/tests/test-array-r/OUTPUT |only flex-2.5.33/tests/test-array-r/scanner.c |only flex-2.5.33/tests/test-array-r/scanner.o |only flex-2.5.33/tests/test-array-r/test-array-r |only flex-2.5.33/tests/test-basic-nr/Makefile |only flex-2.5.33/tests/test-basic-nr/OUTPUT |only flex-2.5.33/tests/test-basic-nr/scanner.c |only flex-2.5.33/tests/test-basic-nr/scanner.o |only flex-2.5.33/tests/test-basic-nr/test-basic-nr |only flex-2.5.33/tests/test-basic-r/Makefile |only flex-2.5.33/tests/test-basic-r/OUTPUT |only flex-2.5.33/tests/test-basic-r/scanner.c |only flex-2.5.33/tests/test-basic-r/scanner.o |only flex-2.5.33/tests/test-basic-r/test-basic-r |only flex-2.5.33/tests/test-bison-nr/Makefile |only flex-2.5.33/tests/test-bison-nr/OUTPUT |only flex-2.5.33/tests/test-bison-nr/main.o |only flex-2.5.33/tests/test-bison-nr/parser.c |only flex-2.5.33/tests/test-bison-nr/parser.h |only flex-2.5.33/tests/test-bison-nr/parser.o |only flex-2.5.33/tests/test-bison-nr/scanner.c |only flex-2.5.33/tests/test-bison-nr/scanner.h |only flex-2.5.33/tests/test-bison-nr/scanner.o |only flex-2.5.33/tests/test-bison-nr/test-bison-nr |only flex-2.5.33/tests/test-bison-yylloc/Makefile |only flex-2.5.33/tests/test-bison-yylloc/OUTPUT |only flex-2.5.33/tests/test-bison-yylloc/main.o |only flex-2.5.33/tests/test-bison-yylloc/parser.c |only flex-2.5.33/tests/test-bison-yylloc/parser.h |only flex-2.5.33/tests/test-bison-yylloc/parser.o |only flex-2.5.33/tests/test-bison-yylloc/scanner.c |only flex-2.5.33/tests/test-bison-yylloc/scanner.h |only flex-2.5.33/tests/test-bison-yylloc/scanner.o |only flex-2.5.33/tests/test-bison-yylloc/test-bison-yylloc |only flex-2.5.33/tests/test-bison-yylval/Makefile |only flex-2.5.33/tests/test-bison-yylval/OUTPUT |only flex-2.5.33/tests/test-bison-yylval/main.o |only flex-2.5.33/tests/test-bison-yylval/parser.c |only flex-2.5.33/tests/test-bison-yylval/parser.h |only flex-2.5.33/tests/test-bison-yylval/parser.o |only flex-2.5.33/tests/test-bison-yylval/scanner.c |only flex-2.5.33/tests/test-bison-yylval/scanner.h |only flex-2.5.33/tests/test-bison-yylval/scanner.o |only flex-2.5.33/tests/test-bison-yylval/test-bison-yylval |only flex-2.5.33/tests/test-c++-basic/Makefile |only flex-2.5.33/tests/test-c++-basic/OUTPUT |only flex-2.5.33/tests/test-c++-basic/scanner.cpp |only flex-2.5.33/tests/test-c++-basic/scanner.o |only flex-2.5.33/tests/test-c++-basic/test-c++-basic |only flex-2.5.33/tests/test-c++-multiple-scanners/Makefile |only flex-2.5.33/tests/test-c++-multiple-scanners/OUTPUT |only flex-2.5.33/tests/test-c++-multiple-scanners/main.o |only flex-2.5.33/tests/test-c++-multiple-scanners/scanner-1.cpp |only flex-2.5.33/tests/test-c++-multiple-scanners/scanner-1.o |only flex-2.5.33/tests/test-c++-multiple-scanners/scanner-2.cpp |only flex-2.5.33/tests/test-c++-multiple-scanners/scanner-2.o |only flex-2.5.33/tests/test-c++-multiple-scanners/test-c++-multiple-scanners |only flex-2.5.33/tests/test-c-cpp-nr/Makefile |only flex-2.5.33/tests/test-c-cpp-nr/OUTPUT |only flex-2.5.33/tests/test-c-cpp-nr/scanner.cpp |only flex-2.5.33/tests/test-c-cpp-nr/scanner.o |only flex-2.5.33/tests/test-c-cpp-nr/test-c-cpp-nr |only flex-2.5.33/tests/test-c-cpp-r/Makefile |only flex-2.5.33/tests/test-c-cpp-r/OUTPUT |only flex-2.5.33/tests/test-c-cpp-r/scanner.cpp |only flex-2.5.33/tests/test-c-cpp-r/scanner.o |only flex-2.5.33/tests/test-c-cpp-r/test-c-cpp-r |only flex-2.5.33/tests/test-debug-nr/Makefile |only flex-2.5.33/tests/test-debug-nr/OUTPUT |only flex-2.5.33/tests/test-debug-nr/scanner.c |only flex-2.5.33/tests/test-debug-nr/scanner.o |only flex-2.5.33/tests/test-debug-nr/test-debug-nr |only flex-2.5.33/tests/test-debug-r/Makefile |only flex-2.5.33/tests/test-debug-r/OUTPUT |only flex-2.5.33/tests/test-debug-r/scanner.c |only flex-2.5.33/tests/test-debug-r/scanner.o |only flex-2.5.33/tests/test-debug-r/test-debug-r |only flex-2.5.33/tests/test-header-nr/Makefile |only flex-2.5.33/tests/test-header-nr/OUTPUT |only flex-2.5.33/tests/test-header-nr/main.o |only flex-2.5.33/tests/test-header-nr/scanner.c |only flex-2.5.33/tests/test-header-nr/scanner.h |only flex-2.5.33/tests/test-header-nr/scanner.o |only flex-2.5.33/tests/test-header-nr/test-header-nr |only flex-2.5.33/tests/test-header-r/Makefile |only flex-2.5.33/tests/test-header-r/OUTPUT |only flex-2.5.33/tests/test-header-r/main.o |only flex-2.5.33/tests/test-header-r/scanner.c |only flex-2.5.33/tests/test-header-r/scanner.h |only flex-2.5.33/tests/test-header-r/scanner.o |only flex-2.5.33/tests/test-header-r/test-header-r |only flex-2.5.33/tests/test-include-by-buffer/Makefile |only flex-2.5.33/tests/test-include-by-buffer/OUTPUT |only flex-2.5.33/tests/test-include-by-buffer/scanner.c |only flex-2.5.33/tests/test-include-by-buffer/scanner.o |only flex-2.5.33/tests/test-include-by-buffer/test-include-by-buffer |only flex-2.5.33/tests/test-include-by-push/Makefile |only flex-2.5.33/tests/test-include-by-push/OUTPUT |only flex-2.5.33/tests/test-include-by-push/scanner.c |only flex-2.5.33/tests/test-include-by-push/scanner.o |only flex-2.5.33/tests/test-include-by-push/test-include-by-push |only flex-2.5.33/tests/test-include-by-reentrant/Makefile |only flex-2.5.33/tests/test-include-by-reentrant/OUTPUT |only flex-2.5.33/tests/test-include-by-reentrant/scanner.c |only flex-2.5.33/tests/test-include-by-reentrant/scanner.o |only flex-2.5.33/tests/test-include-by-reentrant/test-include-by-reentrant |only flex-2.5.33/tests/test-linedir-r/Makefile |only flex-2.5.33/tests/test-linedir-r/OUTPUT |only flex-2.5.33/tests/test-linedir-r/main.o |only flex-2.5.33/tests/test-linedir-r/scanner.c |only flex-2.5.33/tests/test-linedir-r/scanner.h |only flex-2.5.33/tests/test-linedir-r/scanner.o |only flex-2.5.33/tests/test-linedir-r/test-linedir-r |only flex-2.5.33/tests/test-lineno-nr/Makefile |only flex-2.5.33/tests/test-lineno-nr/OUTPUT |only flex-2.5.33/tests/test-lineno-nr/scanner.c |only flex-2.5.33/tests/test-lineno-nr/scanner.o |only flex-2.5.33/tests/test-lineno-nr/test-lineno-nr |only flex-2.5.33/tests/test-lineno-r/Makefile |only flex-2.5.33/tests/test-lineno-r/OUTPUT |only flex-2.5.33/tests/test-lineno-r/scanner.c |only flex-2.5.33/tests/test-lineno-r/scanner.o |only flex-2.5.33/tests/test-lineno-r/test-lineno-r |only flex-2.5.33/tests/test-mem-nr/Makefile |only flex-2.5.33/tests/test-mem-nr/OUTPUT |only flex-2.5.33/tests/test-mem-nr/scanner.c |only flex-2.5.33/tests/test-mem-nr/scanner.o |only flex-2.5.33/tests/test-mem-nr/test-mem-nr |only flex-2.5.33/tests/test-mem-r/Makefile |only flex-2.5.33/tests/test-mem-r/OUTPUT |only flex-2.5.33/tests/test-mem-r/scanner.c |only flex-2.5.33/tests/test-mem-r/scanner.o |only flex-2.5.33/tests/test-mem-r/test-mem-r |only flex-2.5.33/tests/test-multiple-scanners-nr/Makefile |only flex-2.5.33/tests/test-multiple-scanners-nr/OUTPUT |only flex-2.5.33/tests/test-multiple-scanners-nr/main.o |only flex-2.5.33/tests/test-multiple-scanners-nr/scanner-1.c |only flex-2.5.33/tests/test-multiple-scanners-nr/scanner-1.h |only flex-2.5.33/tests/test-multiple-scanners-nr/scanner-1.o |only flex-2.5.33/tests/test-multiple-scanners-nr/scanner-2.c |only flex-2.5.33/tests/test-multiple-scanners-nr/scanner-2.h |only flex-2.5.33/tests/test-multiple-scanners-nr/scanner-2.o |only flex-2.5.33/tests/test-multiple-scanners-nr/test-multiple-scanners-nr |only flex-2.5.33/tests/test-multiple-scanners-r/Makefile |only flex-2.5.33/tests/test-multiple-scanners-r/OUTPUT |only flex-2.5.33/tests/test-multiple-scanners-r/main.o |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-1.c |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-1.h |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-1.o |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-1.tables |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-2.c |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-2.h |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-2.o |only flex-2.5.33/tests/test-multiple-scanners-r/scanner-2.tables |only flex-2.5.33/tests/test-multiple-scanners-r/test-multiple-scanners-r |only flex-2.5.33/tests/test-noansi-nr/Makefile |only flex-2.5.33/tests/test-noansi-nr/OUTPUT |only flex-2.5.33/tests/test-noansi-nr/scanner.c |only flex-2.5.33/tests/test-noansi-nr/scanner.o |only flex-2.5.33/tests/test-noansi-nr/test-noansi-nr |only flex-2.5.33/tests/test-noansi-r/Makefile |only flex-2.5.33/tests/test-noansi-r/OUTPUT |only flex-2.5.33/tests/test-noansi-r/scanner.c |only flex-2.5.33/tests/test-noansi-r/scanner.o |only flex-2.5.33/tests/test-noansi-r/test-noansi-r |only flex-2.5.33/tests/test-posix/Makefile |only flex-2.5.33/tests/test-posix/OUTPUT |only flex-2.5.33/tests/test-posix/scanner.c |only flex-2.5.33/tests/test-posix/scanner.o |only flex-2.5.33/tests/test-posix/test-posix |only flex-2.5.33/tests/test-posixly-correct/Makefile |only flex-2.5.33/tests/test-posixly-correct/OUTPUT |only flex-2.5.33/tests/test-posixly-correct/scanner.c |only flex-2.5.33/tests/test-posixly-correct/scanner.o |only flex-2.5.33/tests/test-posixly-correct/test-posixly-correct |only flex-2.5.33/tests/test-prefix-nr/Makefile |only flex-2.5.33/tests/test-prefix-nr/OUTPUT |only flex-2.5.33/tests/test-prefix-nr/scanner.c |only flex-2.5.33/tests/test-prefix-nr/scanner.o |only flex-2.5.33/tests/test-prefix-nr/test-prefix-nr |only flex-2.5.33/tests/test-prefix-r/Makefile |only flex-2.5.33/tests/test-prefix-r/OUTPUT |only flex-2.5.33/tests/test-prefix-r/scanner.c |only flex-2.5.33/tests/test-prefix-r/scanner.o |only flex-2.5.33/tests/test-prefix-r/test-prefix-r |only flex-2.5.33/tests/test-pthread/Makefile |only flex-2.5.33/tests/test-pthread/OUTPUT |only flex-2.5.33/tests/test-pthread/scanner.c |only flex-2.5.33/tests/test-pthread/scanner.o |only flex-2.5.33/tests/test-pthread/test-pthread |only flex-2.5.33/tests/test-reject/Makefile |only flex-2.5.33/tests/test-reject/OUTPUT |only flex-2.5.33/tests/test-reject/test-reject-nr |only flex-2.5.33/tests/test-reject/test-reject-nr.c |only flex-2.5.33/tests/test-reject/test-reject-nr.o |only flex-2.5.33/tests/test-reject/test-reject-r |only flex-2.5.33/tests/test-reject/test-reject-r.c |only flex-2.5.33/tests/test-reject/test-reject-r.o |only flex-2.5.33/tests/test-reject/test-reject-ser |only flex-2.5.33/tests/test-reject/test-reject-ser.c |only flex-2.5.33/tests/test-reject/test-reject-ser.o |only flex-2.5.33/tests/test-reject/test-reject-ser.tables |only flex-2.5.33/tests/test-reject/test-reject-ver |only flex-2.5.33/tests/test-reject/test-reject-ver.c |only flex-2.5.33/tests/test-reject/test-reject-ver.o |only flex-2.5.33/tests/test-reject/test-reject-ver.tables |only flex-2.5.33/tests/test-rescan-nr/Makefile |only flex-2.5.33/tests/test-rescan-nr/OUTPUT |only flex-2.5.33/tests/test-rescan-nr/scanner.c |only flex-2.5.33/tests/test-rescan-nr/scanner.o |only flex-2.5.33/tests/test-rescan-nr/test-rescan-nr |only flex-2.5.33/tests/test-rescan-r/Makefile |only flex-2.5.33/tests/test-rescan-r/OUTPUT |only flex-2.5.33/tests/test-rescan-r/scanner.c |only flex-2.5.33/tests/test-rescan-r/scanner.o |only flex-2.5.33/tests/test-rescan-r/test-rescan-r |only flex-2.5.33/tests/test-string-nr/Makefile |only flex-2.5.33/tests/test-string-nr/OUTPUT |only flex-2.5.33/tests/test-string-nr/scanner.c |only flex-2.5.33/tests/test-string-nr/scanner.o |only flex-2.5.33/tests/test-string-nr/test-string-nr |only flex-2.5.33/tests/test-string-r/Makefile |only flex-2.5.33/tests/test-string-r/OUTPUT |only flex-2.5.33/tests/test-string-r/scanner.c |only flex-2.5.33/tests/test-string-r/scanner.o |only flex-2.5.33/tests/test-string-r/test-string-r |only flex-2.5.33/tests/test-table-opts/Makefile |only flex-2.5.33/tests/test-table-opts/OUTPUT |only flex-2.5.33/tests/test-table-opts/all-ser.tables |only flex-2.5.33/tests/test-table-opts/test-opt-nr-CF |only flex-2.5.33/tests/test-table-opts/test-opt-nr-CF.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-CF.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Ca |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Ca.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Ca.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cae |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cae.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cae.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-CaeF |only flex-2.5.33/tests/test-table-opts/test-opt-nr-CaeF.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-CaeF.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Caef |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Caef.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Caef.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Caem |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Caem.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Caem.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cam |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cam.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cam.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Ce |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Ce.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Ce.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cem |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cem.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cem.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cf |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cf.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cf.o |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cm |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cm.c |only flex-2.5.33/tests/test-table-opts/test-opt-nr-Cm.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-CF |only flex-2.5.33/tests/test-table-opts/test-opt-r-CF.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-CF.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Ca |only flex-2.5.33/tests/test-table-opts/test-opt-r-Ca.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Ca.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cae |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cae.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cae.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-CaeF |only flex-2.5.33/tests/test-table-opts/test-opt-r-CaeF.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-CaeF.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Caef |only flex-2.5.33/tests/test-table-opts/test-opt-r-Caef.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Caef.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Caem |only flex-2.5.33/tests/test-table-opts/test-opt-r-Caem.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Caem.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cam |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cam.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cam.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Ce |only flex-2.5.33/tests/test-table-opts/test-opt-r-Ce.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Ce.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cem |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cem.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cem.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cf |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cf.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cf.o |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cm |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cm.c |only flex-2.5.33/tests/test-table-opts/test-opt-r-Cm.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CF |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CF.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CF.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CF.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ca |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ca.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ca.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ca.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cae |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cae.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cae.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cae.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CaeF |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CaeF.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CaeF.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-CaeF.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caef |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caef.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caef.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caef.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caem |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caem.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caem.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Caem.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cam |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cam.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cam.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cam.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ce |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ce.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ce.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Ce.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cem |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cem.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cem.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cem.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cf |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cf.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cf.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cf.tables |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cm |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cm.c |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cm.o |only flex-2.5.33/tests/test-table-opts/test-ser-nr-Cm.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-CF |only flex-2.5.33/tests/test-table-opts/test-ser-r-CF.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-CF.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-CF.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ca |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ca.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ca.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ca.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cae |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cae.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cae.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cae.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-CaeF |only flex-2.5.33/tests/test-table-opts/test-ser-r-CaeF.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-CaeF.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-CaeF.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caef |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caef.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caef.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caef.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caem |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caem.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caem.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Caem.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cam |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cam.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cam.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cam.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ce |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ce.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ce.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Ce.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cem |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cem.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cem.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cem.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cf |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cf.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cf.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cf.tables |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cm |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cm.c |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cm.o |only flex-2.5.33/tests/test-table-opts/test-ser-r-Cm.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CF |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CF.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CF.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CF.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ca |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ca.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ca.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ca.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cae |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cae.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cae.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cae.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CaeF |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CaeF.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CaeF.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-CaeF.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caef |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caef.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caef.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caef.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caem |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caem.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caem.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Caem.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cam |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cam.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cam.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cam.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ce |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ce.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ce.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Ce.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cem |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cem.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cem.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cem.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cf |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cf.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cf.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cf.tables |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cm |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cm.c |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cm.o |only flex-2.5.33/tests/test-table-opts/test-ver-nr-Cm.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-CF |only flex-2.5.33/tests/test-table-opts/test-ver-r-CF.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-CF.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-CF.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ca |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ca.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ca.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ca.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cae |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cae.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cae.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cae.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-CaeF |only flex-2.5.33/tests/test-table-opts/test-ver-r-CaeF.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-CaeF.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-CaeF.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caef |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caef.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caef.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caef.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caem |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caem.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caem.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Caem.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cam |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cam.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cam.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cam.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ce |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ce.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ce.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Ce.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cem |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cem.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cem.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cem.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cf |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cf.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cf.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cf.tables |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cm |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cm.c |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cm.o |only flex-2.5.33/tests/test-table-opts/test-ver-r-Cm.tables |only flex-2.5.33/tests/test-top/Makefile |only flex-2.5.33/tests/test-top/OUTPUT |only flex-2.5.33/tests/test-top/main.o |only flex-2.5.33/tests/test-top/scanner.c |only flex-2.5.33/tests/test-top/scanner.h |only flex-2.5.33/tests/test-top/scanner.o |only flex-2.5.33/tests/test-top/test-top |only flex-2.5.33/tests/test-yyextra/Makefile |only flex-2.5.33/tests/test-yyextra/OUTPUT |only flex-2.5.33/tests/test-yyextra/scanner.c |only flex-2.5.33/tests/test-yyextra/scanner.o |only flex-2.5.33/tests/test-yyextra/test-yyextra |only flex-2.5.33/tools/Makefile |only flex-2.5.33/yylex.o |only 536 files changed, 29 insertions(+), 59 deletions(-) --- NEW FILE flex-2.5.33-pic.patch --- Only in flex-2.5.33: buf.o Only in flex-2.5.33: ccl.o diff -urp flex-2.5.33/config.guess flex-2.5.33-pm/config.guess --- flex-2.5.33/config.guess 2007-01-31 15:09:58.000000000 +0100 +++ flex-2.5.33-pm/config.guess 2007-01-31 15:04:44.000000000 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-06-17' +timestamp='2003-05-09' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +106,6 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; @@ -136,13 +135,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -## for Red Hat Linux -if test -f /etc/redhat-release ; then - VENDOR=redhat ; -else - VENDOR= ; -fi - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -290,9 +282,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -331,9 +320,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; @@ -781,8 +767,8 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:3*) + echo i586-pc-interix3 exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -811,11 +797,8 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -859,10 +842,10 @@ EOF test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) - echo powerpc-${VENDOR:-unknown}-linux-gnu + echo powerpc-unknown-linux-gnu exit 0 ;; ppc64:Linux:*:*) - echo powerpc64-${VENDOR:-unknown}-linux-gnu + echo powerpc64-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -890,10 +873,7 @@ EOF echo hppa64-unknown-linux-gnu exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu - exit 0 ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -902,7 +882,7 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; x86_64:Linux:*:*) - echo x86_64-${VENDOR:-unknown}-linux-gnu + echo x86_64-unknown-linux-gnu exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -954,7 +934,7 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) @@ -1209,9 +1189,6 @@ EOF *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 Only in flex-2.5.33: config.h Only in flex-2.5.33: config.log Only in flex-2.5.33: config.status diff -urp flex-2.5.33/config.sub flex-2.5.33-pm/config.sub --- flex-2.5.33/config.sub 2007-01-31 15:09:58.000000000 +0100 +++ flex-2.5.33-pm/config.sub 2007-01-31 15:04:44.000000000 +0100 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2003-06-18' +timestamp='2003-05-09' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -229,7 +229,7 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ + | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ @@ -257,12 +257,11 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | tahoe | thumb | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xscale | xstormy16 | xtensa \ @@ -330,11 +329,10 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | s390-* | s390x-* \ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ @@ -773,24 +771,18 @@ case $basic_machine in pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2 | pentiumiii | pentium3) + pentiumii | pentium2) basic_machine=i686-pc ;; - pentium4) - basic_machine=i786-pc - ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + pentiumii-* | pentium2-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; pn) basic_machine=pn-gould ;; @@ -833,6 +825,12 @@ case $basic_machine in rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi @@ -843,10 +841,6 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; sequent) basic_machine=i386-sequent ;; @@ -854,9 +848,6 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; - sh64) - basic_machine=sh64-unknown - ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -931,6 +922,10 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; + tic4x | c4x*) + basic_machine=tic4x-unknown + os=-coff + ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff @@ -1051,7 +1046,7 @@ case $basic_machine in sh64) basic_machine=sh64-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; cydra) @@ -1136,7 +1131,7 @@ case $os in | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1282,9 +1277,6 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 Only in flex-2.5.33: debugfiles.list Only in flex-2.5.33: debugsources.list Only in flex-2.5.33: dfa.o Only in flex-2.5.33/doc: Makefile Only in flex-2.5.33: ecs.o Only in flex-2.5.33/examples/fastwc: Makefile Only in flex-2.5.33/examples: Makefile Only in flex-2.5.33/examples/manual: Makefile Only in flex-2.5.33: filter.o Only in flex-2.5.33: flex Only in flex-2.5.33: flex.lang Only in flex-2.5.33: gen.o Only in flex-2.5.33: libfl.a Only in flex-2.5.33: libmain.o Only in flex-2.5.33: libyywrap.o Only in flex-2.5.33/m4: Makefile Only in flex-2.5.33: main.o Only in flex-2.5.33: Makefile diff -urp flex-2.5.33/Makefile.in flex-2.5.33-pm/Makefile.in --- flex-2.5.33/Makefile.in 2006-02-21 03:45:12.000000000 +0100 +++ flex-2.5.33-pm/Makefile.in 2007-01-31 15:06:32.000000000 +0100 @@ -292,6 +292,7 @@ SUBDIRS = \ localedir = $(datadir)/locale AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I at includedir@ -I$(top_srcdir)/intl +AM_CFLAGS = -fPIC # Run GNU indent on sources. Don't run this unless all the sources compile cleanly. # Only in flex-2.5.33-pm: Makefile.in~ Only in flex-2.5.33: misc.o Only in flex-2.5.33: nfa.o Only in flex-2.5.33: options.o Only in flex-2.5.33: parse.o Only in flex-2.5.33/po: Makefile Only in flex-2.5.33/po: Makefile.in Only in flex-2.5.33/po: POTFILES Only in flex-2.5.33: regex.o Only in flex-2.5.33: scan.o Only in flex-2.5.33: scanopt.o Only in flex-2.5.33: skel.o Only in flex-2.5.33: stamp-h1 Only in flex-2.5.33: sym.o Only in flex-2.5.33: tables.o Only in flex-2.5.33: tables_shared.o Only in flex-2.5.33: tblcmp.o Only in flex-2.5.33/tests: Makefile Only in flex-2.5.33/tests/TEMPLATE: Makefile Only in flex-2.5.33/tests/test-array-nr: Makefile Only in flex-2.5.33/tests/test-array-nr: OUTPUT Only in flex-2.5.33/tests/test-array-nr: scanner.c Only in flex-2.5.33/tests/test-array-nr: scanner.o Only in flex-2.5.33/tests/test-array-nr: test-array-nr Only in flex-2.5.33/tests/test-array-r: Makefile Only in flex-2.5.33/tests/test-array-r: OUTPUT Only in flex-2.5.33/tests/test-array-r: scanner.c Only in flex-2.5.33/tests/test-array-r: scanner.o Only in flex-2.5.33/tests/test-array-r: test-array-r Only in flex-2.5.33/tests/test-basic-nr: Makefile Only in flex-2.5.33/tests/test-basic-nr: OUTPUT Only in flex-2.5.33/tests/test-basic-nr: scanner.c Only in flex-2.5.33/tests/test-basic-nr: scanner.o Only in flex-2.5.33/tests/test-basic-nr: test-basic-nr Only in flex-2.5.33/tests/test-basic-r: Makefile Only in flex-2.5.33/tests/test-basic-r: OUTPUT Only in flex-2.5.33/tests/test-basic-r: scanner.c Only in flex-2.5.33/tests/test-basic-r: scanner.o Only in flex-2.5.33/tests/test-basic-r: test-basic-r Only in flex-2.5.33/tests/test-bison-nr: main.o Only in flex-2.5.33/tests/test-bison-nr: Makefile Only in flex-2.5.33/tests/test-bison-nr: OUTPUT Only in flex-2.5.33/tests/test-bison-nr: parser.c Only in flex-2.5.33/tests/test-bison-nr: parser.h Only in flex-2.5.33/tests/test-bison-nr: parser.o Only in flex-2.5.33/tests/test-bison-nr: scanner.c Only in flex-2.5.33/tests/test-bison-nr: scanner.h Only in flex-2.5.33/tests/test-bison-nr: scanner.o Only in flex-2.5.33/tests/test-bison-nr: test-bison-nr Only in flex-2.5.33/tests/test-bison-yylloc: main.o Only in flex-2.5.33/tests/test-bison-yylloc: Makefile Only in flex-2.5.33/tests/test-bison-yylloc: OUTPUT Only in flex-2.5.33/tests/test-bison-yylloc: parser.c Only in flex-2.5.33/tests/test-bison-yylloc: parser.h Only in flex-2.5.33/tests/test-bison-yylloc: parser.o Only in flex-2.5.33/tests/test-bison-yylloc: scanner.c Only in flex-2.5.33/tests/test-bison-yylloc: scanner.h Only in flex-2.5.33/tests/test-bison-yylloc: scanner.o Only in flex-2.5.33/tests/test-bison-yylloc: test-bison-yylloc Only in flex-2.5.33/tests/test-bison-yylval: main.o Only in flex-2.5.33/tests/test-bison-yylval: Makefile Only in flex-2.5.33/tests/test-bison-yylval: OUTPUT Only in flex-2.5.33/tests/test-bison-yylval: parser.c Only in flex-2.5.33/tests/test-bison-yylval: parser.h Only in flex-2.5.33/tests/test-bison-yylval: parser.o Only in flex-2.5.33/tests/test-bison-yylval: scanner.c Only in flex-2.5.33/tests/test-bison-yylval: scanner.h Only in flex-2.5.33/tests/test-bison-yylval: scanner.o Only in flex-2.5.33/tests/test-bison-yylval: test-bison-yylval Only in flex-2.5.33/tests/test-c++-basic: Makefile Only in flex-2.5.33/tests/test-c++-basic: OUTPUT Only in flex-2.5.33/tests/test-c++-basic: scanner.cpp Only in flex-2.5.33/tests/test-c++-basic: scanner.o Only in flex-2.5.33/tests/test-c++-basic: test-c++-basic Only in flex-2.5.33/tests/test-c-cpp-nr: Makefile Only in flex-2.5.33/tests/test-c-cpp-nr: OUTPUT Only in flex-2.5.33/tests/test-c-cpp-nr: scanner.cpp Only in flex-2.5.33/tests/test-c-cpp-nr: scanner.o Only in flex-2.5.33/tests/test-c-cpp-nr: test-c-cpp-nr Only in flex-2.5.33/tests/test-c-cpp-r: Makefile Only in flex-2.5.33/tests/test-c-cpp-r: OUTPUT Only in flex-2.5.33/tests/test-c-cpp-r: scanner.cpp Only in flex-2.5.33/tests/test-c-cpp-r: scanner.o Only in flex-2.5.33/tests/test-c-cpp-r: test-c-cpp-r Only in flex-2.5.33/tests/test-c++-multiple-scanners: main.o Only in flex-2.5.33/tests/test-c++-multiple-scanners: Makefile Only in flex-2.5.33/tests/test-c++-multiple-scanners: OUTPUT Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-1.cpp Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-1.o Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-2.cpp Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-2.o Only in flex-2.5.33/tests/test-c++-multiple-scanners: test-c++-multiple-scanners Only in flex-2.5.33/tests/test-debug-nr: Makefile Only in flex-2.5.33/tests/test-debug-nr: OUTPUT Only in flex-2.5.33/tests/test-debug-nr: scanner.c Only in flex-2.5.33/tests/test-debug-nr: scanner.o Only in flex-2.5.33/tests/test-debug-nr: test-debug-nr Only in flex-2.5.33/tests/test-debug-r: Makefile Only in flex-2.5.33/tests/test-debug-r: OUTPUT Only in flex-2.5.33/tests/test-debug-r: scanner.c Only in flex-2.5.33/tests/test-debug-r: scanner.o Only in flex-2.5.33/tests/test-debug-r: test-debug-r Only in flex-2.5.33/tests/test-header-nr: main.o Only in flex-2.5.33/tests/test-header-nr: Makefile Only in flex-2.5.33/tests/test-header-nr: OUTPUT Only in flex-2.5.33/tests/test-header-nr: scanner.c Only in flex-2.5.33/tests/test-header-nr: scanner.h Only in flex-2.5.33/tests/test-header-nr: scanner.o Only in flex-2.5.33/tests/test-header-nr: test-header-nr Only in flex-2.5.33/tests/test-header-r: main.o Only in flex-2.5.33/tests/test-header-r: Makefile Only in flex-2.5.33/tests/test-header-r: OUTPUT Only in flex-2.5.33/tests/test-header-r: scanner.c Only in flex-2.5.33/tests/test-header-r: scanner.h Only in flex-2.5.33/tests/test-header-r: scanner.o Only in flex-2.5.33/tests/test-header-r: test-header-r Only in flex-2.5.33/tests/test-include-by-buffer: Makefile Only in flex-2.5.33/tests/test-include-by-buffer: OUTPUT Only in flex-2.5.33/tests/test-include-by-buffer: scanner.c Only in flex-2.5.33/tests/test-include-by-buffer: scanner.o Only in flex-2.5.33/tests/test-include-by-buffer: test-include-by-buffer Only in flex-2.5.33/tests/test-include-by-push: Makefile Only in flex-2.5.33/tests/test-include-by-push: OUTPUT Only in flex-2.5.33/tests/test-include-by-push: scanner.c Only in flex-2.5.33/tests/test-include-by-push: scanner.o Only in flex-2.5.33/tests/test-include-by-push: test-include-by-push Only in flex-2.5.33/tests/test-include-by-reentrant: Makefile Only in flex-2.5.33/tests/test-include-by-reentrant: OUTPUT Only in flex-2.5.33/tests/test-include-by-reentrant: scanner.c Only in flex-2.5.33/tests/test-include-by-reentrant: scanner.o Only in flex-2.5.33/tests/test-include-by-reentrant: test-include-by-reentrant Only in flex-2.5.33/tests/test-linedir-r: main.o Only in flex-2.5.33/tests/test-linedir-r: Makefile Only in flex-2.5.33/tests/test-linedir-r: OUTPUT Only in flex-2.5.33/tests/test-linedir-r: scanner.c Only in flex-2.5.33/tests/test-linedir-r: scanner.h Only in flex-2.5.33/tests/test-linedir-r: scanner.o Only in flex-2.5.33/tests/test-linedir-r: test-linedir-r Only in flex-2.5.33/tests/test-lineno-nr: Makefile Only in flex-2.5.33/tests/test-lineno-nr: OUTPUT Only in flex-2.5.33/tests/test-lineno-nr: scanner.c Only in flex-2.5.33/tests/test-lineno-nr: scanner.o Only in flex-2.5.33/tests/test-lineno-nr: test-lineno-nr Only in flex-2.5.33/tests/test-lineno-r: Makefile Only in flex-2.5.33/tests/test-lineno-r: OUTPUT Only in flex-2.5.33/tests/test-lineno-r: scanner.c Only in flex-2.5.33/tests/test-lineno-r: scanner.o Only in flex-2.5.33/tests/test-lineno-r: test-lineno-r Only in flex-2.5.33/tests/test-mem-nr: Makefile Only in flex-2.5.33/tests/test-mem-nr: OUTPUT Only in flex-2.5.33/tests/test-mem-nr: scanner.c Only in flex-2.5.33/tests/test-mem-nr: scanner.o Only in flex-2.5.33/tests/test-mem-nr: test-mem-nr Only in flex-2.5.33/tests/test-mem-r: Makefile Only in flex-2.5.33/tests/test-mem-r: OUTPUT Only in flex-2.5.33/tests/test-mem-r: scanner.c Only in flex-2.5.33/tests/test-mem-r: scanner.o Only in flex-2.5.33/tests/test-mem-r: test-mem-r Only in flex-2.5.33/tests/test-multiple-scanners-nr: main.o Only in flex-2.5.33/tests/test-multiple-scanners-nr: Makefile Only in flex-2.5.33/tests/test-multiple-scanners-nr: OUTPUT Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-1.c Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-1.h Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-1.o Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-2.c Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-2.h Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-2.o Only in flex-2.5.33/tests/test-multiple-scanners-nr: test-multiple-scanners-nr Only in flex-2.5.33/tests/test-multiple-scanners-r: main.o Only in flex-2.5.33/tests/test-multiple-scanners-r: Makefile Only in flex-2.5.33/tests/test-multiple-scanners-r: OUTPUT Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.c Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.h Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.o Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.tables Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.c Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.h Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.o Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.tables Only in flex-2.5.33/tests/test-multiple-scanners-r: test-multiple-scanners-r Only in flex-2.5.33/tests/test-noansi-nr: Makefile Only in flex-2.5.33/tests/test-noansi-nr: OUTPUT Only in flex-2.5.33/tests/test-noansi-nr: scanner.c Only in flex-2.5.33/tests/test-noansi-nr: scanner.o Only in flex-2.5.33/tests/test-noansi-nr: test-noansi-nr Only in flex-2.5.33/tests/test-noansi-r: Makefile Only in flex-2.5.33/tests/test-noansi-r: OUTPUT Only in flex-2.5.33/tests/test-noansi-r: scanner.c Only in flex-2.5.33/tests/test-noansi-r: scanner.o Only in flex-2.5.33/tests/test-noansi-r: test-noansi-r Only in flex-2.5.33/tests/test-posix: Makefile Only in flex-2.5.33/tests/test-posix: OUTPUT Only in flex-2.5.33/tests/test-posix: scanner.c Only in flex-2.5.33/tests/test-posix: scanner.o Only in flex-2.5.33/tests/test-posix: test-posix Only in flex-2.5.33/tests/test-posixly-correct: Makefile Only in flex-2.5.33/tests/test-posixly-correct: OUTPUT Only in flex-2.5.33/tests/test-posixly-correct: scanner.c Only in flex-2.5.33/tests/test-posixly-correct: scanner.o Only in flex-2.5.33/tests/test-posixly-correct: test-posixly-correct Only in flex-2.5.33/tests/test-prefix-nr: Makefile Only in flex-2.5.33/tests/test-prefix-nr: OUTPUT Only in flex-2.5.33/tests/test-prefix-nr: scanner.c Only in flex-2.5.33/tests/test-prefix-nr: scanner.o Only in flex-2.5.33/tests/test-prefix-nr: test-prefix-nr Only in flex-2.5.33/tests/test-prefix-r: Makefile Only in flex-2.5.33/tests/test-prefix-r: OUTPUT Only in flex-2.5.33/tests/test-prefix-r: scanner.c Only in flex-2.5.33/tests/test-prefix-r: scanner.o Only in flex-2.5.33/tests/test-prefix-r: test-prefix-r Only in flex-2.5.33/tests/test-pthread: Makefile Only in flex-2.5.33/tests/test-pthread: OUTPUT Only in flex-2.5.33/tests/test-pthread: scanner.c Only in flex-2.5.33/tests/test-pthread: scanner.o Only in flex-2.5.33/tests/test-pthread: test-pthread Only in flex-2.5.33/tests/test-reject: Makefile Only in flex-2.5.33/tests/test-reject: OUTPUT Only in flex-2.5.33/tests/test-reject: test-reject-nr Only in flex-2.5.33/tests/test-reject: test-reject-nr.c Only in flex-2.5.33/tests/test-reject: test-reject-nr.o Only in flex-2.5.33/tests/test-reject: test-reject-r Only in flex-2.5.33/tests/test-reject: test-reject-r.c Only in flex-2.5.33/tests/test-reject: test-reject-r.o Only in flex-2.5.33/tests/test-reject: test-reject-ser Only in flex-2.5.33/tests/test-reject: test-reject-ser.c Only in flex-2.5.33/tests/test-reject: test-reject-ser.o Only in flex-2.5.33/tests/test-reject: test-reject-ser.tables Only in flex-2.5.33/tests/test-reject: test-reject-ver Only in flex-2.5.33/tests/test-reject: test-reject-ver.c Only in flex-2.5.33/tests/test-reject: test-reject-ver.o Only in flex-2.5.33/tests/test-reject: test-reject-ver.tables Only in flex-2.5.33/tests/test-rescan-nr: Makefile Only in flex-2.5.33/tests/test-rescan-nr: OUTPUT Only in flex-2.5.33/tests/test-rescan-nr: scanner.c Only in flex-2.5.33/tests/test-rescan-nr: scanner.o Only in flex-2.5.33/tests/test-rescan-nr: test-rescan-nr Only in flex-2.5.33/tests/test-rescan-r: Makefile Only in flex-2.5.33/tests/test-rescan-r: OUTPUT Only in flex-2.5.33/tests/test-rescan-r: scanner.c Only in flex-2.5.33/tests/test-rescan-r: scanner.o Only in flex-2.5.33/tests/test-rescan-r: test-rescan-r Only in flex-2.5.33/tests/test-string-nr: Makefile Only in flex-2.5.33/tests/test-string-nr: OUTPUT Only in flex-2.5.33/tests/test-string-nr: scanner.c Only in flex-2.5.33/tests/test-string-nr: scanner.o Only in flex-2.5.33/tests/test-string-nr: test-string-nr Only in flex-2.5.33/tests/test-string-r: Makefile Only in flex-2.5.33/tests/test-string-r: OUTPUT Only in flex-2.5.33/tests/test-string-r: scanner.c Only in flex-2.5.33/tests/test-string-r: scanner.o Only in flex-2.5.33/tests/test-string-r: test-string-r Only in flex-2.5.33/tests/test-table-opts: all-ser.tables Only in flex-2.5.33/tests/test-table-opts: Makefile Only in flex-2.5.33/tests/test-table-opts: OUTPUT Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ca Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ca.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cae Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cae.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caef Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CaeF Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caef.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CaeF.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caef.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CaeF.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caem Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caem.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caem.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cae.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cam Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cam.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cam.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ca.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ce Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ce.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cem Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cem.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cem.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ce.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cf Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CF Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cf.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CF.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cf.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CF.o Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cm Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cm.c Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cm.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ca Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ca.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cae Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cae.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caef Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CaeF Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caef.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CaeF.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caef.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CaeF.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caem Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caem.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caem.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cae.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cam Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cam.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cam.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ca.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ce Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ce.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cem Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cem.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cem.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ce.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cf Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CF Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cf.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CF.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cf.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CF.o Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cm Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cm.c Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cm.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm.c Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm.o Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF.tables Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm.c Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm.o Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm.c Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm.o Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF.tables Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm.c Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm.o Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm.tables Only in flex-2.5.33/tests/test-top: main.o Only in flex-2.5.33/tests/test-top: Makefile Only in flex-2.5.33/tests/test-top: OUTPUT Only in flex-2.5.33/tests/test-top: scanner.c Only in flex-2.5.33/tests/test-top: scanner.h Only in flex-2.5.33/tests/test-top: scanner.o Only in flex-2.5.33/tests/test-top: test-top Only in flex-2.5.33/tests/test-yyextra: Makefile Only in flex-2.5.33/tests/test-yyextra: OUTPUT Only in flex-2.5.33/tests/test-yyextra: scanner.c Only in flex-2.5.33/tests/test-yyextra: scanner.o Only in flex-2.5.33/tests/test-yyextra: test-yyextra Only in flex-2.5.33/tools: Makefile Only in flex-2.5.33: yylex.o Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- flex.spec 30 Jan 2007 14:39:31 -0000 1.34 +++ flex.spec 31 Jan 2007 15:01:38 -0000 1.35 @@ -1,11 +1,12 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.33 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ Source: http://puzzle.dl.sourceforge.net/sourceforge/flex/flex-%{version}.tar.bz2 +Patch0: flex-2.5.33-pic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: m4 BuildRequires: gettext info bison m4 @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --disable-dependency-tracking @@ -75,6 +77,9 @@ %{_datadir}/locale/* %changelog +* Wed Jan 31 2007 Petr Machata - 2.5.33-3 +- Compile with -fPIC. + * Tue Jan 30 2007 Petr Machata - 2.5.33-2 - Add Requires:m4. From fedora-cvs-commits at redhat.com Wed Jan 31 15:11:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:11:13 -0500 Subject: rpms/flex/devel flex-2.5.33-pic.patch,1.1,1.2 Message-ID: <200701311511.l0VFBDQK031935@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31690 Modified Files: flex-2.5.33-pic.patch Log Message: Oops, commited wrong patch last time... flex-2.5.33-pic.patch: Makefile.in | 1 + Makefile.in~ |only flex-2.5.33 |only 3 files changed, 1 insertion(+) Index: flex-2.5.33-pic.patch =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex-2.5.33-pic.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- flex-2.5.33-pic.patch 31 Jan 2007 15:01:38 -0000 1.1 +++ flex-2.5.33-pic.patch 31 Jan 2007 15:11:10 -0000 1.2 @@ -1,306 +1,4 @@ -Only in flex-2.5.33: buf.o -Only in flex-2.5.33: ccl.o -diff -urp flex-2.5.33/config.guess flex-2.5.33-pm/config.guess ---- flex-2.5.33/config.guess 2007-01-31 15:09:58.000000000 +0100 -+++ flex-2.5.33-pm/config.guess 2007-01-31 15:04:44.000000000 +0100 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-06-17' -+timestamp='2003-05-09' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -106,7 +106,6 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi - : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; - dummy=$tmp/dummy ; - tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -@@ -136,13 +135,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - --## for Red Hat Linux --if test -f /etc/redhat-release ; then -- VENDOR=redhat ; --else -- VENDOR= ; --fi -- - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -290,9 +282,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; -- Alpha*:OpenVMS:*:*) -- echo alpha-hp-vms -- exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -331,9 +320,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; -- DRS?6000:unix:4.0:6*) -- echo sparc-icl-nx6 -- exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; -@@ -781,8 +767,8 @@ EOF - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -+ x86:Interix*:3*) -+ echo i586-pc-interix3 - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -@@ -811,11 +797,8 @@ EOF - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -- cris:Linux:*:*) -- echo cris-axis-linux-gnu -- exit 0 ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -859,10 +842,10 @@ EOF - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) -- echo powerpc-${VENDOR:-unknown}-linux-gnu -+ echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) -- echo powerpc64-${VENDOR:-unknown}-linux-gnu -+ echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -890,10 +873,7 @@ EOF - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu -- exit 0 ;; -- sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -902,7 +882,7 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) -- echo x86_64-${VENDOR:-unknown}-linux-gnu -+ echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -954,7 +934,7 @@ EOF - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 -+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) -@@ -1209,9 +1189,6 @@ EOF - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; -- SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -- exit 0 ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -Only in flex-2.5.33: config.h -Only in flex-2.5.33: config.log -Only in flex-2.5.33: config.status -diff -urp flex-2.5.33/config.sub flex-2.5.33-pm/config.sub ---- flex-2.5.33/config.sub 2007-01-31 15:09:58.000000000 +0100 -+++ flex-2.5.33-pm/config.sub 2007-01-31 15:04:44.000000000 +0100 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-06-18' -+timestamp='2003-05-09' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -229,7 +229,7 @@ case $basic_machine in - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -- | c4x | clipper \ -+ | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -@@ -257,12 +257,11 @@ case $basic_machine in - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | s390 | s390x \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ -+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ -@@ -330,11 +329,10 @@ case $basic_machine in - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | s390-* | s390x-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ -@@ -773,24 +771,18 @@ case $basic_machine in - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2 | pentiumiii | pentium3) -+ pentiumii | pentium2) - basic_machine=i686-pc - ;; -- pentium4) -- basic_machine=i786-pc -- ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) -+ pentiumii-* | pentium2-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentium4-*) -- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - pn) - basic_machine=pn-gould - ;; -@@ -833,6 +825,12 @@ case $basic_machine in - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; -+ s390 | s390-*) -+ basic_machine=s390-ibm -+ ;; -+ s390x | s390x-*) -+ basic_machine=s390x-ibm -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi -@@ -843,10 +841,6 @@ case $basic_machine in - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -- sei) -- basic_machine=mips-sei -- os=-seiux -- ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -854,9 +848,6 @@ case $basic_machine in - basic_machine=sh-hitachi - os=-hms - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -931,6 +922,10 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -+ tic4x | c4x*) -+ basic_machine=tic4x-unknown -+ os=-coff -+ ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff -@@ -1051,7 +1046,7 @@ case $basic_machine in - sh64) - basic_machine=sh64-unknown - ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) -@@ -1136,7 +1131,7 @@ case $os in - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) -+ | -powermax* | -dnix*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1282,9 +1277,6 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -Only in flex-2.5.33: debugfiles.list -Only in flex-2.5.33: debugsources.list -Only in flex-2.5.33: dfa.o -Only in flex-2.5.33/doc: Makefile -Only in flex-2.5.33: ecs.o -Only in flex-2.5.33/examples/fastwc: Makefile -Only in flex-2.5.33/examples: Makefile -Only in flex-2.5.33/examples/manual: Makefile -Only in flex-2.5.33: filter.o -Only in flex-2.5.33: flex -Only in flex-2.5.33: flex.lang -Only in flex-2.5.33: gen.o -Only in flex-2.5.33: libfl.a -Only in flex-2.5.33: libmain.o -Only in flex-2.5.33: libyywrap.o -Only in flex-2.5.33/m4: Makefile -Only in flex-2.5.33: main.o -Only in flex-2.5.33: Makefile +Only in flex-2.5.33-pm: flex-2.5.33 diff -urp flex-2.5.33/Makefile.in flex-2.5.33-pm/Makefile.in --- flex-2.5.33/Makefile.in 2006-02-21 03:45:12.000000000 +0100 +++ flex-2.5.33-pm/Makefile.in 2007-01-31 15:06:32.000000000 +0100 @@ -313,512 +11,3 @@ # Run GNU indent on sources. Don't run this unless all the sources compile cleanly. # Only in flex-2.5.33-pm: Makefile.in~ -Only in flex-2.5.33: misc.o -Only in flex-2.5.33: nfa.o -Only in flex-2.5.33: options.o -Only in flex-2.5.33: parse.o -Only in flex-2.5.33/po: Makefile -Only in flex-2.5.33/po: Makefile.in -Only in flex-2.5.33/po: POTFILES -Only in flex-2.5.33: regex.o -Only in flex-2.5.33: scan.o -Only in flex-2.5.33: scanopt.o -Only in flex-2.5.33: skel.o -Only in flex-2.5.33: stamp-h1 -Only in flex-2.5.33: sym.o -Only in flex-2.5.33: tables.o -Only in flex-2.5.33: tables_shared.o -Only in flex-2.5.33: tblcmp.o -Only in flex-2.5.33/tests: Makefile -Only in flex-2.5.33/tests/TEMPLATE: Makefile -Only in flex-2.5.33/tests/test-array-nr: Makefile -Only in flex-2.5.33/tests/test-array-nr: OUTPUT -Only in flex-2.5.33/tests/test-array-nr: scanner.c -Only in flex-2.5.33/tests/test-array-nr: scanner.o -Only in flex-2.5.33/tests/test-array-nr: test-array-nr -Only in flex-2.5.33/tests/test-array-r: Makefile -Only in flex-2.5.33/tests/test-array-r: OUTPUT -Only in flex-2.5.33/tests/test-array-r: scanner.c -Only in flex-2.5.33/tests/test-array-r: scanner.o -Only in flex-2.5.33/tests/test-array-r: test-array-r -Only in flex-2.5.33/tests/test-basic-nr: Makefile -Only in flex-2.5.33/tests/test-basic-nr: OUTPUT -Only in flex-2.5.33/tests/test-basic-nr: scanner.c -Only in flex-2.5.33/tests/test-basic-nr: scanner.o -Only in flex-2.5.33/tests/test-basic-nr: test-basic-nr -Only in flex-2.5.33/tests/test-basic-r: Makefile -Only in flex-2.5.33/tests/test-basic-r: OUTPUT -Only in flex-2.5.33/tests/test-basic-r: scanner.c -Only in flex-2.5.33/tests/test-basic-r: scanner.o -Only in flex-2.5.33/tests/test-basic-r: test-basic-r -Only in flex-2.5.33/tests/test-bison-nr: main.o -Only in flex-2.5.33/tests/test-bison-nr: Makefile -Only in flex-2.5.33/tests/test-bison-nr: OUTPUT -Only in flex-2.5.33/tests/test-bison-nr: parser.c -Only in flex-2.5.33/tests/test-bison-nr: parser.h -Only in flex-2.5.33/tests/test-bison-nr: parser.o -Only in flex-2.5.33/tests/test-bison-nr: scanner.c -Only in flex-2.5.33/tests/test-bison-nr: scanner.h -Only in flex-2.5.33/tests/test-bison-nr: scanner.o -Only in flex-2.5.33/tests/test-bison-nr: test-bison-nr -Only in flex-2.5.33/tests/test-bison-yylloc: main.o -Only in flex-2.5.33/tests/test-bison-yylloc: Makefile -Only in flex-2.5.33/tests/test-bison-yylloc: OUTPUT -Only in flex-2.5.33/tests/test-bison-yylloc: parser.c -Only in flex-2.5.33/tests/test-bison-yylloc: parser.h -Only in flex-2.5.33/tests/test-bison-yylloc: parser.o -Only in flex-2.5.33/tests/test-bison-yylloc: scanner.c -Only in flex-2.5.33/tests/test-bison-yylloc: scanner.h -Only in flex-2.5.33/tests/test-bison-yylloc: scanner.o -Only in flex-2.5.33/tests/test-bison-yylloc: test-bison-yylloc -Only in flex-2.5.33/tests/test-bison-yylval: main.o -Only in flex-2.5.33/tests/test-bison-yylval: Makefile -Only in flex-2.5.33/tests/test-bison-yylval: OUTPUT -Only in flex-2.5.33/tests/test-bison-yylval: parser.c -Only in flex-2.5.33/tests/test-bison-yylval: parser.h -Only in flex-2.5.33/tests/test-bison-yylval: parser.o -Only in flex-2.5.33/tests/test-bison-yylval: scanner.c -Only in flex-2.5.33/tests/test-bison-yylval: scanner.h -Only in flex-2.5.33/tests/test-bison-yylval: scanner.o -Only in flex-2.5.33/tests/test-bison-yylval: test-bison-yylval -Only in flex-2.5.33/tests/test-c++-basic: Makefile -Only in flex-2.5.33/tests/test-c++-basic: OUTPUT -Only in flex-2.5.33/tests/test-c++-basic: scanner.cpp -Only in flex-2.5.33/tests/test-c++-basic: scanner.o -Only in flex-2.5.33/tests/test-c++-basic: test-c++-basic -Only in flex-2.5.33/tests/test-c-cpp-nr: Makefile -Only in flex-2.5.33/tests/test-c-cpp-nr: OUTPUT -Only in flex-2.5.33/tests/test-c-cpp-nr: scanner.cpp -Only in flex-2.5.33/tests/test-c-cpp-nr: scanner.o -Only in flex-2.5.33/tests/test-c-cpp-nr: test-c-cpp-nr -Only in flex-2.5.33/tests/test-c-cpp-r: Makefile -Only in flex-2.5.33/tests/test-c-cpp-r: OUTPUT -Only in flex-2.5.33/tests/test-c-cpp-r: scanner.cpp -Only in flex-2.5.33/tests/test-c-cpp-r: scanner.o -Only in flex-2.5.33/tests/test-c-cpp-r: test-c-cpp-r -Only in flex-2.5.33/tests/test-c++-multiple-scanners: main.o -Only in flex-2.5.33/tests/test-c++-multiple-scanners: Makefile -Only in flex-2.5.33/tests/test-c++-multiple-scanners: OUTPUT -Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-1.cpp -Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-1.o -Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-2.cpp -Only in flex-2.5.33/tests/test-c++-multiple-scanners: scanner-2.o -Only in flex-2.5.33/tests/test-c++-multiple-scanners: test-c++-multiple-scanners -Only in flex-2.5.33/tests/test-debug-nr: Makefile -Only in flex-2.5.33/tests/test-debug-nr: OUTPUT -Only in flex-2.5.33/tests/test-debug-nr: scanner.c -Only in flex-2.5.33/tests/test-debug-nr: scanner.o -Only in flex-2.5.33/tests/test-debug-nr: test-debug-nr -Only in flex-2.5.33/tests/test-debug-r: Makefile -Only in flex-2.5.33/tests/test-debug-r: OUTPUT -Only in flex-2.5.33/tests/test-debug-r: scanner.c -Only in flex-2.5.33/tests/test-debug-r: scanner.o -Only in flex-2.5.33/tests/test-debug-r: test-debug-r -Only in flex-2.5.33/tests/test-header-nr: main.o -Only in flex-2.5.33/tests/test-header-nr: Makefile -Only in flex-2.5.33/tests/test-header-nr: OUTPUT -Only in flex-2.5.33/tests/test-header-nr: scanner.c -Only in flex-2.5.33/tests/test-header-nr: scanner.h -Only in flex-2.5.33/tests/test-header-nr: scanner.o -Only in flex-2.5.33/tests/test-header-nr: test-header-nr -Only in flex-2.5.33/tests/test-header-r: main.o -Only in flex-2.5.33/tests/test-header-r: Makefile -Only in flex-2.5.33/tests/test-header-r: OUTPUT -Only in flex-2.5.33/tests/test-header-r: scanner.c -Only in flex-2.5.33/tests/test-header-r: scanner.h -Only in flex-2.5.33/tests/test-header-r: scanner.o -Only in flex-2.5.33/tests/test-header-r: test-header-r -Only in flex-2.5.33/tests/test-include-by-buffer: Makefile -Only in flex-2.5.33/tests/test-include-by-buffer: OUTPUT -Only in flex-2.5.33/tests/test-include-by-buffer: scanner.c -Only in flex-2.5.33/tests/test-include-by-buffer: scanner.o -Only in flex-2.5.33/tests/test-include-by-buffer: test-include-by-buffer -Only in flex-2.5.33/tests/test-include-by-push: Makefile -Only in flex-2.5.33/tests/test-include-by-push: OUTPUT -Only in flex-2.5.33/tests/test-include-by-push: scanner.c -Only in flex-2.5.33/tests/test-include-by-push: scanner.o -Only in flex-2.5.33/tests/test-include-by-push: test-include-by-push -Only in flex-2.5.33/tests/test-include-by-reentrant: Makefile -Only in flex-2.5.33/tests/test-include-by-reentrant: OUTPUT -Only in flex-2.5.33/tests/test-include-by-reentrant: scanner.c -Only in flex-2.5.33/tests/test-include-by-reentrant: scanner.o -Only in flex-2.5.33/tests/test-include-by-reentrant: test-include-by-reentrant -Only in flex-2.5.33/tests/test-linedir-r: main.o -Only in flex-2.5.33/tests/test-linedir-r: Makefile -Only in flex-2.5.33/tests/test-linedir-r: OUTPUT -Only in flex-2.5.33/tests/test-linedir-r: scanner.c -Only in flex-2.5.33/tests/test-linedir-r: scanner.h -Only in flex-2.5.33/tests/test-linedir-r: scanner.o -Only in flex-2.5.33/tests/test-linedir-r: test-linedir-r -Only in flex-2.5.33/tests/test-lineno-nr: Makefile -Only in flex-2.5.33/tests/test-lineno-nr: OUTPUT -Only in flex-2.5.33/tests/test-lineno-nr: scanner.c -Only in flex-2.5.33/tests/test-lineno-nr: scanner.o -Only in flex-2.5.33/tests/test-lineno-nr: test-lineno-nr -Only in flex-2.5.33/tests/test-lineno-r: Makefile -Only in flex-2.5.33/tests/test-lineno-r: OUTPUT -Only in flex-2.5.33/tests/test-lineno-r: scanner.c -Only in flex-2.5.33/tests/test-lineno-r: scanner.o -Only in flex-2.5.33/tests/test-lineno-r: test-lineno-r -Only in flex-2.5.33/tests/test-mem-nr: Makefile -Only in flex-2.5.33/tests/test-mem-nr: OUTPUT -Only in flex-2.5.33/tests/test-mem-nr: scanner.c -Only in flex-2.5.33/tests/test-mem-nr: scanner.o -Only in flex-2.5.33/tests/test-mem-nr: test-mem-nr -Only in flex-2.5.33/tests/test-mem-r: Makefile -Only in flex-2.5.33/tests/test-mem-r: OUTPUT -Only in flex-2.5.33/tests/test-mem-r: scanner.c -Only in flex-2.5.33/tests/test-mem-r: scanner.o -Only in flex-2.5.33/tests/test-mem-r: test-mem-r -Only in flex-2.5.33/tests/test-multiple-scanners-nr: main.o -Only in flex-2.5.33/tests/test-multiple-scanners-nr: Makefile -Only in flex-2.5.33/tests/test-multiple-scanners-nr: OUTPUT -Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-1.c -Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-1.h -Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-1.o -Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-2.c -Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-2.h -Only in flex-2.5.33/tests/test-multiple-scanners-nr: scanner-2.o -Only in flex-2.5.33/tests/test-multiple-scanners-nr: test-multiple-scanners-nr -Only in flex-2.5.33/tests/test-multiple-scanners-r: main.o -Only in flex-2.5.33/tests/test-multiple-scanners-r: Makefile -Only in flex-2.5.33/tests/test-multiple-scanners-r: OUTPUT -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.c -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.h -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.o -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-1.tables -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.c -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.h -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.o -Only in flex-2.5.33/tests/test-multiple-scanners-r: scanner-2.tables -Only in flex-2.5.33/tests/test-multiple-scanners-r: test-multiple-scanners-r -Only in flex-2.5.33/tests/test-noansi-nr: Makefile -Only in flex-2.5.33/tests/test-noansi-nr: OUTPUT -Only in flex-2.5.33/tests/test-noansi-nr: scanner.c -Only in flex-2.5.33/tests/test-noansi-nr: scanner.o -Only in flex-2.5.33/tests/test-noansi-nr: test-noansi-nr -Only in flex-2.5.33/tests/test-noansi-r: Makefile -Only in flex-2.5.33/tests/test-noansi-r: OUTPUT -Only in flex-2.5.33/tests/test-noansi-r: scanner.c -Only in flex-2.5.33/tests/test-noansi-r: scanner.o -Only in flex-2.5.33/tests/test-noansi-r: test-noansi-r -Only in flex-2.5.33/tests/test-posix: Makefile -Only in flex-2.5.33/tests/test-posix: OUTPUT -Only in flex-2.5.33/tests/test-posix: scanner.c -Only in flex-2.5.33/tests/test-posix: scanner.o -Only in flex-2.5.33/tests/test-posix: test-posix -Only in flex-2.5.33/tests/test-posixly-correct: Makefile -Only in flex-2.5.33/tests/test-posixly-correct: OUTPUT -Only in flex-2.5.33/tests/test-posixly-correct: scanner.c -Only in flex-2.5.33/tests/test-posixly-correct: scanner.o -Only in flex-2.5.33/tests/test-posixly-correct: test-posixly-correct -Only in flex-2.5.33/tests/test-prefix-nr: Makefile -Only in flex-2.5.33/tests/test-prefix-nr: OUTPUT -Only in flex-2.5.33/tests/test-prefix-nr: scanner.c -Only in flex-2.5.33/tests/test-prefix-nr: scanner.o -Only in flex-2.5.33/tests/test-prefix-nr: test-prefix-nr -Only in flex-2.5.33/tests/test-prefix-r: Makefile -Only in flex-2.5.33/tests/test-prefix-r: OUTPUT -Only in flex-2.5.33/tests/test-prefix-r: scanner.c -Only in flex-2.5.33/tests/test-prefix-r: scanner.o -Only in flex-2.5.33/tests/test-prefix-r: test-prefix-r -Only in flex-2.5.33/tests/test-pthread: Makefile -Only in flex-2.5.33/tests/test-pthread: OUTPUT -Only in flex-2.5.33/tests/test-pthread: scanner.c -Only in flex-2.5.33/tests/test-pthread: scanner.o -Only in flex-2.5.33/tests/test-pthread: test-pthread -Only in flex-2.5.33/tests/test-reject: Makefile -Only in flex-2.5.33/tests/test-reject: OUTPUT -Only in flex-2.5.33/tests/test-reject: test-reject-nr -Only in flex-2.5.33/tests/test-reject: test-reject-nr.c -Only in flex-2.5.33/tests/test-reject: test-reject-nr.o -Only in flex-2.5.33/tests/test-reject: test-reject-r -Only in flex-2.5.33/tests/test-reject: test-reject-r.c -Only in flex-2.5.33/tests/test-reject: test-reject-r.o -Only in flex-2.5.33/tests/test-reject: test-reject-ser -Only in flex-2.5.33/tests/test-reject: test-reject-ser.c -Only in flex-2.5.33/tests/test-reject: test-reject-ser.o -Only in flex-2.5.33/tests/test-reject: test-reject-ser.tables -Only in flex-2.5.33/tests/test-reject: test-reject-ver -Only in flex-2.5.33/tests/test-reject: test-reject-ver.c -Only in flex-2.5.33/tests/test-reject: test-reject-ver.o -Only in flex-2.5.33/tests/test-reject: test-reject-ver.tables -Only in flex-2.5.33/tests/test-rescan-nr: Makefile -Only in flex-2.5.33/tests/test-rescan-nr: OUTPUT -Only in flex-2.5.33/tests/test-rescan-nr: scanner.c -Only in flex-2.5.33/tests/test-rescan-nr: scanner.o -Only in flex-2.5.33/tests/test-rescan-nr: test-rescan-nr -Only in flex-2.5.33/tests/test-rescan-r: Makefile -Only in flex-2.5.33/tests/test-rescan-r: OUTPUT -Only in flex-2.5.33/tests/test-rescan-r: scanner.c -Only in flex-2.5.33/tests/test-rescan-r: scanner.o -Only in flex-2.5.33/tests/test-rescan-r: test-rescan-r -Only in flex-2.5.33/tests/test-string-nr: Makefile -Only in flex-2.5.33/tests/test-string-nr: OUTPUT -Only in flex-2.5.33/tests/test-string-nr: scanner.c -Only in flex-2.5.33/tests/test-string-nr: scanner.o -Only in flex-2.5.33/tests/test-string-nr: test-string-nr -Only in flex-2.5.33/tests/test-string-r: Makefile -Only in flex-2.5.33/tests/test-string-r: OUTPUT -Only in flex-2.5.33/tests/test-string-r: scanner.c -Only in flex-2.5.33/tests/test-string-r: scanner.o -Only in flex-2.5.33/tests/test-string-r: test-string-r -Only in flex-2.5.33/tests/test-table-opts: all-ser.tables -Only in flex-2.5.33/tests/test-table-opts: Makefile -Only in flex-2.5.33/tests/test-table-opts: OUTPUT -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ca -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ca.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cae -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cae.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caef -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CaeF -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caef.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CaeF.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caef.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CaeF.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caem -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caem.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Caem.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cae.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cam -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cam.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cam.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ca.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ce -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ce.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cem -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cem.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cem.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Ce.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cf -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CF -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cf.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CF.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cf.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-CF.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cm -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cm.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-nr-Cm.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ca -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ca.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cae -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cae.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caef -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CaeF -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caef.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CaeF.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caef.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CaeF.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caem -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caem.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Caem.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cae.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cam -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cam.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cam.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ca.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ce -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ce.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cem -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cem.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cem.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Ce.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cf -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CF -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cf.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CF.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cf.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-CF.o -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cm -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cm.c -Only in flex-2.5.33/tests/test-table-opts: test-opt-r-Cm.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caef.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CaeF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Caem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cae.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cam.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ca.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Ce.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cf.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-CF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-nr-Cm.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caef.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CaeF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Caem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cae.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cam.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ca.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Ce.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cf.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-CF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm.c -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm.o -Only in flex-2.5.33/tests/test-table-opts: test-ser-r-Cm.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caef.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CaeF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Caem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cae.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cam.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ca.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Ce.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cf.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-CF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-nr-Cm.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caef.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CaeF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Caem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cae.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cam.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ca.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cem.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Ce.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cf.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-CF.tables -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm.c -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm.o -Only in flex-2.5.33/tests/test-table-opts: test-ver-r-Cm.tables -Only in flex-2.5.33/tests/test-top: main.o -Only in flex-2.5.33/tests/test-top: Makefile -Only in flex-2.5.33/tests/test-top: OUTPUT -Only in flex-2.5.33/tests/test-top: scanner.c -Only in flex-2.5.33/tests/test-top: scanner.h -Only in flex-2.5.33/tests/test-top: scanner.o -Only in flex-2.5.33/tests/test-top: test-top -Only in flex-2.5.33/tests/test-yyextra: Makefile -Only in flex-2.5.33/tests/test-yyextra: OUTPUT -Only in flex-2.5.33/tests/test-yyextra: scanner.c -Only in flex-2.5.33/tests/test-yyextra: scanner.o -Only in flex-2.5.33/tests/test-yyextra: test-yyextra -Only in flex-2.5.33/tools: Makefile -Only in flex-2.5.33: yylex.o From fedora-cvs-commits at redhat.com Wed Jan 31 15:26:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:26:05 -0500 Subject: rpms/mod_perl/devel mod_perl.spec,1.42,1.43 Message-ID: <200701311526.l0VFQ5ck030826@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30781 Modified Files: mod_perl.spec Log Message: * Wed Jan 31 2007 Joe Orton 2.0.3-4 - restore ModPerl::MM Index: mod_perl.spec =================================================================== RCS file: /cvs/dist/rpms/mod_perl/devel/mod_perl.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mod_perl.spec 5 Dec 2006 15:43:12 -0000 1.42 +++ mod_perl.spec 31 Jan 2007 15:26:03 -0000 1.43 @@ -2,7 +2,7 @@ Name: mod_perl Version: 2.0.3 -Release: 3 +Release: 4 Summary: An embedded Perl interpreter for the Apache Web server Group: System Environment/Daemons @@ -83,7 +83,7 @@ ModPerl::TestRun ModPerl::Config ModPerl::WrapXS \ ModPerl::BuildOptions ModPerl::Manifest \ ModPerl::MapUtil ModPerl::StructureMap \ - ModPerl::TypeMap ModPerl::FunctionMap ModPerl::MM \ + ModPerl::TypeMap ModPerl::FunctionMap \ ModPerl::ParseSource \ Apache2::Build Apache2::ParseSource Apache2::BuildConfig" for m in $trimmods; do @@ -120,6 +120,9 @@ %{_includedir}/httpd/* %changelog +* Wed Jan 31 2007 Joe Orton 2.0.3-4 +- restore ModPerl::MM + * Tue Dec 5 2006 Joe Orton 2.0.3-3 - trim modules even more aggressively (#197841) From fedora-cvs-commits at redhat.com Wed Jan 31 15:26:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:26:18 -0500 Subject: rpms/kernel/FC-5/configs config-generic, 1.184, 1.185 config-i586, 1.21, 1.22 config-i686, 1.2, 1.3 config-ia64-generic, 1.25, 1.26 config-powerpc-generic, 1.18, 1.19 config-powerpc32-generic, 1.13, 1.14 config-powerpc64-generic, 1.5, 1.6 config-powerpc64-iseries, 1.12, 1.13 config-s390-generic, 1.14, 1.15 config-x86-generic, 1.46, 1.47 config-x86_64-generic, 1.39, 1.40 config-xen-generic, 1.21, 1.22 Message-ID: <200701311526.l0VFQItU031033@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv30841/configs Modified Files: config-generic config-i586 config-i686 config-ia64-generic config-powerpc-generic config-powerpc32-generic config-powerpc64-generic config-powerpc64-iseries config-s390-generic config-x86-generic config-x86_64-generic config-xen-generic Log Message: * Wed Jan 31 2007 Chuck Ebbert - Update to 2.6.19.2 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v retrieving revision 1.184 retrieving revision 1.185 diff -u -r1.184 -r1.185 --- config-generic 19 Dec 2006 04:13:56 -0000 1.184 +++ config-generic 31 Jan 2007 15:26:16 -0000 1.185 @@ -22,6 +22,7 @@ # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y CONFIG_SYSCTL=y CONFIG_LOG_BUF_SHIFT=17 # CONFIG_IKCONFIG is not set @@ -36,6 +37,7 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_CFQ=y +CONFIG_IPC_NS=y CONFIG_POSIX_MQUEUE=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y @@ -53,14 +55,17 @@ CONFIG_KMOD=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set +CONFIG_MODULE_VERIFY_ELF=y # # Bus options (PCI, PCMCIA, EISA, MCA, ISA) # CONFIG_PCI=y # CONFIG_PCI_DEBUG is not set +CONFIG_HT_IRQ=y CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y # FIXME: Was borked in .17git11 for non-acpi machines. # CONFIG_HOTPLUG_PCI_PCIE is not set CONFIG_HOTPLUG_PCI_FAKE=m @@ -90,6 +95,7 @@ CONFIG_MMC_BLOCK=y CONFIG_MMC_WBSD=y CONFIG_MMC_SDHCI=m +CONFIG_MMC_TIFM_SD=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m @@ -103,6 +109,8 @@ CONFIG_IPATH_CORE=m CONFIG_INFINIBAND_IPATH=m CONFIG_INFINIBAND_ISER=m +CONFIG_INFINIBAND_AMSO1100=m +# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set # # Executable file formats @@ -142,6 +150,7 @@ CONFIG_NFTL_RW=y CONFIG_INFTL=m CONFIG_RFD_FTL=m +CONFIG_SSFDC=m # # RAM/ROM/Flash chip drivers @@ -345,6 +354,7 @@ CONFIG_BLK_DEV_HPT34X=y CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_IT821X=y +CONFIG_BLK_DEV_JMICRON=y # CONFIG_BLK_DEV_SC1200 is not set CONFIG_BLK_DEV_PIIX=y # CONFIG_BLK_DEV_NS87415 is not set @@ -390,6 +400,8 @@ CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m +CONFIG_SCSI_SAS_LIBSAS=m +# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set CONFIG_RAID_ATTRS=m CONFIG_ISCSI_TCP=m @@ -403,6 +415,8 @@ CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m +CONFIG_SCSI_AIC94XX=m +# CONFIG_AIC94XX_DEBUG is not set CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 # CONFIG_AIC7XXX_PROBE_EISA_VL is not set @@ -425,25 +439,64 @@ CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_SATA=y -CONFIG_SCSI_SATA_SVW=m -CONFIG_SCSI_ATA_PIIX=m -CONFIG_SCSI_SATA_PROMISE=m -CONFIG_SCSI_SATA_VIA=m +CONFIG_ATA=m +CONFIG_SATA_SVW=m +CONFIG_ATA_PIIX=m +CONFIG_SATA_PROMISE=m +CONFIG_SATA_VIA=m CONFIG_BLK_DEV_SX8=m -CONFIG_SCSI_SATA_VITESSE=m -CONFIG_SCSI_SATA_SIL=m -CONFIG_SCSI_SATA_SIS=m -CONFIG_SCSI_SATA_SX4=m -CONFIG_SCSI_SATA_NV=m -CONFIG_SCSI_SATA_AHCI=m -CONFIG_SCSI_SATA_ULI=m -CONFIG_SCSI_SATA_QSTOR=m -CONFIG_SCSI_SATA_MV=m -CONFIG_SCSI_SATA_SIL24=m -CONFIG_SCSI_PDC_ADMA=m +CONFIG_SATA_VITESSE=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SX4=m +CONFIG_SATA_NV=m +CONFIG_SATA_AHCI=m +CONFIG_SATA_ULI=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_MV=m +CONFIG_SATA_SIL24=m +CONFIG_PDC_ADMA=m CONFIG_SCSI_HPTIOP=m +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CS5535 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_ISAPNP is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_LEGACY is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PCMCIA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_QDI is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_INITIO=m # CONFIG_SCSI_OMIT_FLASHPOINT is not set @@ -458,6 +511,7 @@ CONFIG_SCSI_IMM=m # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_STEX=m CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 @@ -501,6 +555,7 @@ CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m CONFIG_DM_SNAPSHOT=m +CONFIG_DM_DEBUG=y CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m CONFIG_DM_CRYPT=m @@ -638,7 +693,12 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=y +CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_ROUTE_FWMARK=y CONFIG_DECNET=m CONFIG_DECNET_ROUTER=y CONFIG_DECNET_ROUTE_FWMARK=y @@ -652,6 +712,7 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m CONFIG_NETFILTER_XT_TARGET_NOTRACK=m @@ -661,6 +722,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m @@ -784,10 +846,14 @@ CONFIG_BRIDGE_EBT_ULOG=m CONFIG_XFRM=y CONFIG_XFRM_USER=y +CONFIG_XFRM_SUB_POLICY=y CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_INET6_XFRM_MODE_BEET=m # # SCTP Configuration (EXPERIMENTAL) @@ -816,8 +882,10 @@ CONFIG_WAN_ROUTER=m CONFIG_IP_DCCP=m CONFIG_IP_DCCP_CCID2=m +# CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=m # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m # # TIPC Configuration (EXPERIMENTAL) @@ -978,17 +1046,20 @@ CONFIG_ES3210=m CONFIG_NET_PCI=y CONFIG_PCNET32=m +CONFIG_PCNET32_NAPI=y CONFIG_AMD8111_ETH=m CONFIG_AMD8111E_NAPI=y CONFIG_ADAPTEC_STARFIRE=m CONFIG_ADAPTEC_STARFIRE_NAPI=y CONFIG_B44=m CONFIG_BNX2=m +CONFIG_QLA3XXX=m # CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set CONFIG_E100=m CONFIG_FEALNX=m CONFIG_FORCEDETH=m +CONFIG_FORCEDETH_NAPI=y CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m CONFIG_8139CP=m @@ -1349,6 +1420,7 @@ # Input device support # CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m # # Userland interfaces @@ -1387,6 +1459,7 @@ # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_LKKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y @@ -1422,6 +1495,9 @@ CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_UINPUT=m @@ -1443,6 +1519,8 @@ # CONFIG_STALDRV is not set # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set +CONFIG_TIFM_CORE=m +CONFIG_TIFM_7XX1=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m CONFIG_TCG_NSC=m @@ -1561,6 +1639,7 @@ CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_HDAPS=m CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -1582,6 +1661,7 @@ CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83781D=m @@ -1637,6 +1717,7 @@ # CONFIG_SC520_WDT is not set CONFIG_ALIM7101_WDT=m CONFIG_ALIM1535_WDT=m +CONFIG_ITCO_WDT=m # CONFIG_SC1200_WDT is not set # CONFIG_WAFER_WDT is not set # CONFIG_CPU5_WDT is not set @@ -1722,6 +1803,7 @@ # CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y # CONFIG_VIDEO_VIVI is not set @@ -1749,6 +1831,7 @@ CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_HEXIUM_ORION=m @@ -1789,12 +1872,14 @@ CONFIG_RADIO_MIROPCM20=m CONFIG_RADIO_MIROPCM20_RDS=m +# CONFIG_DVB_FE_CUSTOMISE is not set # # Digital Video Broadcasting Devices # CONFIG_DVB=y CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y # # Supported Frontend Modules @@ -1852,6 +1937,7 @@ CONFIG_DVB_USB_DIBUSB_MB=m # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_DTT200U=m CONFIG_DVB_USB_GP8PSK=m @@ -1875,6 +1961,7 @@ CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_24XXX=y +CONFIG_VIDEO_PVRUSB2_29XXX=y CONFIG_VIDEO_PVRUSB2_SYSFS=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set @@ -1927,6 +2014,7 @@ # CONFIG_FB_ARC is not set CONFIG_FB_INTEL=m # CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y CONFIG_FB_ATY_GENERIC_LCD=y CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y @@ -1990,8 +2078,10 @@ CONFIG_SND_DUMMY=m CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m # CONFIG_SND_SERIAL_U16550 is not set CONFIG_SND_MPU401=m +CONFIG_SND_AC97_POWER_SAVE=y # # ISA devices @@ -2116,6 +2206,7 @@ CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_ONETOUCH=y CONFIG_USB_STORAGE_ALAUDA=y +CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_LIBUSUAL=y # @@ -2127,6 +2218,7 @@ CONFIG_HID_PID=y CONFIG_LOGITECH_FF=y CONFIG_THRUSTMASTER_FF=y +CONFIG_ZEROPLUS_FF=y CONFIG_USB_HIDDEV=y CONFIG_USB_IDMOUSE=m @@ -2178,6 +2270,7 @@ CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_NET_ZAURUS=m @@ -2204,6 +2297,7 @@ # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_AIRPRIME=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m @@ -2238,6 +2332,8 @@ CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_OPTION=y CONFIG_USB_SERIAL_OMNINET=m @@ -2261,6 +2357,7 @@ # USB Miscellaneous drivers # CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LCD=m @@ -2282,8 +2379,12 @@ CONFIG_USB_ATI_REMOTE2=m CONFIG_USB_ALI_M5632=y # CONFIG_USB_CYTHERM is not set +CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_PHIDGET=m CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_U132_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_PHIDGETKIT=m CONFIG_USB_MON=y @@ -2298,6 +2399,7 @@ CONFIG_USB_KEYSPAN_REMOTE=m CONFIG_USB_LD=m CONFIG_USB_APPLETOUCH=m +CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_TOUCHSCREEN=m @@ -2318,6 +2420,7 @@ CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set +# CONFIG_EXT4DEV_FS is not set CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set @@ -2369,6 +2472,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y @@ -2379,6 +2483,7 @@ # # CONFIG_ADFS_FS is not seta CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m # uses sleepon and needs a major update CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m @@ -2541,7 +2646,9 @@ # CONFIG_FRAME_POINTER is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_DEBUG_DRIVER is not set +CONFIG_HEADERS_CHECK=y # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_LKDTM is not set # Turn off these debug options for production kernels. # CONFIG_DEBUG_SLAB is not set @@ -2582,6 +2689,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set # CONFIG_SECURITY_SECLVL is not set +CONFIG_UTS_NS=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y @@ -2597,10 +2705,12 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DEFLATE=m @@ -2653,6 +2763,7 @@ CONFIG_RELAY=y # CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y CONFIG_DETECT_SOFTLOCKUP=y @@ -2669,6 +2780,7 @@ CONFIG_IBMASR=m CONFIG_PM_LEGACY=y +# CONFIG_PM_SYSFS_DEPRECATED is not set # CONFIG_PM_DEBUG is not set # CONFIG_PM_TRACE is not set @@ -2685,6 +2797,7 @@ CONFIG_SCSI_AHA152X=m CONFIG_SCSI_AHA1542=m # CONFIG_SCSI_IN2000 is not set +CONFIG_SCSI_ARCMSR=m # CONFIG_SCSI_DTC3280 is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set Index: config-i586 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-i586 5 Dec 2006 18:10:13 -0000 1.21 +++ config-i586 31 Jan 2007 15:26:16 -0000 1.22 @@ -42,3 +42,5 @@ # CONFIG_X86_UP_APIC is not set +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_TWOFISH_586=m Index: config-i686 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i686,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-i686 16 Nov 2005 05:13:42 -0000 1.2 +++ config-i686 31 Jan 2007 15:26:16 -0000 1.3 @@ -3,3 +3,6 @@ # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set +CONFIG_CRYPTO_DEV_PADLOCK=m +CONFIG_CRYPTO_DEV_PADLOCK_AES=y +CONFIG_CRYPTO_DEV_PADLOCK_SHA=y Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-ia64-generic,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- config-ia64-generic 2 Oct 2006 02:55:55 -0000 1.25 +++ config-ia64-generic 31 Jan 2007 15:26:16 -0000 1.26 @@ -21,6 +21,8 @@ # CONFIG_IA64_DIG is not set # CONFIG_IA64_HP_ZX1 is not set # CONFIG_IA64_SGI_SN2 is not set +CONFIG_IA64_ESI=y +CONFIG_MSPEC=y # CONFIG_IA64_HP_SIM is not set # CONFIG_IA64_PAGE_SIZE_4KB is not set # CONFIG_IA64_PAGE_SIZE_8KB is not set Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc-generic,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-powerpc-generic 2 Oct 2006 02:55:55 -0000 1.18 +++ config-powerpc-generic 31 Jan 2007 15:26:16 -0000 1.19 @@ -98,3 +98,13 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m +# FIXME: Should depend on IA64/x86 +# CONFIG_SGI_IOC4 is not set + +CONFIG_SERIAL_MPC52xx=y +CONFIG_SERIAL_MPC52xx_CONSOLE=y +CONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200 +CONFIG_USB_OHCI_HCD_PPC_SOC=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_SERIAL_TEXT_DEBUG=y + Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc32-generic,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- config-powerpc32-generic 22 Sep 2006 22:43:07 -0000 1.13 +++ config-powerpc32-generic 31 Jan 2007 15:26:16 -0000 1.14 @@ -66,3 +66,8 @@ # CONFIG_HVC_RTAS is not set # CONFIG_MAMBO is not set +# CONFIG_UDBG_RTAS_CONSOLE is not set +CONFIG_BRIQ_PANEL=m + +CONFIG_PATA_MPC52xx=m + Index: config-powerpc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc64-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-powerpc64-generic 22 Sep 2006 22:43:07 -0000 1.5 +++ config-powerpc64-generic 31 Jan 2007 15:26:16 -0000 1.6 @@ -7,6 +7,8 @@ # CONFIG_FB_CT65550 is not set # CONFIG_POWER4_ONLY is not set +# CONFIG_PPC_PASEMI is not set + CONFIG_RTAS_PROC=y CONFIG_IOMMU_VMERGE=y CONFIG_NUMA=y @@ -25,3 +27,8 @@ # CONFIG_INPUT_PCSPKR is not set CONFIG_EHEA=m +CONFIG_INFINIBAND_EHCA=m +CONFIG_INFINIBAND_EHCA_SCALING=y + +CONFIG_HCALL_STATS=y + Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-powerpc64-iseries,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config-powerpc64-iseries 22 Sep 2006 22:43:07 -0000 1.12 +++ config-powerpc64-iseries 31 Jan 2007 15:26:16 -0000 1.13 @@ -84,3 +84,9 @@ # CONFIG_INFINIBAND is not set # CONFIG_INTEL_IOATDMA is not set +# CONFIG_PPC_PMAC is not set +# CONFIG_PPC_MAPLE is not set +# CONFIG_PPC_IBM_CELL_BLADE is not set +# CONFIG_ADB_PMU_LED is not set +# CONFIG_PMAC_SMU is not set + Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-s390-generic,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config-s390-generic 22 Sep 2006 22:43:07 -0000 1.14 +++ config-s390-generic 31 Jan 2007 15:26:16 -0000 1.15 @@ -182,3 +182,8 @@ # CONFIG_DETECT_SOFTLOCKUP is not set CONFIG_S390_HYPFS_FS=y + +CONFIG_MONWRITER=m +CONFIG_ZCRYPT=m +CONFIG_ZCRYPT_MONOLITHIC=y + Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- config-x86-generic 2 Nov 2006 06:13:45 -0000 1.46 +++ config-x86-generic 31 Jan 2007 15:26:16 -0000 1.47 @@ -194,9 +194,9 @@ # CONFIG_NVRAM=y CONFIG_IBM_ASM=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=y +# CONFIG_CRYPTO_AES_586 is not set +# CONFIG_CRYPTO_TWOFISH_586 is not set +# CONFIG_CRYPTO_DEV_PADLOCK is not set CONFIG_GENERIC_ISA_DMA=y CONFIG_SCHED_SMT=y @@ -298,3 +298,10 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y # CONFIG_COMPAT_VDSO is not set + +# CONFIG_SGI_IOC4 is not set +CONFIG_MSI_LAPTOP=m + +# CONFIG_SMSC37B787_WDT is not set +CONFIG_W83697HF_WDT=m + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86_64-generic,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- config-x86_64-generic 13 Dec 2006 18:50:01 -0000 1.39 +++ config-x86_64-generic 31 Jan 2007 15:26:16 -0000 1.40 @@ -114,9 +114,8 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV_AMD74XX=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=y CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_AMD=y @@ -182,3 +181,13 @@ # CONFIG_BLK_DEV_CS5520 is not set # CONFIG_BLK_DEV_CS5530 is not set # CONFIG_BLK_DEV_CS5535 is not set + +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR_ALL is not set + +CONFIG_SGI_IOC4=m +CONFIG_MSI_LAPTOP=m + +# CONFIG_SMSC37B787_WDT is not set +CONFIG_W83697HF_WDT=m + Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-xen-generic,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-xen-generic 30 Jan 2007 19:14:18 -0000 1.21 +++ config-xen-generic 31 Jan 2007 15:26:16 -0000 1.22 @@ -64,3 +64,5 @@ # CONFIG_HZ_1000 is not set CONFIG_HZ_250=y +# irqs are handled in the HV anyways. It don't compile. +# CONFIG_HT_IRQ is not set From fedora-cvs-commits at redhat.com Wed Jan 31 15:26:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:26:18 -0500 Subject: rpms/kernel/FC-5 find-provides, NONE, 1.1 kabitool, NONE, 1.1 linux-2.6-PT_LOAD-align.patch, NONE, 1.1 linux-2.6-cafe-nand.patch, NONE, 1.1 linux-2.6-defaults-nonmi.patch, NONE, 1.1 linux-2.6-g5-therm-shutdown.patch, 1.2, 1.3 linux-2.6-gfs2-locking-exports.patch, 1.2, 1.3 linux-2.6-gfs2-tux.patch, 1.2, 1.3 linux-2.6-gfs2-update.patch, NONE, 1.1 linux-2.6-ia64-kexec-kdump-xen-conflict.patch, NONE, 1.1 linux-2.6-mac-raid-autorun.patch, NONE, 1.1 linux-2.6-marvell-88alp01.patch, NONE, 1.1 linux-2.6-marvell-update.patch, NONE, 1.1 linux-2.6-modsign-verify.patch, NONE, 1.1 linux-2.6-mtd-update.patch, NONE, 1.1 linux-2.6-olpc-battery.patch, NONE, 1.1 linux-2.6-olpc-dcon.patch, NONE, 1.1 linux-2.6-power6-no-ci-large-page.patch, NONE, 1.1 linux-2.6-sha_alignment.patch, NONE, 1.1 linux-2.6-sysprof-1.0.3.patch, NONE, 1.1 linux-2.6-xfs_attr2.patch, NONE, 1.1 linux-2.6.19.tar.bz2.sign, NONE, 1.1 merge.pl, 1.7, 1.8 patch-2.6.19.2.bz2.sign, NONE, 1.1 kernel-2.6.spec, 1.2263, 1.2264 linux-2.6-debug-sysfs-crash-debugging-xen.patch! , 1.1, 1.2 linux-2.6-debug-taint-vm.patch, 1.8, 1.9 linux-2.6-debug-verbosify-bug.patch, 1.1, 1.2 linux-2.6-defaults-disable-split-ptlock.patch, 1.5, 1.6 linux-2.6-devmem.patch, 1.9, 1.10 linux-2.6-drivers-add-qlogic-firmware.patch, 1.1, 1.2 linux-2.6-execshield.patch, 1.26, 1.27 linux-2.6-lockdep-fixes.patch, 1.7, 1.8 linux-2.6-modsign-core.patch, 1.3, 1.4 linux-2.6-modsign-crypto.patch, 1.2, 1.3 linux-2.6-modsign-include.patch, 1.2, 1.3 linux-2.6-modsign-ksign.patch, 1.3, 1.4 linux-2.6-modsign-mpilib.patch, 1.2, 1.3 linux-2.6-modsign-script.patch, 1.1, 1.2 linux-2.6-optimise-spinlock-debug.patch, 1.4, 1.5 linux-2.6-proc-self-maps-fix.patch, 1.4, 1.5 linux-2.6-sata-promise-pata-ports.patch, 1.3, 1.4 linux-2.6-sysrq-c.patch, 1.1, 1.2 linux-2.6-tux.patch, 1.16, 1.17 linux-2.6-usb-storage-reboot.patch, 1.1, 1.2 linux-2.6-vm-debug.patch, 1.3, 1.4 linux-2.6-xen-execshield.patch, 1.1, 1.2 linux-2.6-xen.patch, 1.30, 1.31 sources, 1.368, 1.369 upstream, 1.333, 1.334 linux-2.6-xen-x86-unwinder.patch, 1.2, NONE Message-ID: <200701311526.l0VFQI7b031014@cvs.devel.redhat.com> Author: cebbert Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30841 Modified Files: kernel-2.6.spec linux-2.6-debug-sysfs-crash-debugging-xen.patch linux-2.6-debug-taint-vm.patch linux-2.6-debug-verbosify-bug.patch linux-2.6-defaults-disable-split-ptlock.patch linux-2.6-devmem.patch linux-2.6-drivers-add-qlogic-firmware.patch linux-2.6-execshield.patch linux-2.6-lockdep-fixes.patch linux-2.6-modsign-core.patch linux-2.6-modsign-crypto.patch linux-2.6-modsign-include.patch linux-2.6-modsign-ksign.patch linux-2.6-modsign-mpilib.patch linux-2.6-modsign-script.patch linux-2.6-optimise-spinlock-debug.patch linux-2.6-proc-self-maps-fix.patch linux-2.6-sata-promise-pata-ports.patch linux-2.6-sysrq-c.patch linux-2.6-tux.patch linux-2.6-usb-storage-reboot.patch linux-2.6-vm-debug.patch linux-2.6-xen-execshield.patch linux-2.6-xen.patch sources upstream Added Files: find-provides kabitool linux-2.6-PT_LOAD-align.patch linux-2.6-cafe-nand.patch linux-2.6-defaults-nonmi.patch linux-2.6-g5-therm-shutdown.patch linux-2.6-gfs2-locking-exports.patch linux-2.6-gfs2-tux.patch linux-2.6-gfs2-update.patch linux-2.6-ia64-kexec-kdump-xen-conflict.patch linux-2.6-mac-raid-autorun.patch linux-2.6-marvell-88alp01.patch linux-2.6-marvell-update.patch linux-2.6-modsign-verify.patch linux-2.6-mtd-update.patch linux-2.6-olpc-battery.patch linux-2.6-olpc-dcon.patch linux-2.6-power6-no-ci-large-page.patch linux-2.6-sha_alignment.patch linux-2.6-sysprof-1.0.3.patch linux-2.6-xfs_attr2.patch linux-2.6.19.tar.bz2.sign merge.pl patch-2.6.19.2.bz2.sign Removed Files: linux-2.6-xen-x86-unwinder.patch Log Message: * Wed Jan 31 2007 Chuck Ebbert - Update to 2.6.19.2 --- NEW FILE find-provides --- #!/usr/bin/python # # find-provides: munge the provides dependencies from the kabideps file # # This software may be freely redistributed under the terms of the GNU # General Public License (GPL). # # Takes a directory prefix, then outputs the kabideps file contents. __author__ = "Jon Masters " __version__ = "1.0" __date__ = "Tue 25 Jul 2006 04:00 GMT" __copyright__ = "Copyright (C) 2006 Red Hat, Inc" __license__ = "GPL" import os import re import string import sys false = 0 true = 1 kabideps="" p = re.compile('^(.*)/symvers-(.*).gz$') while true: foo = sys.stdin.readline() if foo == "": break string.split(foo) m = p.match(foo) if m: kabideps=sys.argv[1] + "/kernel-" + m.group(2) + "-kabideps" if kabideps == "": sys.exit(0) if not (os.path.isfile(kabideps)): sys.stderr.write(sys.argv[0] + ": cannot locate kabideps file: " + kabideps + "\n") sys.exit(1) sys.stderr.write(sys.argv[0] + ": processing kABI: " + kabideps) os.system("cat " + kabideps) ***** Error reading new file: [Errno 2] No such file or directory: 'kabitool' linux-2.6-PT_LOAD-align.patch: vmlinux.lds.S | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-PT_LOAD-align.patch --- --- linux-2.6.18.i686/arch/i386/kernel/vmlinux.lds.S.orig 2006-09-22 05:21:57.000000000 -0400 +++ linux-2.6.18.i686/arch/i386/kernel/vmlinux.lds.S 2006-09-22 05:22:36.000000000 -0400 @@ -50,6 +50,7 @@ } __tracedata_end = .; + . = ALIGN(4096); /* writeable */ .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ *(.data) linux-2.6-cafe-nand.patch: Kconfig | 7 Makefile | 4 cafe.c | 771 ++++++++++++++++++++++++++++++++++ cafe_ecc.c | 1381 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 2162 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-cafe-nand.patch --- commit cad40654c312fc51bdb520e9be91e29a9742bbcb Author: David Woodhouse Date: Wed Nov 1 08:19:20 2006 +0800 [MTD] NAND: Fix ECC settings in CAF?? controller driver. We were resetting cafe->ctl2 to zero after an erase (and also during a write, but it was correctly reset after that). This meant that ECC reads after an erase were failing. Doh. Signed-off-by: David Woodhouse commit be8444bdf34f7ba21e2364ca296c68e81033e3b2 Author: David Woodhouse Date: Tue Oct 31 12:36:04 2006 +0800 [MTD] NAND: Add register debugging spew option to CAF?? driver Signed-off-by: David Woodhouse commit 195a253b6632e2b7e6319f2f67120e708646554e Author: David Woodhouse Date: Tue Oct 31 12:30:11 2006 +0800 [MTD] NAND: Use register #defines throughout CAF?? driver, not numbers Also use cafe_readl() and cafe_writel() abstraction to make code slightly cleaner -- especially if we want to use it in PIO mode. Signed-off-by: David Woodhouse commit a020727b1628cb4d7b70733222253c7fa3ec6113 Author: David Woodhouse Date: Sat Oct 28 17:08:38 2006 +0300 [MTD] NAND: Fix timing calculation in CAF?? debugging message Signed-off-by: David Woodhouse commit 63a1423763c6c38eeeaf6dc8cee986514ab67aed Author: David Woodhouse Date: Fri Oct 27 22:12:02 2006 +0300 [MTD] NAND: Remove empty block ECC workaround They fixed the hardware so that ECC doesn't fail on reading an empty block. Signed-off-by: David Woodhouse commit 7608194c4ae454fab23b8d940986eeb9c58c3478 Author: David Woodhouse Date: Fri Oct 27 15:40:51 2006 +0300 [MTD] NAND: Add ECC debugging for CAF?? Signed-off-by: David Woodhouse commit b478c775a0c306c84215a1138e49fab540b94a5d Author: David Woodhouse Date: Fri Oct 27 14:50:04 2006 +0300 [MTD] CAF?? NAND: Add 'slowtiming' parameter, default usedma and checkecc on Signed-off-by: David Woodhouse commit dcc41bc81c872862652d68af8993b9fa32ce56a4 Author: David Woodhouse Date: Fri Oct 27 09:55:34 2006 +0300 [MTD] NAND: Reset Caf?? controller before initialising. Fixes http://dev.laptop.org/ticket/237 Signed-off-by: David Woodhouse commit 2c8cfdcbeb1ab0ec7bbd5af1be311b55281154c4 Author: David Woodhouse Date: Fri Oct 27 09:53:08 2006 +0300 [MTD] NAND: Caf?? ECC -- remove spurious BUG_ON() in err_pos() Being a value which isn't in the table is a case we explicitly check for in the caller. Don't BUG_ON() because it does actually happen in practice. Signed-off-by: David Woodhouse commit 470b0a90d6a21cb72b671215f12ec7ec8a0db2c0 Author: David Woodhouse Date: Mon Oct 23 14:29:04 2006 +0100 [MTD] NAND: Disable ECC checking on CAF?? since it's broken for now Signed-off-by: David Woodhouse commit fbad5696c5c45982d02e05b85922bad6eb6e6349 Author: David Woodhouse Date: Sun Oct 22 15:09:33 2006 +0100 [MTD] NAND: CAF?? NAND driver cleanup, fix ECC on reading empty flash Signed-off-by: David Woodhouse commit 04459d7c6239193fa8de4a5107ee8fdb0f366e35 Author: David Woodhouse Date: Sun Oct 22 02:18:48 2006 +0100 [MTD] NAND: Add hardware ECC correction support to CAF?? NAND driver Signed-off-by: David Woodhouse commit c45aa055c32b488fc3fd73c760df372b09acf69a Merge: 784f4d5... 8dd851d... Author: David Woodhouse Date: Sun Oct 22 02:17:05 2006 +0100 Merge git://git.infradead.org/~dwmw2/cafe-2.6 Conflicts: drivers/mtd/nand/Kconfig commit 8dd851de8184bb39c4ea86de20a0ed2496e6eb0d Author: David Woodhouse Date: Fri Oct 20 02:11:40 2006 +0100 [MTD NAND] OLPC CAF?? driver update - Fix OOB handling, bad block table marker placement - Some cleanups, enable runtime-optional debugging - Allow BBT stuff to be skipped Signed-off-by: David Woodhouse commit 5467fb025537eb92313fd3a557b2051cb41ba5e8 Author: David Woodhouse Date: Fri Oct 6 15:36:29 2006 +0100 [MTD NAND] Initial import of CAF?? NAND driver. Signed-off-by: David Woodhouse diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index b4b1656..564f79d 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -219,6 +219,13 @@ config MTD_NAND_SHARPSL tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" depends on MTD_NAND && ARCH_PXA +config MTD_NAND_CAFE + tristate "NAND support for OLPC CAF?? chip" + depends on PCI + help + Use NAND flash attached to the CAF?? chip designed for the $100 + laptop. + config MTD_NAND_CS553X tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)" depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH) diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 27c9f0a..f7a53f0 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -6,6 +6,7 @@ # $Id: Makefile.common,v 1.15 2004/11/26 obj-$(CONFIG_MTD_NAND) += nand.o nand_ecc.o obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o +obj-$(CONFIG_MTD_NAND_CAFE) += cafe_nand.o obj-$(CONFIG_MTD_NAND_SPIA) += spia.o obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o obj-$(CONFIG_MTD_NAND_TOTO) += toto.o @@ -22,5 +23,6 @@ obj-$(CONFIG_MTD_NAND_TS7250) += ts7250 obj-$(CONFIG_MTD_NAND_NANDSIM) += nandsim.o obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o obj-$(CONFIG_MTD_NAND_NDFC) += ndfc.o -nand-objs = nand_base.o nand_bbt.o +nand-objs := nand_base.o nand_bbt.o +cafe_nand-objs := cafe.o cafe_ecc.o diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c new file mode 100644 index 0000000..fad304b --- /dev/null +++ b/drivers/mtd/nand/cafe.c @@ -0,0 +1,771 @@ +/* + * Driver for One Laptop Per Child ???CAF????? controller, aka Marvell 88ALP01 + * + * Copyright ?? 2006 Red Hat, Inc. + * Copyright ?? 2006 David Woodhouse + */ + +#define DEBUG + +#include +#undef DEBUG +#include +#include [...1945 lines suppressed...] + } else if (found_num_root == 1) { + bit3_root1 = test_root; + found_num_root = 2; + } else if (found_num_root == 2) { + bit3_root2 = test_root; + found_num_root = 3; + break; + } + } + } + if (found_num_root != 3) + return -EINVAL; + else { + bit3_root0_inv = gf4096_inv(bit3_root0); + bit3_root1_inv = gf4096_inv(bit3_root1); + bit3_root2_inv = gf4096_inv(bit3_root2); + + find_3bit_err_pats(chk_syndrome_list[0], chk_syndrome_list[1], + chk_syndrome_list[2], bit3_root0_inv, + bit3_root1_inv, bit3_root2_inv, err_pats); + + //check if only 3-bit error + tmp0 = gf4096_mul(bit3_root0_inv, bit3_root0_inv); + tmp0 = gf4096_mul(tmp0, tmp0); + tmp0 = gf4096_mul(tmp0, bit3_root0_inv); + tmp0 = gf4096_mul(tmp0, bit3_root0_inv); //rinv0^6 + tmp1 = gf4096_mul(tmp0, bit3_root0_inv); //rinv0^7 + tmp2 = gf4096_mul(bit3_root1_inv, bit3_root1_inv); + tmp2 = gf4096_mul(tmp2, tmp2); + tmp2 = gf4096_mul(tmp2, bit3_root1_inv); + tmp2 = gf4096_mul(tmp2, bit3_root1_inv); //rinv1^6 + tmp3 = gf4096_mul(tmp2, bit3_root1_inv); //rinv1^7 + tmp4 = gf4096_mul(bit3_root2_inv, bit3_root2_inv); + tmp4 = gf4096_mul(tmp4, tmp4); + tmp4 = gf4096_mul(tmp4, bit3_root2_inv); + tmp4 = gf4096_mul(tmp4, bit3_root2_inv); //rinv2^6 + tmp5 = gf4096_mul(tmp4, bit3_root2_inv); //rinv2^7 + + //check if only 3 errors + if ((chk_syndrome_list[6] == (gf4096_mul(err_pats[0], tmp0) ^ + gf4096_mul(err_pats[1], tmp2) ^ + gf4096_mul(err_pats[2], tmp4))) & + (chk_syndrome_list[7] == (gf4096_mul(err_pats[0], tmp1) ^ + gf4096_mul(err_pats[1], tmp3) ^ gf4096_mul(err_pats[2], tmp5)))) { + if ((err_pos(bit3_root0_inv) == 0xfff) | + (err_pos(bit3_root1_inv) == 0xfff) | (err_pos(bit3_root2_inv) == 0xfff)) { + return -EINVAL; + } else { + err_info[0] = 0x3; + err_info[1] = (0x55e - err_pos(bit3_root0_inv)); + err_info[2] = (0x55e - err_pos(bit3_root1_inv)); + err_info[3] = (0x55e - err_pos(bit3_root2_inv)); + err_info[5] = err_pats[0]; + err_info[6] = err_pats[1]; + err_info[7] = err_pats[2]; + return 0; + } + } else + return -EINVAL; + } +} +static int chk_4_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info) +{ + unsigned short coefs[4]; + unsigned short err_pats[4]; + int found_num_root = 0; + unsigned short bit4_root0, bit4_root1, bit4_root2, bit4_root3; + unsigned short bit4_root0_inv, bit4_root1_inv, bit4_root2_inv, bit4_root3_inv; + unsigned short err_loc_eqn, test_root; + + find_4bit_err_coefs(chk_syndrome_list[0], + chk_syndrome_list[1], + chk_syndrome_list[2], + chk_syndrome_list[3], + chk_syndrome_list[4], + chk_syndrome_list[5], chk_syndrome_list[6], chk_syndrome_list[7], coefs); + + for (test_root = 0x1; test_root < 0xfff; test_root++) { + err_loc_eqn = + gf4096_mul(coefs[3], + gf4096_mul(gf4096_mul + (gf4096_mul(test_root, test_root), + test_root), + test_root)) ^ gf4096_mul(coefs[2], + gf4096_mul + (gf4096_mul(test_root, test_root), test_root)) + ^ gf4096_mul(coefs[1], gf4096_mul(test_root, test_root)) ^ gf4096_mul(coefs[0], test_root) + ^ 0x1; + if (err_loc_eqn == 0x0) { + if (found_num_root == 0) { + bit4_root0 = test_root; + found_num_root = 1; + } else if (found_num_root == 1) { + bit4_root1 = test_root; + found_num_root = 2; + } else if (found_num_root == 2) { + bit4_root2 = test_root; + found_num_root = 3; + } else { + found_num_root = 4; + bit4_root3 = test_root; + break; + } + } + } + if (found_num_root != 4) { + return -EINVAL; + } else { + bit4_root0_inv = gf4096_inv(bit4_root0); + bit4_root1_inv = gf4096_inv(bit4_root1); + bit4_root2_inv = gf4096_inv(bit4_root2); + bit4_root3_inv = gf4096_inv(bit4_root3); + find_4bit_err_pats(chk_syndrome_list[0], + chk_syndrome_list[1], + chk_syndrome_list[2], + chk_syndrome_list[3], + bit4_root0_inv, bit4_root1_inv, bit4_root2_inv, bit4_root3_inv, err_pats); + err_info[0] = 0x4; + err_info[1] = (0x55e - err_pos(bit4_root0_inv)); + err_info[2] = (0x55e - err_pos(bit4_root1_inv)); + err_info[3] = (0x55e - err_pos(bit4_root2_inv)); + err_info[4] = (0x55e - err_pos(bit4_root3_inv)); + err_info[5] = err_pats[0]; + err_info[6] = err_pats[1]; + err_info[7] = err_pats[2]; + err_info[8] = err_pats[3]; + return 0; + } +} + +void correct_12bit_symbol(unsigned char *buf, unsigned short sym, + unsigned short val) +{ + if (unlikely(sym > 1366)) { + printk(KERN_ERR "Error: symbol %d out of range; cannot correct\n", sym); + } else if (sym == 0) { + buf[0] ^= val; + } else if (sym & 1) { + buf[1+(3*(sym-1))/2] ^= (val >> 4); + buf[2+(3*(sym-1))/2] ^= ((val & 0xf) << 4); + } else { + buf[2+(3*(sym-2))/2] ^= (val >> 8); + buf[3+(3*(sym-2))/2] ^= (val & 0xff); + } +} + +static int debugecc = 0; +module_param(debugecc, int, 0644); + +int cafe_correct_ecc(unsigned char *buf, + unsigned short *chk_syndrome_list) +{ + unsigned short err_info[9]; + int i; + + if (debugecc) { + printk(KERN_WARNING "cafe_correct_ecc invoked. Syndromes %x %x %x %x %x %x %x %x\n", + chk_syndrome_list[0], chk_syndrome_list[1], + chk_syndrome_list[2], chk_syndrome_list[3], + chk_syndrome_list[4], chk_syndrome_list[5], + chk_syndrome_list[6], chk_syndrome_list[7]); + for (i=0; i < 2048; i+=16) { + printk(KERN_WARNING "D %04x: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + i, + buf[i], buf[i+1], buf[i+2], buf[i+3], + buf[i+4], buf[i+5], buf[i+6], buf[i+7], + buf[i+8], buf[i+9], buf[i+10], buf[i+11], + buf[i+12], buf[i+13], buf[i+14], buf[i+15]); + } + for ( ; i < 2112; i+=16) { + printk(KERN_WARNING "O %02x: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + i - 2048, + buf[i], buf[i+1], buf[i+2], buf[i+3], + buf[i+4], buf[i+5], buf[i+6], buf[i+7], + buf[i+8], buf[i+9], buf[i+10], buf[i+11], + buf[i+12], buf[i+13], buf[i+14], buf[i+15]); + } + } + + + + if (chk_no_err_only(chk_syndrome_list, err_info) && + chk_1_err_only(chk_syndrome_list, err_info) && + chk_2_err_only(chk_syndrome_list, err_info) && + chk_3_err_only(chk_syndrome_list, err_info) && + chk_4_err_only(chk_syndrome_list, err_info)) { + return -EIO; + } + + for (i=0; i < err_info[0]; i++) { + if (debugecc) + printk(KERN_WARNING "Correct symbol %d with 0x%03x\n", + err_info[1+i], err_info[5+i]); + + correct_12bit_symbol(buf, err_info[1+i], err_info[5+i]); + } + + return err_info[0]; +} + linux-2.6-defaults-nonmi.patch: i386/kernel/nmi.c | 2 +- x86_64/kernel/nmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-defaults-nonmi.patch --- From: Arjan van de Ven --- linux-2.6.19/arch/i386/kernel/nmi.c.org 2007-01-07 10:40:52.000000000 -0800 +++ linux-2.6.19/arch/i386/kernel/nmi.c 2007-01-07 10:42:41.000000000 -0800 @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned long, evn */ atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ -unsigned int nmi_watchdog = NMI_DEFAULT; +unsigned int nmi_watchdog = NMI_NONE; static unsigned int nmi_hz = HZ; struct nmi_watchdog_ctlblk { --- linux-2.6.19/arch/x86_64/kernel/nmi.c.org 2007-01-07 10:42:55.000000000 -0800 +++ linux-2.6.19/arch/x86_64/kernel/nmi.c 2007-01-07 10:42:58.000000000 -0800 @@ -55,7 +55,7 @@ static DEFINE_PER_CPU(unsigned, evntsel_ atomic_t nmi_active = ATOMIC_INIT(0); /* oprofile uses this */ int panic_on_timeout; -unsigned int nmi_watchdog = NMI_DEFAULT; +unsigned int nmi_watchdog = NMI_NONE; static unsigned int nmi_hz = HZ; struct nmi_watchdog_ctlblk { linux-2.6-g5-therm-shutdown.patch: therm_pm72.c | 30 ++++++++++++++++++++++++------ therm_pm72.h | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) Index: linux-2.6-g5-therm-shutdown.patch =================================================================== RCS file: linux-2.6-g5-therm-shutdown.patch diff -N linux-2.6-g5-therm-shutdown.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-g5-therm-shutdown.patch 31 Jan 2007 15:26:15 -0000 1.3 @@ -0,0 +1,70 @@ +--- linux-2.6.15/drivers/macintosh/therm_pm72.c.orig 2006-04-02 21:34:48.000000000 +0100 ++++ linux-2.6.15/drivers/macintosh/therm_pm72.c 2006-04-02 22:33:27.000000000 +0100 +@@ -924,10 +925,16 @@ static void do_monitor_cpu_combined(void + printk(KERN_WARNING "Warning ! Temperature way above maximum (%d) !\n", + temp_combi >> 16); + state0->overtemp += CPU_MAX_OVERTEMP / 4; +- } else if (temp_combi > (state0->mpu.tmax << 16)) ++ } else if (temp_combi > (state0->mpu.tmax << 16)) { + state0->overtemp++; +- else ++ printk(KERN_WARNING "Temperature %d above max %d. overtemp %d\n", ++ temp_combi >> 16, state0->mpu.tmax, state0->overtemp); ++ } else { ++ if (state0->overtemp) ++ printk(KERN_WARNING "Temperature back down to %d\n", ++ temp_combi >> 16); + state0->overtemp = 0; ++ } + if (state0->overtemp >= CPU_MAX_OVERTEMP) + critical_state = 1; + if (state0->overtemp > 0) { +@@ -999,10 +1015,16 @@ static void do_monitor_cpu_split(struct + " (%d) !\n", + state->index, temp >> 16); + state->overtemp += CPU_MAX_OVERTEMP / 4; +- } else if (temp > (state->mpu.tmax << 16)) ++ } else if (temp > (state->mpu.tmax << 16)) { + state->overtemp++; +- else ++ printk(KERN_WARNING "CPU %d temperature %d above max %d. overtemp %d\n", ++ state->index, temp >> 16, state->mpu.tmax, state->overtemp); ++ } else { ++ if (state->overtemp) ++ printk(KERN_WARNING "CPU %d temperature back down to %d\n", ++ state->index, temp >> 16); + state->overtemp = 0; ++ } + if (state->overtemp >= CPU_MAX_OVERTEMP) + critical_state = 1; + if (state->overtemp > 0) { +@@ -1061,10 +1097,16 @@ static void do_monitor_cpu_rack(struct c + " (%d) !\n", + state->index, temp >> 16); + state->overtemp = CPU_MAX_OVERTEMP / 4; +- } else if (temp > (state->mpu.tmax << 16)) ++ } else if (temp > (state->mpu.tmax << 16)) { + state->overtemp++; +- else ++ printk(KERN_WARNING "CPU %d temperature %d above max %d. overtemp %d\n", ++ state->index, temp >> 16, state->mpu.tmax, state->overtemp); ++ } else { ++ if (state->overtemp) ++ printk(KERN_WARNING "CPU %d temperature back down to %d\n", ++ state->index, temp >> 16); + state->overtemp = 0; ++ } + if (state->overtemp >= CPU_MAX_OVERTEMP) + critical_state = 1; + if (state->overtemp > 0) { +--- linux-2.6.15/drivers/macintosh/therm_pm72.h~ 2006-01-03 03:21:10.000000000 +0000 ++++ linux-2.6.15/drivers/macintosh/therm_pm72.h 2006-04-02 22:25:58.000000000 +0100 +@@ -243,7 +243,7 @@ struct dimm_pid_state + #define CPU_TEMP_HISTORY_SIZE 2 + #define CPU_POWER_HISTORY_SIZE 10 + #define CPU_PID_INTERVAL 1 +-#define CPU_MAX_OVERTEMP 30 ++#define CPU_MAX_OVERTEMP 90 + + #define CPUA_PUMP_RPM_INDEX 7 + #define CPUB_PUMP_RPM_INDEX 8 linux-2.6-gfs2-locking-exports.patch: locking.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) Index: linux-2.6-gfs2-locking-exports.patch =================================================================== RCS file: linux-2.6-gfs2-locking-exports.patch diff -N linux-2.6-gfs2-locking-exports.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-gfs2-locking-exports.patch 31 Jan 2007 15:26:15 -0000 1.3 @@ -0,0 +1,10 @@ +--- linux-2.6.17.noarch/fs/gfs2/locking.c~ 2006-08-10 13:33:09.000000000 -0400 ++++ linux-2.6.17.noarch/fs/gfs2/locking.c 2006-08-10 13:33:23.000000000 -0400 +@@ -188,4 +188,6 @@ void __init gfs2_init_lmh(void) + + EXPORT_SYMBOL_GPL(gfs2_register_lockproto); + EXPORT_SYMBOL_GPL(gfs2_unregister_lockproto); +- ++EXPORT_SYMBOL_GPL(gfs2_withdraw_lockproto); ++EXPORT_SYMBOL_GPL(gfs2_mount_lockproto); ++EXPORT_SYMBOL_GPL(gfs2_unmount_lockproto); linux-2.6-gfs2-tux.patch: ops_file.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-gfs2-tux.patch =================================================================== RCS file: linux-2.6-gfs2-tux.patch diff -N linux-2.6-gfs2-tux.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-gfs2-tux.patch 31 Jan 2007 15:26:15 -0000 1.3 @@ -0,0 +1,11 @@ +--- linux-2.6.17.noarch/fs/gfs2/ops_file.c~ 2006-09-07 12:13:56.000000000 -0400 ++++ linux-2.6.17.noarch/fs/gfs2/ops_file.c 2006-09-07 12:14:00.000000000 -0400 +@@ -113,7 +113,7 @@ int gfs2_internal_read(struct gfs2_inode + desc.error = 0; + do_generic_mapping_read(inode->i_mapping, ra_state, + &gfs2_internal_file_sentinel, pos, &desc, +- gfs2_read_actor); ++ gfs2_read_actor, 0); + return desc.written ? desc.written : desc.error; + } + linux-2.6-gfs2-update.patch: b/fs/gfs2/Kconfig | 2 b/fs/gfs2/acl.c | 2 b/fs/gfs2/acl.h | 1 b/fs/gfs2/bmap.c | 32 +- b/fs/gfs2/daemon.c | 7 b/fs/gfs2/dir.c | 8 b/fs/gfs2/dir.h | 8 b/fs/gfs2/eaops.c | 2 b/fs/gfs2/eattr.c | 27 +- b/fs/gfs2/eattr.h | 6 b/fs/gfs2/glock.c | 2 b/fs/gfs2/glock.h | 2 b/fs/gfs2/glops.c | 2 b/fs/gfs2/incore.h | 2 b/fs/gfs2/inode.c | 4 b/fs/gfs2/inode.h | 4 b/fs/gfs2/lm.c | 8 b/fs/gfs2/locking/dlm/plock.c | 2 b/fs/gfs2/log.c | 17 - b/fs/gfs2/log.h | 2 b/fs/gfs2/lops.c | 4 b/fs/gfs2/lops.h | 2 b/fs/gfs2/main.c | 4 b/fs/gfs2/meta_io.c | 3 b/fs/gfs2/meta_io.h | 2 b/fs/gfs2/ondisk.c | 6 b/fs/gfs2/ops_address.c | 1 b/fs/gfs2/ops_dentry.c | 2 b/fs/gfs2/ops_export.c | 8 b/fs/gfs2/ops_export.h | 2 b/fs/gfs2/ops_file.c | 2 b/fs/gfs2/ops_file.h | 3 b/fs/gfs2/ops_fstype.c | 4 b/fs/gfs2/ops_inode.c | 10 b/fs/gfs2/ops_super.c | 2 b/fs/gfs2/ops_vm.c | 2 b/fs/gfs2/quota.c | 2 b/fs/gfs2/recovery.c | 22 - b/fs/gfs2/recovery.h | 2 b/fs/gfs2/rgrp.c | 2 b/fs/gfs2/super.c | 2 b/fs/gfs2/super.h | 2 b/fs/gfs2/sys.c | 9 b/fs/gfs2/util.c | 6 b/fs/gfs2/util.h | 7 b/include/linux/gfs2_ondisk.h | 49 +++ fs/gfs2/Kconfig | 5 fs/gfs2/acl.c | 37 -- fs/gfs2/bmap.c | 148 +++++------ fs/gfs2/dir.c | 86 +++--- fs/gfs2/eattr.c | 39 +-- fs/gfs2/glock.c | 36 -- fs/gfs2/glock.h | 2 fs/gfs2/glops.c | 156 +++--------- fs/gfs2/incore.h | 41 +-- fs/gfs2/inode.c | 528 +++++++++++++++++------------------------- fs/gfs2/inode.h | 20 - fs/gfs2/log.c | 25 + fs/gfs2/lops.c | 37 +- fs/gfs2/meta_io.c | 44 +-- fs/gfs2/ondisk.c | 150 +++-------- fs/gfs2/ops_address.c | 158 +++++------- fs/gfs2/ops_dentry.c | 2 fs/gfs2/ops_export.c | 30 -- fs/gfs2/ops_file.c | 78 +++++- fs/gfs2/ops_inode.c | 186 +++++++------- fs/gfs2/ops_super.c | 21 + fs/gfs2/quota.c | 13 - fs/gfs2/recovery.c | 13 - fs/gfs2/rgrp.c | 11 fs/gfs2/super.c | 51 ++-- fs/gfs2/super.h | 4 fs/gfs2/util.h | 7 include/linux/gfs2_ondisk.h | 238 ++++++++++++------ 74 files changed, 1213 insertions(+), 1253 deletions(-) --- NEW FILE linux-2.6-gfs2-update.patch --- >From 3ca68df6ee61e1a2034f3307b9edb9b3d87e5ca1 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 13 Oct 2006 20:11:25 -0400 Subject: [PATCH] [GFS2] split gfs2_dinode into on-disk and host variants The latter is used as part of gfs2-private part of struct inode. It actually stores a lot of fields differently; for now the declaration is just cloned, inode field is swtiched and changes propagated. Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse --- fs/gfs2/inode.c | 4 ++-- fs/gfs2/ondisk.c | 6 +++-- include/linux/gfs2_ondisk.h | 48 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index d470e52..191a3df 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -48,7 +48,7 @@ #include "util.h" void gfs2_inode_attr_in(struct gfs2_inode *ip) { struct inode *inode = &ip->i_inode; - struct gfs2_dinode *di = &ip->i_di; + struct gfs2_dinode_host *di = &ip->i_di; inode->i_ino = ip->i_num.no_addr; @@ -98,7 +98,7 @@ void gfs2_inode_attr_in(struct gfs2_inod void gfs2_inode_attr_out(struct gfs2_inode *ip) { struct inode *inode = &ip->i_inode; - struct gfs2_dinode *di = &ip->i_di; + struct gfs2_dinode_host *di = &ip->i_di; gfs2_assert_withdraw(GFS2_SB(inode), (di->di_mode & S_IFMT) == (inode->i_mode & S_IFMT)); di->di_mode = inode->i_mode; diff --git a/fs/gfs2/ondisk.c b/fs/gfs2/ondisk.c index 1025960..52cb9a2 100644 --- a/fs/gfs2/ondisk.c +++ b/fs/gfs2/ondisk.c @@ -153,7 +153,7 @@ void gfs2_quota_in(struct gfs2_quota *qu qu->qu_value = be64_to_cpu(str->qu_value); } -void gfs2_dinode_in(struct gfs2_dinode *di, const void *buf) +void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf) { const struct gfs2_dinode *str = buf; @@ -187,7 +187,7 @@ void gfs2_dinode_in(struct gfs2_dinode * } -void gfs2_dinode_out(const struct gfs2_dinode *di, void *buf) +void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf) { struct gfs2_dinode *str = buf; @@ -221,7 +221,7 @@ void gfs2_dinode_out(const struct gfs2_d } -void gfs2_dinode_print(const struct gfs2_dinode *di) +void gfs2_dinode_print(const struct gfs2_dinode_host *di) { gfs2_meta_header_print(&di->di_header); gfs2_inum_print(&di->di_num); diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index a7ae7c1..f334b4b 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h @@ -270,6 +270,48 @@ struct gfs2_dinode { __u8 di_reserved[56]; }; +struct gfs2_dinode_host { + struct gfs2_meta_header di_header; + + struct gfs2_inum di_num; + + __be32 di_mode; /* mode of file */ + __be32 di_uid; /* owner's user id */ + __be32 di_gid; /* owner's group id */ + __be32 di_nlink; /* number of links to this file */ + __be64 di_size; /* number of bytes in file */ + __be64 di_blocks; /* number of blocks in file */ + __be64 di_atime; /* time last accessed */ + __be64 di_mtime; /* time last modified */ + __be64 di_ctime; /* time last changed */ + __be32 di_major; /* device major number */ + __be32 di_minor; /* device minor number */ + + /* This section varies from gfs1. Padding added to align with + * remainder of dinode + */ + __be64 di_goal_meta; /* rgrp to alloc from next */ + __be64 di_goal_data; /* data block goal */ + __be64 di_generation; /* generation number for NFS */ + + __be32 di_flags; /* GFS2_DIF_... */ + __be32 di_payload_format; /* GFS2_FORMAT_... */ + __u16 __pad1; /* Was ditype in gfs1 */ + __be16 di_height; /* height of metadata */ + __u32 __pad2; /* Unused incarnation number from gfs1 */ + + /* These only apply to directories */ + __u16 __pad3; /* Padding */ + __be16 di_depth; /* Number of bits in the table */ + __be32 di_entries; /* The number of entries in the directory */ + + struct gfs2_inum __pad4; /* Unused even in current gfs1 */ + + __be64 di_eattr; /* extended attribute block number */ + + __u8 di_reserved[56]; +}; + /* * directory structure - many of these per directory file */ @@ -422,8 +464,8 @@ extern void gfs2_rgrp_in(struct gfs2_rgr extern void gfs2_rgrp_out(const struct gfs2_rgrp *rg, void *buf); extern void gfs2_quota_in(struct gfs2_quota *qu, const void *buf); extern void gfs2_quota_out(const struct gfs2_quota *qu, void *buf); -extern void gfs2_dinode_in(struct gfs2_dinode *di, const void *buf); -extern void gfs2_dinode_out(const struct gfs2_dinode *di, void *buf); +extern void gfs2_dinode_in(struct gfs2_dinode_host *di, const void *buf); +extern void gfs2_dinode_out(const struct gfs2_dinode_host *di, void *buf); extern void gfs2_ea_header_in(struct gfs2_ea_header *ea, const void *buf); extern void gfs2_ea_header_out(const struct gfs2_ea_header *ea, void *buf); extern void gfs2_log_header_in(struct gfs2_log_header *lh, const void *buf); @@ -436,7 +478,7 @@ extern void gfs2_quota_change_in(struct /* Printing functions */ extern void gfs2_rindex_print(const struct gfs2_rindex *ri); -extern void gfs2_dinode_print(const struct gfs2_dinode *di); +extern void gfs2_dinode_print(const struct gfs2_dinode_host *di); #endif /* __KERNEL__ */ -- 1.4.1 >From 5c6edb576f3800723bb65dbfaff82517089e32d0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 13 Oct 2006 20:33:01 -0400 Subject: [PATCH] [GFS2] gfs2_dinode_host fields are host-endian Annotated scalar fields, dropped unused ones. Note that it's not at all obvious that we want to convert all of them to host-endian... Signed-off-by: Al Viro Signed-off-by: Steven Whitehouse --- fs/gfs2/incore.h | 2 +- include/linux/gfs2_ondisk.h | 47 ++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 118dc69..1c876e0 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -229,7 +229,7 @@ struct gfs2_inode { unsigned long i_flags; /* GIF_... */ u64 i_vn; - struct gfs2_dinode i_di; /* To be replaced by ref to block */ + struct gfs2_dinode_host i_di; /* To be replaced by ref to block */ struct gfs2_glock *i_gl; /* Move into i_gh? */ struct gfs2_holder i_iopen_gh; diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index f334b4b..0e67a89 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h @@ -275,41 +275,34 @@ struct gfs2_dinode_host { struct gfs2_inum di_num; - __be32 di_mode; /* mode of file */ - __be32 di_uid; /* owner's user id */ - __be32 di_gid; /* owner's group id */ - __be32 di_nlink; /* number of links to this file */ - __be64 di_size; /* number of bytes in file */ - __be64 di_blocks; /* number of blocks in file */ - __be64 di_atime; /* time last accessed */ - __be64 di_mtime; /* time last modified */ - __be64 di_ctime; /* time last changed */ - __be32 di_major; /* device major number */ - __be32 di_minor; /* device minor number */ + __u32 di_mode; /* mode of file */ + __u32 di_uid; /* owner's user id */ + __u32 di_gid; /* owner's group id */ + __u32 di_nlink; /* number of links to this file */ [...8365 lines suppressed...] This fixes Red Hat bugzilla #221237 Signed-off-by: S. Wendy Cheng Signed-off-by: Steven Whitehouse --- fs/gfs2/inode.c | 50 +++++++++++++++++++++++++++++++------------------- fs/gfs2/inode.h | 2 +- fs/gfs2/ops_inode.c | 25 +++---------------------- 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index bab338f..80787de 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -281,13 +281,13 @@ out: } /** - * gfs2_change_nlink_i - Change nlink count on inode + * gfs2_change_nlink - Change nlink count on inode * @ip: The GFS2 inode * @diff: The change in the nlink count required * * Returns: errno */ -int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff) +int gfs2_change_nlink(struct gfs2_inode *ip, int diff) { struct buffer_head *dibh; u32 nlink; @@ -320,40 +320,52 @@ int gfs2_change_nlink_i(struct gfs2_inod brelse(dibh); mark_inode_dirty(&ip->i_inode); + if (ip->i_di.di_nlink == 0) + error = gfs2_change_nlink_i(ip); + return error; } -int gfs2_change_nlink(struct gfs2_inode *ip, int diff) +int gfs2_change_nlink_i(struct gfs2_inode *ip) { struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info; - int error; - - /* update the nlink */ - error = gfs2_change_nlink_i(ip, diff); - if (error) - return error; - - /* return meta data block back to rg */ - if (ip->i_inode.i_nlink == 0) { - struct gfs2_rgrpd *rgd; - struct gfs2_holder ri_gh, rg_gh; + struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex); + struct gfs2_glock *ri_gl = rindex->i_gl; + struct gfs2_rgrpd *rgd; + struct gfs2_holder ri_gh, rg_gh; + int existing, error; + /* if we come from rename path, we could have the lock already */ + existing = gfs2_glock_is_locked_by_me(ri_gl); + if (!existing) { error = gfs2_rindex_hold(sdp, &ri_gh); if (error) goto out; - error = -EIO; - rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr); - if (!rgd) - goto out_norgrp; + } + + /* find the matching rgd */ + error = -EIO; + rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr); + if (!rgd) + goto out_norgrp; + + /* + * Eventually we may want to move rgd(s) to a linked list + * and piggyback the free logic into one of gfs2 daemons + * to gain some performance. + */ + if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) { error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh); if (error) goto out_norgrp; gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */ gfs2_glock_dq_uninit(&rg_gh); + } + out_norgrp: + if (!existing) gfs2_glock_dq_uninit(&ri_gh); - } out: return error; } diff --git a/fs/gfs2/inode.h b/fs/gfs2/inode.h index 85c67cb..cee281b 100644 --- a/fs/gfs2/inode.h +++ b/fs/gfs2/inode.h @@ -40,7 +40,7 @@ int gfs2_inode_refresh(struct gfs2_inode int gfs2_dinode_dealloc(struct gfs2_inode *inode); int gfs2_change_nlink(struct gfs2_inode *ip, int diff); -int gfs2_change_nlink_i(struct gfs2_inode *ip, int diff); +int gfs2_change_nlink_i(struct gfs2_inode *ip); struct inode *gfs2_lookupi(struct inode *dir, const struct qstr *name, int is_root, struct nameidata *nd); struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name, diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 919e894..b2a12f4 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c @@ -553,7 +553,6 @@ static int gfs2_rename(struct inode *odi int alloc_required; unsigned int x; int error; - struct gfs2_rgrpd *rgd; if (ndentry->d_inode) { nip = GFS2_I(ndentry->d_inode); @@ -685,12 +684,12 @@ static int gfs2_rename(struct inode *odi error = gfs2_trans_begin(sdp, sdp->sd_max_dirres + al->al_rgd->rd_ri.ri_length + 4 * RES_DINODE + 4 * RES_LEAF + - RES_STATFS + RES_QUOTA + 1, 0); + RES_STATFS + RES_QUOTA + 4, 0); if (error) goto out_ipreserv; } else { error = gfs2_trans_begin(sdp, 4 * RES_DINODE + - 5 * RES_LEAF + 1, 0); + 5 * RES_LEAF + 4, 0); if (error) goto out_gunlock; } @@ -704,25 +703,7 @@ static int gfs2_rename(struct inode *odi error = gfs2_dir_del(ndip, &ndentry->d_name); if (error) goto out_end_trans; - error = gfs2_change_nlink_i(nip, -1); - if ((!error) && (nip->i_inode.i_nlink == 0)) { - error = -EIO; - rgd = gfs2_blk2rgrpd(sdp, nip->i_num.no_addr); - if (rgd) { - struct gfs2_holder nlink_rg_gh; - if (rgd != nip->i_alloc.al_rgd) - error = gfs2_glock_nq_init( - rgd->rd_gl, LM_ST_EXCLUSIVE, - 0, &nlink_rg_gh); - else - error = 0; - if (!error) { - gfs2_unlink_di(&nip->i_inode); - if (rgd != nip->i_alloc.al_rgd) - gfs2_glock_dq_uninit(&nlink_rg_gh); - } - } - } + error = gfs2_change_nlink(nip, -1); } if (error) goto out_end_trans; -- 1.4.1 >From f8fb3e9d4c0d4e7709803eab2e1b23d76e42009b Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 9 Jan 2007 12:00:31 -0500 Subject: [PATCH] [GFS2] Compile file for previous patch This is a quick fix to the previous patch to fix a typo which prevents it compiling. Signed-off-by: Steven Whitehouse Cc: Wendy Cheng --- fs/gfs2/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 80787de..58c2ce7 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -320,7 +320,7 @@ int gfs2_change_nlink(struct gfs2_inode brelse(dibh); mark_inode_dirty(&ip->i_inode); - if (ip->i_di.di_nlink == 0) + if (ip->i_inode.i_nlink == 0) error = gfs2_change_nlink_i(ip); return error; -- 1.4.1 linux-2.6-ia64-kexec-kdump-xen-conflict.patch: meminit.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-ia64-kexec-kdump-xen-conflict.patch --- diff -Nraup a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h --- a/include/asm-ia64/meminit.h 2006-08-15 05:52:24.000000000 +0800 +++ b/include/asm-ia64/meminit.h 2006-08-15 09:50:03.000000000 +0800 @@ -15,15 +15,16 @@ * - initrd (optional) * - command line string * - kernel code & data + * - crash dumping code reserved region * - Kernel memory map built from EFI memory map * - xen start info * * More could be added if necessary */ #ifndef CONFIG_XEN -#define IA64_MAX_RSVD_REGIONS 6 -#else #define IA64_MAX_RSVD_REGIONS 7 +#else +#define IA64_MAX_RSVD_REGIONS 8 #endif struct rsvd_region { linux-2.6-mac-raid-autorun.patch: mac.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE linux-2.6-mac-raid-autorun.patch --- diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c index c087100..b7dde97 100644 --- a/fs/partitions/mac.c +++ b/fs/partitions/mac.c @@ -74,6 +74,8 @@ #endif be32_to_cpu(part->start_block) * (secsize/512), be32_to_cpu(part->block_count) * (secsize/512)); + if (!strnicmp(part->type, "Linux_RAID", 10)) + state->parts[slot].flags = 1; #ifdef CONFIG_PPC_PMAC /* * If this is the first bootable partition, tell the linux-2.6-marvell-88alp01.patch: Documentation/video4linux/m88alp01-ccic | 57 drivers/media/video/Kconfig | 30 drivers/media/video/Makefile | 2 drivers/media/video/m88alp01-ccic.c | 2373 +++++++++++++++++++++++++ drivers/media/video/m88alp01-regs.h | 153 + drivers/media/video/ovcamchip/Makefile | 2 drivers/media/video/ovcamchip/ov7670.c | 794 ++++++++ drivers/media/video/ovcamchip/ovcamchip_core.c | 24 include/linux/i2c-id.h | 1 include/linux/videodev2.h | 1 include/media/ovcamchip.h | 3 11 files changed, 3426 insertions(+), 14 deletions(-) --- NEW FILE linux-2.6-marvell-88alp01.patch --- diff -Nur -p linux-2.6.18.i586.orig/Documentation/video4linux/m88alp01-ccic linux-2.6.18.i586/Documentation/video4linux/m88alp01-ccic --- linux-2.6.18.i586.orig/Documentation/video4linux/m88alp01-ccic 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.18.i586/Documentation/video4linux/m88alp01-ccic 2006-10-16 14:19:52.000000000 -0400 @@ -0,0 +1,57 @@ +This is the initial version of the Cafe camera driver. Here's a few notes +to go along with it... + + - You need a 2.6.18+ kernel for this driver. If you're running + 2.6.18-vanilla, you'll need a couple of small v4l2 patches + or the driver will not function. + + - The name of the driver (m88alp01-ccic) was taken from the product name + found in the draft spec. If we want to change its name (and Marvell + could well change theirs) now is probably the right time to do so. + + - It is rock-solid with mplayer. The command I use is: + + mplayer tv:// -tv driver=v4l2:width=640:height=480 -nosound + + That will give you a 30fps window, VGA resolution, showing whatever the + camera sees. You can tweak contrast and brightness ('1' and '2' for + contrast, '3' and '4' for brightness); no other controls are hooked up + yet. + + - Also supported are the RGB565 and RGB444 formats. RGB565 can be + displayed directly with a command like: + + mplayer tv:// -tv driver=v4l2:width=640:height=480:outfmt=bgr16 -nosound + + No application currently knows how to do RGB444, so the driver currently + implements a fake RGB32 mode generated from RGB444. V4L2 drivers are not + supposed to do video format transformations, so this options will + probably come out eventually, but it is useful for testing now; use + outfmt=rgb32 with mplayer to get this mode. + + - It does not behave at all well with gqcam - which appears to be trying + to use the read() method. There is some residual weirdness with read() + that I've not yet had a chance to track down. Xawtv also does strange + stuff. + + - This driver uses the "ovcamchip" layer because it was convenient, but it + is at most a marriage of convenience. This layer has traditionally been + used to configure OmniVision sensors for a specific back-end processor; + here, instead, we want to see the sensor's output data directly. So the + supplied OV7670 driver will not work with the older ovcamchip users, and + the other OmniVision sensor drivers are not useful for the m88alp01 + camera controller. + + I have made a beginning attempt to shove some V4L2 functionality down + into the ovcamchip layer as a way of making it a bit more general, but + (1) this work is rough as yet, and (2) I have not been able to talk with + the ovcamchip maintainer about how he would like things done. So + changes may be required in this interface. + +Please do look it over, try it out, and get back to me with any questions +or comments. + +jon + +Jonathan Corbet +corbet at lwn.net diff -Nur -p linux-2.6.18.i586.orig/drivers/media/video/Kconfig linux-2.6.18.i586/drivers/media/video/Kconfig --- linux-2.6.18.i586.orig/drivers/media/video/Kconfig 2006-10-16 14:11:57.000000000 -0400 +++ linux-2.6.18.i586/drivers/media/video/Kconfig 2006-10-16 14:19:34.000000000 -0400 @@ -326,6 +326,25 @@ config VIDEO_M32R_AR_M64278 Say Y here to use the Renesas M64278E-800 camera module, which supports VGA(640x480 pixcels) size of images. +config VIDEO_OVCAMCHIP + tristate "OmniVision Camera Chip support" + depends on I2C + ---help--- + Support for the OmniVision OV6xxx and OV7xxx series of camera chips. + This driver is intended to be used with the ov511 and w9968cf USB + camera drivers. + + To compile this driver as a module, choose M here: the + module will be called ovcamchip. + +config VIDEO_M88ALP01_CCIC + tristate "Marvell 88ALP01 CMOS Camera Controller support" + depends on I2C && VIDEO_V4L2 + ---help--- + This is a video4linux2 driver for the Marvell 88ALP01 integrated + CMOS camera controller. It currently requires the "ovcamchip" + module. + # # Encoder / Decoder module configuration # @@ -453,17 +472,6 @@ source "drivers/media/video/usbvideo/Kco source "drivers/media/video/et61x251/Kconfig" -config VIDEO_OVCAMCHIP - tristate "OmniVision Camera Chip support" - depends on I2C && VIDEO_V4L1 - ---help--- - Support for the OmniVision OV6xxx and OV7xxx series of camera chips. - This driver is intended to be used with the ov511 and w9968cf USB - camera drivers. - - To compile this driver as a module, choose M here: the - module will be called ovcamchip. - config USB_W9968CF tristate "USB W996[87]CF JPEG Dual Mode Camera support" depends on USB && VIDEO_V4L1 && I2C diff -Nur -p linux-2.6.18.i586.orig/drivers/media/video/m88alp01-ccic.c linux-2.6.18.i586/drivers/media/video/m88alp01-ccic.c --- linux-2.6.18.i586.orig/drivers/media/video/m88alp01-ccic.c 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.18.i586/drivers/media/video/m88alp01-ccic.c 2006-10-16 14:19:52.000000000 -0400 @@ -0,0 +1,2373 @@ +/* + * A driver for the CMOS camera controller in the Marvell 88ALP01 + * multifunction chip. Currently works with the Omnivision OV7670 + * sensor. + * + * Copyright 2006 One Laptop Per Child Association, Inc. + * + * Written by Jonathan Corbet, corbet at lwn.net. + * + * This file may be distributed under the terms of the GNU General + * Public License, version 2. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "m88alp01-regs.h" + +#define DEBUG /* For the foreseeable future */ + +#define M88_VERSION 0x000001 + + +/* + * Parameters. + */ +MODULE_AUTHOR("Jonathan Corbet "); +MODULE_DESCRIPTION("Marvell 88ALP01 CMOS Camera Controller driver"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("Video"); + +/* + * Internal DMA buffer management. Since the controller cannot do S/G I/O, + * we must have physically contiguous buffers to bring frames into. + * These parameters control how many buffers we use, whether we + * allocate them at load time (better chance of success, but nails down + * memory) or when somebody tries to use the camera (riskier), and, + * for load-time allocation, how big they should be. + * + * The controller can cycle through three buffers. We could use + * more by flipping pointers around, but it probably makes little + * sense. + */ + +#define MAX_DMA_BUFS 3 +static int alloc_bufs_at_load = 1; +module_param(alloc_bufs_at_load, bool, 0444); +MODULE_PARM_DESC(alloc_bufs_at_load, + "Non-zero value causes DMA buffers to be allocated at module " + "load time. This increases the chances of successfully getting " + "those buffers, but at the cost of nailing down the memory from " + "the outset."); + +static int n_dma_bufs = 2; +module_param(n_dma_bufs, uint, 0644); +MODULE_PARM_DESC(n_dma_bufs, + "The number of DMA buffers to allocate. Can be either two " + "(saves memory, makes timing tighter) or three."); + +static int dma_buf_size = 640 * 480 * 2; /* Worst case */ +module_param(dma_buf_size, uint, 0444); +MODULE_PARM_DESC(dma_buf_size, + "The size of the allocated DMA buffers. If actual operating " + "parameters require larger buffers, an attempt to reallocate " + "will be made."); + +static int min_buffers = 1; [...3169 lines suppressed...] + */ + if (pix->field == V4L2_FIELD_ANY) + pix->field = V4L2_FIELD_NONE; + else if (pix->field != V4L2_FIELD_NONE) + return -EINVAL; + /* + * Round requested image size down to the nearest + * we support, but not below the smallest. + */ +#if 0 + if (pix->height < m88_height_options[0] || + pix->width < m88_width_options[0]) + sizeindex = 0; + else { + for (sizeindex = N_WINDOW_SIZES-1; sizeindex > 0; sizeindex--) + if (pix->height >= m88_height_options[sizeindex] && + pix->width >= m88_width_options[sizeindex]) + break; + } + pix->width = m88_width_options[sizeindex]; + pix->height = m88_height_options[sizeindex]; +#endif + /* + * Wire VGA for now; we'll add flexibility later + */ + pix->width = 640; + pix->height = 480; + pix->bytesperline = pix->width*BYTES_PER_PIXEL; + if (pix->pixelformat == V4L2_PIX_FMT_RGB32) + pix->bytesperline *= 2; + pix->sizeimage = pix->height*pix->bytesperline; + return 0; + +} + +/* + * Set a format. + */ +static int ov7670_s_fmt(struct i2c_client *c, struct v4l2_format *fmt) +{ + int ret, i; + struct v4l2_pix_format *pix = &fmt->fmt.pix; + + ret = ov7670_try_fmt(c, fmt); + if (ret) + return ret; + /* + * Resolution wired to VGA for the moment. + */ + ov_write_mask(c, REG_COM7, COM7_FMT_VGA, COM7_FMT_MASK); + /* + * Find our format again. Kind of silly that we have to + * search twice. We know it exists, though, or try_fmt() + * would have barfed. + */ + for (i = 0; i < N_OV7670_FMTS; i++) + if (ov7670_formats[i].pixelformat == pix->pixelformat) + break; + ov_write_regvals(c, ov7670_formats[i].regs); + return 0; +} + + +static int ov7670_command(struct i2c_client *c, unsigned int cmd, void *arg) +{ + switch (cmd) { + case OVCAMCHIP_CMD_S_CTRL: + return ov7670_set_v4l1_control(c, arg); + case OVCAMCHIP_CMD_G_CTRL: + return ov7670_get_v4l1_control(c, arg); + case OVCAMCHIP_CMD_S_MODE: + return ov7670_set_window(c, arg); + /* + * Accept a few V4L2 ioctls directly. + */ + case VIDIOC_ENUM_FMT: + return ov7670_enum_fmt(c, (struct v4l2_fmtdesc *) arg); + case VIDIOC_TRY_FMT: + return ov7670_try_fmt(c, (struct v4l2_format *) arg); + case VIDIOC_S_FMT: + return ov7670_s_fmt(c, (struct v4l2_format *) arg); + + default: + DDEBUG(2, &c->dev, "command not supported: %d", cmd); + return -ENOIOCTLCMD; + } +} + +struct ovcamchip_ops ov7670_ops = { + .init = ov7670_init, + .free = ov7670_free, + .command = ov7670_command, +}; diff -Nur -p linux-2.6.18.i586.orig/drivers/media/video/ovcamchip/ovcamchip_core.c linux-2.6.18.i586/drivers/media/video/ovcamchip/ovcamchip_core.c --- linux-2.6.18.i586.orig/drivers/media/video/ovcamchip/ovcamchip_core.c 2006-10-16 14:11:59.000000000 -0400 +++ linux-2.6.18.i586/drivers/media/video/ovcamchip/ovcamchip_core.c 2006-10-16 14:19:41.000000000 -0400 @@ -46,6 +46,8 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); /* Registers common to all chips, that are needed for detection */ +#define GENERIC_REG_PID_HIGH 0x0a /* Product ID */ +#define GENERIC_REG_PID_LOW 0x0b #define GENERIC_REG_ID_HIGH 0x1C /* manufacturer ID MSB */ #define GENERIC_REG_ID_LOW 0x1D /* manufacturer ID LSB */ #define GENERIC_REG_COM_I 0x29 /* misc ID bits */ @@ -55,6 +57,7 @@ extern struct ovcamchip_ops ov6x30_ops; extern struct ovcamchip_ops ov7x10_ops; extern struct ovcamchip_ops ov7x20_ops; extern struct ovcamchip_ops ov76be_ops; +extern struct ovcamchip_ops ov7670_ops; static char *chip_names[NUM_CC_TYPES] = { [CC_UNKNOWN] = "Unknown chip", @@ -66,6 +69,7 @@ static char *chip_names[NUM_CC_TYPES] = [CC_OV6630] = "OV6630", [CC_OV6630AE] = "OV6630AE", [CC_OV6630AF] = "OV6630AF", + [CC_OV7670] = "OV7670" }; /* Forward declarations */ @@ -164,10 +168,27 @@ static int ov7xx0_detect(struct i2c_clie { struct ovcamchip *ov = i2c_get_clientdata(c); int rc; - unsigned char val; + unsigned char val, val2; PDEBUG(4, ""); + /* + * Detect the 7670 via the product ID registers. Not sure why + * they aren't all done this way. + */ + rc = ov_read(c, GENERIC_REG_PID_HIGH, &val) + + ov_read(c, GENERIC_REG_PID_LOW, &val2); + if (rc < 0) { + PERROR("Error reading 0v7xx0 PID regs"); + return -1; + } + if (val == 0x76 && val2 == 0x73) { + ov->subtype = CC_OV7670; + ov->sops = &ov7670_ops; + PINFO("Camera chip is an OV7670"); + return 0; + } + /* Detect chip (sub)type */ rc = ov_read(c, GENERIC_REG_COM_I, &val); if (rc < 0) { @@ -300,6 +321,7 @@ static int ovcamchip_attach(struct i2c_a case I2C_HW_SMBUS_OV518: case I2C_HW_SMBUS_OVFX2: case I2C_HW_SMBUS_W9968CF: + case I2C_HW_SMBUS_M88ALP01: PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id); break; default: diff -Nur -p linux-2.6.18.i586.orig/include/linux/i2c-id.h linux-2.6.18.i586/include/linux/i2c-id.h --- linux-2.6.18.i586.orig/include/linux/i2c-id.h 2006-10-16 14:11:46.000000000 -0400 +++ linux-2.6.18.i586/include/linux/i2c-id.h 2006-10-16 14:19:34.000000000 -0400 @@ -249,6 +249,7 @@ #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ #define I2C_HW_SMBUS_OV519 0x040010 /* OV519 USB 1.1 webcam IC */ #define I2C_HW_SMBUS_OVFX2 0x040011 /* Cypress/OmniVision FX2 webcam */ +#define I2C_HW_SMBUS_M88ALP01 0x040012 /* Marvell 88ALP01 cam */ /* --- ISA pseudo-adapter */ #define I2C_HW_ISA 0x050000 diff -Nur -p linux-2.6.18.i586.orig/include/linux/videodev2.h linux-2.6.18.i586/include/linux/videodev2.h --- linux-2.6.18.i586.orig/include/linux/videodev2.h 2006-10-16 14:11:44.000000000 -0400 +++ linux-2.6.18.i586/include/linux/videodev2.h 2006-10-16 14:19:52.000000000 -0400 @@ -244,6 +244,7 @@ struct v4l2_pix_format #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */ #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */ #define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:1:1 16x16 macroblocks */ +#define V4L2_PIX_FMT_RGB444 v4l2_fourcc('R','4','4','4') /* 16 xxxxrrrr ggggbbbb */ /* see http://www.siliconimaging.com/RGB%20Bayer.htm */ #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ diff -Nur -p linux-2.6.18.i586.orig/include/media/ovcamchip.h linux-2.6.18.i586/include/media/ovcamchip.h --- linux-2.6.18.i586.orig/include/media/ovcamchip.h 2006-10-16 14:11:39.000000000 -0400 +++ linux-2.6.18.i586/include/media/ovcamchip.h 2006-10-16 14:19:41.000000000 -0400 @@ -38,7 +38,7 @@ enum { }; /* Chip types */ -#define NUM_CC_TYPES 9 +#define NUM_CC_TYPES 10 enum { CC_UNKNOWN, CC_OV76BE, @@ -49,6 +49,7 @@ enum { CC_OV6630, CC_OV6630AE, CC_OV6630AF, + CC_OV7670 }; /* --------------------------------- */ linux-2.6-marvell-update.patch: m88alp01-ccic.c | 11 ++++++++--- ovcamchip/ov7670.c | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-marvell-update.patch --- 4af6a81e1087b5ffc034ac36bda38e780c73ba5c diff --git a/drivers/media/video/m88alp01-ccic.c b/drivers/media/video/m88alp01-ccic.c index 77922bc..22f505f 100644 --- a/drivers/media/video/m88alp01-ccic.c +++ b/drivers/media/video/m88alp01-ccic.c @@ -708,6 +708,11 @@ static void m88_ctlr_init(struct m88_cam spin_lock_irqsave(&cam->dev_lock, flags); /* + * Added magic to bring up the hardware on the B-Test board + */ + m88_reg_write(cam, 0x3038, 0x8); + m88_reg_write(cam, 0x315c, 0x80008); + /* * Go through the dance needed to wake the device up. * Note that these registers are global and shared * with the NAND and SD devices. Interaction between the @@ -783,10 +788,10 @@ static void m88_ctlr_power_up(struct m88 * wiring). Control 0 is reset - set to 1 to operate. * Control 1 is power down, set to 0 to operate. */ - m88_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN); - mdelay(500); /* FIXME */ + m88_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C1); + mdelay(1); /* Marvell says 1ms will do it */ m88_reg_write(cam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C0); - mdelay(10); /* Enough? */ + mdelay(1); /* Enough? */ spin_unlock_irqrestore(&cam->dev_lock, flags); } 1aa00c3c680d94dee971d2544cc19e695e4f7dd5 diff --git a/drivers/media/video/ovcamchip/ov7670.c b/drivers/media/video/ovcamchip/ov7670.c index 004113f..c89d4dc 100644 --- a/drivers/media/video/ovcamchip/ov7670.c +++ b/drivers/media/video/ovcamchip/ov7670.c @@ -253,8 +253,8 @@ static struct ovcamchip_regvals regvals_ { REG_COM5, 0x61 }, { REG_COM6, 0x4b }, { 0x16, 0x02 }, -// { REG_MVFP, 0x07 }, - { REG_MVFP, 0x07 | MVFP_FLIP }, // Flip needed on dev system + { REG_MVFP, 0x07 }, +// { REG_MVFP, 0x07 | MVFP_FLIP }, // Flip needed on dev system { 0x21, 0x02 }, { 0x22, 0x91 }, { 0x29, 0x07 }, linux-2.6-modsign-verify.patch: init/Kconfig | 11 + kernel/Makefile | 2 kernel/module-verify-elf.c | 304 +++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 41 ++++++ kernel/module-verify.h | 53 +++++++ kernel/module.c | 7 - 6 files changed, 416 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-modsign-verify.patch --- MODSIGN: Module ELF verifier From: David Howells Do preliminary verification of the ELF structure of a module. This is used to make sure that the ELF structure can then be used to check the module signature and access the module data without breaking the module loader. Signed-Off-By: David Howells --- init/Kconfig | 11 ++ kernel/Makefile | 2 kernel/module-verify-elf.c | 304 ++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 41 ++++++ kernel/module-verify.h | 53 ++++++++ kernel/module.c | 7 + 6 files changed, 416 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index a3f83e2..d1ca69b 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -549,6 +549,17 @@ config MODULE_SRCVERSION_ALL the version). With this option, such a "srcversion" field will be created for all modules. If unsure, say N. +config MODULE_VERIFY_ELF + bool "Module ELF structure verification" + depends on MODULES + help + Check ELF structure of modules upon load + +config MODULE_VERIFY + bool + depends on MODULES + default y if MODULE_VERIFY_ELF + config KMOD bool "Automatic kernel module loading" depends on MODULES diff --git a/kernel/Makefile b/kernel/Makefile index 14f4d45..5ed0824 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -30,6 +30,8 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock obj-$(CONFIG_PROVE_LOCKING) += spinlock.o obj-$(CONFIG_UID16) += uid16.o obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_MODULE_VERIFY) += module-verify.o +obj-$(CONFIG_MODULE_VERIFY_ELF) += module-verify-elf.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o diff --git a/kernel/module-verify-elf.c b/kernel/module-verify-elf.c new file mode 100644 index 0000000..6c4f1b1 --- /dev/null +++ b/kernel/module-verify-elf.c @@ -0,0 +1,304 @@ +/* module-verify-elf.c: module ELF verifier + * + * Written by David Howells (dhowells at redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include +#include +#include +#include +#include "module-verify.h" + +#if 0 +#define _debug(FMT, ...) printk(FMT, ##__VA_ARGS__) +#else +#define _debug(FMT, ...) do {} while (0) +#endif + +/* + * verify the ELF structure of a module + */ +int module_verify_elf(struct module_verify_data *mvdata) +{ + const Elf_Ehdr *hdr = mvdata->hdr; + const Elf_Shdr *section, *section2, *secstop; + const Elf_Rela *relas, *rela, *relastop; + const Elf_Rel *rels, *rel, *relstop; + const Elf_Sym *symbol, *symstop; + size_t size, sssize, *secsize, tmp, tmp2; + long last; + int line; + + size = mvdata->size; + mvdata->nsects = hdr->e_shnum; + +#define elfcheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto elfcheck_error; } } while(0) + +#define seccheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto seccheck_error; } } while(0) + +#define symcheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto symcheck_error; } } while(0) + +#define relcheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto relcheck_error; } } while(0) + +#define relacheck(X) \ +do { if (unlikely(!(X))) { line = __LINE__; goto relacheck_error; } } while(0) + + /* validate the ELF header */ + elfcheck(hdr->e_ehsize < size); + elfcheck(hdr->e_entry == 0); + elfcheck(hdr->e_phoff == 0); + elfcheck(hdr->e_phnum == 0); + + elfcheck(hdr->e_shnum < SHN_LORESERVE); + elfcheck(hdr->e_shoff < size); + elfcheck(hdr->e_shoff >= hdr->e_ehsize); + elfcheck((hdr->e_shoff & (sizeof(long) - 1)) == 0); + elfcheck(hdr->e_shstrndx > 0); + elfcheck(hdr->e_shstrndx < hdr->e_shnum); + elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr)); + + tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum; + elfcheck(tmp <= size - hdr->e_shoff); + + /* allocate a table to hold in-file section sizes */ + mvdata->secsizes = kcalloc(hdr->e_shnum, sizeof(size_t), GFP_KERNEL); + if (!mvdata->secsizes) + return -ENOMEM; + + /* validate the ELF section headers */ + mvdata->sections = mvdata->buffer + hdr->e_shoff; + secstop = mvdata->sections + mvdata->nsects; + + sssize = mvdata->sections[hdr->e_shstrndx].sh_size; + elfcheck(sssize > 0); + + section = mvdata->sections; + seccheck(section->sh_type == SHT_NULL); + seccheck(section->sh_size == 0); + seccheck(section->sh_offset == 0); + + secsize = mvdata->secsizes + 1; + for (section++; section < secstop; secsize++, section++) { + seccheck(section->sh_name < sssize); + seccheck(section->sh_link < hdr->e_shnum); + + if (section->sh_entsize > 0) + seccheck(section->sh_size % section->sh_entsize == 0); + + seccheck(section->sh_offset >= hdr->e_ehsize); + seccheck(section->sh_offset < size); + + /* determine the section's in-file size */ + tmp = size - section->sh_offset; + if (section->sh_offset < hdr->e_shoff) + tmp = hdr->e_shoff - section->sh_offset; + + for (section2 = mvdata->sections + 1; + section2 < secstop; + section2++) { + if (section->sh_offset < section2->sh_offset) { + tmp2 = section2->sh_offset - + section->sh_offset; + if (tmp2 < tmp) + tmp = tmp2; + } + } + *secsize = tmp; + + _debug("Section %ld: %zx bytes at %lx\n", + section - mvdata->sections, + *secsize, + (unsigned long) section->sh_offset); + + /* perform section type specific checks */ + switch (section->sh_type) { + case SHT_NOBITS: + break; + + case SHT_REL: + seccheck(section->sh_entsize == sizeof(Elf_Rel)); + goto more_rel_checks; + + case SHT_RELA: + seccheck(section->sh_entsize == sizeof(Elf_Rela)); + more_rel_checks: + seccheck(section->sh_info > 0); + seccheck(section->sh_info < hdr->e_shnum); + goto more_sec_checks; + + case SHT_SYMTAB: + seccheck(section->sh_entsize == sizeof(Elf_Sym)); + goto more_sec_checks; + + default: + more_sec_checks: + /* most types of section must be contained entirely + * within the file */ + seccheck(section->sh_size <= *secsize); + break; + } + } + + /* validate the ELF section names */ + section = &mvdata->sections[hdr->e_shstrndx]; + + seccheck(section->sh_offset != hdr->e_shoff); + + mvdata->secstrings = mvdata->buffer + section->sh_offset; + + last = -1; + for (section = mvdata->sections + 1; section < secstop; section++) { + const char *secname; + tmp = sssize - section->sh_name; + secname = mvdata->secstrings + section->sh_name; + seccheck(secname[0] != 0); + if (section->sh_name > last) + last = section->sh_name; + } + + if (last > -1) { + tmp = sssize - last; + elfcheck(memchr(mvdata->secstrings + last, 0, tmp) != NULL); + } + + /* look for various sections in the module */ + for (section = mvdata->sections + 1; section < secstop; section++) { + switch (section->sh_type) { + case SHT_SYMTAB: + if (strcmp(mvdata->secstrings + section->sh_name, + ".symtab") == 0 + ) { + seccheck(mvdata->symbols == NULL); + mvdata->symbols = + mvdata->buffer + section->sh_offset; + mvdata->nsyms = + section->sh_size / sizeof(Elf_Sym); + seccheck(section->sh_size > 0); + } + break; + + case SHT_STRTAB: + if (strcmp(mvdata->secstrings + section->sh_name, + ".strtab") == 0 + ) { + seccheck(mvdata->strings == NULL); + mvdata->strings = + mvdata->buffer + section->sh_offset; + sssize = mvdata->nstrings = section->sh_size; + seccheck(section->sh_size > 0); + } + break; + } + } + + if (!mvdata->symbols) { + printk("Couldn't locate module symbol table\n"); + goto format_error; + } + + if (!mvdata->strings) { + printk("Couldn't locate module strings table\n"); + goto format_error; + } + + /* validate the symbol table */ + symstop = mvdata->symbols + mvdata->nsyms; + + symbol = mvdata->symbols; + symcheck(ELF_ST_TYPE(symbol[0].st_info) == STT_NOTYPE); + symcheck(symbol[0].st_shndx == SHN_UNDEF); + symcheck(symbol[0].st_value == 0); + symcheck(symbol[0].st_size == 0); + + last = -1; + for (symbol++; symbol < symstop; symbol++) { + symcheck(symbol->st_name < sssize); + if (symbol->st_name > last) + last = symbol->st_name; + symcheck(symbol->st_shndx < mvdata->nsects || + symbol->st_shndx >= SHN_LORESERVE); + } + + if (last > -1) { + tmp = sssize - last; + elfcheck(memchr(mvdata->strings + last, 0, tmp) != NULL); + } + + /* validate each relocation table as best we can */ + for (section = mvdata->sections + 1; section < secstop; section++) { + section2 = mvdata->sections + section->sh_info; + + switch (section->sh_type) { + case SHT_REL: + rels = mvdata->buffer + section->sh_offset; + relstop = mvdata->buffer + + section->sh_offset + section->sh_size; + + for (rel = rels; rel < relstop; rel++) { + relcheck(rel->r_offset < section2->sh_size); + relcheck(ELF_R_SYM(rel->r_info) < + mvdata->nsyms); + } + + break; + + case SHT_RELA: + relas = mvdata->buffer + section->sh_offset; + relastop = mvdata->buffer + + section->sh_offset + section->sh_size; + + for (rela = relas; rela < relastop; rela++) { + relacheck(rela->r_offset < section2->sh_size); + relacheck(ELF_R_SYM(rela->r_info) < + mvdata->nsyms); + } + + break; + + default: + break; + } + } + + + _debug("ELF okay\n"); + return 0; + +elfcheck_error: + printk("Verify ELF error (assertion %d)\n", line); + goto format_error; + +seccheck_error: + printk("Verify ELF error [sec %ld] (assertion %d)\n", + (long)(section - mvdata->sections), line); + goto format_error; + +symcheck_error: + printk("Verify ELF error [sym %ld] (assertion %d)\n", + (long)(symbol - mvdata->symbols), line); + goto format_error; + +relcheck_error: + printk("Verify ELF error [sec %ld rel %ld] (assertion %d)\n", + (long)(section - mvdata->sections), + (long)(rel - rels), line); + goto format_error; + +relacheck_error: + printk("Verify ELF error [sec %ld rela %ld] (assertion %d)\n", + (long)(section - mvdata->sections), + (long)(rela - relas), line); + goto format_error; + +format_error: + return -ELIBBAD; +} diff --git a/kernel/module-verify.c b/kernel/module-verify.c new file mode 100644 index 0000000..875279f --- /dev/null +++ b/kernel/module-verify.c @@ -0,0 +1,41 @@ +/* module-verify.c: module verifier + * + * Written by David Howells (dhowells at redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include +#include +#include +#include "module-verify.h" + +/* + * verify a module's integrity + * - check the ELF is viable + */ +int module_verify(const Elf_Ehdr *hdr, size_t size) +{ + struct module_verify_data mvdata; + int ret; + + memset(&mvdata, 0, sizeof(mvdata)); + mvdata.buffer = hdr; + mvdata.hdr = hdr; + mvdata.size = size; + + ret = module_verify_elf(&mvdata); + if (ret < 0) { + if (ret == -ELIBBAD) + printk("Module failed ELF checks\n"); + goto error; + } + +error: + kfree(mvdata.secsizes); + kfree(mvdata.canonlist); + return ret; +} diff --git a/kernel/module-verify.h b/kernel/module-verify.h new file mode 100644 index 0000000..63f5e08 --- /dev/null +++ b/kernel/module-verify.h @@ -0,0 +1,53 @@ +/* module-verify.h: module verification definitions + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. + * Written by David Howells (dhowells at redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include +#include + +#ifdef CONFIG_MODULE_VERIFY +struct module_verify_data { + struct crypto_tfm *digest; /* module signature digest */ + const void *buffer; /* module buffer */ + const Elf_Ehdr *hdr; /* ELF header */ + const Elf_Shdr *sections; /* ELF section table */ + const Elf_Sym *symbols; /* ELF symbol table */ + const char *secstrings; /* ELF section string table */ + const char *strings; /* ELF string table */ + size_t *secsizes; /* section size list */ + size_t size; /* module object size */ + size_t nsects; /* number of sections */ + size_t nsyms; /* number of symbols */ + size_t nstrings; /* size of strings section */ + size_t signed_size; /* count of bytes contributed to digest */ + int *canonlist; /* list of canonicalised sections */ + int *canonmap; /* section canonicalisation map */ + int sig_index; /* module signature section index */ + uint8_t xcsum; /* checksum of bytes contributed to digest */ + uint8_t csum; /* checksum of bytes representing a section */ +}; + +/* + * module-verify.c + */ +extern int module_verify(const Elf_Ehdr *hdr, size_t size); + +/* + * module-verify-elf.c + */ +#ifdef CONFIG_MODULE_VERIFY_ELF +extern int module_verify_elf(struct module_verify_data *mvdata); +#else +#define module_verify_elf(m) (0) +#endif + +#else +#define module_verify(h, s) (0) +#endif diff --git a/kernel/module.c b/kernel/module.c index dbce132..9d5787d 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -44,6 +44,7 @@ #include #include #include #include +#include "module-verify.h" #if 0 #define DEBUGP printk @@ -1591,8 +1592,10 @@ static struct module *load_module(void _ goto free_hdr; } - if (len < hdr->e_shoff + hdr->e_shnum * sizeof(Elf_Shdr)) - goto truncated; + /* Verify the module's contents */ + err = module_verify(hdr, len); + if (err < 0) + goto free_hdr; /* Convenience variables */ sechdrs = (void *)hdr + hdr->e_shoff; linux-2.6-mtd-update.patch: drivers/mtd/nand/nand_base.c | 177 ++++++++++++++++++++++++++----------------- drivers/mtd/nand/nand_bbt.c | 2 include/linux/mtd/nand.h | 31 +++++-- 3 files changed, 134 insertions(+), 76 deletions(-) --- NEW FILE linux-2.6-mtd-update.patch --- commit 0d9a4bd32fb9f4b9eeaa4c3d299f7a7b7c515646 Author: David Woodhouse Date: Mon Sep 25 21:58:50 2006 +0100 [MTD NAND] Provide prototype for newly-exported nand_wait_ready() Signed-off-by: David Woodhouse (cherry picked from b77d95c78fb0ec330cd53e0d297ffa4fd2975e32 commit) commit 8239bbd4a22659610ee48180e8b7479a9a8a7b14 Author: David Woodhouse Date: Sun Oct 22 01:47:45 2006 +0100 [MTD] NAND: Correct setting of chip->oob_poi OOB buffer Signed-off-by: David Woodhouse (cherry picked from 784f4d5e66ac1d962091e08fe5a4b238ed8c793d commit) commit 2847334a3f154772e660fe74361f2c731b8b0456 Author: David Woodhouse Date: Sat Oct 21 17:09:53 2006 +0100 [MTD] NAND: Combined oob buffer so it's contiguous with data Ditch the separate oobrbuf and oobwbuf fields from the chip buffers, and use only a single buffer immediately after the data. This accommodates NAND controllers such as the OLPC CAF?? chip, which can't do scatter/gather DMA so needs the OOB buffer to be contiguous with the data, for both read and write. Signed-off-by: David Woodhouse (cherry picked from 7dcdcbef5d2b60d1db68fd2c07351f7afd8ad376 commit) commit 887200e884747e39b48686440c8dc65ceb550e94 Author: David Woodhouse Date: Mon Sep 25 17:12:39 2006 +0100 [MTD NAND] Allow override of page read and write functions. - allow high-level nand_write_page() function to be overridden - likewise low-level write_page_raw() and read_page_raw() functions - Clean up the abuse of chip->ecc.{write,read}_page() with MTD_OOB_RAW Signed-off-by: David Woodhouse (cherry picked from 956e944c7690ea994757a8cbedbb6241e1d9138f commit) commit 2321c28e4406e780d7f28eb9923b027fed215752 Author: David Woodhouse Date: Mon Sep 25 17:08:04 2006 +0100 [MTD NAND] Allocate chip->buffers separately to allow it to be overridden In particular, the board driver might need it to be DMAable. Signed-off-by: David Woodhouse (cherry picked from 4bf63fcb83dc761853f69a77b15e47712689020b commit) commit c859608b17e61b12bb69940a6f29caed59a7ad71 Author: David Woodhouse Date: Mon Sep 25 17:06:53 2006 +0100 [MTD NAND] Split nand_scan() into two parts; allow board driver to intervene Signed-off-by: David Woodhouse (cherry picked from 3b85c3211ebde263a86c8cd3c7277fdd2e440310 commit) commit 7b982caee25a8c6407f5e71ed366564e180af5ff Author: David Woodhouse Date: Mon Sep 25 17:05:24 2006 +0100 [MTD NAND] Export nand_wait_ready() for use by board drivers Signed-off-by: David Woodhouse (cherry picked from 4b648b0253c0976e944ea07e38a2d53ad4d0b30e commit) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 975b2ef..185bfa1 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -415,7 +415,7 @@ static int nand_block_checkbad(struct mt * Wait for the ready pin, after a command * The timeout is catched later. */ -static void nand_wait_ready(struct mtd_info *mtd) +void nand_wait_ready(struct mtd_info *mtd) { struct nand_chip *chip = mtd->priv; unsigned long timeo = jiffies + 2; @@ -429,6 +429,7 @@ static void nand_wait_ready(struct mtd_i } while (time_before(jiffies, timeo)); led_trigger_event(nand_led_trigger, LED_OFF); } +EXPORT_SYMBOL_GPL(nand_wait_ready); /** * nand_command - [DEFAULT] Send command to NAND device @@ -766,8 +767,8 @@ static int nand_read_page_swecc(struct m int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; uint8_t *p = buf; - uint8_t *ecc_calc = chip->buffers.ecccalc; - uint8_t *ecc_code = chip->buffers.ecccode; + uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_code = chip->buffers->ecccode; int *eccpos = chip->ecc.layout->eccpos; nand_read_page_raw(mtd, chip, buf); @@ -808,8 +809,8 @@ static int nand_read_page_hwecc(struct m int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; uint8_t *p = buf; - uint8_t *ecc_calc = chip->buffers.ecccalc; - uint8_t *ecc_code = chip->buffers.ecccode; + uint8_t *ecc_calc = chip->buffers->ecccalc; + uint8_t *ecc_code = chip->buffers->ecccode; int *eccpos = chip->ecc.layout->eccpos; for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) { @@ -970,7 +971,6 @@ static int nand_do_read_ops(struct mtd_i page = realpage & chip->pagemask; col = (int)(from & (mtd->writesize - 1)); - chip->oob_poi = chip->buffers.oobrbuf; buf = ops->datbuf; oob = ops->oobbuf; @@ -981,7 +981,7 @@ static int nand_do_read_ops(struct mtd_i /* Is the current page in the buffer ? */ if (realpage != chip->pagebuf || oob) { - bufpoi = aligned ? buf : chip->buffers.databuf; + bufpoi = aligned ? buf : chip->buffers->databuf; if (likely(sndcmd)) { chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); @@ -989,14 +989,17 @@ static int nand_do_read_ops(struct mtd_i } /* Now read the page into the buffer */ - ret = chip->ecc.read_page(mtd, chip, bufpoi); + if (unlikely(ops->mode == MTD_OOB_RAW)) + ret = chip->ecc.read_page_raw(mtd, chip, bufpoi); + else + ret = chip->ecc.read_page(mtd, chip, bufpoi); if (ret < 0) break; /* Transfer not aligned data */ if (!aligned) { chip->pagebuf = realpage; - memcpy(buf, chip->buffers.databuf + col, bytes); + memcpy(buf, chip->buffers->databuf + col, bytes); } buf += bytes; @@ -1023,7 +1026,7 @@ static int nand_do_read_ops(struct mtd_i nand_wait_ready(mtd); } } else { - memcpy(buf, chip->buffers.databuf + col, bytes); + memcpy(buf, chip->buffers->databuf + col, bytes); buf += bytes; } @@ -1266,8 +1269,6 @@ static int nand_do_read_oob(struct mtd_i realpage = (int)(from >> chip->page_shift); page = realpage & chip->pagemask; - chip->oob_poi = chip->buffers.oobrbuf; - while(1) { sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd); buf = nand_transfer_oob(chip, buf, ops); @@ -1322,8 +1323,6 @@ static int nand_do_read_oob(struct mtd_i static int nand_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops) { - int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, - uint8_t *buf) = NULL; struct nand_chip *chip = mtd->priv; int ret = -ENOTSUPP; @@ -1341,12 +1340,7 @@ static int nand_read_oob(struct mtd_info switch(ops->mode) { case MTD_OOB_PLACE: case MTD_OOB_AUTO: - break; - case MTD_OOB_RAW: - /* Replace the read_page algorithm temporary */ - read_page = chip->ecc.read_page; - chip->ecc.read_page = nand_read_page_raw; break; default: @@ -1358,8 +1352,6 @@ static int nand_read_oob(struct mtd_info else ret = nand_do_read_ops(mtd, from, ops); - if (unlikely(ops->mode == MTD_OOB_RAW)) - chip->ecc.read_page = read_page; out: nand_release_device(mtd); return ret; @@ -1391,7 +1383,7 @@ static void nand_write_page_swecc(struct int i, eccsize = chip->ecc.size; int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; - uint8_t *ecc_calc = chip->buffers.ecccalc; + uint8_t *ecc_calc = chip->buffers->ecccalc; const uint8_t *p = buf; int *eccpos = chip->ecc.layout->eccpos; @@ -1417,7 +1409,7 @@ static void nand_write_page_hwecc(struct int i, eccsize = chip->ecc.size; int eccbytes = chip->ecc.bytes; int eccsteps = chip->ecc.steps; - uint8_t *ecc_calc = chip->buffers.ecccalc; + uint8_t *ecc_calc = chip->buffers->ecccalc; const uint8_t *p = buf; int *eccpos = chip->ecc.layout->eccpos; @@ -1478,7 +1470,7 @@ static void nand_write_page_syndrome(str } /** - * nand_write_page - [INTERNAL] write one page + * nand_write_page - [REPLACEABLE] write one page * @mtd: MTD device structure * @chip: NAND chip descriptor * @buf: the data to write @@ -1486,13 +1478,16 @@ static void nand_write_page_syndrome(str * @cached: cached programming */ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, - const uint8_t *buf, int page, int cached) + const uint8_t *buf, int page, int cached, int raw) { int status; chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page); - chip->ecc.write_page(mtd, chip, buf); + if (unlikely(raw)) + chip->ecc.write_page_raw(mtd, chip, buf); + else + chip->ecc.write_page(mtd, chip, buf); /* * Cached progamming disabled for now, Not sure if its worth the @@ -1627,7 +1622,9 @@ static int nand_do_write_ops(struct mtd_ (chip->pagebuf << chip->page_shift) < (to + ops->len)) chip->pagebuf = -1; - chip->oob_poi = chip->buffers.oobwbuf; + /* If we're not given explicit OOB data, let it be 0xFF */ + if (likely(!oob)) + memset(chip->oob_poi, 0xff, mtd->oobsize); while(1) { int cached = writelen > bytes && page != blockmask; @@ -1635,7 +1632,8 @@ static int nand_do_write_ops(struct mtd_ if (unlikely(oob)) oob = nand_fill_oob(chip, oob, ops); - ret = nand_write_page(mtd, chip, buf, page, cached); + ret = chip->write_page(mtd, chip, buf, page, cached, + (ops->mode == MTD_OOB_RAW)); if (ret) break; @@ -1655,9 +1653,6 @@ static int nand_do_write_ops(struct mtd_ } } - if (unlikely(oob)) - memset(chip->oob_poi, 0xff, mtd->oobsize); - ops->retlen = ops->len - writelen; return ret; } @@ -1745,7 +1740,6 @@ static int nand_do_write_oob(struct mtd_ if (page == chip->pagebuf) chip->pagebuf = -1; - chip->oob_poi = chip->buffers.oobwbuf; memset(chip->oob_poi, 0xff, mtd->oobsize); nand_fill_oob(chip, ops->oobbuf, ops); status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask); @@ -1768,8 +1762,6 @@ static int nand_do_write_oob(struct mtd_ static int nand_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops) { - void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, - const uint8_t *buf) = NULL; struct nand_chip *chip = mtd->priv; int ret = -ENOTSUPP; @@ -1787,12 +1779,7 @@ static int nand_write_oob(struct mtd_inf switch(ops->mode) { case MTD_OOB_PLACE: case MTD_OOB_AUTO: - break; - case MTD_OOB_RAW: - /* Replace the write_page algorithm temporary */ - write_page = chip->ecc.write_page; - chip->ecc.write_page = nand_write_page_raw; break; default: @@ -1804,8 +1791,6 @@ static int nand_write_oob(struct mtd_inf else ret = nand_do_write_ops(mtd, to, ops); - if (unlikely(ops->mode == MTD_OOB_RAW)) - chip->ecc.write_page = write_page; out: nand_release_device(mtd); return ret; @@ -2288,40 +2273,22 @@ static struct nand_flash_dev *nand_get_f return type; } -/* module_text_address() isn't exported, and it's mostly a pointless - test if this is a module _anyway_ -- they'd have to try _really_ hard - to call us from in-kernel code if the core NAND support is modular. */ -#ifdef MODULE -#define caller_is_module() (1) -#else -#define caller_is_module() \ - module_text_address((unsigned long)__builtin_return_address(0)) -#endif - /** - * nand_scan - [NAND Interface] Scan for the NAND device - * @mtd: MTD device structure - * @maxchips: Number of chips to scan for + * nand_scan_ident - [NAND Interface] Scan for the NAND device + * @mtd: MTD device structure + * @maxchips: Number of chips to scan for * - * This fills out all the uninitialized function pointers - * with the defaults. - * The flash ID is read and the mtd/chip structures are - * filled with the appropriate values. - * The mtd->owner field must be set to the module of the caller + * This is the first phase of the normal nand_scan() function. It + * reads the flash ID and sets up MTD fields accordingly. * + * The mtd->owner field must be set to the module of the caller. */ -int nand_scan(struct mtd_info *mtd, int maxchips) +int nand_scan_ident(struct mtd_info *mtd, int maxchips) { int i, busw, nand_maf_id; struct nand_chip *chip = mtd->priv; struct nand_flash_dev *type; - /* Many callers got this wrong, so check for it for a while... */ - if (!mtd->owner && caller_is_module()) { - printk(KERN_CRIT "nand_scan() called with NULL mtd->owner!\n"); - BUG(); - } - /* Get buswidth to select the correct functions */ busw = chip->options & NAND_BUSWIDTH_16; /* Set the default functions */ @@ -2353,8 +2320,31 @@ int nand_scan(struct mtd_info *mtd, int chip->numchips = i; mtd->size = i * chip->chipsize; - /* Preset the internal oob write buffer */ - memset(chip->buffers.oobwbuf, 0xff, mtd->oobsize); + return 0; +} + + +/** + * nand_scan_tail - [NAND Interface] Scan for the NAND device + * @mtd: MTD device structure + * @maxchips: Number of chips to scan for + * + * This is the second phase of the normal nand_scan() function. It + * fills out all the uninitialized function pointers with the defaults + * and scans for a bad block table if appropriate. + */ +int nand_scan_tail(struct mtd_info *mtd) +{ + int i; + struct nand_chip *chip = mtd->priv; + + if (!(chip->options & NAND_OWN_BUFFERS)) + chip->buffers = kmalloc(sizeof(*chip->buffers), GFP_KERNEL); + if (!chip->buffers) + return -ENOMEM; + + /* Set the internal oob buffer location, just after the page data */ + chip->oob_poi = chip->buffers->databuf + mtd->writesize; /* * If no default placement scheme is given, select an appropriate one @@ -2377,10 +2367,18 @@ int nand_scan(struct mtd_info *mtd, int } } + if (!chip->write_page) + chip->write_page = nand_write_page; + /* * check ECC mode, default to software if 3byte/512byte hardware ECC is * selected and we have 256 byte pagesize fallback to software ECC */ + if (!chip->ecc.read_page_raw) + chip->ecc.read_page_raw = nand_read_page_raw; + if (!chip->ecc.write_page_raw) + chip->ecc.write_page_raw = nand_write_page_raw; + switch (chip->ecc.mode) { case NAND_ECC_HW: /* Use standard hwecc read page function ? */ @@ -2438,6 +2436,7 @@ int nand_scan(struct mtd_info *mtd, int chip->ecc.size = mtd->writesize; chip->ecc.bytes = 0; break; + default: printk(KERN_WARNING "Invalid NAND_ECC_MODE %d\n", chip->ecc.mode); @@ -2503,6 +2502,44 @@ int nand_scan(struct mtd_info *mtd, int return chip->scan_bbt(mtd); } +/* module_text_address() isn't exported, and it's mostly a pointless + test if this is a module _anyway_ -- they'd have to try _really_ hard + to call us from in-kernel code if the core NAND support is modular. */ +#ifdef MODULE +#define caller_is_module() (1) +#else +#define caller_is_module() \ + module_text_address((unsigned long)__builtin_return_address(0)) +#endif + +/** + * nand_scan - [NAND Interface] Scan for the NAND device + * @mtd: MTD device structure + * @maxchips: Number of chips to scan for + * + * This fills out all the uninitialized function pointers + * with the defaults. + * The flash ID is read and the mtd/chip structures are + * filled with the appropriate values. + * The mtd->owner field must be set to the module of the caller + * + */ +int nand_scan(struct mtd_info *mtd, int maxchips) +{ + int ret; + + /* Many callers got this wrong, so check for it for a while... */ + if (!mtd->owner && caller_is_module()) { + printk(KERN_CRIT "nand_scan() called with NULL mtd->owner!\n"); + BUG(); + } + + ret = nand_scan_ident(mtd, maxchips); + if (!ret) + ret = nand_scan_tail(mtd); + return ret; +} + /** * nand_release - [NAND Interface] Free resources held by the NAND device * @mtd: MTD device structure @@ -2520,9 +2557,13 @@ #endif /* Free bad block table memory */ kfree(chip->bbt); + if (!(chip->options & NAND_OWN_BUFFERS)) + kfree(chip->buffers); } EXPORT_SYMBOL_GPL(nand_scan); +EXPORT_SYMBOL_GPL(nand_scan_ident); +EXPORT_SYMBOL_GPL(nand_scan_tail); EXPORT_SYMBOL_GPL(nand_release); static int __init nand_base_init(void) diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index a612c4e..9402653 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -759,7 +759,7 @@ static inline int nand_memory_bbt(struct struct nand_chip *this = mtd->priv; bd->options &= ~NAND_BBT_SCANEMPTY; - return create_bbt(mtd, this->buffers.databuf, bd, -1); + return create_bbt(mtd, this->buffers->databuf, bd, -1); } /** diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 0b4cd2f..6fc3e07 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -27,9 +27,17 @@ #include struct mtd_info; /* Scan and identify a NAND device */ extern int nand_scan (struct mtd_info *mtd, int max_chips); +/* Separate phases of nand_scan(), allowing board driver to intervene + * and override command or ECC setup according to flash type */ +extern int nand_scan_ident(struct mtd_info *mtd, int max_chips); +extern int nand_scan_tail(struct mtd_info *mtd); + /* Free resources held by the NAND device */ extern void nand_release (struct mtd_info *mtd); +/* Internal helper for board drivers which need to override command function */ +extern void nand_wait_ready(struct mtd_info *mtd); + /* The maximum number of NAND chips in an array */ #define NAND_MAX_CHIPS 8 @@ -178,7 +186,9 @@ #define NAND_CHIPOPTIONS_MSK (0x0000ffff #define NAND_USE_FLASH_BBT 0x00010000 /* This option skips the bbt scan during initialization. */ #define NAND_SKIP_BBTSCAN 0x00020000 - +/* This option is defined if the board driver allocates its own buffers + (e.g. because it needs them DMA-coherent */ +#define NAND_OWN_BUFFERS 0x00040000 /* Options set by nand scan */ /* Nand scan has allocated controller struct */ #define NAND_CONTROLLER_ALLOC 0x80000000 @@ -228,6 +238,8 @@ struct nand_hw_control { * be provided if an hardware ECC is available * @calculate: function for ecc calculation or readback from ecc hardware * @correct: function for ecc correction, matching to ecc generator (sw/hw) + * @read_page_raw: function to read a raw page without ECC + * @write_page_raw: function to write a raw page without ECC * @read_page: function to read a page according to the ecc generator requirements * @write_page: function to write a page according to the ecc generator requirements * @read_oob: function to read chip OOB data @@ -249,6 +261,12 @@ struct nand_ecc_ctrl { int (*correct)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc, uint8_t *calc_ecc); + int (*read_page_raw)(struct mtd_info *mtd, + struct nand_chip *chip, + uint8_t *buf); + void (*write_page_raw)(struct mtd_info *mtd, + struct nand_chip *chip, + const uint8_t *buf); int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, uint8_t *buf); @@ -268,9 +286,7 @@ struct nand_ecc_ctrl { * struct nand_buffers - buffer structure for read/write * @ecccalc: buffer for calculated ecc * @ecccode: buffer for ecc read from flash - * @oobwbuf: buffer for write oob data * @databuf: buffer for data - dynamically sized - * @oobrbuf: buffer to read oob data * * Do not change the order of buffers. databuf and oobrbuf must be in * consecutive order. @@ -278,9 +294,7 @@ struct nand_ecc_ctrl { struct nand_buffers { uint8_t ecccalc[NAND_MAX_OOBSIZE]; uint8_t ecccode[NAND_MAX_OOBSIZE]; - uint8_t oobwbuf[NAND_MAX_OOBSIZE]; - uint8_t databuf[NAND_MAX_PAGESIZE]; - uint8_t oobrbuf[NAND_MAX_OOBSIZE]; + uint8_t databuf[NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE]; }; /** @@ -337,6 +351,7 @@ struct nand_buffers { * @priv: [OPTIONAL] pointer to private chip date * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks * (determine if errors are correctable) + * @write_page [REPLACEABLE] High-level page write function */ struct nand_chip { @@ -359,6 +374,8 @@ struct nand_chip { void (*erase_cmd)(struct mtd_info *mtd, int page); int (*scan_bbt)(struct mtd_info *mtd); int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state, int status, int page); + int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, + const uint8_t *buf, int page, int cached, int raw); int chip_delay; unsigned int options; @@ -380,7 +397,7 @@ struct nand_chip { struct nand_ecclayout *ecclayout; struct nand_ecc_ctrl ecc; - struct nand_buffers buffers; + struct nand_buffers *buffers; struct nand_hw_control hwcontrol; struct mtd_oob_ops ops; linux-2.6-olpc-battery.patch: drivers/Kconfig | 2 drivers/Makefile | 1 drivers/battery/Kconfig | 28 +++ drivers/battery/Makefile | 5 drivers/battery/battery-class.c | 199 +++++++++++++++++++++++ drivers/battery/olpc-battery.c | 335 ++++++++++++++++++++++++++++++++++++++++ drivers/battery/pmu-battery.c | 265 +++++++++++++++++++++++++++++++ include/linux/battery.h | 101 ++++++++++++ 8 files changed, 936 insertions(+) --- NEW FILE linux-2.6-olpc-battery.patch --- commit c8453602f86070b839521f9fcf1d8d1f7c1392eb Author: David Woodhouse Date: Sat Oct 28 17:24:10 2006 +0300 [BATTERY] Add Kconfig and Makefile bits for PMU battery Signed-off-by: David Woodhouse commit 55410d878c5e034be97ce2ae3b0d7e16fb0f985f Author: David Woodhouse Date: Sat Oct 28 15:10:21 2006 +0300 [BATTERY] Add support for PMU battery information Signed-off-by: David Woodhouse commit 0195ef745141d018b842b43dc4c33e6adb710073 Author: David Woodhouse Date: Wed Oct 25 18:27:01 2006 +0300 [BATTERY] Update properties list. Follow suggestions from Shem Multinymous. Signed-off-by: David Woodhouse commit a32c64abd76ded9d5768953863647cc76290d2bb Author: David Woodhouse Date: Wed Oct 25 17:51:08 2006 +0300 [BATTERY] Fix status_caps for AC supplies to 'on-line' not 'present' Signed-off-by: David Woodhouse commit df2ddf7859840fc9ff15809aa04e6c59a90622ad Author: David Woodhouse Date: Wed Oct 25 17:50:39 2006 +0300 [BATTERY] Fix typo preventing olpc-battery from compiling Signed-off-by: David Woodhouse commit b4d724896650ef3998b5f13a0b93e1c10522a4b9 Author: David Woodhouse Date: Wed Oct 25 15:07:34 2006 +0300 [BATTERY] Separate status flags with space, not comma Signed-off-by: David Woodhouse commit ed23611d8ed5df17d755afd88b9ed41763d92568 Author: David Woodhouse Date: Wed Oct 25 13:04:38 2006 +0300 [BATTERY] Add status_caps file, showing which status flags the driver supports Signed-off-by: David Woodhouse commit 2c569104e3d59f809b0ba87691379975de49601b Author: David Woodhouse Date: Wed Oct 25 12:48:12 2006 +0300 [BATTERY] Run Lindent on drivers/battery/ It managed to become a horrid mix of spaces and tabs; possibly because there was a certain amount of cut and paste from code using spaces. Signed-off-by: David Woodhouse commit 0aa9acc1c47dbb3c285d61bb55a1a363433c129f Author: David Woodhouse Date: Tue Oct 24 16:14:59 2006 +0100 [BATTERY] Update OLPC battery driver - Use platform_device - Implement all available status fields Signed-off-by: David Woodhouse commit 0513b2f5473f1e8bb8880c9dee8e1d63af86336e Author: David Woodhouse Date: Tue Oct 24 09:56:46 2006 +0100 [BATTERY] Switch to using device_attribute, from the hardware driver ... instead of the core battery class. Various other cleanups. Signed-off-by: David Woodhouse commit 74e2a48a77347d348e9ed21576863d0d9b51c690 Author: Greg KH Date: Tue Oct 24 09:39:31 2006 +0100 [BATTERY] Convert to struct device instead of class_device From: Greg KH Signed-off-by: David Woodhouse commit 42fe507a262b2a2879ca62740c5312778ae78627 Author: David Woodhouse Date: Mon Oct 23 18:14:54 2006 +0100 [BATTERY] Add support for OLPC battery Signed-off-by: David Woodhouse commit 6cbec3b84e3ce737b4217788841ea10a28a5e340 Author: David Woodhouse Date: Mon Oct 23 18:14:14 2006 +0100 [BATTERY] Add initial implementation of battery class I really don't like the sysfs interaction, and I don't much like the internal interaction with the battery drivers either. In fact, there isn't much I _do_ like, but it's good enough as a straw man. Signed-off-by: David Woodhouse diff --git a/drivers/Kconfig b/drivers/Kconfig index f394634..1dc5dbe 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -34,6 +34,8 @@ source "drivers/ieee1394/Kconfig" source "drivers/message/i2o/Kconfig" +source "drivers/battery/Kconfig" + source "drivers/macintosh/Kconfig" source "drivers/net/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 4ac14da..cd091c9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_PARPORT) += parport/ obj-y += base/ block/ misc/ mfd/ net/ media/ obj-$(CONFIG_NUBUS) += nubus/ obj-$(CONFIG_ATM) += atm/ +obj-$(CONFIG_BATTERY_CLASS) += battery/ obj-$(CONFIG_PPC_PMAC) += macintosh/ obj-$(CONFIG_IDE) += ide/ obj-$(CONFIG_FC4) += fc4/ diff --git a/drivers/battery/Kconfig b/drivers/battery/Kconfig new file mode 100644 index 0000000..337872c --- /dev/null +++ b/drivers/battery/Kconfig @@ -0,0 +1,28 @@ + +menu "Battery support" + +config BATTERY_CLASS + tristate "Battery support" + help + Say Y to enable battery class support. This allows a battery + information to be presented in a uniform manner for all types + of batteries. + + Battery information from APM and ACPI is not yet available by + this method, but should soon be. If you use APM or ACPI, say + 'N', although saying 'Y' would be harmless. + +config OLPC_BATTERY + tristate "One Laptop Per Child battery" + depends on BATTERY_CLASS && X86_32 + help + Say Y to enable support for the battery on the $100 laptop. + +config PMU_BATTERY + tristate "Apple PMU battery" + depends on ADB_PMU + help + This exposes battery information on Apple machines through + the generic battery class + +endmenu diff --git a/drivers/battery/Makefile b/drivers/battery/Makefile new file mode 100644 index 0000000..75d9285 --- /dev/null +++ b/drivers/battery/Makefile @@ -0,0 +1,5 @@ +# Battery code +obj-$(CONFIG_BATTERY_CLASS) += battery-class.o + +obj-$(CONFIG_OLPC_BATTERY) += olpc-battery.o +obj-$(CONFIG_PMU_BATTERY) += pmu-battery.o diff --git a/drivers/battery/battery-class.c b/drivers/battery/battery-class.c new file mode 100644 index 0000000..a09357f --- /dev/null +++ b/drivers/battery/battery-class.c @@ -0,0 +1,199 @@ +/* + * Battery class core + * + * ?? 2006 David Woodhouse + * + * Based on LED Class support, by John Lenz and Richard Purdie: + * + * ?? 2005 John Lenz + * ?? 2005-2006 Richard Purdie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include + +static struct class *battery_class; + +static DEFINE_IDR(battery_idr); +static DEFINE_SPINLOCK(idr_lock); + +ssize_t battery_attribute_show_status(char *buf, unsigned long status) +{ + ssize_t ret = 0; + + if (status & BAT_STAT_PRESENT) + sprintf(buf, "present"); + else + sprintf(buf, "absent"); + + if (status & BAT_STAT_LOW) + strcat(buf, " low"); + + if (status & BAT_STAT_FULL) + strcat(buf, " full"); + + if (status & BAT_STAT_CHARGING) + strcat(buf, " charging"); + + if (status & BAT_STAT_DISCHARGING) + strcat(buf, " discharging"); + + if (status & BAT_STAT_OVERTEMP) + strcat(buf, " overtemp"); + + if (status & BAT_STAT_CRITICAL) + strcat(buf, " critical"); + + if (status & BAT_STAT_CHARGE_DONE) + strcat(buf, " charge-done"); + + strcat(buf, "\n"); + ret = strlen(buf) + 1; + return ret; +} + +EXPORT_SYMBOL_GPL(battery_attribute_show_status); + +ssize_t battery_attribute_show_ac_status(char *buf, unsigned long status) +{ + return 1 + sprintf(buf, "o%s-line\n", status ? "n" : "ff"); +} + +EXPORT_SYMBOL_GPL(battery_attribute_show_ac_status); + +static ssize_t battery_attribute_show_caps(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct battery_dev *battery_dev = dev_get_drvdata(dev); + + if (battery_dev->type == PWRDEV_TYPE_AC) + return battery_attribute_show_ac_status(buf, + battery_dev->status_cap); + else + return battery_attribute_show_status(buf, + battery_dev->status_cap); +} + +static ssize_t battery_attribute_show_name(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct battery_dev *battery_dev = dev_get_drvdata(dev); + return 1 + sprintf(buf, "%s\n", battery_dev->name); +} + +static const char *dev_types[] = { "battery", "ac" }; + +static ssize_t battery_attribute_show_type(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct battery_dev *battery_dev = dev_get_drvdata(dev); + + return 1 + sprintf(buf, "%s\n", dev_types[battery_dev->type]); +} + +static DEVICE_ATTR(status_cap, 0444, battery_attribute_show_caps, NULL); +static DEVICE_ATTR(name, 0444, battery_attribute_show_name, NULL); +static DEVICE_ATTR(type, 0444, battery_attribute_show_type, NULL); + +/** + * battery_dev_register - register a new object of battery_dev class. + * @dev: The device to register. + * @battery_dev: the battery_dev structure for this device. + */ +int battery_device_register(struct device *parent, + struct battery_dev *battery_dev) +{ + int err; + + if (battery_dev->type < PWRDEV_TYPE_BATTERY + || battery_dev->type > PWRDEV_TYPE_AC) + return -EINVAL; + + do { + if (unlikely(!idr_pre_get(&battery_idr, GFP_KERNEL))) + return -ENOMEM; + + spin_lock(&idr_lock); + err = idr_get_new(&battery_idr, NULL, &battery_dev->id); + spin_unlock(&idr_lock); + } while (err == -EAGAIN); + + if (unlikely(err)) + return err; + + battery_dev->dev = device_create(battery_class, parent, 0, + "psu_%d", battery_dev->id); + + if (unlikely(IS_ERR(battery_dev->dev))) { + spin_lock(&idr_lock); + idr_remove(&battery_idr, battery_dev->id); + spin_unlock(&idr_lock); + return PTR_ERR(battery_dev->dev); + } + + dev_set_drvdata(battery_dev->dev, battery_dev); + + /* register the attributes */ + device_create_file(battery_dev->dev, &dev_attr_status_cap); + device_create_file(battery_dev->dev, &dev_attr_type); + device_create_file(battery_dev->dev, &dev_attr_name); + + dev_info(battery_dev->dev, "Registered power source\n"); + + return 0; +} + +EXPORT_SYMBOL_GPL(battery_device_register); + +/** + * battery_dev_unregister - unregisters a object of battery_properties class. + * @battery_dev: the battery device to unreigister + * + * Unregisters a previously registered via battery_dev_register object. + */ +void battery_device_unregister(struct battery_dev *battery_dev) +{ + device_remove_file(battery_dev->dev, &dev_attr_status_cap); + device_remove_file(battery_dev->dev, &dev_attr_type); + device_remove_file(battery_dev->dev, &dev_attr_name); + + device_unregister(battery_dev->dev); + + spin_lock(&idr_lock); + idr_remove(&battery_idr, battery_dev->id); + spin_unlock(&idr_lock); +} + +EXPORT_SYMBOL_GPL(battery_device_unregister); + +static int __init battery_init(void) +{ + battery_class = class_create(THIS_MODULE, "battery"); + if (IS_ERR(battery_class)) + return PTR_ERR(battery_class); + return 0; +} + +static void __exit battery_exit(void) +{ + class_destroy(battery_class); +} + +subsys_initcall(battery_init); +module_exit(battery_exit); + +MODULE_AUTHOR("David Woodhouse "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Battery class interface"); diff --git a/drivers/battery/olpc-battery.c b/drivers/battery/olpc-battery.c new file mode 100644 index 0000000..d270a2e --- /dev/null +++ b/drivers/battery/olpc-battery.c @@ -0,0 +1,335 @@ +/* + * Battery driver for One Laptop Per Child ($100 laptop) board. + * + * ?? 2006 David Woodhouse + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define wBAT_VOLTAGE 0xf900 /* *9.76/32, mV */ +#define wBAT_CURRENT 0xf902 /* *15.625/120, mA */ +#define wBAT_TEMP 0xf906 /* *256/1000, ??C */ +#define wAMB_TEMP 0xf908 /* *256/1000, ??C */ +#define SOC 0xf910 /* percentage */ +#define sMBAT_STATUS 0xfaa4 +#define sBAT_PRESENT 1 +#define sBAT_FULL 2 +#define sBAT_DESTROY 4 +#define sBAT_LOW 32 +#define sBAT_DISCHG 64 +#define sMCHARGE_STATUS 0xfaa5 +#define sBAT_CHARGE 1 +#define sBAT_OVERTEMP 4 +#define sBAT_NiMH 8 +#define sPOWER_FLAG 0xfa40 +#define ADAPTER_IN 1 + +/********************************************************************* + * EC locking and access + *********************************************************************/ + +static int lock_ec(void) +{ + unsigned long timeo = jiffies + HZ / 20; + + while (1) { + unsigned char lock = inb(0x6c) & 0x80; + if (!lock) + return 0; + if (time_after(jiffies, timeo)) { + printk(KERN_ERR "Failed to lock EC for battery access\n"); + return 1; + } + yield(); + } +} + +static void unlock_ec(void) +{ + outb(0xff, 0x6c); +} + +static unsigned char read_ec_byte(unsigned short adr) +{ + outb(adr >> 8, 0x381); + outb(adr, 0x382); + return inb(0x383); +} + +unsigned short read_ec_word(unsigned short adr) +{ + return (read_ec_byte(adr) << 8) | read_ec_byte(adr + 1); +} + +/********************************************************************* + * Status flags + *********************************************************************/ +static ssize_t olpc_ac_status_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + unsigned long status; + + if (lock_ec()) + return -EIO; + + if (!(read_ec_byte(sMBAT_STATUS) & sBAT_PRESENT)) { + unlock_ec(); + return -ENODEV; + } + + status = read_ec_byte(sPOWER_FLAG) & ADAPTER_IN; + + unlock_ec(); + + return battery_attribute_show_ac_status(buf, status); +} + +static struct device_attribute dev_attr_ac_status = +__ATTR(status, 0444, olpc_ac_status_show, NULL); + +static ssize_t olpc_bat_status_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + unsigned long status = 0; + unsigned short tmp; + + if (lock_ec()) + return -EIO; + + tmp = read_ec_byte(sMBAT_STATUS); + + if (tmp & sBAT_PRESENT) + status |= BAT_STAT_PRESENT; + if (tmp & sBAT_FULL) + status |= BAT_STAT_FULL; + if (tmp & sBAT_DESTROY) + status |= BAT_STAT_CRITICAL; + if (tmp & sBAT_LOW) + status |= BAT_STAT_LOW; + if (tmp & sBAT_DISCHG) + status |= BAT_STAT_DISCHARGING; + + tmp = read_ec_byte(sMCHARGE_STATUS); + if (tmp & sBAT_CHARGE) + status |= BAT_STAT_CHARGING; + if (tmp & sBAT_OVERTEMP) + status |= BAT_STAT_OVERTEMP; + + unlock_ec(); + return battery_attribute_show_status(buf, status); +} +static struct device_attribute dev_attr_bat_status = +__ATTR(status, 0444, olpc_bat_status_show, NULL); + +/********************************************************************* + * Integer attributes + *********************************************************************/ + +struct olpc_bat_attr_int { + struct device_attribute dev_attr; + unsigned short adr; + int mul, div; +}; + +#define ATTR_INT(_name, _adr, _mul, _div) { \ + .dev_attr.attr.name = _name, \ + .dev_attr.attr.mode = 0444, \ + .dev_attr.show = olpc_bat_attr_int_show, \ + .adr = _adr, \ + .mul = _mul, \ + .div = _div, \ +} + +static int olpc_bat_attr_int_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct olpc_bat_attr_int *battr = (void *)attr; + long value; + + if (lock_ec()) + return -EIO; + + if (!(read_ec_byte(sMBAT_STATUS) & sBAT_PRESENT)) { + unlock_ec(); + return -ENODEV; + } + + if (battr->adr == SOC) { + value = read_ec_byte(battr->adr); + } else { + value = (signed short)read_ec_word(battr->adr); + + value *= battr->mul; + value /= battr->div; + } + unlock_ec(); + + return 1 + sprintf(buf, "%ld\n", value); +} + +static struct olpc_bat_attr_int attrs_int[] = { + ATTR_INT(BAT_INFO_VOLTAGE, wBAT_VOLTAGE, 9760, 32000), + ATTR_INT(BAT_INFO_CURRENT, wBAT_CURRENT, 15625, 120000), + ATTR_INT(BAT_INFO_TEMP1, wBAT_TEMP, 1000, 256), + ATTR_INT(BAT_INFO_TEMP2, wAMB_TEMP, 1000, 256), + ATTR_INT(BAT_INFO_CAP_PCT, SOC, 1, 1) +}; + +/********************************************************************* + * String attributes + *********************************************************************/ + +struct olpc_bat_attr_str { + struct device_attribute dev_attr; + char *str; +}; + +#define ATTR_STR(_name, _str) { \ + .dev_attr.attr.name = _name, \ + .dev_attr.attr.mode = 0444, \ + .dev_attr.show = olpc_bat_attr_str_show, \ + .str = (char *)_str, \ +} + +static int olpc_bat_attr_str_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct olpc_bat_attr_str *sattr = (void *)attr; + unsigned short tmp; + int ret = 0; + + /* Static strings are simple */ + if ((unsigned long)sattr->str > PAGE_SIZE) { + return 1 + sprintf(buf, "%s\n", sattr->str); + } + + if (lock_ec()) + ret = -EIO; + + if (!(read_ec_byte(sMBAT_STATUS) & sBAT_PRESENT)) + ret = -ENODEV; + else + switch ((unsigned long)sattr->str) { + case 1: + tmp = read_ec_byte(sMCHARGE_STATUS); + if (tmp & sBAT_NiMH) + ret = 1 + sprintf(buf, "NiMH\n"); + else + ret = 1 + sprintf(buf, "unknown\n"); + break; + default: + printk(KERN_ERR "Unknown string type %p\n", sattr->str); + } + + unlock_ec(); + return ret; +} + +static struct olpc_bat_attr_str attrs_str[] = { + ATTR_STR(BAT_INFO_TEMP1_NAME, "battery"), + ATTR_STR(BAT_INFO_TEMP2_NAME, "ambient"), + ATTR_STR(BAT_INFO_TECHNOLOGY, 1), +}; + +/********************************************************************* + * Initialisation + *********************************************************************/ + +static struct battery_dev olpc_bat = { + .name = "OLPC battery", + .type = PWRDEV_TYPE_BATTERY, + .status_cap = BAT_STAT_PRESENT|BAT_STAT_FULL|BAT_STAT_CRITICAL| + BAT_STAT_LOW|BAT_STAT_CHARGING|BAT_STAT_DISCHARGING| + BAT_STAT_OVERTEMP, +}; + +static struct battery_dev olpc_ac = { + .name = "OLPC AC", + .type = PWRDEV_TYPE_AC, + .status_cap = BAT_STAT_PRESENT +}; +static struct platform_device *bat_plat_dev; + +int __init olpc_bat_init(void) +{ + int ret = -ENODEV; + unsigned short tmp; + int i; + + if (!request_region(0x380, 4, "battery")) + return -EIO; + + if (lock_ec()) + goto out_rel; + + tmp = read_ec_word(0xfe92); + unlock_ec(); + + if (tmp != 0x380) { + /* Doesn't look like OLPC EC, but unlock anyway */ + return -ENODEV; + } + + bat_plat_dev = + platform_device_register_simple("olpc-battery", 0, NULL, 0); + if (IS_ERR(bat_plat_dev)) + goto out_rel; + + ret = battery_device_register(&bat_plat_dev->dev, &olpc_bat); + if (ret) + goto out_plat; + + ret = battery_device_register(&bat_plat_dev->dev, &olpc_ac); + if (ret) { + battery_device_unregister(&olpc_bat); + out_plat: + platform_device_unregister(bat_plat_dev); + out_rel: + release_region(0x380, 4); + return ret; + } + for (i = 0; i < ARRAY_SIZE(attrs_int); i++) + device_create_file(olpc_bat.dev, &attrs_int[i].dev_attr); + for (i = 0; i < ARRAY_SIZE(attrs_str); i++) + device_create_file(olpc_bat.dev, &attrs_str[i].dev_attr); + + device_create_file(olpc_bat.dev, &dev_attr_bat_status); + device_create_file(olpc_ac.dev, &dev_attr_ac_status); + + return ret; +} + +void __exit olpc_bat_exit(void) +{ + int i; + + device_remove_file(olpc_bat.dev, &dev_attr_bat_status); + device_remove_file(olpc_ac.dev, &dev_attr_ac_status); + + for (i = 0; i < ARRAY_SIZE(attrs_int); i++) + device_remove_file(olpc_bat.dev, &attrs_int[i].dev_attr); + for (i = 0; i < ARRAY_SIZE(attrs_str); i++) + device_remove_file(olpc_bat.dev, &attrs_str[i].dev_attr); + battery_device_unregister(&olpc_ac); + battery_device_unregister(&olpc_bat); + platform_device_unregister(bat_plat_dev); + release_region(0x380, 4); +} + +module_init(olpc_bat_init); +module_exit(olpc_bat_exit); + +MODULE_AUTHOR("David Woodhouse "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Battery class interface"); diff --git a/drivers/battery/pmu-battery.c b/drivers/battery/pmu-battery.c new file mode 100644 index 0000000..7b3aa6b --- /dev/null +++ b/drivers/battery/pmu-battery.c @@ -0,0 +1,265 @@ +/* + * Battery class driver for Apple PMU + * + * ?? 2006 David Woodhouse + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static struct pmu_battery_dev { + struct battery_dev bdev; + struct pmu_battery_info *pmu_bat; + char name[16]; +} *pbats[PMU_MAX_BATTERIES]; + +/********************************************************************* + * Status flags + *********************************************************************/ +static ssize_t pmu_ac_status_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + unsigned long status = + ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0) || + pmu_battery_count == 0; + + return battery_attribute_show_ac_status(buf, status); +} + +static struct device_attribute dev_attr_ac_status = +__ATTR(status, 0444, pmu_ac_status_show, NULL); + +static ssize_t pmu_bat_status_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + /* You are lost in a maze of twisty structures, all alike */ + struct pmu_battery_dev *pbat = dev_get_drvdata(dev); + struct pmu_battery_info *pmu_bat = pbat->pmu_bat; + unsigned long status = 0; + + if (pmu_bat->flags & PMU_BATT_PRESENT) + status |= BAT_STAT_PRESENT; + if (pmu_bat->flags & PMU_BATT_CHARGING) + status |= BAT_STAT_CHARGING; + + return battery_attribute_show_status(buf, status); +} +static struct device_attribute dev_attr_bat_status = +__ATTR(status, 0444, pmu_bat_status_show, NULL); + +/********************************************************************* + * Integer attributes + *********************************************************************/ + +#define ATTR_INT(_name) { \ + .attr.name = _name, \ + .attr.mode = 0444, \ + .show = pmu_bat_attr_int_show, \ +} + +static int pmu_bat_attr_int_show(struct device *dev, + struct device_attribute *attr, char *buf); + +static struct device_attribute attrs_int[] = { + ATTR_INT(BAT_INFO_CAP_LEFT), + ATTR_INT(BAT_INFO_CAP_LAST_FULL), + ATTR_INT(BAT_INFO_CURRENT), + ATTR_INT(BAT_INFO_VOLTAGE), + ATTR_INT(BAT_INFO_TIME_EMPTY), + ATTR_INT(BAT_INFO_CAP_PCT), +}; + +static int pmu_bat_attr_int_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct pmu_battery_dev *pbat = dev_get_drvdata(dev); + struct pmu_battery_info *pmu_bat = pbat->pmu_bat; + + int field = attr - attrs_int; + long value; + + switch (field) { + case 0: + value = pmu_bat->charge; + break; + + case 1: + value = pmu_bat->max_charge; + break; + + case 2: + value = pmu_bat->amperage; + break; + + case 3: + value = pmu_bat->voltage; + break; + + case 4: + value = pmu_bat->time_remaining; + break; + + case 5: + value = 100 * pmu_bat->charge / pmu_bat->max_charge; + break; + + default: + BUG(); + } + return 1 + sprintf(buf, "%ld\n", value); +} + + +/********************************************************************* + * String attributes + *********************************************************************/ + +#define ATTR_STR(_name) { \ + .attr.name = _name, \ + .attr.mode = 0444, \ + .show = pmu_bat_attr_str_show, \ +} + +static int pmu_bat_attr_str_show(struct device *dev, + struct device_attribute *attr, char *buf); + +static struct device_attribute attrs_str[] = { + ATTR_STR(BAT_INFO_CAP_UNITS), + ATTR_STR(BAT_INFO_MODEL), +}; + +static int pmu_bat_attr_str_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct pmu_battery_dev *pbat = dev_get_drvdata(dev); + struct pmu_battery_info *pmu_bat = pbat->pmu_bat; + int field = attr - attrs_str; + const char *str; + + + switch (field) { + case 0: + str = "mW"; + break; + + case 1: + switch (pmu_bat->flags & PMU_BATT_TYPE_MASK) { + case PMU_BATT_TYPE_SMART: + str = "Smart"; + break; + case PMU_BATT_TYPE_COMET: + str = "Comet"; + break; + case PMU_BATT_TYPE_HOOPER: + str = "Hooper"; + break; + default: + str = "unknown"; + break; + } + break; + default: + BUG(); + } + return 1 + sprintf(buf, "%s\n", str); +} + +/********************************************************************* + * Initialisation + *********************************************************************/ + +static struct battery_dev pmu_ac = { + .name = "PMU AC", + .type = PWRDEV_TYPE_AC, + .status_cap = BAT_STAT_PRESENT +}; + +static struct platform_device *bat_plat_dev; + +int __init pmu_bat_init(void) +{ + int ret; + int i, j; + + bat_plat_dev = + platform_device_register_simple("pmu-battery", 0, NULL, 0); + if (IS_ERR(bat_plat_dev)) + return PTR_ERR(bat_plat_dev); + + ret = battery_device_register(&bat_plat_dev->dev, &pmu_ac); + if (ret) { + platform_device_unregister(bat_plat_dev); + return ret; + } + + device_create_file(pmu_ac.dev, &dev_attr_ac_status); + + for (i=0; i < pmu_battery_count; i++) { + struct pmu_battery_dev *pbat = kmalloc(sizeof(*pbat), GFP_KERNEL); + if (!pbat) + break; + memset(pbat, 0, sizeof(*pbat)); + + sprintf(pbat->name, "PMU battery %d\n", i); + pbat->bdev.name = pbat->name; + pbat->bdev.type = PWRDEV_TYPE_BATTERY; + pbat->bdev.status_cap = BAT_STAT_PRESENT|BAT_STAT_CHARGING; + + ret = battery_device_register(&bat_plat_dev->dev, &pbat->bdev); + if (ret) { + kfree(pbat); + break; + } + pbats[i] = pbat; + pbat->pmu_bat = &pmu_batteries[i]; + + device_create_file(pbat->bdev.dev, &dev_attr_bat_status); + + for (j = 0; j < ARRAY_SIZE(attrs_int); j++) + device_create_file(pbat->bdev.dev, &attrs_int[j]); + for (j = 0; j < ARRAY_SIZE(attrs_str); j++) + device_create_file(pbat->bdev.dev, &attrs_str[j]); + } + + return 0; +} + +void __exit pmu_bat_exit(void) +{ + int i, j; + device_remove_file(pmu_ac.dev, &dev_attr_ac_status); + battery_device_unregister(&pmu_ac); + + for (i=0; i < PMU_MAX_BATTERIES; i++) { + if (!pbats[i]) + continue; + + device_remove_file(pbats[i]->bdev.dev, &dev_attr_bat_status); + + for (j = 0; j < ARRAY_SIZE(attrs_int); j++) + device_remove_file(pbats[i]->bdev.dev, &attrs_int[j]); + for (j = 0; j < ARRAY_SIZE(attrs_str); j++) + device_remove_file(pbats[i]->bdev.dev, &attrs_str[j]); + battery_device_unregister(&pbats[i]->bdev); + kfree(pbats[i]); + } + platform_device_unregister(bat_plat_dev); +} + +module_init(pmu_bat_init); +module_exit(pmu_bat_exit); + +MODULE_AUTHOR("David Woodhouse "); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("PMU battery class driver"); diff --git a/include/linux/battery.h b/include/linux/battery.h new file mode 100644 index 0000000..2f856a0 --- /dev/null +++ b/include/linux/battery.h @@ -0,0 +1,101 @@ +/* + * Driver model for batteries + * + * ?? 2006 David Woodhouse + * + * Based on LED Class support, by John Lenz and Richard Purdie: + * + * ?? 2005 John Lenz + * ?? 2005-2006 Richard Purdie + * + * 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_BATTERY_H__ +#define __LINUX_BATTERY_H__ + +struct device; +struct class_device; + +/* + * Battery Core + */ +#define PWRDEV_TYPE_BATTERY 0 +#define PWRDEV_TYPE_AC 1 + +#define BAT_STAT_PRESENT (1<<0) +#define BAT_STAT_LOW (1<<1) +#define BAT_STAT_FULL (1<<2) +#define BAT_STAT_CHARGING (1<<3) +#define BAT_STAT_DISCHARGING (1<<4) +#define BAT_STAT_OVERTEMP (1<<5) +#define BAT_STAT_CRITICAL (1<<6) +#define BAT_STAT_FIRE (1<<7) +#define BAT_STAT_CHARGE_DONE (1<<8) + +/* Thou shalt not export any attributes in sysfs except these, and + with these units: */ +#define BAT_INFO_STATUS "status" /* Not free-form. Use + provided function */ +#define BAT_INFO_TEMP1 "temp1" /* ??C/1000 */ +#define BAT_INFO_TEMP1_NAME "temp1_name" /* string */ + +#define BAT_INFO_TEMP2 "temp2" /* ??C/1000 */ +#define BAT_INFO_TEMP2_NAME "temp2_name" /* string */ + +#define BAT_INFO_VOLTAGE "voltage" /* mV */ +#define BAT_INFO_VOLTAGE_DESIGN "voltage_design" /* mV */ + +#define BAT_INFO_CURRENT "current" /* mA */ +#define BAT_INFO_CURRENT_NOW "current_now" /* mA */ + +#define BAT_INFO_POWER "power" /* mW */ +#define BAT_INFO_POWER_NOW "power_now" /* mW */ + +/* The following capacity/charge properties are represented in either + mA or mW. The CAP_UNITS property MUST be provided if any of these are. */ +#define BAT_INFO_RATE "rate" /* CAP_UNITS */ +#define BAT_INFO_CAP_LEFT "capacity_left" /* CAP_UNITS*h */ +#define BAT_INFO_CAP_DESIGN "capacity_design" /* CAP_UNITS*h */ +#define BAT_INFO_CAP_LAST_FULL "capacity_last_full" /* CAP_UNITS*h */ +#define BAT_INFO_CAP_LOW "capacity_low_thresh" /* CAP_UNITS*h */ +#define BAT_INFO_CAP_WARN "capacity_warn_thresh" /* CAP_UNITS*h */ +#define BAT_INFO_CAP_UNITS "capacity_units" /* string: must be + either mA or mW */ + +#define BAT_INFO_CAP_PCT "capacity_percentage" /* integer */ + +#define BAT_INFO_TIME_EMPTY "time_to_empty" /* seconds */ +#define BAT_INFO_TIME_EMPTY_NOW "time_to_empty_now" /* seconds */ +#define BAT_INFO_TIME_FULL "time_to_full" /* seconds */ +#define BAT_INFO_TIME_FULL_NOW "time_to_full_now" /* seconds */ + +#define BAT_INFO_MANUFACTURER "manufacturer" /* string */ +#define BAT_INFO_TECHNOLOGY "technology" /* string */ +#define BAT_INFO_MODEL "model" /* string */ +#define BAT_INFO_SERIAL "serial" /* string */ +#define BAT_INFO_OEM_INFO "oem_info" /* string */ + +#define BAT_INFO_CYCLE_COUNT "cycle_count" /* integer */ +#define BAT_INFO_DATE_MFR "date_manufactured" /* YYYY[-MM[-DD]] */ +#define BAT_INFO_DATE_FIRST_USE "date_first_use" /* YYYY[-MM[-DD]] */ + +struct battery_dev { + int status_cap; + int id; + int type; + const char *name; + + struct device *dev; +}; + +int battery_device_register(struct device *parent, + struct battery_dev *battery_cdev); +void battery_device_unregister(struct battery_dev *battery_cdev); + + +ssize_t battery_attribute_show_status(char *buf, unsigned long status); +ssize_t battery_attribute_show_ac_status(char *buf, unsigned long status); +#endif /* __LINUX_BATTERY_H__ */ linux-2.6-olpc-dcon.patch: arch/i386/Kconfig | 7 arch/i386/kernel/Makefile | 1 arch/i386/kernel/olpc.c | 38 ++ drivers/video/backlight/Kconfig | 7 drivers/video/backlight/Makefile | 1 drivers/video/backlight/dcon_bl.c | 88 ++++ drivers/video/geode/Kconfig | 23 - drivers/video/geode/Makefile | 2 drivers/video/geode/display_gx.c | 6 drivers/video/geode/gxfb_core.c | 86 +++- drivers/video/geode/gxfb_dcon.c | 721 ++++++++++++++++++++++++++++++++++++++ drivers/video/geode/gxfb_dcon.h | 79 ++++ drivers/video/geode/video_gx.c | 81 ++++ drivers/video/geode/video_gx.h | 2 drivers/video/modedb.c | 4 include/linux/i2c-id.h | 1 16 files changed, 1110 insertions(+), 37 deletions(-) --- NEW FILE linux-2.6-olpc-dcon.patch --- diff -Nur -p linux-2.6.18.i586.orig/arch/i386/Kconfig linux-2.6.18.i586/arch/i386/Kconfig --- linux-2.6.18.i586.orig/arch/i386/Kconfig 2006-10-16 15:56:36.000000000 -0400 +++ linux-2.6.18.i586/arch/i386/Kconfig 2006-10-16 15:56:58.000000000 -0400 @@ -1158,6 +1158,13 @@ config K8_NB def_bool y depends on AGP_AMD64 +config OLPC + bool "OLPC Support" + default n + help + Add support for detecting the unique features of the OLPC + Childrens Machine + source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" diff -Nur -p linux-2.6.18.i586.orig/arch/i386/kernel/Makefile linux-2.6.18.i586/arch/i386/kernel/Makefile --- linux-2.6.18.i586.orig/arch/i386/kernel/Makefile 2006-10-16 15:56:36.000000000 -0400 +++ linux-2.6.18.i586/arch/i386/kernel/Makefile 2006-10-16 15:56:58.000000000 -0400 @@ -43,6 +43,7 @@ obj-$(CONFIG_K8_NB) += k8.o EXTRA_AFLAGS := -traditional obj-$(CONFIG_SCx200) += scx200.o +obj-$(CONFIG_OLPC) += olpc.o ifdef CONFIG_XEN vsyscall_note := vsyscall-note-xen.o diff -Nur -p linux-2.6.18.i586.orig/arch/i386/kernel/olpc.c linux-2.6.18.i586/arch/i386/kernel/olpc.c --- linux-2.6.18.i586.orig/arch/i386/kernel/olpc.c 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.18.i586/arch/i386/kernel/olpc.c 2006-10-16 15:57:27.000000000 -0400 @@ -0,0 +1,38 @@ +/* Support for the OLPC DCON + * Copyright (C) 2006, Advanced Micro Devices, 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. + */ + +//#include +#include +#include +#include + +int olpc_dcon_present; + +/* REV_A CMOS map: + * bit 440; DCON present bit + */ + +#define OLPC_CMOS_DCON_OFFSET (440 / 8) +#define OLPC_CMOS_DCON_MASK 0x01 + +static int __init olpc_init(void) { + + unsigned char val; + + /* Read the DCON present bit in the CMOS and set the flag accordingly */ + + val = CMOS_READ(OLPC_CMOS_DCON_OFFSET); + olpc_dcon_present = (val & OLPC_CMOS_DCON_MASK); + + return 0; +} + +subsys_initcall(olpc_init); +EXPORT_SYMBOL(olpc_dcon_present); + diff -Nur -p linux-2.6.18.i586.orig/drivers/video/backlight/dcon_bl.c linux-2.6.18.i586/drivers/video/backlight/dcon_bl.c --- linux-2.6.18.i586.orig/drivers/video/backlight/dcon_bl.c 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.18.i586/drivers/video/backlight/dcon_bl.c 2006-10-16 15:57:27.000000000 -0400 @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2006 Advanced Micro Devices, 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 1 or + * (at your option) any later version. + */ + +#include +#include +#include +#include +#include +#include +#include "../geode/gxfb_dcon.h" + +static struct backlight_device *dconbl_dev; + +static int dconbl_set(struct backlight_device *dev) { + + int level = dev->props->brightness; + int power = dev->props->power; + + /* If we are blanking, then just turn off the backlight all together */ + + if (power != FB_BLANK_UNBLANK) + level = 0; + + dcon_set_backlight(level); + return 0; +} + +static int dconbl_get(struct backlight_device *dev) { + return dcon_get_backlight(); +} + +static struct backlight_properties dcon_data = { + .owner = THIS_MODULE, + .get_brightness = dconbl_get, + .update_status = dconbl_set, + .max_brightness = 15 +}; + +static int dconbl_probe(struct platform_device *dev) +{ + dconbl_dev = backlight_device_register("dcon-bl", NULL, &dcon_data); + + if (IS_ERR(dconbl_dev)) + return PTR_ERR(dconbl_dev); + + dcon_data.brightness = dcon_get_backlight(); + return 0; +} + +static int dconbl_remove(struct platform_device *dev) +{ + backlight_device_unregister(dconbl_dev); + return 0; +} + +/* Note: We dont define suspend and resume functions here - + we cannot assume the user wanted the backlight to be changed + while in the suspended mode +*/ + +static struct platform_driver dconbl_driver = { + .probe = dconbl_probe, + .remove = dconbl_remove, + .driver = { + .name = "dcon-bl" + } +}; + +static int __init dconbl_init(void) { + return platform_driver_register(&dconbl_driver); +} + +static void __exit dconbl_exit(void) { + platform_driver_unregister(&dconbl_driver); +} + +module_init(dconbl_init); +module_exit(dconbl_exit); + +MODULE_AUTHOR("Advanced Micro Devices, Inc."); +MODULE_DESCRIPTION("OLPC DCON backlight Driver"); +MODULE_LICENSE("GPL"); diff -Nur -p linux-2.6.18.i586.orig/drivers/video/backlight/Kconfig linux-2.6.18.i586/drivers/video/backlight/Kconfig --- linux-2.6.18.i586.orig/drivers/video/backlight/Kconfig 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/backlight/Kconfig 2006-10-16 15:57:15.000000000 -0400 @@ -66,3 +66,10 @@ config BACKLIGHT_HP680 If you have a HP Jornada 680, say y to enable the backlight driver. +config BACKLIGHT_DCON + tristate "OLPC DCON Backlight Driver" + depends on BACKLIGHT_DEVICE && FB_GEODE_GX_DCON + default y + help + Enable the backlight driver for the OLPC Display CONtroller + diff -Nur -p linux-2.6.18.i586.orig/drivers/video/backlight/Makefile linux-2.6.18.i586/drivers/video/backlight/Makefile --- linux-2.6.18.i586.orig/drivers/video/backlight/Makefile 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/backlight/Makefile 2006-10-16 15:57:15.000000000 -0400 @@ -5,3 +5,4 @@ obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o +obj-$(CONFIG_BACKLIGHT_DCON) += dcon_bl.o diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/display_gx.c linux-2.6.18.i586/drivers/video/geode/display_gx.c --- linux-2.6.18.i586.orig/drivers/video/geode/display_gx.c 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/geode/display_gx.c 2006-10-16 15:56:50.000000000 -0400 @@ -21,11 +21,6 @@ #include "geodefb.h" #include "display_gx.h" -#ifdef CONFIG_FB_GEODE_GX_SET_FBSIZE -unsigned int gx_frame_buffer_size(void) { - return CONFIG_FB_GEODE_GX_FBSIZE; -} -#else unsigned int gx_frame_buffer_size(void) { unsigned int val; @@ -40,7 +35,6 @@ unsigned int gx_frame_buffer_size(void) val = (unsigned int)(inw(0xAC1E)) & 0xFFl; return (val << 19); } -#endif int gx_line_delta(int xres, int bpp) { diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/gxfb_core.c linux-2.6.18.i586/drivers/video/geode/gxfb_core.c --- linux-2.6.18.i586.orig/drivers/video/geode/gxfb_core.c 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/geode/gxfb_core.c 2006-10-16 15:57:27.000000000 -0400 @@ -38,6 +38,7 @@ static char *mode_option; /* Modes relevant to the GX (taken from modedb.c) */ + static const struct fb_videomode gx_modedb[] __initdata = { /* 640x480-60 VESA */ { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, @@ -103,11 +104,24 @@ static const struct fb_videomode gx_mode { NULL, 85, 1600, 1200, 4357, 304, 64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, - { "OLPC-1", 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, + /* 1200x900-75 - CRT timings for the OLPC mode */ + { NULL, 75, 1200, 900, 8049, 104, 240, 29, 54, 136, 3, + FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + FB_VMODE_NONINTERLACED, 0 } +}; + +#ifdef CONFIG_OLPC +static const struct fb_videomode gx_dcon_modedb[] __initdata = { + /* The only mode the DCON has is 1200x900 */ + { NULL, 50, 1200, 900, 17460, 24, 8, 4, 5, 8, 3, FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0 } }; +extern int olpc_dcon_present; +#endif + + static int gxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { if (var->xres > 1600 || var->yres > 1200) @@ -207,10 +221,11 @@ static int gxfb_blank(int blank_mode, st return par->vid_ops->blank_display(info, blank_mode); } +static int fbsize; + static int __init gxfb_map_video_memory(struct fb_info *info, struct pci_dev *dev) { struct geodefb_par *par = info->par; - int fb_len; int ret; ret = pci_enable_device(dev); @@ -235,32 +250,54 @@ static int __init gxfb_map_video_memory( ret = pci_request_region(dev, 0, "gxfb (framebuffer)"); if (ret < 0) return ret; - if ((fb_len = gx_frame_buffer_size()) < 0) - return -ENOMEM; + + /* If the fbsize wasn't specified then try to probe it */ + + if (!fbsize) { + fbsize = gx_frame_buffer_size(); + if (fbsize == 0) + return -ENOMEM; + } + info->fix.smem_start = pci_resource_start(dev, 0); - info->fix.smem_len = fb_len; + info->fix.smem_len = fbsize; info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len); if (!info->screen_base) return -ENOMEM; - /* Set the 16MB aligned base address of the graphics memory region + /* Set the 16MiB aligned base address of the graphics memory region * in the display controller */ writel(info->fix.smem_start & 0xFF000000, par->dc_regs + DC_GLIU0_MEM_OFFSET); - dev_info(&dev->dev, "%d Kibyte of video memory at 0x%lx\n", + dev_info(&dev->dev, "%d KiB of video memory at 0x%lx\n", info->fix.smem_len / 1024, info->fix.smem_start); return 0; } +int (*gxfb_ioctl_func)(struct fb_info *, unsigned int, unsigned long); +EXPORT_SYMBOL(gxfb_ioctl_func); + +static int gxfb_ioctl( struct fb_info *info, unsigned int cmd, + unsigned long arg) +{ + int ret = -ENOTTY; + + if (gxfb_ioctl_func != NULL) + ret = gxfb_ioctl_func(info, cmd, arg); + + return ret; +} + static struct fb_ops gxfb_ops = { .owner = THIS_MODULE, .fb_check_var = gxfb_check_var, .fb_set_par = gxfb_set_par, .fb_setcolreg = gxfb_setcolreg, .fb_blank = gxfb_blank, + .fb_ioctl = gxfb_ioctl, /* No HW acceleration for now. */ .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, @@ -306,16 +343,21 @@ static struct fb_info * __init gxfb_init return info; } -static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) +static int __init gxfb_probe(struct pci_dev *pdev, + const struct pci_device_id *id) { struct geodefb_par *par; struct fb_info *info; int ret; unsigned long val; + struct fb_videomode *modedb_ptr; + int modedb_size; + info = gxfb_init_fbinfo(&pdev->dev); if (!info) return -ENOMEM; + par = info->par; /* GX display controller and GX video device. */ @@ -336,15 +378,30 @@ static int __init gxfb_probe(struct pci_ else par->enable_crt = 1; + /* We need to determine a display mode right now, so we will + * check to see if the DCON was previously detected by the BIOS + * and use that to make our mode database decision. + */ + + modedb_ptr = (struct fb_videomode *) gx_modedb; + modedb_size = ARRAY_SIZE(gx_modedb); + +#ifdef CONFIG_OLPC + if (olpc_dcon_present) { + modedb_ptr = (struct fb_videomode *) gx_dcon_modedb; + modedb_size = ARRAY_SIZE(gx_dcon_modedb); + } +#endif + ret = fb_find_mode(&info->var, info, mode_option, - gx_modedb, ARRAY_SIZE(gx_modedb), NULL, 16); + modedb_ptr, modedb_size, NULL, 16); + if (ret == 0 || ret == 4) { dev_err(&pdev->dev, "could not find valid video mode\n"); ret = -EINVAL; goto err; } - /* Clear the frame buffer of garbage. */ memset_io(info->screen_base, 0, info->fix.smem_len); @@ -427,7 +484,10 @@ static int __init gxfb_setup(char *optio if (!*opt) continue; - mode_option = opt; + if (!strncmp(opt, "fbsize:", 7)) + fbsize = simple_strtoul(opt+7, NULL, 0); + else + mode_option = opt; } return 0; @@ -446,7 +506,6 @@ static int __init gxfb_init(void) #endif return pci_register_driver(&gxfb_driver); } - static void __exit gxfb_cleanup(void) { pci_unregister_driver(&gxfb_driver); @@ -458,5 +517,8 @@ module_exit(gxfb_cleanup); module_param(mode_option, charp, 0); MODULE_PARM_DESC(mode_option, "video mode (x[-][@])"); +module_param(fbsize, int, 0); +MODULE_PARM_DESC(fbsize, "video memory size"); + MODULE_DESCRIPTION("Framebuffer driver for the AMD Geode GX"); MODULE_LICENSE("GPL"); diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/gxfb_dcon.c linux-2.6.18.i586/drivers/video/geode/gxfb_dcon.c --- linux-2.6.18.i586.orig/drivers/video/geode/gxfb_dcon.c 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.18.i586/drivers/video/geode/gxfb_dcon.c 2006-10-16 15:57:27.000000000 -0400 @@ -0,0 +1,721 @@ +/* + * Mainly by David Woodhouse, somewhat modified by Jordan Crouse + * + * Jordan's work is copyright (C) 2006 Advanced Micro Devices, 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 1 or + * (at your option) any later version. + */ + + +#include +#include +#include "geodefb.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "gxfb_dcon.h" + +/* Module definitions */ + +int resumeline = 905; +module_param(resumeline, int, 0444); + +static int noinit; +module_param(noinit, int, 0444); + +/* ioctl() defines */ + +#define DCONIOC_SOURCE _IOW('d', 0, int) +#define DCONIOC_OUTPUT _IOW('d', 1, int) +#define DCONIOC_SETREG _IOW('d', 2, int) +#define DCONIOC_DUMPREG _IOW('d', 3, int) +#define DCONIOC_GETREG _IOW('d', 4, int) +#define DCONIOC_SETBL _IOW('d', 5, int) +#define DCONIOC_GETBL _IOW('d', 6, int) + +/* I2C structures */ + +static struct i2c_driver dcon_driver; +static struct i2c_client *dcon_client; + +/* Platform devices */ +static struct platform_device *dcon_device; +static struct platform_device *dconbl_device; + +/* Base address of the GPIO registers */ +static unsigned long gpio_base; + +/* fbinfo from the GX framebuffer driver */ +static struct fb_info *fbinfo; + +/* Current source */ +static int dcon_source = DCON_SOURCE_CPU; + +/* Current output type */ +static int dcon_output = DCON_OUTPUT_COLOR; + +/* Current sleep status (not yet implemented) */ +static int dcon_sleep = DCON_ACTIVE; + +/* Shadow register for the DCON_REG_MODE register */ +static unsigned short dcon_disp_mode; + +/* Variables used during switches */ +static int dcon_switched; + +static DECLARE_WAIT_QUEUE_HEAD(dcon_wait_queue); + +extern int gxfb_powerdown(struct fb_info *info); +extern int gxfb_powerup(struct fb_info *info); + +extern int (*gxfb_ioctl_func)(struct fb_info *, unsigned int, unsigned long); + +static unsigned short normal_i2c[] = { 0x0D, I2C_CLIENT_END }; +I2C_CLIENT_INSMOD; + +#define dcon_write(reg,val) i2c_smbus_write_word_data(dcon_client,reg,val) +#define dcon_read(reg) i2c_smbus_read_word_data(dcon_client,reg) + +/* ===== API functions - these are called by a variety of users ==== */ + +/* The current backlight value - this saves us some smbus traffic */ +static int gxfb_bl_val = -1; + +/* Backlight notes - turning off the backlight enable bit in the DCON + * doesn't save us any power over just pushing the BL to zero, so we + * don't use that bit in this code. + */ + +int dcon_get_backlight(void) +{ + if (dcon_client == NULL) + return 0; + + if (gxfb_bl_val == -1) + gxfb_bl_val = dcon_read(DCON_REG_BRIGHT) & 0x0F; + + return gxfb_bl_val; +} + +void dcon_set_backlight(int level) +{ + if (dcon_client == NULL) + return; + + if (gxfb_bl_val == (level & 0x0F)) + return; + + gxfb_bl_val = level & 0x0F; + dcon_write(DCON_REG_BRIGHT, gxfb_bl_val); +} + +/* Set the output type to either color or mono */ + +static int dcon_set_output(int arg) +{ + if (dcon_output == arg) + return 0; + + dcon_output = arg; + + if (arg == DCON_OUTPUT_MONO) { + dcon_disp_mode &= ~(MODE_CSWIZZLE | MODE_COL_AA); + dcon_disp_mode |= MODE_MONO_LUMA; + } + else { + dcon_disp_mode &= ~(MODE_MONO_LUMA); + dcon_disp_mode |= (MODE_CSWIZZLE | MODE_COL_AA); + } + + dcon_write(DCON_REG_MODE, dcon_disp_mode); + return 0; +} + +EXPORT_SYMBOL(dcon_get_backlight); +EXPORT_SYMBOL(dcon_set_backlight); + +/* Set the source of the display (CPU or DCON) */ + +static int dcon_set_source(int arg) +{ + if (dcon_source == arg) + return 0; + + dcon_source = arg; + + DECLARE_WAITQUEUE(wait, current); + + dcon_switched = 0; + + if (arg == DCON_SOURCE_CPU) { + + /* FIXME: Set the task uninterruptable for this bit? */ + + /* Enable the scanline interrupt bit */ + dcon_write(DCON_REG_MODE, dcon_disp_mode | MODE_SCAN_INT); + + /* Wait up to one second for the mode to change */ + wait_event_timeout(dcon_wait_queue, dcon_switched == 1, HZ); + + /* Turn off the scanline interrupt */ + dcon_write(DCON_REG_MODE, dcon_disp_mode); + + if (!dcon_switched) { + printk(KERN_ERR "dcon: Timeout entering CPU mode\n"); + return -1; + } + + /* Turn on the graphics engine */ + gxfb_powerup(fbinfo); + outl(1<<11, gpio_base + GPIOx_OUT_VAL); + + printk(KERN_INFO "dcon: The CPU has control\n"); + } + else { + int t; + + add_wait_queue(&dcon_wait_queue, &wait); + set_current_state(TASK_UNINTERRUPTIBLE); + + /* Clear GPIO11 (DCONLOAD) - this implies that the DCON is in + control */ + + outl(1 << (11 + 16), gpio_base + GPIOx_OUT_VAL); + + t = schedule_timeout(HZ/2); + remove_wait_queue(&dcon_wait_queue, &wait); + set_current_state(TASK_RUNNING); + + if (!dcon_switched) { + printk(KERN_ERR "dcon: Timeout entering DCON mode\n"); + + /* Set DCONLOAD back to CPU control */ + outl(1 << 11, gpio_base + GPIOx_OUT_VAL); + return -1; + } + + /* Turn off the graphics engine completely */ + gxfb_powerdown(fbinfo); + printk(KERN_INFO "dcon: The DCON has control\n"); + } + + dcon_source = arg; + return 0; +} + +static int gxfb_dcon_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg) +{ + int karg; + int ret = 0; + unsigned short reg, val; + + switch (cmd) { + case DCONIOC_SOURCE: + if (get_user(karg, (int __user *)arg)) + return -EFAULT; + + if (karg > 1 || karg < -1) + return -EINVAL; + + if (karg > -1) + ret = dcon_set_source(karg); + + if (ret) + karg = -1; + else + karg = dcon_source; + + ret = 0; + break; + + case DCONIOC_OUTPUT: + if (get_user(karg, (int __user *)arg)) + return -EFAULT; + + if (karg > 1 || karg < -1) + return -EINVAL; + + if (karg > -1) + ret = dcon_set_output(karg); + + if (ret) + return ret; + + karg = dcon_output; + break; + + case DCONIOC_SETREG: + if (get_user(karg, (int __user *)arg)) + return -EFAULT; + reg = karg >> 16; + val = karg & 0xffff; + + if (reg >= 128) + return -EINVAL; + + i2c_smbus_write_word_data(dcon_client, reg, val); + karg = 0; + break; + + case DCONIOC_GETREG: + if (get_user(karg, (int __user *)arg)) + return -EFAULT; + + if (karg >= 128) + return -EINVAL; + + karg = i2c_smbus_read_word_data(dcon_client, karg); + break; + + case DCONIOC_DUMPREG: + for (reg = 0; reg < 11; reg++) { + val = i2c_smbus_read_word_data(dcon_client, reg); + printk("Reg %d: 0x%x\n", reg, val); + } + karg = 0; + break; + + case DCONIOC_SETBL: + if (get_user(karg, (int __user *)arg)) + return -EFAULT; + + dcon_set_backlight(karg); + karg = 0; + break; + + case DCONIOC_GETBL: + if (get_user(karg, (int __user *)arg)) + return -EFAULT; + + karg = dcon_get_backlight(); + break; + + default: + return -ENOTTY; + } + if (put_user(karg, (int __user *)arg)) + return -EFAULT; + return ret; +} + +static ssize_t dcon_mode_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%4.4X\n", dcon_disp_mode); +} + +static ssize_t dcon_sleep_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%d\n", dcon_sleep); +} + +static ssize_t dcon_source_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%d\n", dcon_source); +} + +static ssize_t dcon_output_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%d\n", dcon_output); +} + +static int _strtoul(const char *buf, int len, unsigned int *val) +{ + + char *endp; + unsigned int output = simple_strtoul(buf, &endp, 0); + int size = endp - buf; + + if (*endp && isspace(*endp)) + size++; + + if (size != len) + return -EINVAL; + + *val = output; + return 0; +} + +static ssize_t dcon_output_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + int output; + int rc = -EINVAL; + + if (_strtoul(buf, count, &output)) + return -EINVAL; + + if (output == DCON_OUTPUT_COLOR || output == DCON_OUTPUT_MONO) { + dcon_set_output(output); + rc = count; + } + + return rc; +} + +static ssize_t dcon_source_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + int output; + int rc = -EINVAL; + + if (_strtoul(buf, count, &output)) + return -EINVAL; + + if (output == DCON_SOURCE_CPU || output == DCON_SOURCE_DCON) { + dcon_set_source(output); + rc = count; + } + + return rc; +} + +#if 0 +/* FIXME: I haven't yet implemented sleep support */ + +static ssize_t dcon_sleep_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + int output; + int rc = -EINVAL; + + if (_strtoul(buf, count, &output)) + return -EINVAL; + + dcon_sleep(output ? DCON_SLEEP : DCON_ACTIVE); + return count; +} +#endif + +static struct device_attribute dcon_device_files[] = { + __ATTR(mode, 0444, dcon_mode_show, NULL), + __ATTR(sleep, 0644, dcon_sleep_show, NULL), + __ATTR(source, 0644, dcon_source_show, dcon_source_store), + __ATTR(output, 0644, dcon_output_show, dcon_output_store), +}; + +static int dcon_probe(struct i2c_adapter *adap, int addr, int kind) +{ + struct i2c_client *client; + struct pci_dev *dev; + uint16_t ver; + int rc, i; + + dev = pci_find_device(PCI_VENDOR_ID_NS,PCI_DEVICE_ID_NS_GX_VIDEO, + NULL); + + if (dev == NULL || (fbinfo = pci_get_drvdata(dev)) == NULL) { + printk(KERN_ERR "dcon: Couldn't find the GX GPU device\n"); + return -ENXIO; + } + + if (adap->id != I2C_HW_SMBUS_SCX200) { + printk(KERN_ERR "gxfb-dcon: Invalid I2C bus (%d not %d)\n", + adap->id, I2C_HW_SMBUS_SCX200); + return -ENXIO; + } + + client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); + if (client == NULL) + return -ENOMEM; + + strncpy(client->name, "DCON", I2C_NAME_SIZE); + client->addr = addr; + client->adapter = adap; + client->driver = &dcon_driver; + + if ((rc = i2c_attach_client(client)) != 0) { + printk(KERN_ERR "gxfb-dcon: Unable to attach the I2C client.\n"); + goto eclient; + } + + ver = i2c_smbus_read_word_data(client, DCON_REG_ID); + + if ((ver >> 8) != 0xDC) { + printk(KERN_ERR "gxfb-dcon: DCON ID not 0xDCxx: 0x%04x instead.\n", ver); + rc = -ENXIO; + goto ei2c; + } + + if (!noinit) { + /* Initialize the DCON registers */ + + /* Switch to OLPC mode */ + i2c_smbus_write_word_data(client, 0x0b, 0x002); + + /* Colour swizzle, AA, no passthrough, backlight */ + + dcon_disp_mode = MODE_PASSTHRU | MODE_BL_ENABLE | + MODE_CSWIZZLE | MODE_COL_AA; + + i2c_smbus_write_word_data(client, DCON_REG_MODE, + dcon_disp_mode); + + /* Initialise SDRAM */ + + i2c_smbus_write_word_data(client, 0x3a, 0xe040); + i2c_smbus_write_word_data(client, 0x3b, 0x0028); + i2c_smbus_write_word_data(client, 0x3c, 0x0000); + i2c_smbus_write_word_data(client, 0x3d, 0x0000); + i2c_smbus_write_word_data(client, 0x3e, 0x400f); + i2c_smbus_write_word_data(client, 0x3f, 0x04b0); + i2c_smbus_write_word_data(client, 0x40, 0x0384); + i2c_smbus_write_word_data(client, 0x41, 0x0101); + i2c_smbus_write_word_data(client, 0x42, 0x0101); + i2c_smbus_write_word_data(client, 0x43, 0x0101); + } + + /* Set the scanline to interrupt on during resume */ + + i2c_smbus_write_word_data(client, DCON_REG_SCAN_INT, resumeline); + + /* Add the DCON device */ + + dcon_device = platform_device_alloc("dcon", -1); + + if (dcon_device == NULL) { + printk(KERN_ERR "dcon: Unable to create the DCON device\n"); + rc = -ENOMEM; + goto ei2c; + } + + if ((rc = platform_device_add(dcon_device))) { + printk(KERN_ERR "dcon: Unable to add the DCON device\n"); + goto edev; + } + + for(i = 0; i < ARRAY_SIZE(dcon_device_files); i++) + device_create_file(&dcon_device->dev, &dcon_device_files[i]); + + /* Add the DCON backlight device (for use by the backlight engine) */ + + dconbl_device = platform_device_alloc("dcon-bl", -1); + + if (dconbl_device == NULL) { + printk(KERN_ERR "dcon: Unable to create the DCON backlight device\n"); + rc = -ENOMEM; + goto edev; + } + + if ((rc = platform_device_add(dconbl_device))) { + printk(KERN_ERR "dcon: Unable to add the DCON backlight device\n"); + goto ebldev; + } + + dcon_client = client; + gxfb_ioctl_func = gxfb_dcon_ioctl; + + printk(KERN_INFO "gxfb-dcon: Discovered DCON version %x\n", ver & 0xFF); + + return 0; + + ebldev: + platform_device_unregister(dconbl_device); + dconbl_device = NULL; + edev: + platform_device_unregister(dcon_device); + dcon_device = NULL; + ei2c: + i2c_detach_client(client); + eclient: + kfree(client); + + return rc; +} + +static int dcon_attach(struct i2c_adapter *adap) +{ + int ret; + + ret = i2c_probe(adap, &addr_data, dcon_probe); + + if (dcon_client == NULL) + printk(KERN_ERR "gxfb-dcon: No DCON found on SMBus\n"); + + return ret; +} + +static int dcon_detach(struct i2c_client *client) +{ + int rc; + gxfb_ioctl_func = NULL; + dcon_client = NULL; + + if ((rc = i2c_detach_client(client)) == 0) + kfree(i2c_get_clientdata(client)); + + if (dconbl_device != NULL) + platform_device_unregister(dconbl_device); + + if (dcon_device != NULL) + platform_device_unregister(dcon_device); + + return rc; +} + +static struct i2c_driver dcon_driver = { + .driver = { + .name = "DCON", + }, + .id = I2C_DRIVERID_DCON, + .attach_adapter = dcon_attach, + .detach_client = dcon_detach, +}; + + +static int dcon_interrupt(int irq, void *id, struct pt_regs *regs) +{ + unsigned long gin = inl(gpio_base + GPIOx_READ_BACK); + int dconstat = (gin >> 5) & 3; + + /* Clear the negative edge status for GPIO7 */ + outl(1 << 7, gpio_base + GPIOx_NEGEDGE_STS); + + if (dconstat == 2 || dconstat == 1) { + if (dconstat == 2) + printk("IRQ - switch to DCON mode\n"); + else + printk("IRQ - switch to CPU mode\n"); + + dcon_switched = 1; + wake_up(&dcon_wait_queue); + } + + return IRQ_HANDLED; +} + +/* List of GPIOs that we care about: + (in) GPIO12 -- DCONBLNK + (in) GPIO[56] -- DCONSTAT[01] + (out) GPIO11 -- DCONLOAD +*/ + +#define IN_GPIOS ((1<<5) | (1<<6) | (1<<12)) +#define OUT_GPIOS (1<<11) + +int __init gxfb_dcon_init(void) +{ + unsigned long lo, hi; + unsigned char lob; + + rdmsr(MSR_LBAR_GPIO, lo, hi); + + /* Check the mask and whether GPIO is enabled (sanity check) */ + if (hi != 0x0000f001) { + printk(KERN_ERR "GPIO not enabled -- cannot use DCON\n"); + return -ENODEV; + } + + /* Mask off the IO base address */ + gpio_base = lo & 0x0000ff00; + + /* Set the directions for the GPIO pins */ + + outl(OUT_GPIOS | (IN_GPIOS << 16), gpio_base + GPIOx_OUT_EN); + outl(IN_GPIOS | (OUT_GPIOS << 16), gpio_base + GPIOx_IN_EN); + + /* Turn off the event enable for GPIO7 just to be safe */ + outl(1 << (16 + 7), gpio_base + GPIOx_EVNT_EN); + + /* Set up the interrupt mappings first, so we can collect the + * first interrupt when it happens + */ + + hi = inl(gpio_base + GPIO_MAP_X); + hi &= 0x0fffffff; + hi |= 0x70000000; + outl(hi, gpio_base + GPIO_MAP_X); + + /* Don't map the GPIO12 interrupt */ + + hi = inl(gpio_base + GPIO_MAP_Y); + hi &= 0xfff0ffff; + hi |= 0x00000000; + outl(hi, gpio_base + GPIO_MAP_Y); + + /* Enable GPIO IRQ 7 to trigger the PIC interrupt in the Z sources */ + + rdmsr(0x51400023, hi, lo); + hi &= 0x0fffffff; + hi |= (DCON_IRQ << 28); + wrmsrl(0x51400023, hi); + + /* Select edge level for interrupt (in PIC) */ + + lob = inb(0x4d0); + lob &= ~(1 << DCON_IRQ); + outb(lob, 0x4d0); + + /* Register the interupt handler */ + request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", &dcon_driver); + + /* Clear INV_EN for GPIO7 (DCONIRQ) */ + outl((1<<(16+7)), gpio_base + GPIOx_INV_EN); + + /* Enable filter for GPIO12 (DCONBLANK) */ + outl(1<<(12), gpio_base + GPIOx_IN_FLTR_EN); + + /* Disable filter for GPIO7 */ + outl(1<<(16+7), gpio_base + GPIOx_IN_FLTR_EN); + + /* Disable event counter for GPIO7 (DCONIRQ) and GPIO12 (DCONBLANK) */ + + outl(1<<(16+7), gpio_base + GPIOx_EVNTCNT_EN); + outl(1<<(16+12), gpio_base + GPIOx_EVNTCNT_EN); + + /* Add GPIO12 to the Filter Event Pair #7 */ + outb(12, gpio_base + GPIO_FE7_SEL); + + /* Turn off negative Edge Enable for GPIO12 */ + outl(1<<(16+12), gpio_base + GPIOx_NEGEDGE_EN); + + /* Enable negative Edge Enable for GPIO7 */ + outl(1<<7, gpio_base + GPIOx_NEGEDGE_EN); + + /* Zero the filter amount for Filter Event Pair #7 */ + outw(0, gpio_base + GPIO_FLT7_AMNT); + + /* Clear the negative edge status for GPIO7 and GPIO12 */ + outl((1<<7) | (1<<12), gpio_base+0x4c); + + /* FIXME: Clear the posiitive status as well, just to be sure */ + outl((1<<7) | (1<<12), gpio_base+0x48); + + /* Enable events for GPIO7 (DCONIRQ) and GPIO12 (DCONBLANK) */ + outl((1<<(7))|(1<<12), gpio_base + GPIOx_EVNT_EN); + + /* Assert DCONLOAD - this asserts that the CPU is still in control */ + outl(1<<11, gpio_base + GPIOx_OUT_VAL); + + /* Attach the I2C driver */ + i2c_add_driver(&dcon_driver); + + return 0; +} + +void __exit gxfb_dcon_exit(void) +{ + free_irq(DCON_IRQ, &dcon_driver); + i2c_del_driver(&dcon_driver); +} + +module_init(gxfb_dcon_init); +module_exit(gxfb_dcon_exit); + +MODULE_LICENSE("GPL"); diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/gxfb_dcon.h linux-2.6.18.i586/drivers/video/geode/gxfb_dcon.h --- linux-2.6.18.i586.orig/drivers/video/geode/gxfb_dcon.h 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.18.i586/drivers/video/geode/gxfb_dcon.h 2006-10-16 15:57:27.000000000 -0400 @@ -0,0 +1,79 @@ +#ifndef GXFB_DCON_H_ +#define GXFB_DCON_H_ + +/* DCON registers */ + +#define DCON_REG_ID 0 +#define DCON_REG_MODE 1 + +#define MODE_PASSTHRU (1<<0) +#define MODE_SLEEP (1<<1) +#define MODE_SLEEP_AUTO (1<<2) +#define MODE_BL_ENABLE (1<<3) +#define MODE_BLANK (1<<4) +#define MODE_CSWIZZLE (1<<5) +#define MODE_COL_AA (1<<6) +#define MODE_MONO_LUMA (1<<7) +#define MODE_SCAN_INT (1<<8) +#define MODE_CLOCKDIV (1<<9) +#define MODE_DEBUG (1<<14) +#define MODE_SELFTEST (1<<15) + +#define DCON_REG_HRES 2 +#define DCON_REG_HTOTAL 3 +#define DCON_REG_HSYNC_WIDTH 4 +#define DCON_REG_VRES 5 +#define DCON_REG_VTOTAL 6 +#define DCON_REG_VSYNC_WIDTH 7 +#define DCON_REG_TIMEOUT 8 +#define DCON_REG_SCAN_INT 9 +#define DCON_REG_BRIGHT 10 + +/* GPIO registers (CS5536) */ + +#define MSR_LBAR_GPIO 0x5140000C + +#define GPIOx_OUT_VAL 0x00 +#define GPIOx_OUT_EN 0x04 +#define GPIOx_IN_EN 0x20 +#define GPIOx_INV_EN 0x24 +#define GPIOx_IN_FLTR_EN 0x28 +#define GPIOx_EVNTCNT_EN 0x2C +#define GPIOx_READ_BACK 0x30 +#define GPIOx_EVNT_EN 0x38 +#define GPIOx_NEGEDGE_EN 0x44 +#define GPIOx_NEGEDGE_STS 0x4C +#define GPIO_FLT7_AMNT 0xD8 +#define GPIO_MAP_X 0xE0 +#define GPIO_MAP_Y 0xE4 +#define GPIO_FE7_SEL 0xF7 + + +/* Status values */ + +#define DCONSTAT_SCANINT 0 +#define DCONSTAT_SCANINT_DCON 1 +#define DCONSTAT_DISPLAYLOAD 2 +#define DCONSTAT_MISSED 3 + +/* Source values */ + +#define DCON_SOURCE_DCON 0 +#define DCON_SOURCE_CPU 1 + +/* Output values */ +#define DCON_OUTPUT_COLOR 0 +#define DCON_OUTPUT_MONO 1 + +/* Sleep values */ +#define DCON_ACTIVE 0 +#define DCON_SLEEPING 1 + +/* Interrupt */ +#define DCON_IRQ 6 + + +void dcon_set_backlight(int); +int dcon_get_backlight(void); + +#endif diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/Kconfig linux-2.6.18.i586/drivers/video/geode/Kconfig --- linux-2.6.18.i586.orig/drivers/video/geode/Kconfig 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/geode/Kconfig 2006-10-16 15:57:06.000000000 -0400 @@ -23,25 +23,14 @@ config FB_GEODE_GX If unsure, say N. -config FB_GEODE_GX_SET_FBSIZE - bool "Manually specify the Geode GX framebuffer size" +config FB_GEODE_GX_DCON + tristate "One Laptop Per Child Display CONtroller support" depends on FB_GEODE_GX - default n + select I2C ---help--- - If you want to manually specify the size of your GX framebuffer, - say Y here, otherwise say N to dynamically probe it. - - Say N unless you know what you are doing. - -config FB_GEODE_GX_FBSIZE - hex "Size of the GX framebuffer, in bytes" - depends on FB_GEODE_GX_SET_FBSIZE - default "0x1600000" - ---help--- - Specify the size of the GX framebuffer. Normally, you will - want this to be MB aligned. Common values are 0x80000 (8MB) - and 0x1600000 (16MB). Don't change this unless you know what - you are doing + Add support fo the OLPC DCON controller. This controller is only + available on OLPC platforms. Unless you have one of these + platforms,you will want to say 'N'. config FB_GEODE_GX1 tristate "AMD Geode GX1 framebuffer support (EXPERIMENTAL)" diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/Makefile linux-2.6.18.i586/drivers/video/geode/Makefile --- linux-2.6.18.i586.orig/drivers/video/geode/Makefile 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/geode/Makefile 2006-10-16 15:57:06.000000000 -0400 @@ -3,5 +3,7 @@ obj-$(CONFIG_FB_GEODE_GX1) += gx1fb.o obj-$(CONFIG_FB_GEODE_GX) += gxfb.o +obj-$(CONFIG_FB_GEODE_GX_DCON) += gxfb_dcon.o + gx1fb-objs := gx1fb_core.o display_gx1.o video_cs5530.o gxfb-objs := gxfb_core.o display_gx.o video_gx.o diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/video_gx.c linux-2.6.18.i586/drivers/video/geode/video_gx.c --- linux-2.6.18.i586.orig/drivers/video/geode/video_gx.c 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/geode/video_gx.c 2006-10-16 15:57:06.000000000 -0400 @@ -19,6 +19,7 @@ #include "geodefb.h" #include "video_gx.h" +#include "display_gx.h" /* @@ -289,6 +290,77 @@ static void gx_configure_display(struct gx_configure_tft(info); } +/* This is a speedier way to power down the graphics engine - + it is intended to be called through the blanking infrastructure below + but also to be called by things like the DCON driver +*/ + +static int gxfb_powered_down; +unsigned long gx_pm_regs[5]; + +#define VC_VCFG 0 +#define VC_DCFG 1 +#define VC_FP_PM 2 +#define DC_GCFG 3 +#define DC_DCFG 4 + +int gxfb_powerdown(struct fb_info *info) { + + struct geodefb_par *par = info->par; + + /* Bail if we have already saved our state and powered down */ + if (gxfb_powered_down == 1) + return 0; + + /* Disable the video hardware */ + gx_pm_regs[VC_VCFG] = readl(par->vid_regs + GX_VCFG); + writel(gx_pm_regs[VC_VCFG] & ~0x01, par->vid_regs + GX_VCFG); + + /* Black the dacs, turn off horiz / vert sync and turn off crt */ + gx_pm_regs[VC_DCFG] = readl(par->vid_regs + GX_DCFG); + writel(gx_pm_regs[VC_DCFG] & ~0x0F, par->vid_regs + GX_DCFG); + + /* Turn off the flat panel */ + gx_pm_regs[VC_FP_PM] = readl(par->vid_regs + GX_FP_PM); + writel(gx_pm_regs[VC_FP_PM] & ~GX_FP_PM_P, par->vid_regs + GX_FP_PM); + + /* Unlock the DC - this will remain unlocked until power up */ + writel(0x4758, par->dc_regs + DC_UNLOCK); + + /* Disable video, icon, cursor and the FIFO */ + gx_pm_regs[DC_GCFG] = readl(par->dc_regs + DC_GENERAL_CFG); + writel(gx_pm_regs[DC_GCFG] & ~0x0F, par->dc_regs + DC_GENERAL_CFG); + + /* Disable video data enable, graphics data enable and the timing generator */ + gx_pm_regs[DC_DCFG] = readl(par->dc_regs + DC_DISPLAY_CFG); + writel(gx_pm_regs[DC_DCFG] & ~0x19, par->dc_regs + DC_DISPLAY_CFG); + + gxfb_powered_down = 1; + + return 0; +} + +int gxfb_powerup(struct fb_info *info) { + + struct geodefb_par *par = info->par; + + if (gxfb_powered_down == 0) + return 0; + + writel(gx_pm_regs[VC_VCFG], par->vid_regs + GX_VCFG); + writel(gx_pm_regs[VC_DCFG], par->vid_regs + GX_DCFG); + writel(gx_pm_regs[VC_FP_PM], par->vid_regs + GX_FP_PM); + writel(gx_pm_regs[DC_DCFG], par->dc_regs + DC_DISPLAY_CFG); + + /* Do this one last because it will turn on the FIFO which will start the line count */ + writel(gx_pm_regs[DC_GCFG], par->dc_regs + DC_GENERAL_CFG); + + writel(0x0, par->dc_regs + DC_UNLOCK); + + gxfb_powered_down = 0; + return 0; +} + static int gx_blank_display(struct fb_info *info, int blank_mode) { struct geodefb_par *par = info->par; @@ -315,6 +387,7 @@ static int gx_blank_display(struct fb_in default: return -EINVAL; } + dcfg = readl(par->vid_regs + GX_DCFG); dcfg &= ~(GX_DCFG_DAC_BL_EN | GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN); @@ -326,7 +399,7 @@ static int gx_blank_display(struct fb_in dcfg |= GX_DCFG_VSYNC_EN; writel(dcfg, par->vid_regs + GX_DCFG); - /* Power on/off flat panel. */ + /* Power on/off flat panel */ if (par->enable_crt == 0) { fp_pm = readl(par->vid_regs + GX_FP_PM); @@ -345,3 +418,9 @@ struct geode_vid_ops gx_vid_ops = { .configure_display = gx_configure_display, .blank_display = gx_blank_display, }; + +/* We define these as special hooks for the DCON driver to hook into */ + +EXPORT_SYMBOL(gxfb_powerdown); +EXPORT_SYMBOL(gxfb_powerup); + diff -Nur -p linux-2.6.18.i586.orig/drivers/video/geode/video_gx.h linux-2.6.18.i586/drivers/video/geode/video_gx.h --- linux-2.6.18.i586.orig/drivers/video/geode/video_gx.h 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/geode/video_gx.h 2006-10-16 15:57:06.000000000 -0400 @@ -20,6 +20,8 @@ extern struct geode_vid_ops gx_vid_ops; /* Geode GX video processor registers */ +#define GX_VCFG 0x0000 + #define GX_DCFG 0x0008 # define GX_DCFG_CRT_EN 0x00000001 # define GX_DCFG_HSYNC_EN 0x00000002 diff -Nur -p linux-2.6.18.i586.orig/drivers/video/modedb.c linux-2.6.18.i586/drivers/video/modedb.c --- linux-2.6.18.i586.orig/drivers/video/modedb.c 2006-10-16 15:56:30.000000000 -0400 +++ linux-2.6.18.i586/drivers/video/modedb.c 2006-10-16 15:56:58.000000000 -0400 @@ -506,7 +506,9 @@ int fb_find_mode(struct fb_var_screeninf dbsize = ARRAY_SIZE(modedb); } if (!default_mode) - default_mode = &modedb[DEFAULT_MODEDB_INDEX]; + default_mode = (db == modedb) ? + &modedb[DEFAULT_MODEDB_INDEX] : &db[0]; + if (!default_bpp) default_bpp = 8; diff -Nur -p linux-2.6.18.i586.orig/include/linux/i2c-id.h linux-2.6.18.i586/include/linux/i2c-id.h --- linux-2.6.18.i586.orig/include/linux/i2c-id.h 2006-10-16 15:56:29.000000000 -0400 +++ linux-2.6.18.i586/include/linux/i2c-id.h 2006-10-16 15:57:06.000000000 -0400 @@ -116,6 +116,7 @@ #define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ #define I2C_DRIVERID_ISL1208 88 /* Intersil ISL1208 RTC */ +#define I2C_DRIVERID_DCON 89 #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ linux-2.6-power6-no-ci-large-page.patch: cputable.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-power6-no-ci-large-page.patch --- diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 12707ab..afdd0b2 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h @@ -328,7 +328,7 @@ #define CPU_FTRS_POWER6 (CPU_FTR_SPLIT_I CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ CPU_FTR_MMCRA | CPU_FTR_SMT | \ CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \ - CPU_FTR_PURR | CPU_FTR_CI_LARGE_PAGE | CPU_FTR_REAL_LE) + CPU_FTR_PURR | CPU_FTR_REAL_LE) #define CPU_FTRS_CELL (CPU_FTR_SPLIT_ID_CACHE | CPU_FTR_USE_TB | \ CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ linux-2.6-sha_alignment.patch: sha1.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-sha_alignment.patch --- Patch to fix unaligned access during module loads. Tested by Doug (dchapman at redhat.com) on HP ia64 boxes, and by me on SGI ia64 box. Additionally tested by me on x86_64. Addresses and resolves BZ 210013. Signed-off-by: Prarit Bhargava Signed-off-by: Doug Chapman --- linux-2.6.17.ia64/lib/sha1.c.orig 2006-09-19 17:07:59.000000000 -0400 +++ linux-2.6.17.ia64/lib/sha1.c 2006-09-19 17:07:48.000000000 -0400 @@ -3,6 +3,7 @@ * Peter Gutmann, and placed in the public domain. */ +#include #include #include #include @@ -41,7 +42,7 @@ __u32 a, b, c, d, e, t, i; for (i = 0; i < 16; i++) - W[i] = be32_to_cpu(((const __be32 *)in)[i]); + W[i] = be32_to_cpu(get_unaligned((const __be32 *)in+i)); for (i = 0; i < 64; i++) W[i+16] = rol32(W[i+13] ^ W[i+8] ^ W[i+2] ^ W[i], 1); linux-2.6-sysprof-1.0.3.patch: Kconfig | 2 Makefile | 2 sysprof/Kconfig | 12 ++ sysprof/Makefile | 1 sysprof/config.h | 23 ++++ sysprof/sysprof-module.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++ sysprof/sysprof-module.h | 37 ++++++ 7 files changed, 328 insertions(+) --- NEW FILE linux-2.6-sysprof-1.0.3.patch --- diff -Nur linux-2.6/drivers.orig/Kconfig linux-2.6/drivers/Kconfig --- linux-2.6/drivers.orig/Kconfig 2006-10-23 15:47:27.000000000 -0200 +++ linux-2.6/drivers/Kconfig 2006-10-23 15:52:58.000000000 -0200 @@ -76,4 +76,6 @@ source "drivers/dma/Kconfig" +source "drivers/sysprof/Kconfig" + endmenu diff -Nur linux-2.6/drivers.orig/Makefile linux-2.6/drivers/Makefile --- linux-2.6/drivers.orig/Makefile 2006-10-23 15:48:08.000000000 -0200 +++ linux-2.6/drivers/Makefile 2006-10-23 15:53:19.000000000 -0200 @@ -21,6 +21,8 @@ obj-$(CONFIG_CONNECTOR) += connector/ +obj-$(CONFIG_SYSPROF) += sysprof/ + # i810fb and intelfb depend on char/agp/ obj-$(CONFIG_FB_I810) += video/i810/ obj-$(CONFIG_FB_INTEL) += video/intelfb/ diff -Nur linux-2.6/drivers.orig/sysprof/config.h linux-2.6/drivers/sysprof/config.h --- linux-2.6/drivers.orig/sysprof/config.h 1969-12-31 21:00:00.000000000 -0300 +++ linux-2.6/drivers/sysprof/config.h 2006-10-23 16:18:03.000000000 -0200 @@ -0,0 +1,23 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Look for global separate debug info in this path */ +#define DEBUGDIR "/usr/local/lib/debug" + +/* Define to 1 if you have the `iberty' library (-liberty). */ +/* #undef HAVE_LIBIBERTY */ + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "sysprof" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "sysprof 1.0.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "sysprof" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.3" diff -Nur linux-2.6/drivers.orig/sysprof/Kconfig linux-2.6/drivers/sysprof/Kconfig --- linux-2.6/drivers.orig/sysprof/Kconfig 1969-12-31 21:00:00.000000000 -0300 +++ linux-2.6/drivers/sysprof/Kconfig 2006-10-23 16:14:28.000000000 -0200 @@ -0,0 +1,12 @@ + +menu "Sysprof" + +config SYSPROF + tristate "Sysprof support" + help + Say M here to include the sysprof-module. + + Sysprof is a sampling profiler that uses a kernel module, + sysprof-module, to generate stacktraces which are then interpreted by + the userspace program "sysprof". +endmenu diff -Nur linux-2.6/drivers.orig/sysprof/Makefile linux-2.6/drivers/sysprof/Makefile --- linux-2.6/drivers.orig/sysprof/Makefile 1969-12-31 21:00:00.000000000 -0300 +++ linux-2.6/drivers/sysprof/Makefile 2006-10-23 15:52:44.000000000 -0200 @@ -0,0 +1 @@ +obj-$(CONFIG_SYSPROF) += sysprof-module.o diff -Nur linux-2.6/drivers.orig/sysprof/sysprof-module.c linux-2.6/drivers/sysprof/sysprof-module.c --- linux-2.6/drivers.orig/sysprof/sysprof-module.c 1969-12-31 21:00:00.000000000 -0300 +++ linux-2.6/drivers/sysprof/sysprof-module.c 2006-10-23 16:22:54.000000000 -0200 @@ -0,0 +1,251 @@ +/* -*- c-basic-offset: 8 -*- */ + +/* Sysprof -- Sampling, systemwide CPU profiler + * Copyright 2004, Red Hat, Inc. + * Copyright 2004, 2005, Soeren Sandmann + * + * 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 /* Needed for KERN_ALERT */ +#include /* Needed by all modules */ +#include + +#if !CONFIG_PROFILING +# error Sysprof needs a kernel with profiling support compiled in. +#endif +#ifdef CONFIG_SMP +# define __SMP__ +#endif + +#include +#include +#include +#include +#include +#include + +#include "sysprof-module.h" + +#include "config.h" + +#include +#if KERNEL_VERSION(2,6,11) > LINUX_VERSION_CODE +# error Sysprof needs a Linux 2.6.11 kernel or later +#endif +#include + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Soeren Sandmann (sandmann at daimi.au.dk)"); + +#define SAMPLES_PER_SECOND (200) +#define INTERVAL ((HZ <= SAMPLES_PER_SECOND)? 1 : (HZ / SAMPLES_PER_SECOND)) +#define N_TRACES 256 + +static SysprofStackTrace stack_traces[N_TRACES]; +static SysprofStackTrace * head = &stack_traces[0]; +static SysprofStackTrace * tail = &stack_traces[0]; +DECLARE_WAIT_QUEUE_HEAD (wait_for_trace); +DECLARE_WAIT_QUEUE_HEAD (wait_for_exit); + +/* Macro the names of the registers that are used on each architecture */ +#if defined(CONFIG_X86_64) +# define REG_FRAME_PTR rbp +# define REG_INS_PTR rip +# define REG_STACK_PTR rsp +#elif defined(CONFIG_X86) +# define REG_FRAME_PTR ebp +# define REG_INS_PTR eip +# define REG_STACK_PTR esp +#else +# error Sysprof only supports the i386 and x86-64 architectures +#endif + +typedef struct userspace_reader userspace_reader; +struct userspace_reader +{ + struct task_struct *task; + unsigned long cache_address; + unsigned long *cache; +}; + +typedef struct StackFrame StackFrame; +struct StackFrame { + unsigned long next; + unsigned long return_address; +}; + +struct work_struct work; + +static int +read_frame (void *frame_pointer, StackFrame *frame) +{ +#if 0 + /* This is commented out because we seem to be called with + * (current_thread_info()->addr_limit.seg)) == 0 + * which means access_ok() _always_ fails. + * + * Not sure why (or if) this isn't the case for oprofile + */ + if (!access_ok(VERIFY_READ, frame_pointer, sizeof(StackFrame))) + return 1; +#endif + + if (__copy_from_user_inatomic ( + frame, frame_pointer, sizeof (StackFrame))) + return 2; + + return 0; +} + +static int +timer_notify (struct pt_regs *regs) +{ + static int n_samples; + struct SysprofStackTrace *trace = head; + int i; + int is_user; + + if ((n_samples++ % INTERVAL) != 0) + return 0; + + is_user = user_mode(regs); + + if (!current || current->pid == 0) + return 0; + + if (is_user && current->state != TASK_RUNNING) + return 0; + + if (!is_user) + { + /* kernel */ + + trace->pid = current->pid; + trace->truncated = 0; + trace->n_addresses = 1; + + /* 0x1 is taken by sysprof to mean "in kernel" */ + trace->addresses[0] = (void *)0x1; + } + else + { + StackFrame *frame_pointer; + StackFrame frame; + memset(trace, 0, sizeof (SysprofStackTrace)); + + trace->pid = current->pid; + trace->truncated = 0; + + i = 0; + + trace->addresses[i++] = (void *)regs->REG_INS_PTR; + + frame_pointer = (void *)regs->REG_FRAME_PTR; + + while (read_frame (frame_pointer, &frame) == 0 && + i < SYSPROF_MAX_ADDRESSES && + (unsigned long)frame_pointer >= regs->REG_STACK_PTR) + { + trace->addresses[i++] = (void *)frame.return_address; + frame_pointer = (StackFrame *)frame.next; + } + + trace->n_addresses = i; + + if (i == SYSPROF_MAX_ADDRESSES) + trace->truncated = 1; + else + trace->truncated = 0; + } + + if (head++ == &stack_traces[N_TRACES - 1]) + head = &stack_traces[0]; + + wake_up (&wait_for_trace); + + return 0; +} + +static int +procfile_read(char *buffer, + char **buffer_location, + off_t offset, + int buffer_len, + int *eof, + void *data) +{ + if (head == tail) + return -EWOULDBLOCK; + + *buffer_location = (char *)tail; + + if (tail++ == &stack_traces[N_TRACES - 1]) + tail = &stack_traces[0]; + + return sizeof (SysprofStackTrace); +} + +struct proc_dir_entry *trace_proc_file; +static unsigned int +procfile_poll(struct file *filp, poll_table *poll_table) +{ + if (head != tail) + return POLLIN | POLLRDNORM; + + poll_wait(filp, &wait_for_trace, poll_table); + + if (head != tail) + return POLLIN | POLLRDNORM; + + return 0; +} + +int +init_module(void) +{ + static struct file_operations fops; + + trace_proc_file = + create_proc_entry ("sysprof-trace", S_IFREG | S_IRUGO, &proc_root); + + if (!trace_proc_file) + return 1; + + fops = *trace_proc_file->proc_fops; + fops.poll = procfile_poll; + + trace_proc_file->read_proc = procfile_read; + trace_proc_file->proc_fops = &fops; + trace_proc_file->size = sizeof (SysprofStackTrace); + + register_timer_hook (timer_notify); + + printk(KERN_ALERT "sysprof: loaded (%s)\n", PACKAGE_VERSION); + + return 0; +} + +void +cleanup_module(void) +{ + unregister_timer_hook (timer_notify); + + remove_proc_entry("sysprof-trace", &proc_root); + + printk(KERN_ALERT "sysprof: unloaded\n"); +} + diff -Nur linux-2.6/drivers.orig/sysprof/sysprof-module.h linux-2.6/drivers/sysprof/sysprof-module.h --- linux-2.6/drivers.orig/sysprof/sysprof-module.h 1969-12-31 21:00:00.000000000 -0300 +++ linux-2.6/drivers/sysprof/sysprof-module.h 2006-10-23 16:23:27.000000000 -0200 @@ -0,0 +1,37 @@ +/* Sysprof -- Sampling, systemwide CPU profiler + * Copyright 2004, Red Hat, Inc. + * Copyright 2004, 2005, Soeren Sandmann + * + * 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 SYSPROF_MODULE_H +#define SYSPROF_MODULE_H + +typedef struct SysprofStackTrace SysprofStackTrace; + +#define SYSPROF_MAX_ADDRESSES 512 + +struct SysprofStackTrace +{ + int pid; /* -1 if in kernel */ + int truncated; + int n_addresses; /* note: this can be 1 if the process was compiled + * with -fomit-frame-pointer or is otherwise weird + */ + void *addresses[SYSPROF_MAX_ADDRESSES]; +}; + +#endif linux-2.6-xfs_attr2.patch: xfs_attr.c | 19 +++++++++++-------- xfs_attr_leaf.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- xfs_bmap.c | 1 + 3 files changed, 54 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6-xfs_attr2.patch --- Log: Fix attr2 corruption with btree data extents Merge of xfs-linux-melb:xfs-kern:27792a by kenmcd. ------------------------------------------------- Fix up initial creation of shortform attributes Members: xfs_attr.c:1.140->1.141 ------------------------------------------------- Lock forkoff when data extent is in btree form. Members: xfs_bmap.c:1.359->1.360 ------------------------------------------------- Lock forkoff when data extent is in btree form. Also allow more space for attr if extents must convert to btree form. Members: xfs_attr_leaf.c:1.104->1.105 Signed-off-by: Barry Naujok Signed-off-by: Timothy Shimmin Signed-off-by: Russell Cattelan Signed-off-by: Eric Sandeen Index: linux-2.6.18.noarch/fs/xfs/xfs_attr.c =================================================================== --- linux-2.6.18.noarch.orig/fs/xfs/xfs_attr.c 2006-09-19 23:42:06.000000000 -0400 +++ linux-2.6.18.noarch/fs/xfs/xfs_attr.c 2006-12-21 18:34:12.864403389 -0500 @@ -200,18 +200,14 @@ xfs_attr_set_int(xfs_inode_t *dp, const return (error); /* - * Determine space new attribute will use, and if it would be - * "local" or "remote" (note: local != inline). - */ - size = xfs_attr_leaf_newentsize(namelen, valuelen, - mp->m_sb.sb_blocksize, &local); - - /* * If the inode doesn't have an attribute fork, add one. * (inode must not be locked when we call this routine) */ if (XFS_IFORK_Q(dp) == 0) { - if ((error = xfs_bmap_add_attrfork(dp, size, rsvd))) + int sf_size = sizeof(xfs_attr_sf_hdr_t) + + XFS_ATTR_SF_ENTSIZE_BYNAME(namelen, valuelen); + + if ((error = xfs_bmap_add_attrfork(dp, sf_size, rsvd))) return(error); } @@ -232,6 +228,13 @@ xfs_attr_set_int(xfs_inode_t *dp, const args.addname = 1; args.oknoent = 1; + /* + * Determine space new attribute will use, and if it would be + * "local" or "remote" (note: local != inline). + */ + size = xfs_attr_leaf_newentsize(namelen, valuelen, + mp->m_sb.sb_blocksize, &local); + nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); if (local) { if (size > (mp->m_sb.sb_blocksize >> 1)) { Index: linux-2.6.18.noarch/fs/xfs/xfs_attr_leaf.c =================================================================== --- linux-2.6.18.noarch.orig/fs/xfs/xfs_attr_leaf.c 2006-09-19 23:42:06.000000000 -0400 +++ linux-2.6.18.noarch/fs/xfs/xfs_attr_leaf.c 2006-12-21 18:34:12.936404440 -0500 @@ -113,6 +113,7 @@ xfs_attr_shortform_bytesfit(xfs_inode_t int offset; int minforkoff; /* lower limit on valid forkoff locations */ int maxforkoff; /* upper limit on valid forkoff locations */ + int dsize; xfs_mount_t *mp = dp->i_mount; offset = (XFS_LITINO(mp) - bytes) >> 3; /* rounded down */ @@ -132,8 +133,43 @@ xfs_attr_shortform_bytesfit(xfs_inode_t return 0; } - /* data fork btree root can have at least this many key/ptr pairs */ - minforkoff = MAX(dp->i_df.if_bytes, XFS_BMDR_SPACE_CALC(MINDBTPTRS)); + dsize = dp->i_df.if_bytes; + + switch (dp->i_d.di_format) { + case XFS_DINODE_FMT_EXTENTS: + /* + * If there is no attr fork and the data fork is extents, + * determine if creating the default attr fork will result + * in the extents form migrating to btree. If so, the + * minimum offset only needs to be the space required for + * the btree root. + */ + if (!dp->i_d.di_forkoff && dp->i_df.if_bytes > mp->m_attroffset) + dsize = XFS_BMDR_SPACE_CALC(MINDBTPTRS); + break; + + case XFS_DINODE_FMT_BTREE: + /* + * If have data btree then keep forkoff if we have one, + * otherwise we are adding a new attr, so then we set + * minforkoff to where the btree root can finish so we have + * plenty of room for attrs + */ + if (dp->i_d.di_forkoff) { + if (offset < dp->i_d.di_forkoff) + return 0; + else + return dp->i_d.di_forkoff; + } else + dsize = XFS_BMAP_BROOT_SPACE(dp->i_df.if_broot); + break; + } + + /* + * A data fork btree root must have space for at least + * MINDBTPTRS key/ptr pairs if the data fork is small or empty. + */ + minforkoff = MAX(dsize, XFS_BMDR_SPACE_CALC(MINDBTPTRS)); minforkoff = roundup(minforkoff, 8) >> 3; /* attr fork btree root can have at least this many key/ptr pairs */ @@ -308,7 +344,8 @@ xfs_attr_shortform_remove(xfs_da_args_t */ totsize -= size; if (totsize == sizeof(xfs_attr_sf_hdr_t) && !args->addname && - (mp->m_flags & XFS_MOUNT_ATTR2)) { + (mp->m_flags & XFS_MOUNT_ATTR2) && + (dp->i_d.di_format != XFS_DINODE_FMT_BTREE)) { /* * Last attribute now removed, revert to original * inode format making all literal area available @@ -729,6 +766,7 @@ xfs_attr_shortform_allfit(xfs_dabuf_t *b + be16_to_cpu(name_loc->valuelen); } if ((dp->i_mount->m_flags & XFS_MOUNT_ATTR2) && + (dp->i_d.di_format != XFS_DINODE_FMT_BTREE) && (bytes == sizeof(struct xfs_attr_sf_hdr))) return(-1); return(xfs_attr_shortform_bytesfit(dp, bytes)); @@ -767,6 +805,7 @@ xfs_attr_leaf_to_shortform(xfs_dabuf_t * if (forkoff == -1) { ASSERT(dp->i_mount->m_flags & XFS_MOUNT_ATTR2); + ASSERT(dp->i_d.di_format != XFS_DINODE_FMT_BTREE); /* * Last attribute was removed, revert to original Index: linux-2.6.18.noarch/fs/xfs/xfs_bmap.c =================================================================== --- linux-2.6.18.noarch.orig/fs/xfs/xfs_bmap.c 2006-09-19 23:42:06.000000000 -0400 +++ linux-2.6.18.noarch/fs/xfs/xfs_bmap.c 2006-12-21 18:34:12.932404381 -0500 @@ -3541,6 +3541,7 @@ xfs_bmap_forkoff_reset( if (whichfork == XFS_ATTR_FORK && (ip->i_d.di_format != XFS_DINODE_FMT_DEV) && (ip->i_d.di_format != XFS_DINODE_FMT_UUID) && + (ip->i_d.di_format != XFS_DINODE_FMT_BTREE) && ((mp->m_attroffset >> 3) > ip->i_d.di_forkoff)) { ip->i_d.di_forkoff = mp->m_attroffset >> 3; ip->i_df.if_ext_max = XFS_IFORK_DSIZE(ip) / --- NEW FILE linux-2.6.19.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFbg6fyGugalF9Dw4RAtsXAJ0cHgRP7Kt0I4MA1Y3NAPWKnHOBWgCeKmfd lrpzTJPFKb3GqlMcF4FVE8o= =/nzH -----END PGP SIGNATURE----- Index: merge.pl =================================================================== RCS file: merge.pl diff -N merge.pl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ merge.pl 31 Jan 2007 15:26:15 -0000 1.8 @@ -0,0 +1,66 @@ +#! /usr/bin/perl + +my @args=@ARGV; +my %configvalues; +my @configoptions; +my $configcounter = 0; + +# optionally print out the architecture as the first line of our output +my $arch = $args[2]; +if (defined $arch) { + print "# $arch\n"; +} + +# first, read the override file + +open (FILE,"$args[0]") || die "Could not open $args[0]"; +while () { + my $str = $_; + my $configname; + + if (/\# ([\w]+) is not set/) { + $configname = $1; + } elsif (/([\w]+)=/) { + $configname = $1; + } + + if (defined($configname) && !exists($configvalues{$configname})) { + $configvalues{$configname} = $str; + $configoptions[$configcounter] = $configname; + $configcounter ++; + } +}; + +# now, read and output the entire configfile, except for the overridden +# parts... for those the new value is printed. + +open (FILE2,"$args[1]") || die "Could not open $args[1]"; +while () { + my $configname; + + if (/\# ([\w]+) is not set/) { + $configname = $1; + } elsif (/([\w]+)=/) { + $configname = $1; + } + + if (defined($configname) && exists($configvalues{$configname})) { + print "$configvalues{$configname}"; + delete($configvalues{$configname}); + } else { + print "$_"; + } +} + +# now print the new values from the overridden configfile +my $counter = 0; + +while ($counter < $configcounter) { + my $configname = $configoptions[$counter]; + if (exists($configvalues{$configname})) { + print "$configvalues{$configname}"; + } + $counter++; +} + +1; --- NEW FILE patch-2.6.19.2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFpWcCyGugalF9Dw4RAqGeAJoD6v1U+MgnoniDfjHAYafKBX20DgCggC/f kUGKdJ29G42xSOVuMycmmr8= =tf7q -----END PGP SIGNATURE----- Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2263 retrieving revision 1.2264 diff -u -r1.2263 -r1.2264 --- kernel-2.6.spec 30 Jan 2007 19:14:18 -0000 1.2263 +++ kernel-2.6.spec 31 Jan 2007 15:26:14 -0000 1.2264 @@ -4,23 +4,33 @@ # These are the kernels that are built IF the architecture allows it. %define buildup 1 +# Only used on archs without run-time support (ie ppc, sparc64) %define buildsmp 0 +%define buildpae 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 1 %define builddoc 0 %define buildkdump 1 +%define buildheaders 0 +%define builddebug 0 # Versions of various parts +# After branching, please hardcode these values as the +# %dist and %rhel tags are not reliable yet +# For example dist -> .el5 and rhel -> 5 +#% define dist .XX +#% define rhel Y + # # Polite request for people who spin their own kernel rpms: # please modify the "release" field in a way that identifies # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 18 +%define sublevel 19 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})%{?dist} @@ -33,38 +43,66 @@ %define xen_image vmlinuz %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} +%define hdrarch %_target_cpu # groups of related archs -%define all_x86 i586 i686 +#OLPC stuff +%if 0%{?olpc} +%define buildxen 0 +%define buildkdump 0 +%endif +# Don't build 586 kernels for RHEL builds. +%if 0%{?rhel} +%define all_x86 i386 i686 +# we differ here b/c of the reloc patches +%ifarch i686 x86_64 +%define buildkdump 0 +%endif +%else +%define all_x86 i386 i586 i686 +%endif # Override generic defaults with per-arch defaults %ifarch noarch %define builddoc 1 %define buildup 0 +%define buildheaders 0 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config %endif -# Xen and kdump only build on i686 and x86_64 ... -%ifnarch i686 x86_64 -%define buildxen 0 +# Do debug builds on i686, x86_64 +%ifarch i686 x86_64 +%define builddebug 1 +%endif + +# kdump only builds on i686, x86_64, ppc64 ... +%ifnarch i686 x86_64 ppc64 ppc64iseries %define buildkdump 0 %endif -%ifarch ppc64 -%define buildkdump 1 +# Xen only builds on i686, x86_64 and ia64 ... +%ifnarch i686 x86_64 ia64 +%define buildxen 0 %endif # Second, per-architecture exclusions (ifarch) +%ifarch ppc64iseries i686 i586 +%define buildheaders 0 +%endif + %ifarch %{all_x86} %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config %define image_install_path boot %define signmodules 1 +%define hdrarch i386 %endif %ifarch i586 i686 %define buildsmp 1 +# we build always xen HV with pae +%define xen_flags verbose=y crash_debug=y pae=y %endif %ifarch x86_64 @@ -73,20 +111,14 @@ %define signmodules 1 %endif -%ifarch ppc64 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config -%define image_install_path boot -%define signmodules 1 -%define make_target vmlinux -%define kernel_image vmlinux -%endif - -%ifarch ppc64iseries +%ifarch ppc64 ppc64iseries %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config %define image_install_path boot %define signmodules 1 %define make_target vmlinux %define kernel_image vmlinux +%define kernel_image_elf 1 +%define hdrarch powerpc %endif %ifarch s390 @@ -101,6 +133,7 @@ %define image_install_path boot %define make_target image %define kernel_image arch/s390/boot/image +%define hdrarch s390 %endif %ifarch sparc @@ -117,21 +150,47 @@ %endif %ifarch ppc -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc*.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc{-,.}*config %define image_install_path boot %define make_target vmlinux %define kernel_image vmlinux +%define kernel_image_elf 1 %define buildsmp 1 +%define hdrarch powerpc %endif %ifarch ia64 -%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config +%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config %define image_install_path boot/efi/EFI/redhat %define signmodules 1 %define make_target compressed %define kernel_image vmlinux.gz +# ia64 xen HV doesn't building with debug=y at the moment +%define xen_flags verbose=y crash_debug=y +%define xen_target compressed +%define xen_image vmlinux.gz %endif +# To temporarily exclude an architecture from being built, add it to +# %nobuildarches. Do _NOT_ use the ExclusiveArch: line, because if we +# don't build kernel-headers then the new build system will no longer let +# us use the previous build of that package -- it'll just be completely AWOL. +# Which is a BadThing(tm). + +# We don't build a kernel on i386 or s390x -- we only do kernel-headers there. +# We also don't support s390, iseries and ia64 on Fedora. +%define nobuildarches i386 s390 s390x ppc64iseries ia64 + +%ifarch %nobuildarches +%define buildup 0 +%define buildsmp 0 +%define buildpae 0 +%define buildxen 0 +%define buildkdump 0 +%define _enable_debug_packages 0 +%endif + + # # Three sets of minimum package version requirements in the form of Conflicts: # to versions below the minimum @@ -167,9 +226,14 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 +%if 0%{?olpc} +ExclusiveArch: i386 i586 +%else +# DO NOT CHANGE THIS LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. +# SET %nobuildarches (ABOVE) INSTEAD +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries ia64 sparc sparc64 s390 s390x +%endif ExclusiveOS: Linux -Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release} Prereq: %{kernel_prereq} @@ -178,7 +242,6 @@ # 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 - # KMP - We need this for the moment #AutoReqProv: no AutoReqProv: yes @@ -188,8 +251,14 @@ # List the packages used during the kernel build # BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar -BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, diffutils +BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils +%if %{signmodules} +BuildPreReq: gnupg +%endif BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config +%if %{buildheaders} +BuildRequires: unifdef +%endif BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -199,43 +268,54 @@ Source10: COPYING.modules Source11: genkey +Source12: kabitool +Source14: find-provides +Source15: merge.pl Source20: kernel-%{kversion}-i586.config Source21: kernel-%{kversion}-i586-smp.config Source22: kernel-%{kversion}-i686.config -Source23: kernel-%{kversion}-i686-smp.config -Source24: kernel-%{kversion}-i686-kdump.config - -Source25: kernel-%{kversion}-x86_64.config -Source26: kernel-%{kversion}-x86_64-kdump.config - -Source27: kernel-%{kversion}-ppc.config -Source28: kernel-%{kversion}-ppc-smp.config -Source29: kernel-%{kversion}-ppc64.config -Source30: kernel-%{kversion}-ppc64iseries.config -Source31: kernel-%{kversion}-ppc64-kdump.config - -Source32: kernel-%{kversion}-s390.config -Source33: kernel-%{kversion}-s390x.config - -Source34: kernel-%{kversion}-ia64.config - -Source35: kernel-%{kversion}-i686-xen0.config -Source36: kernel-%{kversion}-i686-xenU.config -Source37: kernel-%{kversion}-i686-xen.config -Source38: kernel-%{kversion}-x86_64-xen0.config -Source49: kernel-%{kversion}-x86_64-xenU.config -Source40: kernel-%{kversion}-x86_64-xen.config +Source23: kernel-%{kversion}-i686-debug.config +Source24: kernel-%{kversion}-i686-smp.config +Source25: kernel-%{kversion}-i686-kdump.config + +Source26: kernel-%{kversion}-x86_64.config +Source27: kernel-%{kversion}-x86_64-debug.config +Source28: kernel-%{kversion}-x86_64-kdump.config + +Source29: kernel-%{kversion}-ppc.config +Source30: kernel-%{kversion}-ppc-smp.config +Source31: kernel-%{kversion}-ppc64.config +Source32: kernel-%{kversion}-ppc64iseries.config +Source33: kernel-%{kversion}-ppc64-kdump.config + +Source34: kernel-%{kversion}-s390.config +Source35: kernel-%{kversion}-s390x.config + +Source36: kernel-%{kversion}-ia64.config + +Source37: kernel-%{kversion}-i686-xen0.config +Source38: kernel-%{kversion}-i686-xenU.config +Source39: kernel-%{kversion}-i686-xen.config +Source40: kernel-%{kversion}-x86_64-xen0.config +Source41: kernel-%{kversion}-x86_64-xenU.config +Source42: kernel-%{kversion}-x86_64-xen.config #Source66: kernel-%{kversion}-sparc.config #Source67: kernel-%{kversion}-sparc64.config #Source68: kernel-%{kversion}-sparc64-smp.config +Source80: config-rhel-generic +Source81: config-rhel-x86-generic +Source82: config-olpc-generic + # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.18.6.bz2 -Patch4: git-agpgart.patch +Patch1: patch-2.6.19.2.bz2 + +# Patches 10 through 99 are for things that are going upstream really soon. +#Patch10: linux-2.6-utrace.patch # enable sysrq-c on all kernels, not only kexec Patch20: linux-2.6-sysrq-c.patch @@ -249,17 +329,14 @@ Patch202: linux-2.6-x86-64-edac-support.patch Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch Patch204: linux-2.6-x86-apic-auto.patch -Patch207: linux-2.6-x86_64-tif-restore-sigmask.patch -Patch208: linux-2.6-x86_64-add-ppoll-pselect.patch -Patch211: linux-2.6-x86-unwinder-fixes.patch # 300 - 399 ppc(64) Patch301: linux-2.6-cell-mambo-drivers.patch Patch302: linux-2.6-hvc-console.patch Patch303: linux-2.6-ppc-rtas-check.patch -Patch304: linux-2.6-ppc64-export-copypage.patch -Patch309: linux-2.6-ppc-isapnp.patch - +Patch310: linux-2.6-g5-therm-shutdown.patch +Patch311: linux-2.6-power6-no-ci-large-page.patch +Patch312: linux-2.6-mac-raid-autorun.patch # 400 - 499 ia64 @@ -272,31 +349,30 @@ # 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-deprecate-configh-include.patch # Exec-shield. Patch810: linux-2.6-execshield.patch Patch811: linux-2.6-warn-c-p-a.patch # Module signing infrastructure. -Patch900: linux-2.6-modsign-core.patch +Patch900: linux-2.6-modsign-mpilib.patch Patch901: linux-2.6-modsign-crypto.patch -Patch902: linux-2.6-modsign-ksign.patch -Patch903: linux-2.6-modsign-mpilib.patch -Patch904: linux-2.6-modsign-script.patch -Patch905: linux-2.6-modsign-include.patch +Patch902: linux-2.6-modsign-include.patch +Patch903: linux-2.6-modsign-verify.patch +Patch904: linux-2.6-modsign-ksign.patch +Patch905: linux-2.6-modsign-core.patch +Patch906: linux-2.6-modsign-script.patch # Tux http accelerator. Patch910: linux-2.6-tux.patch # 950 - 999 Xen Patch950: linux-2.6-xen.patch +#Patch951: linux-2.6-xen-utrace.patch Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch -Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch -Patch959: linux-2.6-xen-x86-unwinder.patch +Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch Patch990: linux-2.6-xen-console.patch Patch991: linux-2.6-xen-pvfb.patch Patch992: linux-2.6-xen-pvfb-fixes.patch @@ -307,9 +383,7 @@ Patch1010: linux-2.6-debug-sizeof-structs.patch 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-singlebiterror.patch Patch1015: linux-2.6-debug-spinlock-taint.patch Patch1016: linux-2.6-debug-Wundef.patch Patch1017: linux-2.6-debug-disable-builtins.patch @@ -333,85 +407,48 @@ # SCSI bits. Patch1101: linux-2.6-ips-softlockup.patch -Patch1102: linux-2.6-scsi-advansys-pcitable.patch Patch1106: linux-2.6-scsi-cpqarray-set-master.patch # NFS bits. -Patch1200: linux-2.6-NFSD-ctlbits.patch Patch1201: linux-2.6-NFSD-badness.patch # core networking changes. +# NIC driver fixes + # Filesystem stuff. # Squashfs Patch1400: linux-2.6-squashfs.patch -Patch1420: linux-2.6-inode_diet-replace-inodeugeneric_ip-with-inodei_private.patch -Patch1421: linux-2.6-inode-diet-move-i_pipe-into-a-union.patch -Patch1422: linux-2.6-inode-diet-move-i_bdev-into-a-union.patch -Patch1423: linux-2.6-inode-diet-move-i_cdev-into-a-union.patch -Patch1424: linux-2.6-inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch -Patch1426: linux-2.6-inode-diet-xfs.patch -Patch1427: linux-2.6-inode-diet-fix-splice.patch +# GFS/DLM +Patch1411: linux-2.6-gfs2-tux.patch +Patch1412: linux-2.6-gfs2-locking-exports.patch +Patch1413: linux-2.6-gfs2-update.patch # NFS superblock sharing / CacheFS -Patch1430: linux-2.6-nfs-superblock-sharing.patch Patch1431: linux-2.6-cachefiles.patch -Patch1432: linux-2.6-filesystem-caching-for-afs-and-nfs.patch -Patch1433: linux-2.6-nfs-superblock-unmount-optimization.patch -Patch1435: linux-2.6-nfs4-use-after-free.patch # Various NFS changes. -# NFS uses 64-bit inodes -Patch1440: linux-2.6-nfs-64-bit-inode-support.patch -# Fix NFS/Selinux oops. -Patch1441: linux-2.6-nfs-selinux-oops.patch -# Fix rpc_pipefs umount oops -Patch1442: linux-2.6.17-nfs-fix_client_shutdown.patch -# Fix NFS DIO error -Patch1443: linux-2.6-nfs-dio-error.patch - -# EXT3/JBD fixes -Patch1450: linux-2.6-ext3-16tb-overflow-fixes.patch -Patch1451: linux-2.6-jbd-1k-crash-fix.patch -Patch1452: linux-2.6-ext3-robustness.patch - -Patch1460: linux-2.6-cifs-einval-on-readdir-fix.patch -Patch1461: linux-2.6-cifs_getattr-preferred-iosize.patch -Patch1462: linux-2.6-cifs-samba-4176.patch # Device mapper / MD layer -Patch1500: linux-2.6-dm-mirroring.patch # Misc bits. Patch1600: linux-2.6-module_version.patch -Patch1601: linux-2.6-ntpd-weak-symbol-gcc-workaround.patch -Patch1610: linux-2.6-input-kill-stupid-messages.patch -Patch1620: linux-2.6-serial-tickle-nmi.patch -Patch1630: linux-2.6-mm-suspend-improvements.patch -Patch1640: linux-2.6-autofs-revalidate-lookup.patch +Patch1601: linux-2.6-sha_alignment.patch Patch1650: linux-2.6-serial-460800.patch -Patch1670: linux-2.6-softcursor-persistent-alloc.patch -Patch1680: linux-2.6-reiserfs-dentry-ref.patch Patch1681: linux-2.6-xfs-umount-fix.patch -Patch1700: linux-2.6-tty-locking-fixes.patch -Patch1710: linux-2.6-sched-up-migration-cost.patch +Patch1682: linux-2.6-xfs_attr2.patch +Patch1690: linux-2.6-PT_LOAD-align.patch Patch1720: linux-2.6-proc-self-maps-fix.patch Patch1731: linux-2.6-cpufreq-unload-smi.patch Patch1740: linux-2.6-softlockup-disable.patch Patch1750: linux-2.6-usb-storage-reboot.patch -Patch1760: linux-2.6-fs-grow_buffers-limit.patch -Patch1761: linux-2.6-fs-cramfs-corruption-oops.patch -Patch1762: linux-2.6-fs-hfs-mokb.patch Patch1770: linux-2.6-optimise-spinlock-debug.patch Patch1771: linux-2.6-silence-noise.patch Patch1790: linux-2.6-drivers-add-qlogic-firmware.patch -Patch1793: linux-2.6-asix-usbnet-update.patch # SELinux/audit patches. Patch1801: linux-2.6-selinux-mprotect-checks.patch -Patch1802: linux-2.6-selinux-support-range-transitions.patch -Patch1803: linux-2.6-audit-code-walking-out-of-bounds.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-oss-warning.patch @@ -422,9 +459,6 @@ # VM bits. Patch2000: linux-2.6-vm-debug.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch -Patch2002: linux-2.6-mm-tracking-dirty-pages.patch -Patch2004: linux-2.6-vm-icp2-nonzero-gfp.patch -Patch2005: linux-2.6-mm-prevent-oom-fixes.patch # Tweak some defaults. Patch2100: linux-2.6-defaults-fat-utf8.patch @@ -432,20 +466,28 @@ Patch2102: linux-2.6-defaults-phys-start.patch Patch2103: linux-2.6-defaults-unicode-vt.patch Patch2104: linux-2.6-defaults-disable-split-ptlock.patch +Patch2105: linux-2.6-defaults-nonmi.patch # SATA Bits Patch2200: linux-2.6-sata-promise-pata-ports.patch -Patch2201: linux-2.6-sata-ahci-suspend.patch -Patch2202: linux-2.6-sata-promise-null-deref.patch -# ACPI bits +Patch2300: linux-2.6-lockdep-fixes.patch -# Lockdep fixes. -Patch2400: linux-2.6-lockdep-fixes.patch +# ACPI bits # Net driver fixes. Patch2500: linux-2.6-net-forcedeth-suspend.patch -Patch2501: linux-2.6-net-netpoll-fixes.patch + +# OLPC drivers +Patch5000: linux-2.6-mtd-update.patch +Patch5001: linux-2.6-cafe-nand.patch +Patch5010: linux-2.6-marvell-88alp01.patch +Patch5011: linux-2.6-marvell-update.patch +Patch5020: linux-2.6-olpc-dcon.patch +Patch5030: linux-2.6-libertas.diff +Patch5040: linux-2.6-olpc-touchpad.diff +Patch5050: linux-2.6-sysprof-1.0.3.patch +Patch5060: linux-2.6-olpc-battery.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -474,6 +516,10 @@ of the operating system: memory allocation, process allocation, device input and output, etc. +%if 0%{?olpc} +Provides: kmod-sysprof = 1.0.3 +%endif + %package devel Summary: Development package for building kernel modules to match the kernel. Group: System Environment/Kernel @@ -498,6 +544,29 @@ 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. +%package debug +Summary: The Linux kernel compiled with extra debugging enabled. +Group: System Environment/Kernel +Provides: kernel = %{version} +Provides: kernel-drm = 4.3.0 +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}-debug +Prereq: %{kernel_prereq} +Conflicts: %{kernel_dot_org_conflicts} +Conflicts: %{package_conflicts} +AutoReq: no +AutoProv: yes + +%description debug +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 +input and output, etc. + +This variant of the kernel has numerous debugging options enabled. +It should only be installed when trying to gather additional information +on kernel bugs, as some of these options impact performance noticably. + + %package smp Summary: The Linux kernel compiled for SMP machines. @@ -536,6 +605,30 @@ This package provides kernel headers and makefiles sufficient to build modules against the SMP kernel package. +%package smp-debug +Summary: The SMP Linux kernel compiled with extra debugging enabled. +Group: System Environment/Kernel +Provides: kernel = %{version} +Provides: kernel-drm = 4.3.0 +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}-smp-debug +Prereq: %{kernel_prereq} +Conflicts: %{kernel_dot_org_conflicts} +Conflicts: %{package_conflicts} +AutoReq: no +AutoProv: yes + +%description smp-debug +This package includes a SMP version of the Linux kernel. It is +required only on machines with two or more CPUs as well as machines with +hyperthreading technology. + +Install the kernel-smp package if your machine uses two or more CPUs. + +This variant of the kernel has numerous debugging options enabled. +It should only be installed when trying to gather additional information +on kernel bugs, as some of these options impact performance noticably. + + %package xen0 Summary: The Linux kernel compiled for Xen guest0 VM operations @@ -683,6 +776,32 @@ %prep +#if a rhel kernel, apply the rhel config options +%if 0%{?rhel} + for i in %{all_arch_configs} + do + mv $i $i.tmp + $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i + rm $i.tmp + done + for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config + do + echo i is this file $i + mv $i $i.tmp + $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-x86-generic $i.tmp > $i + rm $i.tmp + done +%endif +#if a olpc kernel, apply the olpc config options +%if 0%{?olpc} + for i in %{all_arch_configs} + do + mv $i $i.tmp + $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-olpc-generic $i.tmp > $i + rm $i.tmp + done +%endif + # First we unpack the kernel tarball. # If this isn't the first make prep, we use links to the existing clean tarball # which speeds things up quite a bit. @@ -708,10 +827,12 @@ # Update to latest upstream. %patch1 -p1 -%patch4 -p1 # Patches 10 through 100 are meant for core subsystem upgrades +# Rolands utrace ptrace replacement. +#%patch10 -p1 + # sysrq works always %patch20 -p1 @@ -734,12 +855,6 @@ %patch203 -p1 # Use heuristics to determine whether to enable lapic on i386. #%patch204 -p1 -# Support TIF_RESTORE_SIGMASK on x86_64 -%patch207 -p1 -# Add ppoll and pselect syscalls -%patch208 -p1 -# DWARF2 unwinder fixes. -%patch211 -p1 # # PowerPC @@ -750,11 +865,14 @@ #%patch302 -p1 # Check properly for successful RTAS instantiation %patch303 -p1 -# Export copy_4K_page for ppc64 -%patch304 -p1 -# Fix ISAPNP messages on ppc32. -%patch309 -p1 +# Alleviate G5 thermal shutdown problems +%patch310 -p1 +# Disable cache-inhibited 64KiB pages on POWER6 +%patch311 -p1 +# Flag RAID partitions with Mac partition tables for autorun +%patch312 -p1 +# S390 # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -766,10 +884,6 @@ # also gives a list of missing options at the end. Useful for automated # builds (as used in the buildsystem). %patch800 -p1 -# Warn if someone tries to build userspace using kernel headers -%patch801 -p1 -# Warn if someone #include's -%patch802 -p1 # Exec shield %patch810 -p1 @@ -784,9 +898,10 @@ %patch903 -p1 %patch904 -p1 %patch905 -p1 +%patch906 -p1 # Tux -%patch910 -p1 +#%patch910 -p1 # # Xen @@ -794,6 +909,7 @@ %if %{includexen} # # Apply the main xen patch... +#%patch951 -p1 %patch950 -p1 -b .p.xen # # ... and back out all the tpm additions, they need fixing @@ -806,18 +922,19 @@ # Delete the rest of the backup files, they just confuse the build later find -name "*.p.xen" | xargs rm -f +# Xen utrace +#%patch951 -p1 %patch952 -p1 -%patch953 -p1 # Xen exec-shield bits %patch954 -p1 %patch955 -p1 -# Unwinder fixes for Xen. -%patch959 -p1 +# ia64 xen cleanups for kexec/kdump +%patch958 -p1 # xen framebuffer patches -%patch990 -p1 -%patch991 -p1 -%patch992 -p1 +#%patch990 -p1 +#%patch991 -p1 +#%patch992 -p1 %endif @@ -829,9 +946,7 @@ # Various low-impact patches to aid debugging. %patch1010 -p1 %patch1011 -p1 -%patch1012 -p1 %patch1013 -p1 -%patch1014 -p1 %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 @@ -872,121 +987,65 @@ # # Fix softlockup with ips driver. %patch1101 -p1 -# Add a pci table to advansys driver. -%patch1102 -p1 # fix cpqarray pci enable %patch1106 -p1 # # Various NFS/NFSD fixes. -# kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports -%patch1200 -p1 +# # Fix badness. %patch1201 -p1 # core networking changes. +# NIC driver fixes + # Filesystem patches. # Squashfs %patch1400 -p1 - -# Ted's inode diet work. -%patch1420 -p1 -%patch1421 -p1 -%patch1422 -p1 -%patch1423 -p1 -%patch1424 -p1 -%patch1426 -p1 -%patch1427 -p1 +# GFS2/DLM +#%patch1411 -p1 +%patch1412 -p1 +# GFS2 update +%patch1413 -p1 #nfs sharing / cachefs -%patch1430 -p1 %patch1431 -p1 -%patch1432 -p1 -%patch1433 -p1 -%patch1435 -p1 # NFS -# NFS supports 64-bit inodes -%patch1440 -p1 -# Fix NFS/Selinux oops. (#204848) -%patch1441 -p1 -# Fix rpc_pipefs umount oops -%patch1442 -p1 -# Fix bug triggered by fsstress on nfs -%patch1443 -p1 - -# EXT3 -# overflows at 16tb fix -%patch1450 -p1 -# Fix jbd crash with 1KB block size filesystems. -%patch1451 -p1 -# More ext3 robustness fixes. -%patch1452 -p1 - -# Fix CIFS -%patch1460 -p1 -%patch1461 -p1 -%patch1462 -p1 # Device mapper / MD layer -# dm mirroring -%patch1500 -p1 # Misc fixes # Add missing MODULE_VERSION tags to some modules. %patch1600 -p1 -# Workaround broken weak symbol handling in FC5 gcc. +# Fix SHA1 alignment problem on ia64 %patch1601 -p1 -# The input layer spews crap no-one cares about. -%patch1610 -p1 -# Tickle the NMI whilst doing serial writes. -%patch1620 -p1 -# Numerous patches to improve software suspend. -%patch1630 -p1 -# Enable autofs4 to return fail for revalidate during lookup -%patch1640 -p1 # Allow to use 480600 baud on 16C950 UARTs %patch1650 -p1 -# Use persistent allocation in softcursor -%patch1670 -p1 -# reiserfs-make-sure-all-dentries-refs-are-released-before-calling-kill_block_super-try-2.patch -%patch1680 -p1 # Fix XFS umount bug. %patch1681 -p1 -# TTY locking fixes. -%patch1700 -p1 -# Only print migration info on SMP -%patch1710 -p1 +# Fix attr2 corruption with btree data extents +%patch1682 -p1 +# Align kernel data segment to page boundary. +%patch1690 -p1 # setuid /proc/self/maps fix. %patch1720 -p1 -# Don't let speedstep-smi register on mobile Pentium4 +# Don't load speedstep-smi on mobile pentium 4 %patch1731 -p1 # Add a safety net to softlockup so that it doesn't prevent installs. %patch1740 -p1 # USB storage not seen upon reboot %patch1750 -p1 -# CVE-2006-5757 ISO9660 __find_get_block_slow() denial of service -%patch1760 -p1 -# Fix up oops in cramfs when encountering corrupt images. -%patch1761 -p1 -# Fix up error handling in hfs -%patch1762 -p1 # Speed up spinlock debug. %patch1770 -p1 -# Silence some noisy printks at boot time. +# Silence some useless messages that still get printed with 'quiet' %patch1771 -p1 # qlogic firmware %patch1790 -p1 -# Fixes for DUB-E100 vB1 usb ethernet -%patch1793 -p1 - # Fix the SELinux mprotect checks on executable mappings %patch1801 -p1 -# Add support for SELinux range transitions -%patch1802 -p1 -%patch1803 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -996,16 +1055,10 @@ # # VM related fixes. # -# VM debugging +# Reenable negative pagecount debugging even if CONFIG_DEBUG_VM is off. %patch2000 -p1 # Silence GFP_ATOMIC failures. %patch2001 -p1 -# track dirty pages -%patch2002 -p1 -# Fix NFS corruption -%patch2004 -p1 -# OOM Killer improvements. -%patch2005 -p1 # Changes to upstream defaults. # Use UTF-8 by default on VFAT. @@ -1019,31 +1072,50 @@ %patch2103 -p1 # Disable split page table lock %patch2104 -p1 - -# Enable PATA ports on Promise SATA. -%patch2200 -p1 -# Fix AHCI Suspend. -%patch2201 -p1 -# Avoid null pointer dereference in SATA Promise. -%patch2202 -p1 +# Disable NMI watchdog by default. +%patch2105 -p1 # ACPI patches -# Lockdep fixes -%patch2400 -p1 +# SATA +# PATA ports on Promise. +%patch2200 -p1 + +%patch2300 -p1 # Network driver fixes. # suspend/resume for forcedeth %patch2500 -p1 -# Netpoll fixes. -%patch2501 -p1 - # # Patches 5000 to 6000 are reserved for new drivers that are about to -# be merged upstream +# be merged upstream, which includes OLPC work # +# OLPC specific patches +%if 0%{?olpc} +# MTD NAND driver core updates... +# git://git.infradead.org/~dwmw2/cafe-2.6.18.git +%patch5000 -p1 +# ... needed for OLPC CAF?? NAND driver +%patch5001 -p1 + +# Marvell 88ALP01 camera +%patch5010 -p1 +%patch5011 -p1 +# OLPC DCON fb driver +%patch5020 -p1 +# Marvell Libertas wireless driver +%patch5030 -p1 +# OLPC touchpad +%patch5040 -p1 +# sysprof +%patch5050 -p1 +# battery +# git://git.infradead.org/battery-2.6.git +%patch5060 -p1 +%endif + # # final stuff # @@ -1062,6 +1134,13 @@ cp -f %{all_arch_configs} . +%if 0%{?olpc} +# don't need these for OLPC +rm -f kernel-%{kversion}-*PAE*.config +rm -f kernel-%{kversion}-*xen*.config +rm -f kernel-%{kversion}-*kdump*.config +%endif + # now run oldconfig over all the config files for i in *.config do @@ -1119,10 +1198,12 @@ # Create gpg keys for signing the modules # +%if %{signmodules} 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 +%endif BuildKernel() { MakeTarget=$1 @@ -1166,6 +1247,7 @@ %if "%{_enable_debug_packages}" == "1" mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot + mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/%{image_install_path} %endif mkdir -p $RPM_BUILD_ROOT/%{image_install_path} install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer @@ -1269,7 +1351,6 @@ done unset KEYFLAGS %endif - # mark modules executable so that strip-to-file can strip them cat modnames | xargs chmod u+x @@ -1308,34 +1389,42 @@ %if %{includexen} %if %{buildxen} cd xen - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} -# FixMe: Juan Quintela (when no PAE is not needed anymore) - make debug=y verbose=y crash_debug=y pae=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE - install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE - make clean - make debug=y verbose=y crash_debug=y - install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL} + mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot + make %{?_smp_mflags} %{xen_flags} + install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL} install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. + # need to let BuildKernel() create directory first. The problem here is BuildKernel + # doesn't mkdir a new directory, but instead 'mv /lib/modules//build to + # if the were to exist already, then the contents of 'build' are placed in a sub-dir + # named 'build' under . ugh. So save xen directory temporarily instead + mkdir -p $RPM_BUILD_ROOT/usr/src/kernels + mv xen $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp %endif %endif cd linux-%{kversion}.%{_target_cpu} +%if %{builddebug} +BuildKernel %make_target %kernel_image debug +%endif + %if %{buildup} BuildKernel %make_target %kernel_image %endif %if %{buildsmp} BuildKernel %make_target %kernel_image smp +%if %{builddebug} +BuildKernel %make_target %kernel_image smp-debug +%endif %endif %if %{includexen} %if %{buildxen} -BuildKernel vmlinuz vmlinuz xen -BuildKernel vmlinuz vmlinuz xen0 -BuildKernel vmlinuz vmlinuz xenU +BuildKernel %xen_target %xen_image xen +# Now the directory is properly created, copy xen over +mv $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}-HV-temp $RPM_BUILD_ROOT/usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}/xen %endif %endif @@ -1376,6 +1465,30 @@ tar cf - Documentation | tar xf - -C $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion} %endif +%if %{buildheaders} +# Install kernel headers +make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install + +# Manually go through the 'headers_check' process for every file, but +# don't die if it fails +chmod +x scripts/hdrcheck.sh +echo -e '*****\n*****\nHEADER EXPORT WARNINGS:\n*****' > hdrwarnings.txt +for FILE in `find $RPM_BUILD_ROOT/usr/include` ; do + scripts/hdrcheck.sh $RPM_BUILD_ROOT/usr/include $FILE /dev/null >> hdrwarnings.txt || : +done +echo -e '*****\n*****' >> hdrwarnings.txt +if grep -q exist hdrwarnings.txt; then + sed s:^$RPM_BUILD_ROOT/usr/include/:: hdrwarnings.txt + # Temporarily cause a build failure if header inconsistencies. + # exit 1 +fi + +# glibc provides scsi headers for itself, for now +rm -rf $RPM_BUILD_ROOT/usr/include/scsi +rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h +rm -f $RPM_BUILD_ROOT/usr/include/asm*/io.h +rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h +%endif ### ### clean ### @@ -1426,6 +1539,10 @@ popd > /dev/null fi +%post smp-debug +[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp-debug +/sbin/new-kernel-pkg --package kernel-smp-debug --mkinitrd --depmod --install %{KVERREL}smp-debug + %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 @@ -1481,6 +1598,10 @@ popd > /dev/null fi +%post debug +/sbin/new-kernel-pkg --package kernel-debug --mkinitrd --depmod --install %{KVERREL}debug || exit $? + + %preun /sbin/modprobe loop 2> /dev/null > /dev/null || : /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} @@ -1489,10 +1610,17 @@ /sbin/modprobe loop 2> /dev/null > /dev/null || : /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp +%preun smp-debug +/sbin/modprobe loop 2> /dev/null > /dev/null || : +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp-debug + %preun kdump /sbin/modprobe loop 2> /dev/null > /dev/null || : /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump +%preun debug +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}debug || exit $? + %preun xen0 /sbin/modprobe loop 2> /dev/null > /dev/null || : /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0 @@ -1529,6 +1657,74 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-%{_target_cpu} %endif +%if %{builddebug} +%if "%{_enable_debug_packages}" == "1" +%ifnarch noarch +%package debug-debuginfo +Summary: Debug information for package %{name}-debug +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL} +Provides: %{name}-debug-debuginfo-%{_target_cpu} = %{KVERREL} +%description debug-debuginfo +This package provides debug information for package %{name}-debug +%files debug-debuginfo +%defattr(-,root,root) +%if "%{elf_image_install_path}" != "" +/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}debug.debug +%endif +/usr/lib/debug/lib/modules/%{KVERREL}debug +/usr/lib/debug/usr/src/kernels/%{KVERREL}-debug-%{_target_cpu} +%endif +%endif + +%files debug +%defattr(-,root,root) +/%{image_install_path}/vmlinuz-%{KVERREL}debug +/boot/System.map-%{KVERREL}debug +/boot/symvers-%{KVERREL}debug.gz +/boot/config-%{KVERREL}debug +%dir /lib/modules/%{KVERREL}debug +/lib/modules/%{KVERREL}debug/kernel +/lib/modules/%{KVERREL}debug/build +/lib/modules/%{KVERREL}debug/source +/lib/modules/%{KVERREL}debug/extra +/lib/modules/%{KVERREL}debug/updates +/lib/modules/%{KVERREL}debug/weak-updates +%ghost /boot/initrd-%{KVERREL}debug.img + +%ifnarch noarch +%package smp-debug-debuginfo +Summary: Debug information for package %{name}-smp-debug +Group: Development/Debug +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{KVERREL} +Provides: %{name}-debug-debuginfo-%{_target_cpu} = %{KVERREL} +%description smp-debug-debuginfo +This package provides debug information for package %{name}-smp-debug +%files smp-debug-debuginfo +%defattr(-,root,root) +%if "%{elf_image_install_path}" != "" +/usr/lib/debug/%{elf_image_install_path}/*-%{KVERREL}smp-debug.debug +%endif +/usr/lib/debug/lib/modules/%{KVERREL}smp-debug +/usr/lib/debug/usr/src/kernels/%{KVERREL}-smp-debug-%{_target_cpu} +%endif +%endif + +%files smp-debug +%defattr(-,root,root) +/%{image_install_path}/vmlinuz-%{KVERREL}smp-debug +/boot/System.map-%{KVERREL}smp-debug +/boot/symvers-%{KVERREL}smp-debug.gz +/boot/config-%{KVERREL}smp-debug +%dir /lib/modules/%{KVERREL}smp-debug +/lib/modules/%{KVERREL}smp-debug/kernel +/lib/modules/%{KVERREL}smp-debug/build +/lib/modules/%{KVERREL}smp-debug/source +/lib/modules/%{KVERREL}smp-debug/extra +/lib/modules/%{KVERREL}smp-debug/updates +/lib/modules/%{KVERREL}smp-debug/weak-updates +%ghost /boot/initrd-%{KVERREL}smp-debug.img + %if %{buildsmp} %files smp %defattr(-,root,root) @@ -1647,6 +1843,9 @@ %endif %changelog +* Wed Jan 31 2007 Chuck Ebbert +- Update to 2.6.19.2 + * Tue Jan 30 2007 Markus Armbruster - Update Xen paravirt framebuffer patch to upstream xen-unstable changeset 13066, less changeset 12680, because that breaks with linux-2.6-debug-sysfs-crash-debugging-xen.patch: arch/i386/kernel/traps-xen.c | 5 +++++ linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c | 5 +++++ 2 files changed, 10 insertions(+) Index: linux-2.6-debug-sysfs-crash-debugging-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-sysfs-crash-debugging-xen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-sysfs-crash-debugging-xen.patch 22 Sep 2006 22:46:11 -0000 1.1 +++ linux-2.6-debug-sysfs-crash-debugging-xen.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -26,19 +26,19 @@ if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) { -diff -r 35d3d547d0d3 -r e5168f3eb0de arch/x86_64/kernel/traps-xen.c ---- a/arch/x86_64/kernel/traps-xen.c Thu Jul 27 00:46:20 2006 +0200 -+++ b/arch/x86_64/kernel/traps-xen.c Thu Jul 27 00:59:37 2006 +0200 -@@ -69,6 +69,8 @@ asmlinkage void spurious_interrupt_bug(v - asmlinkage void spurious_interrupt_bug(void); - +diff -uNp linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c.orig linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c +--- linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c.orig 2006-12-23 21:21:30.000000000 +0100 ++++ linux-2.6.19.noarch/arch/x86_64/kernel/traps-xen.c 2006-12-23 21:23:13.000000000 +0100 +@@ -73,6 +73,8 @@ asmlinkage void spurious_interrupt_bug(v ATOMIC_NOTIFIER_HEAD(die_chain); -+ -+extern char last_sysfs_file[]; + EXPORT_SYMBOL(die_chain); ++extern char last_sysfs_file[]; ++ int register_die_notifier(struct notifier_block *nb) { -@@ -537,6 +539,9 @@ void __kprobes __die(const char * str, s + vmalloc_sync_all(); +@@ -607,6 +609,9 @@ void __kprobes __die(const char * str, s printk("DEBUG_PAGEALLOC"); #endif printk("\n"); 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 | 10 +++++++--- linux-2.6.16.noarch/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/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 18 Jun 2006 04:45:03 -0000 1.8 +++ linux-2.6-debug-taint-vm.patch 31 Jan 2007 15:26:15 -0000 1.9 @@ -16,15 +16,17 @@ panic("BUG!"); \ } while (0) #endif -@@ -19,7 +23,7 @@ - #ifndef HAVE_ARCH_WARN_ON - #define WARN_ON(condition) do { \ - if (unlikely((condition)!=0)) { \ -- 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) +@@ -23,8 +23,8 @@ extern const char *print_tainted(void); + #define WARN_ON(condition) ({ \ + typeof(condition) __ret_warn_on = (condition); \ + if (unlikely(__ret_warn_on)) { \ +- 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(); \ + } \ + unlikely(__ret_warn_on); \ diff -urNp --exclude-from=/home/davej/.exclude linux-1740/kernel/panic.c linux-2000/kernel/panic.c --- linux-1740/kernel/panic.c +++ linux-2000/kernel/panic.c linux-2.6-debug-verbosify-bug.patch: bug.h | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) Index: linux-2.6-debug-verbosify-bug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-debug-verbosify-bug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-verbosify-bug.patch 30 Oct 2006 05:13:45 -0000 1.1 +++ linux-2.6-debug-verbosify-bug.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -71,11 +71,11 @@ --- linux-2.6.18.noarch/include/asm-generic/bug.h~ 2006-10-30 00:09:01.000000000 -0500 +++ linux-2.6.18.noarch/include/asm-generic/bug.h 2006-10-30 00:11:12.000000000 -0500 -@@ -34,11 +34,22 @@ extern const char *print_tainted(void); +@@ -16,14 +16,19 @@ extern const char *print_tainted(void); #endif #ifndef HAVE_ARCH_BUG_ON --#define BUG_ON(condition) do { if (condition) ; } while(0) +-#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0) +#define BUG_ON(condition) do { \ + if (unlikely((condition)!=0)) { \ + printk("BUGging on (%s)\n", #condition); \ @@ -85,23 +85,23 @@ #endif #ifndef HAVE_ARCH_WARN_ON --#define WARN_ON(condition) do { if (condition) ; } while(0) -+#define WARN_ON(condition) do { \ -+ if (unlikely((condition)!=0)) { \ -+ printk("BUG: warning: (%s) at %s:%d/%s()\n", \ -+ #condition, __FILE__, __LINE__, __FUNCTION__); \ -+ dump_stack(); \ -+ } \ -+} while (0) - #endif - #endif + #define WARN_ON(condition) ({ \ + typeof(condition) __ret_warn_on = (condition); \ + if (unlikely(__ret_warn_on)) { \ +- printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, \ ++ printk("BUG: warning: (%s) at %s:%d/%s() (%s)\n", #condition, __FILE__, \ + __LINE__, __FUNCTION__, print_tainted()); \ + dump_stack(); \ + } \ +@@ -58,8 +58,10 @@ extern const char *print_tainted(void); + typeof(condition) __ret_warn_once = (condition); \ + \ + if (unlikely(__ret_warn_once)) \ +- if (WARN_ON(!__warned)) \ ++ if (!__warned) { \ + __warned = 1; \ ++ WARN_ON(condition); \ ++ } \ + unlikely(__ret_warn_once); \ + }) -@@ -49,7 +60,7 @@ extern const char *print_tainted(void); - \ - if (unlikely((condition) && __warn_once)) { \ - __warn_once = 0; \ -- WARN_ON(1); \ -+ WARN_ON(condition); \ - __ret = 1; \ - } \ - __ret; \ linux-2.6-defaults-disable-split-ptlock.patch: Kconfig | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-defaults-disable-split-ptlock.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-defaults-disable-split-ptlock.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-defaults-disable-split-ptlock.patch 22 Sep 2006 22:43:07 -0000 1.5 +++ linux-2.6-defaults-disable-split-ptlock.patch 31 Jan 2007 15:26:15 -0000 1.6 @@ -1,10 +1,11 @@ ---- linux-2.6.17.noarch/mm/Kconfig.orig 2006-07-19 16:23:03.000000000 +0200 -+++ linux-2.6.17.noarch/mm/Kconfig 2006-07-19 16:25:16.000000000 +0200 -@@ -135,6 +135,7 @@ config SPLIT_PTLOCK_CPUS +diff -uNp linux-2.6.19.noarch/mm/Kconfig.orig linux-2.6.19.noarch/mm/Kconfig +--- linux-2.6.19.noarch/mm/Kconfig.orig 2006-12-23 21:32:06.000000000 +0100 ++++ linux-2.6.19.noarch/mm/Kconfig 2006-12-23 21:33:18.000000000 +0100 +@@ -139,6 +139,7 @@ config SPLIT_PTLOCK_CPUS + int default "4096" if ARM && !CPU_CACHE_VIPT default "4096" if PARISC && !PA20 - default "4096" if X86_XEN || X86_64_XEN + default "4096" if !64BIT + default "4096" if X86_XEN || X86_64_XEN default "4" - # linux-2.6-devmem.patch: include/asm-m68k/page.h | 2 linux-2.6.19.noarch/include/asm-ia64/page.h | 1 linux-2.6/arch/i386/mm/init.c | 19 +++ linux-2.6/arch/ia64/mm/init.c | 7 + linux-2.6/arch/powerpc/mm/mem.c | 14 ++ linux-2.6/arch/s390/mm/init.c | 5 linux-2.6/arch/x86_64/mm/init.c | 42 ++++++++ linux-2.6/drivers/char/mem.c | 144 ++++------------------------ linux-2.6/fs/proc/kcore.c | 2 linux-2.6/include/asm-alpha/page.h | 2 linux-2.6/include/asm-arm/page.h | 2 linux-2.6/include/asm-arm26/page.h | 2 linux-2.6/include/asm-cris/page.h | 2 linux-2.6/include/asm-h8300/page.h | 2 linux-2.6/include/asm-i386/page.h | 2 linux-2.6/include/asm-m68knommu/page.h | 2 linux-2.6/include/asm-mips/page.h | 2 linux-2.6/include/asm-parisc/page.h | 2 linux-2.6/include/asm-powerpc/page.h | 2 linux-2.6/include/asm-ppc/page.h | 2 linux-2.6/include/asm-s390/page.h | 2 linux-2.6/include/asm-sh/page.h | 2 linux-2.6/include/asm-sh64/page.h | 2 linux-2.6/include/asm-sparc/page.h | 2 linux-2.6/include/asm-sparc64/page.h | 2 linux-2.6/include/asm-um/page.h | 1 linux-2.6/include/asm-v850/page.h | 2 linux-2.6/include/asm-x86_64/page.h | 4 28 files changed, 152 insertions(+), 123 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-devmem.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-devmem.patch 16 Nov 2006 22:14:34 -0000 1.9 +++ linux-2.6-devmem.patch 31 Jan 2007 15:26:15 -0000 1.10 @@ -1,7 +1,8 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/i386/mm/init.c linux-1050/arch/i386/mm/init.c ---- linux-1020/arch/i386/mm/init.c -+++ linux-1050/arch/i386/mm/init.c -@@ -229,6 +229,25 @@ static inline int page_is_ram(unsigned l +Index: linux-2.6/arch/i386/mm/init.c +=================================================================== +--- linux-2.6.orig/arch/i386/mm/init.c ++++ linux-2.6/arch/i386/mm/init.c +@@ -233,6 +233,25 @@ int page_is_ram(unsigned long pagenr) return 0; } @@ -27,10 +28,11 @@ #ifdef CONFIG_HIGHMEM pte_t *kmap_pte; pgprot_t kmap_prot; -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/ia64/mm/init.c linux-1050/arch/ia64/mm/init.c ---- linux-1020/arch/ia64/mm/init.c -+++ linux-1050/arch/ia64/mm/init.c -@@ -230,6 +230,13 @@ free_initrd_mem (unsigned long start, un +Index: linux-2.6/arch/ia64/mm/init.c +=================================================================== +--- linux-2.6.orig/arch/ia64/mm/init.c ++++ linux-2.6/arch/ia64/mm/init.c +@@ -263,6 +263,13 @@ free_initrd_mem (unsigned long start, un } } @@ -44,10 +46,11 @@ /* * This installs a clean page in the kernel's page table. */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/ppc64/mm/init.c linux-1050/arch/ppc64/mm/init.c ---- linux-1020/arch/powerpc/mm/mem.c -+++ linux-1050/arch/powerpc/mm/mem.c -@@ -46,6 +46,7 @@ +Index: linux-2.6/arch/powerpc/mm/mem.c +=================================================================== +--- linux-2.6.orig/arch/powerpc/mm/mem.c ++++ linux-2.6/arch/powerpc/mm/mem.c +@@ -45,6 +45,7 @@ #include #include #include @@ -55,7 +58,7 @@ #include #include "mmu_decl.h" -@@ -352,6 +352,19 @@ void __init mem_init(void) +@@ -343,6 +344,19 @@ void __init mem_init(void) max_mapnr = max_pfn; totalram_pages += free_all_bootmem(); #endif @@ -75,12 +78,13 @@ for_each_online_pgdat(pgdat) { for (i = 0; i < pgdat->node_spanned_pages; 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 -@@ -253,6 +253,11 @@ void __init paging_init(void) +Index: linux-2.6/arch/s390/mm/init.c +=================================================================== +--- linux-2.6.orig/arch/s390/mm/init.c ++++ linux-2.6/arch/s390/mm/init.c +@@ -241,6 +241,11 @@ void __init paging_init(void) } - #endif /* CONFIG_ARCH_S390X */ + #endif /* CONFIG_64BIT */ +int page_is_ram (unsigned long pagenr) +{ @@ -90,12 +94,42 @@ void __init mem_init(void) { unsigned long codesize, reservedpages, datasize, initsize; -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/x86_64/mm/init.c linux-1050/arch/x86_64/mm/init.c ---- linux-1020/arch/x86_64/mm/init.c -+++ linux-1050/arch/x86_64/mm/init.c -@@ -397,6 +397,26 @@ static inline int page_is_ram (unsigned +Index: linux-2.6/arch/x86_64/mm/init.c +=================================================================== +--- linux-2.6.orig/arch/x86_64/mm/init.c ++++ linux-2.6/arch/x86_64/mm/init.c +@@ -452,6 +452,28 @@ void __init clear_kernel_mapping(unsigne + __flush_tlb_all(); + } - extern int swiotlb_force; ++static inline int page_is_ram (unsigned long pagenr) ++{ ++ int i; ++ ++ for (i = 0; i < e820.nr_map; i++) { ++ unsigned long addr, end; ++ ++ if (e820.map[i].type != E820_RAM) /* not usable memory */ ++ continue; ++ /* ++ * !!!FIXME!!! Some BIOSen report areas as RAM that ++ * are not. Notably the 640->1Mb area. We need a sanity ++ * check here. ++ */ ++ addr = (e820.map[i].addr+PAGE_SIZE-1) >> PAGE_SHIFT; ++ end = (e820.map[i].addr+e820.map[i].size) >> PAGE_SHIFT; ++ if ((pagenr >= addr) && (pagenr < end)) ++ return 1; ++ } ++ return 0; ++} ++ + /* + * Memory hotplug specific functions + */ +@@ -534,6 +556,26 @@ int __add_pages(struct zone *z, unsigned + } + #endif +/* + * devmem_is_allowed() checks to see if /dev/mem access to a certain address is @@ -120,10 +154,11 @@ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, kcore_vsyscall; -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/drivers/char/mem.c linux-1050/drivers/char/mem.c ---- linux-1020/drivers/char/mem.c -+++ linux-1050/drivers/char/mem.c -@@ -111,6 +111,22 @@ static inline int valid_phys_addr_range( +Index: linux-2.6/drivers/char/mem.c +=================================================================== +--- linux-2.6.orig/drivers/char/mem.c ++++ linux-2.6/drivers/char/mem.c +@@ -102,6 +102,22 @@ static inline int valid_mmap_phys_addr_r } #endif @@ -146,7 +181,7 @@ /* * This funcion reads the *physical* memory. The f_pos points directly to the * memory location. -@@ -160,6 +176,8 @@ static ssize_t read_mem(struct file * fi +@@ -151,6 +167,8 @@ static ssize_t read_mem(struct file * fi */ ptr = xlate_dev_mem_ptr(p); @@ -155,7 +190,7 @@ if (copy_to_user(buf, ptr, sz)) return -EFAULT; buf += sz; -@@ -217,6 +235,8 @@ static ssize_t write_mem(struct file * f +@@ -208,6 +226,8 @@ static ssize_t write_mem(struct file * f */ ptr = xlate_dev_mem_ptr(p); @@ -163,20 +198,21 @@ + return -EPERM; copied = copy_from_user(ptr, buf, sz); if (copied) { - ssize_t ret; -@@ -270,6 +290,8 @@ static ssize_t read_kmem(struct file *fi - ssize_t read, virtr, sz; + written += sz - copied; +@@ -357,6 +377,8 @@ static ssize_t read_kmem(struct file *fi + ssize_t low_count, read, sz; char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ + return -EPERM; + read = 0; - virtr = 0; if (p < (unsigned long) high_memory) { -@@ -432,67 +432,6 @@ static ssize_t read_kmem(struct file *fi + low_count = count; +@@ -432,126 +454,6 @@ static ssize_t read_kmem(struct file *fi + return read; } - +- -static inline ssize_t -do_write_kmem(void *p, unsigned long realp, const char __user * buf, - size_t count, loff_t *ppos) @@ -238,13 +274,6 @@ -} - - - /* - * 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. - */ @@ -303,28 +332,29 @@ - return virtr + wrote; -} - - #if defined(CONFIG_ISA) || !defined(__mc68000__) + #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !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 = - static struct file_operations kmem_fops = { +@@ -818,7 +720,6 @@ static const struct file_operations mem_ + static const struct file_operations kmem_fops = { .llseek = memory_lseek, .read = read_kmem, - .write = write_kmem, .mmap = mmap_kmem, .open = open_kmem, - }; -@@ -823,7 +722,6 @@ static const struct { - struct file_operations *fops; + .get_unmapped_area = get_unmapped_area_mem, +@@ -954,7 +855,6 @@ static const struct { + const struct file_operations *fops; } devlist[] = { /* list of minor devices */ {1, "mem", S_IRUSR | S_IWUSR | S_IRGRP, &mem_fops}, - {2, "kmem", S_IRUSR | S_IWUSR | S_IRGRP, &kmem_fops}, {3, "null", S_IRUGO | S_IWUGO, &null_fops}, - #if defined(CONFIG_ISA) || !defined(__mc68000__) + #if (defined(CONFIG_ISA) || defined(CONFIG_PCI)) && !defined(__mc68000__) {4, "port", S_IRUSR | S_IWUSR | S_IRGRP, &port_fops}, -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/fs/proc/kcore.c linux-1050/fs/proc/kcore.c ---- linux-1020/fs/proc/kcore.c -+++ linux-1050/fs/proc/kcore.c +Index: linux-2.6/fs/proc/kcore.c +=================================================================== +--- linux-2.6.orig/fs/proc/kcore.c ++++ linux-2.6/fs/proc/kcore.c @@ -25,7 +25,7 @@ static int open_kcore(struct inode * inode, struct file * filp) @@ -334,8 +364,10 @@ } static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); ---- linux-2.6.17.noarch/include/asm-alpha/page.h~ 2006-09-17 11:29:02.000000000 -0400 -+++ linux-2.6.17.noarch/include/asm-alpha/page.h 2006-09-17 11:29:22.000000000 -0400 +Index: linux-2.6/include/asm-alpha/page.h +=================================================================== +--- linux-2.6.orig/include/asm-alpha/page.h ++++ linux-2.6/include/asm-alpha/page.h @@ -93,6 +93,8 @@ typedef unsigned long pgprot_t; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -345,22 +377,24 @@ #include #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 -@@ -192,6 +192,8 @@ static inline int get_order(unsigned lon - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +Index: linux-2.6/include/asm-arm/page.h +=================================================================== +--- linux-2.6.orig/include/asm-arm/page.h ++++ linux-2.6/include/asm-arm/page.h +@@ -192,6 +192,8 @@ typedef unsigned long pgprot_t; + + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-arm26/page.h linux-1050/include/asm-arm26/page.h ---- linux-1020/include/asm-arm26/page.h -+++ linux-1050/include/asm-arm26/page.h -@@ -110,6 +110,8 @@ static inline int get_order(unsigned lon +Index: linux-2.6/include/asm-arm26/page.h +=================================================================== +--- linux-2.6.orig/include/asm-arm26/page.h ++++ linux-2.6/include/asm-arm26/page.h +@@ -95,6 +95,8 @@ typedef unsigned long pgprot_t; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -368,45 +402,49 @@ + #endif /* __KERNEL__ */ - #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-cris/page.h linux-1050/include/asm-cris/page.h ---- linux-1020/include/asm-cris/page.h -+++ linux-1050/include/asm-cris/page.h -@@ -99,6 +99,8 @@ static inline int get_order(unsigned lon - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + #include +Index: linux-2.6/include/asm-cris/page.h +=================================================================== +--- linux-2.6.orig/include/asm-cris/page.h ++++ linux-2.6/include/asm-cris/page.h +@@ -76,6 +76,8 @@ typedef struct { unsigned long pgprot; } + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _CRIS_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-h8300/page.h linux-1050/include/asm-h8300/page.h ---- linux-1020/include/asm-h8300/page.h -+++ linux-1050/include/asm-h8300/page.h -@@ -99,6 +99,8 @@ extern unsigned long memory_end; - - #endif /* __ASSEMBLY__ */ +Index: linux-2.6/include/asm-h8300/page.h +=================================================================== +--- linux-2.6.orig/include/asm-h8300/page.h ++++ linux-2.6/include/asm-h8300/page.h +@@ -78,6 +78,8 @@ extern unsigned long memory_end; + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _H8300_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-i386/page.h linux-1050/include/asm-i386/page.h ---- linux-1020/include/asm-i386/page.h -+++ linux-1050/include/asm-i386/page.h -@@ -119,6 +119,8 @@ static __inline__ int get_order(unsigned +Index: linux-2.6/include/asm-i386/page.h +=================================================================== +--- linux-2.6.orig/include/asm-i386/page.h ++++ linux-2.6/include/asm-i386/page.h +@@ -108,6 +108,8 @@ extern int sysctl_legacy_va_layout; - extern int sysctl_legacy_va_layout; + extern int page_is_ram(unsigned long pagenr); +extern int devmem_is_allowed(unsigned long pagenr); + #endif /* __ASSEMBLY__ */ #ifdef __ASSEMBLY__ ---- linux-2.6.17.noarch/include/asm-ia64/page.h~ 2006-09-17 11:30:36.000000000 -0400 -+++ linux-2.6.17.noarch/include/asm-ia64/page.h 2006-09-17 11:30:48.000000000 -0400 +diff -uNp linux-2.6.19.noarch/include/asm-ia64/page.h.orig linux-2.6.19.noarch/include/asm-ia64/page.h +--- linux-2.6.19.noarch/include/asm-ia64/page.h.orig 2006-12-23 21:24:24.000000000 +0100 ++++ linux-2.6.19.noarch/include/asm-ia64/page.h 2006-12-23 21:30:02.000000000 +0100 @@ -277,5 +277,6 @@ extern struct address_space xen_ia64_for #endif /* CONFIG_XEN */ @@ -414,56 +452,62 @@ +#define devmem_is_allowed(x) 1 #endif /* __KERNEL__ */ #endif /* _ASM_IA64_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-m68k/page.h linux-1050/include/asm-m68k/page.h ---- linux-1020/include/asm-m68k/page.h -+++ linux-1050/include/asm-m68k/page.h -@@ -190,6 +190,8 @@ static inline void *__va(unsigned long x - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + +=================================================================== +--- linux-2.6.orig/include/asm-m68k/page.h ++++ linux-2.6/include/asm-m68k/page.h +@@ -177,6 +177,8 @@ static inline void *__va(unsigned long x + + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _M68K_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-m68knommu/page.h linux-1050/include/asm-m68knommu/page.h ---- linux-1020/include/asm-m68knommu/page.h -+++ linux-1050/include/asm-m68knommu/page.h -@@ -96,6 +96,8 @@ extern unsigned long memory_end; +Index: linux-2.6/include/asm-m68knommu/page.h +=================================================================== +--- linux-2.6.orig/include/asm-m68knommu/page.h ++++ linux-2.6/include/asm-m68knommu/page.h +@@ -77,6 +77,8 @@ extern unsigned long memory_end; - #endif /* __ASSEMBLY__ */ + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _M68KNOMMU_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-mips/page.h linux-1050/include/asm-mips/page.h ---- linux-1020/include/asm-mips/page.h -+++ linux-1050/include/asm-mips/page.h -@@ -148,4 +148,6 @@ static __inline__ int get_order(unsigned - #define WANT_PAGE_VIRTUAL - #endif +Index: linux-2.6/include/asm-mips/page.h +=================================================================== +--- linux-2.6.orig/include/asm-mips/page.h ++++ linux-2.6/include/asm-mips/page.h +@@ -178,4 +178,6 @@ typedef struct { unsigned long pgprot; } + + #endif /* defined (__KERNEL__) */ +#define devmem_is_allowed(x) 1 + #endif /* _ASM_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-parisc/page.h linux-1050/include/asm-parisc/page.h ---- linux-1020/include/asm-parisc/page.h -+++ linux-1050/include/asm-parisc/page.h -@@ -157,6 +157,8 @@ extern int npmem_ranges; - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +Index: linux-2.6/include/asm-parisc/page.h +=================================================================== +--- linux-2.6.orig/include/asm-parisc/page.h ++++ linux-2.6/include/asm-parisc/page.h +@@ -169,6 +169,8 @@ extern int npmem_ranges; + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _PARISC_PAGE_H */ ---- 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 */ +Index: linux-2.6/include/asm-ppc/page.h +=================================================================== +--- linux-2.6.orig/include/asm-ppc/page.h ++++ linux-2.6/include/asm-ppc/page.h +@@ -173,6 +173,8 @@ extern __inline__ int get_order(unsigned + /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */ #define __HAVE_ARCH_GATE_AREA 1 +#define devmem_is_allowed(x) 1 @@ -471,10 +515,12 @@ #include #endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ ---- linux-2.6.14/include/asm-powerpc/page.h~ 2005-11-15 12:12:43.000000000 -0500 -+++ linux-2.6.14/include/asm-powerpc/page.h 2005-11-15 12:13:21.000000000 -0500 -@@ -174,6 +174,8 @@ extern int page_is_ram(unsigned long pfn - +Index: linux-2.6/include/asm-powerpc/page.h +=================================================================== +--- linux-2.6.orig/include/asm-powerpc/page.h ++++ linux-2.6/include/asm-powerpc/page.h +@@ -191,6 +191,8 @@ extern const char *arch_vma_name(struct + #include #endif /* __ASSEMBLY__ */ +#define devmem_is_allowed(x) 1 @@ -482,56 +528,60 @@ #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-s390/page.h linux-1050/include/asm-s390/page.h ---- linux-1020/include/asm-s390/page.h -+++ linux-1050/include/asm-s390/page.h -@@ -203,6 +203,8 @@ page_get_storage_key(unsigned long addr) - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +Index: linux-2.6/include/asm-s390/page.h +=================================================================== +--- linux-2.6.orig/include/asm-s390/page.h ++++ linux-2.6/include/asm-s390/page.h +@@ -148,6 +148,8 @@ page_get_storage_key(unsigned long addr) + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _S390_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sh/page.h linux-1050/include/asm-sh/page.h ---- linux-1020/include/asm-sh/page.h -+++ linux-1050/include/asm-sh/page.h -@@ -139,6 +139,8 @@ static __inline__ int get_order(unsigned - +Index: linux-2.6/include/asm-sh/page.h +=================================================================== +--- linux-2.6.orig/include/asm-sh/page.h ++++ linux-2.6/include/asm-sh/page.h +@@ -124,5 +124,7 @@ typedef struct { unsigned long pgprot; } + #define __HAVE_ARCH_GATE_AREA #endif +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ - #endif /* __ASM_SH_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sh64/page.h linux-1050/include/asm-sh64/page.h ---- linux-1020/include/asm-sh64/page.h -+++ linux-1050/include/asm-sh64/page.h -@@ -132,6 +132,8 @@ extern __inline__ int get_order(unsigned - - #endif +Index: linux-2.6/include/asm-sh64/page.h +=================================================================== +--- linux-2.6.orig/include/asm-sh64/page.h ++++ linux-2.6/include/asm-sh64/page.h +@@ -115,5 +115,7 @@ typedef struct { unsigned long pgprot; } + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ - #endif /* __ASM_SH64_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-sparc/page.h linux-1050/include/asm-sparc/page.h ---- linux-1020/include/asm-sparc/page.h -+++ linux-1050/include/asm-sparc/page.h -@@ -176,6 +176,8 @@ extern unsigned long pfn_base; - #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +Index: linux-2.6/include/asm-sparc/page.h +=================================================================== +--- linux-2.6.orig/include/asm-sparc/page.h ++++ linux-2.6/include/asm-sparc/page.h +@@ -163,6 +163,8 @@ extern unsigned long pfn_base; + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ #endif /* _SPARC_PAGE_H */ ---- linux-2.6.18.noarch/include/asm-sparc64/page.h~ 2006-10-11 17:32:57.000000000 -0400 -+++ linux-2.6.18.noarch/include/asm-sparc64/page.h 2006-10-11 17:33:07.000000000 -0400 +Index: linux-2.6/include/asm-sparc64/page.h +=================================================================== +--- linux-2.6.orig/include/asm-sparc64/page.h ++++ linux-2.6/include/asm-sparc64/page.h @@ -141,6 +141,8 @@ typedef unsigned long pgprot_t; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) @@ -541,35 +591,38 @@ #include #endif /* __KERNEL__ */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-um/page.h linux-1050/include/asm-um/page.h ---- linux-1020/include/asm-um/page.h -+++ linux-1050/include/asm-um/page.h -@@ -123,6 +123,7 @@ static __inline__ int get_order(unsigned +Index: linux-2.6/include/asm-um/page.h +=================================================================== +--- linux-2.6.orig/include/asm-um/page.h ++++ linux-2.6/include/asm-um/page.h +@@ -113,6 +113,7 @@ extern unsigned long uml_physmem; - extern struct page *arch_validate(struct page *page, int mask, int order); + extern struct page *arch_validate(struct page *page, gfp_t mask, int order); #define HAVE_ARCH_VALIDATE +#define devmem_is_allowed(x) 1 extern void arch_free_page(struct page *page, int order); #define HAVE_ARCH_FREE_PAGE -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-v850/page.h linux-1050/include/asm-v850/page.h ---- linux-1020/include/asm-v850/page.h -+++ linux-1050/include/asm-v850/page.h -@@ -141,6 +141,8 @@ extern __inline__ int get_order (unsigne - #define __va(x) ((void *)__phys_to_virt ((unsigned long)(x))) - +Index: linux-2.6/include/asm-v850/page.h +=================================================================== +--- linux-2.6.orig/include/asm-v850/page.h ++++ linux-2.6/include/asm-v850/page.h +@@ -126,6 +126,8 @@ typedef unsigned long pgprot_t; + #include + #include +#define devmem_is_allowed(x) 1 + #endif /* KERNEL */ #endif /* __V850_PAGE_H__ */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-x86_64/page.h linux-1050/include/asm-x86_64/page.h ---- linux-1020/include/asm-x86_64/page.h -+++ linux-1050/include/asm-x86_64/page.h -@@ -138,6 +138,10 @@ extern __inline__ int get_order(unsigned - - #define __HAVE_ARCH_GATE_AREA 1 +Index: linux-2.6/include/asm-x86_64/page.h +=================================================================== +--- linux-2.6.orig/include/asm-x86_64/page.h ++++ linux-2.6/include/asm-x86_64/page.h +@@ -138,6 +138,10 @@ typedef struct { unsigned long pgprot; } + #include + #include +#ifndef __ASSEMBLY__ +extern int devmem_is_allowed(unsigned long pagenr); @@ -578,34 +631,3 @@ #endif /* __KERNEL__ */ #endif /* _X86_64_PAGE_H */ ---- linux-2.6.13/arch/x86_64/mm/init.c~ 2005-09-13 01:17:03.000000000 -0400 -+++ linux-2.6.13/arch/x86_64/mm/init.c 2005-09-13 01:18:03.000000000 -0400 -@@ -414,6 +414,28 @@ unsigned long next_ram_page (unsigned lo - - EXPORT_SYMBOL_GPL(next_ram_page); - -+static inline int page_is_ram (unsigned long pagenr) -+{ -+ int i; -+ -+ for (i = 0; i < e820.nr_map; i++) { -+ unsigned long addr, end; -+ -+ if (e820.map[i].type != E820_RAM) /* not usable memory */ -+ continue; -+ /* -+ * !!!FIXME!!! Some BIOSen report areas as RAM that -+ * are not. Notably the 640->1Mb area. We need a sanity -+ * check here. -+ */ -+ addr = (e820.map[i].addr+PAGE_SIZE-1) >> PAGE_SHIFT; -+ end = (e820.map[i].addr+e820.map[i].size) >> PAGE_SHIFT; -+ if ((pagenr >= addr) && (pagenr < end)) -+ return 1; -+ } -+ return 0; -+} -+ - /* - * devmem_is_allowed() checks to see if /dev/mem access to a certain address is - * valid. The argument is a physical page number. linux-2.6-drivers-add-qlogic-firmware.patch: Makefile | 3 ql2100_fw.c | 6419 +++++++++++++++++++++++ ql2200_fw.c | 7066 +++++++++++++++++++++++++ ql2300_fw.c |10283 ++++++++++++++++++++++++++++++++++++ ql2322_fw.c |11100 +++++++++++++++++++++++++++++++++++++++ ql2400_fw.c |16705 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qla_os.c | 14 7 files changed, 51583 insertions(+), 7 deletions(-) Index: linux-2.6-drivers-add-qlogic-firmware.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-drivers-add-qlogic-firmware.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-drivers-add-qlogic-firmware.patch 22 Sep 2006 22:46:11 -0000 1.1 +++ linux-2.6-drivers-add-qlogic-firmware.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -22,23 +22,23 @@ diff -pruN a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c --- a/drivers/scsi/qla2xxx/qla_os.c 2006-08-15 10:45:32.000000000 -0400 +++ b/drivers/scsi/qla2xxx/qla_os.c 2006-08-15 10:51:14.000000000 -0400 -@@ -2575,12 +2575,14 @@ qla2x00_down_timeout(struct semaphore *s +@@ -2614,12 +2614,14 @@ qla2x00_down_timeout(struct semaphore *s static DECLARE_MUTEX(qla_fw_lock); +extern struct firmware ql2100_fw, ql2200_fw, ql2300_fw, ql2322_fw, ql2400_fw; + static struct fw_blob qla_fw_blobs[FW_BLOBS] = { -- { .name = "ql2100_fw.bin", .segs = { 0x1000, 0 }, }, -- { .name = "ql2200_fw.bin", .segs = { 0x1000, 0 }, }, -- { .name = "ql2300_fw.bin", .segs = { 0x800, 0 }, }, -- { .name = "ql2322_fw.bin", .segs = { 0x800, 0x1c000, 0x1e000, 0 }, }, -- { .name = "ql2400_fw.bin", }, -+ { .name = "ql2100_fw.bin", .segs = { 0x1000, 0 }, .fw = &ql2100_fw }, -+ { .name = "ql2200_fw.bin", .segs = { 0x1000, 0 }, .fw = &ql2200_fw }, -+ { .name = "ql2300_fw.bin", .segs = { 0x800, 0 }, .fw = &ql2300_fw }, -+ { .name = "ql2322_fw.bin", .segs = { 0x800, 0x1c000, 0x1e000, 0 }, .fw = &ql2322_fw }, -+ { .name = "ql2400_fw.bin", .fw = &ql2400_fw }, +- { .name = FW_FILE_ISP21XX, .segs = { 0x1000, 0 }, }, +- { .name = FW_FILE_ISP22XX, .segs = { 0x1000, 0 }, }, +- { .name = FW_FILE_ISP2300, .segs = { 0x800, 0 }, }, +- { .name = FW_FILE_ISP2322, .segs = { 0x800, 0x1c000, 0x1e000, 0 }, }, +- { .name = FW_FILE_ISP24XX, }, ++ { .name = FW_FILE_ISP21XX, .segs = { 0x1000, 0 }, .fw = &ql2100_fw }, ++ { .name = FW_FILE_ISP22XX, .segs = { 0x1000, 0 }, .fw = &ql2200_fw }, ++ { .name = FW_FILE_ISP2300, .segs = { 0x800, 0 }, .fw = &ql2300_fw }, ++ { .name = FW_FILE_ISP2322, .segs = { 0x800, 0x1c000, 0x1e000, 0 }, .fw = &ql2322_fw }, ++ { .name = FW_FILE_ISP24XX, .fw = &ql2400_fw }, }; struct fw_blob * linux-2.6-execshield.patch: linux-2.6.19.noarch/drivers/char/random.c | 8 + linux-2.6/arch/i386/kernel/cpu/common.c | 7 + linux-2.6/arch/i386/kernel/process.c | 59 +++++++++ linux-2.6/arch/i386/kernel/smp.c | 3 linux-2.6/arch/i386/kernel/sysenter.c | 6 linux-2.6/arch/i386/kernel/traps.c | 93 ++++++++++++++- linux-2.6/arch/i386/mm/init.c | 6 linux-2.6/arch/i386/mm/mmap.c | 6 linux-2.6/arch/i386/mm/pageattr.c | 8 + linux-2.6/arch/ia64/ia32/binfmt_elf32.c | 2 linux-2.6/arch/powerpc/kernel/vdso.c | 3 linux-2.6/arch/x86_64/ia32/ia32_binfmt.c | 6 linux-2.6/arch/x86_64/ia32/syscall32.c | 4 linux-2.6/arch/x86_64/kernel/process.c | 6 linux-2.6/arch/x86_64/kernel/setup64.c | 40 ------ linux-2.6/arch/x86_64/mm/fault.c | 2 linux-2.6/arch/x86_64/mm/mmap.c | 98 ++++++++++++---- linux-2.6/fs/binfmt_elf.c | 134 +++++++++++++++++---- linux-2.6/fs/proc/array.c | 8 - linux-2.6/fs/proc/base.c | 8 - linux-2.6/fs/proc/task_mmu.c | 29 ++++ linux-2.6/include/asm-i386/a.out.h | 2 linux-2.6/include/asm-i386/desc.h | 14 ++ linux-2.6/include/asm-i386/elf.h | 6 linux-2.6/include/asm-i386/mmu.h | 4 linux-2.6/include/asm-i386/page.h | 5 linux-2.6/include/asm-i386/pgalloc.h | 1 linux-2.6/include/asm-i386/processor.h | 8 + linux-2.6/include/asm-ia64/pgalloc.h | 4 linux-2.6/include/asm-powerpc/elf.h | 3 linux-2.6/include/asm-powerpc/pgalloc.h | 5 linux-2.6/include/asm-ppc/pgalloc.h | 5 linux-2.6/include/asm-s390/pgalloc.h | 4 linux-2.6/include/asm-sparc/pgalloc.h | 4 linux-2.6/include/asm-sparc64/pgalloc.h | 4 linux-2.6/include/asm-x86_64/pgalloc.h | 7 + linux-2.6/include/linux/mm.h | 16 ++ linux-2.6/include/linux/resource.h | 5 linux-2.6/include/linux/sched.h | 9 + linux-2.6/include/linux/sysctl.h | 3 linux-2.6/kernel/signal.c | 33 +++++ linux-2.6/kernel/sysctl.c | 56 +++++++++ linux-2.6/mm/fremap.c | 16 +- linux-2.6/mm/mmap.c | 183 ++++++++++++++++++++++++++++-- linux-2.6/mm/mprotect.c | 6 linux-2.6/mm/mremap.c | 4 46 files changed, 798 insertions(+), 145 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.26 -r 1.27 linux-2.6-execshield.patch Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-execshield.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- linux-2.6-execshield.patch 15 Dec 2006 15:19:11 -0000 1.26 +++ linux-2.6-execshield.patch 31 Jan 2007 15:26:15 -0000 1.27 @@ -1,7 +1,8 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-802/arch/i386/kernel/cpu/common.c linux-810/arch/i386/kernel/cpu/common.c ---- linux-802/arch/i386/kernel/cpu/common.c -+++ linux-810/arch/i386/kernel/cpu/common.c -@@ -428,6 +428,13 @@ void __cpuinit identify_cpu(struct cpuin +Index: linux-2.6/arch/i386/kernel/cpu/common.c +=================================================================== +--- linux-2.6.orig/arch/i386/kernel/cpu/common.c ++++ linux-2.6/arch/i386/kernel/cpu/common.c +@@ -437,6 +437,13 @@ void __cpuinit identify_cpu(struct cpuin if (disable_pse) clear_bit(X86_FEATURE_PSE, c->x86_capability); @@ -15,10 +16,11 @@ /* If the model name is still unset, do table lookup. */ if ( !c->x86_model_id[0] ) { char *p; -diff -urNp --exclude-from=/home/davej/.exclude linux-802/arch/i386/kernel/process.c linux-810/arch/i386/kernel/process.c ---- linux-802/arch/i386/kernel/process.c -+++ linux-810/arch/i386/kernel/process.c -@@ -641,6 +641,8 @@ struct task_struct fastcall * __switch_t +Index: linux-2.6/arch/i386/kernel/process.c +=================================================================== +--- linux-2.6.orig/arch/i386/kernel/process.c ++++ linux-2.6/arch/i386/kernel/process.c +@@ -647,6 +647,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -27,7 +29,7 @@ /* * Reload esp0. -@@ -901,3 +903,60 @@ unsigned long arch_align_stack(unsigned +@@ -907,3 +909,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } @@ -88,9 +90,10 @@ + current->mm->brk = new_brk; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-802/arch/i386/kernel/smp.c linux-810/arch/i386/kernel/smp.c ---- linux-802/arch/i386/kernel/smp.c -+++ linux-810/arch/i386/kernel/smp.c +Index: linux-2.6/arch/i386/kernel/smp.c +=================================================================== +--- linux-2.6.orig/arch/i386/kernel/smp.c ++++ linux-2.6/arch/i386/kernel/smp.c @@ -23,6 +23,7 @@ #include @@ -99,7 +102,7 @@ #include /* -@@ -324,6 +325,8 @@ fastcall void smp_invalidate_interrupt(s +@@ -325,6 +326,8 @@ fastcall void smp_invalidate_interrupt(s unsigned long cpu; cpu = get_cpu(); @@ -108,9 +111,10 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; -diff -urNp --exclude-from=/home/davej/.exclude linux-802/arch/i386/kernel/sysenter.c linux-810/arch/i386/kernel/sysenter.c ---- linux-802/arch/i386/kernel/sysenter.c -+++ linux-810/arch/i386/kernel/sysenter.c +Index: linux-2.6/arch/i386/kernel/sysenter.c +=================================================================== +--- linux-2.6.orig/arch/i386/kernel/sysenter.c ++++ linux-2.6/arch/i386/kernel/sysenter.c @@ -16,6 +16,7 @@ #include #include @@ -138,1701 +142,1721 @@ if (IS_ERR_VALUE(addr)) { ret = addr; goto up_fail; -diff -urNp --exclude-from=/home/davej/.exclude linux-802/arch/i386/kernel/traps.c linux-810/arch/i386/kernel/traps.c ---- linux-802/arch/i386/kernel/traps.c -+++ linux-810/arch/i386/kernel/traps.c -@@ -625,7 +625,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) --DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0) +Index: linux-2.6/kernel/sysctl.c +=================================================================== +--- linux-2.6.orig/kernel/sysctl.c ++++ linux-2.6/kernel/sysctl.c +@@ -77,6 +77,28 @@ extern int sysctl_drop_caches; + extern int percpu_pagelist_fraction; + extern int compat_log; + ++extern unsigned int vdso_enabled, vdso_populate; + ++int exec_shield = (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: force noexecstack regardless of PT_GNU_STACK ++ The old settings ++ (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) ++ are ignored because the vdso is placed completely randomly ++*/ + -+/* -+ * lazy-check for CS validity on exec-shield binaries: -+ * -+ * the original non-exec stack patch was written by -+ * Solar Designer . Thanks! -+ */ -+static int -+check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code) ++static int __init setup_exec_shield(char *str) +{ -+ struct desc_struct *desc1, *desc2; -+ struct vm_area_struct *vma; -+ unsigned long limit; -+ -+ if (current->mm == NULL) -+ return 0; -+ -+ limit = -1UL; -+ if (current->mm->context.exec_limit != -1UL) { -+ limit = PAGE_SIZE; -+ spin_lock(¤t->mm->page_table_lock); -+ for (vma = current->mm->mmap; vma; vma = vma->vm_next) -+ if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit)) -+ limit = vma->vm_end; -+ spin_unlock(¤t->mm->page_table_lock); -+ if (limit >= TASK_SIZE) -+ limit = -1UL; -+ current->mm->context.exec_limit = limit; -+ } -+ set_user_cs(¤t->mm->context.user_cs, limit); -+ -+ desc1 = ¤t->mm->context.user_cs; -+ desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; -+ -+ if (desc1->a != desc2->a || desc1->b != desc2->b) { -+ /* -+ * The CS was not in sync - reload it and retry the -+ * instruction. If the instruction still faults then -+ * we won't hit this branch next time around. -+ */ -+ if (print_fatal_signals >= 2) { -+ printk("#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code, error_code/8, regs->eip, smp_processor_id()); -+ printk(" exec_limit: %08lx, user_cs: %08lx/%08lx, CPU_cs: %08lx/%08lx.\n", current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b); -+ } -+ load_user_cs_desc(cpu, current->mm); -+ return 1; -+ } ++ get_option (&str, &exec_shield); + -+ return 0; ++ return 1; +} + -+/* -+ * The fixup code for errors in iret jumps to here (iret_exc). It loses -+ * the original trap number and error code. The bogus trap 32 and error -+ * code 0 are what the vanilla kernel delivers via: -+ * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0) -+ * -+ * In case of a general protection fault in the iret instruction, we -+ * need to check for a lazy CS update for exec-shield. -+ */ -+fastcall void do_iret_error(struct pt_regs *regs, long error_code) -+{ -+ int ok = check_lazy_exec_limit(get_cpu(), regs, error_code); -+ put_cpu(); -+ if (!ok && notify_die(DIE_TRAP, "iret exception", regs, -+ error_code, 32, SIGSEGV) != NOTIFY_STOP) { -+ siginfo_t info; -+ info.si_signo = SIGSEGV; -+ info.si_errno = 0; -+ info.si_code = ILL_BADSTK; -+ info.si_addr = 0; -+ do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code, -+ &info); -+ } -+} ++__setup("exec-shield=", setup_exec_shield); ++ + /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ + static int maxolduid = 65535; + static int minolduid; +@@ -331,6 +353,40 @@ static ctl_table kern_table[] = { + .proc_handler = &proc_dointvec, [...2979 lines suppressed...] - } -+ + KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ +Index: linux-2.6/kernel/signal.c +=================================================================== +--- linux-2.6.orig/kernel/signal.c ++++ linux-2.6/kernel/signal.c +@@ -764,6 +764,37 @@ out_set: + #define LEGACY_QUEUE(sigptr, sig) \ + (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) + ++int print_fatal_signals = 0; + -+static struct page * -+special_mapping_nopage(struct vm_area_struct *vma, -+ unsigned long address, int *type) ++static void print_fatal_signal(struct pt_regs *regs, int signr) +{ -+ struct page **pages; -+ -+ BUG_ON(address < vma->vm_start || address >= vma->vm_end); ++ printk("%s/%d: potentially unexpected fatal signal %d.\n", ++ current->comm, current->pid, signr); + -+ address -= vma->vm_start; -+ for (pages = vma->vm_private_data; address > 0 && *pages; ++pages) -+ address -= PAGE_SIZE; ++#ifdef __i386__ ++ printk("code at %08lx: ", regs->eip); ++ { ++ int i; ++ for (i = 0; i < 16; i++) { ++ unsigned char insn; + -+ if (*pages) { -+ get_page(*pages); -+ return *pages; ++ __get_user(insn, (unsigned char *)(regs->eip + i)); ++ printk("%02x ", insn); ++ } + } -+ -+ return NOPAGE_SIGBUS; ++#endif ++ printk("\n"); ++ show_regs(regs); +} + -+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) ++static int __init setup_print_fatal_signals(char *str) +{ -+ 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; ++ get_option (&str, &print_fatal_signals); + -+ if (!vdso_populate) -+ return 0; ++ return 1; ++} + -+ 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; ++__setup("print-fatal-signals=", setup_print_fatal_signals); + + static int + specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1795,6 +1826,8 @@ relock: + * Anything else is fatal, maybe with a core dump. + */ + current->flags |= PF_SIGNALED; ++ if (print_fatal_signals) ++ print_fatal_signal(regs, signr); + if (sig_kernel_coredump(signr)) { + /* + * If it was able to dump core, this kills all +Index: linux-2.6/mm/fremap.c +=================================================================== +--- linux-2.6.orig/mm/fremap.c ++++ linux-2.6/mm/fremap.c +@@ -67,13 +67,15 @@ int install_page(struct mm_struct *mm, s + * caller about it. + */ + err = -EINVAL; +- inode = vma->vm_file->f_mapping->host; +- size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; +- if (!page->mapping || page->index >= size) +- goto unlock; +- err = -ENOMEM; +- if (page_mapcount(page) > INT_MAX/2) +- goto unlock; ++ if (vma->vm_file) { ++ inode = vma->vm_file->f_mapping->host; ++ size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; ++ if (!page->mapping || page->index >= size) ++ goto unlock; ++ err = -ENOMEM; ++ if (page_mapcount(page) > INT_MAX/2) ++ goto unlock; + } -+ -+ return err; -+} -diff -urNp --exclude-from=/home/davej/.exclude linux-802/mm/mprotect.c linux-810/mm/mprotect.c ---- linux-802/mm/mprotect.c -+++ linux-810/mm/mprotect.c + + if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) + inc_mm_counter(mm, file_rss); +Index: linux-2.6/mm/mprotect.c +=================================================================== +--- linux-2.6.orig/mm/mprotect.c ++++ linux-2.6/mm/mprotect.c @@ -23,6 +23,7 @@ #include #include @@ -1841,28 +1865,30 @@ #include #include -@@ -122,7 +123,7 @@ mprotect_fixup(struct vm_area_struct *vm +@@ -135,7 +136,7 @@ mprotect_fixup(struct vm_area_struct *vm struct mm_struct *mm = vma->vm_mm; unsigned long oldflags = vma->vm_flags; long nrpages = (end - start) >> PAGE_SHIFT; - unsigned long charged = 0; + unsigned long charged = 0, old_end = vma->vm_end; - unsigned int mask; - pgprot_t newprot; pgoff_t pgoff; -@@ -190,6 +191,8 @@ success: - */ - vma->vm_flags = newflags; - vma->vm_page_prot = newprot; + int error; + int dirty_accountable = 0; +@@ -201,6 +202,9 @@ success: + dirty_accountable = 1; + } + + if (oldflags & VM_EXEC) + arch_remove_exec_range(current->mm, old_end); ++ if (is_vm_hugetlb_page(vma)) - hugetlb_change_protection(vma, start, end, newprot); + hugetlb_change_protection(vma, start, end, vma->vm_page_prot); else -diff -urNp --exclude-from=/home/davej/.exclude linux-802/mm/mremap.c linux-810/mm/mremap.c ---- linux-802/mm/mremap.c -+++ linux-810/mm/mremap.c -@@ -387,8 +387,8 @@ unsigned long do_mremap(unsigned long ad +Index: linux-2.6/mm/mremap.c +=================================================================== +--- linux-2.6.orig/mm/mremap.c ++++ linux-2.6/mm/mremap.c +@@ -389,8 +389,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; linux-2.6-lockdep-fixes.patch: services.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 linux-2.6-lockdep-fixes.patch Index: linux-2.6-lockdep-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-lockdep-fixes.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-lockdep-fixes.patch 1 Nov 2006 18:00:26 -0000 1.7 +++ linux-2.6-lockdep-fixes.patch 31 Jan 2007 15:26:15 -0000 1.8 @@ -1,3582 +1,29 @@ -From davej Tue Jul 4 14:33:56 2006 -Return-path: -X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on - nwo.kernelslacker.org -X-Spam-Level: -X-Spam-Status: No, score=-2.5 required=5.0 tests=AWL,BAYES_00 autolearn=ham - version=3.1.3 -Envelope-to: davej at kernelslacker.org -Delivery-date: Tue, 04 Jul 2006 19:33:38 +0100 -Received: from testure.choralone.org [194.9.77.134] - by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4) - for (single-drop); Tue, 04 Jul 2006 14:33:56 -0400 (EDT) -Received: from vger.kernel.org ([209.132.176.167]) - by testure.choralone.org with esmtp (Exim 4.62) - (envelope-from ) - id 1FxpiM-0006Ou-0k - for davej at kernelslacker.org; Tue, 04 Jul 2006 19:33:38 +0100 -Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand - id S932295AbWGDSc4 (ORCPT ); - Tue, 4 Jul 2006 14:32:56 -0400 -Received: (majordomo at vger.kernel.org) by vger.kernel.org id S932327AbWGDSc4 - (ORCPT ); - Tue, 4 Jul 2006 14:32:56 -0400 -Received: from pentafluge.infradead.org ([213.146.154.40]:54679 "EHLO - pentafluge.infradead.org") by vger.kernel.org with ESMTP - id S932295AbWGDScz (ORCPT ); - Tue, 4 Jul 2006 14:32:55 -0400 -Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43]) - by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux)) - id 1FxphZ-00035i-H1; Tue, 04 Jul 2006 19:32:49 +0100 -Subject: Re: [2.6.17-git22] lock debugging output -From: Arjan van de Ven -To: Alessandro Suardi -Cc: akpm at osdl.org, mingo at elte.hu, - Linux Kernel , - netdev at vger.kernel.org -In-Reply-To: <5a4c581d0607041113o2993cbf5m7011b2a06e96d974 at mail.gmail.com> -References: <5a4c581d0607041113o2993cbf5m7011b2a06e96d974 at mail.gmail.com> -Content-Type: text/plain -Date: Tue, 04 Jul 2006 20:32:46 +0200 -Message-Id: <1152037966.3109.91.camel at laptopd505.fenrus.org> -Mime-Version: 1.0 -X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) -Content-Transfer-Encoding: 7bit -X-SRS-Rewrite: SMTP reverse-path rewritten from by pentafluge.infradead.org - See http://www.infradead.org/rpr.html -Sender: linux-kernel-owner at vger.kernel.org -Precedence: bulk -X-Mailing-List: linux-kernel at vger.kernel.org -Status: RO -Content-Length: 2470 -Lines: 75 - -From: Arjan van de Ven - -On Tue, 2006-07-04 at 20:13 +0200, Alessandro Suardi wrote: -> Hoping gmail doesn't mess it too badly... -> -> eth0: tg3 (BCM5751 Gbit Ethernet) -> eth1: ipw2200 (Intel PRO/Wireless 2200BG) -> -> Sequence: -> 1. boot with eth0 disconnected (eth1 doesn't come up on boot) -> 2. ifup eth1, bring wpa-supplicant up -> 3. run 'dig' ---> - - -this appears to be a real deadlock: - -the SO_BINDTODEVICE ioctl calls sk_dst_reset(), which looks like this: -static inline void -sk_dst_reset(struct sock *sk) -{ - write_lock(&sk->sk_dst_lock); - __sk_dst_reset(sk); - write_unlock(&sk->sk_dst_lock); -} - -now... ipv6 does this in softirq context: - [] sk_dst_check+0x1b/0xe6 - [] ip6_dst_lookup+0x31/0x16d [ipv6] - [] icmpv6_send+0x332/0x549 [ipv6] - [] udpv6_rcv+0x4ab/0x4d6 [ipv6] - [] ip6_input+0x19c/0x228 [ipv6] - [] ipv6_rcv+0x188/0x1b7 [ipv6] - [] netif_receive_skb+0x18d/0x1d8 - [] process_backlog+0x80/0xf9 - [] net_rx_action+0x80/0x174 - [] __do_softirq+0x46/0x9c - [] do_softirq+0x4d/0xac - -where sk_dst_check() takes the same lock for read. - -that looks like a real deadlock to me... -the most obvious low impact solution is to make sk_dst_reset use an -irqsave variant; patch for that is attached below. I'll leave it to the -networking people to say if that's the real right approach - -Signed-off-by: Arjan van de Ven - ---- - include/net/sock.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: linux-2.6.17-mm6/include/net/sock.h -=================================================================== ---- linux-2.6.17-mm6.orig/include/net/sock.h -+++ linux-2.6.17-mm6/include/net/sock.h -@@ -1025,9 +1025,10 @@ __sk_dst_reset(struct sock *sk) - static inline void - sk_dst_reset(struct sock *sk) - { -- write_lock(&sk->sk_dst_lock); -+ unsigned long flags; -+ write_lock_irqsave(&sk->sk_dst_lock, flags); - __sk_dst_reset(sk); -- write_unlock(&sk->sk_dst_lock); -+ write_unlock_irqrestore(&sk->sk_dst_lock, flags); - } - - extern struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie); - - -- -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/ - -From davej Mon Jul 10 11:13:32 2006 -Return-Path: -X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on - nwo.kernelslacker.org -X-Spam-Level: -X-Spam-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00, - UNPARSEABLE_RELAY autolearn=ham version=3.1.3 -Received: from pobox.devel.redhat.com [10.11.255.8] - by nwo.kernelslacker.org with IMAP (fetchmail-6.3.4) - for (single-drop); Mon, 10 Jul 2006 11:13:32 -0400 (EDT) -Received: from pobox.devel.redhat.com ([unix socket]) - by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA; - Mon, 10 Jul 2006 11:12:55 -0400 -X-Sieve: CMU Sieve 2.2 -Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) - by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k6AFCtN4021006; - Mon, 10 Jul 2006 11:12:55 -0400 -Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) - by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6AFCtPL011743; - Mon, 10 Jul 2006 11:12:55 -0400 -Received: from pentafluge.infradead.org (pentafluge.infradead.org [213.146.154.40]) - by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k6AFCr4C009817; - Mon, 10 Jul 2006 11:12:53 -0400 -Received: from a222036.upc-a.chello.nl ([62.163.222.36] helo=[172.31.3.43]) - by pentafluge.infradead.org with esmtpsa (Exim 4.62 #1 (Red Hat Linux)) - id 1FzxRM-0000xQ-Cp; Mon, 10 Jul 2006 16:12:52 +0100 -Subject: Re: lockdep input layer warnings. -From: Arjan van de Ven -To: Dmitry Torokhov -Cc: Dave Jones , mingo at redhat.com, - Linux Kernel -In-Reply-To: -References: <20060706173411.GA2538 at redhat.com> - - <1152212575.3084.88.camel at laptopd505.fenrus.org> - -Content-Type: text/plain -Date: Mon, 10 Jul 2006 17:12:51 +0200 -Message-Id: <1152544371.4874.66.camel at laptopd505.fenrus.org> -Mime-Version: 1.0 -X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) -Content-Transfer-Encoding: 7bit -X-SRS-Rewrite: SMTP reverse-path rewritten from by pentafluge.infradead.org - See http://www.infradead.org/rpr.html -X-RedHat-Spam-Score: 2.646 ** -Status: RO -Content-Length: 3434 -Lines: 85 - -On Thu, 2006-07-06 at 16:29 -0400, Dmitry Torokhov wrote: -> On 7/6/06, Arjan van de Ven wrote: -> > On Thu, 2006-07-06 at 14:37 -0400, Dmitry Torokhov wrote: -> > > On 7/6/06, Dave Jones wrote: -> > > > One of our Fedora-devel users picked up on this this morning -> > > > in an 18rc1 based kernel. -> > > > -> > > > Dave -> > > > -> > > > -> > > > Synaptics Touchpad, model: 1, fw: 5.9, id: 0x2c6ab1, caps: 0x884793/0x0 -> > > > serio: Synaptics pass-through port at isa0060/serio1/input0 -> > > > input: SynPS/2 Synaptics TouchPad as /class/input/input1 [...3220 lines suppressed...] - -Signed-off-by: Peter Zijlstra ---- - kernel/fork.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: linux-2.6.18.noarch/kernel/fork.c -=================================================================== ---- linux-2.6.18.noarch.orig/kernel/fork.c -+++ linux-2.6.18.noarch/kernel/fork.c -@@ -979,6 +979,8 @@ static struct task_struct *copy_process( - if (!p) - goto fork_out; - -+ rt_mutex_init_task(p); -+ - p->tux_info = NULL; - - #ifdef CONFIG_TRACE_IRQFLAGS -@@ -1084,8 +1086,6 @@ static struct task_struct *copy_process( - p->lockdep_recursion = 0; - #endif - -- rt_mutex_init_task(p); -- - #ifdef CONFIG_DEBUG_MUTEXES - p->blocked_on = NULL; /* not blocked yet */ - #endif - - -From davej Mon Oct 9 14:17:42 2006 -Return-Path: -X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on - pressure.kernelslacker.org -X-Spam-Level: -X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00, - UNPARSEABLE_RELAY autolearn=ham version=3.1.4 -Received: from pobox.devel.redhat.com [10.11.255.8] - by pressure.kernelslacker.org with IMAP (fetchmail-6.3.4) - for (single-drop); Mon, 09 Oct 2006 14:17:42 -0400 (EDT) -Received: from pobox.devel.redhat.com ([unix socket]) - by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA; - Mon, 09 Oct 2006 14:15:17 -0400 -X-Sieve: CMU Sieve 2.2 -Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) - by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k99IFH3U012252; - Mon, 9 Oct 2006 14:15:17 -0400 -Received: from post-office.corp.redhat.com (post-office.corp.redhat.com [172.16.52.227]) - by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k99IFAep023131; - Mon, 9 Oct 2006 14:15:10 -0400 -Received: from post-office.corp.redhat.com (localhost.localdomain [127.0.0.1]) - by post-office.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k99IFAl03667; - Mon, 9 Oct 2006 14:15:10 -0400 -Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) - by post-office.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k99IEhl03467 - for ; Mon, 9 Oct 2006 14:14:43 -0400 -Received: from pobox.stuttgart.redhat.com (pobox.stuttgart.redhat.com [172.16.2.10]) - by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k99IEgna022875 - for ; Mon, 9 Oct 2006 14:14:42 -0400 -Received: from vpn-4-63.str.redhat.com (vpn-4-63.str.redhat.com [10.32.4.63]) - by pobox.stuttgart.redhat.com (8.12.8/8.12.8) with ESMTP id k99IEeUa001189; - Mon, 9 Oct 2006 20:14:40 +0200 -Subject: [RHEL5 PATCH] lockdep: annotate i386-apm irq usage -From: Peter Zijlstra -To: rhkernel-list at redhat.com -Cc: Don Zickus -Content-Type: text/plain -Message-Id: <1160417678.7005.3.camel at lappy> -Mime-Version: 1.0 -X-Mailer: Evolution 2.6.1 -Content-Transfer-Encoding: 7bit -X-loop: rhkernel-list at redhat.com -Sender: rhkernel-list-admin at redhat.com -Errors-To: rhkernel-list-admin at redhat.com -X-BeenThere: rhkernel-list at redhat.com -X-Mailman-Version: 2.0.13 -Precedence: bulk -Reply-To: rhkernel-list at redhat.com -List-Help: -List-Post: -List-Subscribe: , - -List-Id: Red Hat INTERNAL-ONLY kernel discussion list -List-Unsubscribe: , - -List-Archive: -Date: Mon, 09 Oct 2006 20:14:38 +0200 -Status: RO -Content-Length: 2405 -Lines: 79 - -BZ209480 - ---- - -Lockdep doesn't like to enable interrupts when they are enabled already. - -BUG: warning at kernel/lockdep.c:1814/trace_hardirqs_on() (Not tainted) - [] show_trace_log_lvl+0x58/0x16a - [] show_trace+0xd/0x10 - [] dump_stack+0x19/0x1b - [] trace_hardirqs_on+0xa2/0x11e - [] apm_bios_call_simple+0xcd/0xfd - [] apm+0x92/0x5b1 - [] kernel_thread_helper+0x5/0xb -DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb -Leftover inexact backtrace: - [] show_trace+0xd/0x10 - [] dump_stack+0x19/0x1b - [] trace_hardirqs_on+0xa2/0x11e - [] apm_bios_call_simple+0xcd/0xfd - [] apm+0x92/0x5b1 - [] kernel_thread_helper+0x5/0xb - -Signed-off-by: Peter Zijlstra ---- - arch/i386/kernel/apm.c | 25 ++++++++++++++++++------- - 1 file changed, 18 insertions(+), 7 deletions(-) - -Index: linux-2.6.18.noarch/arch/i386/kernel/apm.c -=================================================================== ---- linux-2.6.18.noarch.orig/arch/i386/kernel/apm.c -+++ linux-2.6.18.noarch/arch/i386/kernel/apm.c -@@ -539,11 +539,22 @@ static inline void apm_restore_cpus(cpum - * Also, we KNOW that for the non error case of apm_bios_call, there - * is no useful data returned in the low order 8 bits of eax. - */ --#define APM_DO_CLI \ -- if (apm_info.allow_ints) \ -- local_irq_enable(); \ -- else \ -- local_irq_disable(); -+#define APM_DO_CLI \ -+ do { \ -+ if (apm_info.allow_ints) { \ -+ if (irqs_disabled_flags(flags)) \ -+ local_irq_enable(); \ -+ } else \ -+ local_irq_disable(); \ -+ } while (0) -+ -+#define APM_DO_STI \ -+ do { \ -+ if (irqs_disabled_flags(flags)) \ -+ local_irq_disable(); \ -+ else if (irqs_disabled()) \ -+ local_irq_enable(); \ -+ } while (0) - - #ifdef APM_ZERO_SEGS - # define APM_DECL_SEGS \ -@@ -600,7 +611,7 @@ static u8 apm_bios_call(u32 func, u32 eb - APM_DO_SAVE_SEGS; - apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi); - APM_DO_RESTORE_SEGS; -- local_irq_restore(flags); -+ APM_DO_STI; - gdt[0x40 / 8] = save_desc_40; - put_cpu(); - apm_restore_cpus(cpus); -@@ -644,7 +655,7 @@ static u8 apm_bios_call_simple(u32 func, - APM_DO_SAVE_SEGS; - error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax); - APM_DO_RESTORE_SEGS; -- local_irq_restore(flags); -+ APM_DO_STI; - gdt[0x40 / 8] = save_desc_40; - put_cpu(); - apm_restore_cpus(cpus); - - +Subject: netlabel locking problems +From: Eric Paris +To: davej at redhat.com + +do not call a sleeping lock API in an RCU read section. +lock_sock_nested can sleep, its BH counterpart doesn't. +selinux_netlbl_inode_permission() needs to use the BH counterpart +unconditionally. + +added BH disabling, because this function can be called from non-atomic +contexts too, so a naked bh_lock_sock() would be deadlock-prone. + + +--- linux-2.6.19.noarch/security/selinux/ss/services.c~ 2007-01-08 13:55:02.000000000 -0500 ++++ linux-2.6.19.noarch/security/selinux/ss/services.c 2007-01-08 14:05:06.000000000 -0500 +@@ -2585,9 +2585,11 @@ int selinux_netlbl_inode_permission(stru + mutex_lock(&isec->lock); + if (unlikely(sksec->nlbl_state == NLBL_REQUIRE && + (mask & (MAY_WRITE | MAY_APPEND)))) { +- lock_sock(sock->sk); ++ local_bh_disable(); ++ bh_lock_sock_nested(sock->sk); + rc = selinux_netlbl_socket_setsid(sock, sksec->sid); +- release_sock(sock->sk); ++ bh_unlock_sock(sock->sk); ++ local_bh_enable(); + } else + rc = 0; + mutex_unlock(&isec->lock); linux-2.6-modsign-core.patch: include/linux/module.h | 3 init/Kconfig | 18 + kernel/Makefile | 1 kernel/module-verify-sig.c | 450 +++++++++++++++++++++++++++++++++++++++++++++ kernel/module-verify.c | 5 kernel/module-verify.h | 12 + kernel/module.c | 12 + 7 files changed, 498 insertions(+), 3 deletions(-) Index: linux-2.6-modsign-core.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-modsign-core.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-modsign-core.patch 22 Sep 2006 22:43:07 -0000 1.3 +++ linux-2.6-modsign-core.patch 31 Jan 2007 15:26:15 -0000 1.4 @@ -1,22 +1,43 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-811/include/linux/module.h linux-900/include/linux/module.h ---- linux-811/include/linux/module.h -+++ linux-900/include/linux/module.h -@@ -277,6 +277,9 @@ struct module - - /* Am I GPL-compatible */ - int license_gplok; -+ -+ /* Am I gpg signed */ -+ int gpgsig_ok; +MODSIGN: Apply signature checking to modules on module load + +From: David Howells + +Apply signature checking to modules on module load, checking the signature +against the ring of public keys compiled into the kernel. + +Signed-Off-By: David Howells +--- + + include/linux/module.h | 3 + init/Kconfig | 18 ++ + kernel/Makefile | 1 + kernel/module-verify-sig.c | 450 ++++++++++++++++++++++++++++++++++++++++++++ + kernel/module-verify.c | 5 + kernel/module-verify.h | 12 + + kernel/module.c | 12 + + 7 files changed, 498 insertions(+), 3 deletions(-) + +diff --git a/include/linux/module.h b/include/linux/module.h +index 10f771a..159560d 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -326,6 +326,9 @@ #ifdef CONFIG_GENERIC_BUG + unsigned num_bugs; + #endif ++ /* Is this module GPG signed */ ++ int gpgsig_ok; ++ #ifdef CONFIG_MODULE_UNLOAD /* Reference counts */ -diff -urNp --exclude-from=/home/davej/.exclude linux-811/init/Kconfig linux-900/init/Kconfig ---- linux-811/init/Kconfig -+++ linux-900/init/Kconfig -@@ -434,6 +434,22 @@ config MODULE_SRCVERSION_ALL - the version). With this option, such a "srcversion" field - will be created for all modules. If unsure, say N. + struct module_ref ref[NR_CPUS]; +diff --git a/init/Kconfig b/init/Kconfig +index d1ca69b..b03e9f3 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -555,10 +555,26 @@ config MODULE_VERIFY_ELF + help + Check ELF structure of modules upon load +config MODULE_SIG + bool "Module signature verification (EXPERIMENTAL)" @@ -34,467 +55,32 @@ + Reject unsigned modules or signed modules for which we don't have a + key. + + config MODULE_VERIFY + bool + depends on MODULES +- default y if MODULE_VERIFY_ELF ++ default y if MODULE_VERIFY_ELF || MODULE_SIG + config KMOD bool "Automatic kernel module loading" - depends on MODULES ---- linux-2.6.17.noarch/kernel/Makefile~ 2006-06-21 23:47:11.000000000 -0400 -+++ linux-2.6.17.noarch/kernel/Makefile 2006-06-21 23:47:19.000000000 -0400 -@@ -19,7 +19,8 @@ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o - obj-$(CONFIG_SMP) += cpu.o spinlock.o - obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o - obj-$(CONFIG_UID16) += uid16.o --obj-$(CONFIG_MODULES) += module.o -+obj-$(CONFIG_MODULES) += module.o module-verify.o +diff --git a/kernel/Makefile b/kernel/Makefile +index 5ed0824..715da89 100644 +--- a/kernel/Makefile ++++ b/kernel/Makefile +@@ -32,6 +32,7 @@ obj-$(CONFIG_UID16) += uid16.o + obj-$(CONFIG_MODULES) += module.o + obj-$(CONFIG_MODULE_VERIFY) += module-verify.o + obj-$(CONFIG_MODULE_VERIFY_ELF) += module-verify-elf.o +obj-$(CONFIG_MODULE_SIG) += module-verify-sig.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 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include "module-verify.h" - - #if 0 - #define DEBUGP printk -@@ -1413,6 +1414,7 @@ static struct module *load_module(void _ - long err = 0; - void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ - struct exception_table_entry *extable; - mm_segment_t old_fs; -+ int gpgsig_ok; - - DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n", -@@ -1438,8 +1440,13 @@ static struct module *load_module(void _ - goto free_hdr; - } - -- if (len < hdr->e_shoff + hdr->e_shnum * sizeof(Elf_Shdr)) -- goto truncated; -+ /* verify the module (validates ELF and checks signature) */ -+ gpgsig_ok = 0; -+ err = module_verify(hdr, len); -+ if (err < 0) -+ goto free_hdr; -+ if (err == 1) -+ gpgsig_ok = 1; - - /* Convenience variables */ - sechdrs = (void *)hdr + hdr->e_shoff; -@@ -1476,6 +1483,7 @@ static struct module *load_module(void _ - goto free_hdr; - } - mod = (void *)sechdrs[modindex].sh_addr; -+ mod->gpgsig_ok = gpgsig_ok; - - if (symindex == 0) { - printk(KERN_WARNING "%s: module has no symbols (stripped?)\n", -@@ -2078,8 +2086,13 @@ void print_modules(void) - struct module *mod; - - printk("Modules linked in:"); -- list_for_each_entry(mod, &modules, list) -+ list_for_each_entry(mod, &modules, list) { - printk(" %s", mod->name); -+#if CONFIG_MODULE_SIG -+ if (!mod->gpgsig_ok) -+ printk("(U)"); -+#endif -+ } - printk("\n"); - } - -diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.c linux-900/kernel/module-verify.c ---- linux-811/kernel/module-verify.c -+++ linux-900/kernel/module-verify.c -@@ -0,0 +1,339 @@ -+/* module-verify.c: module verifier -+ * -+ * Written by David Howells (dhowells at redhat.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include "module-verify.h" -+ -+#if 0 -+#define _debug(FMT, ...) printk(FMT, ##__VA_ARGS__) -+#else -+#define _debug(FMT, ...) do {} while (0) -+#endif -+ -+static int module_verify_elf(struct module_verify_data *mvdata); -+ -+/*****************************************************************************/ -+/* -+ * verify a module's integrity -+ * - check the ELF is viable -+ * - check the module's signature if it has one -+ */ -+int module_verify(const Elf_Ehdr *hdr, size_t size) -+{ -+ struct module_verify_data mvdata; -+ int ret; -+ -+ memset(&mvdata, 0, sizeof(mvdata)); -+ mvdata.buffer = hdr; -+ mvdata.hdr = hdr; -+ mvdata.size = size; -+ -+ ret = module_verify_elf(&mvdata); -+ if (ret < 0) { -+ if (ret == -ELIBBAD) -+ printk("Module failed ELF checks\n"); -+ goto error; -+ } -+ -+#ifdef CONFIG_MODULE_SIG -+ ret = module_verify_signature(&mvdata); -+#endif -+ -+ error: -+ kfree(mvdata.secsizes); -+ kfree(mvdata.canonlist); -+ return ret; -+ -+} /* end module_verify() */ -+ -+/*****************************************************************************/ -+/* -+ * verify the ELF structure of a module -+ */ -+static int module_verify_elf(struct module_verify_data *mvdata) -+{ -+ const Elf_Ehdr *hdr = mvdata->hdr; -+ const Elf_Shdr *section, *section2, *secstop; -+ const Elf_Rela *relas, *rela, *relastop; -+ const Elf_Rel *rels, *rel, *relstop; -+ const Elf_Sym *symbol, *symstop; -+ size_t size, sssize, *secsize, tmp, tmp2; -+ long last; -+ int line; -+ -+ size = mvdata->size; -+ mvdata->nsects = hdr->e_shnum; -+ -+#define elfcheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto elfcheck_error; } } while(0) -+ -+#define seccheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto seccheck_error; } } while(0) -+ -+#define symcheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto symcheck_error; } } while(0) -+ -+#define relcheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto relcheck_error; } } while(0) -+ -+#define relacheck(X) \ -+do { if (unlikely(!(X))) { line = __LINE__; goto relacheck_error; } } while(0) -+ -+ /* validate the ELF header */ -+ elfcheck(hdr->e_ehsize < size); -+ elfcheck(hdr->e_entry == 0); -+ elfcheck(hdr->e_phoff == 0); -+ elfcheck(hdr->e_phnum == 0); -+ -+ elfcheck(hdr->e_shnum < SHN_LORESERVE); -+ elfcheck(hdr->e_shoff < size); -+ elfcheck(hdr->e_shoff >= hdr->e_ehsize); -+ elfcheck((hdr->e_shoff & (sizeof(long) - 1)) == 0); -+ elfcheck(hdr->e_shstrndx > 0); -+ elfcheck(hdr->e_shstrndx < hdr->e_shnum); -+ elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr)); -+ -+ tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum; -+ elfcheck(tmp < size - hdr->e_shoff); -+ -+ /* allocate a table to hold in-file section sizes */ -+ mvdata->secsizes = kmalloc(hdr->e_shnum * sizeof(size_t), GFP_KERNEL); -+ if (!mvdata->secsizes) -+ return -ENOMEM; -+ -+ memset(mvdata->secsizes, 0, hdr->e_shnum * sizeof(size_t)); -+ -+ /* validate the ELF section headers */ -+ mvdata->sections = mvdata->buffer + hdr->e_shoff; -+ secstop = mvdata->sections + mvdata->nsects; -+ -+ sssize = mvdata->sections[hdr->e_shstrndx].sh_size; -+ elfcheck(sssize > 0); -+ -+ section = mvdata->sections; -+ seccheck(section->sh_type == SHT_NULL); -+ seccheck(section->sh_size == 0); -+ seccheck(section->sh_offset == 0); -+ -+ secsize = mvdata->secsizes + 1; -+ for (section++; section < secstop; secsize++, section++) { -+ seccheck(section->sh_name < sssize); -+ seccheck(section->sh_link < hdr->e_shnum); -+ -+ if (section->sh_entsize > 0) -+ seccheck(section->sh_size % section->sh_entsize == 0); -+ -+ seccheck(section->sh_offset >= hdr->e_ehsize); -+ seccheck(section->sh_offset < size); -+ -+ /* determine the section's in-file size */ -+ tmp = size - section->sh_offset; -+ if (section->sh_offset < hdr->e_shoff) -+ tmp = hdr->e_shoff - section->sh_offset; -+ -+ for (section2 = mvdata->sections + 1; section2 < secstop; section2++) { -+ if (section->sh_offset < section2->sh_offset) { -+ tmp2 = section2->sh_offset - section->sh_offset; -+ if (tmp2 < tmp) -+ tmp = tmp2; -+ } -+ } -+ *secsize = tmp; -+ -+ _debug("Section %ld: %zx bytes at %lx\n", -+ section - mvdata->sections, -+ *secsize, -+ section->sh_offset); -+ -+ /* perform section type specific checks */ -+ switch (section->sh_type) { -+ case SHT_NOBITS: -+ break; -+ -+ case SHT_REL: -+ seccheck(section->sh_entsize == sizeof(Elf_Rel)); -+ goto more_rel_checks; -+ -+ case SHT_RELA: -+ seccheck(section->sh_entsize == sizeof(Elf_Rela)); -+ more_rel_checks: -+ seccheck(section->sh_info > 0); -+ seccheck(section->sh_info < hdr->e_shnum); -+ goto more_sec_checks; -+ -+ case SHT_SYMTAB: -+ seccheck(section->sh_entsize == sizeof(Elf_Sym)); -+ goto more_sec_checks; -+ -+ default: -+ more_sec_checks: -+ /* most types of section must be contained entirely -+ * within the file */ -+ seccheck(section->sh_size <= *secsize); -+ break; -+ } -+ } -+ -+ /* validate the ELF section names */ -+ section = &mvdata->sections[hdr->e_shstrndx]; -+ -+ seccheck(section->sh_offset != hdr->e_shoff); -+ -+ mvdata->secstrings = mvdata->buffer + section->sh_offset; -+ -+ last = -1; -+ for (section = mvdata->sections + 1; section < secstop; section++) { -+ const char *secname; -+ tmp = sssize - section->sh_name; -+ secname = mvdata->secstrings + section->sh_name; -+ seccheck(secname[0] != 0); -+ if (section->sh_name > last) -+ last = section->sh_name; -+ } -+ -+ if (last > -1) { -+ tmp = sssize - last; -+ elfcheck(memchr(mvdata->secstrings + last, 0, tmp) != NULL); -+ } -+ -+ /* look for various sections in the module */ -+ for (section = mvdata->sections + 1; section < secstop; section++) { -+ switch (section->sh_type) { -+ case SHT_SYMTAB: -+ if (strcmp(mvdata->secstrings + section->sh_name, -+ ".symtab") == 0 -+ ) { -+ seccheck(mvdata->symbols == NULL); -+ mvdata->symbols = -+ mvdata->buffer + section->sh_offset; -+ mvdata->nsyms = -+ section->sh_size / sizeof(Elf_Sym); -+ seccheck(section->sh_size > 0); -+ } -+ break; -+ -+ case SHT_STRTAB: -+ if (strcmp(mvdata->secstrings + section->sh_name, -+ ".strtab") == 0 -+ ) { -+ seccheck(mvdata->strings == NULL); -+ mvdata->strings = -+ mvdata->buffer + section->sh_offset; -+ sssize = mvdata->nstrings = section->sh_size; -+ seccheck(section->sh_size > 0); -+ } -+ break; -+ } -+ } -+ -+ if (!mvdata->symbols) { -+ printk("Couldn't locate module symbol table\n"); -+ goto format_error; -+ } -+ -+ if (!mvdata->strings) { -+ printk("Couldn't locate module strings table\n"); -+ goto format_error; -+ } -+ -+ /* validate the symbol table */ -+ symstop = mvdata->symbols + mvdata->nsyms; -+ -+ symbol = mvdata->symbols; -+ symcheck(ELF_ST_TYPE(symbol[0].st_info) == STT_NOTYPE); -+ symcheck(symbol[0].st_shndx == SHN_UNDEF); -+ symcheck(symbol[0].st_value == 0); -+ symcheck(symbol[0].st_size == 0); -+ -+ last = -1; -+ for (symbol++; symbol < symstop; symbol++) { -+ symcheck(symbol->st_name < sssize); -+ if (symbol->st_name > last) -+ last = symbol->st_name; -+ symcheck(symbol->st_shndx < mvdata->nsects || -+ symbol->st_shndx >= SHN_LORESERVE); -+ } -+ -+ if (last > -1) { -+ tmp = sssize - last; -+ elfcheck(memchr(mvdata->strings + last, 0, tmp) != NULL); -+ } -+ -+ /* validate each relocation table as best we can */ -+ for (section = mvdata->sections + 1; section < secstop; section++) { -+ section2 = mvdata->sections + section->sh_info; -+ -+ switch (section->sh_type) { -+ case SHT_REL: -+ rels = mvdata->buffer + section->sh_offset; -+ relstop = mvdata->buffer + section->sh_offset + section->sh_size; -+ -+ for (rel = rels; rel < relstop; rel++) { -+ relcheck(rel->r_offset < section2->sh_size); -+ relcheck(ELF_R_SYM(rel->r_info) < mvdata->nsyms); -+ } -+ -+ break; -+ -+ case SHT_RELA: -+ relas = mvdata->buffer + section->sh_offset; -+ relastop = mvdata->buffer + section->sh_offset + section->sh_size; -+ -+ for (rela = relas; rela < relastop; rela++) { -+ relacheck(rela->r_offset < section2->sh_size); -+ relacheck(ELF_R_SYM(rela->r_info) < mvdata->nsyms); -+ } -+ -+ break; -+ -+ default: -+ break; -+ } -+ } -+ -+ -+ _debug("ELF okay\n"); -+ return 0; -+ -+ elfcheck_error: -+ printk("Verify ELF error (assertion %d)\n", line); -+ goto format_error; -+ -+ seccheck_error: -+ printk("Verify ELF error [sec %ld] (assertion %d)\n", -+ (long)(section - mvdata->sections), line); -+ goto format_error; -+ -+ symcheck_error: -+ printk("Verify ELF error [sym %ld] (assertion %d)\n", -+ (long)(symbol - mvdata->symbols), line); -+ goto format_error; -+ -+ relcheck_error: -+ printk("Verify ELF error [sec %ld rel %ld] (assertion %d)\n", -+ (long)(section - mvdata->sections), -+ (long)(rel - rels), line); -+ goto format_error; -+ -+ relacheck_error: -+ printk("Verify ELF error [sec %ld rela %ld] (assertion %d)\n", -+ (long)(section - mvdata->sections), -+ (long)(rela - relas), line); -+ goto format_error; -+ -+ format_error: -+ return -ELIBBAD; -+ -+} /* end module_verify_elf() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify.h linux-900/kernel/module-verify.h ---- linux-811/kernel/module-verify.h -+++ linux-900/kernel/module-verify.h -@@ -0,0 +1,37 @@ -+/* module-verify.h: module verification definitions -+ * -+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. -+ * Written by David Howells (dhowells at redhat.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+ -+struct module_verify_data { -+ struct crypto_tfm *digest; /* module signature digest */ -+ const void *buffer; /* module buffer */ -+ const Elf_Ehdr *hdr; /* ELF header */ -+ const Elf_Shdr *sections; /* ELF section table */ -+ const Elf_Sym *symbols; /* ELF symbol table */ -+ const char *secstrings; /* ELF section string table */ -+ const char *strings; /* ELF string table */ -+ size_t *secsizes; /* section size list */ -+ size_t size; /* module object size */ -+ size_t nsects; /* number of sections */ -+ size_t nsyms; /* number of symbols */ -+ size_t nstrings; /* size of strings section */ -+ size_t signed_size; /* count of bytes contributed to digest */ -+ int *canonlist; /* list of canonicalised sections */ -+ int *canonmap; /* section canonicalisation map */ -+ int sig_index; /* module signature section index */ -+ uint8_t xcsum; /* checksum of bytes contributed to digest */ -+ uint8_t csum; /* checksum of bytes representing a section */ -+}; -+ -+extern int module_verify(const Elf_Ehdr *hdr, size_t size); -+extern int module_verify_signature(struct module_verify_data *mvdata); -diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module-verify-sig.c linux-900/kernel/module-verify-sig.c ---- linux-811/kernel/module-verify-sig.c -+++ linux-900/kernel/module-verify-sig.c -@@ -0,0 +1,441 @@ +diff --git a/kernel/module-verify-sig.c b/kernel/module-verify-sig.c +new file mode 100644 +index 0000000..45cb967 +--- /dev/null ++++ b/kernel/module-verify-sig.c +@@ -0,0 +1,450 @@ +/* module-verify-sig.c: module signature checker + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. @@ -545,7 +131,7 @@ + size_t __n = (N); \ + uint8_t *__p = (uint8_t *)(PTR); \ + count_and_csum((C), __p, __n); \ -+ crypto_digest_update_kernel((C)->digest, __p, __n); \ ++ crypto_hash_update_kernel(&(C)->hash, __p, __n); \ +} while(0) + +#define crypto_digest_update_val(C,VAL) \ @@ -553,7 +139,7 @@ + size_t __n = sizeof(VAL); \ + uint8_t *__p = (uint8_t *)&(VAL); \ + count_and_csum((C), __p, __n); \ -+ crypto_digest_update_kernel((C)->digest, __p, __n); \ ++ crypto_hash_update_kernel(&(C)->hash, __p, __n); \ +} while(0) + +static int module_verify_canonicalise(struct module_verify_data *mvdata); @@ -570,7 +156,13 @@ + +static int signedonly; + -+/*****************************************************************************/ ++static int __init sign_setup(char *str) ++{ ++ signedonly = 1; ++ return 0; ++} ++__setup("enforcemodulesig", sign_setup); ++ +/* + * verify a module's signature + */ @@ -610,13 +202,13 @@ + /* grab an SHA1 transformation context + * - !!! if this tries to load the sha1.ko module, we will deadlock!!! + */ -+ mvdata->digest = crypto_alloc_tfm2("sha1", 0, 1); -+ if (!mvdata->digest) { ++ mvdata->hash.tfm = crypto_hash_cast(crypto_alloc_tfm2("sha1", 0, 1)); ++ if (!mvdata->hash.tfm) { + printk("Couldn't load module - SHA1 transform unavailable\n"); + return -EPERM; + } + -+ crypto_digest_init(mvdata->digest); ++ crypto_hash_init(&mvdata->hash); + +#ifdef MODSIGN_DEBUG + mvdata->xcsum = 0; @@ -697,28 +289,39 @@ + mvdata->signed_size, mvdata->xcsum); + + /* do the actual signature verification */ -+ i = ksign_verify_signature(sig, sig_size, mvdata->digest); ++ ret = ksign_verify_signature(sig, sig_size, mvdata->hash.tfm); + -+ _debug("verify-sig : %d\n", i); ++ _debug("verify-sig : %d\n", ret); + -+ if (i == 0) -+ i = 1; -+ return i; ++ switch (ret) { ++ case 0: /* good signature */ ++ ret = 1; ++ break; ++ case -EKEYREJECTED: /* signature mismatch or number format error */ ++ printk(KERN_ERR "Module signature verification failed\n"); ++ break; ++ case -ENOKEY: /* signed, but we don't have the public key */ ++ printk(KERN_ERR "Module signed with unknown public key\n"); ++ break; ++ default: /* other error (probably ENOMEM) */ ++ break; ++ } ++ ++ return ret; + -+ format_error: -+ crypto_free_tfm(mvdata->digest); ++format_error: ++ crypto_free_hash(mvdata->hash.tfm); ++ printk(KERN_ERR "Module format error encountered\n"); + return -ELIBBAD; + + /* deal with the case of an unsigned module */ -+ no_signature: ++no_signature: + if (!signedonly) + return 0; -+ printk("An attempt to load unsigned module was rejected\n"); -+ return -EPERM; -+ -+} /* end module_verify_signature() */ ++ printk(KERN_ERR "An attempt to load unsigned module was rejected\n"); ++ return -EKEYREJECTED; ++} + -+/*****************************************************************************/ +/* + * canonicalise the section table index numbers + */ @@ -774,12 +377,10 @@ + mvdata->canonmap[mvdata->canonlist[loop]] = loop + 1; + + return 0; ++} + -+} /* end module_verify_canonicalise() */ -+ -+/*****************************************************************************/ +/* -+ * extract a RELA table ++ * extract an ELF RELA table + * - need to canonicalise the entries in case section addition/removal has + * rearranged the symbol table and the section table + */ @@ -854,11 +455,12 @@ + mvdata->signed_size, mvdata->csum, sh_name, nrels); + + return 0; -+} /* end extract_elf_rela() */ ++} + -+/*****************************************************************************/ +/* -+ * ++ * extract an ELF REL table ++ * - need to canonicalise the entries in case section addition/removal has ++ * rearranged the symbol table and the section table + */ +static int extract_elf_rel(struct module_verify_data *mvdata, + int secix, @@ -928,23 +530,109 @@ + mvdata->signed_size, mvdata->csum, sh_name, nrels); + + return 0; -+} /* end extract_elf_rel() */ -+ -+static int __init sign_setup(char *str) -+{ -+ signedonly = 1; -+ return 0; +} -+__setup("enforcemodulesig", sign_setup); ---- linux-2.6.12/kernel/module-verify.c.~1~ 2005-08-07 17:39:38.000000000 -0700 -+++ linux-2.6.12/kernel/module-verify.c 2005-08-10 00:48:43.000000000 -0700 -@@ -107,7 +107,7 @@ do { if (unlikely(!(X))) { line = __LINE - elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr)); - - tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum; -- elfcheck(tmp < size - hdr->e_shoff); -+ elfcheck(tmp <= size - hdr->e_shoff); +diff --git a/kernel/module-verify.c b/kernel/module-verify.c +index 875279f..04920b2 100644 +--- a/kernel/module-verify.c ++++ b/kernel/module-verify.c +@@ -16,6 +16,9 @@ #include "module-verify.h" + /* + * verify a module's integrity + * - check the ELF is viable ++ * - return 1 if the module has a correct signature ++ * - return 0 if the module has no signature or one we don't have a key for ++ * - return -ve on error + */ + int module_verify(const Elf_Ehdr *hdr, size_t size) + { +@@ -34,6 +37,8 @@ int module_verify(const Elf_Ehdr *hdr, s + goto error; + } + ++ ret = module_verify_signature(&mvdata); ++ + error: + kfree(mvdata.secsizes); + kfree(mvdata.canonlist); +diff --git a/kernel/module-verify.h b/kernel/module-verify.h +index 63f5e08..f4e3dc7 100644 +--- a/kernel/module-verify.h ++++ b/kernel/module-verify.h +@@ -10,11 +10,12 @@ + */ + + #include ++#include + #include + + #ifdef CONFIG_MODULE_VERIFY + struct module_verify_data { +- struct crypto_tfm *digest; /* module signature digest */ ++ struct hash_desc hash; /* module signature digest */ + const void *buffer; /* module buffer */ + const Elf_Ehdr *hdr; /* ELF header */ + const Elf_Shdr *sections; /* ELF section table */ +@@ -48,6 +49,15 @@ #else + #define module_verify_elf(m) (0) + #endif + ++/* ++ * module-verify-sig.c ++ */ ++#ifdef CONFIG_MODULE_SIG ++extern int module_verify_signature(struct module_verify_data *mvdata); ++#else ++#define module_verify_signature(m) (0) ++#endif ++ + #else + #define module_verify(h, s) (0) + #endif +diff --git a/kernel/module.c b/kernel/module.c +index 9d5787d..6825888 100644 +--- a/kernel/module.c ++++ b/kernel/module.c +@@ -1567,6 +1567,7 @@ static struct module *load_module(void _ + void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ + struct exception_table_entry *extable; + mm_segment_t old_fs; ++ int gpgsig_ok; + + DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n", + umod, len, uargs); +@@ -1593,9 +1594,12 @@ static struct module *load_module(void _ + } + + /* Verify the module's contents */ ++ gpgsig_ok = 0; + err = module_verify(hdr, len); + if (err < 0) + goto free_hdr; ++ if (err == 1) ++ gpgsig_ok = 1; + + /* Convenience variables */ + sechdrs = (void *)hdr + hdr->e_shoff; +@@ -1632,6 +1636,7 @@ #endif + goto free_hdr; + } + mod = (void *)sechdrs[modindex].sh_addr; ++ mod->gpgsig_ok = gpgsig_ok; + + if (symindex == 0) { + printk(KERN_WARNING "%s: module has no symbols (stripped?)\n", +@@ -2325,8 +2330,13 @@ void print_modules(void) + char buf[8]; + + printk("Modules linked in:"); +- list_for_each_entry(mod, &modules, list) ++ list_for_each_entry(mod, &modules, list) { + printk(" %s%s", mod->name, taint_flags(mod->taints, buf)); ++#if CONFIG_MODULE_SIG ++ if (!mod->gpgsig_ok) ++ printk("(U)"); ++#endif ++ } + printk("\n"); + } - /* allocate a table to hold in-file section sizes */ - mvdata->secsizes = kmalloc(hdr->e_shnum * sizeof(size_t), GFP_KERNEL); - linux-2.6-modsign-crypto.patch: crypto/api.c | 25 ++++++++++++++++++++++--- crypto/digest.c | 9 +++++++++ include/linux/crypto.h | 11 +++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) Index: linux-2.6-modsign-crypto.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-modsign-crypto.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-modsign-crypto.patch 22 Sep 2006 22:43:07 -0000 1.2 +++ linux-2.6-modsign-crypto.patch 31 Jan 2007 15:26:15 -0000 1.3 @@ -1,93 +1,136 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/api.c linux-901/crypto/api.c ---- linux-900/crypto/api.c -+++ linux-901/crypto/api.c -@@ -117,12 +117,17 @@ static void crypto_exit_ops(struct crypt - } +MODSIGN: In-kernel crypto extensions + +From: David Howells + +Two extensions are added: + + (1) Support for SHA1 digestion of in-kernel buffers directly without the use + of scatter-gather lists. + + (2) Allocation of crypto algorithm instances without resort to fallback module + loading. + +SHA1 is used by module signature checking, and so must not itself require +loading as a module when the module signature checking is enabled. + +Signed-Off-By: David Howells +--- + + crypto/api.c | 25 ++++++++++++++++++++++--- + crypto/digest.c | 9 +++++++++ + include/linux/crypto.h | 11 +++++++++++ + 3 files changed, 42 insertions(+), 3 deletions(-) + +diff --git a/crypto/api.c b/crypto/api.c +index 8c44687..5109d28 100644 +--- a/crypto/api.c ++++ b/crypto/api.c +@@ -362,7 +362,17 @@ out: } + EXPORT_SYMBOL_GPL(__crypto_alloc_tfm); -struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) ++/* ++ * crypto_alloc_tfm2 - Find or load crypto module ++ * @name: Name of algorithm ++ * @flags: Flags to control algorithm instance ++ * @nomodload: True to suppress resort to module loading ++ * ++ * Attempt to find or load a crypto algorithm module and create an ++ * instance of it. ++ */ +struct crypto_tfm *crypto_alloc_tfm2(const char *name, u32 flags, + int nomodload) { struct crypto_tfm *tfm = NULL; - struct crypto_alg *alg; - unsigned int tfm_size; - -- alg = crypto_alg_mod_lookup(name); -+ if (!nomodload) -+ alg = crypto_alg_mod_lookup(name); -+ else -+ alg = crypto_alg_lookup(name); -+ - if (alg == NULL) - goto out; -@@ -153,6 +160,11 @@ out: - return tfm; + int err; +@@ -370,7 +380,11 @@ struct crypto_tfm *crypto_alloc_tfm(cons + do { + struct crypto_alg *alg; + +- alg = crypto_alg_mod_lookup(name, 0, CRYPTO_ALG_ASYNC); ++ if (!nomodload) ++ alg = crypto_alg_mod_lookup(name, 0, CRYPTO_ALG_ASYNC); ++ else ++ alg = crypto_alg_lookup(name, 0, CRYPTO_ALG_ASYNC); ++ + err = PTR_ERR(alg); + if (IS_ERR(alg)) + continue; +@@ -439,7 +453,12 @@ err: + return ERR_PTR(err); } - + EXPORT_SYMBOL_GPL(crypto_alloc_base); +- ++ +struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags) +{ + return crypto_alloc_tfm2(name, flags, 0); +} + - void crypto_free_tfm(struct crypto_tfm *tfm) - { - struct crypto_alg *alg = tfm->__crt_alg; -diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Kconfig linux-901/crypto/Kconfig ---- linux-900/crypto/Kconfig -+++ linux-901/crypto/Kconfig -@@ -287,6 +287,25 @@ config CRYPTO_TEST - help - Quick & dirty crypto test module. - -+config CRYPTO_SIGNATURE -+ bool "In-kernel signature checker (EXPERIMENTAL)" -+ depends on CRYPTO -+ help -+ Signature checker (used for module sig checking). -+ -+config CRYPTO_SIGNATURE_DSA -+ bool "Handle DSA signatures (EXPERIMENTAL)" -+ depends on CRYPTO_SIGNATURE -+ select CRYPTO_MPILIB -+ help -+ DSA Signature checker. -+ -+config CRYPTO_MPILIB -+ bool "Multiprecision maths library (EXPERIMENTAL)" -+ depends on CRYPTO -+ help -+ Multiprecision maths library from GnuPG -+ - source "drivers/crypto/Kconfig" - endmenu - -diff -urNp --exclude-from=/home/davej/.exclude linux-900/crypto/Makefile linux-901/crypto/Makefile ---- linux-900/crypto/Makefile -+++ linux-901/crypto/Makefile -@@ -32,3 +32,6 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich - obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o + /* + * crypto_free_tfm - Free crypto transform + * @tfm: Transform to free +diff --git a/crypto/digest.c b/crypto/digest.c +index 8f45932..c5e6d92 100644 +--- a/crypto/digest.c ++++ b/crypto/digest.c +@@ -81,6 +81,14 @@ static int update(struct hash_desc *desc + return 0; + } - obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o ++static void update_kernel(struct hash_desc *desc, ++ const void *data, size_t count) ++{ ++ struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm); ++ tfm->__crt_alg->cra_digest.dia_update(tfm, data, count); ++ crypto_yield(desc->flags); ++} + -+obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ -+obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ -diff -urNp --exclude-from=/home/davej/.exclude linux-900/include/linux/crypto.h linux-901/include/linux/crypto.h ---- linux-900/include/linux/crypto.h -+++ linux-901/include/linux/crypto.h -@@ -213,10 +213,14 @@ struct crypto_tfm { - * will then attempt to load a module of the same name or alias. A refcount - * is grabbed on the algorithm which is then associated with the new transform. - * -+ * crypto_alloc_tfm2() is similar, but allows module loading to be suppressed. -+ * - * crypto_free_tfm() frees up the transform and any associated resources, - * then drops the refcount on the associated algorithm. + static int final(struct hash_desc *desc, u8 *out) + { + struct crypto_tfm *tfm = crypto_hash_tfm(desc->tfm); +@@ -138,6 +146,7 @@ int crypto_init_digest_ops(struct crypto + + ops->init = init; + ops->update = update; ++ ops->update_kernel = update_kernel; + ops->final = final; + ops->digest = digest; + ops->setkey = dalg->dia_setkey ? setkey : nosetkey; +diff --git a/include/linux/crypto.h b/include/linux/crypto.h +index 4aa9046..9cc4a4c 100644 +--- a/include/linux/crypto.h ++++ b/include/linux/crypto.h +@@ -301,6 +301,8 @@ struct hash_tfm { + int (*init)(struct hash_desc *desc); + int (*update)(struct hash_desc *desc, + struct scatterlist *sg, unsigned int nsg); ++ void (*update_kernel)(struct hash_desc *desc, ++ const void *data, size_t count); + int (*final)(struct hash_desc *desc, u8 *out); + int (*digest)(struct hash_desc *desc, struct scatterlist *sg, + unsigned int nsg, u8 *out); +@@ -364,6 +366,8 @@ struct crypto_attr_alg { */ + struct crypto_tfm *crypto_alloc_tfm(const char *alg_name, u32 tfm_flags); +struct crypto_tfm *crypto_alloc_tfm2(const char *alg_name, u32 tfm_flags, -+ int nomodload); ++ int nomodload); + struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask); void crypto_free_tfm(struct crypto_tfm *tfm); - /* - +@@ -791,6 +795,13 @@ static inline int crypto_hash_update(str + return crypto_hash_crt(desc->tfm)->update(desc, sg, nbytes); + } + ++static inline void crypto_hash_update_kernel(struct hash_desc *desc, ++ const void *data, ++ size_t count) ++{ ++ return crypto_hash_crt(desc->tfm)->update_kernel(desc, data, count); ++} ++ + static inline int crypto_hash_final(struct hash_desc *desc, u8 *out) + { + return crypto_hash_crt(desc->tfm)->final(desc, out); linux-2.6-modsign-include.patch: asm-alpha/module.h | 3 +++ asm-arm/module.h | 5 +++++ asm-cris/module.h | 5 +++++ asm-h8300/module.h | 5 +++++ asm-i386/module.h | 5 +++++ asm-ia64/module.h | 5 +++++ asm-m32r/module.h | 5 +++++ asm-m68k/module.h | 5 +++++ asm-mips/module.h | 12 ++++++++++-- asm-parisc/module.h | 8 ++++++++ asm-powerpc/module.h | 10 ++++++++++ asm-s390/module.h | 3 +++ asm-sh/module.h | 5 +++++ asm-sparc/module.h | 5 +++++ asm-sparc64/module.h | 5 +++++ asm-um/module-i386.h | 4 ++++ asm-v850/module.h | 5 +++++ asm-x86_64/module.h | 5 +++++ 18 files changed, 98 insertions(+), 2 deletions(-) Index: linux-2.6-modsign-include.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-modsign-include.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-modsign-include.patch 31 Oct 2005 03:03:28 -0000 1.2 +++ linux-2.6-modsign-include.patch 31 Jan 2007 15:26:15 -0000 1.3 @@ -1,6 +1,36 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-alpha/module.h linux-905/include/asm-alpha/module.h ---- linux-904/include/asm-alpha/module.h -+++ linux-905/include/asm-alpha/module.h +MODSIGN: Add indications of module ELF types + +From: David Howells + +Add per-arch indications of module ELF types and relocation table entry types. + +Signed-Off-By: David Howells +--- + + include/asm-alpha/module.h | 3 +++ + include/asm-arm/module.h | 5 +++++ + include/asm-cris/module.h | 5 +++++ + include/asm-h8300/module.h | 5 +++++ + include/asm-i386/module.h | 5 +++++ + include/asm-ia64/module.h | 5 +++++ + include/asm-m32r/module.h | 5 +++++ + include/asm-m68k/module.h | 5 +++++ + include/asm-mips/module.h | 12 ++++++++++-- + include/asm-parisc/module.h | 8 ++++++++ + include/asm-powerpc/module.h | 10 ++++++++++ + include/asm-s390/module.h | 3 +++ + include/asm-sh/module.h | 5 +++++ + include/asm-sparc/module.h | 5 +++++ + include/asm-sparc64/module.h | 5 +++++ + include/asm-um/module-i386.h | 4 ++++ + include/asm-v850/module.h | 5 +++++ + include/asm-x86_64/module.h | 5 +++++ + 18 files changed, 98 insertions(+), 2 deletions(-) + +diff --git a/include/asm-alpha/module.h b/include/asm-alpha/module.h +index 7b63743..3d5a3ea 100644 +--- a/include/asm-alpha/module.h ++++ b/include/asm-alpha/module.h @@ -6,6 +6,7 @@ struct mod_arch_specific unsigned int gotsecindex; }; @@ -9,7 +39,7 @@ #define Elf_Sym Elf64_Sym #define Elf_Shdr Elf64_Shdr #define Elf_Ehdr Elf64_Ehdr -@@ -13,6 +14,8 @@ struct mod_arch_specific +@@ -13,6 +14,8 @@ #define Elf_Phdr Elf64_Phdr #define Elf_Dyn Elf64_Dyn #define Elf_Rel Elf64_Rel #define Elf_Rela Elf64_Rela @@ -18,9 +48,10 @@ #define ARCH_SHF_SMALL SHF_ALPHA_GPREL -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-arm/module.h linux-905/include/asm-arm/module.h ---- linux-904/include/asm-arm/module.h -+++ linux-905/include/asm-arm/module.h +diff --git a/include/asm-arm/module.h b/include/asm-arm/module.h +index 24b168d..f1558f3 100644 +--- a/include/asm-arm/module.h ++++ b/include/asm-arm/module.h @@ -6,9 +6,14 @@ struct mod_arch_specific int foo; }; @@ -36,10 +67,11 @@ /* * Include the ARM architecture version. -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-cris/module.h linux-905/include/asm-cris/module.h ---- linux-904/include/asm-cris/module.h -+++ linux-905/include/asm-cris/module.h -@@ -3,7 +3,12 @@ +diff --git a/include/asm-cris/module.h b/include/asm-cris/module.h +index 7ee7231..03f7b2e 100644 +--- a/include/asm-cris/module.h ++++ b/include/asm-cris/module.h +@@ -3,7 +3,12 @@ #define _ASM_CRIS_MODULE_H /* cris is simple */ struct mod_arch_specific { }; @@ -52,10 +84,11 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_CRIS_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-h8300/module.h linux-905/include/asm-h8300/module.h ---- linux-904/include/asm-h8300/module.h -+++ linux-905/include/asm-h8300/module.h -@@ -4,9 +4,14 @@ +diff --git a/include/asm-h8300/module.h b/include/asm-h8300/module.h +index de23231..b1c08e2 100644 +--- a/include/asm-h8300/module.h ++++ b/include/asm-h8300/module.h +@@ -4,9 +4,14 @@ #define _ASM_H8300_MODULE_H * This file contains the H8/300 architecture specific module code. */ struct mod_arch_specific { }; @@ -70,9 +103,10 @@ #define MODULE_SYMBOL_PREFIX "_" -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-i386/module.h linux-905/include/asm-i386/module.h ---- linux-904/include/asm-i386/module.h -+++ linux-905/include/asm-i386/module.h +diff --git a/include/asm-i386/module.h b/include/asm-i386/module.h +index 02f8f54..42ab093 100644 +--- a/include/asm-i386/module.h ++++ b/include/asm-i386/module.h @@ -6,9 +6,14 @@ struct mod_arch_specific { }; @@ -88,9 +122,10 @@ #ifdef CONFIG_M386 #define MODULE_PROC_FAMILY "386 " -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-ia64/module.h linux-905/include/asm-ia64/module.h ---- linux-904/include/asm-ia64/module.h -+++ linux-905/include/asm-ia64/module.h +diff --git a/include/asm-ia64/module.h b/include/asm-ia64/module.h +index d2da61e..191355a 100644 +--- a/include/asm-ia64/module.h ++++ b/include/asm-ia64/module.h @@ -23,9 +23,14 @@ struct mod_arch_specific { unsigned int next_got_entry; /* index of next available got entry */ }; @@ -105,11 +140,12 @@ +#define ELF_R_SYM(X) ELF64_R_SYM(X) #define MODULE_PROC_FAMILY "ia64" - #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m32r/module.h linux-905/include/asm-m32r/module.h ---- linux-904/include/asm-m32r/module.h -+++ linux-905/include/asm-m32r/module.h -@@ -5,9 +5,14 @@ + #define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY \ +diff --git a/include/asm-m32r/module.h b/include/asm-m32r/module.h +index 3f2541c..6ca963a 100644 +--- a/include/asm-m32r/module.h ++++ b/include/asm-m32r/module.h +@@ -5,9 +5,14 @@ #define _ASM_M32R_MODULE_H struct mod_arch_specific { }; @@ -124,9 +160,10 @@ #endif /* _ASM_M32R_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-m68k/module.h linux-905/include/asm-m68k/module.h ---- linux-904/include/asm-m68k/module.h -+++ linux-905/include/asm-m68k/module.h +diff --git a/include/asm-m68k/module.h b/include/asm-m68k/module.h +index c6d75af..ee98908 100644 +--- a/include/asm-m68k/module.h ++++ b/include/asm-m68k/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_M68K_MODULE_H #define _ASM_M68K_MODULE_H @@ -140,10 +177,11 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_M68K_MODULE_H */ - ---- linux-2.6.14/include/asm-mips/module.h~ 2005-10-30 21:31:42.000000000 -0500 -+++ linux-2.6.14/include/asm-mips/module.h 2005-10-30 21:33:30.000000000 -0500 -@@ -34,11 +34,15 @@ typedef struct { +diff --git a/include/asm-mips/module.h b/include/asm-mips/module.h +index 399d03f..694f979 100644 +--- a/include/asm-mips/module.h ++++ b/include/asm-mips/module.h +@@ -33,11 +33,15 @@ typedef struct { } Elf64_Mips_Rela; #ifdef CONFIG_32BIT @@ -160,7 +198,7 @@ #define Elf_Mips_Rel Elf32_Rel #define Elf_Mips_Rela Elf32_Rela -@@ -49,11 +53,15 @@ typedef struct { +@@ -48,11 +52,15 @@ #define ELF_MIPS_R_TYPE(rel) ELF32_R_TYP #endif #ifdef CONFIG_64BIT @@ -177,10 +215,11 @@ #define Elf_Mips_Rel Elf64_Mips_Rel #define Elf_Mips_Rela Elf64_Mips_Rela -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-parisc/module.h linux-905/include/asm-parisc/module.h ---- linux-904/include/asm-parisc/module.h -+++ linux-905/include/asm-parisc/module.h -@@ -4,17 +4,25 @@ +diff --git a/include/asm-parisc/module.h b/include/asm-parisc/module.h +index 00f0688..ebd9a5e 100644 +--- a/include/asm-parisc/module.h ++++ b/include/asm-parisc/module.h +@@ -4,17 +4,25 @@ #define _ASM_PARISC_MODULE_H * This file contains the parisc architecture specific module code. */ #ifdef __LP64__ @@ -206,9 +245,11 @@ #endif struct unwind_table; ---- linux-2.6.13/include/asm-powerpc/module.h~ 2005-09-08 01:05:31.000000000 -0400 -+++ linux-2.6.13/include/asm-powerpc/module.h 2005-09-08 01:11:30.000000000 -0400 -@@ -53,16 +53,26 @@ extern struct bug_entry *module_find_bug +diff --git a/include/asm-powerpc/module.h b/include/asm-powerpc/module.h +index e5f14b1..f9baae1 100644 +--- a/include/asm-powerpc/module.h ++++ b/include/asm-powerpc/module.h +@@ -52,16 +52,26 @@ #endif */ #ifdef __powerpc64__ @@ -235,9 +276,10 @@ # ifdef MODULE asm(".section .plt,\"ax\", at nobits; .align 3; .previous"); asm(".section .init.plt,\"ax\", at nobits; .align 3; .previous"); -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-s390/module.h linux-905/include/asm-s390/module.h ---- linux-904/include/asm-s390/module.h -+++ linux-905/include/asm-s390/module.h +diff --git a/include/asm-s390/module.h b/include/asm-s390/module.h +index 1cc1c5a..b64dab0 100644 +--- a/include/asm-s390/module.h ++++ b/include/asm-s390/module.h @@ -29,14 +29,17 @@ struct mod_arch_specific }; @@ -256,9 +298,10 @@ #define Elf_Rela ElfW(Rela) #define Elf_Shdr ElfW(Shdr) #define Elf_Sym ElfW(Sym) -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sh/module.h linux-905/include/asm-sh/module.h ---- linux-904/include/asm-sh/module.h -+++ linux-905/include/asm-sh/module.h +diff --git a/include/asm-sh/module.h b/include/asm-sh/module.h +index 118d5a2..c3cf495 100644 +--- a/include/asm-sh/module.h ++++ b/include/asm-sh/module.h @@ -9,9 +9,14 @@ struct mod_arch_specific { /* Nothing to see here .. */ }; @@ -274,9 +317,10 @@ #ifdef CONFIG_CPU_LITTLE_ENDIAN # ifdef CONFIG_CPU_SH2 -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc/module.h linux-905/include/asm-sparc/module.h ---- linux-904/include/asm-sparc/module.h -+++ linux-905/include/asm-sparc/module.h +diff --git a/include/asm-sparc/module.h b/include/asm-sparc/module.h +index cbd9e67..e2921e2 100644 +--- a/include/asm-sparc/module.h ++++ b/include/asm-sparc/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_SPARC_MODULE_H #define _ASM_SPARC_MODULE_H @@ -290,9 +334,10 @@ +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_SPARC_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-sparc64/module.h linux-905/include/asm-sparc64/module.h ---- linux-904/include/asm-sparc64/module.h -+++ linux-905/include/asm-sparc64/module.h +diff --git a/include/asm-sparc64/module.h b/include/asm-sparc64/module.h +index 3d77ba4..2e7ca17 100644 +--- a/include/asm-sparc64/module.h ++++ b/include/asm-sparc64/module.h @@ -1,7 +1,12 @@ #ifndef _ASM_SPARC64_MODULE_H #define _ASM_SPARC64_MODULE_H @@ -306,9 +351,10 @@ +#define ELF_R_TYPE(X) ELF64_R_TYPE(X) +#define ELF_R_SYM(X) ELF64_R_SYM(X) #endif /* _ASM_SPARC64_MODULE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-um/module-i386.h linux-905/include/asm-um/module-i386.h ---- linux-904/include/asm-um/module-i386.h -+++ linux-905/include/asm-um/module-i386.h +diff --git a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h +index 5ead4a0..b441057 100644 +--- a/include/asm-um/module-i386.h ++++ b/include/asm-um/module-i386.h @@ -9,5 +9,9 @@ struct mod_arch_specific #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym @@ -319,9 +365,10 @@ +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-v850/module.h linux-905/include/asm-v850/module.h ---- linux-904/include/asm-v850/module.h -+++ linux-905/include/asm-v850/module.h +diff --git a/include/asm-v850/module.h b/include/asm-v850/module.h +index 2c2f494..48752f3 100644 +--- a/include/asm-v850/module.h ++++ b/include/asm-v850/module.h @@ -31,9 +31,14 @@ struct mod_arch_specific unsigned int core_plt_section, init_plt_section; }; @@ -337,10 +384,11 @@ /* Make empty sections for module_frob_arch_sections to expand. */ #ifdef MODULE -diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-x86_64/module.h linux-905/include/asm-x86_64/module.h ---- linux-904/include/asm-x86_64/module.h -+++ linux-905/include/asm-x86_64/module.h -@@ -3,8 +3,13 @@ +diff --git a/include/asm-x86_64/module.h b/include/asm-x86_64/module.h +index 67f8f69..3a7373a 100644 +--- a/include/asm-x86_64/module.h ++++ b/include/asm-x86_64/module.h +@@ -3,8 +3,13 @@ #define _ASM_X8664_MODULE_H struct mod_arch_specific {}; linux-2.6-modsign-ksign.patch: crypto/Kconfig | 13 crypto/Makefile | 1 crypto/signature/Makefile | 10 crypto/signature/dsa.c | 96 +++++ crypto/signature/key.h | 7 crypto/signature/ksign-keyring.c | 116 +++++++ crypto/signature/ksign-parse.c | 603 +++++++++++++++++++++++++++++++++++++ crypto/signature/ksign-publickey.c | 18 + crypto/signature/ksign.c | 180 +++++++++++ crypto/signature/local.h | 160 +++++++++ include/linux/crypto/ksign.h | 22 + 11 files changed, 1226 insertions(+) Index: linux-2.6-modsign-ksign.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-modsign-ksign.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-modsign-ksign.patch 22 Sep 2006 22:43:07 -0000 1.3 +++ linux-2.6-modsign-ksign.patch 31 Jan 2007 15:26:15 -0000 1.4 @@ -1,32 +1,81 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/digest.c linux-902/crypto/digest.c ---- linux-901/crypto/digest.c -+++ linux-902/crypto/digest.c -@@ -52,6 +52,13 @@ static void update(struct crypto_tfm *tf - } - } +MODSIGN: Module signature checker and key manager + +From: David Howells + +Add a facility to retain public keys and to verify signatures made with those +public keys, given a signature and crypto_hash of the data that was signed. + +Signed-Off-By: David Howells +--- + + crypto/Kconfig | 13 + + crypto/Makefile | 1 + crypto/signature/Makefile | 10 + + crypto/signature/dsa.c | 96 ++++++ + crypto/signature/key.h | 7 + crypto/signature/ksign-keyring.c | 116 +++++++ + crypto/signature/ksign-parse.c | 603 ++++++++++++++++++++++++++++++++++++ + crypto/signature/ksign-publickey.c | 18 + + crypto/signature/ksign.c | 180 +++++++++++ + crypto/signature/local.h | 160 ++++++++++ + include/linux/crypto/ksign.h | 22 + + 11 files changed, 1226 insertions(+), 0 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index d768c46..205cbdf 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -471,6 +471,19 @@ config CRYPTO_MPILIB + help + Multiprecision maths library from GnuPG -+static void update_kernel(struct crypto_tfm *tfm, -+ const void *data, size_t count) -+{ -+ tfm->__crt_alg->cra_digest.dia_update(tfm, data, count); -+ crypto_yield(tfm); -+} ++config CRYPTO_SIGNATURE ++ bool "In-kernel signature checker (EXPERIMENTAL)" ++ depends on CRYPTO ++ help ++ Signature checker (used for module sig checking). ++ ++config CRYPTO_SIGNATURE_DSA ++ bool "Handle DSA signatures (EXPERIMENTAL)" ++ depends on CRYPTO_SIGNATURE ++ select CRYPTO_MPILIB ++ help ++ DSA Signature checker. ++ + source "drivers/crypto/Kconfig" + + endif # if CRYPTO +diff --git a/crypto/Makefile b/crypto/Makefile +index 36a6211..309a806 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -47,3 +47,4 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o + obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o + + obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ ++obj-$(CONFIG_CRYPTO_SIGNATURE) += signature/ +diff --git a/crypto/signature/Makefile b/crypto/signature/Makefile +new file mode 100644 +index 0000000..4d1042e +--- /dev/null ++++ b/crypto/signature/Makefile +@@ -0,0 +1,10 @@ ++# ++# Makefile for the signature checker ++# + - static void final(struct crypto_tfm *tfm, u8 *out) - { - tfm->__crt_alg->cra_digest.dia_final(crypto_tfm_ctx(tfm), out); -@@ -94,6 +101,7 @@ int crypto_init_digest_ops(struct crypto - - ops->dit_init = init; - ops->dit_update = update; -+ ops->dit_update_kernel = update_kernel; - ops->dit_final = final; - ops->dit_digest = digest; - ops->dit_setkey = setkey; -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/dsa.c linux-902/crypto/signature/dsa.c ---- linux-901/crypto/signature/dsa.c -+++ linux-902/crypto/signature/dsa.c -@@ -0,0 +1,98 @@ ++obj-y := \ ++ ksign.o \ ++ ksign-parse.o \ ++ ksign-keyring.o \ ++ ksign-publickey.o \ ++ dsa.o +diff --git a/crypto/signature/dsa.c b/crypto/signature/dsa.c +new file mode 100644 +index 0000000..469539c +--- /dev/null ++++ b/crypto/signature/dsa.c +@@ -0,0 +1,96 @@ +/* dsa.c - DSA signature algorithm + * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + * @@ -52,7 +101,6 @@ +#include +#include "local.h" + -+/*****************************************************************************/ +/* + * perform DSA algorithm signature verification + */ @@ -66,8 +114,7 @@ + + if (!datahash || + !sig[0] || !sig[1] || -+ !pkey[0] || !pkey[1] || !pkey[2] || !pkey[3] -+ ) ++ !pkey[0] || !pkey[1] || !pkey[2] || !pkey[3]) + return -EINVAL; + + p = pkey[0]; /* prime */ @@ -79,12 +126,12 @@ + + if (!(mpi_cmp_ui(r, 0) > 0 && mpi_cmp(r, q) < 0)) { + printk("DSA_verify assertion failed [0 < r < q]\n"); -+ return -EPERM; ++ return -EKEYREJECTED; + } + + if (!(mpi_cmp_ui(s, 0) > 0 && mpi_cmp(s, q) < 0)) { + printk("DSA_verify assertion failed [0 < s < q]\n"); -+ return -EPERM; ++ return -EKEYREJECTED; + } + + rc = -ENOMEM; @@ -116,18 +163,20 @@ + if (mpi_fdiv_r(v, v, q) < 0) + goto cleanup; + -+ rc = mpi_cmp(v, r) == 0 ? 0 : -EPERM; ++ rc = (mpi_cmp(v, r) == 0) ? 0 : -EKEYREJECTED; + -+ cleanup: ++cleanup: + mpi_free(w); + mpi_free(u1); + mpi_free(u2); + mpi_free(v); + return rc; -+} /* end DSA_verify() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/key.h linux-902/crypto/signature/key.h ---- linux-901/crypto/signature/key.h -+++ linux-902/crypto/signature/key.h ++} +diff --git a/crypto/signature/key.h b/crypto/signature/key.h +new file mode 100644 +index 0000000..7297968 +--- /dev/null ++++ b/crypto/signature/key.h @@ -0,0 +1,7 @@ +const int ksign_def_public_key_size = 0; +/* automatically generated by bin2hex */ @@ -136,193 +185,12 @@ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign.c linux-902/crypto/signature/ksign.c ---- linux-901/crypto/signature/ksign.c -+++ linux-902/crypto/signature/ksign.c -@@ -0,0 +1,179 @@ -+/* ksign.c: signature checker -+ * -+ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. -+ * Written by David Howells (dhowells at redhat.com) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+#include -+#include "local.h" -+ -+#if 0 -+#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__) -+#else -+#define _debug(FMT, ...) do { ; } while (0) -+#endif -+ -+/*****************************************************************************/ -+/* -+ * check the signature which is contained in SIG. -+ */ -+static int ksign_signature_check(const struct ksign_signature *sig, -+ struct crypto_tfm *sha1_tfm) -+{ -+ struct ksign_public_key *pk; -+ uint8_t sha1[SHA1_DIGEST_SIZE]; -+ MPI result = NULL; -+ int rc = 0; -+ -+ pk = ksign_get_public_key(sig->keyid); -+ if (!pk) { -+ printk("ksign: module signed with unknown public key\n"); -+ printk("- signature keyid: %08x%08x ver=%u\n", -+ sig->keyid[0], sig->keyid[1], sig->version); -+ return -EPERM; -+ } -+ -+ if (pk->timestamp > sig->timestamp) -+ printk("ksign:" -+ " public key is %lu seconds newer than the signature\n", -+ pk->timestamp - sig->timestamp); -+ -+ /* complete the digest */ -+ if (sig->version >= 4) -+ SHA1_putc(sha1_tfm, sig->version); -+ SHA1_putc(sha1_tfm, sig->sig_class); -+ -+ if (sig->version < 4) { -+ u32 a = sig->timestamp; -+ SHA1_putc(sha1_tfm, (a >> 24) & 0xff); -+ SHA1_putc(sha1_tfm, (a >> 16) & 0xff); -+ SHA1_putc(sha1_tfm, (a >> 8) & 0xff); -+ SHA1_putc(sha1_tfm, (a >> 0) & 0xff); -+ } -+ else { -+ uint8_t buf[6]; -+ size_t n; -+ SHA1_putc(sha1_tfm, PUBKEY_ALGO_DSA); -+ SHA1_putc(sha1_tfm, DIGEST_ALGO_SHA1); -+ if (sig->hashed_data) { -+ n = (sig->hashed_data[0] << 8) | sig->hashed_data[1]; -+ SHA1_write(sha1_tfm, sig->hashed_data, n + 2); -+ n += 6; -+ } -+ else { -+ n = 6; -+ } -+ -+ /* add some magic */ -+ buf[0] = sig->version; -+ buf[1] = 0xff; -+ buf[2] = n >> 24; -+ buf[3] = n >> 16; -+ buf[4] = n >> 8; -+ buf[5] = n; -+ SHA1_write(sha1_tfm, buf, 6); -+ } -+ -+ crypto_digest_final(sha1_tfm, sha1); -+ crypto_free_tfm(sha1_tfm); -+ -+ -+ -+ -+ -+ -+ rc = -ENOMEM; -+ result = mpi_alloc((SHA1_DIGEST_SIZE + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB); -+ if (!result) -+ goto cleanup; -+ -+ rc = mpi_set_buffer(result, sha1, SHA1_DIGEST_SIZE, 0); -+ if (rc < 0) -+ goto cleanup; -+ -+ rc = DSA_verify(result, sig->data, pk->pkey); -+ -+ cleanup: -+ mpi_free(result); -+ ksign_put_public_key(pk); -+ -+ return rc; -+} /* end ksign_signature_check() */ -+ -+/*****************************************************************************/ -+/* -+ * examine the signatures that are parsed out of the signature data - we keep -+ * the first one that's appropriate and ignore the rest -+ * - return 0 if signature of interest (sig not freed by caller) -+ * - return 1 if no interest (caller frees) -+ */ -+static int ksign_grab_signature(struct ksign_signature *sig, void *fnxdata) -+{ -+ struct ksign_signature **_sig = fnxdata; -+ -+ if (sig->sig_class != 0x00) { -+ _debug("ksign: standalone signature of class 0x%02x\n", -+ sig->sig_class); -+ return 1; -+ } -+ -+ if (*_sig) -+ return 1; -+ -+ *_sig = sig; -+ return 0; -+} /* end ksign_grab_signature() */ -+ -+/*****************************************************************************/ -+/* -+ * verify the signature of some data with one of the kernel's known public keys -+ * - the SHA1 context should be currently open with the signed data digested -+ * into it so that more data can be appended -+ * - the SHA1 context is finalised and freed before returning -+ */ -+int ksign_verify_signature(const char *sigdata, unsigned sig_size, -+ struct crypto_tfm *sha1) -+{ -+ struct ksign_signature *sig = NULL; -+ int retval; -+ -+ /* parse the signature data to get the actual signature */ -+ retval = ksign_parse_packets(sigdata, sig_size, -+ &ksign_grab_signature, NULL, NULL, -+ &sig); -+ if (retval < 0) -+ goto cleanup; -+ -+ if (!sig) { -+ printk("Couldn't find valid DSA signature in module\n"); -+ return -ENOENT; -+ } -+ -+ _debug("signature keyid: %08x%08x ver=%u\n", -+ sig->keyid[0], sig->keyid[1], sig->version); -+ -+ /* check the data SHA1 transformation against the public key */ -+ retval = ksign_signature_check(sig, sha1); -+ if (retval == 0) { -+ _debug("ksign: Signature check succeeded\n"); -+ } -+ else if (retval != -ENOMEM) { -+ _debug("ksign: Signature check failed\n"); -+ retval = -EPERM; -+ } -+ else { -+ _debug("ksign: Signature check ENOMEM\n"); -+ } -+ -+ cleanup: -+ if (sig) -+ ksign_free_signature(sig); -+ -+ return retval; -+} /* end ksign_verify_signature() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-keyring.c linux-902/crypto/signature/ksign-keyring.c ---- linux-901/crypto/signature/ksign-keyring.c -+++ linux-902/crypto/signature/ksign-keyring.c -@@ -0,0 +1,112 @@ +diff --git a/crypto/signature/ksign-keyring.c b/crypto/signature/ksign-keyring.c +new file mode 100644 +index 0000000..a839261 +--- /dev/null ++++ b/crypto/signature/ksign-keyring.c +@@ -0,0 +1,116 @@ +/* ksign-keyring.c: public key cache + * + * Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. @@ -351,6 +219,9 @@ +static LIST_HEAD(keyring); +static DECLARE_RWSEM(keyring_sem); + ++/* ++ * handle a public key element parsed from the keyring blob ++ */ +static int add_keyblock_key(struct ksign_public_key *pk, void *data) +{ + printk("- Added public key %X%X\n", pk->keyid[0], pk->keyid[1]); @@ -371,15 +242,17 @@ + return 0; +} + ++/* ++ * handle a user ID element parsed from the keyring blob ++ */ +static int add_keyblock_uid(struct ksign_user_id *uid, void *data) +{ + printk("- User ID: %s\n", uid->name); + return 1; +} + -+/*****************************************************************************/ +/* -+ * ++ * add the keys from a ASN.1 encoded blob into the keyring + */ +int ksign_load_keyring_from_buffer(const void *buffer, size_t size) +{ @@ -391,11 +264,10 @@ + add_keyblock_key, + add_keyblock_uid, + NULL); -+} /* end ksign_load_keyring_from_buffer() */ ++} + -+/*****************************************************************************/ +/* -+ * ++ * find a public key by ID + */ +struct ksign_public_key *ksign_get_public_key(const uint32_t *keyid) +{ @@ -410,15 +282,15 @@ + } + } + -+ found: -+ up_read(&keyring_sem); ++ pk = NULL; + ++found: ++ up_read(&keyring_sem); + return pk; -+} /* end ksign_get_public_key() */ ++} + -+/*****************************************************************************/ +/* -+ * clear the public key keyring ++ * clear the public-key keyring + */ +void ksign_clear_keyring(void) +{ @@ -434,12 +306,14 @@ + } + + up_write(&keyring_sem); -+} /* end ksign_clear_keyring() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-parse.c linux-902/crypto/signature/ksign-parse.c ---- linux-901/crypto/signature/ksign-parse.c -+++ linux-902/crypto/signature/ksign-parse.c -@@ -0,0 +1,609 @@ -+/* parse-packet.c - read packets ++} +diff --git a/crypto/signature/ksign-parse.c b/crypto/signature/ksign-parse.c +new file mode 100644 +index 0000000..96e2ff5 +--- /dev/null ++++ b/crypto/signature/ksign-parse.c +@@ -0,0 +1,603 @@ ++/* parse packet data + * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. @@ -496,14 +370,13 @@ +{ + int i; + -+ if (!sig) -+ return; -+ -+ for (i = 0; i < DSA_NSIG; i++) -+ mpi_free(sig->data[i]); -+ kfree(sig->hashed_data); -+ kfree(sig->unhashed_data); -+ kfree(sig); ++ if (sig) { ++ for (i = 0; i < DSA_NSIG; i++) ++ mpi_free(sig->data[i]); ++ kfree(sig->hashed_data); ++ kfree(sig->unhashed_data); ++ kfree(sig); ++ } +} + +void ksign_free_public_key(struct ksign_public_key *pk) @@ -519,15 +392,13 @@ + +void ksign_free_user_id(struct ksign_user_id *uid) +{ -+ if (uid) -+ kfree(uid); ++ kfree(uid); +} + -+/*****************************************************************************/ +/* + * + */ -+static void ksign_calc_pk_keyid(struct crypto_tfm *sha1, ++static void ksign_calc_pk_keyid(struct hash_desc *sha1, + struct ksign_public_key *pk) +{ + unsigned n; @@ -538,7 +409,7 @@ + int i; + int npkey = DSA_NPKEY; + -+ crypto_digest_init(sha1); ++ crypto_hash_init(sha1); + + n = pk->version < 4 ? 8 : 6; + for (i = 0; i < npkey; i++) { @@ -551,7 +422,7 @@ + SHA1_putc(sha1, n >> 8); /* 2 uint8_t length header */ + SHA1_putc(sha1, n); + -+ if( pk->version < 4) ++ if (pk->version < 4) + SHA1_putc(sha1, 3); + else + SHA1_putc(sha1, 4); @@ -566,7 +437,8 @@ + uint16_t a16; + + if( pk->expiredate ) -+ a16 = (uint16_t) ((pk->expiredate - pk->timestamp) / 86400L); ++ a16 = (uint16_t) ++ ((pk->expiredate - pk->timestamp) / 86400L); + else + a16 = 0; + SHA1_putc(sha1, a16 >> 8); @@ -581,10 +453,8 @@ + SHA1_write(sha1, pp[i], nn[i]); + kfree(pp[i]); + } ++} + -+} /* end ksign_calc_pk_keyid() */ -+ -+/*****************************************************************************/ +/* + * parse a user ID embedded in a signature + */ @@ -615,9 +485,8 @@ + + ksign_free_user_id(uid); + return rc; -+} /* end ksign_parse_user_id() */ ++} + -+/*****************************************************************************/ +/* + * extract a public key embedded in a signature + */ @@ -626,9 +495,9 @@ + ksign_public_key_actor_t pkfnx, void *fnxdata) +{ + struct ksign_public_key *pk; -+ struct crypto_tfm *sha1_tfm; ++ struct hash_desc sha1; + unsigned long timestamp, expiredate; -+ uint8_t sha1[SHA1_DIGEST_SIZE]; ++ uint8_t hash[SHA1_DIGEST_SIZE]; + int i, version; + int is_v4 = 0; + int rc = 0; @@ -652,9 +521,9 @@ + } + + timestamp = read_32(&datap); -+ if (is_v4) ++ if (is_v4) { + expiredate = 0; /* have to get it from the selfsignature */ -+ else { ++ } else { + unsigned short ndays; + ndays = read_16(&datap); + if (ndays) @@ -670,11 +539,10 @@ + } + + /* extract the stuff from the DSA public key */ -+ pk = kmalloc(sizeof(struct ksign_public_key), GFP_KERNEL); ++ pk = kzalloc(sizeof(struct ksign_public_key), GFP_KERNEL); + if (!pk) + return -ENOMEM; + -+ memset(pk, 0, sizeof(struct ksign_public_key)); + atomic_set(&pk->count, 1); + pk->timestamp = timestamp; + pk->expiredate = expiredate; @@ -689,29 +557,29 @@ + + rc = -ENOMEM; + -+ sha1_tfm = crypto_alloc_tfm2("sha1", 0, 1); -+ if (!sha1_tfm) ++ sha1.tfm = crypto_hash_cast(crypto_alloc_tfm2("sha1", 0, 1)); ++ if (!sha1.tfm) + goto cleanup; ++ sha1.flags = 0; + -+ ksign_calc_pk_keyid(sha1_tfm, pk); -+ crypto_digest_final(sha1_tfm, sha1); -+ crypto_free_tfm(sha1_tfm); ++ ksign_calc_pk_keyid(&sha1, pk); ++ crypto_hash_final(&sha1, hash); ++ crypto_free_hash(sha1.tfm); + -+ pk->keyid[0] = sha1[12] << 24 | sha1[13] << 16 | sha1[14] << 8 | sha1[15]; -+ pk->keyid[1] = sha1[16] << 24 | sha1[17] << 16 | sha1[18] << 8 | sha1[19]; ++ pk->keyid[0] = hash[12] << 24 | hash[13] << 16 | hash[14] << 8 | hash[15]; ++ pk->keyid[1] = hash[16] << 24 | hash[17] << 16 | hash[18] << 8 | hash[19]; + + rc = 0; + if (pkfnx) + rc = pkfnx(pk, fnxdata); + -+ cleanup: ++cleanup: + ksign_put_public_key(pk); + return rc; -+} /* end ksign_parse_key() */ ++} + -+/*****************************************************************************/ +/* -+ * ++ * find an element representing the issuer + */ +static const uint8_t *ksign_find_sig_issuer(const uint8_t *buffer) +{ @@ -731,8 +599,7 @@ + goto too_short; + n = read_32(&buffer); + buflen -= 4; -+ } -+ else if (n >= 192) { ++ } else if (n >= 192) { + if(buflen < 2) + goto too_short; + n = ((n - 192) << 8) + *buffer + 192; @@ -744,9 +611,10 @@ + goto too_short; + + type = *buffer & 0x7f; -+ if (!(++seq > 0)) ++ if (!(++seq > 0)) { + ; -+ else if (type == SIGSUBPKT_ISSUER) { /* found */ ++ } else if (type == SIGSUBPKT_ISSUER) { ++ /* found */ + buffer++; + n--; + if (n > buflen || n < 8) @@ -758,11 +626,10 @@ + buflen -= n; + } + -+ too_short: ++too_short: + return NULL; /* end of subpackets; not found */ -+} /* end ksign_find_sig_issuer() */ ++} + -+/*****************************************************************************/ +/* + * extract signature data embedded in a signature + */ @@ -788,16 +655,16 @@ + case 2: + break; + default: -+ printk("ksign: signature packet with unknown version %d\n", version); ++ printk("ksign: signature packet with unknown version %d\n", ++ version); + return 0; + } + + /* store information */ -+ sig = kmalloc(sizeof(*sig), GFP_KERNEL); ++ sig = kzalloc(sizeof(*sig), GFP_KERNEL); + if (!sig) + return -ENOMEM; + -+ memset(sig, 0, sizeof(*sig)); + sig->version = version; + + if (!is_v4) @@ -821,15 +688,18 @@ + } + + rc = -EBADMSG; -+ if (is_v4) { /* read subpackets */ ++ if (is_v4) { ++ /* read subpackets */ + n = read_16(&datap); /* length of hashed data */ + if (n > 10000) { -+ printk("ksign: signature packet: hashed data too long\n"); ++ printk("ksign: signature packet:" ++ " hashed data too long\n"); + goto leave; + } + if (n) { + if ((size_t)(endp - datap) < n) { -+ printk("ksign: signature packet: available data too short\n"); ++ printk("ksign: signature packet:" ++ " available data too short\n"); + goto leave; + } + sig->hashed_data = kmalloc(n + 2, GFP_KERNEL); @@ -845,12 +715,14 @@ + + n = read_16(&datap); /* length of unhashed data */ + if (n > 10000) { -+ printk("ksign: signature packet: unhashed data too long\n"); ++ printk("ksign: signature packet:" ++ " unhashed data too long\n"); + goto leave; + } + if (n) { + if ((size_t) (endp - datap) < n) { -+ printk("ksign: signature packet: available data too short\n"); ++ printk("ksign: signature packet:" ++ " available data too short\n"); + goto leave; + } + sig->unhashed_data = kmalloc(n + 2, GFP_KERNEL); @@ -879,9 +751,9 @@ + p = ksign_find_sig_issuer(sig->hashed_data); + if (!p) + p = ksign_find_sig_issuer(sig->unhashed_data); -+ if (!p) ++ if (!p) { + printk("ksign: signature packet without issuer\n"); -+ else { ++ } else { + sig->keyid[0] = buffer_to_u32(p); + sig->keyid[1] = buffer_to_u32(p + 4); + } @@ -902,12 +774,11 @@ + rc = 0; + } + -+ leave: ++leave: + ksign_free_signature(sig); + return rc; -+} /* end ksign_parse_signature() */ ++} + -+/*****************************************************************************/ +/* + * parse the next packet and call appropriate handler function for known types + * - returns: @@ -955,8 +826,7 @@ + + if (c < 192) { + pktlen = c; -+ } -+ else if (c < 224) { ++ } else if (c < 224) { + pktlen = (c - 192) * 256; + if (*datap >= endp) { + printk("ksign: 2nd length uint8_t missing\n"); @@ -965,28 +835,24 @@ + c = *(*datap)++; + hdr[hdrlen++] = c; + pktlen += c + 192; -+ } -+ else if (c == 255) { ++ } else if (c == 255) { + if (*datap + 3 >= endp) { + printk("ksign: 4 uint8_t length invalid\n"); + goto leave; + } -+ pktlen = (hdr[hdrlen++] = *(*datap)++ << 24 ); -+ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 16 ); -+ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 8 ); -+ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 0 ); -+ } -+ else { ++ pktlen = (hdr[hdrlen++] = *(*datap)++ << 24); ++ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 16); ++ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 8); ++ pktlen |= (hdr[hdrlen++] = *(*datap)++ << 0); ++ } else { + pktlen = 0;/* to indicate partial length */ + } -+ } -+ else { ++ } else { + pkttype = (ctb >> 2) & 0xf; + lenuint8_ts = ((ctb & 3) == 3) ? 0 : (1 << (ctb & 3)); + if( !lenuint8_ts ) { + pktlen = 0; /* don't know the value */ -+ } -+ else { ++ } else { + if (*datap + lenuint8_ts > endp) { + printk("ksign: length uint8_ts missing\n"); + goto leave; @@ -1006,13 +872,16 @@ + /* deal with the next packet appropriately */ + switch (pkttype) { + case PKT_PUBLIC_KEY: -+ rc = ksign_parse_key(*datap, *datap + pktlen, hdr, hdrlen, pkfnx, data); ++ rc = ksign_parse_key(*datap, *datap + pktlen, hdr, hdrlen, ++ pkfnx, data); + break; + case PKT_SIGNATURE: -+ rc = ksign_parse_signature(*datap, *datap + pktlen, sigfnx, data); ++ rc = ksign_parse_signature(*datap, *datap + pktlen, ++ sigfnx, data); + break; + case PKT_USER_ID: -+ rc = ksign_parse_user_id(*datap, *datap + pktlen, uidfnx, data); ++ rc = ksign_parse_user_id(*datap, *datap + pktlen, ++ uidfnx, data); + break; + default: + rc = 0; /* unknown packet */ @@ -1020,11 +889,10 @@ + } + + *datap += pktlen; -+ leave: ++leave: + return rc; -+} /* end ksign_parse_one_packet() */ ++} + -+/*****************************************************************************/ +/* + * parse the contents of a packet buffer, passing the signature, public key and + * user ID to the caller's callback functions @@ -1047,13 +915,14 @@ + } while (rc == 0 && datap < endp); + + return rc; -+} /* end ksign_parse_packets() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/ksign-publickey.c linux-902/crypto/signature/ksign-publickey.c ---- linux-901/crypto/signature/ksign-publickey.c -+++ linux-902/crypto/signature/ksign-publickey.c -@@ -0,0 +1,19 @@ ++} +diff --git a/crypto/signature/ksign-publickey.c b/crypto/signature/ksign-publickey.c +new file mode 100644 +index 0000000..832a419 +--- /dev/null ++++ b/crypto/signature/ksign-publickey.c +@@ -0,0 +1,18 @@ +#include "local.h" -+ +#include "key.h" + +static int __init ksign_init(void) @@ -1071,10 +940,198 @@ +} + +module_init(ksign_init) -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/local.h linux-902/crypto/signature/local.h ---- linux-901/crypto/signature/local.h -+++ linux-902/crypto/signature/local.h -@@ -0,0 +1,163 @@ +diff --git a/crypto/signature/ksign.c b/crypto/signature/ksign.c +new file mode 100644 +index 0000000..b62eb38 +--- /dev/null ++++ b/crypto/signature/ksign.c +@@ -0,0 +1,180 @@ ++/* ksign.c: signature checker ++ * ++ * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. ++ * Written by David Howells (dhowells at redhat.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#include ++#include ++#include "local.h" ++ ++#if 0 ++#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__) ++#else ++#define _debug(FMT, ...) do { ; } while (0) ++#endif ++ ++/* ++ * check the signature which is contained in SIG. ++ */ ++static int ksign_signature_check(const struct ksign_signature *sig, ++ struct crypto_hash *sha1_tfm) ++{ ++ struct ksign_public_key *pk; ++ struct hash_desc sha1_d; ++ uint8_t sha1[SHA1_DIGEST_SIZE]; ++ MPI result = NULL; ++ int rc = 0; ++ ++ pk = ksign_get_public_key(sig->keyid); ++ if (!pk) { ++ printk("ksign: module signed with unknown public key\n"); ++ printk("- signature keyid: %08x%08x ver=%u\n", ++ sig->keyid[0], sig->keyid[1], sig->version); ++ return -ENOKEY; ++ } ++ ++ if (pk->timestamp > sig->timestamp) ++ printk("ksign:" ++ " public key is %lu seconds newer than the signature\n", ++ pk->timestamp - sig->timestamp); ++ ++ sha1_d.tfm = sha1_tfm; ++ sha1_d.flags = 0; ++ ++ /* complete the digest */ ++ if (sig->version >= 4) ++ SHA1_putc(&sha1_d, sig->version); ++ SHA1_putc(&sha1_d, sig->sig_class); ++ ++ if (sig->version < 4) { ++ u32 a = sig->timestamp; ++ SHA1_putc(&sha1_d, (a >> 24) & 0xff); ++ SHA1_putc(&sha1_d, (a >> 16) & 0xff); ++ SHA1_putc(&sha1_d, (a >> 8) & 0xff); ++ SHA1_putc(&sha1_d, (a >> 0) & 0xff); ++ } ++ else { ++ uint8_t buf[6]; ++ size_t n; ++ SHA1_putc(&sha1_d, PUBKEY_ALGO_DSA); ++ SHA1_putc(&sha1_d, DIGEST_ALGO_SHA1); ++ if (sig->hashed_data) { ++ n = (sig->hashed_data[0] << 8) | sig->hashed_data[1]; ++ SHA1_write(&sha1_d, sig->hashed_data, n + 2); ++ n += 6; ++ } ++ else { ++ n = 6; ++ } ++ ++ /* add some magic */ ++ buf[0] = sig->version; ++ buf[1] = 0xff; ++ buf[2] = n >> 24; ++ buf[3] = n >> 16; ++ buf[4] = n >> 8; ++ buf[5] = n; ++ SHA1_write(&sha1_d, buf, 6); ++ } ++ ++ crypto_hash_final(&sha1_d, sha1); ++ crypto_free_hash(sha1_tfm); ++ ++ rc = -ENOMEM; ++ result = mpi_alloc((SHA1_DIGEST_SIZE + BYTES_PER_MPI_LIMB - 1) / ++ BYTES_PER_MPI_LIMB); ++ if (!result) ++ goto cleanup; ++ ++ rc = mpi_set_buffer(result, sha1, SHA1_DIGEST_SIZE, 0); ++ if (rc < 0) ++ goto cleanup; ++ ++ rc = DSA_verify(result, sig->data, pk->pkey); ++ ++ cleanup: ++ mpi_free(result); ++ ksign_put_public_key(pk); ++ ++ return rc; ++} ++ ++/* ++ * examine the signatures that are parsed out of the signature data - we keep ++ * the first one that's appropriate and ignore the rest ++ * - return 0 if signature of interest (sig not freed by caller) ++ * - return 1 if no interest (caller frees) ++ */ ++static int ksign_grab_signature(struct ksign_signature *sig, void *fnxdata) ++{ ++ struct ksign_signature **_sig = fnxdata; ++ ++ if (sig->sig_class != 0x00) { ++ _debug("ksign: standalone signature of class 0x%02x\n", ++ sig->sig_class); ++ return 1; ++ } ++ ++ if (*_sig) ++ return 1; ++ ++ *_sig = sig; ++ return 0; ++} ++ ++/* ++ * verify the signature of some data with one of the kernel's known public keys ++ * - the SHA1 context should be currently open with the signed data digested ++ * into it so that more data can be appended ++ * - the SHA1 context is finalised and freed before returning ++ */ ++int ksign_verify_signature(const char *sigdata, unsigned sig_size, ++ struct crypto_hash *sha1) ++{ ++ struct ksign_signature *sig = NULL; ++ int retval; ++ ++ /* parse the signature data to get the actual signature */ ++ retval = ksign_parse_packets(sigdata, sig_size, ++ &ksign_grab_signature, NULL, NULL, ++ &sig); ++ if (retval < 0) ++ goto cleanup; ++ ++ if (!sig) { ++ printk(KERN_NOTICE ++ "Couldn't find valid DSA signature in module\n"); ++ return -ENOENT; ++ } ++ ++ _debug("signature keyid: %08x%08x ver=%u\n", ++ sig->keyid[0], sig->keyid[1], sig->version); ++ ++ /* check the data SHA1 transformation against the public key */ ++ retval = ksign_signature_check(sig, sha1); ++ switch (retval) { ++ case 0: ++ _debug("ksign: Signature check succeeded\n"); ++ break; ++ case -ENOMEM: ++ _debug("ksign: Signature check ENOMEM\n"); ++ break; ++ default: ++ _debug("ksign: Signature check failed\n"); ++ if (retval != -ENOKEY) ++ retval = -EKEYREJECTED; ++ break; ++ } ++ ++ cleanup: ++ if (sig) ++ ksign_free_signature(sig); ++ ++ return retval; ++} +diff --git a/crypto/signature/local.h b/crypto/signature/local.h +new file mode 100644 +index 0000000..aa18cc4 +--- /dev/null ++++ b/crypto/signature/local.h +@@ -0,0 +1,160 @@ +/* local.h: kernel signature checker internal defs + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. @@ -1153,8 +1210,7 @@ +/* + * signature record + */ -+struct ksign_signature -+{ ++struct ksign_signature { + uint32_t keyid[2]; /* 64 bit keyid */ + time_t timestamp; /* signature made */ + uint8_t version; @@ -1170,8 +1226,7 @@ +/* + * public key record + */ -+struct ksign_public_key -+{ ++struct ksign_public_key { + struct list_head link; + atomic_t count; /* ref count */ + time_t timestamp; /* key made */ @@ -1200,8 +1255,7 @@ +/* + * user ID record + */ -+struct ksign_user_id -+{ ++struct ksign_user_id { + int len; /* length of the name */ + char name[0]; +}; @@ -1229,32 +1283,20 @@ + * - we _know_ the data is locked into kernel memory, so we don't want to have + * to kmap() it + */ -+static inline void SHA1_putc(struct crypto_tfm *sha1, uint8_t ch) ++static inline void SHA1_putc(struct hash_desc *sha1, uint8_t ch) +{ -+ crypto_digest_update_kernel(sha1, &ch, 1); ++ crypto_hash_update_kernel(sha1, &ch, 1); +} + -+static inline void SHA1_write(struct crypto_tfm *sha1, const void *s, size_t n) ++static inline void SHA1_write(struct hash_desc *sha1, const void *s, size_t n) +{ -+ crypto_digest_update_kernel(sha1, s, n); ++ crypto_hash_update_kernel(sha1, s, n); +} -diff -urNp --exclude-from=/home/davej/.exclude linux-901/crypto/signature/Makefile linux-902/crypto/signature/Makefile ---- linux-901/crypto/signature/Makefile -+++ linux-902/crypto/signature/Makefile -@@ -0,0 +1,10 @@ -+# -+# Makefile for the signature checker -+# -+ -+obj-y := \ -+ ksign.o \ -+ ksign-parse.o \ -+ ksign-keyring.o \ -+ ksign-publickey.o \ -+ dsa.o -diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto/ksign.h linux-902/include/linux/crypto/ksign.h ---- linux-901/include/linux/crypto/ksign.h -+++ linux-902/include/linux/crypto/ksign.h +diff --git a/include/linux/crypto/ksign.h b/include/linux/crypto/ksign.h +new file mode 100644 +index 0000000..27c9e4a +--- /dev/null ++++ b/include/linux/crypto/ksign.h @@ -0,0 +1,22 @@ +/* ksign.h: in-kernel signature checker + * @@ -1274,45 +1316,7 @@ + +#ifdef CONFIG_CRYPTO_SIGNATURE +extern int ksign_verify_signature(const char *sig, unsigned sig_size, -+ struct crypto_tfm *sha1); ++ struct crypto_hash *sha1); +#endif + +#endif /* _LINUX_CRYPTO_KSIGN_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-901/include/linux/crypto.h linux-902/include/linux/crypto.h ---- linux-901/include/linux/crypto.h -+++ linux-902/include/linux/crypto.h -@@ -167,6 +167,8 @@ struct digest_tfm { - void (*dit_init)(struct crypto_tfm *tfm); - void (*dit_update)(struct crypto_tfm *tfm, - struct scatterlist *sg, unsigned int nsg); -+ void (*dit_update_kernel)(struct crypto_tfm *tfm, -+ const void *data, size_t count); - void (*dit_final)(struct crypto_tfm *tfm, u8 *out); - void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg, - unsigned int nsg, u8 *out); -@@ -287,6 +289,14 @@ static inline void crypto_digest_update( - tfm->crt_digest.dit_update(tfm, sg, nsg); - } - -+static inline void crypto_digest_update_kernel(struct crypto_tfm *tfm, -+ const void *data, -+ size_t count) -+{ -+ BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); -+ tfm->crt_digest.dit_update_kernel(tfm, data, count); -+} -+ - static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) - { - BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); ---- linux-2.6.14/crypto/signature/ksign-keyring.c~ 2005-11-22 14:11:25.000000000 -0500 -+++ linux-2.6.14/crypto/signature/ksign-keyring.c 2005-11-22 14:11:38.000000000 -0500 -@@ -85,6 +85,8 @@ struct ksign_public_key *ksign_get_publi - } - } - -+ pk = NULL; -+ - found: - up_read(&keyring_sem); - linux-2.6-modsign-mpilib.patch: crypto/Kconfig | 6 crypto/Makefile | 2 crypto/mpi/Makefile | 30 crypto/mpi/generic_mpi-asm-defs.h | 10 crypto/mpi/generic_mpih-add1.c | 62 + crypto/mpi/generic_mpih-lshift.c | 66 + crypto/mpi/generic_mpih-mul1.c | 58 + crypto/mpi/generic_mpih-mul2.c | 63 + crypto/mpi/generic_mpih-mul3.c | 64 + crypto/mpi/generic_mpih-rshift.c | 65 + crypto/mpi/generic_mpih-sub1.c | 62 + crypto/mpi/generic_udiv-w-sdiv.c | 130 +++ crypto/mpi/longlong.h | 1502 ++++++++++++++++++++++++++++++++++++++ crypto/mpi/mpi-add.c | 258 ++++++ crypto/mpi/mpi-bit.c | 245 ++++++ crypto/mpi/mpi-cmp.c | 71 + crypto/mpi/mpi-div.c | 345 ++++++++ crypto/mpi/mpi-gcd.c | 60 + crypto/mpi/mpi-inline.c | 33 crypto/mpi/mpi-inline.h | 128 +++ crypto/mpi/mpi-internal.h | 265 ++++++ crypto/mpi/mpi-inv.c | 148 +++ crypto/mpi/mpi-mpow.c | 113 ++ crypto/mpi/mpi-mul.c | 202 +++++ crypto/mpi/mpi-pow.c | 312 +++++++ crypto/mpi/mpi-scan.c | 129 +++ crypto/mpi/mpicoder.c | 359 +++++++++ crypto/mpi/mpih-cmp.c | 58 + crypto/mpi/mpih-div.c | 534 +++++++++++++ crypto/mpi/mpih-mul.c | 546 +++++++++++++ crypto/mpi/mpiutil.c | 213 +++++ include/linux/crypto/mpi.h | 147 +++ 32 files changed, 6286 insertions(+) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-modsign-mpilib.patch Index: linux-2.6-modsign-mpilib.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-modsign-mpilib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-modsign-mpilib.patch 22 Nov 2005 16:15:15 -0000 1.2 +++ linux-2.6-modsign-mpilib.patch 31 Jan 2007 15:26:15 -0000 1.3 @@ -1,6 +1,119 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpi-asm-defs.h linux-903/crypto/mpi/generic_mpi-asm-defs.h ---- linux-902/crypto/mpi/generic_mpi-asm-defs.h -+++ linux-903/crypto/mpi/generic_mpi-asm-defs.h +MODSIGN: Multiprecision maths library + +From: David Howells + +Add a multiprecision maths library (MPILIB) required for doing cryptographic +operations based on very large prime numbers. + +This is derived from GPG, reduced to the minimum necessary bits for doing DSA +signature verification with error handling added. This is used to do kernel +module signing. + +Signed-Off-By: David Howells +--- + + crypto/Kconfig | 6 + crypto/Makefile | 2 + crypto/mpi/Makefile | 30 + + crypto/mpi/generic_mpi-asm-defs.h | 10 + crypto/mpi/generic_mpih-add1.c | 62 ++ + crypto/mpi/generic_mpih-lshift.c | 66 ++ + crypto/mpi/generic_mpih-mul1.c | 58 + + crypto/mpi/generic_mpih-mul2.c | 63 ++ + crypto/mpi/generic_mpih-mul3.c | 64 ++ + crypto/mpi/generic_mpih-rshift.c | 65 ++ + crypto/mpi/generic_mpih-sub1.c | 62 ++ + crypto/mpi/generic_udiv-w-sdiv.c | 130 +++ + crypto/mpi/longlong.h | 1502 +++++++++++++++++++++++++++++++++++++ + crypto/mpi/mpi-add.c | 258 ++++++ + crypto/mpi/mpi-bit.c | 245 ++++++ + crypto/mpi/mpi-cmp.c | 71 ++ + crypto/mpi/mpi-div.c | 345 ++++++++ + crypto/mpi/mpi-gcd.c | 60 + + crypto/mpi/mpi-inline.c | 33 + + crypto/mpi/mpi-inline.h | 128 +++ + crypto/mpi/mpi-internal.h | 265 +++++++ + crypto/mpi/mpi-inv.c | 148 ++++ + crypto/mpi/mpi-mpow.c | 113 +++ + crypto/mpi/mpi-mul.c | 202 +++++ + crypto/mpi/mpi-pow.c | 312 ++++++++ + crypto/mpi/mpi-scan.c | 129 +++ + crypto/mpi/mpicoder.c | 359 +++++++++ + crypto/mpi/mpih-cmp.c | 58 + + crypto/mpi/mpih-div.c | 534 +++++++++++++ + crypto/mpi/mpih-mul.c | 546 +++++++++++++ + crypto/mpi/mpiutil.c | 213 +++++ + include/linux/crypto/mpi.h | 147 ++++ + 32 files changed, 6286 insertions(+), 0 deletions(-) + +diff --git a/crypto/Kconfig b/crypto/Kconfig +index 92ba249..d768c46 100644 +--- a/crypto/Kconfig ++++ b/crypto/Kconfig +@@ -465,6 +465,12 @@ config CRYPTO_TEST + help + Quick & dirty crypto test module. + ++config CRYPTO_MPILIB ++ bool "Multiprecision maths library (EXPERIMENTAL)" ++ depends on CRYPTO ++ help ++ Multiprecision maths library from GnuPG ++ + source "drivers/crypto/Kconfig" + + endif # if CRYPTO +diff --git a/crypto/Makefile b/crypto/Makefile +index 60e3d24..36a6211 100644 +--- a/crypto/Makefile ++++ b/crypto/Makefile +@@ -45,3 +45,5 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += mich + obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o + + obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o ++ ++obj-$(CONFIG_CRYPTO_MPILIB) += mpi/ +diff --git a/crypto/mpi/Makefile b/crypto/mpi/Makefile +new file mode 100644 +index 0000000..e96597d +--- /dev/null ++++ b/crypto/mpi/Makefile +@@ -0,0 +1,30 @@ ++# ++# MPI multiprecision maths library (from gpg) ++# ++ ++obj-$(CONFIG_CRYPTO_MPILIB) = \ ++ generic_mpih-lshift.o \ ++ generic_mpih-mul1.o \ ++ generic_mpih-mul2.o \ ++ generic_mpih-mul3.o \ ++ generic_mpih-rshift.o \ ++ generic_mpih-sub1.o \ ++ generic_mpih-add1.o \ ++ generic_udiv-w-sdiv.o \ ++ mpicoder.o \ ++ mpi-add.o \ ++ mpi-bit.o \ ++ mpi-div.o \ ++ mpi-cmp.o \ ++ mpi-gcd.o \ ++ mpih-cmp.o \ ++ mpih-div.o \ ++ mpih-mul.o \ ++ mpi-inline.o \ ++ mpi-inv.o \ ++ mpi-mpow.o \ ++ mpi-mul.o \ ++ mpi-pow.o \ ++ mpi-scan.o \ ++ mpiutil.o ++ +diff --git a/crypto/mpi/generic_mpi-asm-defs.h b/crypto/mpi/generic_mpi-asm-defs.h +new file mode 100644 +index 0000000..13424e2 +--- /dev/null ++++ b/crypto/mpi/generic_mpi-asm-defs.h @@ -0,0 +1,10 @@ +/* This file defines some basic constants for the MPI machinery. We + * need to define the types on a per-CPU basis, so it is done with @@ -12,9 +125,11 @@ + + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-add1.c linux-903/crypto/mpi/generic_mpih-add1.c ---- linux-902/crypto/mpi/generic_mpih-add1.c -+++ linux-903/crypto/mpi/generic_mpih-add1.c +diff --git a/crypto/mpi/generic_mpih-add1.c b/crypto/mpi/generic_mpih-add1.c +new file mode 100644 +index 0000000..891fef0 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-add1.c @@ -0,0 +1,62 @@ +/* mpihelp-add_1.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, @@ -78,9 +193,11 @@ + return cy; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-lshift.c linux-903/crypto/mpi/generic_mpih-lshift.c ---- linux-902/crypto/mpi/generic_mpih-lshift.c -+++ linux-903/crypto/mpi/generic_mpih-lshift.c +diff --git a/crypto/mpi/generic_mpih-lshift.c b/crypto/mpi/generic_mpih-lshift.c +new file mode 100644 +index 0000000..9e159b5 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-lshift.c @@ -0,0 +1,66 @@ +/* mpihelp-lshift.c - MPI helper functions + * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc. @@ -148,9 +265,11 @@ +} + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul1.c linux-903/crypto/mpi/generic_mpih-mul1.c ---- linux-902/crypto/mpi/generic_mpih-mul1.c -+++ linux-903/crypto/mpi/generic_mpih-mul1.c +diff --git a/crypto/mpi/generic_mpih-mul1.c b/crypto/mpi/generic_mpih-mul1.c +new file mode 100644 +index 0000000..4e34d46 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-mul1.c @@ -0,0 +1,58 @@ +/* mpihelp-mul_1.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -210,9 +329,11 @@ + return cy_limb; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul2.c linux-903/crypto/mpi/generic_mpih-mul2.c ---- linux-902/crypto/mpi/generic_mpih-mul2.c -+++ linux-903/crypto/mpi/generic_mpih-mul2.c +diff --git a/crypto/mpi/generic_mpih-mul2.c b/crypto/mpi/generic_mpih-mul2.c +new file mode 100644 +index 0000000..c1f41f3 +--- /dev/null ++++ b/crypto/mpi/generic_mpih-mul2.c @@ -0,0 +1,63 @@ +/* mpihelp-mul_2.c - MPI helper functions + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. @@ -277,9 +398,11 @@ +} + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/generic_mpih-mul3.c linux-903/crypto/mpi/generic_mpih-mul3.c ---- linux-902/crypto/mpi/generic_mpih-mul3.c -+++ linux-903/crypto/mpi/generic_mpih-mul3.c +diff --git a/crypto/mpi/generic_mpih-mul3.c b/crypto/mpi/generic_mpih-mul3.c +new file mode 100644 [...5398 lines suppressed...] + */ + -+#include "mpi-internal.h" -+#include "longlong.h" -+ -+/**************** -+ * Scan through an mpi and return byte for byte. a -1 is returned to indicate -+ * the end of the mpi. Scanning is done from the lsb to the msb, returned -+ * values are in the range of 0 .. 255. -+ * -+ * FIXME: This code is VERY ugly! -+ */ +int -+mpi_getbyte( const MPI a, unsigned idx ) ++mpihelp_mul( mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize, ++ mpi_ptr_t vp, mpi_size_t vsize, ++ mpi_limb_t *_result) +{ -+ int i, j; -+ unsigned n; -+ mpi_ptr_t ap; -+ mpi_limb_t limb; -+ -+ ap = a->d; -+ for(n=0,i=0; i < a->nlimbs; i++ ) { -+ limb = ap[i]; -+ for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ ) -+ if( n == idx ) -+ return (limb >> j*8) & 0xff; -+ } -+ return -1; -+} -+ ++ mpi_ptr_t prod_endp = prodp + usize + vsize - 1; ++ mpi_limb_t cy; ++ struct karatsuba_ctx ctx; + -+/**************** -+ * Put a value at position IDX into A. idx counts from lsb to msb -+ */ -+void -+mpi_putbyte( MPI a, unsigned idx, int xc ) -+{ -+ int i, j; -+ unsigned n; -+ mpi_ptr_t ap; -+ mpi_limb_t limb, c; ++ if( vsize < KARATSUBA_THRESHOLD ) { ++ mpi_size_t i; ++ mpi_limb_t v_limb; + -+ c = xc & 0xff; -+ ap = a->d; -+ for(n=0,i=0; i < a->alloced; i++ ) { -+ limb = ap[i]; -+ for( j=0; j < BYTES_PER_MPI_LIMB; j++, n++ ) -+ if( n == idx ) { -+ #if BYTES_PER_MPI_LIMB == 4 -+ if( j == 0 ) -+ limb = (limb & 0xffffff00) | c; -+ else if( j == 1 ) -+ limb = (limb & 0xffff00ff) | (c<<8); -+ else if( j == 2 ) -+ limb = (limb & 0xff00ffff) | (c<<16); -+ else -+ limb = (limb & 0x00ffffff) | (c<<24); -+ #elif BYTES_PER_MPI_LIMB == 8 -+ if( j == 0 ) -+ limb = (limb & 0xffffffffffffff00) | c; -+ else if( j == 1 ) -+ limb = (limb & 0xffffffffffff00ff) | (c<<8); -+ else if( j == 2 ) -+ limb = (limb & 0xffffffffff00ffff) | (c<<16); -+ else if( j == 3 ) -+ limb = (limb & 0xffffffff00ffffff) | (c<<24); -+ else if( j == 4 ) -+ limb = (limb & 0xffffff00ffffffff) | (c<<32); -+ else if( j == 5 ) -+ limb = (limb & 0xffff00ffffffffff) | (c<<40); -+ else if( j == 6 ) -+ limb = (limb & 0xff00ffffffffffff) | (c<<48); -+ else -+ limb = (limb & 0x00ffffffffffffff) | (c<<56); -+ #else -+ #error please enhance this function, its ugly - i know. -+ #endif -+ if( a->nlimbs <= i ) -+ a->nlimbs = i+1; -+ ap[i] = limb; -+ return; -+ } -+ } -+ log_bug("index out of range\n"); -+} ++ if( !vsize ) { ++ *_result = 0; ++ return 0; ++ } + ++ /* Multiply by the first limb in V separately, as the result can be ++ * stored (not added) to PROD. We also avoid a loop for zeroing. */ ++ v_limb = vp[0]; ++ if( v_limb <= 1 ) { ++ if( v_limb == 1 ) ++ MPN_COPY( prodp, up, usize ); ++ else ++ MPN_ZERO( prodp, usize ); ++ cy = 0; ++ } ++ else ++ cy = mpihelp_mul_1( prodp, up, usize, v_limb ); + -+/**************** -+ * Count the number of zerobits at the low end of A -+ */ -+unsigned -+mpi_trailing_zeros( const MPI a ) -+{ -+ unsigned n, count = 0; ++ prodp[usize] = cy; ++ prodp++; + -+ for(n=0; n < a->nlimbs; n++ ) { -+ if( a->d[n] ) { -+ unsigned nn; -+ mpi_limb_t alimb = a->d[n]; ++ /* For each iteration in the outer loop, multiply one limb from ++ * U with one limb from V, and add it to PROD. */ ++ for( i = 1; i < vsize; i++ ) { ++ v_limb = vp[i]; ++ if( v_limb <= 1 ) { ++ cy = 0; ++ if( v_limb == 1 ) ++ cy = mpihelp_add_n(prodp, prodp, up, usize); ++ } ++ else ++ cy = mpihelp_addmul_1(prodp, up, usize, v_limb); + -+ count_trailing_zeros( nn, alimb ); -+ count += nn; -+ break; ++ prodp[usize] = cy; ++ prodp++; + } -+ count += BITS_PER_MPI_LIMB; ++ ++ *_result = cy; ++ return 0; + } -+ return count; + ++ memset( &ctx, 0, sizeof ctx ); ++ if (mpihelp_mul_karatsuba_case( prodp, up, usize, vp, vsize, &ctx ) < 0) ++ return -ENOMEM; ++ mpihelp_release_karatsuba_ctx( &ctx ); ++ *_result = *prod_endp; ++ return 0; +} + + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/crypto/mpi/mpiutil.c linux-903/crypto/mpi/mpiutil.c ---- linux-902/crypto/mpi/mpiutil.c -+++ linux-903/crypto/mpi/mpiutil.c -@@ -0,0 +1,214 @@ +diff --git a/crypto/mpi/mpiutil.c b/crypto/mpi/mpiutil.c +new file mode 100644 +index 0000000..26157e9 +--- /dev/null ++++ b/crypto/mpi/mpiutil.c +@@ -0,0 +1,213 @@ +/* mpiutil.ac - Utility functions for MPI + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. + * @@ -6132,10 +6264,9 @@ + kfree(a->d); + a->d = p; + } else { -+ a->d = kmalloc( nlimbs * sizeof(mpi_limb_t), GFP_KERNEL); ++ a->d = kzalloc( nlimbs * sizeof(mpi_limb_t), GFP_KERNEL); + if (!a->d) + return -ENOMEM; -+ memset(a->d, 0, nlimbs * sizeof(mpi_limb_t) ); + } + a->alloced = nlimbs; + return 0; @@ -6247,9 +6378,11 @@ + tmp = *a; *a = *b; *b = tmp; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-902/include/linux/crypto/mpi.h linux-903/include/linux/crypto/mpi.h ---- linux-902/include/linux/crypto/mpi.h -+++ linux-903/include/linux/crypto/mpi.h +diff --git a/include/linux/crypto/mpi.h b/include/linux/crypto/mpi.h +new file mode 100644 +index 0000000..4de3ba0 +--- /dev/null ++++ b/include/linux/crypto/mpi.h @@ -0,0 +1,147 @@ +/* mpi.h - Multi Precision Integers + * Copyright (C) 1994, 1996, 1998, 1999, linux-2.6-modsign-script.patch: Makefile | 27 + mod-extract.c | 890 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ modsign.sh | 58 +++ 3 files changed, 975 insertions(+) Index: linux-2.6-modsign-script.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-modsign-script.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-modsign-script.patch 16 Oct 2005 22:23:45 -0000 1.1 +++ linux-2.6-modsign-script.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -1,6 +1,36 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/Makefile linux-904/scripts/modsign/Makefile ---- linux-903/scripts/modsign/Makefile -+++ linux-904/scripts/modsign/Makefile +MODSIGN: Stuff for signing modules + +From: David Howells + +Add scripts and programs for signing module files (.ko files). + +With the kernel key files (kernel.sec and kernel.pub) in the parent directory +of the kernel source file, any particular module can be signed by doing: + + sh scripts/modsign/modsign.sh + +For example, the RxRPC module can be signed: + + sh scripts/modsign/modsign.sh net/rxrpc/rxrpc.ko + +This will leave a file called .signed (eg: net/rxrpc/rxrpc.ko.signed) +that is the signed module binary. This file can then be stripped if desired to +remove debugging information without invalidating the signature. It would be +loaded with insmod as normal. + +Signed-Off-By: David Howells +--- + + scripts/modsign/Makefile | 27 + + scripts/modsign/mod-extract.c | 890 +++++++++++++++++++++++++++++++++++++++++ + scripts/modsign/modsign.sh | 58 +++ + 3 files changed, 975 insertions(+), 0 deletions(-) + +diff --git a/scripts/modsign/Makefile b/scripts/modsign/Makefile +new file mode 100644 +index 0000000..9cf4fd9 +--- /dev/null ++++ b/scripts/modsign/Makefile @@ -0,0 +1,27 @@ +# Set the following to `true' to make a debuggable build. +# Leave this set to `false' for production use. @@ -14,7 +44,7 @@ + +CC = gcc + -+INCLUDES = ++INCLUDES = +CFLAGS = -g -O -Wall + +OBJS = mod-extract.o @@ -29,10 +59,12 @@ + +clean: + -rm $(OBJS) $(ROOT) -diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/mod-extract.c linux-904/scripts/modsign/mod-extract.c ---- linux-903/scripts/modsign/mod-extract.c -+++ linux-904/scripts/modsign/mod-extract.c -@@ -0,0 +1,900 @@ +diff --git a/scripts/modsign/mod-extract.c b/scripts/modsign/mod-extract.c +new file mode 100644 +index 0000000..b7b5dd1 +--- /dev/null ++++ b/scripts/modsign/mod-extract.c +@@ -0,0 +1,890 @@ +/* mod-extract.c: module extractor for signing + * + * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved. @@ -141,7 +173,6 @@ + exit(2); +} + -+/*****************************************************************************/ +/* + * + */ @@ -230,10 +261,8 @@ + } + + return 0; ++} + -+} /* end main() */ -+ -+/*****************************************************************************/ +/* + * extract a RELA table + * - need to canonicalise the entries in case section addition/removal has @@ -301,10 +330,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf64_rela() */ -+ -+/*****************************************************************************/ +/* + * extract a REL table + * - need to canonicalise the entries in case section addition/removal has @@ -370,10 +397,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf64_rel() */ -+ -+/*****************************************************************************/ +/* + * extract the data from a 64-bit module + */ @@ -403,6 +428,8 @@ + + symbols = NULL; + strings = NULL; ++ nstrings = 0; ++ nsyms = 0; + + for (loop = 1; loop < shnum; loop++) { + const char *sh_name = secstrings + get32(§ions[loop].sh_name); @@ -578,10 +605,8 @@ + + verbose("%08lx (%lu bytes csum 0x%02x)\n", + ftell(outfd), ftell(outfd), xcsum); ++} + -+} /* end extract_elf64() */ -+ -+/*****************************************************************************/ +/* + * extract a RELA table + * - need to canonicalise the entries in case section addition/removal has @@ -649,10 +674,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf32_rela() */ -+ -+/*****************************************************************************/ +/* + * extract a REL table + * - need to canonicalise the entries in case section addition/removal has @@ -707,7 +730,7 @@ + /* canonicalise the section used by the symbol */ + if (st_shndx > SHN_UNDEF && st_shndx < nsects) + set16(&relocation.st_shndx, canonmap[st_shndx]); -+ ++ + write_out_val(relocation); + + /* undefined symbols must be named if referenced */ @@ -718,10 +741,8 @@ + } + + verbose("%02x %4d %s [canon]\n", csum, secix, sh_name); ++} + -+} /* end extract_elf32_rel() */ -+ -+/*****************************************************************************/ +/* + * extract the data from a 32-bit module + */ @@ -751,6 +772,8 @@ + + symbols = NULL; + strings = NULL; ++ nstrings = 0; ++ nsyms = 0; + + for (loop = 1; loop < shnum; loop++) { + const char *sh_name = secstrings + get32(§ions[loop].sh_name); @@ -931,12 +954,13 @@ + + verbose("%08lx (%lu bytes csum 0x%02x)\n", + ftell(outfd), ftell(outfd), xcsum); -+ -+} /* end extract_elf32() */ -diff -urNp --exclude-from=/home/davej/.exclude linux-903/scripts/modsign/modsign.sh linux-904/scripts/modsign/modsign.sh ---- linux-903/scripts/modsign/modsign.sh -+++ linux-904/scripts/modsign/modsign.sh -@@ -0,0 +1,57 @@ ++} +diff --git a/scripts/modsign/modsign.sh b/scripts/modsign/modsign.sh +new file mode 100644 +index 0000000..5615f92 +--- /dev/null ++++ b/scripts/modsign/modsign.sh +@@ -0,0 +1,58 @@ +#!/bin/bash +############################################################################### +# @@ -980,6 +1004,7 @@ + +# strip out only the sections that we care about +scripts/modsign/mod-extract $verbose $module $module.out || exit $? ++# dd if=/dev/zero of=$module.out bs=1 count=1 # inject fault + +# sign the sections +gpg --no-greeting $KEYFLAGS -b $module.out || exit $? linux-2.6-optimise-spinlock-debug.patch: spinlock_debug.c | 3 --- 1 files changed, 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-optimise-spinlock-debug.patch 10 Oct 2006 05:04:22 -0000 1.4 +++ linux-2.6-optimise-spinlock-debug.patch 31 Jan 2007 15:26:15 -0000 1.5 @@ -27,74 +27,3 @@ if (print_once) { -commit c22f008ba226e2ff25ee1a56abd9c5fd355828fc -tree ffa01da1cf0dec73de897889a1aa5f354f521df1 -parent 92a0f861fe1790dad55ea249169d94f2dc88d696 -author Chuck Ebbert <76306.1226 at compuserve.com> 1159520354 -0700 -committer Linus Torvalds 1159546686 -0700 - -[PATCH] spinlock_debug: don't recompute (jiffies_per_loop * HZ) in spinloop - -In spinlock_debug.c, the spinloops call __delay() on every iteration. -Because that is an external function, (jiffies_per_loop * HZ), the loop's -iteration limit, gets recomputed every time. Caching it explicitly -prevents that. - -Signed-off-by: Chuck Ebbert <76306.1226 at compuserve.com> -Cc: Ingo Molnar -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds - - lib/spinlock_debug.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c -index 58c577d..dafaf1d 100644 ---- a/lib/spinlock_debug.c -+++ b/lib/spinlock_debug.c -@@ -99,11 +99,12 @@ static inline void debug_spin_unlock(spi - - static void __spin_lock_debug(spinlock_t *lock) - { -- int print_once = 1; - u64 i; -+ u64 loops = loops_per_jiffy * HZ; -+ int print_once = 1; - - for (;;) { -- for (i = 0; i < loops_per_jiffy * HZ; i++) { -+ for (i = 0; i < loops; i++) { - if (__raw_spin_trylock(&lock->raw_lock)) - return; - __delay(1); -@@ -165,11 +166,12 @@ #define RWLOCK_BUG_ON(cond, lock, msg) i - #if 0 /* __write_lock_debug() can lock up - maybe this can too? */ - static void __read_lock_debug(rwlock_t *lock) - { -- int print_once = 1; - u64 i; -+ u64 loops = loops_per_jiffy * HZ; -+ int print_once = 1; - - for (;;) { -- for (i = 0; i < loops_per_jiffy * HZ; i++) { -+ for (i = 0; i < loops; i++) { - if (__raw_read_trylock(&lock->raw_lock)) - return; - __delay(1); -@@ -239,11 +241,12 @@ static inline void debug_write_unlock(rw - #if 0 /* This can cause lockups */ - static void __write_lock_debug(rwlock_t *lock) - { -- int print_once = 1; - u64 i; -+ u64 loops = loops_per_jiffy * HZ; -+ int print_once = 1; - - for (;;) { -- for (i = 0; i < loops_per_jiffy * HZ; i++) { -+ for (i = 0; i < loops; i++) { - if (__raw_write_trylock(&lock->raw_lock)) - return; - __delay(1); - linux-2.6-proc-self-maps-fix.patch: b/fs/proc/base.c | 20 ++++++++++++++++++++ b/fs/proc/internal.h | 2 ++ foo/fs/proc/base.c | 2 +- foo/include/linux/ptrace.h | 1 + foo/kernel/ptrace.c | 4 ++-- linux-2.6.17.noarch/fs/proc/task_mmu.c | 3 +-- 6 files changed, 27 insertions(+), 5 deletions(-) Index: linux-2.6-proc-self-maps-fix.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-proc-self-maps-fix.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-proc-self-maps-fix.patch 17 Nov 2006 17:21:08 -0000 1.4 +++ linux-2.6-proc-self-maps-fix.patch 31 Jan 2007 15:26:15 -0000 1.5 @@ -108,12 +108,4 @@ task_unlock(task); return !err; } -@@ -193,7 +193,7 @@ repeat: - /* the same process cannot be attached many times */ - if (task->ptrace & PT_PTRACED) - goto bad; -- retval = may_attach(task); -+ retval = __ptrace_may_attach(task); - if (retval) - goto bad; - + linux-2.6-sata-promise-pata-ports.patch: drivers/ata/libata-core.c | 4 +-- drivers/ata/sata_promise.c | 48 +++++++++++++++++++++++++++++++++++++++------ include/linux/libata.h | 2 - 3 files changed, 45 insertions(+), 9 deletions(-) Index: linux-2.6-sata-promise-pata-ports.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-sata-promise-pata-ports.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-sata-promise-pata-ports.patch 22 Sep 2006 22:43:07 -0000 1.3 +++ linux-2.6-sata-promise-pata-ports.patch 31 Jan 2007 15:26:15 -0000 1.4 @@ -1,134 +1,159 @@ -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 -@@ -172,7 +172,7 @@ +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index 915a55a..d0ab733 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -5298,13 +5298,13 @@ void ata_port_init(struct ata_port *ap, + ap->pio_mask = ent->pinfo2->pio_mask; + ap->mwdma_mask = ent->pinfo2->mwdma_mask; + ap->udma_mask = ent->pinfo2->udma_mask; +- ap->flags |= ent->pinfo2->flags; ++ ap->flags |= ent->pinfo2->flags | ent->_port_flags[port_no]; + ap->ops = ent->pinfo2->port_ops; + } else { + ap->pio_mask = ent->pio_mask; + ap->mwdma_mask = ent->mwdma_mask; + ap->udma_mask = ent->udma_mask; +- ap->flags |= ent->port_flags; ++ ap->flags |= ent->port_flags | ent->_port_flags[port_no]; + ap->ops = ent->port_ops; + } + ap->hw_sata_spd_limit = UINT_MAX; +diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c +index 72eda51..543e6a4 100644 +--- a/drivers/ata/sata_promise.c ++++ b/drivers/ata/sata_promise.c +@@ -175,7 +175,7 @@ static const struct ata_port_info pdc_po /* board_2037x */ { .sht = &pdc_ata_sht, -- .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, -+ .host_flags = PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */, /* pata fix */ +- .flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, ++ .flags = PDC_COMMON_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = 0x7f, /* udma0-6 ; FIXME */ -@@ -363,8 +363,16 @@ static void pdc_reset_port(struct ata_po - +@@ -355,23 +355,27 @@ static void pdc_reset_port(struct ata_po static void pdc_sata_phy_reset(struct ata_port *ap) { -- pdc_reset_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 */ ++ if (ap->flags & ATA_FLAG_SATA) ++ sata_phy_reset(ap); ++ else ++ pdc_pata_phy_reset(ap); } static void pdc_pata_cbl_detect(struct ata_port *ap) -@@ -383,6 +391,12 @@ static void pdc_pata_cbl_detect(struct a + { + u8 tmp; +- void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; ++ void __iomem *mmio = ++ (void __iomem *) 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) { -+ 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 */ -+ ap->udma_mask &= ATA_UDMA_MASK_40C; /* pata fix */ -+ pdc_pata_cbl_detect(ap); - pdc_reset_port(ap); - ata_port_probe(ap); -@@ -673,6 +692,7 @@ +@@ -384,6 +388,20 @@ static u32 pdc_sata_scr_read (struct ata + { + if (sc_reg > SCR_CONTROL) + return 0xffffffffU; ++ if (ap->flags & ATA_FLAG_SLAVE_POSS) ++ { ++ switch (sc_reg) { ++ case SCR_STATUS: ++ return 0x113; ++ case SCR_CONTROL: ++ return 0x300; ++ case SCR_ERROR: ++ case SCR_ACTIVE: ++ default: ++ return 0xffffffffU; ++ } ++ } ++ + return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); + } + +@@ -391,7 +409,7 @@ static u32 pdc_sata_scr_read (struct ata + static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, + u32 val) + { +- if (sc_reg > SCR_CONTROL) ++ if ((sc_reg > SCR_CONTROL) || (ap->flags & ATA_FLAG_SLAVE_POSS)) + return; + writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); + } +@@ -679,6 +697,7 @@ static int pdc_ata_init_one (struct pci_ unsigned int board_idx = (unsigned int) ent->driver_data; int pci_dev_busy = 0; int rc; -+ u8 tmp; /* pata fix */ ++ u8 tmp; if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); -@@ -741,6 +761,9 @@ +@@ -743,6 +762,9 @@ static int pdc_ata_init_one (struct pci_ 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 */ ++ probe_ent->_port_flags[0] = ATA_FLAG_SATA; ++ probe_ent->_port_flags[1] = ATA_FLAG_SATA; + /* notice 4-port boards */ switch (board_idx) { - case board_20319: -@@ -755,13 +778,27 @@ + case board_40518: +@@ -757,13 +779,27 @@ static int pdc_ata_init_one (struct pci_ 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 */ ++ ++ probe_ent->_port_flags[2] = ATA_FLAG_SATA; ++ probe_ent->_port_flags[3] = ATA_FLAG_SATA; break; - case board_2057x: - /* Override hotplug offset for SATAII150 */ - hp->hotplug_offset = PDC2_SATA_PLUG_CSR; - /* Fall through */ + case board_2057x: + /* Override hotplug offset for SATAII150 */ + hp->hotplug_offset = PDC2_SATA_PLUG_CSR; + /* Fall through */ 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 */ ++ /* Some boards have also PATA port */ + probe_ent->n_ports = 2; ++ probe_ent->_port_flags[0] = ATA_FLAG_SATA; ++ probe_ent->_port_flags[1] = ATA_FLAG_SATA; ++ 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->_port_flags[2] = ATA_FLAG_SLAVE_POSS; ++ printk(KERN_INFO DRV_NAME " PATA port found\n"); ++ } break; case board_20771: probe_ent->n_ports = 2; -@@ -774,6 +811,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 -@@ -281,6 +281,7 @@ - unsigned long irq; +diff --git a/include/linux/libata.h b/include/linux/libata.h +index abd2deb..aa8c822 100644 +--- a/include/linux/libata.h ++++ b/include/linux/libata.h +@@ -377,6 +377,7 @@ struct ata_probe_ent { unsigned int irq_flags; - unsigned long host_flags; -+ unsigned long port_flags[ATA_MAX_PORTS]; /* pata fix */ - unsigned long host_set_flags; + unsigned long port_flags; + unsigned long _host_flags; ++ unsigned long _port_flags[ATA_MAX_PORTS]; void __iomem *mmio_base; void *private_data; - }; + +- +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/ + linux-2.6-sysrq-c.patch: sysrq.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) Index: linux-2.6-sysrq-c.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-sysrq-c.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-sysrq-c.patch 22 Sep 2006 22:46:11 -0000 1.1 +++ linux-2.6-sysrq-c.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -1,24 +1,25 @@ ---- linux-2.6.17/drivers/char/sysrq.c.orig 2006-08-16 06:39:44.000000000 -0400 -+++ linux-2.6.17/drivers/char/sysrq.c 2006-08-16 06:43:32.000000000 -0400 -@@ -94,11 +94,16 @@ +diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c +index 5f49280..3ff609d 100644 +--- a/drivers/char/sysrq.c ++++ b/drivers/char/sysrq.c +@@ -93,10 +93,15 @@ #else #define sysrq_unraw_op (*(struct sysrq_key_op *)0) #endif /* CONFIG_VT */ -#ifdef CONFIG_KEXEC - static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs, - struct tty_struct *tty) + static void sysrq_handle_crashdump(int key, struct tty_struct *tty) { +#ifdef CONFIG_KEXEC - crash_kexec(pt_regs); + crash_kexec(get_irq_regs()); + /* can't get here if crash image is loaded */ + printk("Kexec: Warning: crash image not loaded\n"); +#endif -+ if(panic_on_oops) ++ if (panic_on_oops) + panic("SysRq-triggered panic!\n"); } static struct sysrq_key_op sysrq_crashdump_op = { .handler = sysrq_handle_crashdump, -@@ -106,9 +111,6 @@ +@@ -104,9 +109,6 @@ static struct sysrq_key_op sysrq_crashdu .action_msg = "Trigger a crashdump", .enable_mask = SYSRQ_ENABLE_DUMP, }; @@ -26,5 +27,5 @@ -#define sysrq_crashdump_op (*(struct sysrq_key_op *)0) -#endif - static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs, - struct tty_struct *tty) + static void sysrq_handle_reboot(int key, struct tty_struct *tty) + { 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 | 4 include/linux/sysctl.h | 50 include/net/sock.h | 8 include/net/tcp.h | 3 include/net/tux.h | 803 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 9 kernel/fork.c | 2 kernel/kmod.c | 27 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 | 1 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 54 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 | 841 ++++++++++++++ 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, 12700 insertions(+), 32 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-tux.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- linux-2.6-tux.patch 14 Oct 2006 20:19:50 -0000 1.16 +++ linux-2.6-tux.patch 31 Jan 2007 15:26:15 -0000 1.17 @@ -226,7 +226,7 @@ { struct vfsmount *mnt = nd->mnt; struct dentry *dentry = __d_lookup(nd->dentry, name); -@@ -761,12 +761,16 @@ done: +@@ -785,12 +785,16 @@ done: return 0; need_lookup: @@ -240,9 +240,9 @@ need_revalidate: + if (atomic) + return -EWOULDBLOCKIO; - if (dentry->d_op->d_revalidate(dentry, nd)) - goto done; - if (d_invalidate(dentry)) + dentry = do_revalidate(dentry, nd); + if (!dentry) + goto need_lookup; @@ -790,9 +794,11 @@ static fastcall int __link_path_walk(con { struct path next; @@ -1803,17 +1803,15 @@ flush_signals(current); spin_lock_irq(¤t->sighand->siglock); old_session = __install_session_keyring(current, new_session); -@@ -145,12 +145,28 @@ static int ____call_usermodehelper(void +@@ -145,6 +145,21 @@ __exec_usermodehelper(char *path, char * key_put(old_session); + retval = -EPERM; + if (current->fs->root) + retval = execve(path, argv, envp); -+ + return retval; +} -+ +EXPORT_SYMBOL_GPL(__exec_usermodehelper); + +/* @@ -1824,14 +1822,19 @@ + struct subprocess_info *sub_info = data; + int retval; + + /* Install input pipe when needed */ + if (sub_info->stdin) { + struct files_struct *f = current->files; +@@ -165,10 +180,8 @@ __exec_usermodehelper(char *path, char * /* We can run anywhere, unlike our parent keventd(). */ set_cpus_allowed(current, CPU_MASK_ALL); - retval = -EPERM; - if (current->fs->root) -- retval = execve(sub_info->path, sub_info->argv,sub_info->envp); +- retval = kernel_execve(sub_info->path, +- sub_info->argv, sub_info->envp); + retval = __exec_usermodehelper(sub_info->path, -+ sub_info->argv, sub_info->envp, sub_info->ring); ++ sub_info->argv, sub_info->envp, sub_info->ring); /* Exec failed? */ sub_info->retval = retval; linux-2.6-usb-storage-reboot.patch: libusual.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 3 deletions(-) Index: linux-2.6-usb-storage-reboot.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-usb-storage-reboot.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-usb-storage-reboot.patch 31 Oct 2006 17:20:45 -0000 1.1 +++ linux-2.6-usb-storage-reboot.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -74,7 +74,7 @@ /* * The table. */ -@@ -113,16 +119,42 @@ EXPORT_SYMBOL_GPL(usb_usual_check_type); +@@ -120,16 +120,42 @@ EXPORT_SYMBOL_GPL(usb_usual_check_type); /* */ @@ -103,7 +103,7 @@ const struct usb_device_id *id) { unsigned long type; -- int rc; +- struct task_struct* task; - unsigned long flags; type = USB_US_TYPE(id->driver_info); @@ -114,8 +114,8 @@ + +static int usu_kick(unsigned long type) +{ -+ int rc; + unsigned long flags; ++ struct task_struct* task; spin_lock_irqsave(&usu_lock, flags); if ((stat[type].fls & (USU_MOD_FL_THREAD|USU_MOD_FL_PRESENT)) != 0) { linux-2.6-vm-debug.patch: include/linux/rmap.h | 2 +- mm/filemap_xip.c | 2 +- mm/fremap.c | 2 +- mm/memory.c | 4 ++-- mm/rmap.c | 9 ++++++--- 5 files changed, 11 insertions(+), 8 deletions(-) Index: linux-2.6-vm-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-vm-debug.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-vm-debug.patch 14 Oct 2006 20:35:37 -0000 1.3 +++ linux-2.6-vm-debug.patch 31 Jan 2007 15:26:15 -0000 1.4 @@ -1,22 +1,3 @@ ---- linux-2.6.18.noarch/mm/rmap.c~ 2006-10-04 19:43:08.000000000 -0400 -+++ linux-2.6.18.noarch/mm/rmap.c 2006-10-04 19:43:24.000000000 -0400 -@@ -576,15 +576,13 @@ void page_add_file_rmap(struct page *pag - void page_remove_rmap(struct page *page) - { - if (atomic_add_negative(-1, &page->_mapcount)) { --#ifdef CONFIG_DEBUG_VM - if (unlikely(page_mapcount(page) < 0)) { - printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page)); - printk (KERN_EMERG " page->flags = %lx\n", page->flags); - printk (KERN_EMERG " page->count = %x\n", page_count(page)); - printk (KERN_EMERG " page->mapping = %p\n", page->mapping); -+ BUG(); - } --#endif -- BUG_ON(page_mapcount(page) < 0); - /* - * It would be tidy to reset the PageAnon mapping here, - * but that might overwrite a racing page_add_anon_rmap Index: linux-2.6/include/linux/rmap.h =================================================================== linux-2.6-xen-execshield.patch: arch/i386/kernel/cpu/common-xen.c | 7 ++ arch/i386/kernel/process-xen.c | 60 +++++++++++++++++ arch/i386/kernel/smp-xen.c | 3 arch/i386/kernel/traps-xen.c | 94 +++++++++++++++++++++++++++- arch/x86_64/ia32/syscall32-xen.c | 4 - arch/x86_64/kernel/process-xen.c | 6 - arch/x86_64/kernel/setup64-xen.c | 40 ----------- arch/x86_64/mm/fault-xen.c | 2 include/asm-i386/mach-xen/asm/desc.h | 14 ++++ include/asm-i386/mach-xen/asm/mmu.h | 4 + include/asm-i386/mach-xen/asm/pgalloc.h | 1 include/asm-i386/mach-xen/asm/processor.h | 8 ++ include/asm-x86_64/mach-xen/asm/pgalloc.h | 8 ++ linux-2.6.19.noarch/arch/i386/mm/init-xen.c | 6 + 14 files changed, 206 insertions(+), 51 deletions(-) Index: linux-2.6-xen-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen-execshield.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-xen-execshield.patch 22 Sep 2006 22:46:11 -0000 1.1 +++ linux-2.6-xen-execshield.patch 31 Jan 2007 15:26:15 -0000 1.2 @@ -235,9 +235,9 @@ if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) -diff -r 095d53b0d1a6 arch/i386/mm/init-xen.c ---- a/arch/i386/mm/init-xen.c Tue Jul 25 21:53:33 2006 +0200 -+++ b/arch/i386/mm/init-xen.c Tue Jul 25 23:02:25 2006 +0200 +diff -uNp linux-2.6.19.noarch/arch/i386/mm/init-xen.c.orig linux-2.6.19.noarch/arch/i386/mm/init-xen.c +--- linux-2.6.19.noarch/arch/i386/mm/init-xen.c.orig 2006-12-23 20:55:44.000000000 +0100 ++++ linux-2.6.19.noarch/arch/i386/mm/init-xen.c 2006-12-23 21:12:52.000000000 +0100 @@ -465,7 +465,7 @@ EXPORT_SYMBOL(__supported_pte_mask); * Control non executable mappings. * @@ -245,23 +245,22 @@ - * off Disable + * off Disable (disables exec-shield too) */ - void __init noexec_setup(const char *str) + static int __init noexec_setup(char *str) { -@@ -475,6 +475,7 @@ void __init noexec_setup(const char *str - } else if (!strncmp(str,"off",3)) { +@@ -477,6 +477,7 @@ static int __init noexec_setup(char *str + } else if (!strcmp(str,"off")) { disable_nx = 1; __supported_pte_mask &= ~_PAGE_NX; + exec_shield = 0; - } - } + } else + return -EINVAL; -@@ -541,7 +542,10 @@ void __init paging_init(void) +@@ -548,7 +549,10 @@ void __init paging_init(void) set_nx(); if (nx_enabled) printk("NX (Execute Disable) protection: active\n"); --#endif + else -+#endif + #endif + if (exec_shield) + printk("Using x86 segment limits to approximate NX protection\n"); @@ -297,25 +296,33 @@ } asmlinkage long sys_fork(struct pt_regs *regs) -diff -r 095d53b0d1a6 arch/x86_64/kernel/setup64-xen.c ---- a/arch/x86_64/kernel/setup64-xen.c Tue Jul 25 21:53:33 2006 +0200 -+++ b/arch/x86_64/kernel/setup64-xen.c Tue Jul 25 23:02:25 2006 +0200 -@@ -55,7 +55,7 @@ on Enable(default) - on Enable(default) - off Disable - */ --int __init nonx_setup(char *str) -+void __init nonx_setup(char *str) - { - if (!strncmp(str, "on", 2)) { - __supported_pte_mask |= _PAGE_NX; -@@ -64,28 +64,7 @@ int __init nonx_setup(char *str) - do_not_nx = 1; - __supported_pte_mask &= ~_PAGE_NX; - } -- return 1; +diff +--- linux-2.6.orig/arch/x86_64/kernel/setup64-xen.c ++++ linux-2.6/arch/x86_64/kernel/setup64-xen.c +@@ -40,46 +40,6 @@ unsigned long __supported_pte_mask __rea + EXPORT_SYMBOL(__supported_pte_mask); + static int do_not_nx __cpuinitdata = 0; + +-/* noexec=on|off +-Control non executable mappings for 64bit processes. +- +-on Enable(default) +-off Disable +-*/ +-static int __init nonx_setup(char *str) +-{ +- if (!str) +- return -EINVAL; +- if (!strncmp(str, "on", 2)) { +- __supported_pte_mask |= _PAGE_NX; +- do_not_nx = 0; +- } else if (!strncmp(str, "off", 3)) { +- do_not_nx = 1; +- __supported_pte_mask &= ~_PAGE_NX; +- } +- return 0; -} --__setup("noexec=", nonx_setup); /* parsed early actually */ +-early_param("noexec", nonx_setup); - -int force_personality32 = 0; - @@ -335,10 +342,10 @@ - return 1; -} -__setup("noexec32=", nonx32_setup); -+} - +- /* * Great future plan: + * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data. diff -r 095d53b0d1a6 arch/x86_64/mm/fault-xen.c --- a/arch/x86_64/mm/fault-xen.c Tue Jul 25 21:53:33 2006 +0200 +++ b/arch/x86_64/mm/fault-xen.c Tue Jul 25 23:02:25 2006 +0200 @@ -448,15 +455,3 @@ void make_page_readonly(void *va, unsigned int feature); void make_page_writable(void *va, unsigned int feature); void make_pages_readonly(void *va, unsigned int nr, unsigned int feature); -diff -r 095d53b0d1a6 include/asm-x86_64/mach-xen/asm/pgtable.h ---- a/include/asm-x86_64/mach-xen/asm/pgtable.h Tue Jul 25 21:53:33 2006 +0200 -+++ b/include/asm-x86_64/mach-xen/asm/pgtable.h Tue Jul 25 23:02:25 2006 +0200 -@@ -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); - linux-2.6-xen.patch: arch/i386/Kconfig | 85 arch/i386/Kconfig.cpu | 4 arch/i386/Kconfig.debug | 1 arch/i386/Makefile | 24 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 21 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1332 ++++++++ arch/i386/kernel/alternative.c | 11 arch/i386/kernel/apic-xen.c | 223 + arch/i386/kernel/asm-offsets.c | 7 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 747 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 198 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 1254 ++++++++ arch/i386/kernel/entry.S | 6 arch/i386/kernel/fixup.c | 92 arch/i386/kernel/head-xen.S | 200 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2965 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 121 arch/i386/kernel/irq-xen.c | 328 ++ arch/i386/kernel/ldt-xen.c | 270 + arch/i386/kernel/microcode-xen.c | 147 arch/i386/kernel/mpparse-xen.c | 1157 +++++++ arch/i386/kernel/pci-dma-xen.c | 376 ++ arch/i386/kernel/process-xen.c | 851 +++++ arch/i386/kernel/quirks-xen.c | 47 arch/i386/kernel/setup-xen.c | 1735 +++++++++++ arch/i386/kernel/smp-xen.c | 631 ++++ arch/i386/kernel/swiotlb.c | 672 ++++ arch/i386/kernel/sysenter.c | 22 arch/i386/kernel/time-xen.c | 1112 +++++++ arch/i386/kernel/traps-xen.c | 1248 ++++++++ arch/i386/kernel/traps.c | 9 arch/i386/kernel/tsc.c | 2 arch/i386/kernel/vm86.c | 12 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/lib/delay.c | 3 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/irqflags.c | 99 arch/i386/mach-xen/setup.c | 161 + arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 762 +++++ arch/i386/mm/highmem-xen.c | 121 arch/i386/mm/hypervisor.c | 457 +++ arch/i386/mm/init-xen.c | 879 +++++ arch/i386/mm/ioremap-xen.c | 443 ++ arch/i386/mm/pageattr.c | 2 arch/i386/mm/pgtable-xen.c | 721 ++++ arch/i386/oprofile/Makefile | 4 arch/i386/oprofile/xenoprof.c | 584 +++ arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1167 +++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 60 arch/ia64/Makefile | 16 arch/ia64/dig/setup.c | 17 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/asm-offsets.c | 25 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/gate.S | 113 arch/ia64/kernel/gate.lds.S | 22 arch/ia64/kernel/head.S | 6 arch/ia64/kernel/iosapic.c | 65 arch/ia64/kernel/irq_ia64.c | 260 + arch/ia64/kernel/pal.S | 3 arch/ia64/kernel/patch.c | 71 arch/ia64/kernel/setup.c | 125 arch/ia64/mm/ioremap.c | 3 arch/ia64/xen/Makefile | 8 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/hypercall.S | 413 ++ arch/ia64/xen/hypervisor.c | 847 +++++ arch/ia64/xen/util.c | 115 arch/ia64/xen/xenentry.S | 867 +++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2169 ++++++++++++++ arch/ia64/xen/xenminstate.h | 368 ++ arch/ia64/xen/xenpal.S | 76 arch/ia64/xen/xensetup.S | 54 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 62 arch/x86_64/Makefile | 20 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 743 +++++ 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 | 20 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 254 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 759 +++++ arch/x86_64/kernel/early_printk-xen.c | 299 ++ arch/x86_64/kernel/entry-xen.S | 1217 ++++++++ arch/x86_64/kernel/genapic-xen.c | 143 arch/x86_64/kernel/genapic_xen.c | 190 + arch/x86_64/kernel/head-xen.S | 189 + arch/x86_64/kernel/head64-xen.c | 119 arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2182 ++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 99 arch/x86_64/kernel/irq.c | 4 arch/x86_64/kernel/irqflags-xen.c | 100 arch/x86_64/kernel/ldt-xen.c | 283 + arch/x86_64/kernel/mpparse-xen.c | 850 +++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 55 arch/x86_64/kernel/process-xen.c | 859 +++++ arch/x86_64/kernel/setup-xen.c | 1473 +++++++++ arch/x86_64/kernel/setup-xen.c.orig | 1472 +++++++++ arch/x86_64/kernel/setup64-xen.c | 356 ++ arch/x86_64/kernel/smp-xen.c | 571 +++ arch/x86_64/kernel/traps-xen.c | 1245 ++++++++ arch/x86_64/kernel/vmlinux.lds.S | 2 arch/x86_64/kernel/vsyscall-xen.c | 329 ++ arch/x86_64/kernel/xen_entry.S | 40 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 717 ++++ arch/x86_64/mm/init-xen.c | 1147 +++++++ arch/x86_64/mm/pageattr-xen.c | 396 ++ arch/x86_64/oprofile/Makefile | 5 arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/char/hangcheck-timer.c | 2 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 12 drivers/char/tpm/Makefile | 2 drivers/char/tpm/tpm.c | 55 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_vtpm.c | 547 +++ drivers/char/tpm/tpm_vtpm.h | 68 drivers/char/tpm/tpm_xen.c | 756 +++++ drivers/char/tty_io.c | 1 drivers/firmware/Kconfig | 2 drivers/ide/ide-lib.c | 8 drivers/oprofile/buffer_sync.c | 66 drivers/oprofile/cpu_buffer.c | 51 drivers/oprofile/cpu_buffer.h | 9 drivers/oprofile/event_buffer.h | 7 drivers/oprofile/oprof.c | 32 drivers/oprofile/oprof.h | 3 drivers/oprofile/oprofile_files.c | 207 + drivers/pci/Kconfig | 3 drivers/serial/Kconfig | 1 drivers/xen/Kconfig | 283 + drivers/xen/Makefile | 19 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 637 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 549 +++ drivers/xen/blkback/common.h | 133 drivers/xen/blkback/interface.c | 171 + drivers/xen/blkback/vbd.c | 119 drivers/xen/blkback/xenbus.c | 468 +++ drivers/xen/blkfront/Kconfig | 6 drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 846 +++++ drivers/xen/blkfront/block.h | 154 + drivers/xen/blkfront/vbd.c | 318 ++ drivers/xen/blktap/Makefile | 6 drivers/xen/blktap/blktapmain.c | 1393 +++++++++ drivers/xen/blktap/common.h | 120 drivers/xen/blktap/interface.c | 164 + drivers/xen/blktap/xenbus.c | 366 ++ drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 180 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 715 ++++ drivers/xen/console/xencons_ring.c | 143 drivers/xen/core/Makefile | 13 drivers/xen/core/cpu_hotplug.c | 188 + drivers/xen/core/evtchn.c | 840 +++++ drivers/xen/core/features.c | 30 drivers/xen/core/gnttab.c | 483 +++ drivers/xen/core/hypervisor_sysfs.c | 59 drivers/xen/core/reboot.c | 385 ++ drivers/xen/core/skbuff.c | 144 drivers/xen/core/smpboot.c | 442 ++ drivers/xen/core/xen_proc.c | 18 drivers/xen/core/xen_sysfs.c | 378 ++ drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 456 +++ drivers/xen/fbfront/Makefile | 2 drivers/xen/fbfront/xenfb.c | 686 ++++ drivers/xen/fbfront/xenkbd.c | 300 ++ drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 141 drivers/xen/netback/interface.c | 352 ++ drivers/xen/netback/loopback.c | 320 ++ drivers/xen/netback/netback.c | 1510 ++++++++++ drivers/xen/netback/xenbus.c | 438 ++ drivers/xen/netfront/Kconfig | 6 drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 2138 ++++++++++++++ drivers/xen/pciback/Makefile | 15 drivers/xen/pciback/conf_space.c | 425 ++ drivers/xen/pciback/conf_space.h | 126 drivers/xen/pciback/conf_space_capability.c | 71 drivers/xen/pciback/conf_space_capability.h | 23 drivers/xen/pciback/conf_space_capability_pm.c | 113 drivers/xen/pciback/conf_space_capability_vpd.c | 42 drivers/xen/pciback/conf_space_header.c | 299 ++ drivers/xen/pciback/conf_space_quirks.c | 128 drivers/xen/pciback/conf_space_quirks.h | 35 drivers/xen/pciback/passthrough.c | 157 + drivers/xen/pciback/pci_stub.c | 916 ++++++ drivers/xen/pciback/pciback.h | 93 drivers/xen/pciback/pciback_ops.c | 95 drivers/xen/pciback/slot.c | 151 + drivers/xen/pciback/vpci.c | 204 + drivers/xen/pciback/xenbus.c | 458 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 46 drivers/xen/pcifront/pci_op.c | 273 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 + drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 294 + drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 86 drivers/xen/tpmback/interface.c | 182 + drivers/xen/tpmback/tpmback.c | 944 ++++++ drivers/xen/tpmback/xenbus.c | 287 + drivers/xen/util.c | 70 drivers/xen/xenbus/Makefile | 12 drivers/xen/xenbus/xenbus_backend_client.c | 147 drivers/xen/xenbus/xenbus_client.c | 300 ++ drivers/xen/xenbus/xenbus_comms.c | 203 + drivers/xen/xenbus/xenbus_comms.h | 45 drivers/xen/xenbus/xenbus_dev.c | 356 ++ drivers/xen/xenbus/xenbus_probe.c | 1189 ++++++++ drivers/xen/xenbus/xenbus_xs.c | 853 +++++ fs/Kconfig | 1 include/asm-i386/apic.h | 2 include/asm-i386/mach-default/mach_traps.h | 12 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 203 + include/asm-i386/mach-xen/asm/dma-mapping.h | 151 + include/asm-i386/mach-xen/asm/fixmap.h | 161 + include/asm-i386/mach-xen/asm/floppy.h | 147 include/asm-i386/mach-xen/asm/highmem.h | 80 include/asm-i386/mach-xen/asm/hypercall.h | 389 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 234 + include/asm-i386/mach-xen/asm/io.h | 362 ++ include/asm-i386/mach-xen/asm/irqflags.h | 81 include/asm-i386/mach-xen/asm/kmap_types.h | 31 include/asm-i386/mach-xen/asm/maddr.h | 160 + include/asm-i386/mach-xen/asm/mmu.h | 29 include/asm-i386/mach-xen/asm/mmu_context.h | 108 include/asm-i386/mach-xen/asm/page.h | 220 + include/asm-i386/mach-xen/asm/pci.h | 153 + include/asm-i386/mach-xen/asm/pgalloc.h | 63 include/asm-i386/mach-xen/asm/pgtable-2level.h | 78 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 24 include/asm-i386/mach-xen/asm/pgtable-3level.h | 195 + include/asm-i386/mach-xen/asm/pgtable.h | 551 +++ include/asm-i386/mach-xen/asm/processor.h | 737 ++++ include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 132 include/asm-i386/mach-xen/asm/setup.h | 81 include/asm-i386/mach-xen/asm/smp.h | 114 include/asm-i386/mach-xen/asm/swiotlb.h | 41 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 include/asm-i386/mach-xen/asm/system.h | 531 +++ include/asm-i386/mach-xen/asm/timer.h | 67 include/asm-i386/mach-xen/asm/tlbflush.h | 99 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.h | 5 include/asm-i386/pgtable-2level-defs.h | 2 include/asm-i386/pgtable-3level-defs.h | 2 include/asm-i386/spinlock.h | 5 include/asm-ia64/agp.h | 31 include/asm-ia64/dma-mapping.h | 98 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hw_irq.h | 10 include/asm-ia64/hypercall.h | 423 ++ include/asm-ia64/hypervisor.h | 219 + include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/io.h | 34 include/asm-ia64/iosapic.h | 2 include/asm-ia64/irq.h | 31 include/asm-ia64/machvec_dig.h | 15 include/asm-ia64/maddr.h | 92 include/asm-ia64/meminit.h | 5 include/asm-ia64/page.h | 52 include/asm-ia64/pal.h | 1 include/asm-ia64/pgalloc.h | 4 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 | 304 ++ include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/dwarf2.h | 2 include/asm-x86_64/ipi.h | 5 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 40 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 200 + include/asm-x86_64/mach-xen/asm/dmi.h | 29 include/asm-x86_64/mach-xen/asm/e820.h | 59 include/asm-x86_64/mach-xen/asm/fixmap.h | 109 include/asm-x86_64/mach-xen/asm/floppy.h | 207 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 136 include/asm-x86_64/mach-xen/asm/hypercall.h | 389 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 300 ++ include/asm-x86_64/mach-xen/asm/irq.h | 34 include/asm-x86_64/mach-xen/asm/irqflags.h | 65 include/asm-x86_64/mach-xen/asm/maddr.h | 139 include/asm-x86_64/mach-xen/asm/mmu.h | 38 include/asm-x86_64/mach-xen/asm/mmu_context.h | 135 include/asm-x86_64/mach-xen/asm/msr.h | 410 ++ include/asm-x86_64/mach-xen/asm/nmi.h | 96 include/asm-x86_64/mach-xen/asm/page.h | 213 + include/asm-x86_64/mach-xen/asm/pci.h | 173 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 224 + include/asm-x86_64/mach-xen/asm/pgtable.h | 555 +++ include/asm-x86_64/mach-xen/asm/processor.h | 499 +++ include/asm-x86_64/mach-xen/asm/smp.h | 132 include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 266 + include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 120 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 | 111 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 58 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/interrupt.h | 6 include/linux/mm.h | 10 include/linux/oprofile.h | 11 include/linux/pfn.h | 4 include/linux/skbuff.h | 15 include/xen/balloon.h | 57 include/xen/cpu_hotplug.h | 43 include/xen/driver_util.h | 15 include/xen/evtchn.h | 113 include/xen/features.h | 20 include/xen/foreign_page.h | 30 include/xen/gnttab.h | 150 + include/xen/hvm.h | 24 include/xen/hypervisor_sysfs.h | 32 include/xen/interface/acm.h | 187 + include/xen/interface/acm_ops.h | 102 include/xen/interface/arch-ia64.h | 448 +++ include/xen/interface/arch-powerpc.h | 115 include/xen/interface/arch-x86_32.h | 255 + include/xen/interface/arch-x86_64.h | 322 ++ include/xen/interface/callback.h | 74 include/xen/interface/dom0_ops.h | 102 include/xen/interface/domctl.h | 392 ++ include/xen/interface/elfnote.h | 133 include/xen/interface/event_channel.h | 233 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 362 ++ include/xen/interface/hvm/e820.h | 32 include/xen/interface/hvm/hvm_info_table.h | 22 include/xen/interface/hvm/ioreq.h | 99 include/xen/interface/hvm/params.h | 24 include/xen/interface/hvm/vmx_assist.h | 98 include/xen/interface/io/blkif.h | 87 include/xen/interface/io/console.h | 33 include/xen/interface/io/fbif.h | 116 include/xen/interface/io/kbdif.h | 108 include/xen/interface/io/netif.h | 166 + include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 273 + include/xen/interface/io/tpmif.h | 59 include/xen/interface/io/xenbus.h | 45 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 243 + include/xen/interface/nmi.h | 60 include/xen/interface/physdev.h | 149 + include/xen/interface/platform.h | 125 include/xen/interface/sched.h | 103 include/xen/interface/sysctl.h | 151 + include/xen/interface/trace.h | 87 include/xen/interface/vcpu.h | 121 include/xen/interface/version.h | 73 include/xen/interface/xen-compat.h | 26 include/xen/interface/xen.h | 581 +++ include/xen/interface/xencomm.h | 37 include/xen/interface/xenoprof.h | 110 include/xen/pcifront.h | 76 include/xen/public/evtchn.h | 88 include/xen/public/privcmd.h | 79 include/xen/xen_proc.h | 12 include/xen/xenbus.h | 306 ++ include/xen/xencons.h | 17 kernel/Kconfig.preempt | 1 kernel/fork.c | 3 kernel/irq/manage.c | 1 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 120 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 63 net/core/skbuff.c | 27 net/ipv4/netfilter/ip_nat_proto_tcp.c | 7 net/ipv4/netfilter/ip_nat_proto_udp.c | 7 net/ipv4/xfrm4_output.c | 6 net/ipv6/addrconf.c | 3 scripts/Makefile.xen | 14 421 files changed, 90718 insertions(+), 200 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.30 -r 1.31 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- linux-2.6-xen.patch 7 Dec 2006 20:50:55 -0000 1.30 +++ linux-2.6-xen.patch 31 Jan 2007 15:26:15 -0000 1.31 @@ -1,8 +1,6 @@ - * linux-2.6.18-xen changeset: 36192:9d376c854d17 - * ../upstream/xen-3.0.3-testing changeset: 11774:52ae8dd4bc75 -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/arch/i386/boot-xen/Makefile linux-2.6.18-xen/arch/i386/boot-xen/Makefile ---- /scratch/src/linux-2.6.18.5/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.18-xen/arch/i386/boot-xen/Makefile 2006-12-07 19:47:32.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile source/arch/i386/boot-xen/Makefile +--- /scratch/src/linux-2.6.19.2/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ source/arch/i386/boot-xen/Makefile 2006-12-23 17:42:12.000000000 +0100 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded @@ -25,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='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/arch/i386/Kconfig linux-2.6.18-xen/arch/i386/Kconfig ---- /scratch/src/linux-2.6.18.5/arch/i386/Kconfig 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6.18-xen/arch/i386/Kconfig 2006-12-07 19:47:32.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/Kconfig source/arch/i386/Kconfig +--- /scratch/src/linux-2.6.19.2/arch/i386/Kconfig 2006-11-29 22:57:37.000000000 +0100 ++++ source/arch/i386/Kconfig 2006-12-23 17:44:39.000000000 +0100 @@ -16,6 +16,7 @@ config X86_32 config GENERIC_TIME @@ -52,7 +50,7 @@ config X86_ELAN bool "AMD Elan" help -@@ -213,6 +223,7 @@ source "arch/i386/Kconfig.cpu" +@@ -212,6 +222,7 @@ source "arch/i386/Kconfig.cpu" config HPET_TIMER bool "HPET Timer Support" @@ -60,31 +58,31 @@ help This enables the use of the HPET for the kernel's internal timer. HPET is the next generation timer replacing legacy 8254s. -@@ -263,7 +274,7 @@ source "kernel/Kconfig.preempt" +@@ -262,7 +273,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) +- depends on !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH) ++ depends on !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH || 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 -@@ -288,12 +299,12 @@ config X86_UP_IOAPIC +@@ -287,12 +298,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)) +- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH ++ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) || X86_GENERICARCH 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)) +- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) || X86_GENERICARCH ++ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) || X86_GENERICARCH default y config X86_VISWS_APIC -@@ -303,7 +314,7 @@ config X86_VISWS_APIC +@@ -302,7 +313,7 @@ config X86_VISWS_APIC config X86_MCE bool "Machine Check Exception" @@ -93,15 +91,15 @@ ---help--- Machine Check Exception support allows the processor to notify the kernel if it detects a problem (e.g. overheating, component failure). -@@ -402,6 +413,7 @@ config X86_REBOOTFIXUPS +@@ -401,6 +412,7 @@ config X86_REBOOTFIXUPS config MICROCODE tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" + depends on !XEN_UNPRIVILEGED_GUEST + select FW_LOADER ---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 -@@ -419,6 +431,7 @@ config MICROCODE +@@ -424,6 +436,7 @@ config MICROCODE_OLD_INTERFACE config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" @@ -109,7 +107,7 @@ help This device gives privileged processes access to the x86 Model-Specific Registers (MSRs). It is a character device with -@@ -434,6 +447,10 @@ config X86_CPUID +@@ -439,6 +452,10 @@ config X86_CPUID with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to /dev/cpu/31/cpuid. @@ -120,7 +118,7 @@ source "drivers/firmware/Kconfig" choice -@@ -607,7 +624,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID +@@ -611,7 +628,7 @@ source "mm/Kconfig" config HIGHPTE bool "Allocate 3rd-level pagetables from highmem" @@ -129,7 +127,7 @@ 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 -@@ -616,6 +633,7 @@ config HIGHPTE +@@ -620,6 +637,7 @@ config HIGHPTE config MATH_EMULATION bool "Math emulation" @@ -137,7 +135,7 @@ ---help--- Linux can emulate a math coprocessor (used for floating point operations) if you don't have one. 486DX and Pentium processors have -@@ -641,6 +659,8 @@ config MATH_EMULATION +@@ -645,6 +663,8 @@ config MATH_EMULATION config MTRR bool "MTRR (Memory Type Range Register) support" @@ -146,7 +144,7 @@ ---help--- On Intel P6 family processors (Pentium Pro, Pentium II and later) the Memory Type Range Registers (MTRRs) may be used to control -@@ -675,7 +695,7 @@ config MTRR +@@ -679,7 +699,7 @@ config MTRR config EFI bool "Boot from EFI support" @@ -154,8 +152,8 @@ + depends on ACPI && !X86_XEN default n ---help--- - This enables the the kernel to boot on EFI platforms using -@@ -693,7 +713,7 @@ config EFI + This enables the kernel to boot on EFI platforms using +@@ -697,7 +717,7 @@ config EFI config IRQBALANCE bool "Enable kernel irq balancing" @@ -164,24 +162,24 @@ default y help The default yes will allow the kernel to do irq load balancing. -@@ -741,7 +761,7 @@ source kernel/Kconfig.hz +@@ -745,6 +765,7 @@ source kernel/Kconfig.hz config KEXEC - bool "kexec system call (EXPERIMENTAL)" -- depends on EXPERIMENTAL -+ depends on EXPERIMENTAL && !X86_XEN + bool "kexec system call" ++ depends on !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 -@@ -794,6 +814,7 @@ config HOTPLUG_CPU +@@ -804,7 +825,7 @@ config HOTPLUG_CPU config COMPAT_VDSO bool "Compat VDSO support" default y +- depends on !PARAVIRT + depends on !X86_XEN help Map the VDSO to the predictable old-style address too. ---help--- -@@ -810,18 +831,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG +@@ -821,18 +842,20 @@ config ARCH_ENABLE_MEMORY_HOTPLUG depends on HIGHMEM menu "Power management options (ACPI, APM)" @@ -205,7 +203,7 @@ ---help--- APM is a BIOS specification for saving power using several different techniques. This is mostly useful for battery powered laptops with -@@ -1006,6 +1029,7 @@ choice +@@ -1017,6 +1040,7 @@ choice config PCI_GOBIOS bool "BIOS" @@ -213,7 +211,7 @@ [...23180 lines suppressed...] int rc = -ENOMEM; @@ -92509,7 +94585,7 @@ /* GSO will handle the following emulations directly. */ if (netif_needs_gso(dev, skb)) goto gso; -@@ -1798,6 +1847,19 @@ int netif_receive_skb(struct sk_buff *sk +@@ -1800,6 +1849,19 @@ int netif_receive_skb(struct sk_buff *sk } #endif @@ -92518,7 +94594,7 @@ + case CHECKSUM_UNNECESSARY: + skb->proto_data_valid = 1; + break; -+ case CHECKSUM_HW: ++ case CHECKSUM_PARTIAL: + /* XXX Implement me. */ + default: + skb->proto_data_valid = 0; @@ -92529,7 +94605,7 @@ list_for_each_entry_rcu(ptype, &ptype_all, list) { if (!ptype->dev || ptype->dev == skb->dev) { if (pt_prev) -@@ -3584,6 +3646,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif +@@ -3586,6 +3648,7 @@ EXPORT_SYMBOL(unregister_netdevice_notif EXPORT_SYMBOL(net_enable_timestamp); EXPORT_SYMBOL(net_disable_timestamp); EXPORT_SYMBOL(dev_get_flags); @@ -92537,9 +94613,9 @@ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) EXPORT_SYMBOL(br_handle_frame_hook); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/core/skbuff.c linux-2.6.18-xen/net/core/skbuff.c ---- /scratch/src/linux-2.6.18.5/net/core/skbuff.c 2006-12-07 18:25:12.000000000 +0100 -+++ linux-2.6.18-xen/net/core/skbuff.c 2006-12-07 19:48:33.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/core/skbuff.c source/net/core/skbuff.c +--- /scratch/src/linux-2.6.19.2/net/core/skbuff.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/core/skbuff.c 2006-12-23 17:44:56.000000000 +0100 @@ -139,6 +139,7 @@ EXPORT_SYMBOL(skb_truesize_bug); * Buffers may only be allocated from interrupts using a @gfp_mask of * %GFP_ATOMIC. @@ -92548,7 +94624,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int fclone) { -@@ -193,6 +194,7 @@ nodata: +@@ -194,6 +195,7 @@ nodata: skb = NULL; goto out; } @@ -92556,7 +94632,7 @@ /** * alloc_skb_from_cache - allocate a network buffer -@@ -210,14 +212,17 @@ nodata: +@@ -211,14 +213,17 @@ nodata: */ struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp, unsigned int size, @@ -92577,7 +94653,7 @@ if (!skb) goto out; -@@ -241,10 +246,20 @@ struct sk_buff *alloc_skb_from_cache(kme +@@ -242,10 +247,20 @@ struct sk_buff *alloc_skb_from_cache(kme skb_shinfo(skb)->gso_segs = 0; skb_shinfo(skb)->gso_type = 0; skb_shinfo(skb)->frag_list = NULL; @@ -92599,7 +94675,7 @@ skb = NULL; goto out; } -@@ -464,6 +479,10 @@ struct sk_buff *skb_clone(struct sk_buff +@@ -465,6 +480,10 @@ struct sk_buff *skb_clone(struct sk_buff C(local_df); n->cloned = 1; n->nohdr = 0; @@ -92610,43 +94686,51 @@ C(pkt_type); C(ip_summed); C(priority); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_tcp.c ---- /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-07 19:48:34.000000000 +0100 -@@ -129,7 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb, +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c source/net/ipv4/netfilter/ip_nat_proto_tcp.c +--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-12-23 17:44:57.000000000 +0100 +@@ -129,9 +129,16 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; -- hdr->check = ip_nat_cheat_check(~oldip, newip, +#ifdef CONFIG_XEN + if ((*pskb)->proto_csum_blank) -+ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check); ++ hdr->check = ~nf_csum_update(~oldip, newip, hdr->check); + else +#endif -+ hdr->check = ip_nat_cheat_check(~oldip, newip, - ip_nat_cheat_check(oldport ^ 0xFFFF, - newport, - hdr->check)); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_udp.c ---- /scratch/src/linux-2.6.18.5/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6.18-xen/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-07 19:48:34.000000000 +0100 -@@ -114,7 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb, - portptr = &hdr->dest; ++ { + hdr->check = nf_proto_csum_update(*pskb, ~oldip, newip, hdr->check, 1); + hdr->check = nf_proto_csum_update(*pskb, oldport ^ htons(0xFFFF), newport, + hdr->check, 0); ++ } + return 1; + } + +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c source/net/ipv4/netfilter/ip_nat_proto_udp.c +--- /scratch/src/linux-2.6.19.2/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-12-23 17:44:57.000000000 +0100 +@@ -115,11 +115,18 @@ udp_manip_pkt(struct sk_buff **pskb, } - if (hdr->check) /* 0 is a special case meaning no checksum */ -- hdr->check = ip_nat_cheat_check(~oldip, newip, + + if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) { +#ifdef CONFIG_XEN + if ((*pskb)->proto_csum_blank) -+ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check); ++ hdr->check = ~nf_csum_update(~oldip, newip, hdr->check); + else +#endif -+ hdr->check = ip_nat_cheat_check(~oldip, newip, - ip_nat_cheat_check(*portptr ^ 0xFFFF, - newport, - hdr->check)); -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv4/xfrm4_output.c linux-2.6.18-xen/net/ipv4/xfrm4_output.c ---- /scratch/src/linux-2.6.18.5/net/ipv4/xfrm4_output.c 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6.18-xen/net/ipv4/xfrm4_output.c 2006-12-07 19:48:34.000000000 +0100 ++ { + hdr->check = nf_proto_csum_update(*pskb, ~oldip, newip, + hdr->check, 1); + hdr->check = nf_proto_csum_update(*pskb, + *portptr ^ htons(0xFFFF), newport, + hdr->check, 0); ++ } + if (!hdr->check) + hdr->check = -1; + } +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c source/net/ipv4/xfrm4_output.c +--- /scratch/src/linux-2.6.19.2/net/ipv4/xfrm4_output.c 2006-11-29 22:57:37.000000000 +0100 ++++ source/net/ipv4/xfrm4_output.c 2006-12-23 17:44:57.000000000 +0100 @@ -18,6 +18,8 @@ #include #include @@ -92664,21 +94748,22 @@ + if (err) + goto error_nolock; + - if (skb->ip_summed == CHECKSUM_HW) { - err = skb_checksum_help(skb, 0); + if (skb->ip_summed == CHECKSUM_PARTIAL) { + err = skb_checksum_help(skb); if (err) -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/net/ipv6/addrconf.c linux-2.6.18-xen/net/ipv6/addrconf.c ---- /scratch/src/linux-2.6.18.5/net/ipv6/addrconf.c 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6.18-xen/net/ipv6/addrconf.c 2006-12-07 19:48:34.000000000 +0100 -@@ -2514,6 +2514,7 @@ static void addrconf_dad_start(struct in +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c source/net/ipv6/addrconf.c +--- /scratch/src/linux-2.6.19.2/net/ipv6/addrconf.c 2007-01-15 16:07:25.000000000 +0100 ++++ source/net/ipv6/addrconf.c 2007-01-22 12:58:23.000000000 +0100 +@@ -2545,6 +2545,8 @@ static void addrconf_dad_start(struct in spin_lock_bh(&ifp->lock); if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) || ++ + !(dev->flags&IFF_MULTICAST) || - !(ifp->flags&IFA_F_TENTATIVE)) { + !(ifp->flags&IFA_F_TENTATIVE) || + ifp->flags & IFA_F_NODAD) { ifp->flags &= ~IFA_F_TENTATIVE; - spin_unlock_bh(&ifp->lock); -@@ -2598,6 +2599,7 @@ static void addrconf_dad_completed(struc +@@ -2630,6 +2632,7 @@ static void addrconf_dad_completed(struc if (ifp->idev->cnf.forwarding == 0 && ifp->idev->cnf.rtr_solicits > 0 && (dev->flags&IFF_LOOPBACK) == 0 && @@ -92686,9 +94771,9 @@ (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) { struct in6_addr all_routers; -diff -urNp --exclude='.hg*' --exclude='*.orig' --exclude='*~' /scratch/src/linux-2.6.18.5/scripts/Makefile.xen linux-2.6.18-xen/scripts/Makefile.xen ---- /scratch/src/linux-2.6.18.5/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.18-xen/scripts/Makefile.xen 2006-12-07 19:48:36.000000000 +0100 +diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/scripts/Makefile.xen source/scripts/Makefile.xen +--- /scratch/src/linux-2.6.19.2/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 ++++ source/scripts/Makefile.xen 2006-12-23 17:42:55.000000000 +0100 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- sources 20 Dec 2006 19:21:53 -0000 1.368 +++ sources 31 Jan 2007 15:26:15 -0000 1.369 @@ -1,3 +1,3 @@ -296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 +443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 a9d44b2651b0898e103395b2a7a4f263 xen-3.0.3-11774.tar.bz2 -0290e7814031c52aaae09f3713fa3828 patch-2.6.18.6.bz2 +e8a9a6dc65da3f7b192e7caa969f9a1b patch-2.6.19.2.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- upstream 20 Dec 2006 19:21:53 -0000 1.333 +++ upstream 31 Jan 2007 15:26:16 -0000 1.334 @@ -1,2 +1,2 @@ -linux-2.6.18.tar.bz2 -patch-2.6.18.6.bz2 +linux-2.6.19.tar.bz2 +patch-2.6.19.2.bz2 --- linux-2.6-xen-x86-unwinder.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 15:26:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:26:57 -0500 Subject: rpms/xorg-x11-server/devel xserver-1.2.0-vfprintf.patch, NONE, 1.1 xorg-x11-server.spec, 1.200, 1.201 Message-ID: <200701311526.l0VFQvKQ031714@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31663 Modified Files: xorg-x11-server.spec Added Files: xserver-1.2.0-vfprintf.patch Log Message: * Wed Jan 31 2007 Adam Jackson 1.2.0-4 - Fix typo in SDK header. (#222487) xserver-1.2.0-vfprintf.patch: xf86_libc.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xserver-1.2.0-vfprintf.patch --- --- xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h.jx 2007-01-22 22:13:15.000000000 -0500 +++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h 2007-01-29 18:13:11.000000000 -0500 @@ -428,7 +428,7 @@ #define toupper(i) xf86toupper(i) #undef ungetc #define ungetc(i,FP) xf86ungetc(i,FP) -#undef vfprinf +#undef vfprintf #define vfprintf(p,f,a) xf86vfprintf(p,f,a) #undef vsnprintf #define vsnprintf(s,n,f,a) xf86vsnprintf(s,n,f,a) Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- xorg-x11-server.spec 29 Jan 2007 23:01:28 -0000 1.200 +++ xorg-x11-server.spec 31 Jan 2007 15:26:55 -0000 1.201 @@ -8,7 +8,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -49,6 +49,7 @@ Patch2001: xserver-1.2.0-geode-mmx.patch Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch +Patch2003: xserver-1.2.0-vfprintf.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -329,6 +330,7 @@ %patch2001 -p1 -b .geode-mmx %patch2002 -p1 -b .xephyr-keysym +%patch2003 -p1 -b .vfprintf %build #FONTDIR="${datadir}/X11/fonts" @@ -637,6 +639,9 @@ # ------------------------------------------------------------------- %changelog +* Wed Jan 31 2007 Adam Jackson 1.2.0-4 +- Fix typo in SDK header. (#222487) + * Mon Jan 29 2007 Adam Jackson 1.2.0-3 - Fix MMX check on AMD CPUs. (#222332) - Fix Xephyr keysym init on LP64. (#224311) From fedora-cvs-commits at redhat.com Wed Jan 31 15:34:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:34:18 -0500 Subject: rpms/f-spot/devel f-spot-0.3.2-libdir.patch, NONE, 1.1 f-spot.spec, 1.34, 1.35 Message-ID: <200701311534.l0VFYIYB004802@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4720 Modified Files: f-spot.spec Added Files: f-spot-0.3.2-libdir.patch Log Message: 0.3.2 f-spot-0.3.2-libdir.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE f-spot-0.3.2-libdir.patch --- --- f-spot-0.3.2/configure.in.libdir 2007-01-31 10:41:05.000000000 -0500 +++ f-spot-0.3.2/configure.in 2007-01-31 10:40:46.000000000 -0500 @@ -50,7 +50,7 @@ needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services Mono.GetOptions" for i in $needed_dlls; do AC_MSG_CHECKING([for $i.dll]) - if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then + if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0//$i.dll \); then AC_MSG_ERROR([missing required mono 2.0 DLL: $i.dll]) else AC_MSG_RESULT([found]) Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- f-spot.spec 23 Jan 2007 06:52:07 -0000 1.34 +++ f-spot.spec 31 Jan 2007 15:34:16 -0000 1.35 @@ -9,8 +9,7 @@ Source0: f-spot-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: f-spot-0.1.11-libdir.patch -Patch2: f-spot-0.2.0-libgphoto2-port.patch +Patch1: f-spot-0.3.2-libdir.patch BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel BuildRequires: libexif-devel gphoto2-devel >= 2.1.4 @@ -41,7 +40,6 @@ %prep %setup -q %patch1 -p1 -b .libdir -%patch2 -p1 -b .libphoto2-port %build autoconf From fedora-cvs-commits at redhat.com Wed Jan 31 15:41:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:41:54 -0500 Subject: rpms/orca/FC-6 .cvsignore, 1.3, 1.4 orca.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200701311541.l0VFfsGX000638@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/orca/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv620 Modified Files: .cvsignore orca.spec sources Log Message: 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/orca/FC-6/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 4 Sep 2006 02:26:53 -0000 1.3 +++ .cvsignore 31 Jan 2007 15:41:52 -0000 1.4 @@ -1 +1 @@ -orca-1.0.0.tar.bz2 +orca-1.0.1.tar.bz2 Index: orca.spec =================================================================== RCS file: /cvs/dist/rpms/orca/FC-6/orca.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- orca.spec 1 Oct 2006 21:18:06 -0000 1.9 +++ orca.spec 31 Jan 2007 15:41:52 -0000 1.10 @@ -15,8 +15,8 @@ %define control_center_verion 2.16.0-5 Name: orca -Version: 1.0.0 -Release: 4%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Flexible, extensible, and powerful assistive technology Group: User Interface/Desktops @@ -102,6 +102,9 @@ %{_datadir}/orca/glade/orca-setup.glade %changelog +* Wed Jan 31 2007 Matthias Clasen - 1.0.1-1 +- Update to 1.0.1 + * Sun Oct 01 2006 Jesse Keating - 1.0.0-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/dist/rpms/orca/FC-6/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 4 Sep 2006 02:26:53 -0000 1.3 +++ sources 31 Jan 2007 15:41:52 -0000 1.4 @@ -1 +1 @@ -b1db09138f1c99b6b0fd468cab35deb2 orca-1.0.0.tar.bz2 +860172c6dadf6a655d8e0b2b3df90628 orca-1.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 15:42:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 10:42:48 -0500 Subject: rpms/f-spot/devel f-spot.spec,1.35,1.36 Message-ID: <200701311542.l0VFgm3Y000680@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv662 Modified Files: f-spot.spec Log Message: fix file lists Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- f-spot.spec 31 Jan 2007 15:34:16 -0000 1.35 +++ f-spot.spec 31 Jan 2007 15:42:46 -0000 1.36 @@ -68,7 +68,6 @@ %defattr(-,root,root,-) %doc COPYING README %{_datadir}/applications/* -%{_datadir}/pixmaps/* %{_libdir}/f-spot %{_bindir}/f-spot %{_bindir}/f-spot-import From fedora-cvs-commits at redhat.com Wed Jan 31 16:09:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:09:52 -0500 Subject: rpms/gnome-games/FC-6 .cvsignore, 1.45, 1.46 gnome-games.spec, 1.89, 1.90 sources, 1.48, 1.49 Message-ID: <200701311609.l0VG9qaN021944@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21916 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/FC-6/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 5 Sep 2006 04:29:50 -0000 1.45 +++ .cvsignore 31 Jan 2007 16:09:50 -0000 1.46 @@ -15,3 +15,4 @@ gnome-games-2.15.6.tar.bz2 gnome-games-2.15.92.tar.bz2 gnome-games-2.16.0.tar.bz2 +gnome-games-2.16.3.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/FC-6/gnome-games.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- gnome-games.spec 5 Sep 2006 04:29:50 -0000 1.89 +++ gnome-games.spec 31 Jan 2007 16:09:50 -0000 1.90 @@ -27,7 +27,7 @@ Summary: GNOME games Name: gnome-games -Version: 2.16.0 +Version: 2.16.3 Release: 1%{?dist} Epoch: 1 License: LGPL @@ -308,6 +308,9 @@ %changelog +* Wed Jan 31 2007 Matthias Clasen - 1:2.16.3-1 +- Update to 2.16.3 + * Tue Sep 5 2006 Matthias Clasen - 1:2.16.0-1.fc6 - Update to 2.16.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/FC-6/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 5 Sep 2006 04:29:50 -0000 1.48 +++ sources 31 Jan 2007 16:09:50 -0000 1.49 @@ -1,2 +1,2 @@ 01464739e83449288c6a58685604f86e gnome-games-extra-data-2.14.0.tar.bz2 -93580896711b7f30deb236bf21c5a1e6 gnome-games-2.16.0.tar.bz2 +88baa9ab64b84bfcac2a1ba05f84d2f9 gnome-games-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 16:11:09 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:11:09 -0500 Subject: rpms/gnome-games/FC-6 gnome-games.spec,1.90,1.91 Message-ID: <200701311611.l0VGB9T6022037@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22023 Modified Files: gnome-games.spec Log Message: bump rev Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/FC-6/gnome-games.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- gnome-games.spec 31 Jan 2007 16:09:50 -0000 1.90 +++ gnome-games.spec 31 Jan 2007 16:11:02 -0000 1.91 @@ -28,7 +28,7 @@ Summary: GNOME games Name: gnome-games Version: 2.16.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPL Group: Amusements/Games From fedora-cvs-commits at redhat.com Wed Jan 31 16:17:27 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:17:27 -0500 Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.84,1.85 Message-ID: <200701311617.l0VGHRbv004641@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4016 Modified Files: nautilus-cd-burner.spec Log Message: * Wed Jan 31 2007 Alexander Larsson - 2.17.6-2 - Disable cdrdao on s390x (its not availible) Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- nautilus-cd-burner.spec 23 Jan 2007 03:42:09 -0000 1.84 +++ nautilus-cd-burner.spec 31 Jan 2007 16:17:24 -0000 1.85 @@ -13,7 +13,7 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner Version: 2.17.6 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL Group: User Interface/Desktops @@ -21,7 +21,7 @@ Requires: gnome-vfs2 >= %{gnome_vfs_version} Requires: mkisofs Requires: cdrecord -%ifnarch s390 +%ifnarch s390 s390x Requires: cdrdao %endif Requires: dvd+rw-tools @@ -138,6 +138,9 @@ %changelog +* Wed Jan 31 2007 Alexander Larsson - 2.17.6-2 +- Disable cdrdao on s390x (its not availible) + * Wed Jan 22 2007 Matthias Clasen - 2.17.6-1 - Update to 2.17.6 From fedora-cvs-commits at redhat.com Wed Jan 31 16:19:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:19:01 -0500 Subject: rpms/f-spot/devel f-spot.spec,1.36,1.37 Message-ID: <200701311619.l0VGJ190010269@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10255 Modified Files: f-spot.spec Log Message: fix file lists Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- f-spot.spec 31 Jan 2007 15:42:46 -0000 1.36 +++ f-spot.spec 31 Jan 2007 16:18:59 -0000 1.37 @@ -55,6 +55,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc + chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll @@ -63,11 +65,26 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +update-desktop-database &> /dev/null ||: +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +update-desktop-database &> /dev/null ||: +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING README %{_datadir}/applications/* +%{_datadir}/gnome/help/f-spot +%{_datadir}/icons/hicolor/*/apps/f-spot.* %{_libdir}/f-spot %{_bindir}/f-spot %{_bindir}/f-spot-import From fedora-cvs-commits at redhat.com Wed Jan 31 16:20:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:20:34 -0500 Subject: rpms/f-spot/devel f-spot.spec,1.37,1.38 Message-ID: <200701311620.l0VGKYYg010354@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10340 Modified Files: f-spot.spec Log Message: Require desktop-file-utils Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- f-spot.spec 31 Jan 2007 16:18:59 -0000 1.37 +++ f-spot.spec 31 Jan 2007 16:20:32 -0000 1.38 @@ -22,6 +22,8 @@ BuildRequires: perl-XML-Parser Requires: sqlite >= 3.3.1 Requires: lcms +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils # Mono only availible on these: (s390x disabled for now) ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x From fedora-cvs-commits at redhat.com Wed Jan 31 16:33:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:33:25 -0500 Subject: rpms/gdm/FC-6 .cvsignore, 1.35, 1.36 gdm.spec, 1.211, 1.212 sources, 1.37, 1.38 Message-ID: <200701311633.l0VGXPKq026187@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gdm/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25329 Modified Files: .cvsignore gdm.spec sources Log Message: 2.16.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdm/FC-6/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 15 Dec 2006 16:21:00 -0000 1.35 +++ .cvsignore 31 Jan 2007 16:33:23 -0000 1.36 @@ -1 +1 @@ -gdm-2.16.4.tar.bz2 +gdm-2.16.5.tar.bz2 Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/FC-6/gdm.spec,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- gdm.spec 15 Dec 2006 16:21:00 -0000 1.211 +++ gdm.spec 31 Jan 2007 16:33:23 -0000 1.212 @@ -13,9 +13,9 @@ %define gail_version 1.2.0 %define nss_version 3.11.1 -Summary: The GNOME Display Manager. +Summary: The GNOME Display Manager Name: gdm -Version: 2.16.4 +Version: 2.16.5 Release: 1%{?dist} Epoch: 1 License: LGPL/GPL @@ -319,6 +319,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Wed Jan 31 2007 Matthias Clasen - 1:2.16.5-1 +- Update to 2.16.5 + * Fri Dec 15 2006 Matthias Clasen - 1:2.16.4-1.fc6 - Update to 2.16.4, which fixes CVE-2006-6105 - Update patches Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdm/FC-6/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 15 Dec 2006 16:21:00 -0000 1.37 +++ sources 31 Jan 2007 16:33:23 -0000 1.38 @@ -1 +1 @@ -7eb4a475cccba73d78af9e0852b7e82a gdm-2.16.4.tar.bz2 +8f223458b0e957650f6d865a06a271e4 gdm-2.16.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 16:34:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:34:05 -0500 Subject: rpms/kdelibs/FC-6 kdelibs.spec,1.204,1.205 Message-ID: <200701311634.l0VGY5GE026697@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26612 Modified Files: kdelibs.spec Log Message: rebuild Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-6/kdelibs.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- kdelibs.spec 31 Jan 2007 11:10:43 -0000 1.204 +++ kdelibs.spec 31 Jan 2007 16:34:03 -0000 1.205 @@ -17,7 +17,7 @@ %define arts 1 Version: 3.5.6 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -135,6 +135,7 @@ Requires: libacl-devel Requires: pcre-devel Requires: libkdnssd-devel +Requires: libutempter-devel Obsoletes: kdesupport-devel @@ -392,6 +393,9 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Wed Jan 31 2007 Than Ngo 6:3.5.6-0.3.fc6 +- rebuild + * Wed Jan 31 2007 Than Ngo 6:3.5.6-0.2.fc6 - apply patch to fix #225420, CVE-2007-0537 Konqueror improper HTML comment rendering, thanks to Dirk M??ller, KDE security team From fedora-cvs-commits at redhat.com Wed Jan 31 16:45:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:45:49 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2264, 1.2265 linux-2.6-xen-console.patch, 1.1, NONE linux-2.6-xen-pvfb-fixes.patch, 1.1, NONE linux-2.6-xen-pvfb.patch, 1.3, NONE Message-ID: <200701311645.l0VGjnKx003287@cvs.devel.redhat.com> Author: armbru Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3168 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-xen-console.patch linux-2.6-xen-pvfb-fixes.patch linux-2.6-xen-pvfb.patch Log Message: - The previous cset folded the Xen paravirt framebuffer patch into linux-2.6-xen.patch, and commented out the obsoleted patch files. Remove them. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2264 retrieving revision 1.2265 diff -u -r1.2264 -r1.2265 --- kernel-2.6.spec 31 Jan 2007 15:26:14 -0000 1.2264 +++ kernel-2.6.spec 31 Jan 2007 16:45:46 -0000 1.2265 @@ -373,9 +373,6 @@ Patch954: linux-2.6-xen-execshield.patch Patch955: linux-2.6-xen-tux.patch Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch -Patch990: linux-2.6-xen-console.patch -Patch991: linux-2.6-xen-pvfb.patch -Patch992: linux-2.6-xen-pvfb-fixes.patch # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -931,11 +928,6 @@ # ia64 xen cleanups for kexec/kdump %patch958 -p1 -# xen framebuffer patches -#%patch990 -p1 -#%patch991 -p1 -#%patch992 -p1 - %endif # @@ -1843,6 +1835,11 @@ %endif %changelog +* Wed Jan 31 2007 Markus Armbruster +- The previous cset folded the Xen paravirt framebuffer patch into + linux-2.6-xen.patch, and commented out the obsoleted patch files. + Remove them. + * Wed Jan 31 2007 Chuck Ebbert - Update to 2.6.19.2 --- linux-2.6-xen-console.patch DELETED --- --- linux-2.6-xen-pvfb-fixes.patch DELETED --- --- linux-2.6-xen-pvfb.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 16:45:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:45:52 -0500 Subject: rpms/sound-juicer/FC-6 .cvsignore, 1.28, 1.29 sound-juicer.spec, 1.63, 1.64 sources, 1.30, 1.31 Message-ID: <200701311645.l0VGjqJb003375@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/sound-juicer/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv3211 Modified Files: .cvsignore sound-juicer.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/FC-6/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 5 Sep 2006 00:32:57 -0000 1.28 +++ .cvsignore 31 Jan 2007 16:45:50 -0000 1.29 @@ -1 +1 @@ -sound-juicer-2.16.0.tar.bz2 +sound-juicer-2.16.3.tar.bz2 Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/FC-6/sound-juicer.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sound-juicer.spec 18 Oct 2006 21:13:03 -0000 1.63 +++ sound-juicer.spec 31 Jan 2007 16:45:50 -0000 1.64 @@ -12,8 +12,8 @@ Name: sound-juicer Summary: Clean and lean CD ripper -Version: 2.16.0 -Release: 2%{?dist} +Version: 2.16.3 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia Source: %{name}-%{version}.tar.bz2 @@ -121,6 +121,9 @@ %{_datadir}/icons/hicolor/* %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Wed Oct 18 2006 Matthias Clasen - 2.16.0-2 - Fix scripts according to the packaging guidelines Index: sources =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/FC-6/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 5 Sep 2006 00:32:57 -0000 1.30 +++ sources 31 Jan 2007 16:45:50 -0000 1.31 @@ -1 +1 @@ -d016189f2e694a3aae1e5036a31ea401 sound-juicer-2.16.0.tar.bz2 +cfe4199f4f50c2a8f8178db4097209e4 sound-juicer-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 16:57:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 11:57:48 -0500 Subject: rpms/rhythmbox/devel rhythmbox-0.9.7-mmkeys-plugin.patch, 1.1, 1.2 rhythmbox.spec, 1.97, 1.98 Message-ID: <200701311657.l0VGvm4w000669@cvs.devel.redhat.com> Author: bnocera Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv431 Modified Files: rhythmbox-0.9.7-mmkeys-plugin.patch rhythmbox.spec Log Message: - a few build fixes (took me a while) rhythmbox-0.9.7-mmkeys-plugin.patch: configure.ac | 1 data/rhythmbox.schemas | 22 + plugins/Makefile.am | 1 plugins/mmkeys/Makefile.am | 51 +++ plugins/mmkeys/mmkeys.rb-plugin.desktop.in | 8 plugins/mmkeys/rb-mmkeys-plugin.c | 419 +++++++++++++++++++++++++++++ shell/rb-shell-player.c | 137 --------- 7 files changed, 502 insertions(+), 137 deletions(-) Index: rhythmbox-0.9.7-mmkeys-plugin.patch =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox-0.9.7-mmkeys-plugin.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rhythmbox-0.9.7-mmkeys-plugin.patch 31 Jan 2007 12:09:08 -0000 1.1 +++ rhythmbox-0.9.7-mmkeys-plugin.patch 31 Jan 2007 16:57:46 -0000 1.2 @@ -54,7 +54,7 @@ diff -urN rhythmbox-0.9.7/plugins/mmkeys/Makefile.am rhythmbox-0.9.7.mmkeys/plugins/mmkeys/Makefile.am --- rhythmbox-0.9.7/plugins/mmkeys/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ rhythmbox-0.9.7.mmkeys/plugins/mmkeys/Makefile.am 2007-01-31 12:00:42.000000000 +0000 -@@ -0,0 +1,52 @@ +@@ -0,0 +1,51 @@ +NULL = + +plugindir = $(PLUGINDIR)/mmkeys @@ -67,7 +67,6 @@ +libmmkeys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + +libmmkeys_la_LIBADD = \ -+ $(top_builddir)/corelib/librhythmbox-core.la \ + $(NULL) + +INCLUDES = \ Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- rhythmbox.spec 31 Jan 2007 14:08:15 -0000 1.97 +++ rhythmbox.spec 31 Jan 2007 16:57:46 -0000 1.98 @@ -39,7 +39,7 @@ BuildRequires: hal-devel BuildRequires: perl-XML-Parser # For Patch1 -BuildRequires: autoconf automake +BuildRequires: autoconf automake libtool ExcludeArch: s390 s390x @@ -63,6 +63,7 @@ /usr/bin/gst-inspect-0.10 --print-all > /dev/null # For Patch1 +aclocal -I macros autoconf automake @@ -143,9 +144,9 @@ %{_libexecdir}/rhythmbox-metadata %changelog -* Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 +* Wed Jan 31 2007 - Bastien Nocera - 0.9.7-11.fc7 - Require automake in the BuildRequires as well, as we need to generate - plugins/power-manager/Makefile.in + plugins/mmkeys/Makefile.in * Wed Jan 31 2007 - Bastien Nocera - 0.9.7-10.fc7 - Require autoconf in the BuildRequires, as it's not in the minimum build From fedora-cvs-commits at redhat.com Wed Jan 31 17:02:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:02:56 -0500 Subject: rpms/sound-juicer/FC-6 sound-juicer.spec,1.64,1.65 Message-ID: <200701311702.l0VH2uDM004535@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/sound-juicer/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4453 Modified Files: sound-juicer.spec Log Message: fix file list Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/FC-6/sound-juicer.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sound-juicer.spec 31 Jan 2007 16:45:50 -0000 1.64 +++ sound-juicer.spec 31 Jan 2007 17:02:54 -0000 1.65 @@ -119,6 +119,7 @@ %{_datadir}/gnome/help/sound-juicer %{_datadir}/omf/sound-juicer %{_datadir}/icons/hicolor/* +%{_mandir}/man1/* %changelog * Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 From fedora-cvs-commits at redhat.com Wed Jan 31 17:06:00 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:06:00 -0500 Subject: rpms/gnome-mag/FC-6 .cvsignore, 1.21, 1.22 gnome-mag.spec, 1.38, 1.39 sources, 1.21, 1.22 Message-ID: <200701311706.l0VH608c007135@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mag/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7059 Modified Files: .cvsignore gnome-mag.spec sources Log Message: 0.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/FC-6/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Aug 2006 23:00:42 -0000 1.21 +++ .cvsignore 31 Jan 2007 17:05:52 -0000 1.22 @@ -1 +1 @@ -gnome-mag-0.13.1.tar.bz2 +gnome-mag-0.13.2.tar.bz2 Index: gnome-mag.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/FC-6/gnome-mag.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gnome-mag.spec 2 Aug 2006 23:00:49 -0000 1.38 +++ gnome-mag.spec 31 Jan 2007 17:05:52 -0000 1.39 @@ -2,7 +2,7 @@ Summary: GNOME Magnifier Name: gnome-mag -Version: 0.13.1 +Version: 0.13.2 Release: 1%{?dist} License: LGPL Group: Desktop/Accessibility @@ -69,6 +69,9 @@ %{_datadir}/doc/gnome-mag* %changelog +* Wed Jan 31 2007 Matthias Clasen - 0.13.2-1 +- Update to 0.13.2 + * Wed Aug 2 2006 Matthias Clasen - 0.13.1-1.fc6 - Update to 0.13.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/FC-6/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 2 Aug 2006 23:00:50 -0000 1.21 +++ sources 31 Jan 2007 17:05:52 -0000 1.22 @@ -1 +1 @@ -4b16b95fd978640c103a6f9cf452c579 gnome-mag-0.13.1.tar.bz2 +093c153c0d8bad40d40d4f7c21be8975 gnome-mag-0.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 17:08:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:08:47 -0500 Subject: rpms/system-config-services/devel .cvsignore, 1.30, 1.31 sources, 1.40, 1.41 system-config-services.spec, 1.41, 1.42 Message-ID: <200701311708.l0VH8lHd009537@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9212 Modified Files: .cvsignore sources system-config-services.spec Log Message: fix up service metadata reading a bit (#217591) Resolves: #217591 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 31 Jan 2007 11:00:06 -0000 1.30 +++ .cvsignore 31 Jan 2007 17:08:40 -0000 1.31 @@ -1 +1 @@ -system-config-services-0.9.5.tar.bz2 +system-config-services-0.9.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 31 Jan 2007 11:00:06 -0000 1.40 +++ sources 31 Jan 2007 17:08:40 -0000 1.41 @@ -1 +1 @@ -2bcf681fc71efec5c0a77f52c0e58bea system-config-services-0.9.5.tar.bz2 +3fd833284441c566c708196399055b4c system-config-services-0.9.6.tar.bz2 Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- system-config-services.spec 31 Jan 2007 11:00:06 -0000 1.41 +++ system-config-services.spec 31 Jan 2007 17:08:40 -0000 1.42 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.9.5 +Version: 0.9.6 Release: 1%{?dist} URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.bz2 @@ -76,6 +76,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Wed Jan 31 2007 Nils Philippsen - 0.9.6 +- fix up service metadata reading a bit (#217591) + * Wed Jan 31 2007 Nils Philippsen - 0.9.5 - use "install -m" to install a lot of files without executable bits (#222579) From fedora-cvs-commits at redhat.com Wed Jan 31 17:08:50 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:08:50 -0500 Subject: rpms/eog/FC-6 .cvsignore, 1.37, 1.38 eog.spec, 1.61, 1.62 sources, 1.37, 1.38 Message-ID: <200701311708.l0VH8o8w009758@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv9571 Modified Files: .cvsignore eog.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/FC-6/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 5 Sep 2006 00:06:22 -0000 1.37 +++ .cvsignore 31 Jan 2007 17:08:48 -0000 1.38 @@ -1 +1 @@ -eog-2.16.0.1.tar.bz2 +eog-2.16.3.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/FC-6/eog.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- eog.spec 18 Oct 2006 16:49:17 -0000 1.61 +++ eog.spec 31 Jan 2007 17:08:48 -0000 1.62 @@ -12,8 +12,8 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.16.0.1 -Release: 3%{?dist} +Version: 2.16.3 +Release: 1%{?dist} URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 License: GPL @@ -111,6 +111,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Wed Oct 18 2006 Matthias Clasen - 2.16.0.1-3 - Fix scripts according to the packaging guidelines Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/FC-6/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 5 Sep 2006 00:06:22 -0000 1.37 +++ sources 31 Jan 2007 17:08:48 -0000 1.38 @@ -1 +1 @@ -4011f378e1c5dda0e1d45b55232f685f eog-2.16.0.1.tar.bz2 +82468185d766b9676d7f06c124939f9d eog-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 17:14:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:14:07 -0500 Subject: rpms/zenity/FC-6 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 zenity.spec, 1.17, 1.18 Message-ID: <200701311714.l0VHE7rm015050@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/zenity/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14205 Modified Files: .cvsignore sources zenity.spec Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/zenity/FC-6/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 4 Sep 2006 20:03:38 -0000 1.9 +++ .cvsignore 31 Jan 2007 17:14:05 -0000 1.10 @@ -1 +1 @@ -zenity-2.16.0.tar.bz2 +zenity-2.16.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/zenity/FC-6/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 4 Sep 2006 20:03:38 -0000 1.9 +++ sources 31 Jan 2007 17:14:05 -0000 1.10 @@ -1 +1 @@ -97956407822b08b3d303d908df5e1404 zenity-2.16.0.tar.bz2 +773579408f3237b38fa4d18a182c0ca6 zenity-2.16.3.tar.bz2 Index: zenity.spec =================================================================== RCS file: /cvs/dist/rpms/zenity/FC-6/zenity.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- zenity.spec 4 Sep 2006 22:24:53 -0000 1.17 +++ zenity.spec 31 Jan 2007 17:14:05 -0000 1.18 @@ -1,5 +1,5 @@ Name: zenity -Version: 2.16.0 +Version: 2.16.3 Release: 1%{?dist} Summary: Display dialog boxes from shell scripts Group: Applications/System @@ -65,6 +65,9 @@ %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Mon Sep 4 2006 Matthias Clasen - 2.16.0-1.fc6 - Update to 2.16.0 - Add missing BRs From fedora-cvs-commits at redhat.com Wed Jan 31 17:17:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:17:25 -0500 Subject: rpms/eog/FC-6 eog.spec,1.62,1.63 Message-ID: <200701311717.l0VHHPNJ027479@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26876 Modified Files: eog.spec Log Message: --disable-scrollkeeper-harder Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/FC-6/eog.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- eog.spec 31 Jan 2007 17:08:48 -0000 1.62 +++ eog.spec 31 Jan 2007 17:17:20 -0000 1.63 @@ -72,6 +72,8 @@ --add-category X-Red-Hat-Extra \ $RPM_BUILD_ROOT%{_datadir}/applications/* +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper + %find_lang %{name} %clean From fedora-cvs-commits at redhat.com Wed Jan 31 17:21:08 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:21:08 -0500 Subject: rpms/gnome-themes/FC-6 .cvsignore, 1.35, 1.36 gnome-themes.spec, 1.67, 1.68 sources, 1.36, 1.37 Message-ID: <200701311721.l0VHL8Sn026109@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-themes/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv26035 Modified Files: .cvsignore gnome-themes.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/FC-6/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 5 Sep 2006 02:37:50 -0000 1.35 +++ .cvsignore 31 Jan 2007 17:21:06 -0000 1.36 @@ -9,3 +9,4 @@ gnome-themes-2.15.91.1.tar.bz2 gnome-themes-2.15.92.tar.bz2 gnome-themes-2.16.0.tar.bz2 +gnome-themes-2.16.3.tar.bz2 Index: gnome-themes.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/FC-6/gnome-themes.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- gnome-themes.spec 5 Sep 2006 02:37:50 -0000 1.67 +++ gnome-themes.spec 31 Jan 2007 17:21:06 -0000 1.68 @@ -2,7 +2,7 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.16.0 +Version: 2.16.3 Release: 1%{?dist} URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/ Source: %{name}-%{version}.tar.bz2 @@ -82,6 +82,9 @@ %doc AUTHORS ChangeLog COPYING NEWS README %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Mon Sep 4 2006 Matthias Clasen - 2.16.0-1.fc6 - Update to 2.16.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/FC-6/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 5 Sep 2006 02:37:50 -0000 1.36 +++ sources 31 Jan 2007 17:21:06 -0000 1.37 @@ -1,2 +1,2 @@ 451ef33d1bffa261c5cbe01182199f97 clearlooks-0.6.2.tar.bz2 -64e44970702ebec39151289d3a1e17c6 gnome-themes-2.16.0.tar.bz2 +ecb4d4b9b90507ba4f3d6e9e63d872d5 gnome-themes-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 17:25:52 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:25:52 -0500 Subject: rpms/metacity/FC-6 .cvsignore, 1.48, 1.49 metacity.spec, 1.101, 1.102 sources, 1.48, 1.49 Message-ID: <200701311725.l0VHPqcr029899@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29818 Modified Files: .cvsignore metacity.spec sources Log Message: 2.16.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/FC-6/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 5 Sep 2006 00:47:32 -0000 1.48 +++ .cvsignore 31 Jan 2007 17:25:50 -0000 1.49 @@ -1 +1 @@ -metacity-2.16.0.tar.bz2 +metacity-2.16.5.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/FC-6/metacity.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- metacity.spec 18 Oct 2006 14:01:28 -0000 1.101 +++ metacity.spec 31 Jan 2007 17:25:50 -0000 1.102 @@ -1,13 +1,13 @@ %define gettext_package metacity -%define metacity_version 2.16.0 +%define metacity_version 2.16.5 %define metacity_filename metacity-%{metacity_version} Summary: Metacity window manager Name: metacity Version: %{metacity_version} -Release: 7%{?dist} +Release: 1%{?dist} URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ Source0: %{metacity_filename}.tar.bz2 License: GPL @@ -123,6 +123,9 @@ %{_mandir}/man1/* %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.5-1 +- Update to 2.16.5 + * Wed Oct 18 2006 Matthias Clasen - 2.16.0-7 - Fix scripts according to packaging guidelines Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/FC-6/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 5 Sep 2006 00:47:33 -0000 1.48 +++ sources 31 Jan 2007 17:25:50 -0000 1.49 @@ -1 +1 @@ -db1f2582681bf5eb0a8ecab45b622d7b metacity-2.16.0.tar.bz2 +7ac14eb4caffbb15df91b70b0def2f5e metacity-2.16.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 17:59:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 12:59:11 -0500 Subject: rpms/metacity/FC-6 metacity.spec,1.102,1.103 Message-ID: <200701311759.l0VHxBK9021279@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21265 Modified Files: metacity.spec Log Message: drop upstreamed patches Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/FC-6/metacity.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- metacity.spec 31 Jan 2007 17:25:50 -0000 1.102 +++ metacity.spec 31 Jan 2007 17:59:09 -0000 1.103 @@ -34,9 +34,6 @@ Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 -Patch2: metacity-2.16.0-losing-focus.patch -Patch3: metacity-2.16.0-currenttime-fixes.patch - %description Metacity is a simple window manager that integrates nicely with @@ -45,9 +42,6 @@ %prep %setup -q -n %{metacity_filename} -%patch2 -p0 -b .losing-focus -%patch3 -p1 -b .currenttime-fixes - %build rm -rf $RPM_BUILD_ROOT @@ -125,6 +119,7 @@ %changelog * Wed Jan 31 2007 Matthias Clasen - 2.16.5-1 - Update to 2.16.5 +- Drop upstreamed patches * Wed Oct 18 2006 Matthias Clasen - 2.16.0-7 - Fix scripts according to packaging guidelines From fedora-cvs-commits at redhat.com Wed Jan 31 18:02:46 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:02:46 -0500 Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.20, 1.21 gnome-doc-utils.spec, 1.29, 1.30 sources, 1.20, 1.21 Message-ID: <200701311802.l0VI2kDM021432@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-doc-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21412 Modified Files: .cvsignore gnome-doc-utils.spec sources Log Message: 0.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 4 Sep 2006 23:52:43 -0000 1.20 +++ .cvsignore 31 Jan 2007 18:02:40 -0000 1.21 @@ -1 +1 @@ -gnome-doc-utils-0.8.0.tar.bz2 +gnome-doc-utils-0.9.2.tar.bz2 Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-doc-utils.spec 10 Dec 2006 03:08:41 -0000 1.29 +++ gnome-doc-utils.spec 31 Jan 2007 18:02:40 -0000 1.30 @@ -1,13 +1,13 @@ ### Abstract ### Name: gnome-doc-utils -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.9.2 +Release: 1%{?dist} License: LGPL Group: Development/Tools Summary: Documentation utilities for the GNOME project URL: http://www.gnome.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source: %{name}-%{version}.tar.bz2 BuildArch: noarch @@ -74,6 +74,9 @@ %{_datadir}/gnome-doc-utils %changelog +* Wed Jan 31 2007 Matthias Clasen - 0.9.2-1 +- Update to 0.9.2 + * Sat Dec 09 2006 Matthew Barnes - 0.8.0-3 - Add patch for GNOME bug #355521 (look for local m4 files). Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 4 Sep 2006 23:52:43 -0000 1.20 +++ sources 31 Jan 2007 18:02:40 -0000 1.21 @@ -1 +1 @@ -50726331fef362dc94921f366fcc8ed2 gnome-doc-utils-0.8.0.tar.bz2 +1a79f644efcb76537c02b842272c9b41 gnome-doc-utils-0.9.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 18:03:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:03:25 -0500 Subject: rpms/device-mapper/devel device-mapper.spec,1.52,1.53 Message-ID: <200701311803.l0VI3OB7021541@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21513 Modified Files: device-mapper.spec Log Message: update buildroot line Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- device-mapper.spec 29 Jan 2007 21:53:53 -0000 1.52 +++ device-mapper.spec 31 Jan 2007 18:03:22 -0000 1.53 @@ -1,12 +1,12 @@ Summary: Device mapper library Name: device-mapper Version: 1.02.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://sources.redhat.com/dm Source0: %{name}.%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel, libsepol-devel %define _exec_prefix / @@ -48,6 +48,9 @@ %changelog +* Tue Jan 31 2007 Alasdair Kergon - 1.02.17-2 +- Update BuildRoot line. + * Mon Jan 29 2007 Alasdair Kergon - 1.02.17-1 - Add recent reporting options to dmsetup man page. - Add dmsetup 'help' command and update usage text. From fedora-cvs-commits at redhat.com Wed Jan 31 18:06:57 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:06:57 -0500 Subject: rpms/file-roller/FC-6 .cvsignore, 1.42, 1.43 file-roller.spec, 1.74, 1.75 sources, 1.43, 1.44 Message-ID: <200701311806.l0VI6vPb021731@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21700 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/FC-6/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 4 Sep 2006 22:47:33 -0000 1.42 +++ .cvsignore 31 Jan 2007 18:06:55 -0000 1.43 @@ -1 +1 @@ -file-roller-2.16.0.tar.bz2 +file-roller-2.16.3.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/FC-6/file-roller.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- file-roller.spec 8 Sep 2006 17:17:53 -0000 1.74 +++ file-roller.spec 31 Jan 2007 18:06:55 -0000 1.75 @@ -10,8 +10,8 @@ Summary: File Roller is a tool for viewing and creating archives Name: file-roller -Version: 2.16.0 -Release: 2%{?dist} +Version: 2.16.3 +Release: 1%{?dist} License: GPL Group: Applications/Archiving @@ -124,6 +124,9 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Fri Sep 8 2006 Matthias Clasen - 2.16.0-2 - Fix directory ownership issues Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/FC-6/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 4 Sep 2006 22:47:33 -0000 1.43 +++ sources 31 Jan 2007 18:06:55 -0000 1.44 @@ -1 +1 @@ -96a17824bedce36d3ebfee602e6a68c5 file-roller-2.16.0.tar.bz2 +3ee134c04b73a584c9ec494d5e542c6d file-roller-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 18:09:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:09:59 -0500 Subject: rpms/epiphany/FC-6 .cvsignore, 1.47, 1.48 epiphany.spec, 1.126, 1.127 sources, 1.48, 1.49 Message-ID: <200701311809.l0VI9xV8021879@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv21863 Modified Files: .cvsignore epiphany.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-6/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 20 Dec 2006 16:38:14 -0000 1.47 +++ .cvsignore 31 Jan 2007 18:09:57 -0000 1.48 @@ -1 +1 @@ -epiphany-2.16.2.tar.bz2 +epiphany-2.16.3.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-6/epiphany.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- epiphany.spec 20 Dec 2006 17:25:47 -0000 1.126 +++ epiphany.spec 31 Jan 2007 18:09:57 -0000 1.127 @@ -8,7 +8,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 2.16.2 +Version: 2.16.3 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -163,6 +163,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Wed Dec 20 2006 Christopher Aillon - 2.16.2-1 - Update to 2.16.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-6/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 20 Dec 2006 16:38:14 -0000 1.48 +++ sources 31 Jan 2007 18:09:57 -0000 1.49 @@ -1 +1 @@ -6d4ca4c3c1fb52b432ad3f5006866b6b epiphany-2.16.2.tar.bz2 +3ee93d168eb5720a96f4c7adf2cdf2d4 epiphany-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 18:11:34 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:11:34 -0500 Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.30,1.31 Message-ID: <200701311811.l0VIBYJm021975@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-doc-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21961 Modified Files: gnome-doc-utils.spec Log Message: drop obsolete patch Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnome-doc-utils.spec 31 Jan 2007 18:02:40 -0000 1.30 +++ gnome-doc-utils.spec 31 Jan 2007 18:11:31 -0000 1.31 @@ -14,9 +14,6 @@ ### Patches ### -# GNOME bug #355521 -Patch1: gnome-doc-utils-0.8.0-aclocal-flags.patch - ### Dependencies ### Requires: libxml2 >= 2.6.12 @@ -39,7 +36,6 @@ %prep %setup -q -%patch1 -p1 -b .aclocal-flags %build %configure --disable-scrollkeeper From fedora-cvs-commits at redhat.com Wed Jan 31 18:12:03 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:12:03 -0500 Subject: rpms/nautilus-cd-burner/FC-6 .cvsignore, 1.39, 1.40 nautilus-cd-burner.spec, 1.79, 1.80 sources, 1.39, 1.40 Message-ID: <200701311812.l0VIC3qN022110@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv22088 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-6/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 5 Sep 2006 03:04:20 -0000 1.39 +++ .cvsignore 31 Jan 2007 18:12:01 -0000 1.40 @@ -1 +1 @@ -nautilus-cd-burner-2.16.0.tar.bz2 +nautilus-cd-burner-2.16.3.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-6/nautilus-cd-burner.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- nautilus-cd-burner.spec 28 Nov 2006 13:05:58 -0000 1.79 +++ nautilus-cd-burner.spec 31 Jan 2007 18:12:01 -0000 1.80 @@ -1,7 +1,7 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.16.0 -Release: 6%{?dist} +Version: 2.16.3 +Release: 1%{?dist} Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL Group: User Interface/Desktops @@ -32,12 +32,6 @@ # For intltool: BuildRequires: perl-XML-Parser >= 2.31-16 -# From upstream cvs (gnome bugzilla 359997) -Patch1: nautilus-cd-burner-2.16-growiso-joliet.patch -Patch2: nautilus-cd-burner-2.16.0-cdrdao.patch -Patch3: nautilus-cd-burner-2.16.0-from-image.patch -Patch4: nautilus-cd-burner-2.16.0-speeds.patch - %description An easy to use CD burning package, well integrated with Nautilus and the Gnome desktop. @@ -58,11 +52,6 @@ %prep %setup -q -%patch1 -p0 -b .growiso-joliet -%patch2 -p0 -b .cdrdao -%patch3 -p0 -b .from-image -%patch4 -p0 -b .speeds - %build %configure --enable-hal --enable-gnome-mount make @@ -135,6 +124,10 @@ %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 +- Drop obsolete patches + * Tue Nov 28 2006 Alexander Larsson - 2.16.0-6 - Backport bugfixes from 2.16.2: - * Limit number of speeds listed Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/FC-6/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 5 Sep 2006 03:04:20 -0000 1.39 +++ sources 31 Jan 2007 18:12:01 -0000 1.40 @@ -1 +1 @@ -a5beaff98911479bc5187dfa18920f3e nautilus-cd-burner-2.16.0.tar.bz2 +6e3653c849e24aacd7e29b4030327b4e nautilus-cd-burner-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 18:17:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:17:10 -0500 Subject: rpms/tomboy/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 tomboy.spec, 1.35, 1.36 Message-ID: <200701311817.l0VIHA6w022479@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/tomboy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22310 Modified Files: .cvsignore sources tomboy.spec Log Message: 0.5.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 11 Jan 2007 06:11:58 -0000 1.9 +++ .cvsignore 31 Jan 2007 18:17:08 -0000 1.10 @@ -1 +1 @@ -tomboy-0.5.3.tar.bz2 +tomboy-0.5.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 11 Jan 2007 06:11:58 -0000 1.9 +++ sources 31 Jan 2007 18:17:08 -0000 1.10 @@ -1 +1 @@ -97205e0e85b628b9b43e85012bd7b2c5 tomboy-0.5.3.tar.bz2 +ff3aeda50d08a638b6b9192d997aa822 tomboy-0.5.5.tar.bz2 Index: tomboy.spec =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- tomboy.spec 17 Jan 2007 02:26:08 -0000 1.35 +++ tomboy.spec 31 Jan 2007 18:17:08 -0000 1.36 @@ -1,5 +1,5 @@ Name: tomboy -Version: 0.5.3 +Version: 0.5.5 Release: 1%{?dist} Summary: Tomboy is a desktop note-taking application for Linux and Unix @@ -102,6 +102,9 @@ %changelog +* Wed Jan 31 2007 Matthias Clasen - 0.5.5-1 +- Update to 0.5.5 + * Thu Jan 11 2007 Matthias Clasen - 0.5.3-1 - Update to 0.5.3 From fedora-cvs-commits at redhat.com Wed Jan 31 18:18:11 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:18:11 -0500 Subject: rpms/gnome-doc-utils/devel gnome-doc-utils.spec,1.31,1.32 Message-ID: <200701311818.l0VIIBpB010294@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-doc-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10276 Modified Files: gnome-doc-utils.spec Log Message: fix BRs Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gnome-doc-utils.spec 31 Jan 2007 18:11:31 -0000 1.31 +++ gnome-doc-utils.spec 31 Jan 2007 18:18:09 -0000 1.32 @@ -27,6 +27,7 @@ BuildRequires: perl-XML-Parser BuildRequires: gettext +BuildRequires: scrollkeeper %description gnome-doc-utils is a collection of documentation utilities for the GNOME From fedora-cvs-commits at redhat.com Wed Jan 31 18:24:14 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:24:14 -0500 Subject: rpms/pango/FC-6 .cvsignore, 1.46, 1.47 pango.spec, 1.93, 1.94 sources, 1.46, 1.47 Message-ID: <200701311824.l0VIOE9G010568@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/pango/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10552 Modified Files: .cvsignore pango.spec sources Log Message: 1.14.10 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pango/FC-6/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 7 Dec 2006 22:20:13 -0000 1.46 +++ .cvsignore 31 Jan 2007 18:24:08 -0000 1.47 @@ -1 +1 @@ -pango-1.14.9.tar.bz2 +pango-1.14.10.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/FC-6/pango.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- pango.spec 7 Dec 2006 22:20:13 -0000 1.93 +++ pango.spec 31 Jan 2007 18:24:08 -0000 1.94 @@ -7,7 +7,7 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.14.9 +Version: 1.14.10 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -189,6 +189,9 @@ %changelog +* Wed Jan 31 2007 Matthias Clasen - 1.14.10-1 +- Update to 1.14.10 + * Thu Dec 07 2006 Behdad Esfahbod - 1.14.9-1 - Update to 1.14.9 - Resolves: #216424, #216850, #211964, #213632 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pango/FC-6/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 7 Dec 2006 22:20:13 -0000 1.46 +++ sources 31 Jan 2007 18:24:08 -0000 1.47 @@ -1 +1 @@ -58766a41693b917fda854b9a41d40834 pango-1.14.9.tar.bz2 +e9fc2f8168e74e2fa0aa8238ee0e9c06 pango-1.14.10.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 18:25:05 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:25:05 -0500 Subject: rpms/device-mapper-multipath/devel device-mapper-multipath.spec, 1.38, 1.39 Message-ID: <200701311825.l0VIP5tJ010597@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/device-mapper-multipath/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10580 Modified Files: device-mapper-multipath.spec Log Message: update BuildRoot & PreReq lines Index: device-mapper-multipath.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- device-mapper-multipath.spec 15 Jan 2007 23:41:05 -0000 1.38 +++ device-mapper-multipath.spec 31 Jan 2007 18:24:57 -0000 1.39 @@ -1,14 +1,15 @@ Summary: Tools to manage multipath devices using device-mapper. Name: device-mapper-multipath Version: 0.4.7 -Release: 9.fc7 +Release: 10.fc7 License: GPL Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ Source0: multipath-tools-0.4.7.head2.tgz Requires: kpartx = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Prereq: chkconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires(post): chkconfig +Requires(preun): chkconfig BuildRequires: libsysfs-devel, device-mapper >= 1.02.02-2 BuildRequires: libselinux-devel, libsepol-devel BuildRequires: readline-devel, ncurses-devel @@ -77,6 +78,9 @@ %{_mandir}/man8/kpartx.8.gz %changelog +* Wed Jan 31 2007 Benjamin Marzinksi - 0.4.7-10.fc7 +- Update BuildRoot and PreReq lines. + * Mon Jan 15 2007 Benjamin Marzinksi - 0.4.7-9.fc7 - Fixed spec file. From fedora-cvs-commits at redhat.com Wed Jan 31 18:27:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:27:59 -0500 Subject: rpms/vte/FC-6 .cvsignore, 1.48, 1.49 sources, 1.48, 1.49 vte.spec, 1.94, 1.95 Message-ID: <200701311827.l0VIRxRq010895@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/vte/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv10868 Modified Files: .cvsignore sources vte.spec Log Message: 0.14.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vte/FC-6/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 8 Dec 2006 21:54:28 -0000 1.48 +++ .cvsignore 31 Jan 2007 18:27:57 -0000 1.49 @@ -1 +1 @@ -vte-0.14.1.tar.bz2 +vte-0.14.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vte/FC-6/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 8 Dec 2006 21:54:28 -0000 1.48 +++ sources 31 Jan 2007 18:27:57 -0000 1.49 @@ -1 +1 @@ -98ea2513b773b44cb7f8d75dc1aa312e vte-0.14.1.tar.bz2 +eceafec1b564cc059fa3407f83631817 vte-0.14.2.tar.bz2 Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/FC-6/vte.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- vte.spec 8 Dec 2006 21:54:28 -0000 1.94 +++ vte.spec 31 Jan 2007 18:27:57 -0000 1.95 @@ -1,5 +1,5 @@ Name: vte -Version: 0.14.1 +Version: 0.14.2 Release: 1%{?dist} Summary: A terminal emulator License: LGPL @@ -105,6 +105,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jan 31 2007 Matthias Clasen 0.14.2-1 +- Update to 0.14.2 + * Fri Dec 08 2006 Behdad Esfahbod 0.14.1-1 - Update to 0.14.1 - Add gnome-pty-helper-hostaddress-garbage.patch From fedora-cvs-commits at redhat.com Wed Jan 31 18:32:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:32:32 -0500 Subject: rpms/libwnck/FC-6 .cvsignore, 1.39, 1.40 libwnck.spec, 1.61, 1.62 sources, 1.39, 1.40 Message-ID: <200701311832.l0VIWWU6025387@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libwnck/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv25316 Modified Files: .cvsignore libwnck.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libwnck/FC-6/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 4 Sep 2006 23:58:01 -0000 1.39 +++ .cvsignore 31 Jan 2007 18:32:30 -0000 1.40 @@ -1 +1 @@ -libwnck-2.16.0.tar.bz2 +libwnck-2.16.3.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/dist/rpms/libwnck/FC-6/libwnck.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- libwnck.spec 1 Oct 2006 21:17:41 -0000 1.61 +++ libwnck.spec 31 Jan 2007 18:32:30 -0000 1.62 @@ -5,8 +5,8 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.16.0 -Release: 4%{?dist} +Version: 2.16.3 +Release: 1%{?dist} URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -98,6 +98,9 @@ %{_datadir}/gtk-doc/html/libwnck %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Sun Oct 01 2006 Jesse Keating - 2.16.0-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libwnck/FC-6/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 4 Sep 2006 23:58:01 -0000 1.39 +++ sources 31 Jan 2007 18:32:30 -0000 1.40 @@ -1 +1 @@ -01efff55c10728a43ecc87b313588a8b libwnck-2.16.0.tar.bz2 +0a36d269b19f78df7bd861033792f550 libwnck-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 18:55:59 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:55:59 -0500 Subject: rpms/kernel/FC-5 linux-2.6-proc-self-maps-fix.patch,1.5,1.6 Message-ID: <200701311855.l0VItxjZ031088@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31047 Modified Files: linux-2.6-proc-self-maps-fix.patch Log Message: compile fix linux-2.6-proc-self-maps-fix.patch: b/fs/proc/base.c | 20 ++++++++++++++++++++ b/fs/proc/internal.h | 2 ++ foo/fs/proc/base.c | 2 +- foo/include/linux/ptrace.h | 1 + foo/kernel/ptrace.c | 4 ++-- linux-2.6.17.noarch/fs/proc/task_mmu.c | 3 +-- linux-2.6.19.noarch/kernel/ptrace.c | 2 +- 7 files changed, 28 insertions(+), 6 deletions(-) Index: linux-2.6-proc-self-maps-fix.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-proc-self-maps-fix.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-proc-self-maps-fix.patch 31 Jan 2007 15:26:15 -0000 1.5 +++ linux-2.6-proc-self-maps-fix.patch 31 Jan 2007 18:55:52 -0000 1.6 @@ -109,3 +109,14 @@ return !err; } +--- linux-2.6.19.noarch/kernel/ptrace.c~ 2007-01-31 13:55:04.000000000 -0500 ++++ linux-2.6.19.noarch/kernel/ptrace.c 2007-01-31 13:55:11.000000000 -0500 +@@ -193,7 +193,7 @@ repeat: + /* the same process cannot be attached many times */ + if (task->ptrace & PT_PTRACED) + goto bad; +- retval = may_attach(task); ++ retval = __ptrace_may_attach(task); + if (retval) + goto bad; + From fedora-cvs-commits at redhat.com Wed Jan 31 18:57:41 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 13:57:41 -0500 Subject: rpms/gnome-desktop/FC-6 .cvsignore, 1.37, 1.38 gnome-desktop.spec, 1.66, 1.67 sources, 1.37, 1.38 Message-ID: <200701311857.l0VIvf7U032495@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv29937 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/FC-6/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 5 Sep 2006 00:11:52 -0000 1.37 +++ .cvsignore 31 Jan 2007 18:57:37 -0000 1.38 @@ -1 +1 @@ -gnome-desktop-2.16.0.tar.bz2 +gnome-desktop-2.16.3.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/FC-6/gnome-desktop.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- gnome-desktop.spec 5 Sep 2006 01:59:02 -0000 1.66 +++ gnome-desktop.spec 31 Jan 2007 18:57:37 -0000 1.67 @@ -11,7 +11,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop -Version: 2.16.0 +Version: 2.16.3 Release: 1%{?dist} URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 @@ -133,6 +133,9 @@ %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Mon Sep 4 2006 Matthias Clasen - 2.16.0-1.fc6 - Update to 2.16.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/FC-6/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 5 Sep 2006 00:11:52 -0000 1.37 +++ sources 31 Jan 2007 18:57:37 -0000 1.38 @@ -1 +1 @@ -7cb89d82a55f117333974b0a97c849e0 gnome-desktop-2.16.0.tar.bz2 +42c21d18589f4955bb0d70c82236d999 gnome-desktop-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 19:12:21 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:12:21 -0500 Subject: rpms/radvd/devel radvd.spec,1.34,1.35 Message-ID: <200701311912.l0VJCLbW011529@cvs.devel.redhat.com> Author: mbacovsk Update of /cvs/dist/rpms/radvd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11146 Modified Files: radvd.spec Log Message: * Wed Jan 31 2007 Martin Bacovsky - 1.0-1.fc7 - fPIE is back again Index: radvd.spec =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- radvd.spec 31 Jan 2007 11:32:20 -0000 1.34 +++ radvd.spec 31 Jan 2007 19:12:19 -0000 1.35 @@ -29,7 +29,7 @@ %setup %build -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIE" %configure --with-pidfile=/var/run/radvd/radvd.pid make # make %{?_smp_mflags} @@ -87,6 +87,7 @@ %changelog * Wed Jan 31 2007 Martin Bacovsky - 1.0-1.fc7 +- rebase to upstream 1.0 - Resolves: #225542: radvd 1.0 released * Fri Aug 18 2006 Jesse Keating - 0.9.1-4 From fedora-cvs-commits at redhat.com Wed Jan 31 19:14:51 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:14:51 -0500 Subject: rpms/gnome-power-manager/FC-6 .cvsignore, 1.23, 1.24 gnome-power-manager.spec, 1.67, 1.68 sources, 1.23, 1.24 Message-ID: <200701311914.l0VJEpHg013248@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-power-manager/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13148 Modified Files: .cvsignore gnome-power-manager.spec sources Log Message: drop patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/FC-6/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 4 Sep 2006 02:05:04 -0000 1.23 +++ .cvsignore 31 Jan 2007 19:14:49 -0000 1.24 @@ -1 +1 @@ -gnome-power-manager-2.16.0.tar.bz2 +gnome-power-manager-2.16.3.tar.bz2 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/FC-6/gnome-power-manager.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- gnome-power-manager.spec 27 Nov 2006 18:38:57 -0000 1.67 +++ gnome-power-manager.spec 31 Jan 2007 19:14:49 -0000 1.68 @@ -4,8 +4,8 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.16.0 -Release: 4%{?dist} +Version: 2.16.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -13,7 +13,6 @@ Patch1: gnome-power-manager-2.15.92-mnemonics.patch # http://bugzilla.gnome.org/show_bug.cgi?id=356150 Patch2: gnome-power-manager-2.16.0-tray-icon.patch -Patch3: gnome-power-manager-2.16.0-remove-dpms-throttles.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome-power.sourceforge.net/ BuildPrereq: libgnomeui-devel @@ -49,7 +48,6 @@ %patch0 -p1 -b .nodefaultbeep %patch1 -p1 -b .mnemonics %patch2 -p1 -b .tray-icon -%patch3 -p1 -b .remove-dpms-throttles %build %configure \ @@ -113,6 +111,10 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 +- Drop upstreamed patch + * Mon Nov 27 2006 Ray Strode - 2.16.0-4.fc6 - fix screensaver from going blank even when configured to show a screensaver (bug 216045) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/FC-6/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 4 Sep 2006 02:05:04 -0000 1.23 +++ sources 31 Jan 2007 19:14:49 -0000 1.24 @@ -1 +1 @@ -64095254b03ca33c1ad1c543605d6075 gnome-power-manager-2.16.0.tar.bz2 +48166c6aaf41f2225090517ae655d05d gnome-power-manager-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 19:27:56 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:27:56 -0500 Subject: rpms/gnome-panel/FC-6 gnome-panel-2.16.3-no-seconds.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 gnome-panel.spec, 1.157, 1.158 sources, 1.47, 1.48 Message-ID: <200701311927.l0VJRuXG011174@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11081 Modified Files: .cvsignore gnome-panel.spec sources Added Files: gnome-panel-2.16.3-no-seconds.patch Log Message: 2.16.3 gnome-panel-2.16.3-no-seconds.patch: clock.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) --- NEW FILE gnome-panel-2.16.3-no-seconds.patch --- --- gnome-panel-2.16.3/applets/clock/clock.c.no-seconds 2007-01-31 14:35:04.000000000 -0500 +++ gnome-panel-2.16.3/applets/clock/clock.c 2007-01-31 14:35:53.000000000 -0500 @@ -50,6 +50,7 @@ #ifdef HAVE_LANGINFO_H #include #endif +#include #include #include @@ -245,6 +246,7 @@ { ClockData *cd = data; time_t new_time; + int timeouttime; time (&new_time); @@ -264,7 +266,20 @@ update_clock (cd); } - return TRUE; + if (cd->format == CLOCK_FORMAT_INTERNET) + timeouttime = INTERNETSECOND; + else { + struct timeval tv; + gettimeofday(&tv, NULL); + timeouttime = (1000000 - tv.tv_usec)/1000+1; + if (!cd->showseconds) + timeouttime += 1000 * (59 - cd->current_time % 60); + } + cd->timeout = g_timeout_add (timeouttime, + clock_timeout_callback, + cd); + + return FALSE; } static float @@ -491,8 +506,13 @@ if (cd->format == CLOCK_FORMAT_INTERNET) timeouttime = INTERNETSECOND; - else - timeouttime = 1000; + else { + struct timeval tv; + gettimeofday(&tv, NULL); + timeouttime = (1000000 - tv.tv_usec)/1000+1; + if (!cd->showseconds) + timeouttime += 1000 * (59 - cd->current_time % 60); + } cd->timeout = g_timeout_add (timeouttime, clock_timeout_callback, Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/FC-6/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 6 Nov 2006 17:13:51 -0000 1.47 +++ .cvsignore 31 Jan 2007 19:27:54 -0000 1.48 @@ -1 +1 @@ -gnome-panel-2.16.1.tar.bz2 +gnome-panel-2.16.3.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/FC-6/gnome-panel.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- gnome-panel.spec 16 Nov 2006 21:39:46 -0000 1.157 +++ gnome-panel.spec 31 Jan 2007 19:27:54 -0000 1.158 @@ -20,8 +20,8 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.16.1 -Release: 3%{?dist} +Version: 2.16.3 +Release: 1%{?dist} 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 @@ -85,10 +85,9 @@ Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch Patch12: gnome-panel-2.14.2-xio-error.patch Patch13: gnome-panel-2.15.90-move-suspend-to-menu.patch -Patch14: gnome-panel-2.15.92-no-seconds.patch +Patch14: gnome-panel-2.16.3-no-seconds.patch Patch15: gnome-panel-2.16.0-compiz-support.patch Patch16: gnome-panel-2.16.0-fix-chinese.patch -Patch17: gnome-panel-2.16.1-launcher-copy.patch Conflicts: gnome-power-manager < 2.15.3 @@ -123,7 +122,6 @@ %patch14 -p1 -b .no-seconds %patch15 -p0 -b .compiz-support %patch16 -p1 -b .fix-chinese -%patch17 -p1 -b .launcher-copy . %{SOURCE4} @@ -295,6 +293,9 @@ %{_datadir}/gtk-doc %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Thu Nov 16 2006 Matthias Clasen - 2.16.1-3 - Fix previous patch and also include the fix for gnome bug 359707 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/FC-6/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 6 Nov 2006 17:13:51 -0000 1.47 +++ sources 31 Jan 2007 19:27:54 -0000 1.48 @@ -1 +1 @@ -d0131e0b33a63b17b22b4d78b00291f8 gnome-panel-2.16.1.tar.bz2 +4af0a1ecb940f2bb27a27db50e3071c8 gnome-panel-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 19:30:18 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:30:18 -0500 Subject: rpms/control-center/FC-6 .cvsignore, 1.47, 1.48 control-center.spec, 1.198, 1.199 sources, 1.50, 1.51 Message-ID: <200701311930.l0VJUIqN013151@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv13078 Modified Files: .cvsignore control-center.spec sources Log Message: 2.16.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/control-center/FC-6/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 4 Sep 2006 19:14:21 -0000 1.47 +++ .cvsignore 31 Jan 2007 19:30:16 -0000 1.48 @@ -1 +1 @@ -control-center-2.16.0.tar.bz2 +control-center-2.16.3.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/FC-6/control-center.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- control-center.spec 27 Nov 2006 02:50:45 -0000 1.198 +++ control-center.spec 31 Jan 2007 19:30:16 -0000 1.199 @@ -20,7 +20,7 @@ Summary: GNOME Control Center Name: control-center -Version: 2.16.0 +Version: 2.16.3 Release: 11%{?dist} Epoch: 1 License: GPL/LGPL @@ -304,6 +304,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Sun Nov 26 2006 Ray Strode - 2.16.0-11 - Re-instate media keybindings (gnome bug 346759) Index: sources =================================================================== RCS file: /cvs/dist/rpms/control-center/FC-6/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 4 Sep 2006 19:14:22 -0000 1.50 +++ sources 31 Jan 2007 19:30:16 -0000 1.51 @@ -1 +1 @@ -20535dc3918d896c1a1087eff003ee27 control-center-2.16.0.tar.bz2 +75ec00d864a69684abc561546fb762bb control-center-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 19:31:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:31:37 -0500 Subject: rpms/vte/FC-6 vte.spec,1.95,1.96 Message-ID: <200701311931.l0VJVbGb014111@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/vte/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14021 Modified Files: vte.spec Log Message: drop patch Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/FC-6/vte.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- vte.spec 31 Jan 2007 18:27:57 -0000 1.95 +++ vte.spec 31 Jan 2007 19:31:35 -0000 1.96 @@ -14,8 +14,6 @@ # initscripts creates the utmp group Prereq: initscripts -Patch1: gnome-pty-helper-hostaddress-garbage.patch - %description VTE is a terminal emulator widget for use with GTK+ 2.0. @@ -32,8 +30,6 @@ %prep %setup -q -%patch1 -p0 -b .hostaddress-garbage - %build PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"` export PYTHON @@ -107,6 +103,7 @@ %changelog * Wed Jan 31 2007 Matthias Clasen 0.14.2-1 - Update to 0.14.2 +- Drop obsolete patch * Fri Dec 08 2006 Behdad Esfahbod 0.14.1-1 - Update to 0.14.1 From fedora-cvs-commits at redhat.com Wed Jan 31 19:38:01 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:38:01 -0500 Subject: rpms/libwnck/FC-6 libwnck.spec,1.62,1.63 Message-ID: <200701311938.l0VJc19k011245@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libwnck/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11225 Modified Files: libwnck.spec Log Message: drop obsolete patch Index: libwnck.spec =================================================================== RCS file: /cvs/dist/rpms/libwnck/FC-6/libwnck.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- libwnck.spec 31 Jan 2007 18:32:30 -0000 1.62 +++ libwnck.spec 31 Jan 2007 19:37:59 -0000 1.63 @@ -26,8 +26,6 @@ BuildRequires: perl-XML-Parser BuildRequires: gettext -# http://bugzilla.gnome.org/show_bug.cgi?id=355523 -Patch0: libwnck-2.16.0-icon-geometry.patch # make the pager visible when running compiz Patch1: libwnck-2.16.0-viewports.patch @@ -58,7 +56,6 @@ %prep %setup -q -%patch0 -p0 -b .icon-geometry %patch1 -p1 -b .viewports %build From fedora-cvs-commits at redhat.com Wed Jan 31 19:39:25 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:39:25 -0500 Subject: rpms/gnome-desktop/FC-6 gnome-desktop.spec,1.67,1.68 Message-ID: <200701311939.l0VJdP6Z011367@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11347 Modified Files: gnome-desktop.spec Log Message: fix file lists Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/FC-6/gnome-desktop.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- gnome-desktop.spec 31 Jan 2007 18:57:37 -0000 1.67 +++ gnome-desktop.spec 31 Jan 2007 19:39:23 -0000 1.68 @@ -114,7 +114,6 @@ %{_datadir}/applications/gnome-about.desktop %{_datadir}/gnome-about %{_datadir}/gnome/help/fdl -%{_datadir}/gnome/help/gnome-feedback %{_datadir}/gnome/help/gpl %{_datadir}/gnome/help/lgpl %{_datadir}/pixmaps/* From fedora-cvs-commits at redhat.com Wed Jan 31 19:39:36 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:39:36 -0500 Subject: rpms/lvm2/devel lvm2.spec,1.100,1.101 Message-ID: <200701311939.l0VJdagl011426@cvs.devel.redhat.com> Author: agk Update of /cvs/dist/rpms/lvm2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11353 Modified Files: lvm2.spec Log Message: Remove superfluous execute perm from .cache data file. Index: lvm2.spec =================================================================== RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- lvm2.spec 30 Jan 2007 18:20:18 -0000 1.100 +++ lvm2.spec 31 Jan 2007 19:39:34 -0000 1.101 @@ -48,7 +48,7 @@ install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/archive install -m 0700 -d $RPM_BUILD_ROOT/etc/lvm/backup install -m 0700 -d $RPM_BUILD_ROOT/var/lock/lvm -install -m 0700 /dev/null $RPM_BUILD_ROOT/etc/lvm/.cache +install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/.cache mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d install scripts/clvmd_init_rhel4 $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/usr/sbin/lvmconf @@ -112,6 +112,9 @@ %changelog +* Wed Jan 31 2007 Alasdair Kergon - 2.02.21-2 +- Remove superfluous execute perm from .cache data file. + * Tue Jan 30 2007 Alasdair Kergon - 2.02.21-1 - Fix vgsplit to handle mirrors. - Reorder fields in reporting field definitions. From fedora-cvs-commits at redhat.com Wed Jan 31 19:45:37 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:45:37 -0500 Subject: rpms/bug-buddy/FC-6 bug-buddy-2.16.0-sysinfo.patch, 1.1, 1.2 bug-buddy.spec, 1.65, 1.66 Message-ID: <200701311945.l0VJjbp2011807@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/bug-buddy/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11787 Modified Files: bug-buddy-2.16.0-sysinfo.patch bug-buddy.spec Log Message: - update extra-info patch to limit the number of lines of output (Patch by Alex, reported by fer, pulled from upstream) (bug 226001) bug-buddy-2.16.0-sysinfo.patch: bug-buddy.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 141 insertions(+), 1 deletion(-) Index: bug-buddy-2.16.0-sysinfo.patch =================================================================== RCS file: /cvs/dist/rpms/bug-buddy/FC-6/bug-buddy-2.16.0-sysinfo.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bug-buddy-2.16.0-sysinfo.patch 1 Nov 2006 10:29:13 -0000 1.1 +++ bug-buddy-2.16.0-sysinfo.patch 31 Jan 2007 19:45:35 -0000 1.2 @@ -1,10 +1,10 @@ Index: src/bug-buddy.c =================================================================== RCS file: /cvs/gnome/bug-buddy/src/bug-buddy.c,v -retrieving revision 1.139 -diff -u -p -r1.139 bug-buddy.c ---- src/bug-buddy.c 4 Sep 2006 21:02:13 -0000 1.139 -+++ src/bug-buddy.c 17 Oct 2006 13:40:35 -0000 +retrieving revision 1.140 +diff -u -p -r1.140 bug-buddy.c +--- src/bug-buddy.c 25 Oct 2006 23:36:31 -0000 1.140 ++++ src/bug-buddy.c 9 Nov 2006 10:56:21 -0000 @@ -31,6 +31,9 @@ #include #include @@ -32,7 +32,34 @@ static GOptionData gopt_data; static int bug_count = 0; -@@ -1054,6 +1058,104 @@ fill_include_file (char *filename, Glade +@@ -89,6 +93,8 @@ enum { + NETWORK_UNKNOWN + }; + ++static void fill_stderr_info (GladeXML *xml); ++ + + static void + buddy_error (GtkWidget *parent, const char *msg, ...) +@@ -784,6 +790,8 @@ known_app_finished (GladeXML *xml) + { + GtkWidget *email_entry; + char *default_email; ++ ++ fill_stderr_info (xml); + + gtk_widget_show (glade_xml_get_widget (xml, "final-box")); + gtk_widget_show (glade_xml_get_widget (xml, "send-button")); +@@ -894,6 +902,8 @@ unknown_app_finished (GladeXML *xml) + { + GtkWidget *button; + ++ fill_stderr_info (xml); ++ + /* don't need user input, so hide these widgets */ + gtk_widget_hide (glade_xml_get_widget (xml, "final-box")); + gtk_widget_hide (glade_xml_get_widget (xml, "progressbar")); +@@ -1054,6 +1064,134 @@ fill_include_file (char *filename, Glade } @@ -45,10 +72,8 @@ + GtkTextBuffer *buffer; + GString *system_info; + struct utsname uts_buf; -+ char *str, *file; ++ char *str; + gboolean has_selinux, enforcing, a11y; -+ gchar **lines; -+ int n_lines, i; + + g_return_if_fail (xml != NULL); + @@ -85,14 +110,40 @@ + g_object_unref (gconf_client); + g_string_append_printf (system_info, "Accessibility: %s\n", a11y?"Enabled":"Disabled"); + ++ g_string_append (system_info, "\n"); ++ ++ text_view = GTK_TEXT_VIEW (glade_xml_get_widget (xml, "gdb-text")); ++ buffer = gtk_text_view_get_buffer (text_view); ++ gtk_text_buffer_get_end_iter (buffer, &end); ++ gtk_text_buffer_insert (buffer, &end, system_info->str, system_info->len); ++ ++ g_string_free (system_info, TRUE); ++} ++ ++static void ++fill_stderr_info (GladeXML *xml) ++{ ++ GtkTextView *text_view; ++ GtkTextIter end; ++ GtkTextBuffer *buffer; ++ GString *stderr_info; ++ char *str, *file; ++ gchar **lines; ++ int n_lines, i; ++ ++ g_return_if_fail (xml != NULL); ++ ++ stderr_info = g_string_new (""); ++ + /* .xsession-errors: read file */ + file = g_build_filename (g_get_home_dir (), ".xsession-errors", NULL); + if (g_file_get_contents (file, &str, NULL, NULL)) { + lines = g_strsplit (str, "\n", -1); + g_free (str); + n_lines = 0; -+ while (lines[n_lines] != NULL) ++ while (lines[n_lines] != NULL) { + n_lines++; ++ } + + if (n_lines > 0) { + struct stat buf; @@ -107,37 +158,43 @@ + } + } + -+ g_string_append_printf (system_info, -+ "----------- .xsession-errors%s ---------------------\n", ++ g_string_append_printf (stderr_info, ++ "\n\n----------- .xsession-errors%s ---------------------\n", + mtime_age?mtime_age:""); + g_free (mtime_age); + } + + for (i = MAX (0, n_lines-16); i < n_lines; i++) { -+ if (lines[i][0] != 0) -+ g_string_append_printf (system_info, "%s\n", lines[i]); ++ if (lines[i][0] != 0) { ++ /* Limit line length to 200 chars to avoid excessive data */ ++ if (strlen (lines[i]) > 200) { ++ lines[i][200] = 0; ++ } ++ ++ g_string_append_printf (stderr_info, "%s\n", lines[i]); ++ } + } + if (n_lines > 0) -+ g_string_append (system_info, "--------------------------------------------------\n"); ++ g_string_append (stderr_info, "--------------------------------------------------\n"); + + g_strfreev (lines); + } + g_free (file); + -+ g_string_append (system_info, "\n"); -+ + text_view = GTK_TEXT_VIEW (glade_xml_get_widget (xml, "gdb-text")); + buffer = gtk_text_view_get_buffer (text_view); + gtk_text_buffer_get_end_iter (buffer, &end); -+ gtk_text_buffer_insert (buffer, &end, system_info->str, system_info->len); -+ -+ g_string_free (system_info, TRUE); ++ gtk_text_buffer_insert (buffer, &end, stderr_info->str, stderr_info->len); ++ ++ g_string_free (stderr_info, TRUE); +} + ++ ++ int main (int argc, char *argv[]) -@@ -1174,6 +1276,8 @@ main (int argc, char *argv[]) +@@ -1174,6 +1312,8 @@ main (int argc, char *argv[]) gtk_statusbar_push (GTK_STATUSBAR (statusbar), DEBUGGING, _("Collecting info from the crash...")); Index: bug-buddy.spec =================================================================== RCS file: /cvs/dist/rpms/bug-buddy/FC-6/bug-buddy.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- bug-buddy.spec 1 Nov 2006 10:29:13 -0000 1.65 +++ bug-buddy.spec 31 Jan 2007 19:45:35 -0000 1.66 @@ -6,7 +6,7 @@ Name: bug-buddy Version: 2.16.0 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: A bug reporting utility for GNOME License: GPL @@ -132,6 +132,11 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Wed Jan 31 2007 Ray Strode - 1:2.16.0-4 +- update extra-info patch to limit the number of lines of + output (Patch by Alex, reported by fer, pulled from upstream) + (bug 226001) + * Wed Nov 1 2006 Alexander Larsson - 1:2.16.0-3 - Add extra information to autogenerated bug reports From fedora-cvs-commits at redhat.com Wed Jan 31 19:45:47 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 14:45:47 -0500 Subject: rpms/gnome-session/FC-6 gnome-session-2.16.3-window-manager.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 gnome-session.spec, 1.91, 1.92 sources, 1.28, 1.29 Message-ID: <200701311945.l0VJjloZ011840@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11791 Modified Files: .cvsignore gnome-session.spec sources Added Files: gnome-session-2.16.3-window-manager.patch Log Message: fix a patch gnome-session-2.16.3-window-manager.patch: gnome-session.schemas.in | 13 ++++++++++++- gnome-wm | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) --- NEW FILE gnome-session-2.16.3-window-manager.patch --- --- gnome-session-2.16.3/gnome-session/gnome-session.schemas.in.window-manager 2007-01-29 17:11:38.000000000 -0500 +++ gnome-session-2.16.3/gnome-session/gnome-session.schemas.in 2007-01-31 14:51:41.000000000 -0500 @@ -2,11 +2,22 @@ + /schemas/apps/gnome-session/rh/window_manager + /apps/gnome-session/rh/window_manager + gnome + string + metacity + + Window Manager to start + The Window manager that gnome-session will start. Valid values are "metacity" and "compiz". + + + /schemas/apps/gnome-session/options/show_splash_screen /apps/gnome-session/options/show_splash_screen gnome bool - true + false Show the splash screen Show the splash screen when the session starts up --- gnome-session-2.16.3/gnome-session/gnome-wm.window-manager 2007-01-29 17:11:38.000000000 -0500 +++ gnome-session-2.16.3/gnome-session/gnome-wm 2007-01-31 14:53:51.000000000 -0500 @@ -3,7 +3,9 @@ # The user can specify his prefered WM by setting the WINDOW_MANAGER # environment variable. # -# If this is not set, we search a list of known windowmanagers and use +# If this is not set, we check the /apps/gnome-session/rh/window_manager key +# and go off that. finally, if all else fails we search a list of known +# windowmanagers and use # the first one that is found in the users's PATH # @@ -40,6 +42,10 @@ # WINDOW_MANAGER overrides all if [ -z "$WINDOW_MANAGER" ] ; then + WINDOW_MANAGER=$(gconftool-2 --get /apps/gnome-session/rh/window_manager) +fi + +if [ -z "$WINDOW_MANAGER" ] ; then # Create a list of window manager we can handle, trying to only use the # compositing ones when it makes sense Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/FC-6/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 5 Sep 2006 00:25:40 -0000 1.28 +++ .cvsignore 31 Jan 2007 19:45:45 -0000 1.29 @@ -1 +1 @@ -gnome-session-2.16.0.tar.bz2 +gnome-session-2.16.3.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/FC-6/gnome-session.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- gnome-session.spec 27 Nov 2006 05:25:38 -0000 1.91 +++ gnome-session.spec 31 Jan 2007 19:45:45 -0000 1.92 @@ -13,8 +13,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.16.0 -Release: 7%{?dist} +Version: 2.16.3 +Release: 1%{?dist} URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -57,7 +57,7 @@ Patch12: gnome-session-2.15.91-desensitize-invalid-buttons.patch # http://bugzilla.gnome.org/show_bug.cgi?id=350848 -Patch13: gnome-session-2.15.91-window-manager.patch +Patch13: gnome-session-2.16.3-window-manager.patch # http://bugzilla.gnome.org/show_bug.cgi?id=84315 Patch14: gnome-session-2.15.91-http-proxy.patch @@ -195,6 +195,9 @@ %{_datadir}/gnome/autostart %changelog +* Wed Jan 31 2007 Matthias Clasen - 2.16.3-1 +- Update to 2.16.3 + * Mon Nov 27 2006 Ray Strode - 2.16.1-7.fc6 - don't set http_proxy variable if proxy requires password (bug 217332) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/FC-6/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 5 Sep 2006 00:25:40 -0000 1.28 +++ sources 31 Jan 2007 19:45:45 -0000 1.29 @@ -1 +1 @@ -0a79eac14f4e13b1935e02eeec7745c1 gnome-session-2.16.0.tar.bz2 +d35a7f541adecc112b7c73f95353a183 gnome-session-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 20:33:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 15:33:13 -0500 Subject: rpms/epiphany/FC-6 epiphany-2.16.3-use-pango.patch, NONE, 1.1 epiphany.spec, 1.127, 1.128 Message-ID: <200701312033.l0VKXDtB004137@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4060 Modified Files: epiphany.spec Added Files: epiphany-2.16.3-use-pango.patch Log Message: update a patch epiphany-2.16.3-use-pango.patch: data/epiphany-pango.schemas | 41 +---------------------------------------- src/ephy-main.c | 13 +------------ 2 files changed, 2 insertions(+), 52 deletions(-) --- NEW FILE epiphany-2.16.3-use-pango.patch --- --- epiphany-2.16.3/src/ephy-main.c.use-pango 2006-12-31 12:02:30.000000000 -0500 +++ epiphany-2.16.3/src/ephy-main.c 2007-01-31 15:01:28.000000000 -0500 @@ -689,18 +689,7 @@ gtk_about_dialog_set_url_hook (handle_url, NULL, NULL); gtk_about_dialog_set_email_hook (handle_email, NULL, NULL); - /* Work around bug #328844, and avoid the gecko+pango performance problem */ - env = g_getenv ("MOZ_ENABLE_PANGO"); - enable_pango = env != NULL && - env[0] != '\0' && - g_ascii_strtoull (env, NULL, 10) != 0; - - if (eel_gconf_get_boolean (CONF_GECKO_ENABLE_PANGO)) - { - g_print ("NOTE: Enabling gecko pango renderer; this may cause performance degradation.\n" - "You can set " CONF_GECKO_ENABLE_PANGO " to \"false\" to disable it.\n"); - } - else if (!enable_pango) + if (!eel_gconf_get_boolean (CONF_GECKO_ENABLE_PANGO)) { g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE); } --- epiphany-2.16.3/data/epiphany-pango.schemas.use-pango 2006-12-30 12:00:31.000000000 -0500 +++ epiphany-2.16.3/data/epiphany-pango.schemas 2007-01-31 15:38:24.000000000 -0500 @@ -6,50 +6,11 @@ /apps/epiphany/web/enable_pango epiphany bool - false + true Whether to enable the gecko pango renderer Whether to enabled the gecko pango renderer. - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/FC-6/epiphany.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- epiphany.spec 31 Jan 2007 18:09:57 -0000 1.127 +++ epiphany.spec 31 Jan 2007 20:33:10 -0000 1.128 @@ -45,7 +45,7 @@ # Patches Patch0: epiphany-1.0.1-home-page.patch -Patch1: epiphany-2.15.92-use-pango.patch +Patch1: epiphany-2.16.3-use-pango.patch %description epiphany is a simple GNOME web browser based on the Mozilla rendering From fedora-cvs-commits at redhat.com Wed Jan 31 20:34:07 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 15:34:07 -0500 Subject: rpms/kdemultimedia/FC-6 .cvsignore, 1.36, 1.37 kdemultimedia.spec, 1.77, 1.78 sources, 1.38, 1.39 Message-ID: <200701312034.l0VKY7Ul004844@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdemultimedia/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv4734 Modified Files: .cvsignore kdemultimedia.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdemultimedia/FC-6/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 10 Aug 2006 13:43:16 -0000 1.36 +++ .cvsignore 31 Jan 2007 20:34:05 -0000 1.37 @@ -13,3 +13,4 @@ kdemultimedia-3.5.2-patched.tar.bz2 kdemultimedia-3.5.3-patched.tar.bz2 kdemultimedia-3.5.4-patched.tar.bz2 +kdemultimedia-3.5.6-patched.tar.bz2 Index: kdemultimedia.spec =================================================================== RCS file: /cvs/dist/rpms/kdemultimedia/FC-6/kdemultimedia.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- kdemultimedia.spec 26 Oct 2006 19:54:05 -0000 1.77 +++ kdemultimedia.spec 31 Jan 2007 20:34:05 -0000 1.78 @@ -11,7 +11,7 @@ %define appdir %{_datadir}/applications/kde -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Epoch: 6 Name: kdemultimedia @@ -211,6 +211,9 @@ %exclude %{_libdir}/libwinskinvis.so %changelog +* Wed Jan 31 2007 Than Ngo 6:3.5.6-0.1.fc6 +- 3.5.6 + * Thu Oct 26 2006 Than Ngo 6:3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdemultimedia/FC-6/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 26 Oct 2006 19:54:05 -0000 1.38 +++ sources 31 Jan 2007 20:34:05 -0000 1.39 @@ -1 +1 @@ -7439844e5105091e2b93b3821d999da5 kdemultimedia-3.5.5-patched.tar.bz2 +b2af43b14a5ec638af66ef9ce4810709 kdemultimedia-3.5.6-patched.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 20:50:54 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 15:50:54 -0500 Subject: rpms/gnome-screensaver/FC-6 gnome-screensaver-2.16.3-better-pam-integration.patch, NONE, 1.1 gnome-screensaver.spec, 1.118, 1.119 gnome-screensaver-2.16.1-better-pam-integration.patch, 1.1, NONE gnome-screensaver-2.16.1-localize-prompt.patch, 1.1, NONE Message-ID: <200701312050.l0VKoswd005482@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv5321 Modified Files: gnome-screensaver.spec Added Files: gnome-screensaver-2.16.3-better-pam-integration.patch Removed Files: gnome-screensaver-2.16.1-better-pam-integration.patch gnome-screensaver-2.16.1-localize-prompt.patch Log Message: - Update to 2.16.3 - fold localize prompt patch into pam integration patch gnome-screensaver-2.16.3-better-pam-integration.patch: data/lock-dialog-default.glade | 4 src/gnome-screensaver-dialog.c | 22 +- src/gs-auth-pam.c | 389 +++++++++++++++++++++++++++++++---------- src/gs-lock-plug.c | 97 ++++++++++ src/gs-lock-plug.h | 4 src/gs-manager.c | 9 src/gs-manager.h | 1 src/gs-window-x11.c | 16 + src/gs-window.h | 1 9 files changed, 449 insertions(+), 94 deletions(-) --- NEW FILE gnome-screensaver-2.16.3-better-pam-integration.patch --- --- gnome-screensaver-2.16.3/src/gs-auth-pam.c.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-auth-pam.c 2007-01-31 15:44:57.000000000 -0500 @@ -28,6 +28,7 @@ # include #endif +#include #include #include #include @@ -40,6 +41,7 @@ #include #include #include +#include #include "gs-auth.h" @@ -81,8 +83,20 @@ const char *username; GSAuthMessageFunc cb_func; gpointer cb_data; + int signal_fd; + int result; }; +typedef struct { + struct pam_closure *closure; + GSAuthMessageStyle style; + const char *msg; + char **resp; + gboolean should_interrupt_stack; +} GsAuthMessageHandlerData; +static GCond *message_handled_condition; +static GMutex *message_handler_mutex; + GQuark gs_auth_error_quark (void) { @@ -162,6 +176,75 @@ return ret; } +static gboolean +gs_auth_queued_message_handler (GsAuthMessageHandlerData *data) +{ + gboolean res; + + if (gs_auth_get_verbose ()) { + g_message ("Waiting for lock"); + } + + g_mutex_lock (message_handler_mutex); + + if (gs_auth_get_verbose ()) { + g_message ("Waiting for response"); + } + + res = data->closure->cb_func (data->style, + data->msg, + data->resp, + data->closure->cb_data); + + data->should_interrupt_stack = res == FALSE; + + g_cond_signal (message_handled_condition); + g_mutex_unlock (message_handler_mutex); + + if (gs_auth_get_verbose ()) { + g_message ("Got response"); + } + + return FALSE; +} + +static gboolean +gs_auth_run_message_handler (struct pam_closure *c, + GSAuthMessageStyle style, + const char *msg, + char **resp) +{ + GsAuthMessageHandlerData data; + + data.closure = c; + data.style = style; + data.msg = msg; + data.resp = resp; + data.should_interrupt_stack = TRUE; + + g_mutex_lock (message_handler_mutex); + + /* Queue the callback in the gui (the main) thread + */ + g_idle_add ((GSourceFunc) gs_auth_queued_message_handler, &data); + + if (gs_auth_get_verbose ()) { + g_message ("Waiting for respose to message style %d: '%s'", style, msg); + } + + /* Wait for the response + */ + g_cond_wait (message_handled_condition, + message_handler_mutex); + g_mutex_unlock (message_handler_mutex); + + if (gs_auth_get_verbose ()) { + g_message ("Got respose to message style %d: interrupt:%d", style, data.should_interrupt_stack); + } + + return data.should_interrupt_stack == FALSE; +} + static int pam_conversation (int nmsgs, const struct pam_message **msg, @@ -217,11 +300,20 @@ NULL); if (c->cb_func != NULL) { - res = c->cb_func (style, - utf8_msg, - &reply [replies].resp, - c->cb_data); + if (gs_auth_get_verbose ()) { + g_message ("Handling message style %d: '%s'", style, utf8_msg); + } + + /* blocks until the gui responds + */ + res = gs_auth_run_message_handler (c, style, + utf8_msg, + &reply [replies].resp); + if (gs_auth_get_verbose ()) { + g_message ("Msg handler returned %d", res); + } + /* If the handler returns FALSE - interrupt the PAM stack */ if (res) { reply [replies].resp_retcode = PAM_SUCCESS; @@ -255,6 +347,16 @@ } } + if (message_handled_condition != NULL) { + g_cond_free (message_handled_condition); + message_handled_condition = NULL; + } + + if (message_handler_mutex != NULL) { + g_mutex_free (message_handler_mutex); + message_handler_mutex = NULL; + } + return TRUE; } @@ -320,6 +422,8 @@ } ret = TRUE; + message_handled_condition = g_cond_new (); + message_handler_mutex = g_mutex_new (); out: if (status_code != NULL) { @@ -366,6 +470,189 @@ } +static int +gs_auth_thread_func (int auth_operation_fd) +{ + static const int flags = 0; + int status; + int status2; + struct timespec timeout; + sigset_t set; + const void *p; + + timeout.tv_sec = 0; + timeout.tv_nsec = 1; + + set = block_sigchld (); + + status = pam_authenticate (pam_handle, flags); + + sigtimedwait (&set, NULL, &timeout); + unblock_sigchld (); + + if (gs_auth_get_verbose ()) { + g_message (" pam_authenticate (...) ==> %d (%s)", + status, + PAM_STRERROR (pam_handle, status)); + } + + if (status != PAM_SUCCESS) { + goto done; + } + + if ((status = pam_get_item (pam_handle, PAM_USER, &p)) != PAM_SUCCESS) { + /* is not really an auth problem, but it will + pretty much look as such, it shouldn't really + happen */ + goto done; + } + + /* We don't actually care if the account modules fail or succeed, + * but we need to run them anyway because certain pam modules + * depend on side effects of the account modules getting run. + */ + status2 = pam_acct_mgmt (pam_handle, 0); + + if (gs_auth_get_verbose ()) { + g_message ("pam_acct_mgmt (...) ==> %d (%s)\n", + status2, + PAM_STRERROR (pam_handle, status2)); + } + + /* FIXME: should we handle these? */ + switch (status2) { + case PAM_SUCCESS: + break; + case PAM_NEW_AUTHTOK_REQD: + break; + case PAM_AUTHINFO_UNAVAIL: + break; + case PAM_ACCT_EXPIRED: + break; + case PAM_PERM_DENIED: + break; + default : + break; + } + + /* Each time we successfully authenticate, refresh credentials, + for Kerberos/AFS/DCE/etc. If this fails, just ignore that + failure and blunder along; it shouldn't matter. + + Note: this used to be PAM_REFRESH_CRED instead of + PAM_REINITIALIZE_CRED, but Jason Heiss + says that the Linux PAM library ignores that one, and only refreshes + credentials when using PAM_REINITIALIZE_CRED. + */ + status2 = pam_setcred (pam_handle, PAM_REINITIALIZE_CRED); + if (gs_auth_get_verbose ()) { + g_message (" pam_setcred (...) ==> %d (%s)", + status2, + PAM_STRERROR (pam_handle, status2)); + } + +done: + + /* we're done, close the fd and wake up the main + * loop + */ + close (auth_operation_fd); + + return status; +} + +static gboolean +gs_auth_loop_quit (GIOChannel *source, + GIOCondition condition, + gboolean *thread_done) +{ + *thread_done = TRUE; + gtk_main_quit (); + return FALSE; +} + +static gboolean +gs_auth_pam_verify_user (pam_handle_t *handle, + int *status) +{ + GThread *auth_thread; + GIOChannel *channel; + guint watch_id; + int auth_operation_fds[2]; + int auth_status; + gboolean thread_done; + + channel = NULL; + watch_id = 0; + auth_status = PAM_INCOMPLETE; + + /* This pipe gives us a set of fds we can hook into + * the event loop to be notified when our helper thread + * is ready to be reaped. + */ + if (pipe (auth_operation_fds) < 0) { + goto out; + } + + if (fcntl (auth_operation_fds[0], F_SETFD, FD_CLOEXEC) < 0) { + close (auth_operation_fds[0]); + close (auth_operation_fds[1]); + goto out; + } + + if (fcntl (auth_operation_fds[1], F_SETFD, FD_CLOEXEC) < 0) { + close (auth_operation_fds[0]); + close (auth_operation_fds[1]); + goto out; + } + + channel = g_io_channel_unix_new (auth_operation_fds[0]); + + /* we use a recursive main loop to process ui events + * while we wait on a thread to handle the blocking parts + * of pam authentication. + */ + thread_done = FALSE; + watch_id = g_io_add_watch (channel, G_IO_ERR | G_IO_HUP, + (GIOFunc) gs_auth_loop_quit, &thread_done); + + auth_thread = g_thread_create ((GThreadFunc) gs_auth_thread_func, + GINT_TO_POINTER (auth_operation_fds[1]), + TRUE, NULL); + + if (auth_thread == NULL) { + goto out; + } + + gtk_main (); + + /* if the event loop was quit before the thread is done then we can't + * reap the thread without blocking on it finishing. The + * thread may not ever finish though if the pam module is blocking. + * + * The only time the event loop is going to stop when the thread isn't + * done, however, is if the dialog quits early (from, e.g., "cancel"), + * so we can just exit. An alternative option would be to switch to + * using pthreads directly and calling pthread_cancel. + */ + if (!thread_done) + raise (SIGTERM); + + auth_status = GPOINTER_TO_INT (g_thread_join (auth_thread)); + +out: + if (watch_id != 0) + g_source_remove (watch_id); + + if (channel != NULL) + g_io_channel_unref (channel); + + if (status) + *status = auth_status; + + return auth_status == PAM_SUCCESS; +} + gboolean gs_auth_verify_user (const char *username, const char *display, @@ -374,20 +661,16 @@ GError **error) { int status = -1; - int status2; struct pam_conv conv; struct pam_closure c; - sigset_t set; - struct timespec timeout; struct passwd *pwent; - int null_tok = 0; - const void *p; pwent = getpwnam (username); if (pwent == NULL) { return FALSE; } + c.username = username; c.cb_func = func; c.cb_data = data; @@ -398,92 +681,26 @@ /* Initialize PAM. */ create_pam_handle (username, display, &conv, &status); if (status != PAM_SUCCESS) { - goto DONE; + goto done; } pam_set_item (pam_handle, PAM_USER_PROMPT, _("Username:")); PAM_NO_DELAY(pam_handle); - timeout.tv_sec = 0; - timeout.tv_nsec = 1; - set = block_sigchld (); - did_we_ask_for_password = FALSE; - status = pam_authenticate (pam_handle, null_tok); - - sigtimedwait (&set, NULL, &timeout); - unblock_sigchld (); - - if (gs_auth_get_verbose ()) { - g_message (" pam_authenticate (...) ==> %d (%s)", - status, - PAM_STRERROR (pam_handle, status)); - } - - if (status != PAM_SUCCESS) { - goto DONE; - } - - if ((status = pam_get_item (pam_handle, PAM_USER, &p)) != PAM_SUCCESS) { - /* is not really an auth problem, but it will - pretty much look as such, it shouldn't really - happen */ - goto DONE; - } - - /* We don't actually care if the account modules fail or succeed, - * but we need to run them anyway because certain pam modules - * depend on side effects of the account modules getting run. - */ - status2 = pam_acct_mgmt (pam_handle, null_tok); - - if (gs_auth_get_verbose ()) { - g_message ("pam_acct_mgmt (...) ==> %d (%s)\n", - status2, - PAM_STRERROR (pam_handle, status2)); - } - - /* FIXME: should we handle these? */ - switch (status2) { - case PAM_SUCCESS: - break; - case PAM_NEW_AUTHTOK_REQD: - break; - case PAM_AUTHINFO_UNAVAIL: - break; - case PAM_ACCT_EXPIRED: - break; - case PAM_PERM_DENIED: - break; - default : - break; - } - - /* Each time we successfully authenticate, refresh credentials, - for Kerberos/AFS/DCE/etc. If this fails, just ignore that - failure and blunder along; it shouldn't matter. - - Note: this used to be PAM_REFRESH_CRED instead of - PAM_REINITIALIZE_CRED, but Jason Heiss - says that the Linux PAM library ignores that one, and only refreshes - credentials when using PAM_REINITIALIZE_CRED. - */ - status2 = pam_setcred (pam_handle, PAM_REINITIALIZE_CRED); - if (gs_auth_get_verbose ()) { - g_message (" pam_setcred (...) ==> %d (%s)", - status2, - PAM_STRERROR (pam_handle, status2)); - } - - DONE: - if (status != PAM_SUCCESS) { - set_pam_error (error, status); - } + if (! gs_auth_pam_verify_user (pam_handle, &status)) { + goto done; + } + +done: + if (status != PAM_SUCCESS) { + set_pam_error (error, status); + } - close_pam_handle (status); + close_pam_handle (status); - return (status == PAM_SUCCESS ? TRUE : FALSE); + return (status == PAM_SUCCESS ? TRUE : FALSE); } gboolean --- gnome-screensaver-2.16.3/src/gs-window.h.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-window.h 2007-01-31 15:39:01.000000000 -0500 @@ -81,6 +81,7 @@ const char *command); void gs_window_request_unlock (GSWindow *window); +void gs_window_cancel_unlock_request (GSWindow *window); GSWindow * gs_window_new (GdkScreen *screen, int monitor, --- gnome-screensaver-2.16.3/src/gs-manager.c.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-manager.c 2007-01-31 15:39:01.000000000 -0500 @@ -1566,3 +1566,12 @@ return TRUE; } + +void +gs_manager_cancel_unlock_request (GSManager *manager) +{ + GSList *l; + for (l = manager->priv->windows; l; l = l->next) { + gs_window_cancel_unlock_request (l->data); + } +} --- gnome-screensaver-2.16.3/src/gs-lock-plug.c.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-lock-plug.c 2007-01-31 15:47:59.000000000 -0500 @@ -100,6 +100,8 @@ guint cancel_timeout_id; guint auth_check_idle_id; guint response_idle_id; + + GList *key_events; }; typedef struct _ResponseData ResponseData; @@ -231,6 +233,11 @@ const char *text) { if (plug->priv->auth_message_label != NULL) { + if (strcmp (text, "") == 0) + gtk_widget_hide (plug->priv->auth_message_label); + else + gtk_widget_show (plug->priv->auth_message_label); + gtk_label_set_text (GTK_LABEL (plug->priv->auth_message_label), text); } } @@ -565,6 +572,32 @@ } } +static void +queue_key_event (GSLockPlug *plug, + GdkEventKey *event) +{ + GdkEvent *saved_event; + + saved_event = gdk_event_copy ((GdkEvent *)event); + plug->priv->key_events = g_list_prepend (plug->priv->key_events, + saved_event); +} + +static void +forward_key_events (GSLockPlug *plug) +{ + plug->priv->key_events = g_list_reverse (plug->priv->key_events); + while (plug->priv->key_events) { + GdkEventKey *event = plug->priv->key_events->data; + + gtk_window_propagate_key_event (GTK_WINDOW (plug), event); + + gdk_event_free ((GdkEvent *)event); + + plug->priv->key_events = g_list_delete_link (plug->priv->key_events, + plug->priv->key_events); + } +} static void gs_lock_plug_size_request (GtkWidget *widget, @@ -845,6 +878,32 @@ } void +gs_lock_plug_set_busy (GSLockPlug *plug) +{ + GdkCursor *cursor; + GtkWidget *top_level; + + top_level = gtk_widget_get_toplevel (GTK_WIDGET (plug)); + + cursor = gdk_cursor_new (GDK_WATCH); + gdk_window_set_cursor (top_level->window, cursor); + gdk_cursor_unref (cursor); +} + +void +gs_lock_plug_set_ready (GSLockPlug *plug) +{ + GdkCursor *cursor; + GtkWidget *top_level; + + top_level = gtk_widget_get_toplevel (GTK_WIDGET (plug)); + + cursor = gdk_cursor_new (GDK_LEFT_PTR); + gdk_window_set_cursor (top_level->window, cursor); + gdk_cursor_unref (cursor); +} + +void gs_lock_plug_show_prompt (GSLockPlug *plug, const char *message, gboolean visible) @@ -853,17 +912,41 @@ gs_debug ("Setting prompt to: %s", message); + gtk_widget_set_sensitive (plug->priv->auth_unlock_button, TRUE); + gtk_widget_show (plug->priv->auth_unlock_button); + gtk_widget_grab_default (plug->priv->auth_unlock_button); + gtk_label_set_text (GTK_LABEL (plug->priv->auth_prompt_label), message); + gtk_widget_show (plug->priv->auth_prompt_label); gtk_entry_set_visibility (GTK_ENTRY (plug->priv->auth_prompt_entry), visible); + gtk_widget_show (plug->priv->auth_prompt_entry); if (! GTK_WIDGET_HAS_FOCUS (plug->priv->auth_prompt_entry)) { gtk_widget_grab_focus (plug->priv->auth_prompt_entry); } + + /* were there any key events sent to the plug while the entry wasnt + * ready? If so, forward them along + */ + forward_key_events (plug); restart_cancel_timeout (plug); } void +gs_lock_plug_hide_prompt (GSLockPlug *plug) +{ + g_return_if_fail (GS_IS_LOCK_PLUG (plug)); + + gtk_widget_hide (plug->priv->auth_prompt_entry); + gtk_widget_hide (plug->priv->auth_prompt_label); + gtk_widget_set_sensitive (plug->priv->auth_unlock_button, FALSE); + gtk_widget_hide (plug->priv->auth_unlock_button); + + gtk_widget_grab_default (plug->priv->auth_cancel_button); +} + +void gs_lock_plug_show_message (GSLockPlug *plug, const char *message) { @@ -899,7 +982,19 @@ capslock_update (plug, capslock_on); } - return FALSE; + /* if the input widget is visible and ready for input + * then just carry on as usual + */ + if (GTK_WIDGET_VISIBLE (plug->priv->auth_prompt_entry) && + GTK_WIDGET_IS_SENSITIVE (plug->priv->auth_prompt_entry)) + return FALSE; + + if (strcmp (event->string, "") == 0) + return FALSE; + + queue_key_event (plug, event); + + return TRUE; } /* adapted from gtk_dialog_add_button */ --- gnome-screensaver-2.16.3/src/gs-window-x11.c.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-window-x11.c 2007-01-31 15:39:01.000000000 -0500 @@ -1468,6 +1468,22 @@ g_signal_emit (window, signals [DIALOG_UP], 0); } +void +gs_window_cancel_unlock_request (GSWindow *window) +{ + /* FIXME: This is a bit of a hammer approach... + * Maybe we should send a delete-event to + * the plug? + */ + g_return_if_fail (GS_IS_WINDOW (window)); + + if (window->priv->lock_socket == NULL) + return; + + if (window->priv->lock_pid > 0) + kill (window->priv->lock_pid, SIGTERM); +} + void gs_window_set_lock_enabled (GSWindow *window, gboolean lock_enabled) --- gnome-screensaver-2.16.3/src/gnome-screensaver-dialog.c.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gnome-screensaver-dialog.c 2007-01-31 15:39:01.000000000 -0500 @@ -147,6 +147,7 @@ if (response == GS_LOCK_PLUG_RESPONSE_OK) { gs_lock_plug_get_text (plug, &text); } + gs_lock_plug_hide_prompt (plug); return text; } @@ -214,6 +215,9 @@ gs_profile_start (NULL); gs_debug ("Got message style %d: '%s'", style, msg); + gtk_widget_show (GTK_WIDGET (plug)); + gs_lock_plug_set_ready (plug); + ret = TRUE; *response = NULL; message = maybe_translate_message (msg); @@ -256,6 +260,7 @@ gtk_main_iteration (); } + gs_lock_plug_set_busy (plug); gs_profile_end (NULL); return ret; @@ -278,6 +283,8 @@ error = NULL; + gs_lock_plug_hide_prompt (plug); + gs_lock_plug_set_busy (plug); res = gs_auth_verify_user (g_get_user_name (), g_getenv ("DISPLAY"), auth_message_handler, plug, &error); gs_debug ("Verify user returned: %s", res ? "TRUE" : "FALSE"); @@ -306,7 +313,8 @@ response_cb (GSLockPlug *plug, gint response_id) { - if (response_id == GS_LOCK_PLUG_RESPONSE_CANCEL) { + if ((response_id == GS_LOCK_PLUG_RESPONSE_CANCEL) || + (response_id == GTK_RESPONSE_DELETE_EVENT)) { quit_response_cancel (); } } @@ -325,6 +333,13 @@ return !res; } +static void +show_cb (GtkWidget *widget, + gpointer data) +{ + print_id (widget); +} + static gboolean popup_dialog_idle (void) { @@ -347,10 +362,9 @@ } g_signal_connect (GS_LOCK_PLUG (widget), "response", G_CALLBACK (response_cb), NULL); + g_signal_connect (widget, "show", G_CALLBACK (show_cb), NULL); - gtk_widget_show (widget); - - print_id (widget); + gtk_widget_realize (widget); g_idle_add ((GSourceFunc)auth_check_idle, widget); --- gnome-screensaver-2.16.3/src/gs-lock-plug.h.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-lock-plug.h 2007-01-31 15:39:01.000000000 -0500 @@ -68,6 +68,10 @@ void gs_lock_plug_show_prompt (GSLockPlug *plug, const char *message, gboolean visible); +void gs_lock_plug_hide_prompt (GSLockPlug *plug); +void gs_lock_plug_set_busy (GSLockPlug *plug); +void gs_lock_plug_set_ready (GSLockPlug *plug); + void gs_lock_plug_get_text (GSLockPlug *plug, char **text); void gs_lock_plug_show_message (GSLockPlug *plug, --- gnome-screensaver-2.16.3/src/gs-manager.h.better-pam-integration 2007-01-05 11:40:02.000000000 -0500 +++ gnome-screensaver-2.16.3/src/gs-manager.h 2007-01-31 15:39:01.000000000 -0500 @@ -94,6 +94,7 @@ void gs_manager_set_mode (GSManager *manager, GSSaverMode mode); gboolean gs_manager_request_unlock (GSManager *manager); +void gs_manager_cancel_unlock_request (GSManager *manager); G_END_DECLS --- gnome-screensaver-2.16.3/data/lock-dialog-default.glade.better-pam-integration 2007-01-05 11:40:22.000000000 -0500 +++ gnome-screensaver-2.16.3/data/lock-dialog-default.glade 2007-01-31 15:39:01.000000000 -0500 @@ -145,8 +145,7 @@ - True - Password: + False False GTK_JUSTIFY_LEFT @@ -173,7 +172,6 @@ - True True True False Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/FC-6/gnome-screensaver.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- gnome-screensaver.spec 19 Jan 2007 16:22:01 -0000 1.118 +++ gnome-screensaver.spec 31 Jan 2007 20:50:52 -0000 1.119 @@ -12,17 +12,16 @@ Summary: GNOME Screensaver Name: gnome-screensaver -Version: 2.16.1 -Release: 4%{?dist} +Version: 2.16.3 +Release: 1%{?dist} License: GPL Group: Amusements/Graphics Source0: %{name}-%{version}.tar.bz2 Source1: gnome-screensaver-hide-xscreensaver.menu Patch1: gnome-screensaver-2.15.4-default-theme.patch -Patch2: gnome-screensaver-2.16.1-better-pam-integration.patch +Patch2: gnome-screensaver-2.16.3-better-pam-integration.patch Patch3: gnome-screensaver-2.16.0-securitytoken.patch -Patch4: gnome-screensaver-2.16.1-localize-prompt.patch BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gnome.org @@ -66,7 +65,6 @@ %patch1 -p1 -b .use-floaters-by-default %patch2 -p1 -b .better-pam-integration %patch3 -p1 -b .securitytoken -%patch4 -p1 -b .localize-prompt %build autoreconf @@ -124,6 +122,10 @@ %{_sysconfdir}/pam.d/* %changelog +* Wed Jan 31 2007 Ray Strode - 2.16.3-1.fc6 +- Update to 2.16.3 +- fold localize prompt patch into pam integration patch + * Fri Jan 19 2007 Ray Strode - 2.16.1-4.fc6 - correctly queue keystrokes so they aren't lost when bringing up lock dialog (bug 206677) --- gnome-screensaver-2.16.1-better-pam-integration.patch DELETED --- --- gnome-screensaver-2.16.1-localize-prompt.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 20:53:10 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 15:53:10 -0500 Subject: rpms/gnome-screensaver/FC-6 .cvsignore,1.30,1.31 sources,1.33,1.34 Message-ID: <200701312053.l0VKrAN2007362@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv7222 Modified Files: .cvsignore sources Log Message: update source tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/FC-6/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 16 Oct 2006 16:27:10 -0000 1.30 +++ .cvsignore 31 Jan 2007 20:53:08 -0000 1.31 @@ -1 +1 @@ -gnome-screensaver-2.16.1.tar.bz2 +gnome-screensaver-2.16.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/FC-6/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 16 Oct 2006 16:27:10 -0000 1.33 +++ sources 31 Jan 2007 20:53:08 -0000 1.34 @@ -1 +1 @@ -af29aeb60a9908f6562664962129ff88 gnome-screensaver-2.16.1.tar.bz2 +cbd3e3b96b24038c7838b89acae318dd gnome-screensaver-2.16.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 21:30:44 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 16:30:44 -0500 Subject: rpms/virt-manager/devel virt-manager.spec,1.15,1.16 Message-ID: <200701312130.l0VLUicN024412@cvs.devel.redhat.com> Author: berrange Update of /cvs/dist/rpms/virt-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24377 Modified Files: virt-manager.spec Log Message: Added missing post/postun deps (bz 224584, 224591) Index: virt-manager.spec =================================================================== RCS file: /cvs/dist/rpms/virt-manager/devel/virt-manager.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- virt-manager.spec 23 Jan 2007 01:06:59 -0000 1.15 +++ virt-manager.spec 31 Jan 2007 21:30:42 -0000 1.16 @@ -8,7 +8,7 @@ Name: virt-manager Version: 0.3.0 -Release: 1%{_extra_release} +Release: 2%{_extra_release} Summary: Virtual Machine Manager Group: Applications/Emulators @@ -56,6 +56,8 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils %description Virtual Machine Manager provides a graphical tool for administering @@ -146,7 +148,10 @@ %{_datadir}/dbus-1/services/%{name}.service %changelog -* Mon Jan 22 2007 Daniel P. Berrange - 0.3.0-2.fc7 +- Added dep on desktop-file-utils for post/postun scripts + +* Mon Jan 22 2007 Daniel P. Berrange - 0.3.0-1.fc7 - Added support for managing inactive domains - Require virt-inst >= 0.100.0 and libvirt >= 0.1.11 for ianctive domain management capabilities From fedora-cvs-commits at redhat.com Wed Jan 31 21:31:31 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 16:31:31 -0500 Subject: rpms/kdegames/FC-6 .cvsignore, 1.35, 1.36 kdegames.spec, 1.56, 1.57 sources, 1.38, 1.39 Message-ID: <200701312131.l0VLVVTX025035@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegames/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24959 Modified Files: .cvsignore kdegames.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdegames/FC-6/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 10 Aug 2006 13:12:41 -0000 1.35 +++ .cvsignore 31 Jan 2007 21:31:29 -0000 1.36 @@ -13,3 +13,4 @@ kdegames-3.5.1-patched.tar.bz2 kdegames-3.5.3-patched.tar.bz2 kdegames-3.5.4-patched.tar.bz2 +kdegames-3.5.6-patched.tar.bz2 Index: kdegames.spec =================================================================== RCS file: /cvs/dist/rpms/kdegames/FC-6/kdegames.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kdegames.spec 26 Oct 2006 20:02:56 -0000 1.56 +++ kdegames.spec 31 Jan 2007 21:31:29 -0000 1.57 @@ -16,7 +16,7 @@ %define kdelibs_epoch 6 %define kdebase_epoch 6 -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Epoch: 6 Summary: K Desktop Environment - Games @@ -154,6 +154,9 @@ %exclude %{_libdir}/libkdeinit_*.so %changelog +* Wed Jan 31 2007 Than Ngo 6:3.5.6-0.1.fc6 +- 3.5.6 + * Thu Oct 26 2006 Than Ngo 6:3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdegames/FC-6/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 26 Oct 2006 20:02:56 -0000 1.38 +++ sources 31 Jan 2007 21:31:29 -0000 1.39 @@ -1 +1 @@ -935e8d9be8dc0c7edb645df0cea78dd0 kdegames-3.5.5-patched.tar.bz2 +b9202b9d3fd07484cab1cb87cbab15d0 kdegames-3.5.6-patched.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 22:00:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:00:13 -0500 Subject: rpms/kdeaddons/FC-6 .cvsignore, 1.31, 1.32 kdeaddons.spec, 1.56, 1.57 sources, 1.34, 1.35 Message-ID: <200701312200.l0VM0Dhx011361@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeaddons/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11347 Modified Files: .cvsignore kdeaddons.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdeaddons/FC-6/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 10 Aug 2006 10:04:50 -0000 1.31 +++ .cvsignore 31 Jan 2007 22:00:06 -0000 1.32 @@ -11,3 +11,4 @@ kdeaddons-3.5.1.tar.bz2 kdeaddons-3.5.3.tar.bz2 kdeaddons-3.5.4.tar.bz2 +kdeaddons-3.5.6.tar.bz2 Index: kdeaddons.spec =================================================================== RCS file: /cvs/dist/rpms/kdeaddons/FC-6/kdeaddons.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- kdeaddons.spec 26 Oct 2006 23:33:33 -0000 1.56 +++ kdeaddons.spec 31 Jan 2007 22:00:06 -0000 1.57 @@ -4,7 +4,7 @@ %define make_cvs 0 %define qt_version 3.3.7 -%define arts_version 1.5.5 +%define arts_version 1.5.6 %define sdl_version 1.2.0 %define kdelibs_epoch 6 @@ -12,7 +12,7 @@ %define arts_epoch 8 %define arts 1 -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Name: kdeaddons Summary: K Desktop Environment - Plugins @@ -186,6 +186,9 @@ %endif %changelog +* Wed Jan 31 2007 Than Ngo 3.5.6-0.1.fc6 +- 3.5.6 + * Fri Oct 27 2006 Than Ngo 3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeaddons/FC-6/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 26 Oct 2006 23:33:33 -0000 1.34 +++ sources 31 Jan 2007 22:00:06 -0000 1.35 @@ -1 +1 @@ -71c0a690abf8ad0f43135fa887d0b40c kdeaddons-3.5.5.tar.bz2 +96d6d2a76da2a5232b3b46318456a5bc kdeaddons-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 22:14:48 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:14:48 -0500 Subject: rpms/kdeartwork/FC-6 .cvsignore, 1.32, 1.33 kdeartwork.spec, 1.53, 1.54 sources, 1.34, 1.35 Message-ID: <200701312214.l0VMEmcr011762@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeartwork/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv11746 Modified Files: .cvsignore kdeartwork.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdeartwork/FC-6/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 10 Aug 2006 12:04:17 -0000 1.32 +++ .cvsignore 31 Jan 2007 22:14:46 -0000 1.33 @@ -12,3 +12,4 @@ kdeartwork-3.5.2.tar.bz2 kdeartwork-3.5.3.tar.bz2 kdeartwork-3.5.4.tar.bz2 +kdeartwork-3.5.6.tar.bz2 Index: kdeartwork.spec =================================================================== RCS file: /cvs/dist/rpms/kdeartwork/FC-6/kdeartwork.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- kdeartwork.spec 26 Oct 2006 22:27:24 -0000 1.53 +++ kdeartwork.spec 31 Jan 2007 22:14:46 -0000 1.54 @@ -4,14 +4,14 @@ %define make_cvs 1 %define qt_version 3.3.7 -%define arts_version 1.5.5 +%define arts_version 1.5.6 %define kdelibs_epoch 6 %define kdebase_epoch 6 %define qt_epoch 1 %define arts 1 Name: kdeartwork -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Summary: Additional artwork (themes, sound themes, ...) for KDE URL: http://www.kde.org/ @@ -124,6 +124,9 @@ %{_datadir}/icons/* %changelog +* Wed Jan 31 2007 Than Ngo 3.5.6-0.1.fc6 +- 3.5.6 + * Fri Oct 27 2006 Than Ngo 3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeartwork/FC-6/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 26 Oct 2006 22:27:24 -0000 1.34 +++ sources 31 Jan 2007 22:14:46 -0000 1.35 @@ -1 +1 @@ -8d35156b506cf870eb9641f72a304c8c kdeartwork-3.5.5.tar.bz2 +4c817eab517fba30fce8f3b40a6f019d kdeartwork-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 22:18:12 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:18:12 -0500 Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.41, 1.42 policy-20070102.patch, 1.13, 1.14 selinux-policy.spec, 1.387, 1.388 Message-ID: <200701312218.l0VMICIV032316@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32298 Modified Files: modules-targeted.conf policy-20070102.patch selinux-policy.spec Log Message: * Fri Jan 25 2007 Dan Walsh 2.5.2-3 - Remove some targeted diffs in file context file Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- modules-targeted.conf 12 Dec 2006 21:46:24 -0000 1.41 +++ modules-targeted.conf 31 Jan 2007 22:18:10 -0000 1.42 @@ -238,7 +238,7 @@ # # Execute a command with a substitute user # -sudo = off +sudo = base # Layer: admin # Module: vbetool policy-20070102.patch: Rules.modular | 10 config/appconfig-strict-mcs/seusers | 1 config/appconfig-strict-mls/seusers | 1 config/appconfig-strict/seusers | 1 man/man8/httpd_selinux.8 | 88 ++-- man/man8/kerberos_selinux.8 | 24 - man/man8/named_selinux.8 | 21 - man/man8/rsync_selinux.8 | 19 - policy/flask/access_vectors | 4 policy/global_booleans | 2 policy/global_tunables | 128 ++++-- policy/mls | 31 + policy/modules/admin/acct.te | 1 policy/modules/admin/bootloader.fc | 5 policy/modules/admin/bootloader.te | 5 policy/modules/admin/consoletype.te | 13 policy/modules/admin/dmesg.te | 1 policy/modules/admin/logwatch.te | 5 policy/modules/admin/netutils.te | 1 policy/modules/admin/prelink.te | 7 policy/modules/admin/quota.fc | 7 policy/modules/admin/quota.te | 20 - policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 24 + policy/modules/admin/rpm.te | 18 policy/modules/admin/su.if | 28 + policy/modules/admin/su.te | 2 policy/modules/admin/sudo.if | 11 policy/modules/admin/usermanage.te | 23 + policy/modules/admin/vpn.te | 1 policy/modules/apps/ethereal.if | 4 policy/modules/apps/evolution.if | 135 ++++++- policy/modules/apps/games.if | 4 policy/modules/apps/gnome.fc | 2 policy/modules/apps/gnome.if | 98 +++++ policy/modules/apps/gnome.te | 5 policy/modules/apps/gpg.fc | 2 policy/modules/apps/gpg.if | 1 policy/modules/apps/java.if | 33 + policy/modules/apps/java.te | 2 policy/modules/apps/loadkeys.if | 44 -- policy/modules/apps/loadkeys.te | 13 policy/modules/apps/mozilla.if | 254 +++++++++++-- policy/modules/apps/mplayer.if | 83 ++++ policy/modules/apps/mplayer.te | 1 policy/modules/apps/slocate.if | 20 + policy/modules/apps/slocate.te | 3 policy/modules/apps/thunderbird.if | 112 ++++- policy/modules/apps/tvtime.if | 3 policy/modules/apps/uml.if | 5 policy/modules/apps/userhelper.if | 19 - policy/modules/apps/vmware.if | 4 policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.fc | 10 policy/modules/kernel/corecommands.if | 72 +++ policy/modules/kernel/corenetwork.if.in | 81 ++++ policy/modules/kernel/corenetwork.te.in | 16 policy/modules/kernel/corenetwork.te.m4 | 4 policy/modules/kernel/devices.fc | 2 policy/modules/kernel/devices.if | 18 policy/modules/kernel/devices.te | 1 policy/modules/kernel/domain.if | 56 ++ policy/modules/kernel/domain.te | 22 + policy/modules/kernel/files.if | 198 ++++++++++ policy/modules/kernel/filesystem.if | 22 + policy/modules/kernel/filesystem.te | 3 policy/modules/kernel/kernel.if | 64 +++ policy/modules/kernel/kernel.te | 6 policy/modules/kernel/mls.if | 20 + policy/modules/kernel/mls.te | 3 policy/modules/kernel/storage.fc | 1 policy/modules/kernel/storage.if | 2 policy/modules/kernel/terminal.if | 20 + policy/modules/kernel/terminal.te | 5 policy/modules/services/apache.fc | 15 policy/modules/services/apache.if | 141 +++++++ policy/modules/services/apache.te | 10 policy/modules/services/apm.te | 3 policy/modules/services/automount.fc | 1 policy/modules/services/automount.te | 9 policy/modules/services/ccs.fc | 1 policy/modules/services/ccs.te | 19 - policy/modules/services/clamav.te | 2 policy/modules/services/cron.fc | 6 policy/modules/services/cron.if | 86 ++-- policy/modules/services/cron.te | 39 +- policy/modules/services/cups.te | 5 policy/modules/services/cvs.te | 1 policy/modules/services/dbus.if | 64 +++ policy/modules/services/dhcp.te | 2 policy/modules/services/ftp.if | 4 policy/modules/services/ftp.te | 13 policy/modules/services/hal.if | 38 ++ policy/modules/services/hal.te | 2 policy/modules/services/inetd.te | 31 + policy/modules/services/irqbalance.te | 4 policy/modules/services/kerberos.if | 2 policy/modules/services/ktalk.fc | 3 policy/modules/services/ktalk.te | 5 policy/modules/services/lpd.if | 52 +- policy/modules/services/mta.if | 9 policy/modules/services/mta.te | 2 policy/modules/services/networkmanager.te | 2 policy/modules/services/nis.fc | 2 policy/modules/services/nis.if | 5 policy/modules/services/nis.te | 10 policy/modules/services/nscd.if | 20 + policy/modules/services/nscd.te | 15 policy/modules/services/openvpn.te | 4 policy/modules/services/pcscd.fc | 9 policy/modules/services/pcscd.if | 58 +++ policy/modules/services/pcscd.te | 78 ++++ policy/modules/services/pegasus.if | 27 + policy/modules/services/pegasus.te | 5 policy/modules/services/postfix.fc | 1 policy/modules/services/postfix.te | 2 policy/modules/services/procmail.te | 4 policy/modules/services/pyzor.if | 4 policy/modules/services/pyzor.te | 4 policy/modules/services/radvd.te | 2 policy/modules/services/razor.if | 9 policy/modules/services/razor.te | 2 policy/modules/services/rhgb.if | 76 ++++ policy/modules/services/rhgb.te | 3 policy/modules/services/ricci.te | 24 + policy/modules/services/rlogin.te | 10 policy/modules/services/rpc.fc | 1 policy/modules/services/rpc.te | 24 + policy/modules/services/rsync.te | 1 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 4 policy/modules/services/setroubleshoot.if | 20 + policy/modules/services/setroubleshoot.te | 2 policy/modules/services/smartmon.te | 1 policy/modules/services/snmp.if | 17 policy/modules/services/snmp.te | 1 policy/modules/services/spamassassin.if | 6 policy/modules/services/spamassassin.te | 8 policy/modules/services/squid.fc | 1 policy/modules/services/squid.if | 2 policy/modules/services/squid.te | 9 policy/modules/services/ssh.fc | 2 policy/modules/services/ssh.if | 79 +++- policy/modules/services/ssh.te | 161 ++++---- policy/modules/services/uucp.te | 2 policy/modules/services/xserver.fc | 2 policy/modules/services/xserver.if | 153 +++++++- policy/modules/services/xserver.te | 20 - policy/modules/system/authlogin.if | 91 ++++ policy/modules/system/authlogin.te | 3 policy/modules/system/clock.te | 3 policy/modules/system/fstools.fc | 1 policy/modules/system/fstools.te | 6 policy/modules/system/getty.te | 14 policy/modules/system/hostname.te | 14 policy/modules/system/init.if | 23 + policy/modules/system/init.te | 37 + policy/modules/system/ipsec.fc | 6 policy/modules/system/ipsec.if | 100 +++++ policy/modules/system/ipsec.te | 105 +++++ policy/modules/system/iptables.te | 9 policy/modules/system/libraries.fc | 4 policy/modules/system/locallogin.te | 6 policy/modules/system/logging.te | 13 policy/modules/system/lvm.if | 23 + policy/modules/system/lvm.te | 36 + policy/modules/system/miscfiles.fc | 2 policy/modules/system/miscfiles.if | 79 ++++ policy/modules/system/modutils.te | 14 policy/modules/system/mount.te | 10 policy/modules/system/raid.te | 4 policy/modules/system/selinuxutil.fc | 2 policy/modules/system/selinuxutil.if | 115 ++++++ policy/modules/system/selinuxutil.te | 138 ++----- policy/modules/system/sysnetwork.te | 3 policy/modules/system/tzdata.fc | 3 policy/modules/system/tzdata.if | 19 + policy/modules/system/tzdata.te | 41 ++ policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.if | 2 policy/modules/system/unconfined.te | 20 + policy/modules/system/userdomain.fc | 7 policy/modules/system/userdomain.if | 567 ++++++++++++++++++++++++------ policy/modules/system/userdomain.te | 44 +- policy/modules/system/xen.te | 25 + policy/support/obj_perm_sets.spt | 2 186 files changed, 4253 insertions(+), 782 deletions(-) Index: policy-20070102.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20070102.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- policy-20070102.patch 26 Jan 2007 16:20:43 -0000 1.13 +++ policy-20070102.patch 31 Jan 2007 22:18:10 -0000 1.14 @@ -342,9 +342,28 @@ } class key +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_booleans serefpolicy-2.5.2/policy/global_booleans +--- nsaserefpolicy/policy/global_booleans 2006-11-16 17:15:26.000000000 -0500 ++++ serefpolicy-2.5.2/policy/global_booleans 2007-01-26 15:43:48.000000000 -0500 +@@ -4,7 +4,6 @@ + # file should be used. + # + +-ifdef(`strict_policy',` + ## + ##

    + ## Enabling secure mode disallows programs, such as +@@ -13,7 +12,6 @@ + ##

    + ##     + gen_bool(secure_mode,false) +-') + + ## + ##

    diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.5.2/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.2/policy/global_tunables 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/global_tunables 2007-01-26 16:58:30.000000000 -0500 @@ -82,6 +82,14 @@ ## @@ -426,7 +445,7 @@ ## Allow gpg executable stack ##

    ##     -@@ -513,91 +566,89 @@ +@@ -513,91 +566,96 @@ ## ##

    @@ -537,18 +556,24 @@ ##

    ##     -gen_tunable(allow_mount_anyfile,false) -- +gen_tunable(use_lpd_server,false) + -+ifdef(`mls_policy',` ++ifdef(`enable_mls',` ++## ++##

    ++## Allow all domains to use netlabel labeled packets ++##

    ++##     ++gen_tunable(allow_netlabel,true) + ## ##

    -## Allow spamd to read/write user home directories. -+## Allow netlabel packets to work on system ++## Allow all domains to use ipsec labeled packets ##

    ##     -gen_tunable(spamd_enable_home_dirs,true) -+gen_tunable(allow_netlabel,true) ++gen_tunable(allow_ipsec_label,true) ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.5.2/policy/mls @@ -931,8 +956,16 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/sudo.if serefpolicy-2.5.2/policy/modules/admin/sudo.if --- nsaserefpolicy/policy/modules/admin/sudo.if 2007-01-02 12:57:51.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/admin/sudo.if 2007-01-25 09:00:58.000000000 -0500 -@@ -71,6 +71,7 @@ ++++ serefpolicy-2.5.2/policy/modules/admin/sudo.if 2007-01-26 14:51:10.000000000 -0500 +@@ -37,7 +37,6 @@ + + gen_require(` + type sudo_exec_t; +- bool secure_mode; + ') + + ############################## +@@ -71,6 +70,7 @@ allow $1_sudo_t self:unix_dgram_socket sendto; allow $1_sudo_t self:unix_stream_socket connectto; allow $1_sudo_t self:netlink_audit_socket { create bind write nlmsg_read read }; @@ -940,7 +973,7 @@ # Enter this derived domain from the user domain domtrans_pattern($2, sudo_exec_t, $1_sudo_t) -@@ -83,6 +84,7 @@ +@@ -83,6 +83,7 @@ kernel_read_kernel_sysctls($1_sudo_t) kernel_read_system_state($1_sudo_t) @@ -948,7 +981,7 @@ dev_read_urand($1_sudo_t) -@@ -90,10 +92,10 @@ +@@ -90,10 +91,10 @@ fs_getattr_xattr_fs($1_sudo_t) auth_domtrans_chk_passwd($1_sudo_t) @@ -961,7 +994,7 @@ domain_use_interactive_fds($1_sudo_t) domain_sigchld_interactive_fds($1_sudo_t) -@@ -140,9 +142,5 @@ +@@ -140,9 +141,5 @@ domain_auto_trans($1_sudo_t, sendmail_exec_t, $1_mail_t) ') @@ -1645,6 +1678,16 @@ + + + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.fc serefpolicy-2.5.2/policy/modules/apps/gpg.fc +--- nsaserefpolicy/policy/modules/apps/gpg.fc 2006-11-16 17:15:07.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/apps/gpg.fc 2007-01-26 13:44:09.000000000 -0500 +@@ -7,6 +7,4 @@ + /usr/lib/gnupg/.* -- gen_context(system_u:object_r:gpg_exec_t,s0) + /usr/lib/gnupg/gpgkeys.* -- gen_context(system_u:object_r:gpg_helper_exec_t,s0) + +-ifdef(`targeted_policy',`',` + HOME_DIR/\.gnupg(/.+)? gen_context(system_u:object_r:ROLE_gpg_secret_t,s0) +-') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/gpg.if serefpolicy-2.5.2/policy/modules/apps/gpg.if --- nsaserefpolicy/policy/modules/apps/gpg.if 2007-01-02 12:57:22.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/apps/gpg.if 2007-01-25 09:00:58.000000000 -0500 @@ -1819,7 +1862,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mozilla.if serefpolicy-2.5.2/policy/modules/apps/mozilla.if --- nsaserefpolicy/policy/modules/apps/mozilla.if 2007-01-02 12:57:22.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/apps/mozilla.if 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/apps/mozilla.if 2007-01-26 14:04:53.000000000 -0500 @@ -60,7 +60,7 @@ allow $1_mozilla_t self:capability { sys_nice setgid setuid }; @@ -1895,22 +1938,22 @@ files_dontaudit_list_home($1_mozilla_t) files_dontaudit_list_tmp($1_mozilla_t) -@@ -335,22 +344,28 @@ +@@ -335,22 +344,26 @@ ') optional_policy(` +- apache_read_user_scripts($1,$1_mozilla_t) +- apache_read_user_content($1,$1_mozilla_t) + gnome_stream_connect_gconf_template($1,$1_mozilla_t) + ') + + optional_policy(` + ssh_dontaudit_use_user_ssh_agent_fds($1,$1_mozilla_t) -+ ') -+ -+ optional_policy(` - apache_read_user_scripts($1,$1_mozilla_t) - apache_read_user_content($1,$1_mozilla_t) ') ++ apache_read_user_scripts($1,$1_mozilla_t) ++ apache_read_user_content($1,$1_mozilla_t) ++ optional_policy(` cups_read_rw_config($1_mozilla_t) + cups_dbus_chat($1_mozilla_t) @@ -1929,7 +1972,7 @@ ') optional_policy(` -@@ -358,44 +373,34 @@ +@@ -358,44 +371,34 @@ ') optional_policy(` @@ -1991,7 +2034,7 @@ # Macros for mozilla/mozilla (or other browser) domains. # FIXME: Rules were removed to centralize policy in a gnome_app macro -@@ -409,3 +414,174 @@ +@@ -409,3 +412,174 @@ ') ') ') @@ -2686,7 +2729,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.if serefpolicy-2.5.2/policy/modules/kernel/corecommands.if --- nsaserefpolicy/policy/modules/kernel/corecommands.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/kernel/corecommands.if 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/kernel/corecommands.if 2007-01-29 05:22:30.000000000 -0500 @@ -138,6 +138,26 @@ ######################################## @@ -3019,6 +3062,21 @@ ',`dnl') portcon $2 $3 gen_context(system_u:object_r:$1,$4) ifelse(`$5',`',`',`declare_ports($1,shiftn(4,$*))')dnl +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.5.2/policy/modules/kernel/devices.fc +--- nsaserefpolicy/policy/modules/kernel/devices.fc 2007-01-02 12:57:13.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/kernel/devices.fc 2007-01-29 09:11:06.000000000 -0500 +@@ -28,9 +28,11 @@ + /dev/js.* -c gen_context(system_u:object_r:mouse_device_t,s0) + /dev/kmem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh) + /dev/kmsg -c gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh) ++/dev/mcelog -c gen_context(system_u:object_r:kmsg_device_t,mls_systemhigh) + /dev/logibm -c gen_context(system_u:object_r:mouse_device_t,s0) + /dev/lp.* -c gen_context(system_u:object_r:printer_device_t,s0) + /dev/mem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh) ++/dev/oldmem -c gen_context(system_u:object_r:memory_device_t,mls_systemhigh) + /dev/mice -c gen_context(system_u:object_r:mouse_device_t,s0) + /dev/microcode -c gen_context(system_u:object_r:cpu_device_t,s0) + /dev/midi.* -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.5.2/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2007-01-02 12:57:13.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/kernel/devices.if 2007-01-26 10:04:44.000000000 -0500 @@ -3057,8 +3115,8 @@ # Type for /dev/mapper/control diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.5.2/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2007-01-02 12:57:13.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/kernel/domain.if 2007-01-25 09:00:58.000000000 -0500 -@@ -1217,3 +1217,41 @@ ++++ serefpolicy-2.5.2/policy/modules/kernel/domain.if 2007-01-26 17:01:47.000000000 -0500 +@@ -1217,3 +1217,59 @@ typeattribute $1 can_change_object_identity; typeattribute $1 set_curr_context; ') @@ -3100,10 +3158,28 @@ + + allow $1 domain:association setcontext; +') ++ ++######################################## ++## ++## Allow specified type to associate ipsec packets from any domain ++## ++## ++## ++## Type of subject to be allowed this. ++## ++## ++# ++interface(`domain_ipsec_labels',` ++ gen_require(` ++ attribute domain; ++ ') ++ ++ allow $1 domain:association { sendto recvfrom }; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.5.2/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2006-11-16 17:15:04.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/kernel/domain.te 2007-01-25 09:00:58.000000000 -0500 -@@ -144,3 +144,22 @@ ++++ serefpolicy-2.5.2/policy/modules/kernel/domain.te 2007-01-26 16:57:48.000000000 -0500 +@@ -144,3 +144,25 @@ # act on all domains keys allow unconfined_domain_type domain:key *; @@ -3119,12 +3195,15 @@ + kernel_sendrecv_unlabeled_association(domain) +') + -+ifdef(`mls_policy',` -+tunable_policy(`allow_netlabel',` -+ kernel_raw_recvfrom_unlabeled(domain) -+ kernel_tcp_recvfrom_unlabeled(domain) -+ kernel_udp_recvfrom_unlabeled(domain) -+') ++ifdef(`enable_mls',` ++ tunable_policy(`allow_netlabel',` ++ kernel_raw_recvfrom_unlabeled(domain) ++ kernel_tcp_recvfrom_unlabeled(domain) ++ kernel_udp_recvfrom_unlabeled(domain) ++ ') ++ tunable_policy(`allow_ipsec_label',` ++ ipsec_labeled(domain) ++ ') +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.5.2/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2007-01-02 12:57:13.000000000 -0500 @@ -3710,8 +3789,19 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.5.2/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2007-01-25 08:13:58.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/apache.fc 2007-01-25 14:48:52.000000000 -0500 -@@ -21,7 +21,6 @@ ++++ serefpolicy-2.5.2/policy/modules/services/apache.fc 2007-01-26 13:42:27.000000000 -0500 +@@ -1,10 +1,5 @@ + # temporary hack till genhomedircon is fixed +-ifdef(`targeted_policy',` +-HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_user_content_t,s0) +-',` + HOME_DIR/((www)|(web)|(public_html))(/.+)? gen_context(system_u:object_r:httpd_ROLE_content_t,s0) +-') +- + /etc/apache(2)?(/.*)? gen_context(system_u:object_r:httpd_config_t,s0) + /etc/apache-ssl(2)?(/.*)? gen_context(system_u:object_r:httpd_config_t,s0) + /etc/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) +@@ -21,7 +16,6 @@ /usr/lib/apache-ssl/.+ -- gen_context(system_u:object_r:httpd_exec_t,s0) /usr/lib/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) @@ -3719,7 +3809,7 @@ /usr/lib(64)?/apache(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) /usr/lib(64)?/apache2/modules(/.*)? gen_context(system_u:object_r:httpd_modules_t,s0) /usr/lib(64)?/apache(2)?/suexec(2)? -- gen_context(system_u:object_r:httpd_suexec_exec_t,s0) -@@ -81,3 +80,12 @@ +@@ -81,3 +75,12 @@ /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) @@ -3734,8 +3824,27 @@ +/opt/fortitude/run(/.*)? gen_context(system_u:object_r:httpd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.5.2/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/apache.if 2007-01-26 10:23:48.000000000 -0500 -@@ -434,6 +434,24 @@ ++++ serefpolicy-2.5.2/policy/modules/services/apache.if 2007-01-26 14:25:48.000000000 -0500 +@@ -268,6 +268,9 @@ + ') + + apache_content_template($1) ++ manage_dirs_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) ++ manage_files_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) ++ manage_lnk_files_pattern($1_t,httpd_$1_content_t,httpd_$1_content_t) + + typeattribute httpd_$1_content_t httpd_script_domains; + userdom_user_home_content($1,httpd_$1_content_t) +@@ -343,7 +346,7 @@ + # + template(`apache_read_user_scripts',` + gen_require(` +- type httpd_$1_script_exec_t; ++ type httpd$1_script_exec_t; + ') + + allow $2 httpd_$1_script_exec_t:dir list_dir_perms; +@@ -434,6 +437,24 @@ ######################################## ## @@ -3760,7 +3869,7 @@ ## Inherit and use file descriptors from Apache. ## ## -@@ -752,6 +770,7 @@ +@@ -752,6 +773,7 @@ ') allow $1 httpd_modules_t:dir list_dir_perms; @@ -3768,7 +3877,7 @@ ') ######################################## -@@ -1000,3 +1019,100 @@ +@@ -1000,3 +1022,120 @@ allow $1 httpd_sys_script_t:dir search_dir_perms; ') @@ -3869,6 +3978,26 @@ + ') + allow $1 httpd_t:process signal; +') ++ ++######################################## ++## ++## allow domain to relabel apache content ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`apache_relabel',` ++ gen_require(` ++ attribute httpdcontent; ++ attribute httpd_script_exec_type; ++ ') ++ ++ allow $1 { httpd_script_exec_type httpdcontent}:dir { relabelto relabelfrom }; ++ allow $1 { httpd_script_exec_type httpdcontent}:file { relabelto relabelfrom }; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.5.2/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2007-01-25 08:13:58.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/apache.te 2007-01-25 10:49:18.000000000 -0500 @@ -4430,7 +4559,7 @@ type cvs_data_t; # customizable diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.if serefpolicy-2.5.2/policy/modules/services/dbus.if --- nsaserefpolicy/policy/modules/services/dbus.if 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/dbus.if 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/dbus.if 2007-01-29 17:30:43.000000000 -0500 @@ -69,13 +69,14 @@ # Local policy # @@ -4523,6 +4652,42 @@ ## Read dbus configuration. ## ## +@@ -345,3 +387,23 @@ + + allow $1 system_dbusd_t:dbus *; + ') ++ ++######################################## ++## ++## dontaudit attempts to use system_dbus_t selinux_socket ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dbus_dontaudit_rw_system_selinux_socket',` ++ gen_require(` ++ type system_dbusd_t; ++ ') ++ ++ dontaudit $1 system_dbusd_t:netlink_selinux_socket { read write }; ++') ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dhcp.te serefpolicy-2.5.2/policy/modules/services/dhcp.te +--- nsaserefpolicy/policy/modules/services/dhcp.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/dhcp.te 2007-01-29 17:31:09.000000000 -0500 +@@ -125,6 +125,8 @@ + dbus_system_bus_client_template(dhcpd,dhcpd_t) + dbus_connect_system_bus(dhcpd_t) + dbus_send_system_bus(dhcpd_t) ++ dbus_read_config(dhcpd_t) ++ dbus_dontaudit_rw_system_selinux_socket(dhcpd_t) + ') + + optional_policy(` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.if serefpolicy-2.5.2/policy/modules/services/ftp.if --- nsaserefpolicy/policy/modules/services/ftp.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/ftp.if 2007-01-25 09:00:58.000000000 -0500 @@ -4632,8 +4797,16 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.5.2/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/hal.te 2007-01-25 09:00:58.000000000 -0500 -@@ -134,6 +134,7 @@ ++++ serefpolicy-2.5.2/policy/modules/services/hal.te 2007-01-31 17:11:45.000000000 -0500 +@@ -85,6 +85,7 @@ + dev_rw_power_management(hald_t) + # hal is now execing pm-suspend + dev_rw_sysfs(hald_t) ++dev_read_sound(hald_t) + + domain_use_interactive_fds(hald_t) + domain_read_all_domains_state(hald_t) +@@ -134,6 +135,7 @@ init_read_utmp(hald_t) #hal runs shutdown, probably need a shutdown domain init_rw_utmp(hald_t) @@ -5323,7 +5496,7 @@ term_dontaudit_use_generic_ptys(postfix_master_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.5.2/policy/modules/services/procmail.te --- nsaserefpolicy/policy/modules/services/procmail.te 2007-01-02 12:57:43.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/services/procmail.te 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/procmail.te 2007-01-29 05:22:56.000000000 -0500 @@ -10,6 +10,7 @@ type procmail_exec_t; domain_type(procmail_t) @@ -5332,6 +5505,23 @@ role system_r types procmail_t; ######################################## +@@ -18,7 +19,7 @@ + # + + allow procmail_t self:capability { sys_nice chown setuid setgid dac_override }; +-allow procmail_t self:process { setsched signal }; ++allow procmail_t self:process { setsched signal signull }; + allow procmail_t self:fifo_file rw_fifo_file_perms; + allow procmail_t self:unix_stream_socket create_socket_perms; + allow procmail_t self:unix_dgram_socket create_socket_perms; +@@ -50,6 +51,7 @@ + corecmd_exec_bin(procmail_t) + corecmd_exec_shell(procmail_t) + corecmd_dontaudit_search_sbin(procmail_t) ++corecmd_exec_ls(procmail_t) + + files_read_etc_files(procmail_t) + files_read_etc_runtime_files(procmail_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pyzor.if serefpolicy-2.5.2/policy/modules/services/pyzor.if --- nsaserefpolicy/policy/modules/services/pyzor.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/pyzor.if 2007-01-25 10:09:40.000000000 -0500 @@ -5818,6 +6008,14 @@ + ') + dontaudit $1 snmpd_var_lib_t:file write; +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/snmp.te serefpolicy-2.5.2/policy/modules/services/snmp.te +--- nsaserefpolicy/policy/modules/services/snmp.te 2007-01-02 12:57:43.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/snmp.te 2007-01-29 09:54:04.000000000 -0500 +@@ -157,3 +157,4 @@ + optional_policy(` + udev_read_db(snmpd_t) + ') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/spamassassin.if serefpolicy-2.5.2/policy/modules/services/spamassassin.if --- nsaserefpolicy/policy/modules/services/spamassassin.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/spamassassin.if 2007-01-25 09:00:58.000000000 -0500 @@ -5909,6 +6107,18 @@ + sysnet_read_config(httpd_squid_script_t) + corenet_non_ipsec_sendrecv(httpd_squid_script_t) +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.fc serefpolicy-2.5.2/policy/modules/services/ssh.fc +--- nsaserefpolicy/policy/modules/services/ssh.fc 2006-11-16 17:15:20.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/services/ssh.fc 2007-01-26 13:44:51.000000000 -0500 +@@ -12,8 +12,6 @@ + + /var/run/sshd\.init\.pid -- gen_context(system_u:object_r:sshd_var_run_t,s0) + +-ifdef(`targeted_policy', `', ` + /usr/bin/ssh-agent -- gen_context(system_u:object_r:ssh_agent_exec_t,s0) + + HOME_DIR/\.ssh(/.*)? gen_context(system_u:object_r:ROLE_home_ssh_t,s0) +-') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.5.2/policy/modules/services/ssh.if --- nsaserefpolicy/policy/modules/services/ssh.if 2007-01-02 12:57:43.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/services/ssh.if 2007-01-25 09:00:58.000000000 -0500 @@ -6581,8 +6791,35 @@ unconfined_domain_noaudit(xdm_xserver_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.5.2/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/authlogin.if 2007-01-25 09:00:58.000000000 -0500 -@@ -180,6 +180,9 @@ ++++ serefpolicy-2.5.2/policy/modules/system/authlogin.if 2007-01-26 15:54:21.000000000 -0500 +@@ -152,21 +152,12 @@ + ## + # + template(`auth_domtrans_user_chk_passwd',` +- ifdef(`targeted_policy',` +- gen_require(` +- type system_chkpwd_t, chkpwd_exec_t; +- ') +- +- corecmd_search_bin($2) +- domtrans_pattern($2,chkpwd_exec_t,system_chkpwd_t) +- ',` +- gen_require(` +- type $1_chkpwd_t, chkpwd_exec_t; +- ') +- +- corecmd_search_bin($2) +- domtrans_pattern($2,chkpwd_exec_t,$1_chkpwd_t) ++ gen_require(` ++ type $1_chkpwd_t, chkpwd_exec_t; + ') ++ ++ corecmd_search_bin($2) ++ domtrans_pattern($2,chkpwd_exec_t,$1_chkpwd_t) + ') + + ######################################## +@@ -180,6 +171,9 @@ ## # interface(`auth_login_pgm_domain',` @@ -6592,7 +6829,7 @@ domain_type($1) domain_subj_id_change_exemption($1) -@@ -187,6 +190,9 @@ +@@ -187,6 +181,9 @@ domain_obj_id_change_exemption($1) role system_r types $1; @@ -6602,7 +6839,7 @@ # for SSP/ProPolice dev_read_urand($1) -@@ -204,6 +210,7 @@ +@@ -204,6 +201,7 @@ mls_file_upgrade($1) mls_file_downgrade($1) mls_process_set_level($1) @@ -6610,7 +6847,7 @@ auth_domtrans_chk_passwd($1) auth_dontaudit_read_shadow($1) -@@ -341,6 +348,11 @@ +@@ -341,6 +339,11 @@ ') optional_policy(` @@ -6622,7 +6859,7 @@ nis_use_ypbind($1) ') -@@ -1352,6 +1364,10 @@ +@@ -1352,6 +1355,10 @@ optional_policy(` samba_stream_connect_winbind($1) ') @@ -6633,7 +6870,7 @@ ') ######################################## -@@ -1385,3 +1401,59 @@ +@@ -1385,3 +1392,59 @@ typeattribute $1 can_write_shadow_passwords; typeattribute $1 can_relabelto_shadow_passwords; ') @@ -6876,7 +7113,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.5.2/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/init.te 2007-01-25 09:00:58.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/init.te 2007-01-29 17:40:17.000000000 -0500 @@ -125,6 +125,7 @@ # file descriptors inherited from the rootfs: files_dontaudit_rw_root_files(init_t) @@ -6904,6 +7141,15 @@ can_exec(initrc_t,initrc_exec_t) manage_dirs_pattern(initrc_t,initrc_state_t,initrc_state_t) +@@ -305,7 +309,7 @@ + domain_sigchld_all_domains(initrc_t) + domain_read_all_domains_state(initrc_t) + domain_getattr_all_domains(initrc_t) +-domain_dontaudit_ptrace_all_domains(initrc_t) ++domain_ptrace_all_domains(initrc_t) + domain_getsession_all_domains(initrc_t) + domain_use_interactive_fds(initrc_t) + # for lsof which is used by alsa shutdown: @@ -338,6 +342,8 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -6996,8 +7242,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.if serefpolicy-2.5.2/policy/modules/system/ipsec.if --- nsaserefpolicy/policy/modules/system/ipsec.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/ipsec.if 2007-01-25 09:00:58.000000000 -0500 -@@ -111,3 +111,22 @@ ++++ serefpolicy-2.5.2/policy/modules/system/ipsec.if 2007-01-26 17:00:37.000000000 -0500 +@@ -111,3 +111,103 @@ files_search_pids($1) manage_files_pattern($1,ipsec_var_run_t,ipsec_var_run_t) ') @@ -7020,6 +7266,87 @@ + allow $1 ipsec_spd_t:association polmatch; + domain_ipsec_labels($1) +') ++ ++ ++######################################## ++## ++## Execute racoon in the racoon domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ipsec_racoon_domtrans',` ++ gen_require(` ++ type racoon_t, racoon_exec_t; ++ ') ++ ++ domain_auto_trans($1,racoon_exec_t,racoon_t) ++ ++ allow $1 racoon_t:fd use; ++ allow racoon_t $1:fd use; ++ allow racoon_t $1:fifo_file rw_file_perms; ++ allow racoon_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Execute setkey in the setkey domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`ipsec_setkey_domtrans',` ++ gen_require(` ++ type setkey_t, setkey_exec_t; ++ ') ++ domain_auto_trans($1,setkey_exec_t,setkey_t) ++ ++ allow $1 setkey_t:fd use; ++ allow setkey_t $1:fd use; ++ allow setkey_t $1:fifo_file rw_file_perms; ++ allow setkey_t $1:process sigchld; ++') ++ ++######################################## ++## ++## Execute ipsec-tools in the setkey and racoon domains ++## and allow the specified role the domains. ++## ++## ++## ++## Domain allowed access. ++## ++## ++## ++## ++## The role to be allowed the racoon and setkey domains. ++## ++## ++## ++## ++## The type of the terminal allow the racoon and setkey domains to use. ++## ++## ++## ++# ++interface(`ipsec_tools_run',` ++ gen_require(` ++ type racoon_t, setkey_t; ++ ') ++ ipsec_racoon_domtrans($1) ++ role $2 types racoon_t; ++ allow racoon_t $3:chr_file rw_term_perms; ++ ++ ipsec_setkey_domtrans($1) ++ role $2 types setkey_t; ++ allow setkey_t $3:chr_file rw_term_perms; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/ipsec.te serefpolicy-2.5.2/policy/modules/system/ipsec.te --- nsaserefpolicy/policy/modules/system/ipsec.te 2007-01-02 12:57:49.000000000 -0500 +++ serefpolicy-2.5.2/policy/modules/system/ipsec.te 2007-01-25 09:00:58.000000000 -0500 @@ -7755,8 +8082,21 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.5.2/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/selinuxutil.te 2007-01-25 09:00:58.000000000 -0500 -@@ -108,6 +108,18 @@ ++++ serefpolicy-2.5.2/policy/modules/system/selinuxutil.te 2007-01-26 15:50:15.000000000 -0500 +@@ -1,10 +1,8 @@ + + policy_module(selinuxutil,1.4.0) + +-ifdef(`strict_policy',` +- gen_require(` +- bool secure_mode; +- ') ++gen_require(` ++ bool secure_mode; + ') + + ######################################## +@@ -108,6 +106,18 @@ domain_entry_file(semanage_t, semanage_exec_t) role system_r types semanage_t; @@ -7775,7 +8115,7 @@ type semanage_store_t; files_type(semanage_store_t) -@@ -195,6 +207,7 @@ +@@ -195,6 +205,7 @@ fs_getattr_xattr_fs(load_policy_t) mls_file_read_up(load_policy_t) @@ -7783,7 +8123,7 @@ selinux_get_fs_mount(load_policy_t) selinux_load_policy(load_policy_t) -@@ -218,6 +231,7 @@ +@@ -218,6 +229,7 @@ dontaudit load_policy_t selinux_config_t:file write; optional_policy(` unconfined_dontaudit_read_pipes(load_policy_t) @@ -7791,7 +8131,7 @@ ') ') -@@ -283,6 +297,10 @@ +@@ -283,6 +295,10 @@ auth_domtrans_chk_passwd(newrole_t) auth_rw_faillog(newrole_t) @@ -7802,7 +8142,7 @@ corecmd_list_bin(newrole_t) corecmd_read_bin_symlinks(newrole_t) -@@ -292,6 +310,7 @@ +@@ -292,6 +308,7 @@ # Write to utmp. init_rw_utmp(newrole_t) @@ -7810,15 +8150,32 @@ files_read_etc_files(newrole_t) files_read_var_files(newrole_t) -@@ -307,6 +326,7 @@ +@@ -307,16 +324,15 @@ userdom_use_unpriv_users_fds(newrole_t) # for some PAM modules and for cwd userdom_dontaudit_search_all_users_home_content(newrole_t) +userdom_search_all_users_home_dirs(newrole_t) - ifdef(`strict_policy',` - # if secure mode is enabled, then newrole -@@ -403,6 +423,10 @@ +-ifdef(`strict_policy',` +- # if secure mode is enabled, then newrole +- # can only transition to unprivileged users +- if(secure_mode) { +- userdom_spec_domtrans_unpriv_users(newrole_t) +- } else { +- userdom_spec_domtrans_all_users(newrole_t) +- } +-') ++# if secure mode is enabled, then newrole ++# can only transition to unprivileged users ++if(secure_mode) { ++ userdom_spec_domtrans_unpriv_users(newrole_t) ++} else { ++ userdom_spec_domtrans_all_users(newrole_t) ++} + + optional_policy(` + nis_use_ypbind(newrole_t) +@@ -403,6 +419,10 @@ fs_rw_tmpfs_blk_files(restorecon_t) fs_relabel_tmpfs_blk_file(restorecon_t) fs_relabel_tmpfs_chr_file(restorecon_t) @@ -7829,7 +8186,7 @@ ') ifdef(`hide_broken_symptoms',` -@@ -546,82 +570,12 @@ +@@ -546,82 +566,12 @@ ######################################## # @@ -7916,7 +8273,7 @@ ######################################## # -@@ -669,6 +623,7 @@ +@@ -669,6 +619,7 @@ init_use_fds(setfiles_t) init_use_script_fds(setfiles_t) init_use_script_ptys(setfiles_t) @@ -7924,7 +8281,7 @@ domain_use_interactive_fds(setfiles_t) -@@ -688,3 +643,16 @@ +@@ -688,3 +639,16 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory userdom_read_all_users_home_content_files(setfiles_t) @@ -8130,7 +8487,7 @@ -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.5.2/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2007-01-02 12:57:49.000000000 -0500 -+++ serefpolicy-2.5.2/policy/modules/system/userdomain.if 2007-01-25 13:55:14.000000000 -0500 ++++ serefpolicy-2.5.2/policy/modules/system/userdomain.if 2007-01-26 16:18:45.000000000 -0500 @@ -102,6 +102,9 @@ libs_exec_ld_so($1_t) @@ -8474,7 +8831,205 @@ ## Do not audit attempts to read users ## untrusted files. ## -@@ -5549,3 +5658,276 @@ +@@ -3434,13 +3543,12 @@ + template(`userdom_setattr_user_ttys',` + ifdef(`targeted_policy',` + term_setattr_unallocated_ttys($2) +- ',` +- gen_require(` +- type $1_tty_device_t; +- ') +- +- allow $2 $1_tty_device_t:chr_file setattr; + ') ++ gen_require(` ++ type $1_tty_device_t; ++ ') ++ ++ allow $2 $1_tty_device_t:chr_file setattr; + ') + + ######################################## +@@ -3471,13 +3579,12 @@ + template(`userdom_use_user_ttys',` + ifdef(`targeted_policy',` + term_use_unallocated_ttys($2) +- ',` +- gen_require(` +- type $1_tty_device_t; +- ') +- +- allow $2 $1_tty_device_t:chr_file rw_term_perms; + ') ++ gen_require(` ++ type $1_tty_device_t; ++ ') ++ ++ allow $2 $1_tty_device_t:chr_file rw_term_perms; + ') + + ######################################## +@@ -3506,18 +3613,13 @@ + ## + # + template(`userdom_use_user_terminals',` +- ifdef(`targeted_policy',` +- term_use_unallocated_ttys($2) +- term_use_generic_ptys($2) +- ',` +- gen_require(` +- type $1_tty_device_t, $1_devpts_t; +- ') +- +- allow $2 $1_tty_device_t:chr_file rw_term_perms; +- allow $2 $1_devpts_t:chr_file rw_term_perms; +- term_list_ptys($2) ++ gen_require(` ++ type $1_tty_device_t, $1_devpts_t; + ') ++ ++ allow $2 $1_tty_device_t:chr_file rw_term_perms; ++ allow $2 $1_devpts_t:chr_file rw_term_perms; ++ term_list_ptys($2) + ') + + ######################################## +@@ -5181,14 +5283,13 @@ + interface(`userdom_use_unpriv_users_ptys',` + ifdef(`targeted_policy',` + term_use_generic_ptys($1) +- ',` +- gen_require(` +- attribute user_ptynode; +- ') +- +- term_search_ptys($1) +- allow $1 user_ptynode:chr_file rw_file_perms; + ') ++ gen_require(` ++ attribute user_ptynode; ++ ') ++ ++ term_search_ptys($1) ++ allow $1 user_ptynode:chr_file rw_file_perms; + ') + + ######################################## +@@ -5205,13 +5306,13 @@ + interface(`userdom_dontaudit_use_unpriv_users_ptys',` + ifdef(`targeted_policy',` + term_dontaudit_use_generic_ptys($1) +- ',` +- gen_require(` +- attribute user_ptynode; +- ') ++ ') + +- dontaudit $1 user_ptynode:chr_file rw_file_perms; ++ gen_require(` ++ attribute user_ptynode; + ') ++ ++ dontaudit $1 user_ptynode:chr_file rw_file_perms; + ') + + ######################################## +@@ -5264,13 +5365,12 @@ + interface(`userdom_list_unpriv_users_tmp',` + ifdef(`targeted_policy',` + files_list_tmp($1) +- ',` +- gen_require(` +- attribute user_tmpfile; +- ') +- +- allow $1 user_tmpfile:dir list_dir_perms; + ') ++ gen_require(` ++ attribute user_tmpfile; ++ ') ++ ++ allow $1 user_tmpfile:dir list_dir_perms; + ') + + ######################################## +@@ -5286,13 +5386,12 @@ + interface(`userdom_read_unpriv_users_tmp_files',` + ifdef(`targeted_policy',` + files_read_generic_tmp_files($1) +- ',` +- gen_require(` +- attribute user_tmpfile; +- ') +- +- allow $1 user_tmpfile:file { read getattr }; + ') ++ gen_require(` ++ attribute user_tmpfile; ++ ') ++ ++ allow $1 user_tmpfile:file { read getattr }; + ') + + ######################################## +@@ -5308,13 +5407,12 @@ + interface(`userdom_read_unpriv_users_tmp_symlinks',` + ifdef(`targeted_policy',` + files_read_generic_tmp_symlinks($1) +- ',` +- gen_require(` +- attribute user_tmpfile; +- ') +- +- allow $1 user_tmpfile:lnk_file { getattr read }; + ') ++ gen_require(` ++ attribute user_tmpfile; ++ ') ++ ++ allow $1 user_tmpfile:lnk_file { getattr read }; + ') + + ######################################## +@@ -5348,13 +5446,12 @@ + interface(`userdom_use_unpriv_users_ttys',` + ifdef(`targeted_policy',` + term_use_unallocated_ttys($1) +- ',` +- gen_require(` +- attribute user_ttynode; +- ') +- +- allow $1 user_ttynode:chr_file rw_term_perms; + ') ++ gen_require(` ++ attribute user_ttynode; ++ ') ++ ++ allow $1 user_ttynode:chr_file rw_term_perms; + ') + + ######################################## +@@ -5371,13 +5468,12 @@ + interface(`userdom_dontaudit_use_unpriv_users_ttys',` + ifdef(`targeted_policy',` + term_dontaudit_use_unallocated_ttys($1) +- ',` +- gen_require(` +- attribute user_ttynode; +- ') +- +- dontaudit $1 user_ttynode:chr_file rw_file_perms; + ') ++ gen_require(` ++ attribute user_ttynode; ++ ') ++ ++ dontaudit $1 user_ttynode:chr_file rw_file_perms; + ') + + ######################################## +@@ -5549,3 +5645,276 @@ allow $1 user_home_dir_t:dir manage_dir_perms; files_home_filetrans($1,user_home_dir_t,dir) ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.387 retrieving revision 1.388 diff -u -r1.387 -r1.388 --- selinux-policy.spec 26 Jan 2007 16:12:32 -0000 1.387 +++ selinux-policy.spec 31 Jan 2007 22:18:10 -0000 1.388 @@ -17,7 +17,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -356,6 +356,9 @@ %endif %changelog +* Fri Jan 25 2007 Dan Walsh 2.5.2-3 +- Remove some targeted diffs in file context file + * Thu Jan 25 2007 Dan Walsh 2.5.2-2 - Fix squid cachemgr labeling From fedora-cvs-commits at redhat.com Wed Jan 31 22:32:42 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:32:42 -0500 Subject: rpms/kdeedu/FC-6 .cvsignore, 1.29, 1.30 kdeedu.spec, 1.53, 1.54 sources, 1.32, 1.33 Message-ID: <200701312232.l0VMWgnE014204@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeedu/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv14126 Modified Files: .cvsignore kdeedu.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdeedu/FC-6/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 10 Aug 2006 12:36:15 -0000 1.29 +++ .cvsignore 31 Jan 2007 22:32:39 -0000 1.30 @@ -13,3 +13,4 @@ kdeedu-3.5.2.tar.bz2 kdeedu-3.5.3.tar.bz2 kdeedu-3.5.4.tar.bz2 +kdeedu-3.5.6.tar.bz2 Index: kdeedu.spec =================================================================== RCS file: /cvs/dist/rpms/kdeedu/FC-6/kdeedu.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- kdeedu.spec 26 Oct 2006 23:30:37 -0000 1.53 +++ kdeedu.spec 31 Jan 2007 22:32:40 -0000 1.54 @@ -10,7 +10,7 @@ %define qt_epoch 1 Name: kdeedu -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Summary: Educational/Edutainment applications for KDE URL: http://www.kde.org/ @@ -148,6 +148,9 @@ %{_libdir}/*.so %changelog +* Wed Jan 31 2007 Than Ngo 3.5.6-0.1.fc6 +- 3.5.6 + * Fri Oct 27 2006 Than Ngo 3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeedu/FC-6/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 26 Oct 2006 23:30:37 -0000 1.32 +++ sources 31 Jan 2007 22:32:40 -0000 1.33 @@ -1 +1 @@ -1659863d74a510bee412d0cb404b4542 kdeedu-3.5.5.tar.bz2 +6017317b133d973e7fc8a279a81f37a1 kdeedu-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 22:33:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:33:32 -0500 Subject: rpms/dhcp/devel dhcp.spec,1.131,1.132 Message-ID: <200701312233.l0VMXW2S014901@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14728 Modified Files: dhcp.spec Log Message: Forgot to remove FORTIFY_SOURCE munging. Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- dhcp.spec 30 Jan 2007 22:51:33 -0000 1.131 +++ dhcp.spec 31 Jan 2007 22:33:30 -0000 1.132 @@ -164,9 +164,7 @@ #define _PATH_DHCLIENT_DB "%{_localstatedir}/lib/dhclient/dhclient.leases" EOF -# Enable extended option info patch and set fortify source to 0 so that we -# don't get inline functions that we don't want (for libdhcp4client) -RPM_OPT_FLAGS="$(echo $RPM_OPT_FLAGS | sed -e 's/_FORTIFY_SOURCE=[0-9]/_FORTIFY_SOURCE=0/g')" +# Enable extended option info patch RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Werror -Dlint -DEXTENDED_NEW_OPTION_INFO" # DO NOT use the %%configure macro because this configure script is not autognu From fedora-cvs-commits at redhat.com Wed Jan 31 22:35:22 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:35:22 -0500 Subject: rpms/dhcp/devel dhcp.spec,1.132,1.133 Message-ID: <200701312235.l0VMZM1L016298@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16260 Modified Files: dhcp.spec Log Message: * Wed Jan 31 2007 David Cantrell - 12:3.0.5-12 - Rebuild Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- dhcp.spec 31 Jan 2007 22:33:30 -0000 1.132 +++ dhcp.spec 31 Jan 2007 22:35:20 -0000 1.133 @@ -8,7 +8,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.5 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 12 License: distributable Group: System Environment/Daemons @@ -346,6 +346,9 @@ %{_libdir}/libdhcp4client.so %changelog +* Wed Jan 31 2007 David Cantrell - 12:3.0.5-12 +- Rebuild + * Tue Jan 30 2007 David Cantrell - 12:3.0.5-11 - Remove FORTIFY_SOURCE=0 leftovers from testing last week (whoops) From fedora-cvs-commits at redhat.com Wed Jan 31 22:37:58 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:37:58 -0500 Subject: rpms/kdeaccessibility/FC-6 kdeaccessibility.spec, 1.25, 1.26 sources, 1.14, 1.15 Message-ID: <200701312237.l0VMbwqQ018143@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeaccessibility/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18049 Modified Files: kdeaccessibility.spec sources Log Message: 3.5.6 Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/dist/rpms/kdeaccessibility/FC-6/kdeaccessibility.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kdeaccessibility.spec 26 Oct 2006 19:41:45 -0000 1.25 +++ kdeaccessibility.spec 31 Jan 2007 22:37:56 -0000 1.26 @@ -4,7 +4,7 @@ %define qt_version 3.3.7 %define kdebase_epoch 6 -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Epoch: 1 Summary: K Desktop Environment - Accessibility @@ -125,7 +125,10 @@ %{_libdir}/lib*.so %changelog -* Thu Oct 26 2006 Than Ngo 1:3.5.5:0.1 +* Wed Jan 31 2007 Than Ngo 1:3.5.6-0.1.fc6 +- 3.5.6 + +* Thu Oct 26 2006 Than Ngo 1:3.5.5-0.1 - 3.5.5 * Thu Aug 10 2006 Than Ngo 1:3.5.4-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeaccessibility/FC-6/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 26 Oct 2006 19:40:51 -0000 1.14 +++ sources 31 Jan 2007 22:37:56 -0000 1.15 @@ -1 +0,0 @@ -a227e65e012b83c8635f6e16c4dc3259 kdeaccessibility-3.5.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 22:39:49 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:39:49 -0500 Subject: rpms/kdeaccessibility/FC-6 .cvsignore,1.12,1.13 sources,1.15,1.16 Message-ID: <200701312239.l0VMdnpC019562@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeaccessibility/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv19469 Modified Files: .cvsignore sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdeaccessibility/FC-6/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 10 Aug 2006 09:15:04 -0000 1.12 +++ .cvsignore 31 Jan 2007 22:39:46 -0000 1.13 @@ -9,3 +9,4 @@ kdeaccessibility-3.5.1.tar.bz2 kdeaccessibility-3.5.3.tar.bz2 kdeaccessibility-3.5.4.tar.bz2 +kdeaccessibility-3.5.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeaccessibility/FC-6/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 31 Jan 2007 22:37:56 -0000 1.15 +++ sources 31 Jan 2007 22:39:46 -0000 1.16 @@ -0,0 +1 @@ +03d3c9f4d8c2fd12b7d0e020e11cd88e kdeaccessibility-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 22:46:06 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:46:06 -0500 Subject: rpms/kdeadmin/FC-6 kdeadmin-3.5.6-knetworkconf-fc-6.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 kdeadmin.spec, 1.67, 1.68 sources, 1.37, 1.38 kdeadmin-3.5.4-knetworkconf-fc-6.patch, 1.1, NONE Message-ID: <200701312246.l0VMk6e5024196@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeadmin/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv24093 Modified Files: .cvsignore kdeadmin.spec sources Added Files: kdeadmin-3.5.6-knetworkconf-fc-6.patch Removed Files: kdeadmin-3.5.4-knetworkconf-fc-6.patch Log Message: 3.5.6 kdeadmin-3.5.6-knetworkconf-fc-6.patch: network-conf.in | 2 +- network.pl.in | 7 +++++++ platform.pl.in | 1 + service.pl.in | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) --- NEW FILE kdeadmin-3.5.6-knetworkconf-fc-6.patch --- --- kdeadmin-3.5.4/knetworkconf/backends/service.pl.in.orig 2006-08-18 18:12:31.000000000 +0200 +++ kdeadmin-3.5.4/knetworkconf/backends/service.pl.in 2006-08-18 18:13:57.000000000 +0200 @@ -100,6 +100,7 @@ "fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "fedora-4" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "fedora-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], "vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], @@ -171,6 +172,7 @@ "fedora-3" => [3, 5], "fedora-4" => [3, 5], "fedora-5" => [3, 5], + "fedora-6" => [3, 5], "rpath" => [3, 5], "vine-3.0" => [3, 5], @@ -239,6 +241,7 @@ "fedora-3" => "redhat-5.2", "fedora-4" => "redhat-5.2", "fedora-5" => "redhat-5.2", + "fedora-6" => "redhat-5.2", "rpath" => "redhat-5.2", "vine-3.0" => "redhat-5.2", @@ -1717,7 +1720,7 @@ "fedora-3" => \&gst_service_redhat_get_status, "fedora-4" => \&gst_service_redhat_get_status, "fedora-5" => \&gst_service_redhat_get_status, - + "fedora-6" => \&gst_service_redhat_get_status, "rpath" => \&gst_service_redhat_get_status, "suse-9.0" => \&gst_service_suse_get_status, --- kdeadmin-3.5.4/knetworkconf/backends/network.pl.in.orig 2006-08-18 18:06:20.000000000 +0200 +++ kdeadmin-3.5.4/knetworkconf/backends/network.pl.in 2006-08-18 18:08:52.000000000 +0200 @@ -524,6 +524,7 @@ "fedora-3" => "redhat-6.2", "fedora-4" => "redhat-6.2", "fedora-5" => "redhat-6.2", + "fedora-6" => "redhat-6.2", "rpath" => "redhat-6.2", "vine-3.0" => "redhat-6.2", "vine-3.1" => "redhat-6.2", @@ -1829,6 +1830,7 @@ "fedora-3" => \&gst_network_rh72_get_file, "fedora-4" => \&gst_network_rh72_get_file, "fedora-5" => \&gst_network_rh72_get_file, + "fedora-6" => \&gst_network_rh72_get_file, "rpath" => \&gst_network_rh72_get_file, "vine-3.0" => \&gst_network_rh62_get_file, "vine-3.1" => \&gst_network_rh62_get_file, @@ -3950,6 +3952,7 @@ "fedora-3" => "", "fedora-4" => "", "fedora-5" => "", + "fedora-6" => "", "rpath" => "", "vine-3.0" => "lo", "vine-3.1" => "lo", @@ -4116,6 +4119,7 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-6" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", @@ -4538,6 +4542,7 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-6" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", @@ -5377,6 +5382,7 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-6" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", @@ -5784,6 +5790,7 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-6" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", --- kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in.orig 2006-08-18 18:08:56.000000000 +0200 +++ kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in 2006-08-18 18:12:20.000000000 +0200 @@ -97,6 +97,7 @@ "fedora-3" => "Fedora Core 3 (Heidelberg)", "fedora-4" => "Fedora Core 4 (Stentz)", "fedora-5" => "Fedora Core 5 (Bordeaux)", + "fedora-6" => "Fedora Core 6 (Zod)", "rpath" => "rPath Linux", "ark" => "Ark Linux", }; --- kdeadmin-3.5.4/knetworkconf/backends/network-conf.in.orig 2006-08-18 18:14:00.000000000 +0200 +++ kdeadmin-3.5.4/knetworkconf/backends/network-conf.in 2006-08-18 18:14:28.000000000 +0200 @@ -71,7 +71,7 @@ "debian-2.2", "debian-3.0", "debian-sarge", "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "suse-7.0", "suse-9.0", "suse-9.1", - "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", + "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "fedora-6", "rpath", "pld-1.0", "pld-1.1", "pld-1.99", "conectiva-9", "conectiva-10", "vine-3.0", "vine-3.1", Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/FC-6/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 10 Aug 2006 10:21:46 -0000 1.35 +++ .cvsignore 31 Jan 2007 22:46:04 -0000 1.36 @@ -11,3 +11,4 @@ kdeadmin-3.5.1.tar.bz2 kdeadmin-3.5.3.tar.bz2 kdeadmin-3.5.4.tar.bz2 +kdeadmin-3.5.6.tar.bz2 Index: kdeadmin.spec =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/FC-6/kdeadmin.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- kdeadmin.spec 26 Oct 2006 20:50:50 -0000 1.67 +++ kdeadmin.spec 31 Jan 2007 22:46:04 -0000 1.68 @@ -18,12 +18,12 @@ %define arts 1 %define knetworkconf 1 -%define qt_version 3.3.6 +%define qt_version 3.3.7 %define kdelibs_epoch 6 %define kdebase_epoch 6 %define appdir %{_datadir}/applications/kde -Version: 3.5.5 +Version: 3.5.6 Release: 0.1%{?dist} Name: kdeadmin Summary: Administrative tools for KDE. @@ -39,7 +39,7 @@ Source4: kpackage.pamd Source5: kpackagerc -Patch0: kdeadmin-3.5.4-knetworkconf-fc-6.patch +Patch0: kdeadmin-3.5.6-knetworkconf-fc-6.patch Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -316,6 +316,9 @@ %endif %changelog +* Wed Jan 31 2007 Than Ngo 7:3.5.6-0.1.fc6 +- 3.5.6 + * Thu Oct 26 2006 Than Ngo 7:3.5.5-0.1 - 3.5.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdeadmin/FC-6/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 26 Oct 2006 20:50:50 -0000 1.37 +++ sources 31 Jan 2007 22:46:04 -0000 1.38 @@ -1 +1 @@ -4af595f5d5506521e8b29a1d92ba3409 kdeadmin-3.5.5.tar.bz2 +13654a93e83b7c8fd2ccce3aceb2d535 kdeadmin-3.5.6.tar.bz2 --- kdeadmin-3.5.4-knetworkconf-fc-6.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 22:54:32 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 17:54:32 -0500 Subject: rpms/kdenetwork/FC-6 .cvsignore, 1.38, 1.39 kdenetwork.spec, 1.94, 1.95 sources, 1.44, 1.45 Message-ID: <200701312254.l0VMsWw1018427@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdenetwork/FC-6 In directory cvs.devel.redhat.com:/tmp/cvs-serv18330 Modified Files: .cvsignore kdenetwork.spec sources Log Message: 3.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdenetwork/FC-6/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 10 Aug 2006 14:38:37 -0000 1.38 +++ .cvsignore 31 Jan 2007 22:54:30 -0000 1.39 @@ -11,3 +11,4 @@ kdenetwork-3.5.1.tar.bz2 kdenetwork-3.5.3.tar.bz2 kdenetwork-3.5.4.tar.bz2 +kdenetwork-3.5.6.tar.bz2 Index: kdenetwork.spec =================================================================== RCS file: /cvs/dist/rpms/kdenetwork/FC-6/kdenetwork.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- kdenetwork.spec 10 Nov 2006 15:45:48 -0000 1.94 +++ kdenetwork.spec 31 Jan 2007 22:54:30 -0000 1.95 @@ -12,8 +12,8 @@ %define appdir %{_datadir}/applications/kde Name: kdenetwork -Version: 3.5.5 -Release: 0.2%{?dist} +Version: 3.5.6 +Release: 0.1%{?dist} Summary: K Desktop Environment - Network Applications Epoch: 7 Group: Applications/Internet @@ -216,7 +216,10 @@ %endif %changelog -* Fri Nov 10 2006 Than Ngo 7:3.5.5-0.2.fc2 +* Wed Jan 31 2007 Than Ngo 7:3.5.6-0.1.fc6 +- 3.5.6 + +* Fri Nov 10 2006 Than Ngo 7:3.5.5-0.2.fc6 - add missing nowlistening plugins * Thu Oct 26 2006 Than Ngo 7:3.5.5-0.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdenetwork/FC-6/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 26 Oct 2006 20:24:16 -0000 1.44 +++ sources 31 Jan 2007 22:54:30 -0000 1.45 @@ -1 +1 @@ -a6e642c070cbd50d4a817f6588bf8e46 kdenetwork-3.5.5.tar.bz2 +0f428cccc4ea16aa53c427530874c591 kdenetwork-3.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 31 23:12:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 18:12:20 -0500 Subject: rpms/pykickstart/devel pykickstart.spec, 1.50, 1.51 sources, 1.50, 1.51 Message-ID: <200701312312.l0VNCKEU032370@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32274 Modified Files: pykickstart.spec sources Log Message: New version. Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- pykickstart.spec 25 Jan 2007 21:55:55 -0000 1.50 +++ pykickstart.spec 31 Jan 2007 23:12:18 -0000 1.51 @@ -2,15 +2,15 @@ Summary: A python library for manipulating kickstart files Name: pykickstart +Url: http://fedoraproject.org/wiki/pykickstart Version: 0.93 -Release: 1%{?dist} +Release: 2%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL Group: System Environment/Libraries BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: python-devel -BuildRequires: gettext +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: python-devel, gettext Requires: python, python-urlgrabber %description @@ -24,20 +24,23 @@ %build %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install +%find_lang %{name} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -%defattr(-,root,root) +%files -f %{name}.lang +%defattr(-,root,root,-) %doc README ChangeLog COPYING docs/programmers-guide %{python_sitelib}/pykickstart -/usr/bin/ksvalidator -/usr/share/locale/*/*/* +%{_bindir}/ksvalidator %changelog +* Wed Jan 31 2007 Chris Lumens - 0.93-2 +- Make some minor spec file changes to get closer to the extras guidelines. + * Thu Jan 25 2007 Chris Lumens - 0.93-1 - Add support for FC3, RHEL4, and RHEL5. - The key command was not supported until after FC6. @@ -48,7 +51,7 @@ - Add a version attribute to handler objects. - Fix line number reporting on lots of commands. - Add initial support for Fedora 7 and remove deprecated commands. -- Accept a --default argument to the %packages header (#221305). +- Accept a --default argument to the %%packages header (#221305). * Wed Jan 17 2007 Chris Lumens - 0.91-1 - Add a method to read kickstart files from strings. @@ -137,8 +140,8 @@ - Ignore spaces before group names (#188095). - Added some translations. - Add options for repo command. -- Reorder %packages section output. -- Output %packages header options. +- Reorder %%packages section output. +- Output %%packages header options. - Initialize RAID and volume group members to empty lists. * Mon Mar 27 2006 Chris Lumens 0.25-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 25 Jan 2007 21:55:55 -0000 1.50 +++ sources 31 Jan 2007 23:12:18 -0000 1.51 @@ -1 +1 @@ -7d94829a67df8189cff6935b5957a538 pykickstart-0.93.tar.gz +0f5deffb2c9edc3f8577370f197bd4fa pykickstart-0.93.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 31 23:24:13 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 18:24:13 -0500 Subject: rpms/kernel/devel patch-2.6.20-rc7.bz2.sign, NONE, 1.1 .cvsignore, 1.564, 1.565 kernel-2.6.spec, 1.2916, 1.2917 sources, 1.527, 1.528 upstream, 1.455, 1.456 patch-2.6.20-rc6-git2.bz2.sign, 1.1, NONE patch-2.6.20-rc6.bz2.sign, 1.1, NONE Message-ID: <200701312324.l0VNODRW028920@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28864 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.20-rc7.bz2.sign Removed Files: patch-2.6.20-rc6-git2.bz2.sign patch-2.6.20-rc6.bz2.sign Log Message: rc7 --- NEW FILE patch-2.6.20-rc7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBFwHaUyGugalF9Dw4RAguqAJsE8MLas8ipiJtAPsyCE3QNuj2ONACeLp4E rJMfQU1tpaO3M6/rISxR4C0= =5Y9D -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.564 retrieving revision 1.565 diff -u -r1.564 -r1.565 --- .cvsignore 30 Jan 2007 21:57:31 -0000 1.564 +++ .cvsignore 31 Jan 2007 23:24:11 -0000 1.565 @@ -4,5 +4,4 @@ kernel-2.6.19 xen-11633.tar.bz2 linux-2.6.19.tar.bz2 -patch-2.6.20-rc6.bz2 -patch-2.6.20-rc6-git2.bz2 +patch-2.6.20-rc7.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2916 retrieving revision 1.2917 diff -u -r1.2916 -r1.2917 --- kernel-2.6.spec 30 Jan 2007 21:57:31 -0000 1.2916 +++ kernel-2.6.spec 31 Jan 2007 23:24:11 -0000 1.2917 @@ -300,8 +300,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.20-rc6.bz2 -Patch2: patch-2.6.20-rc6-git2.bz2 +Patch1: patch-2.6.20-rc7.bz2 Patch3: git-geode.patch # Patches 10 through 99 are for things that are going upstream really soon. @@ -777,7 +776,6 @@ # Update to latest upstream. %patch1 -p1 -%patch2 -p1 # Patches 10 through 100 are meant for core subsystem upgrades @@ -2000,6 +1998,9 @@ # - tux. %changelog +* Wed Jan 31 2007 Dave Jones +- 2.6.20rc7 + * Tue Jan 30 2007 Dave Jones - 2.6.20rc6-git2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.527 retrieving revision 1.528 diff -u -r1.527 -r1.528 --- sources 30 Jan 2007 21:57:31 -0000 1.527 +++ sources 31 Jan 2007 23:24:11 -0000 1.528 @@ -1,4 +1,3 @@ 93d8d8f6c51f3c01beadbae1aa1fd548 xen-11633.tar.bz2 443c265b57e87eadc0c677c3acc37e20 linux-2.6.19.tar.bz2 -7c6dca292f886e7f79df72501f7bfac4 patch-2.6.20-rc6.bz2 -a1b2df5a782b53e0838201a7f4d43551 patch-2.6.20-rc6-git2.bz2 +b78873f8a3aff5bdc719fc7fb4c66a9b patch-2.6.20-rc7.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.455 retrieving revision 1.456 diff -u -r1.455 -r1.456 --- upstream 30 Jan 2007 21:57:31 -0000 1.455 +++ upstream 31 Jan 2007 23:24:11 -0000 1.456 @@ -1,3 +1,2 @@ linux-2.6.19.tar.bz2 -patch-2.6.20-rc6.bz2 -patch-2.6.20-rc6-git2.bz2 +patch-2.6.20-rc7.bz2 --- patch-2.6.20-rc6-git2.bz2.sign DELETED --- --- patch-2.6.20-rc6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 31 23:36:20 2007 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 31 Jan 2007 18:36:20 -0500 Subject: rpms/eclipse/devel eclipse-add-ppc64-sparc64-s390-s390x.patch, NONE, 1.1 eclipse.spec, 1.404, 1.405 Message-ID: <200701312336.l0VNaKpL026545@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4900 Modified Files: eclipse.spec Added Files: eclipse-add-ppc64-sparc64-s390-s390x.patch Log Message: * Wed Jan 31 2007 Ben Konrath 3.2.1-35 - Use original name for the SWT symlinks. - Rework ppc64, s390{x} and sparc{64} hack to fix multilib problem. eclipse-add-ppc64-sparc64-s390-s390x.patch: eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java | 0 eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 0 plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java | 4 ++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java | 5 +++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java | 2 +- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 5 +++++ src/org/eclipse/core/internal/runtime/InternalPlatform.java | 0 src/org/eclipse/core/runtime/Platform.java | 0 8 files changed, 15 insertions(+), 1 deletion(-) --- NEW FILE eclipse-add-ppc64-sparc64-s390-s390x.patch --- Index: src/org/eclipse/core/runtime/Platform.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java,v retrieving revision 1.106 diff -u -r1.106 Platform.java --- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 13 Apr 2006 00:42:47 -0000 1.106 +++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 31 Jan 2007 21:33:51 -0000 @@ -339,6 +339,11 @@ * @since 3.1 */ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$ + + public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$ + public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$ + public static final String ARCH_S390 = "s390";//$NON-NLS-1$ + public static final String ARCH_S390X = "s390x";//$NON-NLS-1$ /** * Constant string (value "win32") indicating the platform is running on a Index: src/org/eclipse/core/internal/runtime/InternalPlatform.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java,v retrieving revision 1.253 diff -u -r1.253 InternalPlatform.java --- plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 21 Apr 2006 20:49:57 -0000 1.253 +++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 31 Jan 2007 21:33:50 -0000 @@ -52,6 +52,10 @@ Platform.ARCH_X86, // Platform.ARCH_AMD64, // Platform.ARCH_IA64, // + Platform.ARCH_PPC64, // + Platform.ARCH_SPARC64, // + Platform.ARCH_S390, // + Platform.ARCH_S390X, // Platform.ARCH_IA64_32}; private static final String BOOT = "-boot"; //$NON-NLS-1$ private static final String CLASSLOADER_PROPERTIES = "-classloaderProperties"; //$NON-NLS-1$ Index: eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java,v retrieving revision 1.13 diff -u -r1.13 PluginConverterImpl.java --- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 13 Apr 2006 16:10:27 -0000 1.13 +++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 31 Jan 2007 21:33:52 -0000 @@ -64,7 +64,7 @@ private static final String MANIFEST_VERSION = "Manifest-Version"; //$NON-NLS-1$ private static final String PLUGIN_PROPERTIES_FILENAME = "plugin"; //$NON-NLS-1$ private static PluginConverterImpl instance; - private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64}; + private static final String[] ARCH_LIST = {org.eclipse.osgi.service.environment.Constants.ARCH_PA_RISC, org.eclipse.osgi.service.environment.Constants.ARCH_PPC, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC, org.eclipse.osgi.service.environment.Constants.ARCH_X86, org.eclipse.osgi.service.environment.Constants.ARCH_AMD64, org.eclipse.osgi.service.environment.Constants.ARCH_IA64, org.eclipse.osgi.service.environment.Constants.ARCH_PPC64, org.eclipse.osgi.service.environment.Constants.ARCH_SPARC64, org.eclipse.osgi.service.environment.Constants.ARCH_S390, org.eclipse.osgi.service.environment.Constants.ARCH_S390X}; static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$ static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$ Index: eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java,v retrieving revision 1.9 diff -u -r1.9 Constants.java --- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 13 Jun 2005 17:14:22 -0000 1.9 +++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 31 Jan 2007 21:33:52 -0000 @@ -119,6 +119,11 @@ */ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$ + public static final String ARCH_PPC64 = "ppc64";//$NON-NLS-1$ + public static final String ARCH_SPARC64 = "sparc64";//$NON-NLS-1$ + public static final String ARCH_S390 = "s390";//$NON-NLS-1$ + public static final String ARCH_S390X = "s390x";//$NON-NLS-1$ + /** * Constant string (value "win32") indicating the platform is running on a * machine using the Windows windowing system. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.404 retrieving revision 1.405 diff -u -r1.404 -r1.405 --- eclipse.spec 31 Jan 2007 07:26:23 -0000 1.404 +++ eclipse.spec 31 Jan 2007 23:36:17 -0000 1.405 @@ -19,7 +19,7 @@ Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 34%{?dist} +Release: 35%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -111,6 +111,7 @@ # fixed a number of update-related bugs -- in an FC6 update. # We can remove this patch for Fedora 8. Patch23: %{name}-launcher-addplatformtotildeeclipse.patch +Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -671,33 +672,30 @@ assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ features/org.eclipse.rcp/build.xml -# Nasty hack to get suppport for ppc64, s390{,x} and sparc{,64} +## Nasty hack to get suppport for ppc64, s390{,x} and sparc{,64} +%patch24 -p0 +# there is only partial support for ppc64 in 3.2 so we have to remove this +# partial support to get the replacemnt hack to work +find -name \*ppc64\* | xargs rm -r +# remove ppc64 support from features/org.eclipse.platform.source/feature.xml +# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets +find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \; +# remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq +sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml +# replace final occurances with an existing arch +sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml +# remove ppc64 support from features/org.eclipse.platform.source/feature.xml +mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig +grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml # Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace # the ia64 strings with ppc64 or s390(x) %ifarch ppc64 s390 s390x sparc sparc64 - # there is only partial support for ppc64 in 3.2 so we have to remove this - # partial support to get the replacemnt hack to work - find -name \*ppc64\* | xargs rm -r - - # remove ppc64 support from features/org.eclipse.platform.source/feature.xml - # replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets - find -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \; - # remove org.eclipse.platform.source.linux.gtk.ppc64,3.2.0.v20060602-0010-gszCh-8eOaU1uKq - sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml - # replace final occurances with an existing arch - sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml - - # remove ppc64 support from features/org.eclipse.platform.source/feature.xml - mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig - grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml - - # finally, the replacement hack for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do mv $f $(echo $f | sed "s/ia64/%{_arch}/") done - find -type f -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \; - find -type f -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \; - find -type f -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \; + find -type f ! -name \*.java -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \; + find -type f ! -name \*.java -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \; + find -type f ! -name \*.java -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \; %endif # gjdoc can't handle Mac-encoded files @@ -1036,12 +1034,10 @@ done popd -# Install symlinks to the SWT JNI shared libraries in /usr/lib/eclipse with sane -# versions +# Install symlinks to the SWT JNI shared libraries in /usr/lib/eclipse pushd $RPM_BUILD_ROOT%{_libdir}/%{name} for lib in $(find configuration -name libswt\*.so); do - ln -s %{_libdir}/%{name}/$lib `basename $lib | sed "s/-gtk-.*.so/-gtk-%{eclipse_majmin}.so/"` - ln -s %{_libdir}/%{name}/$lib `basename $lib | sed "s/-gtk-.*.so/-gtk-%{eclipse_majmin}.%{eclipse_micro}.so/"` + ln -s %{_libdir}/%{name}/$lib `basename $lib` done popd @@ -1742,6 +1738,10 @@ %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Wed Jan 31 2007 Ben Konrath 3.2.1-35 +- Use original name for the SWT symlinks. +- Rework ppc64, s390{x} and sparc{64} hack to fix multilib problem. + * Tue Jan 30 2007 Ben Konrath 3.2.1-34 - Create symlinks to the SWT JNI libs in %%{_libdir}/eclipse with sane versions.